Commit Graph

47043 Commits

Author SHA1 Message Date
Evan Huus 602cf9cd4e Split README.developer into two: README.developer and README.dissector. All the
documentation specific to dissectors should now live in README.dissector - what
remains in README.developer should be useful to anybody coding on Wireshark
regardless of if you're working on the GUI, wiretap, dissectors, etc.

This first pass I did a fairly dumb split of copy-pasting relevant chunks from
one file to the other. There are probably fragments that aren't in the right
file anymore, so cleanup welcome.

svn path=/trunk/; revision=50092
2013-06-20 22:46:08 +00:00
Martin Kaiser 369658c499 inform expert info layer about the current number of packet comments
when the last comment is removed and we have no other expert info,
the maximum severity is changed from comment to none

svn path=/trunk/; revision=50091
2013-06-20 22:25:33 +00:00
Pascal Quantin d7856ef304 Fix bug https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8829 :
Prevent an out of bounds access in 802.11 Radiotap dissector

svn path=/trunk/; revision=50090
2013-06-20 22:21:24 +00:00
Evan Huus 176be6b481 From Fabio Tarabelloni via
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8718

Zigbee partition cluster dissector.

svn path=/trunk/; revision=50089
2013-06-20 21:52:22 +00:00
Alexis La Goutte 2b3b994b01 Fix indent (use Tabs)
svn path=/trunk/; revision=50088
2013-06-20 21:10:23 +00:00
Alexis La Goutte 874ff29b40 Fix warning about CPUInfo in Linux (when use qmake to build qtshark)
../../version_info.c: In function 'get_cpu_info':
../../version_info.c:662:5: warning: pointer targets in passing argument 1 of 'do_cpuid' differ in signedness [-Wpointer-sign]
../../version_info.c:622:1: note: expected 'guint32 *' but argument is of type 'int *'
../../version_info.c:670:5: warning: pointer targets in passing argument 1 of 'do_cpuid' differ in signedness [-Wpointer-sign]
../../version_info.c:622:1: note: expected 'guint32 *' but argument is of type 'int *'
../../version_info.c:672:5: warning: pointer targets in passing argument 1 of 'do_cpuid' differ in signedness [-Wpointer-sign]
../../version_info.c:622:1: note: expected 'guint32 *' but argument is of type 'int *'
../../version_info.c:674:5: warning: pointer targets in passing argument 1 of 'do_cpuid' differ in signedness [-Wpointer-sign]
../../version_info.c:622:1: note: expected 'guint32 *' but argument is of type 'int *'

svn path=/trunk/; revision=50087
2013-06-20 21:10:18 +00:00
Evan Huus e6a902eb76 From Fabio Tarabelloni via
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8718

New zigbee cluster dissectors added for Basic and Identify clusters.

svn path=/trunk/; revision=50086
2013-06-20 20:24:51 +00:00
Alexis La Goutte 8e4e4a3d76 From report of Alexander Okonnikov and Patch of Matt Texier via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8802 Incorrect decoding of Layer2 Info Extended Community
Within BGP Update message for BGP VPLS (RFC 4761) some parts of Extended Community "Layer2 Info" are incorrectly decoded:

1. Encapsulation - Unknown (0x13). Per RFC 4761 encap type 0x13 is "VPLS" (clause 3.2.4);

2. Control Flags - per RFC 4761 (clause 3.2.4) two least-significant bits (6 and 7) are defined as:
"C" (bit 6, Control Word): value 1 - Control Word is required - and value 0 - Control Word is not required; decoding is correct (at least for value 0);
"S" (bit 7, Sequence delivery): value 1 - Sequence delivery is required - and value 0 - Sequence delivery is not required; decoding is incorrect, because for value 0 (sequence delivery is not required) you provide description that "Sequence delivery  is required".

Also, there is description (at the same string) "F Flag (reserved) set. IETF document draft-ietf-l2vpn-vpls-multihoming (clause 3.3.1) updates RFC 4761 and defines two additional bits within Control Flags byte - D (bit 0, "Down") and F (bit 2, "Flush"). You provide description that "F Flag (reserved) set" when this flag actually is not set (value 0). Furthermore, you don't provide description about status of flag D (in attached dump in the first packet flag D is set and unset in the second packet).

svn path=/trunk/; revision=50085
2013-06-20 20:17:25 +00:00
Alexis La Goutte 0a249bf647 Fix errors found by fix-encoding-args script
epan/dissectors/packet-dhcpv6.c:  FT_IPv6:          proto_tree_add_item(pkt_s_tree, hf_packetcable_cccV6_prov_srv_ipv6, tvb, suboptoff+1, 4, [[ENC_BIG_ENDIAN]-->[ENC_NA]]);
epan/dissectors/packet-dhcpv6.c:  FT_BYTES:         proto_tree_add_item(subtree2, hf_capabilities_encoding_bytes, tvb, tlv5_cap_index, tlv5_cap_len, [[ENC_BIG_ENDIAN]-->[ENC_NA]]);

svn path=/trunk/; revision=50084
2013-06-20 20:17:21 +00:00
Martin Mathieson 64e15853fc Fix for bug 8826.
The global variable 'address_item' was not always being set to NULL
before the dissection of a new frame.  Do more to set it in the general
case, and in the particular case of an MTSBindResult_PDU, which was
triggering an error in the supplied capture.

There may be other entry points where this still safely isn't being
set.

svn path=/trunk/; revision=50083
2013-06-20 18:54:58 +00:00
Alexis La Goutte dc82f1cc93 Fix packet-dhcpv6.c: In function 'dhcpv6_option': packet-dhcpv6.c:1826:36: error: 'ti' may be used uninitialized in this function [-Werror=maybe-uninitialized]
svn path=/trunk/; revision=50082
2013-06-20 18:32:18 +00:00
Gerald Combs 879d865039 Sort the encapsulation type combo box similar to the GTK change in r50077.
svn path=/trunk/; revision=50081
2013-06-20 18:07:54 +00:00
Evan Huus 6c65dd2b30 Add a few of our headers to code generated by pycrc (their faq says we can do
basically whatever we want with it, and this cleans up a couple of licensecheck
errors).

Fix FSF address in one dissector.

svn path=/trunk/; revision=50080
2013-06-20 16:54:13 +00:00
Evan Huus 2dab2c8102 Fix file_import_dlg.c:132: warning: useless storage class specifier in empty
declaration

I guess anonymous enums can't be static?

svn path=/trunk/; revision=50079
2013-06-20 16:44:46 +00:00
Evan Huus 1a5b5a331c From Fabio Tarabelloni via
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8718

Move zbee-on-off to zbee-general in preparation to avoid an enormous number of
small files when adding dissection for more zbee cluster types.

svn path=/trunk/; revision=50078
2013-06-20 16:42:17 +00:00
Chris Maynard 9229a5eeb3 Sort the list of encapsulation types, but still have Ethernet be the default.
svn path=/trunk/; revision=50077
2013-06-20 16:40:46 +00:00
Evan Huus 5d53d63cd7 From Michal Labedzki via
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8824

Convert bluetooth emem trees to wmem trees.
Add modelines and fix indentation.
Correct typo in wmem_tree.h that still referred to emem.

svn path=/trunk/; revision=50076
2013-06-20 16:31:53 +00:00
Evan Huus 612d14c883 From Brian Otte via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8592
Numerous fixes and improvements to DHCPv6 Cable Television Labs vendor-specific
information dissection.

svn path=/trunk/; revision=50075
2013-06-20 16:22:53 +00:00
Evan Huus 7c8530539c Ldap still needs to include wmem.h since it uses wmem during normal dissection,
just not for UAT purposes.

svn path=/trunk/; revision=50074
2013-06-20 14:01:54 +00:00
Evan Huus d63bd5330f Back out some of the wmem conversions (r50063 and r50057).
These dissectors allocate ephemeral or seasonal memory in UAT callbacks, which
really makes no sense because UAT callbacks can occur when there is no packet or
file in scope, making this effectively a leak if the user is fiddling with their
UAT and never opens a capture.

Emem let you get away with this, wmem forces an assertion. Back out the changes
so that the UATs are usable until the code can be properly fixed to not use
out-of-scope allocators.

svn path=/trunk/; revision=50073
2013-06-20 06:26:03 +00:00
Guy Harris 4c506222d9 Don't assume $(uname) works; it's not a standard Bourne shell feature,
and we only assume a Bourne-compatible shell.

It's "OS X", not "OsX".

svn path=/trunk/; revision=50072
2013-06-20 00:27:52 +00:00
Evan Huus 0d3718b467 Add some missing wmem includes that apparently only show up on Windows.
svn path=/trunk/; revision=50071
2013-06-19 23:53:25 +00:00
Evan Huus c0fda177b6 From Dirk J via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8821
if no make options are given to the macosx-setup.sh script by the user, the
script sets the number of parallel make jobs to 1.5x CPU cores.

Bonus enhancement: print the "export PKG_CONFIG_PATH" information in autogen.sh
on OsX, so people don't have to remember it.

svn path=/trunk/; revision=50070
2013-06-19 23:52:54 +00:00
Martin Kaiser 88a4c49bf7 update the button in the status bar when a packet comment is added
(this is a quick fix, the case when the last comment is removed
 is still not handled correctly)

svn path=/trunk/; revision=50069
2013-06-19 23:37:38 +00:00
Evan Huus 3a614b161f Based on patch from gyanesh via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8268
Clarify display of the overload bit in multi-topology supported TLV for SPB.

svn path=/trunk/; revision=50068
2013-06-19 23:30:29 +00:00
Martin Mathieson 8411a601df Implement bug 8675: show stream id in follow TCP stream window.
svn path=/trunk/; revision=50067
2013-06-19 23:27:12 +00:00
Evan Huus 8b0f1addd9 Apparently one of our major global headers must include emem.h, because I just
found a bunch more asn1 dissectors using emem without ever directly including
the header. Convert those to wmem as well, which involves add a number of
#include directives since dissectors do *not* automatically pull in the wmem
headers.

svn path=/trunk/; revision=50066
2013-06-19 23:08:58 +00:00
Graham Bloice e6e7c1181b From Orgad Shaneh via bug 8308 - allow a relative path for the WIRESHARK_LIBS location.
svn path=/trunk/; revision=50065
2013-06-19 23:06:14 +00:00
Martin Mathieson 21a682ea24 Fix for bug 6090. Clear the list store when resetting the dialog.
svn path=/trunk/; revision=50064
2013-06-19 22:57:39 +00:00
Evan Huus b1e12ec925 Convert the rest of the ASN1 dissectors from emem to wmem.
svn path=/trunk/; revision=50063
2013-06-19 22:47:36 +00:00
Jeff Morriss 8e7abd9871 From Anders:
Check Header CRC of SYNC protocol.

svn path=/trunk/; revision=50062
2013-06-19 22:28:58 +00:00
Martin Kaiser 52f1140931 support extended size boxes, 2nd attempt
put up an expert info if the extended size does not fit into a gint

svn path=/trunk/; revision=50061
2013-06-19 22:26:12 +00:00
Pascal Quantin 014e2deec6 Add export of SS7 OPC/DPC
svn path=/trunk/; revision=50060
2013-06-19 21:49:12 +00:00
Guy Harris 19d2f6dac4 Fix display of "(correct)"/"(incorrect)" indication for the CRC.
svn path=/trunk/; revision=50058
2013-06-19 21:07:22 +00:00
Evan Huus 9fa4a8e6b6 Convert a batch of asn1 dissectors from emem to wmem.
svn path=/trunk/; revision=50057
2013-06-19 20:43:03 +00:00
Luis Ontanon ab6d043ccc Another iteration
svn path=/trunk/; revision=50056
2013-06-19 20:04:25 +00:00
Jeff Morriss a7bb5e1835 Rework the change from r15595 a bit: when creating a TVB subset, always give
the same captured and reported lengths so that we don't end up throwing
BoundsErrors ("Packet size limited during capture") when the packet is simply
malformed.

This fixes one of the issues reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8816

svn path=/trunk/; revision=50055
2013-06-19 19:31:40 +00:00
Pascal Quantin 6bc8d874fe Preserve summary information when reordering a file
svn path=/trunk/; revision=50054
2013-06-19 19:31:06 +00:00
Chris Maynard 3369a97da7 If the user turns off printing of the packet summary line, disable the column headings checkbox; otherwise, enable it.
svn path=/trunk/; revision=50053
2013-06-19 19:16:35 +00:00
Gerald Combs ba951e1a4d Try to make it more obvious that you can select unselected task list
items.

svn path=/trunk/; revision=50052
2013-06-19 18:48:20 +00:00
Chris Maynard f655e90d8b Remove col_headings_cb from print_cmd_toggle_detail() altogether. It's not needed since if summary isn't printed, neither are column headings anyway.
svn path=/trunk/; revision=50051
2013-06-19 18:44:42 +00:00
Evan Huus 50da1aacf9 Try and keep r50047 and still fix
print_dlg.c:916: warning: value computed is not used

svn path=/trunk/; revision=50050
2013-06-19 18:38:52 +00:00
Jeff Morriss f3dfe6b4df One of the unused hf's commented out in r47389 was not used due to a
cut-n-pasteo.  Fix that cut-n-pasteo and reinstate the hf.

svn path=/trunk/; revision=50049
2013-06-19 18:38:41 +00:00
Jörg Mayer b77119aca7 Remove traling whitespace.
svn path=/trunk/; revision=50048
2013-06-19 18:33:49 +00:00
Jörg Mayer 95a68da158 Fix for
Building C object ui/gtk/CMakeFiles/gtkui.dir/print_dlg.c.o
/home/jmayer/work/wireshark/svn/trunk/ui/gtk/print_dlg.c: In function ‘print_cmd_toggle_detail’:
/home/jmayer/work/wireshark/svn/trunk/ui/gtk/print_dlg.c:910:38: error: variable ‘col_headings_cb’ set but not used [-Werror=unused-but-set-variable]
   GtkWidget *print_bt, *summary_cb, *col_headings_cb, *details_cb;
                                      ^
cc1: all warnings being treated as errors

No idea wether the fix is correct. Compile tested only.

svn path=/trunk/; revision=50047
2013-06-19 18:30:04 +00:00
Evan Huus e13d73e038 Rework wmem scoping limits so that users can still get a handle to a pool when
it is out of scope, they just can't *allocate* in the pool. This is necessary
because file-scope trees (migrating from emem) are set up on program
initialization when there is no file in scope - they need to initialize with the
handle, they just won't use it until a file is actually in scope.

svn path=/trunk/; revision=50046
2013-06-19 18:28:13 +00:00
Jörg Mayer 7670683e3b Explain how to enter a \ in an snmp field.
svn path=/trunk/; revision=50045
2013-06-19 18:20:59 +00:00
Martin Kaiser d8c2f03573 revert the extended size box changes for now,
this needs some more work to make things portable

svn path=/trunk/; revision=50044
2013-06-19 18:10:41 +00:00
Martin Mathieson b49fbad27d Add a couple of missing lines from the usage output.
svn path=/trunk/; revision=50043
2013-06-19 18:06:46 +00:00
Martin Kaiser df74ddb9e3 explicitly use 64bit variables, g(u)int is not 64bit everywhere
svn path=/trunk/; revision=50042
2013-06-19 17:51:59 +00:00