6 years agoFrom e.yimjia via :
Pascal Quantin [Sun, 20 Oct 2013 18:43:00 +0000 (18:43 -0000)]
From e.yimjia via :
Add dissection of OMA-ILP

svn path=/trunk/; revision=52721

6 years agoRegenerate H.225 dissector
Pascal Quantin [Sun, 20 Oct 2013 18:26:08 +0000 (18:26 -0000)]
Regenerate H.225 dissector

svn path=/trunk/; revision=52720

6 years agoFix a typo
Pascal Quantin [Sun, 20 Oct 2013 18:06:23 +0000 (18:06 -0000)]
Fix a typo

svn path=/trunk/; revision=52719

6 years agoPass MPLS "private data" into subdissectors instead of using pinfo->private_data.
Michael Mann [Sun, 20 Oct 2013 18:00:05 +0000 (18:00 -0000)]
Pass MPLS "private data" into subdissectors instead of using pinfo->private_data.

svn path=/trunk/; revision=52718

6 years agoTry to fix recent test failures (wild guess, can't reproduce).
Jakub Zawadzki [Sun, 20 Oct 2013 17:53:55 +0000 (17:53 -0000)]
Try to fix recent test failures (wild guess, can't reproduce).

svn path=/trunk/; revision=52717

6 years agoFrom RobiOneKenobi via :
Pascal Quantin [Sun, 20 Oct 2013 17:35:30 +0000 (17:35 -0000)]
From RobiOneKenobi via :
Add support for MSVC2013

svn path=/trunk/; revision=52716

6 years agoFrom robionekenobi via :
Pascal Quantin [Sun, 20 Oct 2013 16:57:38 +0000 (16:57 -0000)]
From robionekenobi via :
Fix compilation of packet-mq.c

svn path=/trunk/; revision=52715

6 years ago[Automatic manuf, services and enterprise-numbers update for 2013-10-20]
Gerald Combs [Sun, 20 Oct 2013 14:03:43 +0000 (14:03 -0000)]
[Automatic manuf, services and enterprise-numbers update for 2013-10-20]

svn path=/trunk/; revision=52712

6 years agowireshark: use epan_dissect_reset(), rawshark: fix missing epan_dissect_cleanup()
Jakub Zawadzki [Sun, 20 Oct 2013 13:22:48 +0000 (13:22 -0000)]
wireshark: use epan_dissect_reset(), rawshark: fix missing epan_dissect_cleanup()

svn path=/trunk/; revision=52711

6 years agoAdd more new protocols to release notes
Pascal Quantin [Sun, 20 Oct 2013 12:53:04 +0000 (12:53 -0000)]
Add more new protocols to release notes

svn path=/trunk/; revision=52710

6 years agotshark: use epan_dissect_reset()
Jakub Zawadzki [Sun, 20 Oct 2013 12:35:55 +0000 (12:35 -0000)]
tshark: use epan_dissect_reset()

svn path=/trunk/; revision=52709

6 years agorawshark: use epan_dissect_reset()
Jakub Zawadzki [Sun, 20 Oct 2013 12:34:42 +0000 (12:34 -0000)]
rawshark: use epan_dissect_reset()

svn path=/trunk/; revision=52708

6 years agoEnhancement of the packet-mq dissector (WMQ 7.1-7.5). Bug 9267 (https://bugs.wiresha...
Michael Mann [Sun, 20 Oct 2013 12:11:55 +0000 (12:11 -0000)]
Enhancement of the packet-mq dissector (WMQ 7.1-7.5).  Bug 9267 (

From robionekenobi

From me: Pass data through dissectors instead of using pinfo->private_data

svn path=/trunk/; revision=52707

6 years agoReintroduce back epan_dissect_reset(), proto_tree_reset()
Jakub Zawadzki [Sun, 20 Oct 2013 10:21:25 +0000 (10:21 -0000)]
Reintroduce back epan_dissect_reset(), proto_tree_reset()

This time it makes more sense, cause for each dissection we need two wmem allocators.
Reseting wmem allocator is much faster than destroy & create.

svn path=/trunk/; revision=52706

6 years agoMove resetting packet_info structure from dissect_packet() to epan_dissect_init()
Jakub Zawadzki [Sun, 20 Oct 2013 10:11:16 +0000 (10:11 -0000)]
Move resetting packet_info structure from dissect_packet() to epan_dissect_init()

It'd be actually good idea to seperate packet_info data (packet.c) from epan_dissect_t (epan.c),
but this rule is already violated.

Strict seperation could allow for example allow multiple dissection on the same epan_dissect_t
(I think it was idea behind it), but it's not working.

svn path=/trunk/; revision=52705

6 years agoRemove allocation stem from PROTO_NODE_NEW() macro.
Jakub Zawadzki [Sun, 20 Oct 2013 10:03:32 +0000 (10:03 -0000)]
Remove allocation stem from PROTO_NODE_NEW() macro.

Tree root-node will be allocated using g_slice()

svn path=/trunk/; revision=52704

6 years agoRemove non-ASCII characters causing checkAPI failures
Evan Huus [Sun, 20 Oct 2013 02:38:51 +0000 (02:38 -0000)]
Remove non-ASCII characters causing checkAPI failures

svn path=/trunk/; revision=52703

6 years agoFix format error.
Evan Huus [Sun, 20 Oct 2013 02:24:34 +0000 (02:24 -0000)]
Fix format error.

svn path=/trunk/; revision=52702

6 years agoDon't use g_assert_cmpint, it isn't happy on Windows. g_assert is nearly as good
Evan Huus [Sun, 20 Oct 2013 02:18:19 +0000 (02:18 -0000)]
Don't use g_assert_cmpint, it isn't happy on Windows. g_assert is nearly as good
except it doesn't produce as nice error messages.

svn path=/trunk/; revision=52701

6 years agoConvert the proto_tree_add_text calls that should have been expert info.
Michael Mann [Sun, 20 Oct 2013 02:17:42 +0000 (02:17 -0000)]
Convert the proto_tree_add_text calls that should have been expert info.

svn path=/trunk/; revision=52700

6 years agoTake a blind stab at adding oids_test to nmake
Evan Huus [Sun, 20 Oct 2013 02:10:39 +0000 (02:10 -0000)]
Take a blind stab at adding oids_test to nmake

svn path=/trunk/; revision=52699

6 years agoPass SPX "private data" into subdissectors instead of using pinfo->private_data.
Michael Mann [Sat, 19 Oct 2013 23:06:13 +0000 (23:06 -0000)]
Pass SPX "private data" into subdissectors instead of using pinfo->private_data.

svn path=/trunk/; revision=52698

6 years agoFrom
Anders Broman [Sat, 19 Oct 2013 20:25:55 +0000 (20:25 -0000)]
remove unnecessary and unused oid_resolv_cleanup()

svn path=/trunk/; revision=52697

6 years agoFrom Zoltán Lajos Kis:
Anders Broman [Sat, 19 Oct 2013 20:19:35 +0000 (20:19 -0000)]
From Zoltán Lajos Kis:
dissect flow_mod body in openflow_v4

svn path=/trunk/; revision=52696

6 years agoMinor optimizations.
Anders Broman [Sat, 19 Oct 2013 20:16:00 +0000 (20:16 -0000)]
Minor optimizations.

svn path=/trunk/; revision=52695

6 years agoDon't link explicitly with libwmem, it's already in libwireshark and the symbol
Evan Huus [Sat, 19 Oct 2013 19:40:02 +0000 (19:40 -0000)]
Don't link explicitly with libwmem, it's already in libwireshark and the symbol
doubling leads to all sorts of very subtle badness (including test failures due
to funny internal assertions because the two wmems have mismatching state).

Make wmem_init and wmem_cleanup PUBLIC instead of LOCAL so that they don't get
stripped and don't cause a link failure when trying to build oids_test (now that
it's not linking with libwmem explicitly). There is possibly a better way to fix
this, but I'm not sure what it is.

svn path=/trunk/; revision=52694

6 years agoAdd OID unit tests. Bug 9294 (
Michael Mann [Sat, 19 Oct 2013 18:52:13 +0000 (18:52 -0000)]
Add OID unit tests.  Bug 9294 (

From Ed Beroset

svn path=/trunk/; revision=52692

6 years agoCorrect source code formatting. Bug 9146 (
Michael Mann [Sat, 19 Oct 2013 16:50:52 +0000 (16:50 -0000)]
Correct source code formatting.  Bug 9146 (

From Roland Knall

svn path=/trunk/; revision=52691

6 years agoUpdate comments
Pascal Quantin [Sat, 19 Oct 2013 16:13:40 +0000 (16:13 -0000)]
Update comments

svn path=/trunk/; revision=52690

6 years agoMinor refactoring in CMake ABI dump generation
Balint Reczey [Sat, 19 Oct 2013 15:51:36 +0000 (15:51 -0000)]
Minor refactoring in CMake ABI dump generation

svn path=/trunk/; revision=52689

6 years agoSet and use TMPDIR for ABI dump generation when using CMake
Balint Reczey [Sat, 19 Oct 2013 14:55:12 +0000 (14:55 -0000)]
Set and use TMPDIR for ABI dump generation when using CMake

svn path=/trunk/; revision=52688

6 years agoUpdate E.212 list to Operational Bulletin No. 1038 (15.X.2013)
Pascal Quantin [Sat, 19 Oct 2013 14:10:05 +0000 (14:10 -0000)]
Update E.212 list to Operational Bulletin No. 1038 (15.X.2013)

svn path=/trunk/; revision=52687

6 years agoUpdate ITU E.164 list to Operational Bulletin No. 1038 (15.X.2013)
Pascal Quantin [Sat, 19 Oct 2013 14:09:14 +0000 (14:09 -0000)]
Update ITU E.164 list to Operational Bulletin No. 1038 (15.X.2013)

svn path=/trunk/; revision=52686

6 years agoConvert to new hf handling
Jörg Mayer [Sat, 19 Oct 2013 10:04:39 +0000 (10:04 -0000)]
Convert to new hf handling

svn path=/trunk/; revision=52685

6 years agoSome more decoding of mint traffic, start reformatting (incomplete)
Jörg Mayer [Sat, 19 Oct 2013 09:04:10 +0000 (09:04 -0000)]
Some more decoding of mint traffic, start reformatting (incomplete)

svn path=/trunk/; revision=52684

6 years agoOnly allow one popup dialog in UAT dialog. Editing/copying/deleting can modify the...
Michael Mann [Sat, 19 Oct 2013 02:45:01 +0000 (02:45 -0000)]
Only allow one popup dialog in UAT dialog.  Editing/copying/deleting can modify the uat list and other open dialogs will not be aware of it and lead to unexpected behavior (including crashes).  Fixes bug 9129 (


svn path=/trunk/; revision=52683

6 years agoFix writing enhanced packet blocks when flags are
Michael Tüxen [Fri, 18 Oct 2013 22:39:31 +0000 (22:39 -0000)]
Fix writing enhanced packet blocks when flags are
provided: Don't write the end od options parameter

svn path=/trunk/; revision=52682

6 years agoGet it actually building when we don't HAVE_LIBPCAP.
Jeff Morriss [Fri, 18 Oct 2013 21:47:05 +0000 (21:47 -0000)]
Get it actually building when we don't HAVE_LIBPCAP.

It would seem moc doesn't know about or pay attention to #ifdefs so take them
out of wireshark_application.h .

svn path=/trunk/; revision=52681

6 years agoClean up warnings when we don't HAVE_LIBPCAP.
Jeff Morriss [Fri, 18 Oct 2013 21:32:59 +0000 (21:32 -0000)]
Clean up warnings when we don't HAVE_LIBPCAP.

svn path=/trunk/; revision=52680

6 years agoDon't allow invalid ranges to be specified for the stats tree. Bug 9130 (https:/...
Michael Mann [Fri, 18 Oct 2013 21:17:01 +0000 (21:17 -0000)]
Don't allow invalid ranges to be specified for the stats tree. Bug 9130 (

Not sure which memory allocation should be used here (using wmem caused crash), but this revision can at least be easily backported to 1.10 where the bug was reported.

Also allow a single number to be used in the stats range since it's considered a valid "range" by the UAT.

svn path=/trunk/; revision=52679

6 years ago- Remove hf_ integers from few more dissectors
Jakub Zawadzki [Fri, 18 Oct 2013 21:11:11 +0000 (21:11 -0000)]
- Remove hf_ integers from few more dissectors
- udp: remove proto_udp.

svn path=/trunk/; revision=52678

6 years agoWhite space cleanups (thanks either to or
Guy Harris [Fri, 18 Oct 2013 20:28:11 +0000 (20:28 -0000)]
White space cleanups (thanks either to or
Bill Meier; see bug 9280).

svn path=/trunk/; revision=52677

6 years agoSimplify a bit (in a way which will hopefully actually work): just don't add -Wshorte...
Jeff Morriss [Fri, 18 Oct 2013 18:28:57 +0000 (18:28 -0000)]
Simplify a bit (in a way which will hopefully actually work): just don't add -Wshorten-64-to-32 to CXXFLAGS.  Also, add AM_CLEAN_FLAGS to AM_CXXFLAGS, not AM_CPPFLAGS.

svn path=/trunk/; revision=52676

6 years agoFix lemon FSF address and add license exception for the generated mate grammar
Evan Huus [Fri, 18 Oct 2013 18:10:46 +0000 (18:10 -0000)]
Fix lemon FSF address and add license exception for the generated mate grammar
files. One of them has no license (it is just defines) and the other gets picked
up as LGPL for no reason I can discern.

svn path=/trunk/; revision=52675

6 years agoAdd -Wno-shorten-64-to-32 (if we can) when compiling the Qt UI.
Jeff Morriss [Fri, 18 Oct 2013 17:42:32 +0000 (17:42 -0000)]
Add -Wno-shorten-64-to-32 (if we can) when compiling the Qt UI.

svn path=/trunk/; revision=52674

6 years agoAdd AM_CLEAN_CFLAGS (-Werror) to AM_CPPFLAGS so we get notified of warnings in
Jeff Morriss [Fri, 18 Oct 2013 16:56:27 +0000 (16:56 -0000)]
Add AM_CLEAN_CFLAGS (-Werror) to AM_CPPFLAGS so we get notified of warnings in
the C++ stuff.

ui/qt/CMakeLists.txt adds -Wno-shorten-64-to-32 on 64-bit systems but it
doesn't seem necessary on Fedora 18 (64-bit).  Leaving it out for now--let's
see what others say...

svn path=/trunk/; revision=52673

6 years agoMake sure LIBGCRYPT_CFLAGS is added to AM_CPPFLAGS.
Gerald Combs [Fri, 18 Oct 2013 16:32:43 +0000 (16:32 -0000)]

svn path=/trunk/; revision=52672

6 years agoRevert SVN #52650 as per discussion on wireshark-dev
Bill Meier [Fri, 18 Oct 2013 15:08:19 +0000 (15:08 -0000)]
Revert SVN #52650 as per discussion on wireshark-dev

svn path=/trunk/; revision=52671

6 years agoUse Z_tree for the subtree
Michael Mann [Fri, 18 Oct 2013 14:41:01 +0000 (14:41 -0000)]
Use Z_tree for the subtree

svn path=/trunk/; revision=52670

6 years agoBeginnings of Motrola's MiNT protocol.
Jörg Mayer [Fri, 18 Oct 2013 13:09:22 +0000 (13:09 -0000)]
Beginnings of Motrola's MiNT protocol.
Most important missing item: Fill in the test functions
to avoid using all packets to the (fixed) ports.

svn path=/trunk/; revision=52669

6 years agoForgot in the previous checkin.
Jörg Mayer [Fri, 18 Oct 2013 13:06:33 +0000 (13:06 -0000)]
Forgot in the previous checkin.

svn path=/trunk/; revision=52668

6 years agoAfter looking for something in the column-*.h files and
Jörg Mayer [Fri, 18 Oct 2013 13:06:05 +0000 (13:06 -0000)]
After looking for something in the column-*.h files and
not finding it, I finally found it in column_info.h
Renamed column_info.h to column-info.h to have consistency
with the column*h files.

svn path=/trunk/; revision=52667

6 years agoRevert SVN #52665.
Bill Meier [Fri, 18 Oct 2013 04:31:08 +0000 (04:31 -0000)]
Revert SVN #52665.

Compilation fails on (only the ?) OSX-10.6-x64 buildbot with error:

netscaler.c: In function 'nstrace_read_v30':
netscaler.c:1295: warning: implicit conversion shortens 64-bit value into a 32-bit value

(Life is too short for me to dig multiple levels deep into a set of macros to try to see which
 actual line of code is causing the problem.  Maybe the patch submitter can identify the problem).

svn path=/trunk/; revision=52666

6 years agoFrom Shekhar Chandra: support for version 3.0 of netscaler packet wire format.
Bill Meier [Fri, 18 Oct 2013 03:36:04 +0000 (03:36 -0000)]
From Shekhar Chandra: support for version 3.0 of netscaler packet wire format.

From me: fix indentation(tabs->spaces) and trailing whitespace.

svn path=/trunk/; revision=52665

6 years agoAdd more filterable fields around EDNS(0)
Michael Mann [Fri, 18 Oct 2013 01:53:32 +0000 (01:53 -0000)]
Add more filterable fields around EDNS(0)

svn path=/trunk/; revision=52664

6 years agoSign all of the executables.
Gerald Combs [Thu, 17 Oct 2013 22:34:38 +0000 (22:34 -0000)]
Sign all of the executables.

svn path=/trunk/; revision=52663

6 years agoBugfix an apparent typo in edns0 "Higher bits in extended RCODE". Bug 9199 (https...
Michael Mann [Thu, 17 Oct 2013 20:54:42 +0000 (20:54 -0000)]
Bugfix an apparent typo in edns0 "Higher bits in extended RCODE".  Bug 9199 (


svn path=/trunk/; revision=52662

6 years agoIf static analysis is enabled disable error checking when compiling the
Gerald Combs [Thu, 17 Oct 2013 17:50:00 +0000 (17:50 -0000)]
If static analysis is enabled disable error checking when compiling the
Qt code. This should hopefully work around a builder issue.

svn path=/trunk/; revision=52661

6 years agoRevert the optimization in r52578. As Jakub predicted, it caused at least one
Evan Huus [Thu, 17 Oct 2013 12:24:25 +0000 (12:24 -0000)]
Revert the optimization in r52578. As Jakub predicted, it caused at least one
infinite loop to pop up. We're just going to have to eat the performance hit.

svn path=/trunk/; revision=52660

6 years agoH.225.0: fix handling of compound parameters in Generic Extensible Framework (H.460...
Tomas Kukosa [Thu, 17 Oct 2013 11:24:43 +0000 (11:24 -0000)]
H.225.0: fix handling of compound parameters in Generic Extensible Framework (H.460.22 did not work well)

svn path=/trunk/; revision=52659

6 years agoTemporarily revert r52651 it caused a regression when trying to tvb_memcpy from
Evan Huus [Thu, 17 Oct 2013 02:43:21 +0000 (02:43 -0000)]
Temporarily revert r52651 it caused a regression when trying to tvb_memcpy from
a negative offset (

svn path=/trunk/; revision=52658

6 years agoProperly decode CAPWAP Data Keep-Alive's. Bug 9165 (
Michael Mann [Thu, 17 Oct 2013 02:13:23 +0000 (02:13 -0000)]
Properly decode CAPWAP Data Keep-Alive's.  Bug 9165 (

From Andreas Schultz

From me: Use expert API instead of throwing exception for a bad length.

svn path=/trunk/; revision=52657

6 years agoBe able to search through HTTP request and HTTP response lines. Bug 9134 (https...
Michael Mann [Thu, 17 Oct 2013 01:23:12 +0000 (01:23 -0000)]
Be able to search through HTTP request and HTTP response lines.  Bug 9134 (

From Edwin Groothuis

svn path=/trunk/; revision=52656

6 years agoIf the length we allocated was 0, don't try and write to the returned pointer.
Evan Huus [Wed, 16 Oct 2013 22:52:40 +0000 (22:52 -0000)]
If the length we allocated was 0, don't try and write to the returned pointer.

svn path=/trunk/; revision=52655

6 years agoAdd checks to see if CC and/or CXX are Clang. Add "-Qunused-arguments"
Gerald Combs [Wed, 16 Oct 2013 22:39:44 +0000 (22:39 -0000)]
Add checks to see if CC and/or CXX are Clang. Add "-Qunused-arguments"
to CFLAGS and/or CXXFLAGS as needed.

svn path=/trunk/; revision=52654

6 years agoRemove trailing blanks; Fix some indentation;
Bill Meier [Wed, 16 Oct 2013 20:35:08 +0000 (20:35 -0000)]
Remove trailing blanks; Fix some indentation;
Add editor modelines.

svn path=/trunk/; revision=52653

6 years agoFix inconsistent indentation & formatting, trailing blanks.
Bill Meier [Wed, 16 Oct 2013 20:32:57 +0000 (20:32 -0000)]
Fix inconsistent indentation & formatting, trailing blanks.
Add some parens.
Add editor modelines.

svn path=/trunk/; revision=52652

6 years agoCreate an internal _tvb_memcpy() without the sanity checks to be caled from tvb inter...
Anders Broman [Wed, 16 Oct 2013 20:05:59 +0000 (20:05 -0000)]
Create an internal _tvb_memcpy() without the sanity checks to be caled from tvb internal routines with sanity checks to avoid duplicated checks.

svn path=/trunk/; revision=52651

6 years agoPrepend to lists rather than append as that's more efficient.
Anders Broman [Wed, 16 Oct 2013 20:02:14 +0000 (20:02 -0000)]
Prepend to lists rather than append as that's more efficient.

svn path=/trunk/; revision=52650

6 years agoDon't bother checking for clang, just add -Qunused-arguments to the
Gerald Combs [Wed, 16 Oct 2013 18:40:13 +0000 (18:40 -0000)]
Don't bother checking for clang, just add -Qunused-arguments to the
compiler flags checks.

svn path=/trunk/; revision=52649

6 years agoIn packet-wsp.c, don't use the get_long_integer macro where we only need the
Evan Huus [Wed, 16 Oct 2013 18:08:24 +0000 (18:08 -0000)]
In packet-wsp.c, don't use the get_long_integer macro where we only need the
very smallest part of its logic. Just call tvb_get_guint8 directly and check
that the return is between 1 and 4. Properly fixes the set-but-unused and
associated warnings that were showing up.

svn path=/trunk/; revision=52648

6 years ago1.11.0 -> 1.11.1
Pascal Quantin [Wed, 16 Oct 2013 17:32:45 +0000 (17:32 -0000)]
1.11.0 -> 1.11.1

svn path=/trunk/; revision=52647

6 years agoIf we're using Clang add -Qunused-arguments in order to avoid a bunch
Gerald Combs [Wed, 16 Oct 2013 17:22:58 +0000 (17:22 -0000)]
If we're using Clang add -Qunused-arguments in order to avoid a bunch
of warnings described at

svn path=/trunk/; revision=52646

6 years agoFix warnings found by Clang 5.0 (-Wself-assign and -Wparentheses-equality).
Gerald Combs [Wed, 16 Oct 2013 17:19:59 +0000 (17:19 -0000)]
Fix warnings found by Clang 5.0 (-Wself-assign and -Wparentheses-equality).

Move code from ipv6-utils.h to packet-ipv6.c since that was the only
place it was used. Comment out unused code.

svn path=/trunk/; revision=52645

6 years agoFix a comment.
Gerald Combs [Wed, 16 Oct 2013 17:05:29 +0000 (17:05 -0000)]
Fix a comment.

svn path=/trunk/; revision=52644

6 years agoBack out the previous commit. We'll have to find a different fix.
Gerald Combs [Wed, 16 Oct 2013 16:44:56 +0000 (16:44 -0000)]
Back out the previous commit. We'll have to find a different fix.

svn path=/trunk/; revision=52643

6 years agoWork around a self-assingment error picked up by Clang 5.0.
Gerald Combs [Wed, 16 Oct 2013 16:41:28 +0000 (16:41 -0000)]
Work around a self-assingment error picked up by Clang 5.0.

svn path=/trunk/; revision=52642

6 years agoFix (what appears to be) a minor bug when dissecting RTMP.
Bill Meier [Wed, 16 Oct 2013 14:17:05 +0000 (14:17 -0000)]
Fix (what appears to be) a minor bug when dissecting RTMP.

svn path=/trunk/; revision=52641

6 years agoUpgrade RRLP dissector to V11.0.0
Pascal Quantin [Wed, 16 Oct 2013 03:06:46 +0000 (03:06 -0000)]
Upgrade RRLP dissector to V11.0.0

svn path=/trunk/; revision=52640

6 years agoFix various: whitespace, comments & etc.
Bill Meier [Wed, 16 Oct 2013 02:39:09 +0000 (02:39 -0000)]
Fix various: whitespace, comments & etc.
Add editor modelines.

svn path=/trunk/; revision=52639

6 years agoAdd blank line before 'and by'
Bill Meier [Wed, 16 Oct 2013 02:34:03 +0000 (02:34 -0000)]
Add blank line before 'and by'

svn path=/trunk/; revision=52638

6 years agoAdd Ed Beroset to the list of Wireshark authors.
Chris Maynard [Wed, 16 Oct 2013 01:10:04 +0000 (01:10 -0000)]
Add Ed Beroset to the list of Wireshark authors.

svn path=/trunk/; revision=52637

6 years agoFrom Ed Beroset: add modelines and fix irregular indenting;
Bill Meier [Wed, 16 Oct 2013 00:57:28 +0000 (00:57 -0000)]
From Ed Beroset: add modelines and fix irregular indenting;

This patch adds modelines and cleans up the irregular indentation of
this dissector's code.  The only other change was in
asn1/c1222/packet-c1222-template.c to consolidate an #ifdef that had a
redundant #endif (line 812) and subsequent reopening #ifdef (line
824).  The only thing between them was comments, so the span of the
original #ifdef (line 644) was simply extended by eliminating those
two lines.

The purpose for this patch is to make the file easier to edit and
understand in advance of more substantive patches later.  This patch
is intended to be easy to review by having only non-substantive

svn path=/trunk/; revision=52636

6 years agoUpdate the list of new protocols supported
Pascal Quantin [Wed, 16 Oct 2013 00:35:02 +0000 (00:35 -0000)]
Update the list of new protocols supported

svn path=/trunk/; revision=52635

6 years agoAs suggested separately by both Jakub and Anders: only read the
Evan Huus [Tue, 15 Oct 2013 23:16:35 +0000 (23:16 -0000)]
As suggested separately by both Jakub and Anders: only read the
WIRESHARK_DEBUG_WMEM_OVERRIDE environment variable once in wmem_init, not every
time wmem_allocator_new is called. We currently create a new pinfo pool for
every packet we dissect, so this is a small performance win, especially when
getenv is slow (which may happen if a large number of environment variables are
set, such as when fuzz-testing).

svn path=/trunk/; revision=52634

6 years agoIf CODE_SIGN_IDENTITY is set use it to sign the app bundle and the
Gerald Combs [Tue, 15 Oct 2013 23:03:48 +0000 (23:03 -0000)]
If CODE_SIGN_IDENTITY is set use it to sign the app bundle and the
installer package. Add commented-out code to sign the .dmg as well in
case Apple supports that in the future.

svn path=/trunk/; revision=52633

6 years agoAdjust parenthesis to make gcc happy.
Gerald Combs [Tue, 15 Oct 2013 21:31:32 +0000 (21:31 -0000)]
Adjust parenthesis to make gcc happy.

svn path=/trunk/; revision=52632

6 years agoDon't try heuristic dissectors on second pass if no match was found in the first...
Anders Broman [Tue, 15 Oct 2013 21:28:04 +0000 (21:28 -0000)]
Don't try heuristic dissectors on second pass if no match was found in the first one.

svn path=/trunk/; revision=52631

6 years agoFix ABI check error for libwireshark
Balint Reczey [Tue, 15 Oct 2013 20:14:47 +0000 (20:14 -0000)]
Fix ABI check error for libwireshark

svn path=/trunk/; revision=52630

6 years ago1.11.0 → 1.11.1.
Gerald Combs [Tue, 15 Oct 2013 19:21:04 +0000 (19:21 -0000)]
1.11.0 → 1.11.1.

svn path=/trunk/; revision=52629

6 years agoTry building 1.11.0.
Gerald Combs [Tue, 15 Oct 2013 18:40:00 +0000 (18:40 -0000)]
Try building 1.11.0.

svn path=/trunk/; revision=52628

6 years agoFrom Ed Beroset via
Chris Maynard [Tue, 15 Oct 2013 18:27:35 +0000 (18:27 -0000)]
From Ed Beroset via

Add tshark -G column-formats report and document the missing ftypes, heuristic-decodes and plugins reports.

From me: Sort the reports.  Add modelines to epan/column.c.  Minor whitespace changes.

svn path=/trunk/; revision=52627

6 years agog_slist_prepend() should be faster than g_slist_append() use it where the order shoul...
Anders Broman [Tue, 15 Oct 2013 18:21:03 +0000 (18:21 -0000)]
g_slist_prepend() should be faster than g_slist_append() use it where the order shouldn't matter.

svn path=/trunk/; revision=52626

6 years agoMicro-optimize print_columns(): replace g_snprintf() & g_strlcat() with memcpy().
Jakub Zawadzki [Tue, 15 Oct 2013 18:20:59 +0000 (18:20 -0000)]
Micro-optimize print_columns(): replace g_snprintf() & g_strlcat() with memcpy().

svn path=/trunk/; revision=52625

6 years agoTry to optimize heuristics slightly.
Anders Broman [Tue, 15 Oct 2013 18:19:57 +0000 (18:19 -0000)]
Try to optimize heuristics slightly.

svn path=/trunk/; revision=52624

6 years agoReorder all of the bitmask trees according to its endianess from highest to lowest...
Cal Turney [Tue, 15 Oct 2013 16:41:29 +0000 (16:41 -0000)]
Reorder all of the bitmask trees according to its endianess from highest to lowest order bit.
These consist of the following bitmask fields:
[packet-smb.c] 'Create Flags', 'Access Mask', 'File Attributes', 'Share Access', 'Create Options',
               'Security Flags', 'Optional Support'(in TreeConnect AndX responses), and "Quota Flags"
[packet-smb2.c] 'Flags', 'Session Flags', 'Security mode', and 'Interface Capabilities'.

[packet-smb.c] Made the tfs_file_attribute_xxx true_false_string values less verbose and more compact.

[packet-smb2.c] Changed all references to "RMDA" to RDMA".

[packet_smb.c] In dissect_qfi_SMB_FILE_NETWORK_OPEN_INFO() (GetInfo response) changed "Unknown Field"
               to "Reserved" (See capture 'DMtrace2.cap' frame 20023).

svn path=/trunk/; revision=52623

6 years agoAdd another cast.
Gerald Combs [Tue, 15 Oct 2013 16:40:19 +0000 (16:40 -0000)]
Add another cast.

svn path=/trunk/; revision=52622

6 years agoAdd casts to fix some shortening errors.
Gerald Combs [Tue, 15 Oct 2013 16:29:38 +0000 (16:29 -0000)]
Add casts to fix some shortening errors.

svn path=/trunk/; revision=52621

6 years agoAdd some missing parenthesis. Make sure we set our font in the right place.
Gerald Combs [Tue, 15 Oct 2013 15:22:03 +0000 (15:22 -0000)]
Add some missing parenthesis. Make sure we set our font in the right place.

Make the ColorUtils::fromColorT() convenience function a little more
convenient. Use it.

svn path=/trunk/; revision=52620

6 years agolimit the values written to phdr.(cap)len to guint32, not to guint16
Martin Kaiser [Tue, 15 Oct 2013 15:15:59 +0000 (15:15 -0000)]
limit the values written to phdr.(cap)len to guint32, not to guint16

We read a two-byte length field and add a constant number of header
bytes to this length, so we could in theory be larger than guint16.

svn path=/trunk/; revision=52619