metze/wireshark/wip.git
10 years agoAlphabetically sort in file-mp4.c
Jörg Mayer [Sun, 23 Jun 2013 19:13:25 +0000 (19:13 -0000)]
Alphabetically sort in file-mp4.c

svn path=/trunk/; revision=50121

10 years agoSmall whitespace fixes
Jörg Mayer [Sun, 23 Jun 2013 19:12:50 +0000 (19:12 -0000)]
Small whitespace fixes

svn path=/trunk/; revision=50120

10 years ago[Automatic manuf, services and enterprise-numbers update for 2013-06-23]
Gerald Combs [Sun, 23 Jun 2013 14:03:31 +0000 (14:03 -0000)]
[Automatic manuf, services and enterprise-numbers update for 2013-06-23]

svn path=/trunk/; revision=50117

10 years agoOnly do a tree lookup if we have a tree to look up in.
Evan Huus [Sat, 22 Jun 2013 21:01:03 +0000 (21:01 -0000)]
Only do a tree lookup if we have a tree to look up in.
Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8833

svn path=/trunk/; revision=50116

10 years agoMake assertions in tree lookup more useful and fix formatting.
Evan Huus [Sat, 22 Jun 2013 21:00:36 +0000 (21:00 -0000)]
Make assertions in tree lookup more useful and fix formatting.

Should help debugging https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8833

svn path=/trunk/; revision=50115

10 years agoNot yet running but almost there with the dummy
Luis Ontanon [Sat, 22 Jun 2013 20:26:13 +0000 (20:26 -0000)]
Not yet running  but almost there with the dummy

svn path=/trunk/; revision=50114

10 years agoMore proper fix (per advice of bug 8515 (https://bugs.wireshark.org/bugzilla/show_bug...
Michael Mann [Sat, 22 Jun 2013 15:08:18 +0000 (15:08 -0000)]
More proper fix (per advice of bug 8515 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8515)) of global variables complained about in bug 7060 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7060).  Not sure if algorithm_id of x509af dissector could also be a actx->external.direct_reference, so left it alone.

svn path=/trunk/; revision=50113

10 years agoMake TCP segment length a generated field instead of a hidden field.
Ronnie Sahlberg [Sat, 22 Jun 2013 02:00:03 +0000 (02:00 -0000)]
Make TCP segment length a generated field instead of a hidden field.

We should deprecate the use of hidden fields, at least for fields that arei
useful in filters. To make it easier for users to discover and use the fields.

Change the highly useful field for TCP segment payload length from
being a hidden field to be a generated field instead.

svn path=/trunk/; revision=50112

10 years agoAdd Uli Heilmeier
Michael Mann [Fri, 21 Jun 2013 23:23:08 +0000 (23:23 -0000)]
Add Uli Heilmeier

svn path=/trunk/; revision=50111

10 years agoAF_INET and AF_INET6 undefined in textpcap.c when compiling on FreeBSD
Stephen Fisher [Fri, 21 Jun 2013 22:43:24 +0000 (22:43 -0000)]
AF_INET and AF_INET6 undefined in textpcap.c when compiling on FreeBSD
9.1-RELEASE with non-standard gcc 4.6, so pull in sys/socket.h when available.

svn path=/trunk/; revision=50110

10 years agoCast away another implicit conversion not allowed in C++ warning
Stephen Fisher [Fri, 21 Jun 2013 22:37:40 +0000 (22:37 -0000)]
Cast away another implicit conversion not allowed in C++ warning

svn path=/trunk/; revision=50109

10 years agoCast away some errors of these types:
Stephen Fisher [Fri, 21 Jun 2013 22:01:37 +0000 (22:01 -0000)]
Cast away some errors of these types:

    request for implicit conversion from 'gpointer' to 'char *' not permitted
    in C++ [-Werror=c++-compat]

and

    enum conversion when passing argument 3 of 'krb5_crypto_init' is invalid
    in C++ [-Werror=c++-compat]

svn path=/trunk/; revision=50108

10 years agoSort the man pages. Add capinfos and reordercap. Should we also any others (i.e...
Chris Maynard [Fri, 21 Jun 2013 15:30:08 +0000 (15:30 -0000)]
Sort the man pages.  Add capinfos and reordercap.  Should we also any others (i.e., asn2deb, dftest, idl2deb, idl2wrs, randpkt)?

svn path=/trunk/; revision=50107

10 years agoget_ax25_name() is *NOT* the right routine to use to translate a
Guy Harris [Fri, 21 Jun 2013 05:24:59 +0000 (05:24 -0000)]
get_ax25_name() is *NOT* the right routine to use to translate a
human-readable representing an AX.25 subaddress (e.g. "KA9Q-01") into
the binary form of an AX.25 address, because what it does is translate
the binary form of an AX.25 address to the human-readable form!

We currently have no routine that does the right thing and, even if we
did, given that some bits in the AX.25 subaddress format are used for
purposes other than representing the call sign and substation ID, so the
matching routines for AX.25 addresses need to ignore certain bits.

For now, we just remove the call to get_ax25_name() (which squelches the
pointer-signedness warning that made me look at this code, and find the
problem, in the first place) and replace it with a comment discussing
the problem and a failure.

The other pointer-signedness warning brought up a question of what to do
with G_REGEX_RAW in the g_regex_match_full() call; it didn't bring up an
immediately obvious *answer*, so we throw a cast at the warning and add
another comment.  (We fix up alignment while we're at it.)

svn path=/trunk/; revision=50106

10 years agorename packet-mp4.c to file-mp4.c
Martin Kaiser [Fri, 21 Jun 2013 05:18:45 +0000 (05:18 -0000)]
rename packet-mp4.c to file-mp4.c

svn path=/trunk/; revision=50105

10 years agoFix some pointer-signedness (well, signedness of what the pointer points
Guy Harris [Fri, 21 Jun 2013 02:59:54 +0000 (02:59 -0000)]
Fix some pointer-signedness (well, signedness of what the pointer points
to) warnings.

svn path=/trunk/; revision=50104

10 years agoDelete the moved files
Luis Ontanon [Fri, 21 Jun 2013 01:30:39 +0000 (01:30 -0000)]
Delete the moved files

svn path=/trunk/; revision=50103

10 years agomove echld to final dest...
Luis Ontanon [Fri, 21 Jun 2013 01:27:28 +0000 (01:27 -0000)]
move echld to final dest...

svn path=/trunk/; revision=50102

10 years agoCompiles, still incomplete...
Luis Ontanon [Fri, 21 Jun 2013 01:25:22 +0000 (01:25 -0000)]
Compiles, still incomplete...

svn path=/trunk/; revision=50101

10 years agoOne more fix for the protocol grey highlighting.
Evan Huus [Fri, 21 Jun 2013 00:49:35 +0000 (00:49 -0000)]
One more fix for the protocol grey highlighting.

svn path=/trunk/; revision=50100

10 years agoYet another fix, put spaces in insensitive or normal state.
Jakub Zawadzki [Fri, 21 Jun 2013 00:42:19 +0000 (00:42 -0000)]
Yet another fix, put spaces in insensitive or normal state.

svn path=/trunk/; revision=50099

10 years agofix for r50095 don't fetch parent hfinfo, traverse tree to get top one.
Jakub Zawadzki [Fri, 21 Jun 2013 00:23:55 +0000 (00:23 -0000)]
fix for r50095 don't fetch parent hfinfo, traverse tree to get top one.

svn path=/trunk/; revision=50098

10 years agocreate libfiledissectors.a during the autotools build
Martin Kaiser [Fri, 21 Jun 2013 00:08:20 +0000 (00:08 -0000)]
create libfiledissectors.a during the autotools build

svn path=/trunk/; revision=50097

10 years agoFix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8799 :
Pascal Quantin [Thu, 20 Jun 2013 23:37:16 +0000 (23:37 -0000)]
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8799 :
Display certificate as UINT64 and add support for a 64bits unsigned value in BER dissector

svn path=/trunk/; revision=50096

10 years agoHighlight protocol bytes in grey, idea stolen from qtshark
Jakub Zawadzki [Thu, 20 Jun 2013 23:28:35 +0000 (23:28 -0000)]
Highlight protocol bytes in grey, idea stolen from qtshark

svn path=/trunk/; revision=50095

10 years agoSave and restore private_data pointer instead of freeing the old one, since this
Evan Huus [Thu, 20 Jun 2013 23:27:16 +0000 (23:27 -0000)]
Save and restore private_data pointer instead of freeing the old one, since this
function can be called nestedly. Also use wmem memory so it doesn't leak.

Part of https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8828

svn path=/trunk/; revision=50094

10 years agoRegenerate DAP dissector that was changed in r50073 for some reason
Pascal Quantin [Thu, 20 Jun 2013 23:14:38 +0000 (23:14 -0000)]
Regenerate DAP dissector that was changed in r50073 for some reason

svn path=/trunk/; revision=50093

10 years agoSplit README.developer into two: README.developer and README.dissector. All the
Evan Huus [Thu, 20 Jun 2013 22:46:08 +0000 (22:46 -0000)]
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

10 years agoinform expert info layer about the current number of packet comments
Martin Kaiser [Thu, 20 Jun 2013 22:25:33 +0000 (22:25 -0000)]
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

10 years agoFix bug https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8829 :
Pascal Quantin [Thu, 20 Jun 2013 22:21:24 +0000 (22:21 -0000)]
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

10 years agoFrom Fabio Tarabelloni via
Evan Huus [Thu, 20 Jun 2013 21:52:22 +0000 (21:52 -0000)]
From Fabio Tarabelloni via
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8718

Zigbee partition cluster dissector.

svn path=/trunk/; revision=50089

10 years agoFix indent (use Tabs)
Alexis La Goutte [Thu, 20 Jun 2013 21:10:23 +0000 (21:10 -0000)]
Fix indent (use Tabs)

svn path=/trunk/; revision=50088

10 years agoFix warning about CPUInfo in Linux (when use qmake to build qtshark)
Alexis La Goutte [Thu, 20 Jun 2013 21:10:18 +0000 (21:10 -0000)]
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

10 years agoFrom Fabio Tarabelloni via
Evan Huus [Thu, 20 Jun 2013 20:24:51 +0000 (20:24 -0000)]
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

10 years agoFrom report of Alexander Okonnikov and Patch of Matt Texier via https://bugs.wireshar...
Alexis La Goutte [Thu, 20 Jun 2013 20:17:25 +0000 (20:17 -0000)]
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

10 years agoFix errors found by fix-encoding-args script
Alexis La Goutte [Thu, 20 Jun 2013 20:17:21 +0000 (20:17 -0000)]
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

10 years agoFix for bug 8826.
Martin Mathieson [Thu, 20 Jun 2013 18:54:58 +0000 (18:54 -0000)]
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

10 years agoFix packet-dhcpv6.c: In function 'dhcpv6_option': packet-dhcpv6.c:1826:36: error...
Alexis La Goutte [Thu, 20 Jun 2013 18:32:18 +0000 (18:32 -0000)]
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

10 years agoSort the encapsulation type combo box similar to the GTK change in r50077.
Gerald Combs [Thu, 20 Jun 2013 18:07:54 +0000 (18:07 -0000)]
Sort the encapsulation type combo box similar to the GTK change in r50077.

svn path=/trunk/; revision=50081

10 years agoAdd a few of our headers to code generated by pycrc (their faq says we can do
Evan Huus [Thu, 20 Jun 2013 16:54:13 +0000 (16:54 -0000)]
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

10 years agoFix file_import_dlg.c:132: warning: useless storage class specifier in empty
Evan Huus [Thu, 20 Jun 2013 16:44:46 +0000 (16:44 -0000)]
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

10 years agoFrom Fabio Tarabelloni via
Evan Huus [Thu, 20 Jun 2013 16:42:17 +0000 (16:42 -0000)]
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

10 years agoSort the list of encapsulation types, but still have Ethernet be the default.
Chris Maynard [Thu, 20 Jun 2013 16:40:46 +0000 (16:40 -0000)]
Sort the list of encapsulation types, but still have Ethernet be the default.

svn path=/trunk/; revision=50077

10 years agoFrom Michal Labedzki via
Evan Huus [Thu, 20 Jun 2013 16:31:53 +0000 (16:31 -0000)]
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

10 years agoFrom Brian Otte via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8592
Evan Huus [Thu, 20 Jun 2013 16:22:53 +0000 (16:22 -0000)]
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

10 years agoLdap still needs to include wmem.h since it uses wmem during normal dissection,
Evan Huus [Thu, 20 Jun 2013 14:01:54 +0000 (14:01 -0000)]
Ldap still needs to include wmem.h since it uses wmem during normal dissection,
just not for UAT purposes.

svn path=/trunk/; revision=50074

10 years agoBack out some of the wmem conversions (r50063 and r50057).
Evan Huus [Thu, 20 Jun 2013 06:26:03 +0000 (06:26 -0000)]
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

10 years agoDon't assume $(uname) works; it's not a standard Bourne shell feature,
Guy Harris [Thu, 20 Jun 2013 00:27:52 +0000 (00:27 -0000)]
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

10 years agoAdd some missing wmem includes that apparently only show up on Windows.
Evan Huus [Wed, 19 Jun 2013 23:53:25 +0000 (23:53 -0000)]
Add some missing wmem includes that apparently only show up on Windows.

svn path=/trunk/; revision=50071

10 years agoFrom Dirk J via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8821
Evan Huus [Wed, 19 Jun 2013 23:52:54 +0000 (23:52 -0000)]
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

10 years agoupdate the button in the status bar when a packet comment is added
Martin Kaiser [Wed, 19 Jun 2013 23:37:38 +0000 (23:37 -0000)]
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

10 years agoBased on patch from gyanesh via https://bugs.wireshark.org/bugzilla/show_bug.cgi...
Evan Huus [Wed, 19 Jun 2013 23:30:29 +0000 (23:30 -0000)]
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

10 years agoImplement bug 8675: show stream id in follow TCP stream window.
Martin Mathieson [Wed, 19 Jun 2013 23:27:12 +0000 (23:27 -0000)]
Implement bug 8675: show stream id in follow TCP stream window.

svn path=/trunk/; revision=50067

10 years agoApparently one of our major global headers must include emem.h, because I just
Evan Huus [Wed, 19 Jun 2013 23:08:58 +0000 (23:08 -0000)]
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

10 years agoFrom Orgad Shaneh via bug 8308 - allow a relative path for the WIRESHARK_LIBS location.
Graham Bloice [Wed, 19 Jun 2013 23:06:14 +0000 (23:06 -0000)]
From Orgad Shaneh via bug 8308 - allow a relative path for the WIRESHARK_LIBS location.

svn path=/trunk/; revision=50065

10 years agoFix for bug 6090. Clear the list store when resetting the dialog.
Martin Mathieson [Wed, 19 Jun 2013 22:57:39 +0000 (22:57 -0000)]
Fix for bug 6090.  Clear the list store when resetting the dialog.

svn path=/trunk/; revision=50064

10 years agoConvert the rest of the ASN1 dissectors from emem to wmem.
Evan Huus [Wed, 19 Jun 2013 22:47:36 +0000 (22:47 -0000)]
Convert the rest of the ASN1 dissectors from emem to wmem.

svn path=/trunk/; revision=50063

10 years agoFrom Anders:
Jeff Morriss [Wed, 19 Jun 2013 22:28:58 +0000 (22:28 -0000)]
From Anders:

Check Header CRC of SYNC protocol.

svn path=/trunk/; revision=50062

10 years agosupport extended size boxes, 2nd attempt
Martin Kaiser [Wed, 19 Jun 2013 22:26:12 +0000 (22:26 -0000)]
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

10 years agoAdd export of SS7 OPC/DPC
Pascal Quantin [Wed, 19 Jun 2013 21:49:12 +0000 (21:49 -0000)]
Add export of SS7 OPC/DPC

svn path=/trunk/; revision=50060

10 years agoFix display of "(correct)"/"(incorrect)" indication for the CRC.
Guy Harris [Wed, 19 Jun 2013 21:07:22 +0000 (21:07 -0000)]
Fix display of "(correct)"/"(incorrect)" indication for the CRC.

svn path=/trunk/; revision=50058

10 years agoConvert a batch of asn1 dissectors from emem to wmem.
Evan Huus [Wed, 19 Jun 2013 20:43:03 +0000 (20:43 -0000)]
Convert a batch of asn1 dissectors from emem to wmem.

svn path=/trunk/; revision=50057

10 years agoAnother iteration
Luis Ontanon [Wed, 19 Jun 2013 20:04:25 +0000 (20:04 -0000)]
Another iteration

svn path=/trunk/; revision=50056

10 years agoRework the change from r15595 a bit: when creating a TVB subset, always give
Jeff Morriss [Wed, 19 Jun 2013 19:31:40 +0000 (19:31 -0000)]
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

10 years agoPreserve summary information when reordering a file
Pascal Quantin [Wed, 19 Jun 2013 19:31:06 +0000 (19:31 -0000)]
Preserve summary information when reordering a file

svn path=/trunk/; revision=50054

10 years agoIf the user turns off printing of the packet summary line, disable the column heading...
Chris Maynard [Wed, 19 Jun 2013 19:16:35 +0000 (19:16 -0000)]
If the user turns off printing of the packet summary line, disable the column headings checkbox; otherwise, enable it.

svn path=/trunk/; revision=50053

10 years agoTry to make it more obvious that you can select unselected task list
Gerald Combs [Wed, 19 Jun 2013 18:48:20 +0000 (18:48 -0000)]
Try to make it more obvious that you can select unselected task list
items.

svn path=/trunk/; revision=50052

10 years agoRemove col_headings_cb from print_cmd_toggle_detail() altogether. It's not needed...
Chris Maynard [Wed, 19 Jun 2013 18:44:42 +0000 (18:44 -0000)]
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

10 years agoTry and keep r50047 and still fix
Evan Huus [Wed, 19 Jun 2013 18:38:52 +0000 (18:38 -0000)]
Try and keep r50047 and still fix
print_dlg.c:916: warning: value computed is not used

svn path=/trunk/; revision=50050

10 years agoOne of the unused hf's commented out in r47389 was not used due to a
Jeff Morriss [Wed, 19 Jun 2013 18:38:41 +0000 (18:38 -0000)]
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

10 years agoRemove traling whitespace.
Jörg Mayer [Wed, 19 Jun 2013 18:33:49 +0000 (18:33 -0000)]
Remove traling whitespace.

svn path=/trunk/; revision=50048

10 years agoFix for
Jörg Mayer [Wed, 19 Jun 2013 18:30:04 +0000 (18:30 -0000)]
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

10 years agoRework wmem scoping limits so that users can still get a handle to a pool when
Evan Huus [Wed, 19 Jun 2013 18:28:13 +0000 (18:28 -0000)]
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

10 years agoExplain how to enter a \ in an snmp field.
Jörg Mayer [Wed, 19 Jun 2013 18:20:59 +0000 (18:20 -0000)]
Explain how to enter a \ in an snmp field.

svn path=/trunk/; revision=50045

10 years agorevert the extended size box changes for now,
Martin Kaiser [Wed, 19 Jun 2013 18:10:41 +0000 (18:10 -0000)]
revert the extended size box changes for now,
this needs some more work to make things portable

svn path=/trunk/; revision=50044

10 years agoAdd a couple of missing lines from the usage output.
Martin Mathieson [Wed, 19 Jun 2013 18:06:46 +0000 (18:06 -0000)]
Add a couple of missing lines from the usage output.

svn path=/trunk/; revision=50043

10 years agoexplicitly use 64bit variables, g(u)int is not 64bit everywhere
Martin Kaiser [Wed, 19 Jun 2013 17:51:59 +0000 (17:51 -0000)]
explicitly use 64bit variables, g(u)int is not 64bit everywhere

svn path=/trunk/; revision=50042

10 years agoConvert DNS dissector to wmem, including first actual usage of wmem's red-black
Evan Huus [Wed, 19 Jun 2013 17:40:33 +0000 (17:40 -0000)]
Convert DNS dissector to wmem, including first actual usage of wmem's red-black
tree.

svn path=/trunk/; revision=50041

10 years agosupport extended size boxes, general cleanup
Martin Kaiser [Wed, 19 Jun 2013 17:34:43 +0000 (17:34 -0000)]
support extended size boxes, general cleanup

svn path=/trunk/; revision=50040

10 years agoAdd wmem_strbuf_new_label as just a sized new for label lengths.
Evan Huus [Wed, 19 Jun 2013 17:34:24 +0000 (17:34 -0000)]
Add wmem_strbuf_new_label as just a sized new for label lengths.

svn path=/trunk/; revision=50039

10 years agoAdd a comment about how it would nice for display filter macro fields
Martin Mathieson [Wed, 19 Jun 2013 17:11:55 +0000 (17:11 -0000)]
Add a comment about how it would nice for display filter macro fields
to use auto-completion, but that it won't work because the string
contains the $1, etc placeholders...

svn path=/trunk/; revision=50038

10 years agoTrivial: add a missing word, "to".
Chris Maynard [Wed, 19 Jun 2013 15:24:14 +0000 (15:24 -0000)]
Trivial: add a missing word, "to".

svn path=/trunk/; revision=50037

10 years agoAllow for column headers not to be printed in order to make it possible to export...
Chris Maynard [Wed, 19 Jun 2013 15:22:56 +0000 (15:22 -0000)]
Allow for column headers not to be printed in order to make it possible to export packets as plain text in a format that could then have a chance of being imported again (assuming other factors such as packet bytes were printed, etc.) in order to recover the original pcap file.
Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1636

svn path=/trunk/; revision=50036

10 years agoetypes.h needs value_string.h
Martin Kaiser [Wed, 19 Jun 2013 14:56:11 +0000 (14:56 -0000)]
etypes.h needs value_string.h

svn path=/trunk/; revision=50035

10 years agoFet rid of a global variable
Pascal Quantin [Wed, 19 Jun 2013 07:16:14 +0000 (07:16 -0000)]
Fet rid of a global variable

svn path=/trunk/; revision=50034

10 years agoClean up wmem_strsplit to remove a bunch of weird switch statements and
Evan Huus [Wed, 19 Jun 2013 06:48:08 +0000 (06:48 -0000)]
Clean up wmem_strsplit to remove a bunch of weird switch statements and
unnecessary continue statements. Should fix the coverity issues Joerg pointed
out as well.

svn path=/trunk/; revision=50033

10 years agoGet rid of global variables
Pascal Quantin [Wed, 19 Jun 2013 06:44:39 +0000 (06:44 -0000)]
Get rid of global variables

svn path=/trunk/; revision=50032

10 years agoRegenerate dissector
Pascal Quantin [Wed, 19 Jun 2013 06:23:51 +0000 (06:23 -0000)]
Regenerate dissector

svn path=/trunk/; revision=50031

10 years agoFix CID 1033205: Dead default in switch (DEADCODE)
Jörg Mayer [Wed, 19 Jun 2013 03:30:06 +0000 (03:30 -0000)]
Fix CID 1033205: Dead default in switch (DEADCODE)

svn path=/trunk/; revision=50030

10 years agoFix CID 712341: Dereference null return value (NULL_RETURNS)
Jörg Mayer [Wed, 19 Jun 2013 03:23:31 +0000 (03:23 -0000)]
Fix CID 712341: Dereference null return value (NULL_RETURNS)

Well, not really. Just catch that case and error out.

svn path=/trunk/; revision=50029

10 years agoFix CID 1034293: Missing break in switch (MISSING_BREAK)
Jörg Mayer [Wed, 19 Jun 2013 02:54:45 +0000 (02:54 -0000)]
Fix CID 1034293: Missing break in switch (MISSING_BREAK)

svn path=/trunk/; revision=50028

10 years agoClarify (a V1.0 file might have a single zero byte at the end of the
Guy Harris [Wed, 19 Jun 2013 00:02:22 +0000 (00:02 -0000)]
Clarify (a V1.0 file might have a single zero byte at the end of the
page, which doesn't look like an "unused space" record because there
aren't two bytes of record type, just one byte).

svn path=/trunk/; revision=50027

10 years agoSlight stylistic cleanup - most routines, when defined, have no space
Guy Harris [Tue, 18 Jun 2013 23:47:50 +0000 (23:47 -0000)]
Slight stylistic cleanup - most routines, when defined, have no space
between the routine name and the opening parenthesis, so remove it from
the definition of the seek-read routine.

svn path=/trunk/; revision=50026

10 years agoNote that NetScaler trace files are page-oriented, with records not
Guy Harris [Tue, 18 Jun 2013 23:37:30 +0000 (23:37 -0000)]
Note that NetScaler trace files are page-oriented, with records not
split across page boundaries, rather than being a byte stream, and that
the last page may be short.

Fix some comments.

svn path=/trunk/; revision=50025

10 years agoAdd an option (switched off) to decode the Contention Resolution body as
Martin Mathieson [Tue, 18 Jun 2013 23:36:35 +0000 (23:36 -0000)]
Add an option (switched off) to decode the Contention Resolution body as
an RRC UL CCCH PDU.

svn path=/trunk/; revision=50024

10 years agoFrom Anders: Fix the highlighted length, add PDU description as a comment.
Jeff Morriss [Tue, 18 Jun 2013 23:33:00 +0000 (23:33 -0000)]
From Anders: Fix the highlighted length, add PDU description as a comment.

svn path=/trunk/; revision=50023

10 years agoAdd ability to export decrypted IPsec PDUs
Pascal Quantin [Tue, 18 Jun 2013 23:01:46 +0000 (23:01 -0000)]
Add ability to export decrypted IPsec PDUs

svn path=/trunk/; revision=50022

10 years agoSet PDCP SN length for DRBs for separate RRC element.
Martin Mathieson [Tue, 18 Jun 2013 22:38:54 +0000 (22:38 -0000)]
Set PDCP SN length for DRBs for separate RRC element.

svn path=/trunk/; revision=50021

10 years agoUpdate READMEs.
Evan Huus [Tue, 18 Jun 2013 21:47:18 +0000 (21:47 -0000)]
Update READMEs.

svn path=/trunk/; revision=50020

10 years agoAlso signal value of PDCP SN (only used if enabled by RLC preferences).
Martin Mathieson [Tue, 18 Jun 2013 21:44:48 +0000 (21:44 -0000)]
Also signal value of PDCP SN (only used if enabled by RLC preferences).

svn path=/trunk/; revision=50019