6 years agoFrom Peter Wu via :
Jeff Morriss [Tue, 24 Sep 2013 00:31:49 +0000 (00:31 -0000)]
From Peter Wu via :

Allow reading SSL keylog files with carriage returns.

svn path=/trunk/; revision=52197

6 years agoBeginnings of win cmake support (not yet working), created by Graham Bloice,
Jörg Mayer [Mon, 23 Sep 2013 21:45:55 +0000 (21:45 -0000)]
Beginnings of win cmake support (not yet working), created by Graham Bloice,
some smaller changes by me.
- README.cmake
  Document how to (one day) run on Windows
- CMakeLists.txt
  Use MSVC compiler flags for MSVC instead of gcc flags
- FindWSWinLibs.cmake
  New: Creates HINTS for finding includes and libraries
  inside the Wireshark support library installation.
- FindXXX.cmake
  Make use of HINTS generated by FindWSWinLibs.cmake

This has not really been tested on Windows as my installation seems to have
automagically downloaded some fixes and is in an inconsistent state since.
Will probably need to reinstall.

svn path=/trunk/; revision=52194

6 years agoEnsure to release an existing DRX configuration when receiving a RRC Connection Setup...
Pascal Quantin [Mon, 23 Sep 2013 21:21:58 +0000 (21:21 -0000)]
Ensure to release an existing DRX configuration when receiving a RRC Connection Setup message

svn path=/trunk/; revision=52193

6 years agoUpgrade LPPa dissector to v11.3.0
Pascal Quantin [Mon, 23 Sep 2013 20:20:36 +0000 (20:20 -0000)]
Upgrade LPPa dissector to v11.3.0

svn path=/trunk/; revision=52192

6 years agoAdd dissection of new IEs in UL_UNITDATA
Anders Broman [Mon, 23 Sep 2013 19:02:33 +0000 (19:02 -0000)]
Add dissection of new IEs in UL_UNITDATA

svn path=/trunk/; revision=52191

6 years agoAnother step towards tracking UE DRX state
Martin Mathieson [Mon, 23 Sep 2013 17:34:18 +0000 (17:34 -0000)]
Another step towards tracking UE DRX state

svn path=/trunk/; revision=52190

6 years agoDTP Dissector Enhancements
Michael Mann [Mon, 23 Sep 2013 15:54:29 +0000 (15:54 -0000)]
DTP Dissector Enhancements

1) Corrections to the naming and terminology of DTP, its TLVs, types and values

2) Improvements to the dissection of Trunk Status and Trunk Type TLVs whose values and meaning have not been properly decoded so far

3) Improvements to the dissection of the Domain TLV (now using proto_tree_add_item() to display its value; this also allows for filtering operations)

4) Minor cleanups to the code (mainly renaming the macro names to make them more consistent)

From Peter Paluch, Bug 9156 (

svn path=/trunk/; revision=52189

6 years agoTiny indentation fix.
Evan Huus [Mon, 23 Sep 2013 12:09:58 +0000 (12:09 -0000)]
Tiny indentation fix.

svn path=/trunk/; revision=52188

6 years agoThe pointer into proto_tree_add_oid can be NULL if the length is 0. Exposed
Evan Huus [Mon, 23 Sep 2013 12:09:20 +0000 (12:09 -0000)]
The pointer into proto_tree_add_oid can be NULL if the length is 0. Exposed
because wmem_alloc(pool, 0) returns NULL (like pretty much every other
malloc-style function) where ep_ or se_ alloc did not.


svn path=/trunk/; revision=52187

6 years agoFix Function call argument is an uninitialized value warning found by Clang
Alexis La Goutte [Mon, 23 Sep 2013 07:20:53 +0000 (07:20 -0000)]
Fix Function call argument is an uninitialized value warning found by Clang

svn path=/trunk/; revision=52186

6 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
Alexis La Goutte [Mon, 23 Sep 2013 07:20:45 +0000 (07:20 -0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

svn path=/trunk/; revision=52185

6 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
Alexis La Goutte [Mon, 23 Sep 2013 07:20:38 +0000 (07:20 -0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

svn path=/trunk/; revision=52184

6 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
Alexis La Goutte [Mon, 23 Sep 2013 07:20:28 +0000 (07:20 -0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

svn path=/trunk/; revision=52183

6 years agoFrom Peter Wu: on systems other than Windows, skip the GUI tests if the
Guy Harris [Sun, 22 Sep 2013 21:51:05 +0000 (21:51 -0000)]
From Peter Wu: on systems other than Windows, skip the GUI tests if the
DISPLAY environment variable isn't set.

From me: note that this won't be the right thing to do on OS X if we
switch to a toolkit that doesn't use X11, and that this may or may not
be the right thing to do with toolkits using Wayland or Mir directly.

svn path=/trunk/; revision=52182

6 years agoFix some typos, indentation. Don't try to write the NRB if the pointer to our
Evan Huus [Sun, 22 Sep 2013 20:18:25 +0000 (20:18 -0000)]
Fix some typos, indentation. Don't try to write the NRB if the pointer to our
two lists is itself NULL.

svn path=/trunk/; revision=52181

6 years agoMore emem -> wmem conversion:
Pascal Quantin [Sun, 22 Sep 2013 20:04:35 +0000 (20:04 -0000)]
More emem -> wmem conversion:
- tvb_get_g_stringz()/tvb_get_ephemeral_stringz()/tvb_get_seasonal_stringz() -> tvb_get_stringz()
- tvb_get_g_stringz_enc()/tvb_get_ephemeral_stringz_enc() -> tvb_get_stringz_enc()
- tvb_get_ephemeral_unicode_stringz() -> tvb_get_unicode_stringz()
- tvb_bcd_dig_to_ep_str() -> tvb_bcd_dig_to_wmem_packet_str()
- update docs accordingly

svn path=/trunk/; revision=52180

6 years agoFix -Wshadow, indentation
Evan Huus [Sun, 22 Sep 2013 20:01:32 +0000 (20:01 -0000)]
Fix -Wshadow, indentation

svn path=/trunk/; revision=52179

6 years agoRemove unused parameter.
Evan Huus [Sun, 22 Sep 2013 19:58:22 +0000 (19:58 -0000)]
Remove unused parameter.

svn path=/trunk/; revision=52178

6 years agoTurn off debuging.
Anders Broman [Sun, 22 Sep 2013 19:43:51 +0000 (19:43 -0000)]
Turn off debuging.

svn path=/trunk/; revision=52177

6 years agoGet rid of struct addrinfo, use the hastables for name resolution instead.
Anders Broman [Sun, 22 Sep 2013 19:40:02 +0000 (19:40 -0000)]
Get rid of struct addrinfo, use the hastables for name resolution instead.

svn path=/trunk/; revision=52176

6 years agoUpdate SCTP PPIDs and use newly assigned value.
Michael Tüxen [Sun, 22 Sep 2013 17:16:02 +0000 (17:16 -0000)]
Update SCTP PPIDs and use newly assigned value.

svn path=/trunk/; revision=52175

6 years agoemem -> wmem conversion:
Pascal Quantin [Sun, 22 Sep 2013 15:50:55 +0000 (15:50 -0000)]
emem -> wmem conversion:
- ep_tvb_get_bits() -> wmem_packet_tvb_get_bits()
- tvb_g_memdup()/ep_tvb_memdup() -> tvb_memdup()
- tvb_fake_unicode()/tvb_get_ephemeral_faked_unicode() -> tvb_get_faked_unicode()
- tvb_get_g_string()/tvb_get_ephemeral_string()/tvb_get_seasonal_string() -> tvb_get_string()
- tvb_get_g_unicode_string()/tvb_get_ephemeral_unicode_string() -> tvb_get_unicode_string()
- tvb_get_ephemeral_string_enc() -> tvb_get_string_enc()
- update docs accordingly

svn path=/trunk/; revision=52172

6 years ago[Automatic manuf, services and enterprise-numbers update for 2013-09-22]
Gerald Combs [Sun, 22 Sep 2013 14:03:42 +0000 (14:03 -0000)]
[Automatic manuf, services and enterprise-numbers update for 2013-09-22]

svn path=/trunk/; revision=52169

6 years agoDon't declare proto_mac_mgmt_msg_ucd_decoder twice.
Jeff Morriss [Sun, 22 Sep 2013 14:00:52 +0000 (14:00 -0000)]
Don't declare proto_mac_mgmt_msg_ucd_decoder twice.

svn path=/trunk/; revision=52168

6 years agoMake dissectors register for their MAC Management Message Type and use dissector_try_...
Michael Mann [Sun, 22 Sep 2013 00:50:24 +0000 (00:50 -0000)]
Make dissectors register for their MAC Management Message Type and use dissector_try_uint to do any dissection.  Many "outside" (third-party) message types appear to exist.

Have the makefiles do all the work setting up proto_register_<dissector> and proto_reg_handoff_<dissector>, rather than sprinkled throughout the dissectors with extern declarations.

More is coming to make more functions static (because of current makefile fixes) and cleanup MAC Management dissectors to remove unnecessary/duplicative code, but I wanted to get the build issues squared away.

svn path=/trunk/; revision=52167

6 years agoRemove U3 references.
Gerald Combs [Sun, 22 Sep 2013 00:48:03 +0000 (00:48 -0000)]
Remove U3 references.

svn path=/trunk/; revision=52166

6 years agoUpdate to tvb_g_memdup in tvb test suite.
Evan Huus [Sat, 21 Sep 2013 17:37:31 +0000 (17:37 -0000)]
Update to tvb_g_memdup in tvb test suite.

svn path=/trunk/; revision=52165

6 years agoAdd _g_ to the names of functions that allocate glib memory. This is a bit more
Evan Huus [Sat, 21 Sep 2013 17:04:41 +0000 (17:04 -0000)]
Add _g_ to the names of functions that allocate glib memory. This is a bit more
explicit, and frees up the "generic" names (like tvb_memdup) for new signatures
that take the appropriate wmem pool.

Majority of the conversion done with sed.

svn path=/trunk/; revision=52164

6 years agoLower the default RTMPT max reassembly size. A bigger bandaid for
Evan Huus [Sat, 21 Sep 2013 16:27:55 +0000 (16:27 -0000)]
Lower the default RTMPT max reassembly size. A bigger bandaid for

svn path=/trunk/; revision=52163

6 years agoMake it more obvious that the function is using wmem memory
Pascal Quantin [Sat, 21 Sep 2013 11:08:35 +0000 (11:08 -0000)]
Make it more obvious that the function is using wmem memory

svn path=/trunk/; revision=52162

6 years agoAs pointed out by Kurt in
Jeff Morriss [Fri, 20 Sep 2013 20:52:04 +0000 (20:52 -0000)]
As pointed out by Kurt in :

If we're not building with gtk3 we now need to add --with-gtk2 .

svn path=/trunk/; revision=52161

6 years agoFrom Mathias Guettler via :
Pascal Quantin [Fri, 20 Sep 2013 19:40:26 +0000 (19:40 -0000)]
From Mathias Guettler via :
ESIS dissector exception due to incorrect length parameter to 'proto_tree_add_uint'

svn path=/trunk/; revision=52160

6 years agoFix :
Pascal Quantin [Fri, 20 Sep 2013 19:11:23 +0000 (19:11 -0000)]
Fix :
Add dissector_try_uint_new() to the list of exported symbols

svn path=/trunk/; revision=52159

6 years agoEnhance DOCSIS dissector with new fields. Bug 9149 (
Michael Mann [Fri, 20 Sep 2013 19:02:15 +0000 (19:02 -0000)]
Enhance DOCSIS dissector with new fields.  Bug 9149 (

From Jerry Negele

svn path=/trunk/; revision=52158

6 years agoBugfix a few items:
Michael Mann [Fri, 20 Sep 2013 18:35:10 +0000 (18:35 -0000)]
Bugfix a few items:

1. Correct Interface Flag enumeration
2. Dissect ARP data without making it look like its an ARP packet by disabling column writing.

svn path=/trunk/; revision=52157

6 years agoDon't use g_strv_length on a single string, just use strlen. Also do the
Evan Huus [Fri, 20 Sep 2013 14:41:22 +0000 (14:41 -0000)]
Don't use g_strv_length on a single string, just use strlen. Also do the
null-check *before* calling strlen (if it's even necessary?)


svn path=/trunk/; revision=52156

6 years agoIndicate Sequence of 0 length.
Anders Broman [Fri, 20 Sep 2013 14:20:06 +0000 (14:20 -0000)]
Indicate Sequence of 0 length.

svn path=/trunk/; revision=52155

6 years agoDCH-ID can be 255
Anders Broman [Fri, 20 Sep 2013 14:19:31 +0000 (14:19 -0000)]
DCH-ID can be 255

svn path=/trunk/; revision=52154

6 years agoTry to make heuristic slightly faster.
Anders Broman [Fri, 20 Sep 2013 14:06:43 +0000 (14:06 -0000)]
Try to make heuristic slightly faster.

svn path=/trunk/; revision=52153

6 years agoFrom Chun-Yeow via Ability...
Alexis La Goutte [Thu, 19 Sep 2013 21:16:46 +0000 (21:16 -0000)]
From Chun-Yeow via Ability to Decode the Number of Mesh Peerings

Decode the mesh formation information fields related to the number of mesh peerings

Signed-off-by: Chun-Yeow Yeoh <>
svn path=/trunk/; revision=52152

6 years agoAdd Peter Wu to AUTHORS
Alexis La Goutte [Thu, 19 Sep 2013 20:41:22 +0000 (20:41 -0000)]
Add Peter Wu to AUTHORS

(Thanks for the work on SSL/TLS/DTLS Ciphers)

svn path=/trunk/; revision=52151

6 years agoFrom Peter Wu via [PATCH...
Alexis La Goutte [Thu, 19 Sep 2013 20:27:12 +0000 (20:27 -0000)]
From Peter Wu via [PATCH] Update TLS Ciphers

Really add support for AEAD ciphers (GCM)

GCM uses counter mode with authentication tags (the latter is currently
not supported). As for the key material, there is no MAC (because the
auth tag is supposed to verify the authenticity).

Finally, correct the GCM cipher suite definitions: IV block size of
4 bytes and GCM instead of CBC mode.

svn path=/trunk/; revision=52150

6 years agoFrom Peter Wu via [PATCH...
Alexis La Goutte [Thu, 19 Sep 2013 20:27:05 +0000 (20:27 -0000)]
From Peter Wu via [PATCH] Update TLS Ciphers

Use IV from record for CBC mode, add padding/IV length check

Add summary of RFCs to make it more obvious why certain parts (IV, MAC,
padding) are used. Merge DTLS and TLS blocks for extracting IV. This
saves an unnecessary memmove() because the input pointer is, well, just
a local variable and can therefore be incremented.

Validate padding and IV lengths before using it. A crash could occur
if the explicit IV is missing (this would make memmove write before its
buffer). The missing padding check had as implication that a misleading
error is returning with a negative length (not exploitable).

Use IV from record for CBC mode, previously it decrypted the first block
incorrectly and then threw this "decrypted" IV away. Now it extracts the
IV and uses this for decrypting the first fragment block. (remember that
CBC xor's the output of the block cipher with the previous ciphertext
(or IV for the first block)).

This is a preparation for GCM which does not have a MAC. The skip_mac
branch is necessary to make the compiler happy in this patch, 'mac'
could otherwise be uninitialised.

svn path=/trunk/; revision=52149

6 years agoFrom Peter Wu via [PATCH...
Alexis La Goutte [Thu, 19 Sep 2013 20:26:57 +0000 (20:26 -0000)]
From Peter Wu via [PATCH] Update TLS Ciphers

Correct cipher suites list, add TLS_ annotations

Add official TLS_ names as comment and correct:
- 6: RC2 is a block cipher using MD5, not stream+SHA.
- 25,26,27: should be SHA instead of MD5
- 98: DES export is a block cipher using 56-bits[1], not stream.
- 99: DES export should be using 56-bits[1].
- 138: removed commented RC4 cipher because it is not a block cipher

Besides these comments and corrections, there are no further changes.


svn path=/trunk/; revision=52148

6 years agoFrom Peter Wu via [PATCH...
Alexis La Goutte [Thu, 19 Sep 2013 20:26:50 +0000 (20:26 -0000)]
From Peter Wu via [PATCH] Update TLS Ciphers

Drop export_cipher and dig_len, cleaner digest access

Removed dig_len as this magic number is dependent on dig. The digests
variable is converted from a string to a structure holding the digest
name and length because of its close dependency.

Introduce another struct+function to get rid of the magic number 0x40

Removed export_cipher bit as this is dependent on eff_bits < bits.
Verified with:
grep ,KEX_ packet-ssl-utils.c | awk -F, '{bits=$6!=$7;ex=$9;
if ((bits && !ex) || (!bits && ex))print $6, $7, $8, "###", $0}'.

Removed space before SIG_RSA for cipher 51 for consistency with others.

svn path=/trunk/; revision=52147

6 years agoAdd *.lai file to wireshark
Alexis La Goutte [Thu, 19 Sep 2013 20:26:41 +0000 (20:26 -0000)]
Add *.lai file to wireshark

svn path=/trunk/; revision=52146

6 years agoZero the key in ntlmssp, because we don't otherwise fill all of it. I suspect
Evan Huus [Thu, 19 Sep 2013 17:39:43 +0000 (17:39 -0000)]
Zero the key in ntlmssp, because we don't otherwise fill all of it. I suspect
the tvb_memcpy on the next line should be taking more data, but I don't know
enough about the protocol to be sure. This is the least disruptive way to fix
the last valgrind error from

svn path=/trunk/; revision=52145

6 years agoEnum was used after all. Restore it and namespace it with GLUSTER_ to avoid the
Evan Huus [Thu, 19 Sep 2013 13:04:37 +0000 (13:04 -0000)]
Enum was used after all. Restore it and namespace it with GLUSTER_ to avoid the

svn path=/trunk/; revision=52144

6 years agoFrom Mark Vitale via
Evan Huus [Thu, 19 Sep 2013 13:00:57 +0000 (13:00 -0000)]
From Mark Vitale via

Decode AFS RXAFSCB_GetCapabilities RPC requests with their replies.

svn path=/trunk/; revision=52143

6 years agoRemove unused enum that started conflicting with /usr/include/dirent.h on my
Evan Huus [Thu, 19 Sep 2013 12:50:25 +0000 (12:50 -0000)]
Remove unused enum that started conflicting with /usr/include/dirent.h on my

svn path=/trunk/; revision=52142

6 years agoRevert "Prefer newer Lua versions"
Balint Reczey [Wed, 18 Sep 2013 21:51:45 +0000 (21:51 -0000)]
Revert "Prefer newer Lua versions"

The original version was OK, obviously.

svn path=/trunk/; revision=52141

6 years agoPrefer newer Lua versions
Balint Reczey [Wed, 18 Sep 2013 21:13:36 +0000 (21:13 -0000)]
Prefer newer Lua versions

svn path=/trunk/; revision=52140

6 years agoFix (Malformed NORM packet...
Chris Maynard [Wed, 18 Sep 2013 14:49:03 +0000 (14:49 -0000)]
Fix (Malformed NORM packet) having to do with Wireshark assuming that all remaining bytes in the packet are part of the "cc_node_list", rather than stopping dissection according to the hdr_len field in the NORM Common Message Header.


#BACKPORT(1.10, 1.8)

svn path=/trunk/; revision=52139

6 years agoRename PCAP files to .pcap; set mime-type appropriately. Should these files be in...
Jeff Morriss [Wed, 18 Sep 2013 14:23:14 +0000 (14:23 -0000)]
Rename PCAP files to .pcap; set mime-type appropriately.  Should these files be in the test/captures directory?

svn path=/trunk/; revision=52138

6 years agoMissed one file from
Gilbert Ramirez [Wed, 18 Sep 2013 05:12:04 +0000 (05:12 -0000)]
Missed one file from
Updated license in ancient tool.

svn path=/trunk/; revision=52137

6 years agoUpdate to use a much more modern test harness,
Gilbert Ramirez [Wed, 18 Sep 2013 05:07:46 +0000 (05:07 -0000)]
Update to use a much more modern test harness,
the "unittest" module that comes with Python. Specifically, this
takes advantage of a couple of features in the "unittest" in
Python 2.7. The tests are all the same as before, but much
better managed.

This is in preparation for some work on the display filter code.

svn path=/trunk/; revision=52136

6 years agoFix a couple of EXPORT_DEPENDS
Chris Maynard [Wed, 18 Sep 2013 03:58:07 +0000 (03:58 -0000)]
Fix a couple of EXPORT_DEPENDS

svn path=/trunk/; revision=52135

6 years agoAdd the dependeny handling for windows builds as well
Jörg Mayer [Wed, 18 Sep 2013 03:31:03 +0000 (03:31 -0000)]
Add the dependeny handling for windows builds as well

svn path=/trunk/; revision=52134

6 years agoMissed 1 character replacement as part of r52132.
Chris Maynard [Wed, 18 Sep 2013 02:58:14 +0000 (02:58 -0000)]
Missed 1 character replacement as part of r52132.

svn path=/trunk/; revision=52133

6 years agoRemove all non-ASCII characters from all .asn files. I didn't see the harm in replac...
Chris Maynard [Wed, 18 Sep 2013 02:48:29 +0000 (02:48 -0000)]
Remove all non-ASCII characters from all .asn files.  I didn't see the harm in replacing them all as opposed to only those not copied verbatim from other sources.

svn path=/trunk/; revision=52132

6 years agoFrom Jason Wzhy via :
Pascal Quantin [Tue, 17 Sep 2013 21:56:35 +0000 (21:56 -0000)]
From Jason Wzhy via :
BSSGP: Fix dissection of Trace Type IE in SGSN-INVOKE-TRACE message

svn path=/trunk/; revision=52131

6 years agoemem -> wmem
Pascal Quantin [Tue, 17 Sep 2013 21:34:05 +0000 (21:34 -0000)]
emem -> wmem

svn path=/trunk/; revision=52130

6 years agoFix remaining dependencides for -exp.cnf files.
Jörg Mayer [Tue, 17 Sep 2013 20:45:00 +0000 (20:45 -0000)]
Fix remaining dependencides for -exp.cnf files.

svn path=/trunk/; revision=52129

6 years agoFix off by 1 error when dissecting Data Radio Bearer identity number
Pascal Quantin [Tue, 17 Sep 2013 20:06:48 +0000 (20:06 -0000)]
Fix off by 1 error when dissecting Data Radio Bearer identity number

svn path=/trunk/; revision=52128

6 years agoMore dependeny updates for asn1 -exp.cnf files.
Jörg Mayer [Tue, 17 Sep 2013 19:43:37 +0000 (19:43 -0000)]
More dependeny updates for asn1 -exp.cnf files.
Only three remaining: p7, p22, x509ce - thanks to Chris Maynard for the list.

svn path=/trunk/; revision=52127

6 years agoRemove some unneeded #includes...
Bill Meier [Tue, 17 Sep 2013 19:23:11 +0000 (19:23 -0000)]
Remove some unneeded #includes...

svn path=/trunk/; revision=52126

6 years agoRegenerate all files where the .cnf files had whitespace changes.
Jörg Mayer [Tue, 17 Sep 2013 18:55:18 +0000 (18:55 -0000)]
Regenerate all files where the .cnf files had whitespace changes.

svn path=/trunk/; revision=52125

6 years agoReference 'BACnetVendorIdentifiers' value_string using
Bill Meier [Tue, 17 Sep 2013 18:55:17 +0000 (18:55 -0000)]
Reference 'BACnetVendorIdentifiers' value_string using
an extended value string.

svn path=/trunk/; revision=52124

6 years agoOne of the wmem patches only updated the generated packet-snmp.c
Jörg Mayer [Tue, 17 Sep 2013 18:54:18 +0000 (18:54 -0000)]
One of the wmem patches only updated the generated packet-snmp.c
but not the source. Fix that.

svn path=/trunk/; revision=52123

6 years agoSwitch the inline functions that use tvbuffs and emem back to macros.
Gerald Combs [Tue, 17 Sep 2013 18:42:36 +0000 (18:42 -0000)]
Switch the inline functions that use tvbuffs and emem back to macros.
This should hopefully fix linking with Solaris Studio, which doesn't
remove unused inline functions by default. Fix a copy+paste error.

svn path=/trunk/; revision=52122

6 years agoFix proto_registrar_dump_protocols() bug introduced by the
Bill Meier [Tue, 17 Sep 2013 18:33:03 +0000 (18:33 -0000)]
Fix proto_registrar_dump_protocols() bug introduced by the
implementation of BASE_VAL64_STRING value_strings.

Fixes 'tshark -G values' crash.

svn path=/trunk/; revision=52121

6 years agoWhen building packet-dap.c on an empty build tree, packet-dap.c would
Jörg Mayer [Tue, 17 Sep 2013 18:02:25 +0000 (18:02 -0000)]
When building packet-dap.c on an empty build tree, packet-dap.c would
be incorrect on the first pass and only be correct when remade.
The reason was that disp-exp.cnf was created incorrectly on first pass.
disp-exp.cnf required dop-exp.cnf to build correctly, so add a mechanism
to add dependencies for export files.

Note: Only the cmake change has been tested, the autofoo stuff requires

svn path=/trunk/; revision=52120

6 years agoUpdate 'BACnetVendorIdentifiers' value strings from
Bill Meier [Tue, 17 Sep 2013 16:44:26 +0000 (16:44 -0000)]
Update 'BACnetVendorIdentifiers' value strings from
BACnet vendor ID list dated September 16, 2013.

svn path=/trunk/; revision=52119

6 years agoFix dependency problems (continuation of r52110 and r52112).
Chris Maynard [Tue, 17 Sep 2013 14:45:52 +0000 (14:45 -0000)]
Fix dependency problems (continuation of r52110 and r52112).

svn path=/trunk/; revision=52118

6 years agoFix a difference to Makefile.common
Jörg Mayer [Tue, 17 Sep 2013 05:53:02 +0000 (05:53 -0000)]
Fix a difference to Makefile.common

svn path=/trunk/; revision=52117

6 years agoAdd svn id tag
Jörg Mayer [Tue, 17 Sep 2013 05:51:37 +0000 (05:51 -0000)]
Add svn id tag

svn path=/trunk/; revision=52116

6 years agoDon't call gethostbyaddr() we have already read the local hosts file, settle for...
Anders Broman [Tue, 17 Sep 2013 04:55:29 +0000 (04:55 -0000)]
Don't call gethostbyaddr() we have already read the local hosts file, settle for that.

svn path=/trunk/; revision=52115

6 years agoFrom Mark Vitale via
Evan Huus [Mon, 16 Sep 2013 23:24:32 +0000 (23:24 -0000)]
From Mark Vitale via

Fix decoding of AFS Volume Name.

svn path=/trunk/; revision=52114

6 years agoFrom Mark Vitale via
Evan Huus [Mon, 16 Sep 2013 23:15:18 +0000 (23:15 -0000)]
From Mark Vitale via

Add reassembly support for AFS.

From me: minor tweaks to conform to other reassemblable protocols; indentation
fixes; modelines

svn path=/trunk/; revision=52113

6 years agoCopy over rev 52110 to cmake
Jörg Mayer [Mon, 16 Sep 2013 21:45:46 +0000 (21:45 -0000)]
Copy over rev 52110 to cmake

svn path=/trunk/; revision=52112

6 years agoForgot to check in regenerated dissector for dap.
Jörg Mayer [Mon, 16 Sep 2013 21:38:42 +0000 (21:38 -0000)]
Forgot to check in regenerated dissector for dap.

svn path=/trunk/; revision=52111

6 years agoFix dependency problem reported by Joerg Mayer on wireshark-dev.
Chris Maynard [Mon, 16 Sep 2013 21:35:27 +0000 (21:35 -0000)]
Fix dependency problem reported by Joerg Mayer on wireshark-dev.

svn path=/trunk/; revision=52110

6 years agoWhitespace changes
Jörg Mayer [Mon, 16 Sep 2013 21:35:19 +0000 (21:35 -0000)]
Whitespace changes

svn path=/trunk/; revision=52109

6 years agoaddress_equal → addresses_equal. Switch from address macros to functions
Gerald Combs [Mon, 16 Sep 2013 21:33:26 +0000 (21:33 -0000)]
address_equal → addresses_equal. Switch from address macros to functions
in the Qt code.

svn path=/trunk/; revision=52108

6 years agoFix :
Pascal Quantin [Mon, 16 Sep 2013 21:26:03 +0000 (21:26 -0000)]
Fix :
Ensure that codec_str string is always initialized

svn path=/trunk/; revision=52107

6 years agoConvert each of the address.h macros to inline functions.
Gerald Combs [Mon, 16 Sep 2013 21:15:49 +0000 (21:15 -0000)]
Convert each of the address.h macros to inline functions.

Document each function. Note that we now call tvb_get_ptr() before
modifying the address in tvb_set_address() and tvb_set_address_hf(). The
caller doesn't have to worry about doing that any more. Add

svn path=/trunk/; revision=52106

6 years agoDon't print a warning about missing svn id when the argument is not
Jörg Mayer [Mon, 16 Sep 2013 20:30:34 +0000 (20:30 -0000)]
Don't print a warning about missing svn id when the argument is not
a file. Warn about the "wrong" filetype and continue

svn path=/trunk/; revision=52105

6 years agoRead the local services file.
Anders Broman [Mon, 16 Sep 2013 18:36:50 +0000 (18:36 -0000)]
Read the local services file.

svn path=/trunk/; revision=52104

6 years agoDon't call getservbyport() on unresolved ports - it's expensive.
Anders Broman [Mon, 16 Sep 2013 17:53:41 +0000 (17:53 -0000)]
Don't call getservbyport() on unresolved ports - it's expensive.
We should read the services file in initialize_services instead.

svn path=/trunk/; revision=52103

6 years agoAdd stream information to the hint label. Update our hint more often.
Gerald Combs [Mon, 16 Sep 2013 17:28:42 +0000 (17:28 -0000)]
Add stream information to the hint label. Update our hint more often.
Add a "to do" list.

svn path=/trunk/; revision=52102

6 years agoTrivial: Fix typo.
Chris Maynard [Mon, 16 Sep 2013 16:49:17 +0000 (16:49 -0000)]
Trivial: Fix typo.

svn path=/trunk/; revision=52101

6 years agoRemove a bunch more set-but-no-longer-used variables.
Jeff Morriss [Mon, 16 Sep 2013 14:08:43 +0000 (14:08 -0000)]
Remove a bunch more set-but-no-longer-used variables.

svn path=/trunk/; revision=52100

6 years agoRemove set-but-no-longer-used variable.
Jeff Morriss [Mon, 16 Sep 2013 14:05:31 +0000 (14:05 -0000)]
Remove set-but-no-longer-used variable.

svn path=/trunk/; revision=52099

6 years agoConvert proto_tree_add_uint_format to proto_tree_add_uint_format_value if hf_ field...
Michael Mann [Mon, 16 Sep 2013 10:39:06 +0000 (10:39 -0000)]
Convert proto_tree_add_uint_format to proto_tree_add_uint_format_value if hf_ field name is the first part of the formatted string.  This was all manual inspection and most cases were either:
1. Case sensitivity differences between hf_ field name and formatted string.
2. Unnecessary whitespace between hf_ field name and colon in formatted string

There are cases where the hf_ field name doesn't quite match the proto_tree_add_uint_format, but it's close enough that one of them should be "right", I'm just not sure which is, I just know the string in proto_tree_add_uint_format is the one displayed.

svn path=/trunk/; revision=52098

6 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
Alexis La Goutte [Mon, 16 Sep 2013 07:56:04 +0000 (07:56 -0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

svn path=/trunk/; revision=52097

6 years agoFrom Peter Wu via
Alexis La Goutte [Mon, 16 Sep 2013 07:54:28 +0000 (07:54 -0000)]
From Peter Wu via

Update TLS Ciphers

The attached trivial patch corrects the digest (SHA) length for TLS_DHE_DSS_EXPORT1024_WITH_DES_CBC_SHA

svn path=/trunk/; revision=52096

6 years agoMake sure we don't tap our packets twice. Give the graph has focus after
Gerald Combs [Mon, 16 Sep 2013 02:04:52 +0000 (02:04 -0000)]
Make sure we don't tap our packets twice. Give the graph has focus after
we redraw it.

svn path=/trunk/; revision=52095

6 years agoFix graph type selection.
Gerald Combs [Mon, 16 Sep 2013 01:19:14 +0000 (01:19 -0000)]
Fix graph type selection.

svn path=/trunk/; revision=52094

6 years agoAnother attempt at axis scaling. Tweak the appearance a little.
Gerald Combs [Mon, 16 Sep 2013 00:50:23 +0000 (00:50 -0000)]
Another attempt at axis scaling. Tweak the appearance a little.

svn path=/trunk/; revision=52093

6 years agoWhen caclulating throughput, only subtract what we've added. Try to fix
Gerald Combs [Sun, 15 Sep 2013 23:55:51 +0000 (23:55 -0000)]
When caclulating throughput, only subtract what we've added. Try to fix
axis scaling.

svn path=/trunk/; revision=52092