Evan Huus [Fri, 25 Oct 2013 22:14:25 +0000 (22:14 -0000)]
Add a very small hack to make the UAT update callback error string freeable, and
convert all existing UAT update callbacks to use glib memory instead of
ephemeral memory for that string.
UAT code paths are entirely distinct from packet dissection, so using ephemeral
memory was the wrong choice, because there was no guarantees about when it would
be freed.
The move away from emem still needs to be propogated deeper into the UAT code
itself at some point.
Net effect: remove another bunch of emem calls from dissectors, where replacing
with wmem would have caused assertions.
svn path=/trunk/; revision=52854
Gerald Combs [Fri, 25 Oct 2013 21:37:30 +0000 (21:37 -0000)]
Exit if we're building with Qt and we can't find macdeployqt.
svn path=/trunk/; revision=52853
Chris Maynard [Fri, 25 Oct 2013 21:16:39 +0000 (21:16 -0000)]
Sync up with packet-pana.c.
svn path=/trunk/; revision=52852
Chris Maynard [Fri, 25 Oct 2013 21:04:22 +0000 (21:04 -0000)]
wmemify.
svn path=/trunk/; revision=52851
Jeff Morriss [Fri, 25 Oct 2013 20:38:50 +0000 (20:38 -0000)]
Fix CID 281375 (dead code) while hopefully fixing detection of Class-2 ERR
messages.
Also fix a couple of incorrect MTP3 standard detections that I found.
svn path=/trunk/; revision=52850
Evan Huus [Fri, 25 Oct 2013 18:14:36 +0000 (18:14 -0000)]
Add an exception to the license-checker for Samba's special IDL license which
appears to be compatible as far as I can tell (not a lawyer). See:
https://www.wireshark.org/lists/wireshark-dev/201310/msg00234.html
svn path=/trunk/; revision=52849
Jeff Morriss [Fri, 25 Oct 2013 15:25:46 +0000 (15:25 -0000)]
Fix up some formatting and white space.
svn path=/trunk/; revision=52848
Jeff Morriss [Fri, 25 Oct 2013 15:00:00 +0000 (15:00 -0000)]
Fix CID 715143: assert that the preference we were looking for was found. It
should be which is why this is an assertion not a NULL check.
svn path=/trunk/; revision=52847
Jeff Morriss [Fri, 25 Oct 2013 14:57:55 +0000 (14:57 -0000)]
Fix CID 715144: assert that the preference we were looking for was found. It
should be which is why this is an assertion not a NULL check.
svn path=/trunk/; revision=52846
Jeff Morriss [Fri, 25 Oct 2013 14:41:12 +0000 (14:41 -0000)]
Kafka's CRC is 4 bytes long and is added with ENC_BIG_ENDIAN. Make the hf
FT_UINT32 instead of FT_BYTES to match.
svn path=/trunk/; revision=52845
Jeff Morriss [Fri, 25 Oct 2013 14:38:39 +0000 (14:38 -0000)]
Fix CID
1080758: be prepared for tvb_child_uncompress() failing (and returning
NULL).
svn path=/trunk/; revision=52844
Jeff Morriss [Fri, 25 Oct 2013 14:15:28 +0000 (14:15 -0000)]
Fix CID 280081: ENC_NULL can't be used as an array index into ciphers[], rather
ENC_NULL-0x30 needs to be used.
(This could probably use some cleanup...)
svn path=/trunk/; revision=52843
Jeff Morriss [Fri, 25 Oct 2013 14:04:22 +0000 (14:04 -0000)]
Fix CID
1111806: it's not safe to check if "tag < sizeof(tag_to_type)" before
accessing tag_to_type[tag]: while the array is made of enums and the values of
the enum will fit in a guint8 (making the conditional safe) compilers don't
*have* to "right size" the storage for the enum. They very well could be lazy
and store the enum in int's.
Replace it with a macro that tells us the size of the array.
svn path=/trunk/; revision=52842
Michael Mann [Fri, 25 Oct 2013 13:37:10 +0000 (13:37 -0000)]
Make sure "mp2t-dsmcc" dissector is registered by name so it can be picked up by etv dissector.
svn path=/trunk/; revision=52841
Jeff Morriss [Fri, 25 Oct 2013 13:24:29 +0000 (13:24 -0000)]
Fix checkAPIs: don't add hf_zbee_beacon_protocol with
proto_tree_add_uint(..., ENC_NA); use proto_tree_add_item() as it appears
was intended.
svn path=/trunk/; revision=52840
Jeff Morriss [Fri, 25 Oct 2013 13:23:17 +0000 (13:23 -0000)]
Fix CID
1111814: segment_item is set but not used (in one conditional).
Move a URL from in the middle of the copyright notice to up where it (appears
to) belong.
svn path=/trunk/; revision=52839
Chris Maynard [Fri, 25 Oct 2013 12:51:16 +0000 (12:51 -0000)]
Display the frame number on the packet summary line if it's one of the configured columns. Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9317
#BACKPORT(1.10,1.8)
svn path=/trunk/; revision=52838
Michael Mann [Fri, 25 Oct 2013 02:41:47 +0000 (02:41 -0000)]
Improvements for the KDSP dissector. Bug 8891 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8891)
From Yuri Schaeffer
svn path=/trunk/; revision=52837
Michael Mann [Fri, 25 Oct 2013 02:02:02 +0000 (02:02 -0000)]
Pass ieee802154_packet data into the heuristic check instead of using private_data.
svn path=/trunk/; revision=52836
Michael Mann [Fri, 25 Oct 2013 01:54:53 +0000 (01:54 -0000)]
Make TAPA dissector heuristic instead of "ugly hack" now that IP dissector supports heuristics.
IP heuristics pass in IP header to help subdissectors decide what to do.
svn path=/trunk/; revision=52835
Jeff Morriss [Fri, 25 Oct 2013 01:25:23 +0000 (01:25 -0000)]
Fix more SVN properties.
svn path=/trunk/; revision=52834
Jeff Morriss [Fri, 25 Oct 2013 01:25:00 +0000 (01:25 -0000)]
Handle *.rtf and *.qm files.
svn path=/trunk/; revision=52833
Jeff Morriss [Fri, 25 Oct 2013 00:56:17 +0000 (00:56 -0000)]
Add SVN properties.
svn path=/trunk/; revision=52832
Evan Huus [Fri, 25 Oct 2013 00:08:07 +0000 (00:08 -0000)]
Mark unused parameter, remove moved .h file from Makefile.common
svn path=/trunk/; revision=52831
Michael Mann [Thu, 24 Oct 2013 23:59:47 +0000 (23:59 -0000)]
AIM doesn't ever use it's private_data structure, so remove it. If it ever does, just pass the data into the subdissectors.
svn path=/trunk/; revision=52830
Jörg Mayer [Thu, 24 Oct 2013 23:52:58 +0000 (23:52 -0000)]
Fix properties
svn path=/trunk/; revision=52829
Jörg Mayer [Thu, 24 Oct 2013 23:47:30 +0000 (23:47 -0000)]
Make things compile again.
svn path=/trunk/; revision=52828
Michael Mann [Thu, 24 Oct 2013 23:40:58 +0000 (23:40 -0000)]
Have ZigBee dissectors pass data through subdissector parameter instead of using struct _packet_info.
svn path=/trunk/; revision=52827
Gerald Combs [Thu, 24 Oct 2013 23:11:09 +0000 (23:11 -0000)]
Add sequence_dialog.ui.
svn path=/trunk/; revision=52826
Gerald Combs [Thu, 24 Oct 2013 23:01:30 +0000 (23:01 -0000)]
Add a missing dependency.
svn path=/trunk/; revision=52825
Gerald Combs [Thu, 24 Oct 2013 22:52:30 +0000 (22:52 -0000)]
Initial and woefully incomplete flow graph support.
Copy common code from ui/gtk/flow_graph.c and ui/gtk/graph_analysis.[ch]
to ui/tap-sequence-analysis.[ch]. Start using the name "sequence" in
places.
svn path=/trunk/; revision=52824
Pascal Quantin [Thu, 24 Oct 2013 21:11:00 +0000 (21:11 -0000)]
Fix copy paste errors
svn path=/trunk/; revision=52823
Martin Kaiser [Thu, 24 Oct 2013 20:59:32 +0000 (20:59 -0000)]
fix offset calculation
highlight the correct payload bytes for unknown sub-descriptors
svn path=/trunk/; revision=52822
Jeff Morriss [Thu, 24 Oct 2013 20:52:00 +0000 (20:52 -0000)]
Finish implementing https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7263 :
Change cflow.sysuptime from an FT_UINT32 (milliseconds since the router booted)
to an FT_RELATIVE_TIME (seconds since the router booted). I don't imagine
anyone will care if we show them seconds or milliseconds and it satisfy the
user's request (in that bug) to compare cflow.sysuptime to cflow.timeend (which
is already an FT_RELATIVE_TIME).
(If someone does care, we could always display the field twice, once in
milliseconds and once in seconds.)
svn path=/trunk/; revision=52821
Jörg Mayer [Thu, 24 Oct 2013 20:35:53 +0000 (20:35 -0000)]
CID 700176: Dereference null return value (NULL_RETURNS)
Not sure whether this is really possible, but add a dissector_assert
just to be safe.
svn path=/trunk/; revision=52820
Gerald Combs [Thu, 24 Oct 2013 17:24:07 +0000 (17:24 -0000)]
Confirm the license as well.
svn path=/trunk/; revision=52819
Gerald Combs [Thu, 24 Oct 2013 17:23:13 +0000 (17:23 -0000)]
Enable QtMultimedia. We'll need it for VoIP playback at some point.
(The current Qt packages in wireshark-win{32,64}-libs still have
QtMultimedia disabled. This will hopefully make sure it's enabled next
time around.)
svn path=/trunk/; revision=52818
Anders Broman [Thu, 24 Oct 2013 16:50:14 +0000 (16:50 -0000)]
Add a command code.
svn path=/trunk/; revision=52817
Anders Broman [Thu, 24 Oct 2013 16:41:04 +0000 (16:41 -0000)]
From Zoltán Lajos Kis:
dissect echo messages.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9283
svn path=/trunk/; revision=52816
Michael Mann [Thu, 24 Oct 2013 15:04:38 +0000 (15:04 -0000)]
Remove need for match_port #define in packet_info.h and just replace existing calls.
svn path=/trunk/; revision=52815
Michael Tüxen [Thu, 24 Oct 2013 14:32:22 +0000 (14:32 -0000)]
Revert previous commit of Irene, which doesn't work (yet).
svn path=/trunk/; revision=52814
Evan Huus [Thu, 24 Oct 2013 12:41:27 +0000 (12:41 -0000)]
From Michal Labedzki via
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8818
Add correct license headers, $Id$ fields and modelines to the common dwarf
files.
svn path=/trunk/; revision=52813
Irene Rüngeler [Thu, 24 Oct 2013 09:36:33 +0000 (09:36 -0000)]
Move sctp_stat to ui to make it independent from gtk.
svn path=/trunk/; revision=52812
Anders Broman [Thu, 24 Oct 2013 04:04:14 +0000 (04:04 -0000)]
Pascal:s patch from 52759 is needed here too.
curr-num_layer is not always incremented by 1 when calling the subdissector.
svn path=/trunk/; revision=52811
Michael Mann [Thu, 24 Oct 2013 01:26:30 +0000 (01:26 -0000)]
Remove ipxptype from struct _packet_info and pass it into subdissectors through ipxhdr_t structure.
svn path=/trunk/; revision=52810
Michael Mann [Thu, 24 Oct 2013 00:32:52 +0000 (00:32 -0000)]
Minor cleanup.
svn path=/trunk/; revision=52809
Michael Mann [Thu, 24 Oct 2013 00:30:14 +0000 (00:30 -0000)]
Make WiMax CDMA Code Attribute its own protocol with it's own filter.
svn path=/trunk/; revision=52808
Michael Mann [Thu, 24 Oct 2013 00:26:57 +0000 (00:26 -0000)]
Create a single array of ett_ variables, instead of individual etts + array of pointers.
Other minor cleanup.
svn path=/trunk/; revision=52807
Michael Mann [Thu, 24 Oct 2013 00:17:58 +0000 (00:17 -0000)]
Remove profinet_conv member of struct _packet_info and turn it into proto_data.
svn path=/trunk/; revision=52806
Martin Kaiser [Wed, 23 Oct 2013 21:22:14 +0000 (21:22 -0000)]
initialize DSM-CC over TCP and over MPEG2-TS in the same way
svn path=/trunk/; revision=52805
Martin Kaiser [Wed, 23 Oct 2013 21:20:41 +0000 (21:20 -0000)]
support DSM-CC over TCP
dissect some DSM-CC user-to-network messages related to session
management
svn path=/trunk/; revision=52804
Anders Broman [Wed, 23 Oct 2013 20:54:17 +0000 (20:54 -0000)]
Fix warnings.
svn path=/trunk/; revision=52803
Chris Maynard [Wed, 23 Oct 2013 17:47:47 +0000 (17:47 -0000)]
Provide a usage example of the column formats.
svn path=/trunk/; revision=52802
Evan Huus [Wed, 23 Oct 2013 17:22:54 +0000 (17:22 -0000)]
Add an X11/MIT license to asn2wrs.py as it's compatible with our license, that's
what the original base code was, and Tomas (who made most of the
wireshark-specific changes) has no particular preference.
svn path=/trunk/; revision=52801
Evan Huus [Wed, 23 Oct 2013 17:10:25 +0000 (17:10 -0000)]
Fix the last of the 32/64 conversion errors and re-enable ELF dissection.
Actually tested on 32-bit XP vm, so should really work this time.
svn path=/trunk/; revision=52800
Bill Meier [Wed, 23 Oct 2013 16:59:34 +0000 (16:59 -0000)]
Fix (using '#if 0') a few more [-Wunused-const-variable] warnings
svn path=/trunk/; revision=52799
Michael Mann [Wed, 23 Oct 2013 16:47:02 +0000 (16:47 -0000)]
Add Lua cleanup on shutdown, to help with memory leak detection. Bug 5575 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5575)
From Robert G. Jakabosky
From me: cleanup so that it applies to trunk.
svn path=/trunk/; revision=52798
Michael Mann [Wed, 23 Oct 2013 16:25:26 +0000 (16:25 -0000)]
Make option tag and length filterable and part of a subtree, which simplifies the switch statement handling.
Add modelines.
svn path=/trunk/; revision=52797
Jeff Morriss [Wed, 23 Oct 2013 16:23:54 +0000 (16:23 -0000)]
Remove trailing spaces from hf name values (to satisfy checkAPIs).
svn path=/trunk/; revision=52796
Anders Broman [Wed, 23 Oct 2013 15:55:06 +0000 (15:55 -0000)]
Add a few command codes.
svn path=/trunk/; revision=52795
Bill Meier [Wed, 23 Oct 2013 15:53:31 +0000 (15:53 -0000)]
Fix (using '#if 0') various [-Wunused-const-variable] warnings
svn path=/trunk/; revision=52794
Michael Mann [Wed, 23 Oct 2013 15:31:48 +0000 (15:31 -0000)]
Bugfix "Restart the running live capture" when using multiple files makes a long filename. Bug 2274 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2274)
Yes this solution leaks memory, but I think the handful of bytes leaked is worth fixing this nuisance. Won't backport until leak is fixed though.
svn path=/trunk/; revision=52793
Jeff Morriss [Wed, 23 Oct 2013 14:41:30 +0000 (14:41 -0000)]
As suggested by Michael in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4605 :
Add a tooltip to tell users they can click to see the other IP addresses for
the selected interface.
svn path=/trunk/; revision=52792
Michael Mann [Wed, 23 Oct 2013 14:41:07 +0000 (14:41 -0000)]
The interpretation of Max Power Constraint in VHT TPE is incorrect. Bug 8939 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8939).
From chaitanya
svn path=/trunk/; revision=52791
Michael Mann [Wed, 23 Oct 2013 14:24:17 +0000 (14:24 -0000)]
Add the ability to collapse subtrees with Shift+Left + additional menu items. Bug 9008 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9008).
Currently this is only for GTK, but allows users to test it to see if its worth adding to Qt (my personal opinion is yes).
From Jiří Engelthaler
svn path=/trunk/; revision=52790
Anders Broman [Wed, 23 Oct 2013 14:19:28 +0000 (14:19 -0000)]
From Michal Labedzki:
Fix offset values
Still some warnings remaining.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8818
svn path=/trunk/; revision=52789
Anders Broman [Wed, 23 Oct 2013 14:08:56 +0000 (14:08 -0000)]
From Zoltán Lajos Kis:
dissect hello messages
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9283
svn path=/trunk/; revision=52788
Anders Broman [Wed, 23 Oct 2013 14:04:19 +0000 (14:04 -0000)]
g_slist_free_full() is glib 2.28
Fix spelling.
svn path=/trunk/; revision=52787
Anders Broman [Wed, 23 Oct 2013 12:02:15 +0000 (12:02 -0000)]
Make manual address resolution work again by putting the addresses
in a separate list and add that list when address resolution is rebuilt
during rescan of packets.
svn path=/trunk/; revision=52785
Balint Reczey [Wed, 23 Oct 2013 09:53:21 +0000 (09:53 -0000)]
Remove unused wsicon32.xpm
svn path=/trunk/; revision=52784
Anders Broman [Wed, 23 Oct 2013 08:54:30 +0000 (08:54 -0000)]
epan/dissectors/Makefile.common:218: error: comment following trailing backslash
svn path=/trunk/; revision=52783
Guy Harris [Wed, 23 Oct 2013 08:07:28 +0000 (08:07 -0000)]
Pass -sdk, not that it actually *works*.
svn path=/trunk/; revision=52782
Anders Broman [Wed, 23 Oct 2013 08:02:16 +0000 (08:02 -0000)]
Exclude file-elf.c untill the following warningd´s are fixed.
I'm not sure of the correct way of fixing them.
file-elf.c(642) : error C2220: warning treated as error - no 'object' file generated
file-elf.c(642) : warning C4244: '=' : conversion from 'guint64' to 'gint', possible loss of data
file-elf.c(644) : warning C4244: 'function' : conversion from 'guint64' to 'const gint', possible loss of data
file-elf.c(715) : warning C4244: 'function' : conversion from 'guint64' to 'const guint32', possible loss of data
file-elf.c(729) : warning C4244: 'function' : conversion from 'guint64' to 'const guint32', possible loss of data
file-elf.c(752) : warning C4244: 'function' : conversion from 'guint64' to 'const gint', possible loss of data
file-elf.c(917) : warning C4244: 'function' : conversion from 'guint64' to 'gint', possible loss of data
file-elf.c(967) : warning C4244: 'function' : conversion from 'guint64' to 'gint', possible loss of data
file-elf.c(1013) : warning C4244: 'function' : conversion from 'guint64' to 'gint', possible loss of data
file-elf.c(1015) : warning C4244: '+=' : conversion from 'guint64' to 'gint', possible loss of data
file-elf.c(1018) : warning C4244: 'function' : conversion from 'guint64' to 'gint', possible loss of data
file-elf.c(1019) : warning C4244: '+=' : conversion from 'guint64' to 'gint', possible loss of data
file-elf.c(1021) : warning C4244: 'function' : conversion from 'guint64' to 'gint', possible loss of data
file-elf.c(1036) : warning C4244: 'function' : conversion from 'guint64' to 'gint', possible loss of data
file-elf.c(1069) : warning C4244: 'function' : conversion from 'guint64' to 'gint', possible loss of data
file-elf.c(1071) : warning C4244: '+=' : conversion from 'guint64' to 'gint', possible loss of data
file-elf.c(1074) : warning C4244: 'function' : conversion from 'guint64' to 'gint', possible loss of data
file-elf.c(1075) : warning C4244: '+=' : conversion from 'guint64' to 'gint', possible loss of data
file-elf.c(1253) : warning C4244: 'function' : conversion from 'guint64' to 'gint', possible loss of data
file-elf.c(1257) : warning C4244: 'function' : conversion from 'guint64' to 'gint', possible loss of data
file-elf.c(1285) : warning C4244: '=' : conversion from 'guint64' to 'gint', possible loss of data
file-elf.c(1381) : warning C4244: 'function' : conversion from 'guint64' to 'gint', possible loss of data
file-elf.c(1381) : warning C4244: 'function' : conversion from 'guint64' to 'gint', possible loss of data
file-elf.c(1394) : warning C4244: '=' : conversion from 'guint64' to 'gint', possible loss of data
file-elf.c(1411) : warning C4244: 'function' : conversion from 'guint64' to 'const gint', possible loss of data
file-elf.c(1411) : warning C4244: 'function' : conversion from 'guint64' to 'const gint', possible loss of data
file-elf.c(1414) : warning C4244: 'function' : conversion from 'guint64' to 'const gint', possible loss of data
file-elf.c(1414) : warning C4244: 'function' : conversion from 'guint64' to 'const gint', possible loss of data
file-elf.c(1417) : warning C4244: 'function' : conversion from 'guint64' to 'const gint', possible loss of data
file-elf.c(1453) : warning C4244: '=' : conversion from 'guint64' to 'gint', possible loss of data
file-elf.c(1486) : warning C4244: 'function' : conversion from 'guint64' to 'const gint', possible loss of data
file-elf.c(1486) : warning C4244: 'function' : conversion from 'guint64' to 'const gint', possible loss of data
file-elf.c(1489) : warning C4244: 'function' : conversion from 'guint64' to 'const gint', possible loss of data
file-elf.c(1489) : warning C4244: 'function' : conversion from 'guint64' to 'const gint', possible loss of data
file-elf.c(1492) : warning C4244: 'function' : conversion from 'guint64' to 'const gint', possible loss of data
file-elf.c(1581) : warning C4244: 'function' : conversion from 'guint64' to 'gint', possible loss of data
file-elf.c(1581) : warning C4244: 'function' : conversion from 'guint64' to 'gint', possible loss of data
file-elf.c(1586) : warning C4244: 'function' : conversion from 'guint64' to 'gint', possible loss of data
file-elf.c(1586) : warning C4244: 'function' : conversion from 'guint64' to 'gint', possible loss of data
file-elf.c(1592) : warning C4244: 'function' : conversion from 'guint64' to 'gint', possible loss of data
file-elf.c(1592) : warning C4244: 'function' : conversion from 'guint64' to 'gint', possible loss of data
file-elf.c(1598) : warning C4244: '=' : conversion from 'guint64' to 'gint', possible loss of data
file-elf.c(1601) : warning C4244: 'function' : conversion from 'guint64' to 'gint', possible loss of data
file-elf.c(1612) : warning C4244: '=' : conversion from 'guint64' to 'gint', possible loss of data
file-elf.c(1615) : warning C4244: 'function' : conversion from 'guint64' to 'gint', possible loss of data
file-elf.c(1626) : warning C4244: '=' : conversion from 'guint64' to 'gint', possible loss of data
file-elf.c(1637) : warning C4244: '=' : conversion from 'guint64' to 'gint', possible loss of data
file-elf.c(1640) : warning C4244: 'function' : conversion from 'guint64' to 'gint', possible loss of data
file-elf.c(1641) : warning C4244: '+=' : conversion from 'guint64' to 'gint', possible loss of data
file-elf.c(1680) : warning C4244: 'function' : conversion from 'guint64' to 'gint', possible loss of data
file-elf.c(1686) : warning C4244: 'function' : conversion from 'guint64' to 'gint', possible loss of data
file-elf.c(1698) : warning C4244: 'function' : conversion from 'guint64' to 'gint', possible loss of data
svn path=/trunk/; revision=52781
Bill Meier [Wed, 23 Oct 2013 06:29:11 +0000 (06:29 -0000)]
#if 0 numerous "unused const variables" (mostly value-string-arrays);
Also; fix a few "set but not used" warnings.
svn path=/trunk/; revision=52780
Evan Huus [Wed, 23 Oct 2013 01:56:52 +0000 (01:56 -0000)]
Add explicit 64/32 casts missing from r52775.
svn path=/trunk/; revision=52779
Evan Huus [Wed, 23 Oct 2013 01:47:55 +0000 (01:47 -0000)]
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
Guy Harris [Wed, 23 Oct 2013 01:40:33 +0000 (01:40 -0000)]
Default to GTK+ 3, not Qt, for now.
svn path=/trunk/; revision=52777
Guy Harris [Wed, 23 Oct 2013 01:39:54 +0000 (01:39 -0000)]
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
Evan Huus [Wed, 23 Oct 2013 01:36:49 +0000 (01:36 -0000)]
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
Michael Mann [Tue, 22 Oct 2013 23:30:26 +0000 (23:30 -0000)]
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
Balint Reczey [Tue, 22 Oct 2013 22:33:05 +0000 (22:33 -0000)]
Generate wsicon32.xpm during building Debian package
svn path=/trunk/; revision=52773
Balint Reczey [Tue, 22 Oct 2013 22:32:55 +0000 (22:32 -0000)]
Revert "Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9209 :"
This reverts commit r52441.
svn path=/trunk/; revision=52772
Michael Mann [Tue, 22 Oct 2013 17:41:06 +0000 (17:41 -0000)]
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
Martin Mathieson [Tue, 22 Oct 2013 16:52:45 +0000 (16:52 -0000)]
Handle long gaps between PDUs by resetting timers, and show short-cycle-timer as part of state
svn path=/trunk/; revision=52770
Gerald Combs [Tue, 22 Oct 2013 16:48:04 +0000 (16:48 -0000)]
Add information about building Qt.
svn path=/trunk/; revision=52769
Evan Huus [Tue, 22 Oct 2013 16:29:10 +0000 (16:29 -0000)]
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
Bill Meier [Tue, 22 Oct 2013 16:13:32 +0000 (16:13 -0000)]
Remove instances of unused 'data_handle' (and of one other handle).
svn path=/trunk/; revision=52767
Evan Huus [Tue, 22 Oct 2013 16:02:13 +0000 (16:02 -0000)]
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
Martin Mathieson [Tue, 22 Oct 2013 15:56:14 +0000 (15:56 -0000)]
Show state of other DRX timers, and update some comments.
svn path=/trunk/; revision=52765
Evan Huus [Tue, 22 Oct 2013 15:49:32 +0000 (15:49 -0000)]
Revert r52730, it is unnecessary with r52695 reverted.
svn path=/trunk/; revision=52764
Anders Broman [Tue, 22 Oct 2013 14:54:54 +0000 (14:54 -0000)]
Revert 52695.
svn path=/trunk/; revision=52763
Michael Mann [Tue, 22 Oct 2013 14:52:28 +0000 (14:52 -0000)]
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
Bill Meier [Tue, 22 Oct 2013 14:27:48 +0000 (14:27 -0000)]
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
Michael Mann [Tue, 22 Oct 2013 14:12:20 +0000 (14:12 -0000)]
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
Pascal Quantin [Tue, 22 Oct 2013 13:51:21 +0000 (13:51 -0000)]
curr-num_layer is not always incremented by 1 when calling the subdissector
svn path=/trunk/; revision=52759
Jeff Morriss [Tue, 22 Oct 2013 13:27:31 +0000 (13:27 -0000)]
set SVN properties.
svn path=/trunk/; revision=52758
Pascal Quantin [Tue, 22 Oct 2013 11:12:41 +0000 (11:12 -0000)]
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
Irene Rüngeler [Tue, 22 Oct 2013 10:36:12 +0000 (10:36 -0000)]
Use the preferred or default linktype as active.
svn path=/trunk/; revision=52756
Michael Mann [Tue, 22 Oct 2013 02:37:49 +0000 (02:37 -0000)]
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
Michael Mann [Tue, 22 Oct 2013 02:29:12 +0000 (02:29 -0000)]
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