6 years agoAttempt to fix Qt dependencies for SUSE.
Jeff Morriss [Thu, 21 Nov 2013 20:20:29 +0000 (20:20 -0000)]
Attempt to fix Qt dependencies for SUSE.

svn path=/trunk/; revision=53490

6 years agoRemove ethertype, mpls_label and ppids from packet_info structure.
Michael Mann [Thu, 21 Nov 2013 20:08:20 +0000 (20:08 -0000)]
Remove ethertype, mpls_label and ppids from packet_info structure.

The information was converted to "proto" data within their respective dissectors strictly for use in "Decode As".

svn path=/trunk/; revision=53489

6 years agoCreate new dissectors when a protocol goes across ethernet and "something else" inste...
Michael Mann [Thu, 21 Nov 2013 19:51:17 +0000 (19:51 -0000)]
Create new dissectors when a protocol goes across ethernet and "something else" instead a single dissector that uses pinfo->ethertype to determine if it's the "ethernet" or the "something else" case.

svn path=/trunk/; revision=53488

6 years agoAdd some "helper" macros to:
Bill Meier [Thu, 21 Nov 2013 19:11:47 +0000 (19:11 -0000)]
Add some "helper" macros to:
     Provide the capability to define a list of value_strings once and
     then to expand the list as an enum and/or as a value_string array.

svn path=/trunk/; revision=53487

6 years agoGet rid of C++ comments.
Guy Harris [Thu, 21 Nov 2013 18:50:44 +0000 (18:50 -0000)]
Get rid of C++ comments.

svn path=/trunk/; revision=53486

6 years ago#if 0 out some currently-unused variables and the code that sets them,
Guy Harris [Thu, 21 Nov 2013 18:48:36 +0000 (18:48 -0000)]
#if 0 out some currently-unused variables and the code that sets them,
to squelch compiler warnings.

svn path=/trunk/; revision=53485

6 years agoDo some constification;
Bill Meier [Thu, 21 Nov 2013 18:46:40 +0000 (18:46 -0000)]
Do some constification;
Create/use value_string_ext_free();
Display certain numbers also as hex in the
   "forced to fall back to linear search: ..." value-string warning msg
Add editor-modelines to some files;
Do some whitespace changes.

svn path=/trunk/; revision=53484

6 years ago(Trivial) Formatting & whitespace changes ....
Bill Meier [Thu, 21 Nov 2013 18:37:26 +0000 (18:37 -0000)]
(Trivial) Formatting & whitespace changes ....

svn path=/trunk/; revision=53483

6 years agoConstify two vars;
Bill Meier [Thu, 21 Nov 2013 18:03:10 +0000 (18:03 -0000)]
Constify two vars;
Add editor modelines;
Rework some whitespace.

svn path=/trunk/; revision=53482

6 years agoAdd a note about UTF-8.
Gerald Combs [Thu, 21 Nov 2013 17:44:12 +0000 (17:44 -0000)]
Add a note about UTF-8.

svn path=/trunk/; revision=53481

6 years agoConstify a character array;
Bill Meier [Thu, 21 Nov 2013 17:41:17 +0000 (17:41 -0000)]
Constify a character array;
Fix a typo;
Add editor modelines.

svn path=/trunk/; revision=53480

6 years agoRemove an unused function.
Gerald Combs [Thu, 21 Nov 2013 17:39:32 +0000 (17:39 -0000)]
Remove an unused function.

svn path=/trunk/; revision=53479

6 years agoCreate separate dissector function for TCP functionality so packet_info->ethertype...
Michael Mann [Thu, 21 Nov 2013 17:18:11 +0000 (17:18 -0000)]
Create separate dissector function for TCP functionality so packet_info->ethertype doesn't need to be used.

svn path=/trunk/; revision=53478

6 years agoCreate/use a number of extended value-strings;
Bill Meier [Thu, 21 Nov 2013 17:12:05 +0000 (17:12 -0000)]
Create/use a number of extended value-strings;
Use FT_BOOLEAN instead of FT_UINT16 with 'ptp_bool_vals' value_string array;
Add editor modelines;
Do some whitespace & formatting changes.

svn path=/trunk/; revision=53477

6 years agoRemove packet_info->ipproto and packet_info->ethertype uses in the GUI. Convert...
Michael Mann [Thu, 21 Nov 2013 16:42:10 +0000 (16:42 -0000)]
Remove packet_info->ipproto and packet_info->ethertype uses in the GUI.  Convert to walking packet protocol list looking for desired protocols.

I may eventually switch this to use proto_* values instead of strings, but just the addition of the loop is more jarring as compared to the simple comparing of ip or ethernet values.  But it should lead to a smaller (less protocol specific) packet_info structure.

svn path=/trunk/; revision=53476

6 years agoCope with empty VWR files (bug 9428)
Martin Mathieson [Thu, 21 Nov 2013 15:42:22 +0000 (15:42 -0000)]
Cope with empty VWR files (bug 9428)

svn path=/trunk/; revision=53475

6 years agoRevert what I thought was a simple "compile" change for r53473, but causes Wireshark...
Michael Mann [Thu, 21 Nov 2013 12:46:31 +0000 (12:46 -0000)]
Revert what I thought was a simple "compile" change for r53473, but causes Wireshark to crash at startup.

svn path=/trunk/; revision=53474

6 years agoWalk list of protocol strings to determine which protocols are present in a packet...
Michael Mann [Thu, 21 Nov 2013 12:16:49 +0000 (12:16 -0000)]
Walk list of protocol strings to determine which protocols are present in a packet rather than rely on protocol specific items in packet_info in an effort to (eventually) reduce packet_info members.

svn path=/trunk/; revision=53473

6 years agoIndicate fragments in info column
Pascal Quantin [Thu, 21 Nov 2013 11:20:06 +0000 (11:20 -0000)]
Indicate fragments in info column

svn path=/trunk/; revision=53472

6 years agoDo not add an unknown tag item for End-of-options
Pascal Quantin [Thu, 21 Nov 2013 09:33:01 +0000 (09:33 -0000)]
Do not add an unknown tag item for End-of-options

svn path=/trunk/; revision=53471

6 years agoDetect out-of-bounds when handling zero terminated strings from a TvbRange.
Stig Bjørlykke [Thu, 21 Nov 2013 08:42:21 +0000 (08:42 -0000)]
Detect out-of-bounds when handling zero terminated strings from a TvbRange.
This avoids a wireshark crash.

svn path=/trunk/; revision=53470

6 years agoAdd ui_stats_tree_dialog.h to the list of generated headers not to
Guy Harris [Thu, 21 Nov 2013 05:55:30 +0000 (05:55 -0000)]
Add ui_stats_tree_dialog.h to the list of generated headers not to
install; that should fix the "make distclean" errors.

svn path=/trunk/; revision=53469

6 years agoFix memory leak from formatted string.
Michael Mann [Thu, 21 Nov 2013 03:26:42 +0000 (03:26 -0000)]
Fix memory leak from formatted string.

svn path=/trunk/; revision=53468

6 years agoFix buildbing ui/qt/wireshark-tap-register.c with autotools.
Gerald Combs [Thu, 21 Nov 2013 02:12:56 +0000 (02:12 -0000)]
Fix buildbing ui/qt/wireshark-tap-register.c with autotools.

svn path=/trunk/; revision=53467

6 years agoTry to get qmake to create wireshark-tap-register.c.
Gerald Combs [Thu, 21 Nov 2013 02:05:36 +0000 (02:05 -0000)]
Try to get qmake to create wireshark-tap-register.c.

svn path=/trunk/; revision=53466

6 years agoAdd the new stats tree.
Gerald Combs [Thu, 21 Nov 2013 01:31:36 +0000 (01:31 -0000)]
Add the new stats tree.

svn path=/trunk/; revision=53465

6 years agoAdd a statistics tree dialog.
Gerald Combs [Thu, 21 Nov 2013 01:28:17 +0000 (01:28 -0000)]
Add a statistics tree dialog.

Add menu items for each corresponding item in gtk/main_menubar.c that
calls gtk_stats_tree_cb(). Hopefully that's everything. Note that we use
quite a bit less code than the GTK+ flavor and why we might not want to
do that. Change a few things in ui/qt/CMakeLists.txt to more closely
match the GTK+ version. Add plumbing for tap registrations in
CMakeLists.txt and Add the ability to copy text as CSV or

svn path=/trunk/; revision=53464

6 years agoUSB CCID and PN532_HCI can be now used in Decode As. Bug 9445 (https://bugs.wireshar...
Michael Mann [Thu, 21 Nov 2013 01:18:23 +0000 (01:18 -0000)]
USB CCID and PN532_HCI can be now used in Decode As.  Bug 9445 (

From Michal Labedzki

svn path=/trunk/; revision=53463

6 years agoFix DecodeBy priorities. Bug 9445 (
Michael Mann [Thu, 21 Nov 2013 01:12:25 +0000 (01:12 -0000)]
Fix DecodeBy priorities.  Bug 9445 (

From Michal Labedzki.

svn path=/trunk/; revision=53462

6 years agostrncpy() consideered unsafe (it doesn't, for example, guarantee that
Guy Harris [Thu, 21 Nov 2013 00:38:22 +0000 (00:38 -0000)]
strncpy() consideered unsafe (it doesn't, for example, guarantee that
the result is null-terminated); use g_strlcpy() (which *does* guarantee
null termination) instead.

svn path=/trunk/; revision=53461

6 years agoWe don't need "ws_symbol_export.h" if we're not using anything from it;
Guy Harris [Thu, 21 Nov 2013 00:34:38 +0000 (00:34 -0000)]
We don't need "ws_symbol_export.h" if we're not using anything from it;
see whether that's what's currently causing Windows build problems.

svn path=/trunk/; revision=53460

6 years agoGTK3 >= 3.10 will fail building if deprecation warnings are on.
Jörg Mayer [Thu, 21 Nov 2013 00:28:33 +0000 (00:28 -0000)]
GTK3 >= 3.10 will fail building if deprecation warnings are on.
Fix this for the cmake build by disabling these warnings.

svn path=/trunk/; revision=53459

6 years agoRemove one accidentally remaining reference to emem in XMPP utils.
Evan Huus [Thu, 21 Nov 2013 00:18:12 +0000 (00:18 -0000)]
Remove one accidentally remaining reference to emem in XMPP utils.

Kill a bunch of now-unused emem tree code.

svn path=/trunk/; revision=53458

6 years agoFix Bug #9457 Update BACnet vendor list
Jakub Zawadzki [Wed, 20 Nov 2013 23:32:02 +0000 (23:32 -0000)]
Fix Bug #9457 Update BACnet vendor list

Based on attachment #12139 (diff for adding the table) by rtsking117,
but keep original formatting and encoding (ASCII).

svn path=/trunk/; revision=53457

6 years agoFix minor issue introduced with conversion to new expert API in r51688.
Evan Huus [Wed, 20 Nov 2013 22:51:14 +0000 (22:51 -0000)]
Fix minor issue introduced with conversion to new expert API in r51688.
Specifically, proto_tree_add_expert() must take an actual tree node (for example
from proto_item_add_subtree()) and cannot take just any old item node. The
original intent (before the conversion) appeared to be just to put it on the
tree, so do that.

Another assertion gone from

svn path=/trunk/; revision=53456

6 years agostatus, in main, is now used only if we have libpcap.
Guy Harris [Wed, 20 Nov 2013 22:38:15 +0000 (22:38 -0000)]
status, in main, is now used only if we have libpcap.

svn path=/trunk/; revision=53455

6 years agolibui is an static library, not a dynamic library, so the WS_DLL_PUBLIC
Guy Harris [Wed, 20 Nov 2013 22:36:05 +0000 (22:36 -0000)]
libui is an static library, not a dynamic library, so the WS_DLL_PUBLIC
stuff isn't necessary and doesn't work on Windows.

svn path=/trunk/; revision=53454

6 years agoAs per suggestion of Mike Morrin via
Evan Huus [Wed, 20 Nov 2013 22:34:36 +0000 (22:34 -0000)]
As per suggestion of Mike Morrin via

The GSM CBCH assertion should be <= 48 not <48. Fixes one of the failing
assertions with the capture from that bug.

svn path=/trunk/; revision=53453

6 years agoAdd support for a new type of frame data record seen in a k18 file, and
Guy Harris [Wed, 20 Nov 2013 21:00:55 +0000 (21:00 -0000)]
Add support for a new type of frame data record seen in a k18 file, and
handle that file not ending with a 2-byte 0xffff end-of-file record.

This fixes bug 9455, although it doesn't add support for reading an
"index" file for a capture that's in multiple .rf5 files, which is a
separate issue noted in that bug.

It also doesn't attempt to figure out what the data in the new record
type following the data that appears to be the same as that in the other
data record format but preceding the actual packet data is.

svn path=/trunk/; revision=53452

6 years agoMark another parameter as unused
Pascal Quantin [Wed, 20 Nov 2013 20:36:22 +0000 (20:36 -0000)]
Mark another parameter as unused

svn path=/trunk/; revision=53451

6 years agoAdd code to dump part of a record as ASCII, and use it to dump strings
Guy Harris [Wed, 20 Nov 2013 20:17:33 +0000 (20:17 -0000)]
Add code to dump part of a record as ASCII, and use it to dump strings
in a source description record, including the stack.  Dump some other
fields in those records as well.

Attach separate sequential and random read buffers to the private data
structure, rather than allocating them in various routines (and not
always freeing them) and, in at least one case, allocating a single
*common* buffer for all wth's to use.

Fix some comments (the DS0 mask is 32 bytes long, but gets turned into a

Put in a description of what a "stack file"'s contents look like.  Much
of it may be useless to us (for example, we have the notion that TCP has
protocol number 6 built-in...), but the RELATION entries that map from
"BASE" to a protocol could obviate the need to have the user specify a
map from stack file names to starting protocols, and we might be able to
use, for example, entries that map TCP/UDP/SCTP port numbers to
protocols to obviate the need for the user to explicitly use Decode As
or otherwise configure port-to-protocol mappings themselves.

Add a bunch of record length checks before we fetch data from records.

svn path=/trunk/; revision=53450

6 years agoAdd explicit casts to please GCC
Pascal Quantin [Wed, 20 Nov 2013 20:07:42 +0000 (20:07 -0000)]
Add explicit casts to please GCC

svn path=/trunk/; revision=53449

6 years agoAdd explicit casts to please GCC
Pascal Quantin [Wed, 20 Nov 2013 20:05:17 +0000 (20:05 -0000)]
Add explicit casts to please GCC

svn path=/trunk/; revision=53448

6 years agoMark parameter as unused
Anders Broman [Wed, 20 Nov 2013 19:52:21 +0000 (19:52 -0000)]
Mark parameter as unused
packet-ber.c:391: warning: unused parameter 'table_name'

svn path=/trunk/; revision=53447

6 years agoProvide "Decode As" functionality through dissectors themselves instead of the GUI...
Michael Mann [Wed, 20 Nov 2013 19:23:02 +0000 (19:23 -0000)]
Provide "Decode As" functionality through dissectors themselves instead of the GUI.  Bug 9450 (

The basic idea behind this design is to have dissectors register with a "decode as list" with their name and dissector table.  When "Decode As" dialog is launched, any "registered" dissector found in the packet will cause a tab to be created in the dialog.  Any GUI (GTK+/Qt/tshark) can just hook into the "decode as list" to see what can be provided.

This patch includes the GUI portion of the functionality (including packet-dcerpc.[ch] because it had some GUI dependencies that are now removed).

Other notes:
1. Some "GUI text" (UTF8_LEFTWARDS_ARROW and similar) made their way into the dissector code.  Not sure how necessary it is and if reformatting the strings to avoid the macros is desired (TCP/UDP use it, SCTP doesn't).

2. I converted the SCTP functionality to have 2 tabs (instead of radio button), currently both are labeled "Transport" which could be confusing to users.  Naming suggestions welcome (as well as for naming of tabs from other dissectors).

3. BER and DCERPC have more opportunity to use Decode As now that they are selected based on dissector presense, not packet_info values.

4. Catapult DCT2000 populates pinfo->ipproto, yet under new design will not show up to do Decode As.  Should a "decode as item" be created for it?

5. BER dissector doesn't have Clear/Show Current functionality working (never did)

6. Bluetooth (in old design) could have been used "capture wide" instead of single packet (creating tabs of values not present in current packet), which goes against what I believe to be in the intent of Decode As, but I'm willing to hear counter-arguments.

svn path=/trunk/; revision=53446

6 years agoProvide "Decode As" functionality through dissectors themselves instead of the GUI...
Michael Mann [Wed, 20 Nov 2013 19:17:08 +0000 (19:17 -0000)]
Provide "Decode As" functionality through dissectors themselves instead of the GUI.  Bug 9450 (

The basic idea behind this design is to have dissectors register with a "decode as list" with their name and dissector table.  When "Decode As" dialog is launched, any "registered" dissector found in the packet will cause a tab to be created in the dialog.

This patch includes just the dissector portion of the functionality (minus packet-dcerpc.[ch] because it has hooks to the current GUI)

svn path=/trunk/; revision=53445

6 years agoFrom Jakub via
Alexis La Goutte [Wed, 20 Nov 2013 18:38:48 +0000 (18:38 -0000)]
From Jakub via

Wrong offset incrementation in r53416 (Add status_request_v2 TLS extension dissection (RFC6961))

From me
Fix encoding args

svn path=/trunk/; revision=53444

6 years agoConvert ethertype() function into a pure dissector. Bug 9454 (https://bugs.wireshark...
Michael Mann [Wed, 20 Nov 2013 02:28:14 +0000 (02:28 -0000)]
Convert ethertype() function into a pure dissector.  Bug 9454 (

The main driving force for this was my new Decode As functionality ( that wants a dissector/subdissector table relationship for all dissectors wanting to use Decode As functionality.  The ethertype() function provides the value to the "ethertype" subdissector table, so I think it should be matched to a dissector.  Only odd side effect is the display filter of "ethertype" returns no packets because there is no "item" associated with the dissector.

svn path=/trunk/; revision=53443

6 years agoRemove a few (now unused) variables.
Michael Mann [Wed, 20 Nov 2013 01:44:06 +0000 (01:44 -0000)]
Remove a few (now unused) variables.

svn path=/trunk/; revision=53442

6 years agoUpdate URL for the Tektronix manual, and fix a typo in the same comment.
Guy Harris [Tue, 19 Nov 2013 22:22:16 +0000 (22:22 -0000)]
Update URL for the Tektronix manual, and fix a typo in the same comment.

Dump the raw contents of records as hex and ASCII, not just hex.

Sort the record types, and add a new one for a type we've seen in a k18
file and about which we know nothing.

For unknown record types, print the type in hex.

svn path=/trunk/; revision=53441

6 years agoSet our IPv6 status when we set addresses.
Gerald Combs [Tue, 19 Nov 2013 20:30:31 +0000 (20:30 -0000)]
Set our IPv6 status when we set addresses.

svn path=/trunk/; revision=53440

6 years agoPrint one YAML item per packet.
Gerald Combs [Tue, 19 Nov 2013 20:29:58 +0000 (20:29 -0000)]
Print one YAML item per packet.

svn path=/trunk/; revision=53439

6 years agoFix some problems with the debugging code.
Guy Harris [Tue, 19 Nov 2013 20:12:51 +0000 (20:12 -0000)]
Fix some problems with the debugging code.

svn path=/trunk/; revision=53438

6 years agoFix missing semicolon.
Guy Harris [Tue, 19 Nov 2013 20:06:47 +0000 (20:06 -0000)]
Fix missing semicolon.

svn path=/trunk/; revision=53437

6 years agoConstants that don't fit in 32 bits must be wrapped in
Guy Harris [Tue, 19 Nov 2013 20:05:21 +0000 (20:05 -0000)]
Constants that don't fit in 32 bits must be wrapped in

svn path=/trunk/; revision=53436

6 years agoAdd routines to set the personal file directory paths (personal
Guy Harris [Tue, 19 Nov 2013 19:45:38 +0000 (19:45 -0000)]
Add routines to set the personal file directory paths (personal
configuration file directory and directory in which to save captures),
have the routine to parse -P options use them, and move that routine to

Have that routine just return a gboolean.

svn path=/trunk/; revision=53435

6 years agoAdd dissection of UICC Application Identifier
Pascal Quantin [Tue, 19 Nov 2013 18:20:15 +0000 (18:20 -0000)]
Add dissection of UICC Application Identifier

svn path=/trunk/; revision=53434

6 years agoFix a typo
Pascal Quantin [Tue, 19 Nov 2013 18:18:52 +0000 (18:18 -0000)]
Fix a typo

svn path=/trunk/; revision=53433

6 years agoFix compilation with Clang (Remove limitation to -fPIE to only C)
Alexis La Goutte [Tue, 19 Nov 2013 12:27:09 +0000 (12:27 -0000)]
Fix compilation with Clang (Remove limitation to -fPIE to only C)

/usr/include/qt5/QtCore/qglobal.h:1079:4: error:
"You must build your code with position independent code if Qt was built with -reduce-relocations. " "Compile your code with -fPIC or -fPIE."

svn path=/trunk/; revision=53432

6 years agoFrom Glen Parker via
Alexis La Goutte [Tue, 19 Nov 2013 12:27:01 +0000 (12:27 -0000)]
From Glen Parker via

Add support for new PostgreSQL (9.3) error/notice message fields

Improves the PostgreSQL protocol dissector by adding support for the new error and notice fields which are new in PG 9.3:

In particular, it adds support for the 'p', 'q', 's', 't', 'c', 'd', and 'n' field codes.

From me :
Fix wrong hf name...

svn path=/trunk/; revision=53431

6 years agoFrom Ralph Böhme via
Alexis La Goutte [Tue, 19 Nov 2013 12:26:49 +0000 (12:26 -0000)]
From Ralph Böhme via

Add missing SMB_QUERY_CIFS_UNIX_INFO capability flags

Listed in;a=blob_plain;f=libcli/smb/smb_unix_ext.h;hb=HEAD

svn path=/trunk/; revision=53430

6 years agoadd editor modelines
Martin Kaiser [Tue, 19 Nov 2013 08:03:31 +0000 (08:03 -0000)]
add editor modelines

svn path=/trunk/; revision=53429

6 years agoremove unnecessary if(tree) checks
Martin Kaiser [Tue, 19 Nov 2013 07:56:30 +0000 (07:56 -0000)]
remove unnecessary if(tree) checks

svn path=/trunk/; revision=53428

6 years agoFrom DSR Corporation
Martin Kaiser [Tue, 19 Nov 2013 07:26:01 +0000 (07:26 -0000)]
From DSR Corporation

fix segfault in ZigBee APS tunnel commands
pass the data parameter to subdissectors

svn path=/trunk/; revision=53427

6 years agofix compiler warning about write-only variable
Martin Kaiser [Tue, 19 Nov 2013 07:05:34 +0000 (07:05 -0000)]
fix compiler warning about write-only variable

svn path=/trunk/; revision=53426

6 years agoFix [-Wmissing-prototypes]
Anders Broman [Tue, 19 Nov 2013 06:06:38 +0000 (06:06 -0000)]
Fix [-Wmissing-prototypes]

svn path=/trunk/; revision=53425

6 years agoRemove ppid member from packet_info structure and just pass it to SCTP subdissectors...
Michael Mann [Tue, 19 Nov 2013 01:07:28 +0000 (01:07 -0000)]
Remove ppid member from packet_info structure and just pass it to SCTP subdissectors.  There are no subdissectors currently in Wireshark source that use the ppid member so any third party dissectors need to update accordingly.

svn path=/trunk/; revision=53424

6 years agoThe GTK+ "follow stream" dialogs don't support "save as YAML"; put in a
Guy Harris [Tue, 19 Nov 2013 00:32:02 +0000 (00:32 -0000)]
The GTK+ "follow stream" dialogs don't support "save as YAML"; put in a
stub case, complete with a "this can't happen" assert failure, to
squelch compiler warnings.

svn path=/trunk/; revision=53423

6 years ago#if 0 out an error check that wasn't doing anything interesting for an
Guy Harris [Tue, 19 Nov 2013 00:29:37 +0000 (00:29 -0000)]
#if 0 out an error check that wasn't doing anything interesting for an
error, and put in a pseudo-code call to stand in for error reporting

Fix a signed-vs-unsigned comparison issue.

svn path=/trunk/; revision=53422

6 years agoFollow dialog data display improvements.
Gerald Combs [Mon, 18 Nov 2013 23:39:47 +0000 (23:39 -0000)]
Follow dialog data display improvements.

Change the "Raw" character type to UTF-8. I'm not sure it's possible
to show true raw data in a QTextEdit widget and calling it UTF-8 more
accurately repesents what happens when you pass a char * to a QString.
Add a YAML display. Hopefully Scapy users will find it useful.

Sort the the character display items alphabetically. Make sure we go
back to the top of the buffer when we change the direction or character
set. Be less aggressive about setting focus on the "find text" entry.

svn path=/trunk/; revision=53421

6 years agoTerminate a value_string array.
Guy Harris [Mon, 18 Nov 2013 23:27:06 +0000 (23:27 -0000)]
Terminate a value_string array.

svn path=/trunk/; revision=53420

6 years agoFrom Matt Texier Enhance BGP Dissector : AS_PATH
Alexis La Goutte [Mon, 18 Nov 2013 22:02:50 +0000 (22:02 -0000)]
From Matt Texier Enhance BGP Dissector : AS_PATH

Full rewrite of BGP AS_PATH attribut using items and a clearer (and documentated !) heuristic

From me
Fix indent

svn path=/trunk/; revision=53419

6 years agoIt's incremented, so not a const.
Guy Harris [Mon, 18 Nov 2013 21:42:43 +0000 (21:42 -0000)]
It's incremented, so not a const.

Clean up indentation while we're at it.

svn path=/trunk/; revision=53418

6 years agoFrom Peter Wu
Alexis La Goutte [Mon, 18 Nov 2013 20:27:04 +0000 (20:27 -0000)]
From Peter Wu

Add RFC6066 CertificateUrl TLS extension

This is not supported by OpenSSL or NSS, the extension itself seems
unsafe, but some implementations seem to support it[1].

Untested, no capture available.


svn path=/trunk/; revision=53417

6 years agoFrom Peter Wu
Alexis La Goutte [Mon, 18 Nov 2013 20:26:55 +0000 (20:26 -0000)]
From Peter Wu

Add status_request_v2 TLS extension dissection (RFC6961)

Besides adding status_request_v2 support, this patch moves the
Certificate Status Type from the OCSP Status subtree to its parent
(the extension tree). This is needed because this type applies to all
OCSPResponse fields.

The check for "tree != NULL" seems unnecessary here, it was not
clarified in the original patch so I removed it.

From me
Fix typo
Remove unneeded tvb_ensure_bytes_exist
Use proto_tree_add_item

svn path=/trunk/; revision=53416

6 years agoFrom Peter Wu
Alexis La Goutte [Mon, 18 Nov 2013 20:26:46 +0000 (20:26 -0000)]
From Peter Wu

Add TLS StatusRequest (RFC6066) ClientHello extension recognition

Only empty Responder ID lists and empty Request Extensions are
implemented. I could not really find existing clients or servers that
populate these.

This status_request extension has a different signature for a
ClientHello and ServerHello, in the latter the extension_data field
must be empty. Therefore an additional parameter is added to

From me :
Fix typo

svn path=/trunk/; revision=53415

6 years agoFrom Peter Wu
Alexis La Goutte [Mon, 18 Nov 2013 20:26:37 +0000 (20:26 -0000)]
From Peter Wu

Support for EncryptedExtensions handshake type (a.k.a. NextProtocol)

Based on

From me
Fix warning found by fix-encoding-args

svn path=/trunk/; revision=53414

6 years agoRemove duplicate (wireshark_application.h) and unused #include files
Alexis La Goutte [Mon, 18 Nov 2013 20:26:27 +0000 (20:26 -0000)]
Remove duplicate (wireshark_application.h) and unused #include files

svn path=/trunk/; revision=53413

6 years ago1.11.2 → 1.11.3.
Gerald Combs [Mon, 18 Nov 2013 17:41:00 +0000 (17:41 -0000)]
1.11.2 → 1.11.3.

svn path=/trunk/; revision=53412

6 years agoBuild 1.11.2.
Gerald Combs [Mon, 18 Nov 2013 16:44:16 +0000 (16:44 -0000)]
Build 1.11.2.

svn path=/trunk/; revision=53411

6 years agofix
Martin Kaiser [Mon, 18 Nov 2013 11:16:32 +0000 (11:16 -0000)]

pass data parameter to afp dissector

svn path=/trunk/; revision=53410

6 years agoI guess "v4" is 1.3 and "v5" is 1.4. I'm sure there's a reason why that
Guy Harris [Mon, 18 Nov 2013 07:58:16 +0000 (07:58 -0000)]
I guess "v4" is 1.3 and "v5" is 1.4.  I'm sure there's a reason why that
makes sense of a sort....

svn path=/trunk/; revision=53409

6 years agoYou don't get to have three separate protocols all with the name
Guy Harris [Mon, 18 Nov 2013 07:54:48 +0000 (07:54 -0000)]
You don't get to have three separate protocols all with the name
"OpenFlow 1.3".

svn path=/trunk/; revision=53408

6 years agoBeginnings of CheckAPI support. More diligence needed
Jörg Mayer [Mon, 18 Nov 2013 07:42:23 +0000 (07:42 -0000)]
Beginnings of CheckAPI support. More diligence needed
(need to seperate generated files into their own variables).

svn path=/trunk/; revision=53407

6 years agoFix some warnings that were really errors.
Jörg Mayer [Mon, 18 Nov 2013 07:25:12 +0000 (07:25 -0000)]
Fix some warnings that were really errors.

It would really help to fix the remaining warnings so that these
files can be compiled with -Werror, which gets me to the quesiton:
Is this code still maintained in some form or was it an interesting
experiment that has been terminated?

svn path=/trunk/; revision=53406

6 years agoFrom Zoltán Lajos Kis:
Anders Broman [Mon, 18 Nov 2013 06:24:27 +0000 (06:24 -0000)]
From Zoltán Lajos Kis:
Start of OpenFlow 1.4 dissector.

svn path=/trunk/; revision=53405

6 years agoFix [-Wmissing-prototypes]
Anders Broman [Mon, 18 Nov 2013 06:22:09 +0000 (06:22 -0000)]
Fix [-Wmissing-prototypes]

svn path=/trunk/; revision=53404

6 years agoGet rid of unused trivial wrapper routine.
Guy Harris [Mon, 18 Nov 2013 00:51:22 +0000 (00:51 -0000)]
Get rid of unused trivial wrapper routine.

svn path=/trunk/; revision=53403

6 years agoDon't include epan/filesystem.h any more
Jörg Mayer [Sun, 17 Nov 2013 21:25:00 +0000 (21:25 -0000)]
Don't include epan/filesystem.h any more

svn path=/trunk/; revision=53402

6 years agoadd a cast to fix compiler warning
Martin Kaiser [Sun, 17 Nov 2013 17:51:59 +0000 (17:51 -0000)]
add a cast to fix compiler warning

svn path=/trunk/; revision=53401

6 years agoFix the number of highlighted bytes in case of unaligned PER constrained integer
Pascal Quantin [Sun, 17 Nov 2013 17:00:11 +0000 (17:00 -0000)]
Fix the number of highlighted bytes in case of unaligned PER constrained integer

svn path=/trunk/; revision=53400

6 years agoFrom Chris Bontje via :
Pascal Quantin [Sun, 17 Nov 2013 16:40:25 +0000 (16:40 -0000)]
From Chris Bontje via :
DNP3 bug fix for analog data sign bit bandling

svn path=/trunk/; revision=53399

6 years agoFrom Chris Bontje via :
Pascal Quantin [Sun, 17 Nov 2013 15:57:51 +0000 (15:57 -0000)]
From Chris Bontje via :
SEL Fast Message bug fix for signed 16-bit integer fast meter messages

svn path=/trunk/; revision=53398

6 years ago[Automatic manuf, services and enterprise-numbers update for 2013-11-17]
Gerald Combs [Sun, 17 Nov 2013 15:03:41 +0000 (15:03 -0000)]
[Automatic manuf, services and enterprise-numbers update for 2013-11-17]

svn path=/trunk/; revision=53395

6 years agoFrom Peter Lemenkov via :
Pascal Quantin [Sun, 17 Nov 2013 14:48:55 +0000 (14:48 -0000)]
From Peter Lemenkov via :
Fix Notify IPv6 address parsing in RTPproxy dissector

svn path=/trunk/; revision=53394

6 years agoFrom Peter Lemenkov via :
Pascal Quantin [Sun, 17 Nov 2013 14:32:40 +0000 (14:32 -0000)]
From Peter Lemenkov via :
RTPproxy: use proto_item_append_text instead of rewriting the entire item's text

svn path=/trunk/; revision=53393

6 years agoFix indent (2 spaces) and remove trailing whitespace
Alexis La Goutte [Sun, 17 Nov 2013 14:28:42 +0000 (14:28 -0000)]
Fix indent (2 spaces) and remove trailing whitespace

svn path=/trunk/; revision=53392

6 years agoFrom Peter Lemenkov via :
Pascal Quantin [Sun, 17 Nov 2013 14:14:41 +0000 (14:14 -0000)]
From Peter Lemenkov via :
Fix empty ToTag in RTPproxy's Offer/Update command

svn path=/trunk/; revision=53391

6 years agoFix indent (use tabs)
Alexis La Goutte [Sun, 17 Nov 2013 14:03:58 +0000 (14:03 -0000)]
Fix indent (use tabs)

svn path=/trunk/; revision=53390

6 years agoFix indent (use 4 spaces) and add modelines
Alexis La Goutte [Sun, 17 Nov 2013 14:03:45 +0000 (14:03 -0000)]
Fix indent (use 4 spaces) and add modelines

svn path=/trunk/; revision=53389