6 years agoFrom Dirk Jagdmann: Use a guint32 for IPv4 addresses. Fixes compilation
Gerald Combs [Tue, 25 Jun 2013 13:31:19 +0000 (13:31 -0000)]
From Dirk Jagdmann: Use a guint32 for IPv4 addresses. Fixes compilation
on OS X + Cmake.

svn path=/trunk/; revision=50139

6 years agoRevert --with-echld until I find out how to get it to work with Cmake...
Luis Ontanon [Tue, 25 Jun 2013 04:50:36 +0000 (04:50 -0000)]
Revert --with-echld until I find out how to get it to work with Cmake...

svn path=/trunk/; revision=50138

6 years ago--with-echld
Luis Ontanon [Tue, 25 Jun 2013 04:20:08 +0000 (04:20 -0000)]

svn path=/trunk/; revision=50137

6 years agoanother iteration, prepared for automake.
Luis Ontanon [Tue, 25 Jun 2013 03:33:02 +0000 (03:33 -0000)]
another iteration, prepared for automake.

svn path=/trunk/; revision=50136

6 years agomore stuff...
Luis Ontanon [Tue, 25 Jun 2013 00:31:01 +0000 (00:31 -0000)]
more stuff...

svn path=/trunk/; revision=50135

6 years agoBased on initial patch by Michal Labedzki
Evan Huus [Mon, 24 Jun 2013 23:26:56 +0000 (23:26 -0000)]
Based on initial patch by Michal Labedzki

Don't return a negative value from get_type_length, it can get us into bad
loops. Fixes

svn path=/trunk/; revision=50134

6 years agoFrom Fabio Tarabelloni via
Evan Huus [Mon, 24 Jun 2013 22:59:02 +0000 (22:59 -0000)]
From Fabio Tarabelloni via

More zigbee dissection:
- illuminance measurement cluster
- temperature measurement cluster
- pressure measurement cluster
- relative humidity measurement cluster

svn path=/trunk/; revision=50133

6 years agoFix wmem_tree.h ifdef guards, hopefully fixing the check-abi buildbot.
Evan Huus [Mon, 24 Jun 2013 22:37:04 +0000 (22:37 -0000)]
Fix wmem_tree.h ifdef guards, hopefully fixing the check-abi buildbot.

svn path=/trunk/; revision=50132

6 years agoSo it comes to this...
Evan Huus [Mon, 24 Jun 2013 21:59:02 +0000 (21:59 -0000)]
So it comes to this...

Put in a whole bunch of stderr output in the wmem tree tests in the hopes that
the next time one of the buildbots randomly (and irreproducibly) fails on this
step we'll have at least a bit of a hint as to where it happened.

svn path=/trunk/; revision=50131

6 years agoAdd an option to dissect RRC-Container IE
Pascal Quantin [Mon, 24 Jun 2013 21:31:25 +0000 (21:31 -0000)]
Add an option to dissect RRC-Container IE

svn path=/trunk/; revision=50130

6 years agoA follow-up to r50127 to highlight the correct 4 bytes of the Ethernet FCS for the...
Chris Maynard [Mon, 24 Jun 2013 19:27:47 +0000 (19:27 -0000)]
A follow-up to r50127 to highlight the correct 4 bytes of the Ethernet FCS for the hf_eth_fcs_good and hf_eth_fcs_bad fields.

svn path=/trunk/; revision=50128

6 years agoThe Ethernet FCS is 32 bits, not 16 bits.
Guy Harris [Mon, 24 Jun 2013 19:00:55 +0000 (19:00 -0000)]
The Ethernet FCS is 32 bits, not 16 bits.

svn path=/trunk/; revision=50127

6 years agoDumpcap can write raw packets to stdout
Balint Reczey [Mon, 24 Jun 2013 14:49:19 +0000 (14:49 -0000)]
Dumpcap can write raw packets to stdout

svn path=/trunk/; revision=50126

6 years agoDisplay RSSI in dB instead of dBm. Fixes the last remaining issue reported in https...
Chris Maynard [Mon, 24 Jun 2013 14:30:00 +0000 (14:30 -0000)]
Display RSSI in dB instead of dBm.  Fixes the last remaining issue reported in

svn path=/trunk/; revision=50125

6 years agoMake Authentification String filterable
Alexis La Goutte [Sun, 23 Jun 2013 20:41:32 +0000 (20:41 -0000)]
Make Authentification String filterable

svn path=/trunk/; revision=50124

6 years agoFrom chaitanya via Add suppo...
Alexis La Goutte [Sun, 23 Jun 2013 20:41:18 +0000 (20:41 -0000)]
From chaitanya via Add support for VHT Transmit Power Envelope IE

Added support for VHT TPE IE and also tested it

Also fixed a small typo from "IEEE Stc" to "IEEE Std" for all 802.11ac references.

From me:
* Remove some trailing whitespace
* Fix bitmask PWR Info Unit
* Modify expert_info to display error in PWR Info Count
* Fix (possibility) loop
* Fix value_string (not need to have Reserved...)

svn path=/trunk/; revision=50123

6 years agoEnhance VRRP Dissector * Make checksum field filterable * Add also a checksum_bad...
Alexis La Goutte [Sun, 23 Jun 2013 20:41:09 +0000 (20:41 -0000)]
Enhance VRRP Dissector * Make checksum field filterable * Add also a checksum_bad filter and display a expert info when checksum is bad

svn path=/trunk/; revision=50122

6 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

6 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

6 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

6 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.

svn path=/trunk/; revision=50116

6 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

svn path=/trunk/; revision=50115

6 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

6 years agoMore proper fix (per advice of bug 8515 (
Michael Mann [Sat, 22 Jun 2013 15:08:18 +0000 (15:08 -0000)]
More proper fix (per advice of bug 8515 ( of global variables complained about in bug 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

6 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

6 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

6 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

6 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

6 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]


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

svn path=/trunk/; revision=50108

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 years agoFix :
Pascal Quantin [Thu, 20 Jun 2013 23:37:16 +0000 (23:37 -0000)]
Fix :
Display certificate as UINT64 and add support for a 64bits unsigned value in BER dissector

svn path=/trunk/; revision=50096

6 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

6 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

svn path=/trunk/; revision=50094

6 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

6 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

6 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

6 years agoFix bug :
Pascal Quantin [Thu, 20 Jun 2013 22:21:24 +0000 (22:21 -0000)]
Fix bug :
Prevent an out of bounds access in 802.11 Radiotap dissector

svn path=/trunk/; revision=50090

6 years agoFrom Fabio Tarabelloni via
Evan Huus [Thu, 20 Jun 2013 21:52:22 +0000 (21:52 -0000)]
From Fabio Tarabelloni via

Zigbee partition cluster dissector.

svn path=/trunk/; revision=50089

6 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

6 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

6 years agoFrom Fabio Tarabelloni via
Evan Huus [Thu, 20 Jun 2013 20:24:51 +0000 (20:24 -0000)]
From Fabio Tarabelloni via

New zigbee cluster dissectors added for Basic and Identify clusters.

svn path=/trunk/; revision=50086

6 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 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

6 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

6 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

svn path=/trunk/; revision=50083

6 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

6 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

6 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

Fix FSF address in one dissector.

svn path=/trunk/; revision=50080

6 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

I guess anonymous enums can't be static?

svn path=/trunk/; revision=50079

6 years agoFrom Fabio Tarabelloni via
Evan Huus [Thu, 20 Jun 2013 16:42:17 +0000 (16:42 -0000)]
From Fabio Tarabelloni via

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

6 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

6 years agoFrom Michal Labedzki via
Evan Huus [Thu, 20 Jun 2013 16:31:53 +0000 (16:31 -0000)]
From Michal Labedzki via

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

6 years agoFrom Brian Otte via
Evan Huus [Thu, 20 Jun 2013 16:22:53 +0000 (16:22 -0000)]
From Brian Otte via

Numerous fixes and improvements to DHCPv6 Cable Television Labs vendor-specific
information dissection.

svn path=/trunk/; revision=50075

6 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

6 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

6 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

6 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

6 years agoFrom Dirk J via
Evan Huus [Wed, 19 Jun 2013 23:52:54 +0000 (23:52 -0000)]
From Dirk J via

if no make options are given to the 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
on OsX, so people don't have to remember it.

svn path=/trunk/; revision=50070

6 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

6 years agoBased on patch from gyanesh via
Evan Huus [Wed, 19 Jun 2013 23:30:29 +0000 (23:30 -0000)]
Based on patch from gyanesh via

Clarify display of the overload bit in multi-topology supported TLV for SPB.

svn path=/trunk/; revision=50068

6 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

6 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

svn path=/trunk/; revision=50066

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 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

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

svn path=/trunk/; revision=50056

6 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

This fixes one of the issues reported in

svn path=/trunk/; revision=50055

6 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

6 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

6 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

svn path=/trunk/; revision=50052

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 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

svn path=/trunk/; revision=50041

6 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

6 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

6 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

6 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

6 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.

svn path=/trunk/; revision=50036