Commit Graph

42441 Commits

Author SHA1 Message Date
Alexis La Goutte 8f4a2e5f28 Update svnversion.h with (short) SHA-1 commit id and branch when use git repository
svn path=/trunk/; revision=44850
2012-09-10 16:00:58 +00:00
Alexis La Goutte 0157f2f5e7 From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709
Enhance DNS Dissector

Make WKS Type filterable

svn path=/trunk/; revision=44849
2012-09-10 15:54:21 +00:00
Alexis La Goutte 0cede7b727 From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709
Enhance DNS Dissector

Make PTR Type filterable

svn path=/trunk/; revision=44848
2012-09-10 15:52:37 +00:00
Alexis La Goutte a11cd0e674 From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709
Enhance DNS Dissector

Make SOA Type filterable

svn path=/trunk/; revision=44847
2012-09-10 15:52:00 +00:00
Jakub Zawadzki 6ec66dbc45 Revert part of r44845 (packet-lppe.c) #fail
svn path=/trunk/; revision=44846
2012-09-10 15:35:23 +00:00
Jakub Zawadzki 0176a135db Propage changes done in generated dissectors to asn1/
svn path=/trunk/; revision=44845
2012-09-10 15:24:00 +00:00
Jeff Morriss 17e7db3bca Attempt to fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5699
and https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5979 : 

Don't cast the buffer address to int on Win32: a 64-bit address won't
fit in an integer.

svn path=/trunk/; revision=44844
2012-09-10 15:18:17 +00:00
Pascal Quantin e48357e7f3 Add SVN properties
svn path=/trunk/; revision=44843
2012-09-10 14:56:22 +00:00
Michael Mann ea772dea9e Compiler fixes to rev 44841
svn path=/trunk/; revision=44842
2012-09-10 14:22:24 +00:00
Michael Mann 8ba9710ceb Add Bluetooth HID dissector (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7710)
with some minor corrections done to the patch.

svn path=/trunk/; revision=44841
2012-09-10 14:19:07 +00:00
Anders Broman 4f6442c846 Fix a typo.
svn path=/trunk/; revision=44840
2012-09-10 13:40:06 +00:00
Anders Broman 84c57e6eb6 From Pontus Fuchs.
new check for the configure script to disable the tool bar if
the nl80211.h is not good enough.

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

svn path=/trunk/; revision=44839
2012-09-10 13:15:02 +00:00
Jörg Mayer 0fc383a98f Only check if the NL-stuff isn't in the caches already
svn path=/trunk/; revision=44838
2012-09-10 12:16:44 +00:00
Anders Broman 179e7bb4b6 From Michal Labedzki:
Bluetooth: Use correct names for ACL dissector

Dissector name is "bthci_acl" so use it for convention.
Also some cosmetic alignments

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

svn path=/trunk/; revision=44837
2012-09-10 12:12:05 +00:00
Anders Broman 7727889fe4 From Michal Labedzki:
Bluetooth: Use correct names for SCO dissector

Dissector name is "bthci_sco" so use it for convention.
Also some cosmetic alignments.



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

svn path=/trunk/; revision=44836
2012-09-10 12:08:27 +00:00
Anders Broman 1460bb5352 From Michal Labedzki:
Bluetooth: Fix registering DUN and SPP

Use correct variable instead of used by HFP.


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

svn path=/trunk/; revision=44835
2012-09-10 12:07:45 +00:00
Anders Broman 4c3e0d28de From Michal Labedzki:
Bluetooth: Add colors for Bluetooth dissectors

Add color for: HCI_CMD, HCI_EVT, SCO, L2CAP, RFCOMM, HFP and OBEX.

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

svn path=/trunk/; revision=44834
2012-09-10 11:52:44 +00:00
Anders Broman d94a139780 From Michal Labedzki:
Fix casting to make compilator happy again.

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

svn path=/trunk/; revision=44833
2012-09-10 11:49:01 +00:00
Anders Broman 43804346a1 Fix AVP attribute.
svn path=/trunk/; revision=44832
2012-09-10 11:47:45 +00:00
Anders Broman ad3f60afb8 From Michal Labedzki on behalf of Tieto Corporation:
Bluetooth: Update SDP headers to latest ASSIGNED NUMBERS

Based on value provided by Bluetooth SIG:
https://www.bluetooth.org/Technical/AssignedNumbers/service_discovery.htm

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

svn path=/trunk/; revision=44831
2012-09-10 11:30:13 +00:00
Alexis La Goutte e486f63a47 From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709
Enhance DNS Dissector

Fix indent (remove tabs)

svn path=/trunk/; revision=44830
2012-09-10 09:15:33 +00:00
Alexis La Goutte 5d7c6dc0da From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7709
Enhance DNS Dissector

Add new DNS type : TLSA/DANE (52) RFC6698
The DNS-Based Authentication of Named Entities (DANE) Transport Layer Security (TLS) Protocol: TLSA

svn path=/trunk/; revision=44829
2012-09-10 09:14:53 +00:00
Anders Broman eaf81ff987 From Rick Krull:
One can't resize the columns on several "tree views".  The one that I ran into
was "Decode As: Show".  I added "set_resizable" to make it resizable.

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

svn path=/trunk/; revision=44828
2012-09-10 08:36:03 +00:00
Anders Broman 77f4036dd6 Add dissection of Vendor id to CISCO AVP dissection.
svn path=/trunk/; revision=44827
2012-09-10 08:26:22 +00:00
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