Commit Graph

42567 Commits

Author SHA1 Message Date
Bill Meier 5e4bff84d3 Use non-capturing grouping when grouping just for alternatives;
Also: improve error message slightly in the case of a missing NULL termination.

svn path=/trunk/; revision=44826
2012-09-10 01:53:23 +00:00
Jeff Morriss 659569581e As requested in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5415#c4 :
Add a comment about where dictionary.eltex came from.

svn path=/trunk/; revision=44825
2012-09-10 01:48:35 +00:00
Jeff Morriss b1a5af9eed string_strings and range_strings must also be {0, NULL} terminated.
Also, remove some tabs.

svn path=/trunk/; revision=44824
2012-09-10 00:48:50 +00:00
Pascal Quantin 0a1c9c7b8b From Florian Fainelli via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7707 :
Fix dissection of small Homeplug AV frames

svn path=/trunk/; revision=44823
2012-09-09 20:10:14 +00:00
Evan Huus 9c0dd8c7dc Make count variable in editcap unsigned, fixes more format string
mismatches.

svn path=/trunk/; revision=44820
2012-09-09 14:23:38 +00:00
Gerald Combs 2fc104ad34 [Automatic manuf, services and enterprise-numbers update for 2012-09-09]
svn path=/trunk/; revision=44819
2012-09-09 14:03:32 +00:00
Evan Huus bcf6e79573 Convert inpkts_to_sync_pipe and report_packet_count() to use unsigned ints
consistently. Cleans up some cppcheck warnings about signed/unsigned mismatches
in format strings.

svn path=/trunk/; revision=44818
2012-09-09 13:57:43 +00:00
Evan Huus 7ad756e9c2 From Martin Kupec via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7658
Manually expand some of the macros in packet-llrp.c that were only being used
in one place. Makes for a more traditional set of hf_ registrations.

svn path=/trunk/; revision=44817
2012-09-09 01:39:27 +00:00
Guy Harris 87d4f06b2f At least with the Shiny New llvm-gcc in Xcode 4.4.1, there's no need to
add -no-cpp-precomp; I think the way the compiler handled precompiled
headers changed at some point.  Let's stop adding it; that would fix bug
5878.

svn path=/trunk/; revision=44816
2012-09-08 18:42:21 +00:00
Guy Harris c16ff99f81 Make register_all_wiretap_modules() and register_all_codecs() static;
they're only used internally to epan/plugins.c.

svn path=/trunk/; revision=44815
2012-09-08 17:16:51 +00:00
Evan Huus d574361f5c Use g_hash_table_new_full() instead of g_hash_table_new() for subdissector
registration tables, and use g_free as the value_destroy_func. This saves us
from manually freeing the value when we remove an item, and prevents us from
leaking memory when we accidentally overwrite an existing item.

svn path=/trunk/; revision=44814
2012-09-08 15:03:07 +00:00
Guy Harris f5428eddcd OK, fine, g_malloc() and g_free(). We really should be using
g_try_free(), because, trust me, we *can* handle allocation failures
here.

svn path=/trunk/; revision=44813
2012-09-08 07:57:45 +00:00
Guy Harris 001dbcfc0b We no longer use Gestalt(), so there's no need to check for it.
We *do*, however, use CFPropertyListCreateWithStream(), so we need to
check for it, and, if we're able to use the OS X frameworks at all, use
CFPropertyListCreateFromStream() if we don't have
CFPropertyListCreateWithStream().

svn path=/trunk/; revision=44812
2012-09-08 07:46:56 +00:00
Guy Harris 50351aa1c4 Mountain Lion marks Gestalt() as deprecated, which causes the build to
fail on Mountain Lion with the default -W flags, but no replacement API
was specified.  Fall back on dredging information out of
/System/Library/CoreServices/SystemVersion.plist; this also lets us get
the OS build version.

(In theory, we could calculate the OS version from the Darwin version
for everything except 10.0:

	12.x.x  OS X 10.8.x Mountain Lion
	11.x.x  OS X 10.7.x Lion
	10.x.x  OS X 10.6.x Snow Leopard
	 9.x.x  OS X 10.5.x Leopard
	 8.x.x  OS X 10.4.x Tiger
	 7.x.x  OS X 10.3.x Panther
	 6.x.x  OS X 10.2.x Jaguar
	 5.x    OS X 10.1.x Puma

and could get the build number as "kern.osversion" from sysctl.)

svn path=/trunk/; revision=44811
2012-09-08 07:04:13 +00:00
Guy Harris 61b70c94c9 Fix some issues that showed up when building on Mountain Lion, and
update the README.macos file.

svn path=/trunk/; revision=44810
2012-09-08 03:10:03 +00:00
Guy Harris 4c77fc1fca Include wspython if we *do* have libpy, not if we *don't*.
svn path=/trunk/; revision=44809
2012-09-07 19:40:10 +00:00
Alexis La Goutte 01079fba93 From Owen Kirby via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7704
IANA assignments for 6LoWPAN-ND

draft-ietf-6lowpan-nd-21 has entered the RFC editor's queue, and has been
officially assigned values for the ICMPv6 message and option type codes ( as
seen at http://www.iana.org/assignments/icmpv6-parameters/icmpv6-parameters.xml
)

This patch replaces the old placeholder values for the 6LoWPAN-ND types with
the official IANA assignments.

svn path=/trunk/; revision=44808
2012-09-07 11:54:25 +00:00
Anders Broman fdba4d5f3b packet-l2tp.c: In function 'dissect_l2tp_cisco_avps':
packet-l2tp.c:864: warning: unused parameter 'pinfo'

svn path=/trunk/; revision=44807
2012-09-07 10:40:10 +00:00
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