Commit Graph

15275 Commits

Author SHA1 Message Date
Anders Broman f359ed7a74 Split out dissection of vendor AVP:s
svn path=/trunk/; revision=44806
2012-09-07 10:27:38 +00:00
Anders Broman cc6d4341e6 From Mike Morrin:
Interface based on header type rather than MCS.

passes in the header type for EGPRS packets. 
This makes sense because in a real protocol stack, the header type is encoded
in the burst stealing bits, allowing the header can be decoded, giving the CPS
IE, which then allows the data blocks to be decoded, so wireshark now follows
the same practice.

I found that there was a (previously overlooked) alignment error in decoding
the last octet of some headers due to the last "octet" having less than 8 bits,
and both the protocol stacks I have here assume that the left-hand bits are
missing (as per the figures in 44.060).  I corrected this by making a small
extension to the NULL encoding in packet-csn.[ch] to allow a NULL field to
consume more than 0 bits.

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

svn path=/trunk/; revision=44805
2012-09-07 07:43:13 +00:00
Jeff Morriss aa5d9d78dd From Robert Bullen via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7683 :
The reassembled fragments tree in the Packet Details view is awesome, but it
lacks one thing: a field that exposes the reassembled data.

tcp.data already exists for exposing a single TCP segment's payload as a byte
array. It would be handy to have something similar for a single application
layer PDU when TCP segment reassembly is involved. I propose
tcp.reassembled.data, named and placed after the already existing field
tcp.reassembled.length.

My primary use case for this feature is outputting tcp.reassembled.data with
tshark for further processing with a script.

The attached patch implements this very feature. Because the reassembled
fragment tree code is general purpose, i.e. not specific to just TCP, any
dissector that relies upon it can add a similar field very cheaply. In that
vein I've also implemented ip.reassembled.data and ipv6.reassembled.data, which
expose reassembled fragment data as a single byte stream for IPv4 and IPv6,
respectively. All other protocols that use the reassembly code have been left
alone, other than inserting NULL into their initializer lists for the newly
introduced struct field reassemble.h:fragment_items.hf_reassembled_data.

svn path=/trunk/; revision=44802
2012-09-07 02:09:59 +00:00
Jeff Morriss 8ba24b5530 From Aditya Ambadkar via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7046 :
Fix CID 703472 and (external) fuzz failure 7567:

The dissect_subtlv_interface_parameters is missing the handling of BFD 2..4.
For the crash patch, we decided to add the bfd2..4 in dissect_tlc function(in
the diff). We plan to open a separate bug to fix
dissect_subtlv_interface_parameters to make it handle BFD2..4. (Thanks to Arun
Arunachalam for this analysis)


From me: fix up some indentation and replace tabs with spaces (for consistency).

svn path=/trunk/; revision=44801
2012-09-07 01:35:16 +00:00
Gerald Combs 8fde28534d Fall back to using the parent tree if the AVP tree isn't set.
svn path=/trunk/; revision=44795
2012-09-06 22:34:02 +00:00
Anders Broman cab3f8337b packet-l2tp.c:880:9: error: unused variable 'rhcode' [-Werror=unused-variable]
svn path=/trunk/; revision=44794
2012-09-06 21:56:34 +00:00
Anders Broman e9b50ed117 Use proto_add_item
svn path=/trunk/; revision=44793
2012-09-06 21:22:59 +00:00
Pascal Quantin 1c2f498a82 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7697 :
Fix dissection of release 98 and release 99 QoS profiles (bug introduced in r43312)

svn path=/trunk/; revision=44792
2012-09-06 20:58:32 +00:00
Alexis La Goutte fc5c9f7853 From Masashi Honma via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7691
TKIP dissection : wrong IS_TKIP macro

In [1] "11.4.2.2 TKIP MPDU formats", we could see below sentence.
"WEPSeed[1] is not used to construct the TSC, but is set to (TSC1 | 0x20) &
0x7f."

But the IS_TKIP macro only checks (WEPSeed[1] & 0x20).
So sometimes IS_TKIP macro mis-dissects a CCMP frame as a TKIP frame.

This patch changes IS_TKIP macro to do more better check.

[1] IEEE Std 802.11.-2012

#BACKPORT(1.8, 1.6)

svn path=/trunk/; revision=44790
2012-09-06 08:55:16 +00:00
Alexis La Goutte 2cb7032b59 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=44789
2012-09-06 08:49:47 +00:00
Alexis La Goutte 3b413e581e Prefer proto_tree_add_item (when it is possible)
svn path=/trunk/; revision=44788
2012-09-06 08:48:34 +00:00
Anders Broman 57c03ff5b3 From Chris Elston:
Add support for control message authentication checking for IP encapsulated L2TPv3 packets.

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

svn path=/trunk/; revision=44786
2012-09-06 08:03:15 +00:00
Pascal Quantin d2715d3b5f Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7701 :
Do sanity check on option length earlier

svn path=/trunk/; revision=44785
2012-09-05 21:23:50 +00:00
Martin Kaiser cc9feb9857 fix compilation on Win7x64 (I hope)
svn path=/trunk/; revision=44783
2012-09-05 20:31:52 +00:00
Martin Kaiser 45af5d6a2d add modelines for the ftp dissector
svn path=/trunk/; revision=44782
2012-09-05 20:08:09 +00:00
Martin Kaiser fd919c30cb from Alexander Koeppe
ftp PASV and PORT commands: mark ip address and port in data view

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


svn path=/trunk/; revision=44781
2012-09-05 19:51:57 +00:00
Pascal Quantin e6538311a6 Replace process_RequestOperation macro by a real function to speedup compilation time
svn path=/trunk/; revision=44779
2012-09-05 12:45:54 +00:00
Anders Broman 881a115a88 Update value_strings
svn path=/trunk/; revision=44778
2012-09-05 11:54:09 +00:00
Pascal Quantin 03e43c76b3 From Harald Welte via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7696 :
packet-gsm_abis_om2000: Add support for MO IF bytes 2 and 3

svn path=/trunk/; revision=44777
2012-09-05 10:16:24 +00:00
Pascal Quantin 088e40446a From Harald Welte via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7695 :
Fix minor inconsistency in packet-gsm_abis_om2000.c

svn path=/trunk/; revision=44776
2012-09-05 09:54:42 +00:00
Anders Broman 1be02f5226 From Jared August:
PTPv2: Added IEEE C37.238 TLV support

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

svn path=/trunk/; revision=44775
2012-09-05 07:40:36 +00:00
Pascal Quantin 5cdcf9c280 Add dissection of SIP Servers option to DHCPv4 (RFC 3361)
svn path=/trunk/; revision=44773
2012-09-04 20:43:24 +00:00
Guy Harris e79e7c59f8 Use libwireshark's xDLC handling functions and macros to process the
control field.  This means processing the AX.25 header data in one pass.

The field after the control field is the "protocol identifier" field,
not the "packet identifier" field.

svn path=/trunk/; revision=44772
2012-09-04 20:42:21 +00:00
Pascal Quantin 86888580d6 Fix compilation with gcc
svn path=/trunk/; revision=44771
2012-09-04 18:26:18 +00:00
Pascal Quantin 05c440b622 Set SVN properties
svn path=/trunk/; revision=44770
2012-09-04 18:14:20 +00:00
Michael Mann 2b4bcea631 Add GED125 dissector
Bug 2692 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2692)

svn path=/trunk/; revision=44769
2012-09-04 17:54:27 +00:00
Alexis La Goutte 3ccb64d490 Add modelines for DNS dissector
svn path=/trunk/; revision=44767
2012-09-04 08:19:08 +00:00
Jörg Mayer 7aa18f37cd Small whitespace changes
svn path=/trunk/; revision=44763
2012-09-04 00:42:07 +00:00
Martin Kaiser a31e9fc2cc unify the handling for all DVB/MPEG sections
don't initialize pointer where it's not required
 remove unnecessary 'if (tree)' checks

svn path=/trunk/; revision=44762
2012-09-03 21:25:07 +00:00
Martin Kaiser 677d843489 highlight only the actual bytes of EIT, SDT, TDT, TOT and BAT
minor whitespace cleanup
skip initialization and 'if (tree)' where it's not required

svn path=/trunk/; revision=44761
2012-09-03 21:18:50 +00:00
Martin Kaiser 2558013747 fix a typo in dvb service descriptor
svn path=/trunk/; revision=44760
2012-09-03 21:11:01 +00:00
Martin Kaiser d522ab8a42 add modelines for dvb sections
svn path=/trunk/; revision=44756
2012-09-03 18:50:21 +00:00
Martin Kaiser a3bd9a410e add editor modelines (that match the current indentation style)
svn path=/trunk/; revision=44755
2012-09-03 18:37:03 +00:00
Pascal Quantin 965a2f6904 Add missing newline at end of file
svn path=/trunk/; revision=44753
2012-09-03 17:11:55 +00:00
Pascal Quantin 01b374b714 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7666 :
Check that DRDA command has a minimum length of 10 bytes to prevent a potential infinite loop

svn path=/trunk/; revision=44749
2012-09-03 12:48:57 +00:00
Jakub Zawadzki 5ad3e5331e MT: move global frame_end_routines to packet_info.
svn path=/trunk/; revision=44748
2012-09-03 12:00:40 +00:00
Ronnie Sahlberg b9d4af9675 SCSI: lots of MMC improvements and prettifications
svn path=/trunk/; revision=44745
2012-09-02 21:46:50 +00:00
Ronnie Sahlberg fb44903de7 SCSI: Improve decoding of GET_EVENT_STATUS_NOTIFICATION
svn path=/trunk/; revision=44744
2012-09-02 20:02:29 +00:00
Evan Huus 9c924315b6 Use parentheses to clarify ambiguous operator precedence.
svn path=/trunk/; revision=44743
2012-09-02 17:12:12 +00:00
Evan Huus d936fe6cf0 Fix compile with gcc. Mostly removing unused parameters and code.
Change one tvb_get_bits8 to tvb_get_bits16 since the queried length is
9 bits long (should this be added to checkAPI somehow?)

svn path=/trunk/; revision=44742
2012-09-02 16:46:39 +00:00
Anders Broman 12e5e625a6 From Mike Morrin:
Enhancemnt to GSM RLCMAC dissection adding dissection of data block headers

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

svn path=/trunk/; revision=44741
2012-09-02 15:05:43 +00:00
Michael Mann 7da7443c00 length check "heuristics" for FF dissector (UDP + TCP)
Fix compiler error

"Fix" WTP+WSP packets incorrectly dissected as Foundation FieldBus packets https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4822

svn path=/trunk/; revision=44735
2012-09-02 02:28:55 +00:00
Guy Harris 980968ea29 Include packet-6lowpan.h in the release tarball.
svn path=/trunk/; revision=44732
2012-09-01 19:42:53 +00:00
Evan Huus 46a2eeecaf Add expert warning when we get a mysql EOF marker and the
connection is in a state where we're not expecting one.

svn path=/trunk/; revision=44731
2012-09-01 16:20:43 +00:00
Evan Huus 5745bb4382 Remove duplicate assignment (caught by cppcheck).
svn path=/trunk/; revision=44729
2012-09-01 15:00:49 +00:00
Evan Huus ae3ff16465 Fix C++-style comment caught by checkAPI.
svn path=/trunk/; revision=44725
2012-09-01 13:02:14 +00:00
Anders Broman 89f2554ef1 Revert
length check "heuristics" for FF dissector (UDP + TCP)

"Fix" WTP+WSP packets incorrectly dissected as Foundation FieldBus packets https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4822

As it fails with
cc1: warnings being treated as errors
packet-ff.c: In function 'dissect_ff_tcp':
packet-ff.c:13061: warning: passing argument 7 of 'tcp_dissect_pdus' from incompatible pointer type

svn path=/trunk/; revision=44724
2012-09-01 12:06:58 +00:00
Anders Broman e128334750 From Owen Kirby:
6LoWPAN: Automatic context detection and draft-ietf-6lowpan-nd-19 updates.

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

svn path=/trunk/; revision=44723
2012-09-01 11:54:16 +00:00
Anders Broman 4b6ad1d9d7 From Michael Mann:
length check "heuristics" for FF dissector (UDP + TCP)

"Fix" WTP+WSP packets incorrectly dissected as Foundation FieldBus packets https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4822

svn path=/trunk/; revision=44722
2012-09-01 11:37:42 +00:00
Anders Broman c44a7fba0d From Litao Gao:
Implementation of IRemoteSCMActivator::RemoteCreateInstance and some minor bug fix

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

svn path=/trunk/; revision=44721
2012-09-01 11:22:29 +00:00