obnox/wireshark/wip.git
7 years agoChange the -z args for expert item. You can now give the minimum severity level...
martinm [Wed, 30 Nov 2011 15:41:39 +0000 (15:41 +0000)]
Change the -z args for expert item.  You can now give the minimum severity level to report as well as a filter.  Also, now show duplicate reports only once, and give the frequency rather than the frame number.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40049 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFrom Eugene Bogush: Initialize read_err to 0 so mergecap works again. Fixes https...
cmaynard [Wed, 30 Nov 2011 15:28:58 +0000 (15:28 +0000)]
From Eugene Bogush: Initialize read_err to 0 so mergecap works again.  Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6623

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40048 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoExtend coverage of #ifdef HAVE_PCAP_REMOTE to cover the static function insert_new_ro...
martinm [Wed, 30 Nov 2011 09:47:10 +0000 (09:47 +0000)]
Extend coverage of #ifdef HAVE_PCAP_REMOTE to cover the static function insert_new_rows().

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40047 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoGet rid of warnings.
etxrab [Wed, 30 Nov 2011 06:58:44 +0000 (06:58 +0000)]
Get rid of warnings.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40046 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFrom Pascal Quantin:
etxrab [Tue, 29 Nov 2011 22:32:31 +0000 (22:32 +0000)]
From Pascal Quantin:
decoding of IPv6 Control Protocol embedded in PCO

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

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40045 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFrom Pascal Quantin:
etxrab [Tue, 29 Nov 2011 22:25:21 +0000 (22:25 +0000)]
From Pascal Quantin:
Currently Wireshark limits the Access Point Name length to 50 bytes. But
according to 3GPP 24.008 chapter 10.5.6.1, the maximum length is 100 bytes (102
bytes minus the IEI and length fields) and not 50.
The attached patch increases the MAX_APN_LENGTH define value and allow the
correct display of an APN with a size greater than 50 bytes.

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

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40044 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoMust include header files in a macro, so they get included in the
guy [Tue, 29 Nov 2011 20:25:49 +0000 (20:25 +0000)]
Must include header files in a macro, so they get included in the
release tarball.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40043 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Tue, 29 Nov 2011 19:54:00 +0000 (19:54 +0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40042 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Tue, 29 Nov 2011 19:53:02 +0000 (19:53 +0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40041 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFix Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Tue, 29 Nov 2011 19:50:30 +0000 (19:50 +0000)]
Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40040 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoArubaOS 6.x use a new GRE ID (0x9000) for communication between controller and AP
alagoutte [Tue, 29 Nov 2011 19:46:12 +0000 (19:46 +0000)]
ArubaOS 6.x use a new GRE ID (0x9000) for communication between controller and AP
Add this new ID in GRE dissector

The frame with the new GRE ID is not 802.11 frame such as 80XX GRE ID but a 802.3 frame with curious ethertype (8211 the same id with PAPI Protocol...)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40039 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFrom c.David via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6527
alagoutte [Tue, 29 Nov 2011 19:36:53 +0000 (19:36 +0000)]
From c.David via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6527
corba dissector generator improvement

Patch 2 : create a defaulf field hf_operationrequest which provides the requested operation on both the resquest and the reply messages.

From me :
Regenerate GIOP Plugins

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40038 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFrom c.David via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6527
alagoutte [Tue, 29 Nov 2011 19:22:35 +0000 (19:22 +0000)]
From c.David via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6527
corba dissector generator improvement

Patch 1 : field names is used in dissection instead of "enum value" which is not clear

From me :
Regenerate GIOP Plugins

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40037 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoGtk3 package byte highlighter colour fix.
etxrab [Tue, 29 Nov 2011 17:46:38 +0000 (17:46 +0000)]
Gtk3 package byte highlighter colour fix.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6624

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40036 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoUpdate value strings.
etxrab [Tue, 29 Nov 2011 17:31:52 +0000 (17:31 +0000)]
Update value strings.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40035 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoAdd priority to the channel table.
martinm [Tue, 29 Nov 2011 14:42:22 +0000 (14:42 +0000)]
Add priority to the channel table.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40034 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoWireshark crashes in gsm_map dissector
etxrab [Tue, 29 Nov 2011 07:03:31 +0000 (07:03 +0000)]
Wireshark crashes in gsm_map dissector

For now use Jeff's fix:
"The REAL problem is that the GSM_MAP dissector is using this value_string_ext
in the hf without BASE_EXT_STRING:

    { &hf_gsm_old_localValue,
      { "localValue", "gsm_old.localValue",
        FT_INT32, BASE_DEC, &gsm_old_GSMMAPOperationLocalvalue_vals_ext, 0,
        "OperationLocalvalue", HFILL }},

This, in turn, appears to be caused because OperationLocalValue is an alias
for/of GSMMAPOperationLocalValue and only the latter is defined with
.USE_VALS_EXT.

I can fix it by doing:

Index: asn1/gsm_map/gsm_map.cnf
===================================================================
--- asn1/gsm_map/gsm_map.cnf    (revision 39628)
+++ asn1/gsm_map/gsm_map.cnf    (working copy)
@@ -54,6 +54,7 @@

 #.USE_VALS_EXT
 GSMMAPOperationLocalvalue
+OperationLocalvalue

 #.EXPORTS
 AddressString

But it seems to be that asn2wrs should arguably be figuring this out on its
own."

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40033 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoAllow for, but don't yet use, GTK+ 2.24.
gerald [Tue, 29 Nov 2011 00:07:54 +0000 (00:07 +0000)]
Allow for, but don't yet use, GTK+ 2.24.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40032 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoAdd newline at the end of the file.
martinm [Mon, 28 Nov 2011 18:33:58 +0000 (18:33 +0000)]
Add newline at the end of the file.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40031 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFix Checkapi found errors.
etxrab [Mon, 28 Nov 2011 18:10:57 +0000 (18:10 +0000)]
Fix Checkapi found errors.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40030 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFrom Krishnamurthy Mayya:
etxrab [Mon, 28 Nov 2011 17:59:54 +0000 (17:59 +0000)]
From Krishnamurthy Mayya:

Part of patch:
2. BFD extension has been added as per RFC 6428, to decode the BFD packet with
ACH encapsulation(without IP/UDP header encapsulation). The channel type in ACH
header identifies the BFD payload as BFD CC or CV packet. Also decoding for
MPLS-TP source MEP-ID TLV in BFD CV packet has been added.

applied with a change to add packet-bfd.h

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6610#add_comment

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40029 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFrom Krishnamurthy Mayya:
etxrab [Mon, 28 Nov 2011 17:31:09 +0000 (17:31 +0000)]
From Krishnamurthy Mayya:
LSP Ping extension has been added as per RFC 6426, to decode the LSP Ping
packet with ACH encapsulation(without IP/UDP header encapsulation). The channel
type in ACH header identifies the LSP Ping packet. Also support for decoding
new TLVs and Sub-TLVs defined in the RFC 6426 has been provided.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6610#add_comment

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40028 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFrom Krishnamurthy Mayya:
etxrab [Mon, 28 Nov 2011 17:13:45 +0000 (17:13 +0000)]
From Krishnamurthy Mayya:
BFD extension has been added as per RFC 6428, to decode the BFD packet with
ACH encapsulation(without IP/UDP header encapsulation). The channel type in ACH
header identifies the BFD payload as BFD CC or CV packet. Also decoding for
MPLS-TP source MEP-ID TLV in BFD CV packet has been added.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6610#add_comment

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40027 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agofrom Shobhank Sharma:
etxrab [Mon, 28 Nov 2011 17:05:35 +0000 (17:05 +0000)]
from Shobhank Sharma:

- Removed some mpls preferences which are no longer relevant/needed like
  decode PWAC payloads as PPP traffic and assume all channel types except 0x21
are raw BFD.
- MPLS extension from PW-ACH to MPLS Generic Associated Channel as per RFC 5586
- Updated Pseudowire Associated Channel Types as per
http://www.iana.org/assignments/pwe3-parameters
- Updated the VCCV bitmaps as per RFC 5885

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

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40026 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoSquelsh warnings.
etxrab [Mon, 28 Nov 2011 16:42:43 +0000 (16:42 +0000)]
Squelsh warnings.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40025 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoPrevet a crash when dissecting linked TI.
etxrab [Mon, 28 Nov 2011 16:41:59 +0000 (16:41 +0000)]
Prevet a crash when dissecting linked TI.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40024 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agolet packet-gsm_a_gm.c dissect Protocol Configuration Options.
etxrab [Mon, 28 Nov 2011 16:40:29 +0000 (16:40 +0000)]
let packet-gsm_a_gm.c dissect Protocol Configuration Options.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40023 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoUse __except(EXCEPTION_EXECUTE_HANDLER) rather than __except(TRUE);
wmeier [Mon, 28 Nov 2011 16:23:55 +0000 (16:23 +0000)]
Use __except(EXCEPTION_EXECUTE_HANDLER) rather than __except(TRUE);

 Strictly speaking, it appears that __except(EXCEPTION_EXECUTE_HANDLER)
 rather than __exept(TRUE) should be used altho in actuality there's
 no difference since TRUE (as defined by GLIB) == EXCEPTION_EXECUTE_HANDLER.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40022 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoAllow configuration protocol to configure UL priority for channels in mapping.
martinm [Mon, 28 Nov 2011 14:52:11 +0000 (14:52 +0000)]
Allow configuration protocol to configure UL priority for channels in mapping.
This value then gets used in call_rlc_dissector().

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40021 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoDon't specify an hf[] item as using a range_string when it's really using a value_string.
wmeier [Sun, 27 Nov 2011 21:14:59 +0000 (21:14 +0000)]
Don't specify an hf[] item as using a range_string when it's really using a value_string.

Fixes Bug #6618

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

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40020 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFix Coverity CID 1330, "Missing Break" by adding some /* FALLTHRU */'s.
cmaynard [Sun, 27 Nov 2011 16:29:42 +0000 (16:29 +0000)]
Fix Coverity CID 1330, "Missing Break" by adding some /* FALLTHRU */'s.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40019 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFix a typo.
cmaynard [Sun, 27 Nov 2011 16:17:22 +0000 (16:17 +0000)]
Fix a typo.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40018 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoVarious Minor cleanup:
wmeier [Sun, 27 Nov 2011 15:34:07 +0000 (15:34 +0000)]
Various Minor cleanup:
- Remove unneeded #includes;
- Use val_to_str_const() in several places;
- Reformat long lines;
- Fix whitepace and indentation.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40016 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoUse preference port (not defined constant) when port against src port;
wmeier [Sun, 27 Nov 2011 15:30:29 +0000 (15:30 +0000)]
Use preference port (not defined constant) when port against src port;
Remove unneeded #include.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40014 f5534014-38df-0310-8fa8-9805f1628bb7

7 years ago[Automatic manuf, services and enterprise-numbers update for 2011-11-27]
gerald [Sun, 27 Nov 2011 15:03:25 +0000 (15:03 +0000)]
[Automatic manuf, services and enterprise-numbers update for 2011-11-27]

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40013 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFix a wrong copy/paste....
alagoutte [Sat, 26 Nov 2011 16:32:20 +0000 (16:32 +0000)]
Fix a wrong copy/paste....

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40011 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFrom Kari Vatjus-Anttila via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id...
alagoutte [Sat, 26 Nov 2011 16:23:37 +0000 (16:23 +0000)]
From Kari Vatjus-Anttila  via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5956
kNet (KristalliNet) dissector for Wireshark

kNet is a connection-oriented network protocol for transmitting arbitrary application-specific messages between network hosts. It is designed primarily for applications that require a method for rapid space-efficient real-time communication. kNet is an application-level protocol which can be ran either over UDP, TCP or SCTP transports.

From me :
* Add Modelines information and fix trailing whitespace
* Merge packet-knet.h in packet-knet.c
* Make Checkhf happy
* Fix Clang/GCC Warning about unused variable
* Add Authors info & CMakeList.txt

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40010 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoThere is now an early (source only) Win32 version of GTK3 available.
jmayer [Sat, 26 Nov 2011 10:50:27 +0000 (10:50 +0000)]
There is now an early (source only) Win32 version of GTK3 available.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40009 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoDon't pass 'len' to the dissect routine since we know there's only 1 byte present...
cmaynard [Sat, 26 Nov 2011 04:45:49 +0000 (04:45 +0000)]
Don't pass 'len' to the dissect routine since we know there's only 1 byte present.  This fixes the buildbot complaint about using 'len' uninitialized.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40008 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoAdd a few casts to try to make the buildbots happy.
cmaynard [Sat, 26 Nov 2011 04:31:40 +0000 (04:31 +0000)]
Add a few casts to try to make the buildbots happy.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40007 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoIP option improvements. While fixing bug 6561, I noticed some deficiencies in the...
cmaynard [Sat, 26 Nov 2011 04:16:11 +0000 (04:16 +0000)]
IP option improvements.  While fixing bug 6561, I noticed some deficiencies in the IP options dissection capabilities.  Testing of these changes primarily used the capture file attached to that bug report as there were several IP options present.  Packet 222 is an interesting packet that illustrates some of the new filters available.  Further work is needed, but hopefully this is a good first step.  Fuzz testing was performed using my own "menagerie".

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40006 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoAdd missing '*/' to the end of a comment: Fixes gcc compile error.
wmeier [Fri, 25 Nov 2011 22:08:25 +0000 (22:08 +0000)]
Add missing '*/' to the end of a comment: Fixes gcc compile error.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40005 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFrom Ivan Lawrow: Added IEEE 802.15.4-2003 AES-CCM security modes
wmeier [Fri, 25 Nov 2011 22:02:25 +0000 (22:02 +0000)]
From Ivan Lawrow: Added IEEE 802.15.4-2003 AES-CCM security modes

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

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40004 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoMark drep parameter as unused in the epm_dissect_tower_data function
sfisher [Fri, 25 Nov 2011 17:19:00 +0000 (17:19 +0000)]
Mark drep parameter as unused in the epm_dissect_tower_data function
since its use was removed in r40002.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40003 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFrom Wido Kelling: EPM tower UUID must be interpreted always as little endian.
wmeier [Fri, 25 Nov 2011 17:02:51 +0000 (17:02 +0000)]
From Wido Kelling: EPM tower UUID must be interpreted always as little endian.

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

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40002 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoAdd the reason for a UL ReTx (PDCCH retx grant or PHICH NACK).
martinm [Fri, 25 Nov 2011 11:19:03 +0000 (11:19 +0000)]
Add the reason for a UL ReTx (PDCCH retx grant or PHICH NACK).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40001 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoRemove unused code (Add in Revision 836)
alagoutte [Fri, 25 Nov 2011 10:41:11 +0000 (10:41 +0000)]
Remove unused code (Add in Revision 836)
Fix also some Clang/GCC Warning about unused variable

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40000 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFix H.460.18 and H.460.19 integration into H.245
kukosa [Thu, 24 Nov 2011 15:18:11 +0000 (15:18 +0000)]
Fix H.460.18 and H.460.19 integration into H.245

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39998 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoOnly add the priority level if it is set inside valid range.
martinm [Thu, 24 Nov 2011 12:44:11 +0000 (12:44 +0000)]
Only add the priority level if it is set inside valid range.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39997 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFix gcc compile error
wmeier [Thu, 24 Nov 2011 03:33:29 +0000 (03:33 +0000)]
Fix gcc compile error

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39996 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoUse a GHashTable to store templates instead of
wmeier [Thu, 24 Nov 2011 03:20:44 +0000 (03:20 +0000)]
Use a GHashTable to store templates instead of
  using a home-grown hash table (which didn't handle collisions);
Include complete "connection info" (srcAddr,srcPort,dstAddr,dstPort) in "Template Name";
Rename various variables;
Re-indent & Re-format code.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39995 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoDisplay protocol ID consistently in decimal throughout. Append each IP option to...
cmaynard [Wed, 23 Nov 2011 18:33:45 +0000 (18:33 +0000)]
Display protocol ID consistently in decimal throughout.  Append each IP option to top-level Options field.  Whitespace cleanup - the majority of the dissector used 2-space indentation, so that's the format chosen.  Added modelines to match.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39994 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoMove some comments around to make it more boilerplate like.
jake [Tue, 22 Nov 2011 21:51:24 +0000 (21:51 +0000)]
Move some comments around to make it more boilerplate like.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39992 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFix two compiler errors.
wmeier [Tue, 22 Nov 2011 20:48:49 +0000 (20:48 +0000)]
Fix two compiler errors.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39991 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoHandle 2 issues related to cacheing templates:
wmeier [Tue, 22 Nov 2011 20:42:25 +0000 (20:42 +0000)]
Handle 2 issues related to cacheing templates:
 - Use a (slightly) less simplistic hashing algorithm to reduce collisions;
   Note: A GHashTable which handles collisions rather than
         a home-grown hash table (which does not) needs to be implemented.
 - Don't replace an existing template in the cache when a collision occurs;

Fixes Bug #6325
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6325

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39990 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoShow a "Capturing on ..." message similar to TShark.
guy [Tue, 22 Nov 2011 19:07:49 +0000 (19:07 +0000)]
Show a "Capturing on ..." message similar to TShark.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39989 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoAdd more packet highlights to the info column.
martinm [Tue, 22 Nov 2011 17:57:25 +0000 (17:57 +0000)]
Add more packet highlights to the info column.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39988 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFix bugs related to Nounce IE dissection.
etxrab [Tue, 22 Nov 2011 17:44:50 +0000 (17:44 +0000)]
Fix bugs related to Nounce IE dissection.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39987 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFor now, display the protocol in hexadecimal again so displaying it in decimal doesn...
cmaynard [Tue, 22 Nov 2011 15:18:20 +0000 (15:18 +0000)]
For now, display the protocol in hexadecimal again so displaying it in decimal doesn't get backported to the 1.6 and 1.4 trunks at the request of Joerg.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39986 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoUnconditionally install idl2wrs
rbalint [Tue, 22 Nov 2011 13:53:17 +0000 (13:53 +0000)]
Unconditionally install idl2wrs

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39985 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agohardcode /bin/sh to idl2wrs
rbalint [Tue, 22 Nov 2011 13:53:06 +0000 (13:53 +0000)]
hardcode /bin/sh to idl2wrs

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39984 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoIf we're not running as a child process, report the interfaces on which
guy [Tue, 22 Nov 2011 10:08:26 +0000 (10:08 +0000)]
If we're not running as a child process, report the interfaces on which
we're capturing.  (We do not require a -i flag; the message could be
useful if you don't specify the interface, as it lets you know which
interface was chosen, which might not be the interface you'd think it
would be.  Yes, that's arguably a libpcap bug, which I plan to look at;
it should probably try to figure out which interfaces are "active" if
possible, and prefer those.)

Use cmdarg_err() for invalid capture filters and other capture errors.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39983 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoAdd initial .gitignore files
rbalint [Tue, 22 Nov 2011 00:13:12 +0000 (00:13 +0000)]
Add initial .gitignore files

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39982 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoDon't hardcode 'python' for asn2wrs
rbalint [Tue, 22 Nov 2011 00:11:56 +0000 (00:11 +0000)]
Don't hardcode 'python' for asn2wrs

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39981 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoGet rid of Warnings.
etxrab [Mon, 21 Nov 2011 20:08:11 +0000 (20:08 +0000)]
Get rid of Warnings.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39980 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoTypo
etxrab [Mon, 21 Nov 2011 20:06:26 +0000 (20:06 +0000)]
Typo

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39979 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoGet rid of Warnings.
etxrab [Mon, 21 Nov 2011 20:04:45 +0000 (20:04 +0000)]
Get rid of Warnings.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39978 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoGet rid of Warnings.
etxrab [Mon, 21 Nov 2011 18:21:59 +0000 (18:21 +0000)]
Get rid of Warnings.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39977 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFrom Vincent Helfre:
etxrab [Mon, 21 Nov 2011 18:16:19 +0000 (18:16 +0000)]
From Vincent Helfre:
added the display of intermediate value used to decode ARFCN in
range 1024/256 format.
So now the W(n) values can be displayed and localised in the tvb buffer.
The code was reworked a little to use the get_bit functions.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39976 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFrom Claudio: header value always computed twice
wmeier [Mon, 21 Nov 2011 17:58:47 +0000 (17:58 +0000)]
From Claudio: header value always computed twice

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

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39975 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoAn SDNV length > 8 is also not dissectable. Should fix bug 6601.
guy [Mon, 21 Nov 2011 17:49:27 +0000 (17:49 +0000)]
An SDNV length > 8 is also not dissectable.  Should fix bug 6601.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39974 f5534014-38df-0310-8fa8-9805f1628bb7

7 years ago'dissect_ImageLZ_JPEG()' is apparently not used; #if 0 the code for now.
wmeier [Mon, 21 Nov 2011 17:05:17 +0000 (17:05 +0000)]
'dissect_ImageLZ_JPEG()' is apparently not used; #if 0 the code for now.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39973 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFrom Yaniv Kaul: Some enhancements, some fixes, to the Spice dissector:
wmeier [Mon, 21 Nov 2011 16:43:01 +0000 (16:43 +0000)]
From Yaniv Kaul: Some enhancements, some fixes, to the Spice dissector:
- SASL authentication support - improved (and correct) state machine.
- indention, tab fixes
- macro to fetch PDU, simplifying the code (and improving its readability)
- properly show the length of agent messages and align them under the right tree.

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

From me: Fix some indentation & remove some trailing whitespace.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39972 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoAdd the system frame number (SFN) to the context fields logged along with LTE MAC...
martinm [Mon, 21 Nov 2011 16:18:33 +0000 (16:18 +0000)]
Add the system frame number (SFN) to the context fields logged along with LTE MAC frames.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39971 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoLinking against GTK3 stoped working because only libgtk3 was linked
jmayer [Mon, 21 Nov 2011 15:39:25 +0000 (15:39 +0000)]
Linking against GTK3 stoped working because only libgtk3 was linked
against and no libs that gtk3 depended on. Fix this.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39970 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoMore warnings "set but not used" fixed
jmayer [Mon, 21 Nov 2011 15:03:17 +0000 (15:03 +0000)]
More warnings "set but not used" fixed

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39969 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoMove generated dissctors that are causing problems to DIRTY.
jmayer [Mon, 21 Nov 2011 13:52:35 +0000 (13:52 +0000)]
Move generated dissctors that are causing problems to DIRTY.

packet-x11.c: hundreds of:

/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/x11-extension-implementation.h: In function ‘xselinuxGetClientContext’:
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/x11-extension-implementation.h:27994:9: warning: variable ‘f_resource’ set but not used [-Wunused-but-set-variable]
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/x11-extension-implementation.h: In function ‘xselinuxGetClientContext_Reply’:

dissectors/packet-dcerpc-mapi.c: set but not used
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-dcerpc-mapi.c: In function ‘mapi_dissect_struct_Release_req’:
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-dcerpc-mapi.c:8592:14: warning: variable ‘tree’ set but not used [-Wunused-but-set-variable]
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-dcerpc-mapi.c: In function ‘mapi_dissect_struct_Release_repl’:
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-dcerpc-mapi.c:8617:14: warning: variable ‘tree’ set but not used [-Wunused-but-set-variable]
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-dcerpc-mapi.c: In function ‘mapi_dissect_struct_RecipSMTP’:
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-dcerpc-mapi.c:8848:14: warning: variable ‘tree’ set but not used [-Wunused-but-set-variable]

dissecots/packet-dcerpc-drsuapi.c: set but not used
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-dcerpc-drsuapi.c: In function ‘drsuapi_dissect_DsGetNCChangesCtr7’:
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-dcerpc-drsuapi.c:2920:17: warning: variable ‘tree’ set but not used [-Wunused-but-set-variable]

Btw.: Does it really make sense to use an extra CMakefile for the dcerpc/ dir?
      I'd rather the the idl2wrs.c in tools/ and the generatorstuff in epan/CMake

More files with the same problem.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39968 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoAnother case of written to only variable.
jmayer [Mon, 21 Nov 2011 12:13:36 +0000 (12:13 +0000)]
Another case of written to only variable.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39967 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agonew_offset was was written to but never read.
jmayer [Mon, 21 Nov 2011 12:11:35 +0000 (12:11 +0000)]
new_offset was was written to but never read.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39966 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoMove a generated file into file lists that do not treat warnings
jmayer [Mon, 21 Nov 2011 12:08:10 +0000 (12:08 +0000)]
Move a generated file into file lists that do not treat warnings
as errors:

/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-dcerpc-mapi.c: In function ‘mapi_dissect_struct_Release_req’:
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-dcerpc-mapi.c:8592:14: error: variable ‘tree’ set but not used [-Werror=unused-but-set-variable]
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-dcerpc-mapi.c: In function ‘mapi_dissect_struct_Release_repl’:
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-dcerpc-mapi.c:8617:14: error: variable ‘tree’ set but not used [-Werror=unused-but-set-variable]
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-dcerpc-mapi.c: In function ‘mapi_dissect_struct_RecipSMTP’:
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-dcerpc-mapi.c:8848:14: error: variable ‘tree’ set but not used [-Werror=unused-but-set-variable]

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39965 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoOn an I/O error, merge_read_packet() and merge_append_read_packet() need
guy [Mon, 21 Nov 2011 06:26:03 +0000 (06:26 +0000)]
On an I/O error, merge_read_packet() and merge_append_read_packet() need
to return a pointer to the merge_in_file_t that got the error.  Set *err
to 0 on success and an error code on an err, treat a null return as an
EOF indication, and if we don't get a null return check for a non-zero
error code and treat that as an I/O error.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39964 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFix potential infinite loop introduced with r39961 and find by the buildbot. Fixes...
cmaynard [Mon, 21 Nov 2011 02:01:59 +0000 (02:01 +0000)]
Fix potential infinite loop introduced with r39961 and find by the buildbot.  Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6599

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39963 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFix bug 6561: IPv4 UDP/TCP Checksum incorrect if routing header present.
cmaynard [Sun, 20 Nov 2011 15:47:14 +0000 (15:47 +0000)]
Fix bug 6561: IPv4 UDP/TCP Checksum incorrect if routing header present.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6561

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39961 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFix "'Closing File!' Dialog Hangs" bug 3046: https://bugs.wireshark.org/bugzilla...
cmaynard [Sun, 20 Nov 2011 15:11:15 +0000 (15:11 +0000)]
Fix "'Closing File!' Dialog Hangs" bug 3046: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3046

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39959 f5534014-38df-0310-8fa8-9805f1628bb7

7 years ago[Automatic manuf, services and enterprise-numbers update for 2011-11-20]
gerald [Sun, 20 Nov 2011 15:03:25 +0000 (15:03 +0000)]
[Automatic manuf, services and enterprise-numbers update for 2011-11-20]

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39958 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoGet rid of Warnings.
etxrab [Sun, 20 Nov 2011 12:43:04 +0000 (12:43 +0000)]
Get rid of Warnings.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39957 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoRemove export.
etxrab [Sun, 20 Nov 2011 10:27:26 +0000 (10:27 +0000)]
Remove export.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39956 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoSee if this fixes it, why it worked on my system is anybodys guess.
etxrab [Sun, 20 Nov 2011 09:51:03 +0000 (09:51 +0000)]
See if this fixes it, why it worked on my system is anybodys guess.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39955 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoGet rid of Warnings.
etxrab [Sun, 20 Nov 2011 08:59:19 +0000 (08:59 +0000)]
Get rid of Warnings.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39954 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoExpand a comment.
guy [Sun, 20 Nov 2011 03:15:53 +0000 (03:15 +0000)]
Expand a comment.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39953 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoThe URI parameter parser always has to advance current_offset in the
guy [Sat, 19 Nov 2011 22:57:13 +0000 (22:57 +0000)]
The URI parameter parser always has to advance current_offset in the
loop, otherwise you get stuck in an infinite loop.

(Where in RFC 3261 does it mention the use of commas in URI parameters?)

Should fix bug 6598.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39952 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoGet rid of Warnings.
etxrab [Sat, 19 Nov 2011 22:42:51 +0000 (22:42 +0000)]
Get rid of Warnings.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39951 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoClean up indentation.
guy [Sat, 19 Nov 2011 20:49:15 +0000 (20:49 +0000)]
Clean up indentation.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39950 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoWhen reporting "sorry, *this* packet can't be written to a file of that
guy [Sat, 19 Nov 2011 20:18:01 +0000 (20:18 +0000)]
When reporting "sorry, *this* packet can't be written to a file of that
type" when writing out a capture file (i.e., writing a
per-packet-encapsulation capture to a file type that supports it but
doesn't support one of the packet's encapsulations), report the packet
number and, when doing this in a merge operation, report the file from
which it came.

When reporting "sorry, that file can't be written to a file of that
type, period", show the file type rather than the input file link-layer
type that causes the problem.  (We could show both.  We could be
*really* ambitious and iterate through all possible file types and show
the ones that will or at least might work....)

file_write_error_message() is documented as handling only UNIX-style
errnos, and libwireshark should be usable without libwiretap, so leave
it up to its callers to handle Wiretap errors such as
WTAP_ERR_SHORT_WRITE.

Clean up indentation.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39949 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFix Warnings.
etxrab [Sat, 19 Nov 2011 17:21:35 +0000 (17:21 +0000)]
Fix Warnings.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39948 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoRevert 39946
etxrab [Sat, 19 Nov 2011 16:24:19 +0000 (16:24 +0000)]
Revert 39946

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39947 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoSee if this fixes "warning: initializer element is not computable at load time"
etxrab [Sat, 19 Nov 2011 16:15:07 +0000 (16:15 +0000)]
See if this fixes "warning: initializer element is not computable at load time"

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39946 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoGet rod of " warning: identifier ‘class’ conflicts with C++ keyword"
etxrab [Sat, 19 Nov 2011 09:08:50 +0000 (09:08 +0000)]
Get rod of " warning: identifier ‘class’ conflicts with C++ keyword"

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39945 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoFail if somebody tries to write out a packet with an unsupported
guy [Fri, 18 Nov 2011 21:39:18 +0000 (21:39 +0000)]
Fail if somebody tries to write out a packet with an unsupported
encapsulation.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39944 f5534014-38df-0310-8fa8-9805f1628bb7

7 years agoTry to preserve native line endings when we rewrite files.
gerald [Fri, 18 Nov 2011 16:51:40 +0000 (16:51 +0000)]
Try to preserve native line endings when we rewrite files.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39938 f5534014-38df-0310-8fa8-9805f1628bb7