Commit graph

42399 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
Anders Broman
ef3bcb9c84 Revert 44804 as it fails on most OSX and Windows buildbots
svn path=/trunk/; revision=44804
2012-09-07 05:41:54 +00:00
Jeff Morriss
6dc8a84eab From pi-rho via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7403 :
Correct a logic error which filtered out the Python-related library symbols
when Python is enabled.

Actually expose some Python-related symbols (which get filtered out if it's
not enabled).

svn path=/trunk/; revision=44803
2012-09-07 02:20:29 +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
Jeff Morriss
621120248d From Stephen Donnelly via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7266 :
Since we have to 'downconvert' the ERF time stamps to Wireshark's internal
representation anyway, we may as well report the resolution which we convert
to, rather than the original native resolution.

svn path=/trunk/; revision=44800
2012-09-07 01:23:48 +00:00
Guy Harris
b50bf64b3b I presume the mergeType method is supposed to be provided regardless of
whether this is Windows or not.

svn path=/trunk/; revision=44799
2012-09-07 00:29:32 +00:00
Gerald Combs
ed08b5fd5b Fix compilation on Windows.
svn path=/trunk/; revision=44798
2012-09-06 23:41:34 +00:00
Gerald Combs
2bda67e82e Implement File→Merge.
The GTK+ and native Win32 versions are slightly different. The GTK+
version lets you select an output file type and the Win32 version uses
the existing capture filetype. We do the latter for now.

Start documenting significant UI changes in README.qt. This might be
better handled on the wiki.

svn path=/trunk/; revision=44797
2012-09-06 22:58:39 +00:00
Gerald Combs
4333dd03f4 Don't use a variable after we've freed it.
svn path=/trunk/; revision=44796
2012-09-06 22:39:42 +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
Jörg Mayer
d8a7eed0a7 Get netlink detection working with cmake (not complete)
svn path=/trunk/; revision=44791
2012-09-06 10:37:17 +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
Guy Harris
843697e0bd Fix some of the links for Subversion, which is now at
subversion.apache.org.

svn path=/trunk/; revision=44787
2012-09-06 08:21:51 +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
Gerald Combs
345529250f Run 'git log' if we have a .git directory. Fixes a copy+paste error.
svn path=/trunk/; revision=44784
2012-09-05 20:58:15 +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
Gerald Combs
42c506132e The Qt documentation is mysteriously silent about where qmake can find
Qt DLLs on Windows. %QTDIR%? $$QMAKE_LIBDIR_QT? "qmkake -query" says
$$[QT_INSTALL_BINS] so we'll try that.

svn path=/trunk/; revision=44780
2012-09-05 19:00:41 +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
Evan Huus
471b4d94ef Remove string constants from g_assert() calls, as per thread on wireshark-dev:
http://www.wireshark.org/lists/wireshark-dev/201209/msg00030.html

svn path=/trunk/; revision=44774
2012-09-05 01:44:09 +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
Anders Broman
342c344c1f From Pontus Fuchs:
Fall back to CMD_SET_WIPHY for older kernels. 

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

svn path=/trunk/; revision=44768
2012-09-04 08:57:03 +00:00
Alexis La Goutte
3ccb64d490 Add modelines for DNS dissector
svn path=/trunk/; revision=44767
2012-09-04 08:19:08 +00:00
Alexis La Goutte
42ace71553 Add modelines for Qtshark file
svn path=/trunk/; revision=44766
2012-09-04 08:18:31 +00:00
Jörg Mayer
12a0aa4849 - Replace packet_list_recreate_visible_rows -> packet_list_recreate_visible_rows_list
- Replace new_packet_list_ -> packet_list_


svn path=/trunk/; revision=44765
2012-09-04 02:35:25 +00:00
Jörg Mayer
380fe63a6d Rename new_packet_list.[ch] to packet_list.[ch]
svn path=/trunk/; revision=44764
2012-09-04 01:57:36 +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
Jeff Morriss
005bc98d09 LIBGCRYPT_CFLAGS and LIBGNUTLS_CFLAGS don't seem to be necessary here.
svn path=/trunk/; revision=44759
2012-09-03 19:56:25 +00:00
Jeff Morriss
4c0b20f3bb (Attempt to) fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7411 :
Use LIBGCRYPT_CFLAGS if we have it.

svn path=/trunk/; revision=44758
2012-09-03 19:53:35 +00:00
Jeff Morriss
f90f3f3438 Don't fetch the value twice (unsigned integer case). Fix a cut-n-pasteo.
svn path=/trunk/; revision=44757
2012-09-03 19:33:45 +00:00