Commit Graph

49499 Commits

Author SHA1 Message Date
Evan Huus dd314cd97e Add explicit 64/32 casts missing from r52775.
svn path=/trunk/; revision=52779
2013-10-23 01:56:52 +00:00
Evan Huus 53e771f217 From Jonathon Jongsma via
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9143

Add correct license header to packet-spice.h

svn path=/trunk/; revision=52778
2013-10-23 01:47:55 +00:00
Guy Harris 86b6093129 Default to GTK+ 3, not Qt, for now.
svn path=/trunk/; revision=52777
2013-10-23 01:40:33 +00:00
Guy Harris 9ca4360321 First cut at having this handle Qt. Adds a TOOLKIT variable that you
set to "qt", "gtk2", or "gtk3".

Work done on a machine with the command-line build tools, but not Full
Frontal Xcode, installed, so it couldn't build Qt, so it hasn't been
tested.  It *has* been fixed to complain in that case, rather than
letting the Qt build fail with a somewhat less useful message talking
about Xcode licensing.

svn path=/trunk/; revision=52776
2013-10-23 01:39:54 +00:00
Evan Huus 328a05630c From Michal Labedzki via
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8818

Add support for dissection ELF files. It opens as a "capture" file via wiretap
at the moment for simplicity's sake, but the intention is eventually to have
this (and other file types we dissect) open through some other program sharing
much of the libwireshark infrastructure.

svn path=/trunk/; revision=52775
2013-10-23 01:36:49 +00:00
Michael Mann cbd3194bcf Add STANAG 5066 DTS CRC routines. Bug 9217 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9217)
STANAG 5066 DTS will follow when it passes review, just trying to make the patch more manageable.

svn path=/trunk/; revision=52774
2013-10-22 23:30:26 +00:00
Balint Reczey 02a8e72b43 Generate wsicon32.xpm during building Debian package
svn path=/trunk/; revision=52773
2013-10-22 22:33:05 +00:00
Balint Reczey bd0a70c437 Revert "Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9209 :"
This reverts commit r52441.

svn path=/trunk/; revision=52772
2013-10-22 22:32:55 +00:00
Michael Mann 17679ee25d Cannot define Field refering ProtoField defined in LUA. Bug 3513 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3513)
When a new Field is created, does as following: 

* Check whether that field is registered, by using `proto_registrar_get_byname`. This is current behavior.
* (patched) If not registered, check whether that field is defined in LUA and will be registered. This is performed in `wslua_is_field_available` accessing LUA context.
* If not, an error "a field with this name must exist"  occurs.


svn path=/trunk/; revision=52771
2013-10-22 17:41:06 +00:00
Martin Mathieson 1363444506 Handle long gaps between PDUs by resetting timers, and show short-cycle-timer as part of state
svn path=/trunk/; revision=52770
2013-10-22 16:52:45 +00:00
Gerald Combs 4baec51d95 Add information about building Qt.
svn path=/trunk/; revision=52769
2013-10-22 16:48:04 +00:00
Evan Huus 7aee8b2dcf Optimize tvb_ensure_bytes_exist through manual inlining and removal of redundant
checks and computations. Should contain no behavioural changes at *all*, I hope.

svn path=/trunk/; revision=52768
2013-10-22 16:29:10 +00:00
Bill Meier a3a15ff90b Remove instances of unused 'data_handle' (and of one other handle).
svn path=/trunk/; revision=52767
2013-10-22 16:13:32 +00:00
Evan Huus 5b9ec08eae Optimization: in test_length there's no need to validate that the count value
for FT_UINT_STRINGs and FT_UINT_BYTEs is still in the TVB. Any infinite loop
that adds a counted field ought to be extracting the length for its own offset
anyways, in which case it will overflow on the next iteration and won't actually
loop forever.

svn path=/trunk/; revision=52766
2013-10-22 16:02:13 +00:00
Martin Mathieson 27d15390cc Show state of other DRX timers, and update some comments.
svn path=/trunk/; revision=52765
2013-10-22 15:56:14 +00:00
Evan Huus bcadba5f4b Revert r52730, it is unnecessary with r52695 reverted.
svn path=/trunk/; revision=52764
2013-10-22 15:49:32 +00:00
Anders Broman 1684ac969b Revert 52695.
svn path=/trunk/; revision=52763
2013-10-22 14:54:54 +00:00
Michael Mann ab78bb54c4 Print informations even on short reads. Bug 9310 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9310)
Before this patch, an error message would be printed when the file
appears to be truncated. After this patch, a warning will be printed,
but the information is still displayed. In both cases, capinfos exits
with status code 1.

From Peter Wu

svn path=/trunk/; revision=52762
2013-10-22 14:52:28 +00:00
Bill Meier a7fbfd70cf Cleanup:
- remove duplicate/unneeded #includes
- remove some boilerplate comments
- fix up whitespace: indentation, trailing & etc
- remove 'if (tree)'
  (Note: 'if (tree)' needs to be around all the code (as in the previous
          version of packet-wsmp) or none so that the same value of offset is used
          in various function calls whether or not 'tree == NULL'.
         For the moment I've chosen to remove the 'if (tree)' since (in theory)
         the (external) data dissector shouldn't be called under 'if (tree)'.
- revert SVN #52757 since no it's longer needed with the removal of 'if (tree)';
- remove another unneeded line of code.

svn path=/trunk/; revision=52761
2013-10-22 14:27:48 +00:00
Michael Mann 29b709298e dissect error messages. Bug 9283 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9283)
From Zoltán Lajos Kis

svn path=/trunk/; revision=52760
2013-10-22 14:12:20 +00:00
Pascal Quantin d9b9ff60df curr-num_layer is not always incremented by 1 when calling the subdissector
svn path=/trunk/; revision=52759
2013-10-22 13:51:21 +00:00
Jeff Morriss a93eb10ee9 set SVN properties.
svn path=/trunk/; revision=52758
2013-10-22 13:27:31 +00:00
Pascal Quantin 3867c85ae9 From Roland Knall via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9244 :
Fix error: 'wsmlength' may be used uninitialized in this function

svn path=/trunk/; revision=52757
2013-10-22 11:12:41 +00:00
Irene Rüngeler 6e67565b2d Use the preferred or default linktype as active.
svn path=/trunk/; revision=52756
2013-10-22 10:36:12 +00:00
Michael Mann 75926345c6 Latest WSMP protocol support. Bug 9244 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9244)
Per bug, version 1 is no longer in use as its no longer specified in the standard.

svn path=/trunk/; revision=52755
2013-10-22 02:37:49 +00:00
Michael Mann c87641f286 dissection of group_mod messages. Bug 9283 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9283)
From Zoltán Lajos Kis

svn path=/trunk/; revision=52754
2013-10-22 02:29:12 +00:00
Michael Mann 7a360326ab openSAFETY: Fixing rare crash as well as dissector errors. Bug 9314 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9314)
From Roland Knall

svn path=/trunk/; revision=52752
2013-10-22 02:08:42 +00:00
Michael Mann b6df06199c Pass struct rxinfo "private data" into AFS dissector instead of using pinfo->private_data.
svn path=/trunk/; revision=52751
2013-10-22 01:02:00 +00:00
Michael Mann 28b5926fe8 Pass usb_data_t "private data" into subdissectors instead of using pinfo->private_data.
svn path=/trunk/; revision=52750
2013-10-22 00:49:16 +00:00
Bill Meier 88b157d91c Fix "unused variable 'dct3trace_magic_l2_end' [-Werror,-Wunused-const-variable" found by clang v3.4
svn path=/trunk/; revision=52749
2013-10-21 23:57:42 +00:00
Jörg Mayer 6eba75967c Properly implement subtree expansion (including automagically
expanding the mint subtrees during development).

svn path=/trunk/; revision=52748
2013-10-21 21:44:31 +00:00
Martin Mathieson 0aac675f84 Improve the way DRX before and after state is shown.
svn path=/trunk/; revision=52747
2013-10-21 21:20:39 +00:00
Gerald Combs 2dd3a651e6 Code signing updates.
Sign executables, libraries, frameworks, plugins, and bundles as per the
Code Signing Guide. Check our work with spctl. Use "bundle" to
differentiate what we're doing with the package script.

svn path=/trunk/; revision=52746
2013-10-21 20:06:14 +00:00
Jeff Morriss c8573b9897 Reindent.
svn path=/trunk/; revision=52745
2013-10-21 19:57:47 +00:00
Michael Mann 87e55cb9e0 Sync with latest SAMBA PIDL source per http://www.wireshark.org/lists/wireshark-dev/201310/msg00217.html
Didn't integrate
0010-frsrpc-Regenerate-frsrpc-due-to-changes-in-the-pidl-.patch
0016-Regenerate-the-dnserver.patch

due to compilation errors on Windows.

svn path=/trunk/; revision=52744
2013-10-21 19:41:54 +00:00
Michael Mann 15294a1261 Add a new api to allow dissection of the array payload as a whole. Bug 9307 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9307)
From Matthieu Patou 

svn path=/trunk/; revision=52743
2013-10-21 18:46:52 +00:00
Michael Mann 772fb97f76 We can't really have conformant strings they are always conformant and
varying but pidl insists on having a different function.  Bug 9306 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9306)

From Matthieu Patou.

svn path=/trunk/; revision=52742
2013-10-21 18:33:14 +00:00
Michael Mann ac7caf7007 Add APIs for PIDL generated code to return the value of the integer that was dissected. Bug 9305 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9305).
From Matthieu Patou

svn path=/trunk/; revision=52741
2013-10-21 18:25:41 +00:00
Pascal Quantin cc0bba9e4b Tentative fix for https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9287 :
Initialize ofn->lCustData variable

svn path=/trunk/; revision=52740
2013-10-21 18:03:37 +00:00
Jeff Morriss 33dd47e5bc Add packet-spice.h
svn path=/trunk/; revision=52739
2013-10-21 17:59:51 +00:00
Chris Maynard 3616fa1549 Remove if (fh_tree) checks as add_ethernet_trailer() calls such functions as dissector_try_heuristic(), expert_add_info(), and col_append_str(), which all need to be called whether fh_tree is NULL or not.
#BACKPORT(1.10,1.8)

svn path=/trunk/; revision=52738
2013-10-21 17:31:22 +00:00
Michael Mann 2dafe09f0b Update spice protocol dissector. Bug 9143 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9143)
From Jonathon Jongsma

Note that the new packet-spice.h is auto-generated outside of Wireshark.

svn path=/trunk/; revision=52737
2013-10-21 16:48:07 +00:00
Michael Mann a8d18748ab dce-rpc: properly dissect multiple PDU in the same packet. Bug 9302 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9302).
From Matthieu Patou

svn path=/trunk/; revision=52736
2013-10-21 16:00:37 +00:00
Michael Mann 651b858892 Fix compile errors introduced in r52734.
svn path=/trunk/; revision=52735
2013-10-21 15:58:52 +00:00
Michael Mann 598726be02 Datablob size is NDR64/32 dependant. Bug 9301 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9301).
From Matthieu Patou

svn path=/trunk/; revision=52734
2013-10-21 15:50:23 +00:00
Michael Mann 8ee3d11818 Fix padding bytes overlapping due to NDR alignment. Bug 9300 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9300)
From Matthieu Patou

svn path=/trunk/; revision=52733
2013-10-21 15:46:13 +00:00
Michael Mann f69a489472 NULL check ref_nt_challenge_response and ref_lm_challenge_response. Bug 9299 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9299)
From Matthieu Patou

svn path=/trunk/; revision=52732
2013-10-21 15:39:07 +00:00
Pascal Quantin 14fd3d0157 ZeroMemory -> SecureZeroMemory
svn path=/trunk/; revision=52731
2013-10-21 15:16:41 +00:00
Evan Huus 23191ea6e6 Don't go into a loop if we find a zero-length line. Fixes
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9312

Anders, this may be related to your recent TVB optimizations, since I don't
think it happened before that? Did you change the behaviour of tvb_find_line_end
or its callees at all?

svn path=/trunk/; revision=52730
2013-10-21 13:07:19 +00:00
Michael Mann be62b39687 Pass fc_hdr "private data" into subdissectors instead of using pinfo->private_data.
svn path=/trunk/; revision=52729
2013-10-21 03:13:47 +00:00