metze/wireshark/wip.git
12 years agoFix CID 614: callsinfo can't be NULL here so don't check for it being NULL.
Jeff Morriss [Wed, 4 Apr 2012 16:57:31 +0000 (16:57 -0000)]
Fix CID 614: callsinfo can't be NULL here so don't check for it being NULL.

svn path=/trunk/; revision=41934

12 years agoFix CID 615: strinfo can't be NULL here so don't check for it being NULL.
Jeff Morriss [Wed, 4 Apr 2012 16:55:14 +0000 (16:55 -0000)]
Fix CID 615: strinfo can't be NULL here so don't check for it being NULL.

svn path=/trunk/; revision=41933

12 years agoFix CID 616: callsinfo can't be NULL here so don't check for it being NULL.
Jeff Morriss [Wed, 4 Apr 2012 16:52:18 +0000 (16:52 -0000)]
Fix CID 616: callsinfo can't be NULL here so don't check for it being NULL.

svn path=/trunk/; revision=41932

12 years agoFix CID 617: te can't be NULL here (unless si is NULL in which case we've
Jeff Morriss [Wed, 4 Apr 2012 16:42:48 +0000 (16:42 -0000)]
Fix CID 617: te can't be NULL here (unless si is NULL in which case we've
got bigger problems) so there's no need to check for it being NULL.

svn path=/trunk/; revision=41931

12 years agoFix compilation on Win64.
Gerald Combs [Wed, 4 Apr 2012 16:13:35 +0000 (16:13 -0000)]
Fix compilation on Win64.

svn path=/trunk/; revision=41930

12 years agoFix CID 1287: rdp_info can't be NULL here so there's no need to check for it
Jeff Morriss [Wed, 4 Apr 2012 15:54:19 +0000 (15:54 -0000)]
Fix CID 1287: rdp_info can't be NULL here so there's no need to check for it
being NULL.

svn path=/trunk/; revision=41929

12 years agoRevert
Anders Broman [Wed, 4 Apr 2012 15:42:46 +0000 (15:42 -0000)]
Revert

svn path=/trunk/; revision=41928

12 years agoUpdate to a version which have getopt_long(). + one file
Anders Broman [Wed, 4 Apr 2012 15:24:23 +0000 (15:24 -0000)]
Update to a version which have getopt_long(). + one file

svn path=/trunk/; revision=41927

12 years agoUpdate to a version which have getopt_long().
Anders Broman [Wed, 4 Apr 2012 15:23:47 +0000 (15:23 -0000)]
Update to a version which have getopt_long().

svn path=/trunk/; revision=41926

12 years agoAvoid false-positive CID 621: if str is non-NULL, idx should be positive
Jeff Morriss [Wed, 4 Apr 2012 14:42:25 +0000 (14:42 -0000)]
Avoid false-positive CID 621: if str is non-NULL, idx should be positive
(so idx won't be negative when used in the else statement).  To avoid
this false positive, add a check if idx is negative to the if(str) check.

Also remove some trailing commas.

svn path=/trunk/; revision=41925

12 years agoTry to fix:
Anders Broman [Wed, 4 Apr 2012 12:49:09 +0000 (12:49 -0000)]
Try to fix:
packet-eap.c: At top level:
packet-eap.c:150: error: static declaration of ‘eap_sim_subtype_vals’ follows non-static declaration
../../epan/eap.h:62: note: previous declaration of ‘eap_sim_subtype_vals’ was here
packet-eap.c:159: error: static declaration of ‘eap_aka_subtype_vals’ follows non-static declaration
../../epan/eap.h:72: note: previous declaration of ‘eap_aka_subtype_vals’ was here
packet-eap.c: In function ‘dissect_eap’:
packet-eap.c:668: warning: request for implicit conversion from ‘void *’ to ‘struct conv_state_t *’ not permitted in C++
packet-eap.c:673: warning: request for implicit conversion from ‘void *’ to ‘struct conv_state_t *’ not permitted in C++
packet-eap.c:866: warning: request for implicit conversion from ‘void *’ to ‘struct frame_state_t *’ not permitted in C++
packet-eap.c:927: warning: request for implicit conversion from ‘void *’ to ‘struct frame_state_t *’ not permitted in C++
packet-eap.c:1048: warning: request for implicit conversion from ‘void *’ to ‘struct frame_state_t *’ not permitted in C++
packet-eap.c:1067: warning: request for implicit conversion from ‘void *’ to ‘struct frame_state_t *’ not permitted in C++

svn path=/trunk/; revision=41924

12 years agoAvoid some potential divide by zero errors that Clang reports.
Chris Maynard [Wed, 4 Apr 2012 12:47:08 +0000 (12:47 -0000)]
Avoid some potential divide by zero errors that Clang reports.

svn path=/trunk/; revision=41923

12 years agoFrom Nick Lowe:
Anders Broman [Wed, 4 Apr 2012 12:32:44 +0000 (12:32 -0000)]
From Nick Lowe:
- Update eap header file to include SIM and AKA definitions.
- Change the SIM and AKA EAP types to use proto_tree_add_item().

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7020

svn path=/trunk/; revision=41922

12 years agoChange to use eap. in filter names isof eap_
Anders Broman [Wed, 4 Apr 2012 10:35:48 +0000 (10:35 -0000)]
Change to use eap. in filter names isof eap_

svn path=/trunk/; revision=41921

12 years agoAdd Openwire dissector to CMake too...
Alexis La Goutte [Wed, 4 Apr 2012 09:41:03 +0000 (09:41 -0000)]
Add Openwire dissector to CMake too...

svn path=/trunk/; revision=41920

12 years agoFrom Metatech via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7014
Alexis La Goutte [Wed, 4 Apr 2012 09:37:19 +0000 (09:37 -0000)]
From Metatech via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7014

Here is a dissector for ActiveMQ OpenWire protocol.

A few words about the protocol :
OpenWire has two wire formats :
- "loose" : more verbose, less CPU-intensive, less network-intensive (1-pass)
- "tight" : more compact, more CPU-intensive, more network-intensive (2-pass)
This dissector only supports the "loose" syntax, which is not the default.
This dissector only supports version 6 of the protocol.
It can be changed on the broker in the activemq.xml file by specifying
"tightEncodingEnabled=false" :

svn path=/trunk/; revision=41919

12 years agoFrom Nick Lowe:
Anders Broman [Wed, 4 Apr 2012 08:04:25 +0000 (08:04 -0000)]
From Nick Lowe:
Convert EAP-IDENTITY, EAP-NOTIFY and EAP-MD5 to use proto_tree_add_item().

From me consistently use "proto abbr"_"name".

svn path=/trunk/; revision=41918

12 years agoFrom Pascal Quantin:
Anders Broman [Wed, 4 Apr 2012 07:47:54 +0000 (07:47 -0000)]
From Pascal Quantin:
Upgrade LTE RRC dissector to v10.5.0.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7032

svn path=/trunk/; revision=41917

12 years agoFrom Martin Kaiser:
Anders Broman [Wed, 4 Apr 2012 07:40:20 +0000 (07:40 -0000)]
From Martin Kaiser:
DVB-CI: check APDUs against resource id.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7031

svn path=/trunk/; revision=41916

12 years agoFrom Rolf Fiedler:
Anders Broman [Wed, 4 Apr 2012 07:33:39 +0000 (07:33 -0000)]
From Rolf Fiedler:
Patch to add V5.2 tracing capability on E1 links using EyeSDN probes.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7027

Removed preference related stufff as it's not needed.

svn path=/trunk/; revision=41915

12 years agoAdd and update a bunch of Programs and Features-related registry
Gerald Combs [Wed, 4 Apr 2012 00:47:21 +0000 (00:47 -0000)]
Add and update a bunch of Programs and Features-related registry
keys. Sort the keys by name. Calculate the installation size after all
of the files have been installed and add that in the "EstimatedSize"
key. Fix the display icon. Add a hint about our target platform. Add
version information.

We now look like a grown-up application in the Programs and Features
control panel.

svn path=/trunk/; revision=41914

12 years agoFrom Nick Lowe via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7020 :
Jeff Morriss [Tue, 3 Apr 2012 21:52:03 +0000 (21:52 -0000)]
From Nick Lowe via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7020 :

First patch to start the conversion of the EAP dissector from its use of
proto_tree_add_text() to proto_tree_add_item().

svn path=/trunk/; revision=41913

12 years agoFrom Martin Kaiser (on -dev): initialize an uninitialized variable. From me: also...
Jeff Morriss [Tue, 3 Apr 2012 21:38:59 +0000 (21:38 -0000)]
From Martin Kaiser (on -dev): initialize an uninitialized variable.  From me: also clean up some indentation.

svn path=/trunk/; revision=41912

12 years agoImplement spoolss function GetPrinterDriverDirectory (opnum 12).
Graham Bloice [Tue, 3 Apr 2012 20:05:36 +0000 (20:05 -0000)]
Implement spoolss function GetPrinterDriverDirectory (opnum 12).

Also renamed "Architecture" field to "Environment" as per MS docs.

Fix bug #2279

svn path=/trunk/; revision=41911

12 years agoFix CID 620: since we're checking if the given hf index is positive (since
Jeff Morriss [Tue, 3 Apr 2012 17:37:27 +0000 (17:37 -0000)]
Fix CID 620: since we're checking if the given hf index is positive (since
r15662), move the proto_tree_add_boolean() call (which uses the hf index)
inside the check.

svn path=/trunk/; revision=41910

12 years agoRemove fixed or no-longer-relevant bugs.
Gerald Combs [Tue, 3 Apr 2012 17:18:34 +0000 (17:18 -0000)]
Remove fixed or no-longer-relevant bugs.

svn path=/trunk/; revision=41909

12 years agoAdd a to-do list for more decryption tests.
Gerald Combs [Tue, 3 Apr 2012 16:10:55 +0000 (16:10 -0000)]
Add a to-do list for more decryption tests.

svn path=/trunk/; revision=41908

12 years agoFill in the list of new protocols (87 of them!) and new & updated
Gerald Combs [Tue, 3 Apr 2012 16:03:42 +0000 (16:03 -0000)]
Fill in the list of new protocols (87 of them!) and new & updated
capture file support.

svn path=/trunk/; revision=41907

12 years agoImprove the text of some value_strings.
Bill Meier [Tue, 3 Apr 2012 15:38:27 +0000 (15:38 -0000)]
Improve the text of some value_strings.

svn path=/trunk/; revision=41906

12 years agoComment out unused define.
Anders Broman [Tue, 3 Apr 2012 14:46:02 +0000 (14:46 -0000)]
Comment out unused define.

svn path=/trunk/; revision=41905

12 years agoUpdate to V11.1.0 (2012-03)
Anders Broman [Tue, 3 Apr 2012 14:12:07 +0000 (14:12 -0000)]
Update to V11.1.0 (2012-03)

svn path=/trunk/; revision=41904

12 years agoFix off by one shift error introduced in r39531.
Jakub Zawadzki [Tue, 3 Apr 2012 09:28:58 +0000 (09:28 -0000)]
Fix off by one shift error introduced in r39531.

In tvb_get_ephemeral_unicode_string() length is number of bytes (not characters).

svn path=/trunk/; revision=41903

12 years agoFix dependent_frames memleak.
Jakub Zawadzki [Tue, 3 Apr 2012 09:18:16 +0000 (09:18 -0000)]
Fix dependent_frames memleak.

Reviewed-By: Jeff Morriss (http://www.wireshark.org/lists/wireshark-dev/201204/msg00013.html)
svn path=/trunk/; revision=41902

12 years agoFrom Martin Kaiser via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7023 :
Jeff Morriss [Tue, 3 Apr 2012 01:52:44 +0000 (01:52 -0000)]
From Martin Kaiser via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7023 :

For each message, the DVB-CI dissector checks the message size against the
buffer size negotiated at startup. If the buffer size negotation was not
captured, a warning is flagged up for each packet saying its size is too big.

Obviously, the check only makes sense if we know the negotiated buffer size...

svn path=/trunk/; revision=41901

12 years agoSet up table to help with ascii-hex -> hex conversion in advance to
Martin Mathieson [Tue, 3 Apr 2012 01:49:27 +0000 (01:49 -0000)]
Set up table to help with ascii-hex -> hex conversion in advance to
avoid testing static for every conversion.

svn path=/trunk/; revision=41900

12 years agoFix a couple of CIDs related to missing breaks: both are intentional[1] so add
Jeff Morriss [Tue, 3 Apr 2012 01:25:24 +0000 (01:25 -0000)]
Fix a couple of CIDs related to missing breaks: both are intentional[1] so add
comments to that effect.

[1] Based on comment from Lars Roff via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6844

svn path=/trunk/; revision=41899

12 years agoAdd a test for Zigbee. Compress the 802.11 capture. Fix an error message.
Gerald Combs [Mon, 2 Apr 2012 18:48:56 +0000 (18:48 -0000)]
Add a test for Zigbee. Compress the 802.11 capture. Fix an error message.

svn path=/trunk/; revision=41898

12 years agoFrom Irene Ruengeler: Fix a warning when capturing.
Michael Tüxen [Mon, 2 Apr 2012 17:15:58 +0000 (17:15 -0000)]
From Irene Ruengeler: Fix a warning when capturing.

svn path=/trunk/; revision=41897

12 years agoAdd a test for DTLS decryption.
Gerald Combs [Mon, 2 Apr 2012 16:37:40 +0000 (16:37 -0000)]
Add a test for DTLS decryption.

svn path=/trunk/; revision=41896

12 years agoIf a comment is cleared, remove it from fdata->opt_comment.
Anders Broman [Mon, 2 Apr 2012 15:20:54 +0000 (15:20 -0000)]
If a comment is cleared, remove it from fdata->opt_comment.

svn path=/trunk/; revision=41895

12 years agoFix a couple of typos and missing return for GTK 3.
Anders Broman [Mon, 2 Apr 2012 12:23:33 +0000 (12:23 -0000)]
Fix a couple of typos and missing return for GTK 3.

svn path=/trunk/; revision=41894

12 years agoIntroduce utility function to ease GTK3 depcrecated funktion removal.
Anders Broman [Mon, 2 Apr 2012 11:35:53 +0000 (11:35 -0000)]
Introduce utility function to ease GTK3 depcrecated funktion removal.

svn path=/trunk/; revision=41893

12 years agoFrom Nick Lowe:
Anders Broman [Mon, 2 Apr 2012 08:00:43 +0000 (08:00 -0000)]
From Nick Lowe:
Negate version bits in flags for PEAP, TTLS, FAST.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7019

svn path=/trunk/; revision=41892

12 years agoUse correct values for "alt screen size" for 327x-3 and 327x-4 terminals.
Bill Meier [Sun, 1 Apr 2012 23:06:21 +0000 (23:06 -0000)]
Use correct values for "alt screen size" for 327x-3 and 327x-4 terminals.
Slightly improve code which tries to keep track of "screen size".
Add a comment as to what is really required to properly keep track
 of the screen size "state".

svn path=/trunk/; revision=41891

12 years agoRemove a bad (unterminated) comment; Fixes Buildbot compile error.
Bill Meier [Sun, 1 Apr 2012 21:48:17 +0000 (21:48 -0000)]
Remove a bad (unterminated) comment; Fixes Buildbot compile error.

svn path=/trunk/; revision=41890

12 years agoFix some bugs related to the use of proto_tree_add_bits_item();
Bill Meier [Sun, 1 Apr 2012 21:31:51 +0000 (21:31 -0000)]
Fix some bugs related to the use of proto_tree_add_bits_item();
Improve details pane display of a few TN3270 fields.

svn path=/trunk/; revision=41889

12 years agoMore whitespace changes...
Michael Tüxen [Sun, 1 Apr 2012 18:16:15 +0000 (18:16 -0000)]
More whitespace changes...

svn path=/trunk/; revision=41888

12 years agoRemove waring.
Michael Tüxen [Sun, 1 Apr 2012 17:27:26 +0000 (17:27 -0000)]
Remove waring.
While there: Some whitespace cleanups.

svn path=/trunk/; revision=41887

12 years agoFrom Nick Lowe: Show the reserved bits if set for EAP-TLS, unify/clean up the display...
Anders Broman [Sun, 1 Apr 2012 16:12:56 +0000 (16:12 -0000)]
From Nick Lowe: Show the reserved bits if set for EAP-TLS, unify/clean up the display output. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7017

svn path=/trunk/; revision=41886

12 years agoDefine numerous arrays as static rather than dynamic
Bill Meier [Sun, 1 Apr 2012 16:06:39 +0000 (16:06 -0000)]
Define numerous arrays as static rather than dynamic
 so they are initialized only once rather than each time a
 function using the array is executed.
Re-arrange the code slightly so much of the dissection can be
 put under 'if (tree)'.

svn path=/trunk/; revision=41885

12 years agoFrom Liangfeng: SGmb diameter AVP 'MBMS-Data-Transfer-Start' type error. https:/...
Anders Broman [Sun, 1 Apr 2012 16:05:52 +0000 (16:05 -0000)]
From Liangfeng: SGmb diameter AVP 'MBMS-Data-Transfer-Start' type error. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7016

svn path=/trunk/; revision=41884

12 years agoFrom Cal Turney: IO Graph LOAD inaccuracy, intervals not displayed, wrong frames...
Anders Broman [Sun, 1 Apr 2012 16:01:12 +0000 (16:01 -0000)]
From Cal Turney: IO Graph LOAD inaccuracy, intervals not displayed, wrong frames displayed. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6994

svn path=/trunk/; revision=41883

12 years agoSet the extent of IR, IR-DYN and feedback packet types.
Martin Mathieson [Sun, 1 Apr 2012 14:55:40 +0000 (14:55 -0000)]
Set the extent of IR, IR-DYN and feedback packet types.
Make some fields display and HEX and DEC.

svn path=/trunk/; revision=41881

12 years agoClear info column before calling ROHC dissector.
Martin Mathieson [Sun, 1 Apr 2012 14:52:48 +0000 (14:52 -0000)]
Clear info column before calling ROHC dissector.

svn path=/trunk/; revision=41880

12 years ago[Automatic manuf, services and enterprise-numbers update for 2012-04-01]
Gerald Combs [Sun, 1 Apr 2012 14:03:31 +0000 (14:03 -0000)]
[Automatic manuf, services and enterprise-numbers update for 2012-04-01]

svn path=/trunk/; revision=41878

12 years agoRemove return statement (part of r41314), fix bug #7015
Jakub Zawadzki [Sun, 1 Apr 2012 09:31:02 +0000 (09:31 -0000)]
Remove return statement (part of r41314), fix bug #7015

svn path=/trunk/; revision=41877

12 years agoAt least 4 bytes is required to check PSC, fixes bug https://bugs.wireshark.org/bugzi...
Anders Broman [Sun, 1 Apr 2012 09:20:35 +0000 (09:20 -0000)]
At least 4 bytes is required to check PSC, fixes bug https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6996

svn path=/trunk/; revision=41876

12 years agoUse proto_tree_add_item() in a couple of places, show bit fields
Anders Broman [Sun, 1 Apr 2012 09:19:02 +0000 (09:19 -0000)]
Use proto_tree_add_item() in a couple of places, show bit fields

svn path=/trunk/; revision=41875

12 years agoAdd support for RFC 6525.
Michael Tüxen [Sat, 31 Mar 2012 22:01:36 +0000 (22:01 -0000)]
Add support for RFC 6525.

svn path=/trunk/; revision=41874

12 years agoFix off by one shift errors introduced in r39530 where it seemed proper[1]
Jakub Zawadzki [Sat, 31 Mar 2012 20:57:15 +0000 (20:57 -0000)]
Fix off by one shift errors introduced in r39530 where it seemed proper[1]

[1] I'm unsure of packet-dtpt, so I haven't patch it.

svn path=/trunk/; revision=41873

12 years agoAdd initial support for dissecting packets encapsulated in Netfilter LOG (DLT_NFLOG...
Jakub Zawadzki [Sat, 31 Mar 2012 17:29:41 +0000 (17:29 -0000)]
Add initial support for dissecting packets encapsulated in Netfilter LOG (DLT_NFLOG=239).

svn path=/trunk/; revision=41872

12 years agoUpdate the paragraph in 7.12 describing the name of the temp file to include the...
Chris Maynard [Sat, 31 Mar 2012 16:25:22 +0000 (16:25 -0000)]
Update the paragraph in 7.12 describing the name of the temp file to include the name used when capturing on multiple interfaces.

svn path=/trunk/; revision=41871

12 years agoThese buffers in tvb_uncompress() can't ovelaps, so use optimized memcpy().
Jakub Zawadzki [Sat, 31 Mar 2012 12:35:07 +0000 (12:35 -0000)]
These buffers in tvb_uncompress() can't ovelaps, so use optimized memcpy().

svn path=/trunk/; revision=41870

12 years agoFix for bug #6480 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6480)
Jakub Zawadzki [Sat, 31 Mar 2012 12:33:10 +0000 (12:33 -0000)]
Fix for bug #6480 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6480)

Yay, first commit since r37883 (almost 9months).

svn path=/trunk/; revision=41869

12 years agoFrom Martin Kaiser: Fix for main_menubar.c:3874: error: set_menu_visible defined...
Anders Broman [Sat, 31 Mar 2012 09:22:07 +0000 (09:22 -0000)]
From Martin Kaiser: Fix for main_menubar.c:3874: error: set_menu_visible defined but not used

svn path=/trunk/; revision=41868

12 years agoSCSI SBC: Start decoding LogicalBlockProvisioning VPD page
Ronnie Sahlberg [Sat, 31 Mar 2012 04:45:33 +0000 (04:45 -0000)]
SCSI SBC: Start decoding LogicalBlockProvisioning VPD page

svn path=/trunk/; revision=41867

12 years agoAdd a missing file.
Gerald Combs [Fri, 30 Mar 2012 23:52:55 +0000 (23:52 -0000)]
Add a missing file.

svn path=/trunk/; revision=41866

12 years agoAdd a WPA PSK decryption test.
Gerald Combs [Fri, 30 Mar 2012 23:51:48 +0000 (23:51 -0000)]
Add a WPA PSK decryption test.

svn path=/trunk/; revision=41865

12 years agoSCSI SBC: Add the new fields that have been added to READ_CAPACITY16
Ronnie Sahlberg [Fri, 30 Mar 2012 23:48:23 +0000 (23:48 -0000)]
SCSI SBC: Add the new fields that have been added to READ_CAPACITY16

svn path=/trunk/; revision=41864

12 years agoFrom Martin Kaiser via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6984 :
Jeff Morriss [Fri, 30 Mar 2012 23:19:49 +0000 (23:19 -0000)]
From Martin Kaiser via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6984 :

The attached patch extends the mpeg2 ts format detection to take into account
that trailing bytes might be added to each packet.

Once it finds no sync after 188 bytes, it checks an additional 40 bytes for the
next sync byte and adjusts the packet size accordingly.

Only the 188 bytes of the actual ts packet are passed on to wiretap, the
trailer is omitted.

svn path=/trunk/; revision=41863

12 years agoFrom Svetoslav Duhovnikov via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id...
Jeff Morriss [Fri, 30 Mar 2012 22:36:02 +0000 (22:36 -0000)]
From Svetoslav Duhovnikov via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6995 :

The following patch adds decoding capabilities for RFC 5886 for PCEP protocol:

9.1. New PCEP Message

   Each PCEP message has a message type value.

   Two new PCEP (specified in [RFC5440]) messages are defined in this
   document:

   Value  Description                                      Reference
     8    Path Computation Monitoring Request (PCMonReq)   This document
     9    Path Computation Monitoring Reply (PCMonRep)     This document

9.2. New PCEP Objects

   Each PCEP object has an Object-Class and an Object-Type.  The
   following new PCEP objects are defined in this document:

   Object-Class Value Name        Object-Type             Reference

          19          MONITORING  1                       This document

          20          PCC-REQ-ID  1: IPv4 addresses       This document
                                  2: IPv6 addresses

          25          PCE-ID      1: IPv4 addresses       This document
                                  2: IPv6 addresses       This document

          26          PROC-TIME   1                       This document

          27          OVERLOAD    1: overload             This document

svn path=/trunk/; revision=41862

12 years agoFrom Claude LeFrancois: Support 2 new GTP Information Elements. The Fully Qualified...
Anders Broman [Fri, 30 Mar 2012 21:45:42 +0000 (21:45 -0000)]
From Claude LeFrancois: Support  2 new GTP Information Elements. The Fully Qualified Domain Name (FQDN) GTP IE and the Evolved Allocation/Retention Priority II GTP IE.

svn path=/trunk/; revision=41861

12 years agoClobber our personal configuration directory on Windows.
Gerald Combs [Fri, 30 Mar 2012 21:04:09 +0000 (21:04 -0000)]
Clobber our personal configuration directory on Windows.

svn path=/trunk/; revision=41860

12 years agoMore fixes for Windows. UATs need to be created in ../wireshark-gtk2
Gerald Combs [Fri, 30 Mar 2012 20:58:44 +0000 (20:58 -0000)]
More fixes for Windows. UATs need to be created in ../wireshark-gtk2
and backslashes need to be escaped.

svn path=/trunk/; revision=41859

12 years agorsasnakeoil2 is a PCAP file; name it .pcap for consistency. Set SVN properties appro...
Jeff Morriss [Fri, 30 Mar 2012 19:57:48 +0000 (19:57 -0000)]
rsasnakeoil2 is a PCAP file; name it .pcap for consistency.  Set SVN properties appropriately.

svn path=/trunk/; revision=41858

12 years agoFix the location of dhcp.pcap.
Gerald Combs [Fri, 30 Mar 2012 18:19:35 +0000 (18:19 -0000)]
Fix the location of dhcp.pcap.

svn path=/trunk/; revision=41857

12 years agoFix decryption test on Windows.
Gerald Combs [Fri, 30 Mar 2012 18:13:41 +0000 (18:13 -0000)]
Fix decryption test on Windows.

svn path=/trunk/; revision=41856

12 years agoAdd a missing file.
Gerald Combs [Fri, 30 Mar 2012 17:59:27 +0000 (17:59 -0000)]
Add a missing file.

svn path=/trunk/; revision=41855

12 years agoRemove the dependency on tools/make-services.pl for the services target.
Gerald Combs [Fri, 30 Mar 2012 17:53:23 +0000 (17:53 -0000)]
Remove the dependency on tools/make-services.pl for the services target.
This is likely the cause of unwanted "services" file build attempts.

svn path=/trunk/; revision=41853

12 years agoAdd a decryption test suite along with an SSL decryption test. Move our
Gerald Combs [Fri, 30 Mar 2012 17:51:54 +0000 (17:51 -0000)]
Add a decryption test suite along with an SSL decryption test. Move our
growing collection of capture files to a subdirectory.

svn path=/trunk/; revision=41852

12 years agoFrom Weston Andros Adamson via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id...
Jeff Morriss [Fri, 30 Mar 2012 17:50:08 +0000 (17:50 -0000)]
From Weston Andros Adamson via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7010 :

While developing SP4_MACH_CRED support for the linux nfs client, I noticed that
wireshark was displaying these bitmasks incorrectly (as fattrs instead of NFS
operations).

I also noticed that BACKCHANNEL_CTL (a required value in the mask for
SP4_MACH_CRED) wasn't in names_nfsv4_operation[], so I added it and verified
that we're not missing any other ops.

svn path=/trunk/; revision=41851

12 years agoFrom Liangfeng via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7013 :
Jeff Morriss [Fri, 30 Mar 2012 17:43:45 +0000 (17:43 -0000)]
From Liangfeng via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7013 :

Add the application ID for 3GPP SGmb and 2 SGmb AVPs: MBMS-Data-Transfer-Start
and MBMS-Data-Transfer-Stop.

svn path=/trunk/; revision=41850

12 years agoFrom Liangfeng via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7012 :
Jeff Morriss [Fri, 30 Mar 2012 17:40:01 +0000 (17:40 -0000)]
From Liangfeng via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7012 :

According to 3GPP R7//R8/R9/R10/R11, AVP 'MBMS-Session-Duration' has 3 octets.
First 17 bits indicate seconds, the rest of bits(7 bits) represents days.

However, in the source file packet-gtp.c, it parse the AVP reversely -- taking
first 7 bits as days, the rest of 17 bits as seconds.  This patch fixes that.

svn path=/trunk/; revision=41849

12 years agoAllow unknown extension values to be filterable.
Chris Maynard [Fri, 30 Mar 2012 17:38:10 +0000 (17:38 -0000)]
Allow unknown extension values to be filterable.

svn path=/trunk/; revision=41848

12 years agogcc 4.7 would complain that the getopt stuff was not declared.
Jörg Mayer [Fri, 30 Mar 2012 14:55:00 +0000 (14:55 -0000)]
gcc 4.7 would complain that the getopt stuff was not declared.
Looks like getopt.h was silently included somewhere in gcc-4.6's
includes. Explicitely include <getopt.h>. No idea whether this
is the correct fix.
Whitespace change: indent includes, if they are inside a conditional.

svn path=/trunk/; revision=41847

12 years agogcc.47 would complain that rsoffset might be used uninitialized
Jörg Mayer [Fri, 30 Mar 2012 14:48:37 +0000 (14:48 -0000)]
gcc.47 would complain that rsoffset might be used uninitialized
when passed by reference. Init to 0 to silence this warning.

Some whitespace fixes.

svn path=/trunk/; revision=41846

12 years agoFix compiler warnings (set but not used).
Jörg Mayer [Fri, 30 Mar 2012 13:18:13 +0000 (13:18 -0000)]
Fix compiler warnings (set but not used).
Remove whitespace at end of line.

svn path=/trunk/; revision=41845

12 years agoAdjusted UAT name.
Stig Bjørlykke [Fri, 30 Mar 2012 12:45:43 +0000 (12:45 -0000)]
Adjusted UAT name.

svn path=/trunk/; revision=41844

12 years agoAdded more UAT's to the list of configuration profile files.
Stig Bjørlykke [Fri, 30 Mar 2012 11:50:53 +0000 (11:50 -0000)]
Added more UAT's to the list of configuration profile files.

svn path=/trunk/; revision=41843

12 years agoCall uat->post_update_cb also when not having the uat file.
Stig Bjørlykke [Fri, 30 Mar 2012 11:12:03 +0000 (11:12 -0000)]
Call uat->post_update_cb also when not having the uat file.

This is because some uat's do cleanup in the init routine, which is needed
when changing profile.

svn path=/trunk/; revision=41842

12 years agoAdded support for configuring custom LDAP AttributeValue types.
Stig Bjørlykke [Fri, 30 Mar 2012 09:08:55 +0000 (09:08 -0000)]
Added support for configuring custom LDAP AttributeValue types.

svn path=/trunk/; revision=41841

12 years agoRecreate the packet list when changing UAT for header fields.
Stig Bjørlykke [Fri, 30 Mar 2012 08:57:57 +0000 (08:57 -0000)]
Recreate the packet list when changing UAT for header fields.

This fixes a crash when changing settings for fields used as a custom column.

svn path=/trunk/; revision=41840

12 years agoAs pointed out by Alexis: remove a bunch of set-but-unused variables.
Jeff Morriss [Fri, 30 Mar 2012 01:46:42 +0000 (01:46 -0000)]
As pointed out by Alexis: remove a bunch of set-but-unused variables.

svn path=/trunk/; revision=41839

12 years agoGet rid of C++/C99-style comments.
Jeff Morriss [Fri, 30 Mar 2012 01:36:05 +0000 (01:36 -0000)]
Get rid of C++/C99-style comments.

svn path=/trunk/; revision=41838

12 years agoWhen a capture starts with a non-zero SN, don't report 0-(SN-1) as
Martin Mathieson [Fri, 30 Mar 2012 01:18:12 +0000 (01:18 -0000)]
When a capture starts with a non-zero SN, don't report 0-(SN-1) as
missing.

svn path=/trunk/; revision=41837

12 years agoFrom Guy Martin via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7007 :
Jeff Morriss [Fri, 30 Mar 2012 01:17:46 +0000 (01:17 -0000)]
From Guy Martin via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7007 :

This patch adds support for the DVB Bouquet Association Table (BAT) from ETSI
EN 300 468.

With this last patch, the support for the DVB SI table is quite complete.

svn path=/trunk/; revision=41836

12 years agoFix the flag used in a test.
Martin Mathieson [Fri, 30 Mar 2012 00:49:09 +0000 (00:49 -0000)]
Fix the flag used in a test.

svn path=/trunk/; revision=41835

12 years agoFix a test to avoid setting an invalid display filter.
Martin Mathieson [Thu, 29 Mar 2012 23:12:07 +0000 (23:12 -0000)]
Fix a test to avoid setting an invalid display filter.
Reorder some comments to make things a little clearer.

svn path=/trunk/; revision=41834

12 years agoONC-RPC: After we have dissected the decrypted PDU, update offset to reflect that...
Ronnie Sahlberg [Thu, 29 Mar 2012 21:13:24 +0000 (21:13 -0000)]
ONC-RPC: After we have dissected the decrypted PDU, update offset to reflect that we have eaten all these bytes or rpc will think there was un-dissected data remaining and will show it as an extra "data" field.

svn path=/trunk/; revision=41833

12 years agoUpdate a couple of keys.
Gerald Combs [Thu, 29 Mar 2012 20:22:50 +0000 (20:22 -0000)]
Update a couple of keys.

svn path=/trunk/; revision=41832