Commit Graph

38113 Commits

Author SHA1 Message Date
Chris Maynard bdd62e33aa Hopefully clarify usage a bit to indicate multiple infile's can be specified to be merged. Also, add GPL and copyright info.
svn path=/trunk/; revision=40051
2011-11-30 15:55:53 +00:00
Martin Mathieson 98edb1cbb4 Add missing comments in syntax description for -z expert
svn path=/trunk/; revision=40050
2011-11-30 15:45:20 +00:00
Martin Mathieson 3b86b4d608 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.
svn path=/trunk/; revision=40049
2011-11-30 15:41:39 +00:00
Chris Maynard 348c681918 From Eugene Bogush: Initialize read_err to 0 so mergecap works again. Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6623
svn path=/trunk/; revision=40048
2011-11-30 15:28:58 +00:00
Martin Mathieson f24e897094 Extend coverage of #ifdef HAVE_PCAP_REMOTE to cover the static function insert_new_rows().
svn path=/trunk/; revision=40047
2011-11-30 09:47:10 +00:00
Anders Broman f8de290bfa Get rid of warnings.
svn path=/trunk/; revision=40046
2011-11-30 06:58:44 +00:00
Anders Broman fc61fbe43a From Pascal Quantin:
decoding of IPv6 Control Protocol embedded in PCO

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

svn path=/trunk/; revision=40045
2011-11-29 22:32:31 +00:00
Anders Broman f40538afeb 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

svn path=/trunk/; revision=40044
2011-11-29 22:25:21 +00:00
Guy Harris 38689e5c2b Must include header files in a macro, so they get included in the
release tarball.

svn path=/trunk/; revision=40043
2011-11-29 20:25:49 +00:00
Alexis La Goutte ba94f6f0a5 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=40042
2011-11-29 19:54:00 +00:00
Alexis La Goutte 65bfa0ed9a Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=40041
2011-11-29 19:53:02 +00:00
Alexis La Goutte 44c90c7587 Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=40040
2011-11-29 19:50:30 +00:00
Alexis La Goutte 6f7c632a2f 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...)

svn path=/trunk/; revision=40039
2011-11-29 19:46:12 +00:00
Alexis La Goutte 022a45e0d9 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

svn path=/trunk/; revision=40038
2011-11-29 19:36:53 +00:00
Alexis La Goutte 557a841313 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

svn path=/trunk/; revision=40037
2011-11-29 19:22:35 +00:00
Anders Broman 4904586292 Gtk3 package byte highlighter colour fix.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6624

svn path=/trunk/; revision=40036
2011-11-29 17:46:38 +00:00
Anders Broman 209ecca1c1 Update value strings.
svn path=/trunk/; revision=40035
2011-11-29 17:31:52 +00:00
Martin Mathieson 18478b7ba9 Add priority to the channel table.
svn path=/trunk/; revision=40034
2011-11-29 14:42:22 +00:00
Anders Broman 512e379901 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."

svn path=/trunk/; revision=40033
2011-11-29 07:03:31 +00:00
Gerald Combs 50594f1d71 Allow for, but don't yet use, GTK+ 2.24.
svn path=/trunk/; revision=40032
2011-11-29 00:07:54 +00:00
Martin Mathieson 03c35a8483 Add newline at the end of the file.
svn path=/trunk/; revision=40031
2011-11-28 18:33:58 +00:00
Anders Broman 094e30816d Fix Checkapi found errors.
svn path=/trunk/; revision=40030
2011-11-28 18:10:57 +00:00
Anders Broman c610654cc8 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

svn path=/trunk/; revision=40029
2011-11-28 17:59:54 +00:00
Anders Broman 8fd7db8605 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

svn path=/trunk/; revision=40028
2011-11-28 17:31:09 +00:00
Anders Broman 2cd8cf96f9 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

svn path=/trunk/; revision=40027
2011-11-28 17:13:45 +00:00
Anders Broman 947399180f 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

svn path=/trunk/; revision=40026
2011-11-28 17:05:35 +00:00
Anders Broman 4a00a8ac58 Squelsh warnings.
svn path=/trunk/; revision=40025
2011-11-28 16:42:43 +00:00
Anders Broman c755a51c40 Prevet a crash when dissecting linked TI.
svn path=/trunk/; revision=40024
2011-11-28 16:41:59 +00:00
Anders Broman 7d64f2d940 let packet-gsm_a_gm.c dissect Protocol Configuration Options.
svn path=/trunk/; revision=40023
2011-11-28 16:40:29 +00:00
Bill Meier 72825137b4 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.


svn path=/trunk/; revision=40022
2011-11-28 16:23:55 +00:00
Martin Mathieson 8f871c472d Allow configuration protocol to configure UL priority for channels in mapping.
This value then gets used in call_rlc_dissector().

svn path=/trunk/; revision=40021
2011-11-28 14:52:11 +00:00
Bill Meier 5d798a2aa8 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

svn path=/trunk/; revision=40020
2011-11-27 21:14:59 +00:00
Chris Maynard 557d4c491f Fix Coverity CID 1330, "Missing Break" by adding some /* FALLTHRU */'s.
svn path=/trunk/; revision=40019
2011-11-27 16:29:42 +00:00
Chris Maynard bdbe75190f Fix a typo.
svn path=/trunk/; revision=40018
2011-11-27 16:17:22 +00:00
Bill Meier c4ace59928 Various Minor cleanup:
- Remove unneeded #includes;
- Use val_to_str_const() in several places;
- Reformat long lines;
- Fix whitepace and indentation.

svn path=/trunk/; revision=40016
2011-11-27 15:34:07 +00:00
Bill Meier ac9bcb9e7a Use preference port (not defined constant) when port against src port;
Remove unneeded #include.

svn path=/trunk/; revision=40014
2011-11-27 15:30:29 +00:00
Gerald Combs d856fd7b9e [Automatic manuf, services and enterprise-numbers update for 2011-11-27]
svn path=/trunk/; revision=40013
2011-11-27 15:03:25 +00:00
Alexis La Goutte 90fc47b5a3 Fix a wrong copy/paste....
svn path=/trunk/; revision=40011
2011-11-26 16:32:20 +00:00
Alexis La Goutte d4050b9b0a 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

svn path=/trunk/; revision=40010
2011-11-26 16:23:37 +00:00
Jörg Mayer 296fade785 There is now an early (source only) Win32 version of GTK3 available.
svn path=/trunk/; revision=40009
2011-11-26 10:50:27 +00:00
Chris Maynard 5cfa297971 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.
svn path=/trunk/; revision=40008
2011-11-26 04:45:49 +00:00
Chris Maynard 6dc3290d68 Add a few casts to try to make the buildbots happy.
svn path=/trunk/; revision=40007
2011-11-26 04:31:40 +00:00
Chris Maynard d51167076a 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".
svn path=/trunk/; revision=40006
2011-11-26 04:16:11 +00:00
Bill Meier 7ff8d2e622 Add missing '*/' to the end of a comment: Fixes gcc compile error.
svn path=/trunk/; revision=40005
2011-11-25 22:08:25 +00:00
Bill Meier 78af0d3f86 From Ivan Lawrow: Added IEEE 802.15.4-2003 AES-CCM security modes
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4912

svn path=/trunk/; revision=40004
2011-11-25 22:02:25 +00:00
Stephen Fisher a4fedb2a86 Mark drep parameter as unused in the epm_dissect_tower_data function
since its use was removed in r40002.


svn path=/trunk/; revision=40003
2011-11-25 17:19:00 +00:00
Bill Meier 6ed4eee44f From Wido Kelling: EPM tower UUID must be interpreted always as little endian.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6368

svn path=/trunk/; revision=40002
2011-11-25 17:02:51 +00:00
Martin Mathieson 899155a563 Add the reason for a UL ReTx (PDCCH retx grant or PHICH NACK).
svn path=/trunk/; revision=40001
2011-11-25 11:19:03 +00:00
Alexis La Goutte a21d6f0a96 Remove unused code (Add in Revision 836)
Fix also some Clang/GCC Warning about unused variable

svn path=/trunk/; revision=40000
2011-11-25 10:41:11 +00:00
Tomas Kukosa 3c7926a2c6 Fix H.460.18 and H.460.19 integration into H.245
svn path=/trunk/; revision=39998
2011-11-24 15:18:11 +00:00