Commit graph

17011 commits

Author SHA1 Message Date
Guy Harris
d89d6c8314 Report bogus handshake length values with expert info. This includes
trying to handle reassembly of packets with *differing* handshake length
values a bit better.

Make coding style a little more consistent.

svn path=/trunk/; revision=48916
2013-04-18 19:19:38 +00:00
Guy Harris
c35b6c5f6d Catch retransmission of FINs, so if we're doing "reassemble until end of
data stream", only the first FIN segment is reported with the
reassembled packet.

Show the TCP fragment tree *before* processing the payload, so it's
shown even if processing the payload throws an exception.

svn path=/trunk/; revision=48915
2013-04-18 19:11:05 +00:00
Guy Harris
e300ddb0df Catch retransmission of FINs, so if we're doing "reassemble until end of
data stream", only the first FIN segment is reported with the
reassembled packet.

Show the TCP fragment tree *before* processing the payload, so it's
shown even if processing the payload throws an exception.

svn path=/trunk/; revision=48914
2013-04-18 19:10:23 +00:00
Guy Harris
bb61c171a9 Let proto_tree_add_item() do the length checking for string lengths, so
we thrown an exception if the lengths are too long.

For UCS-2/UTF-16 strings, do an extra length check to avoid overflows,
but throw ReportedBoundsError if the check fails, so we report them the
same way we report other too-large length errors.

Just use proto_tree_add_item() to put UCS-2/UTF-16 strings (assumed to
be UTF-16, not UCS-2; is that correct?) into the protocol tree.

svn path=/trunk/; revision=48913
2013-04-18 19:07:44 +00:00
Martin Mathieson
edfccaa019 Add R10 versions of LTE protocols.
svn path=/trunk/; revision=48911
2013-04-18 14:59:41 +00:00
Michael Mann
05c5740166 improve AUTH handling of SMTP dissector. Bug 8591 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8591)
From Uli Heilmeier

The current version of the SMTP dissector expects a 'AUTH LOGIN' mechanism without checking the mechanism.

When some other mechanism (like NTLM or PLAIN) is in use the decoding is wrong. Furthermore it is expected that the username is in a seperate packet. When the username is in the AUTH line the password is shown as smtp.auth.username and the username is not decoded.

svn path=/trunk/; revision=48910
2013-04-18 13:38:26 +00:00
Evan Huus
59b8822170 Follow-up to r48899 - don't include svnversion.h now that we don't
need it, since that's actually what's causing the rebuilds.

svn path=/trunk/; revision=48904
2013-04-17 19:56:56 +00:00
Alexis La Goutte
0ef40a6145 Don't display the SVN Version in SSL Logs (only Wireshark VERSION) (and avoid to rebuild and relinkg libwireshark when the svn revision changes...)
svn path=/trunk/; revision=48899
2013-04-17 19:38:07 +00:00
Alexis La Goutte
a376f3b5d1 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=48897
2013-04-17 19:36:49 +00:00
Evan Huus
b2f0991616 Catch overflow condition in mysql dissector.
Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8458

Also add modelines.

svn path=/trunk/; revision=48894
2013-04-17 15:38:35 +00:00
Guy Harris
fb0701f40e Fix more typos that broke the license checker (these might have been
created by taking packet-dvb-eit.c, doing a global search and replace of
"ei" with the new name, and then doing further editing).

svn path=/trunk/; revision=48891
2013-04-17 01:40:25 +00:00
Guy Harris
f1cd6b131d Fix typo that caused this to fail the license check.
svn path=/trunk/; revision=48890
2013-04-17 01:36:07 +00:00
Evan Huus
82ad8cdf19 Change offset to be 8, based on an educated guess from looking at the
code around line 777.

Fixes the last open issue in
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7260

svn path=/trunk/; revision=48889
2013-04-16 21:57:36 +00:00
Michael Mann
8e2c1312d8 dissect CIP-Safety application reply data
svn path=/trunk/; revision=48887
2013-04-16 21:16:41 +00:00
Martin Kaiser
d7bb57a5ef remove unused structs and defines
(the unnamed union caused a compiler warning on fedora 14)

svn path=/trunk/; revision=48886
2013-04-16 20:53:24 +00:00
Anders Broman
af2cda1cc3 Introduce a dissector table for vendor extensions.
svn path=/trunk/; revision=48885
2013-04-16 18:13:40 +00:00
Evan Huus
80350136f0 Dead assignment caught by cppcheck.
svn path=/trunk/; revision=48879
2013-04-16 14:15:33 +00:00
Evan Huus
4008d3e544 From Roland Knall via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8587
Fix openSafety reassembly and dissection when the first package has
a payload length of 0.

svn path=/trunk/; revision=48877
2013-04-16 13:44:15 +00:00
Michael Mann
c3780c2e8d Fix compiler errors on Linux.
svn path=/trunk/; revision=48876
2013-04-16 13:17:45 +00:00
Evan Huus
494fe3e943 From Roland Knall via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8588
Add casts to that idl2wrs compiles with -Wc++-compat

svn path=/trunk/; revision=48875
2013-04-16 12:48:27 +00:00
Michael Mann
93cd5ebc4a SOCKS dissector, general cleanup.
Cleanup included:
1. converting proto_tree_add_text to proto_tree_add_item.
2. Converting state machines to use frame data instead of a large hash structure.
3. Apply consistent whitespace, add modelines
4. Remove global variable used for recursion, replaced with frame data.
5. Update protocol spec links
6. Add some "manual" fragmentation support. The goal was to fix bug 2157, but it appears some TCP SEQ/ACK inconsistencies may be getting in the way.

svn path=/trunk/; revision=48874
2013-04-16 12:05:38 +00:00
Anders Broman
68f0af8b03 Set pinfo->link_dir per message not in the IE dissection.
svn path=/trunk/; revision=48873
2013-04-16 05:42:17 +00:00
Anders Broman
b522b91cf6 Revert revision 48854, the problem is in packet-gtp.c not setting P2P_DIR correctly.
svn path=/trunk/; revision=48872
2013-04-16 05:40:54 +00:00
Evan Huus
2290bf6575 From J. Bruce Fields via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8584
Support for NFSv4.1 open access modes including delegation wants.

svn path=/trunk/; revision=48871
2013-04-16 02:03:01 +00:00
Evan Huus
cb4d9f982e Don't use seasonal memory for NFS file tracking tables (at least I think that's
what these are). It gets freed slightly before we need to access it in order to
correctly free other glib memory.

Discovered accidentally while valgrinding the capture from
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8584

svn path=/trunk/; revision=48870
2013-04-16 01:58:28 +00:00
Evan Huus
d0bd2097f0 Fix another dozen or so files with bad FSF addresses as caught by licensecheck.
svn path=/trunk/; revision=48869
2013-04-16 00:00:09 +00:00
Evan Huus
f7fbe1ccda From J. Bruce Fields via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8582
Fix a few misc. issues with NFS CB_SEQUENCE decoding.

svn path=/trunk/; revision=48868
2013-04-15 23:26:57 +00:00
Pascal Quantin
238659f271 Add dissection of USAT TLV IARI, PLMN list, EPS PDN connection activation parameters and Tracking Area Identification
svn path=/trunk/; revision=48862
2013-04-15 21:52:59 +00:00
Martin Mathieson
08c91ded8a Add a context field for the carrierId.
svn path=/trunk/; revision=48859
2013-04-15 20:56:49 +00:00
Anders Broman
1b7b729852 Don't check direction on "prot" where the meaning is the same UL/DL
svn path=/trunk/; revision=48854
2013-04-15 16:29:59 +00:00
Alexis La Goutte
55c415b477 Fix Modelines (No CR in the end of file)
svn path=/trunk/; revision=48851
2013-04-15 08:43:04 +00:00
Alexis La Goutte
05e954f48c From report of chen li via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8572 Endian error and IP:Port error when decoding BT-DHT response message
When the remote client sended a node set, it contains nodes info
The node info it shows like (1	3cad1f360cc51870d3e68d61ed604078bc608ee2 60.173.31.54:43365), but this node's true ip and port is 99.192.73.131:26025. When we expand these items, the ips and ports in detailed information are right.

From me :
It is a problem of encoding (LITTLE ENDIAN => BIG ENDIAN) and wrong offset
Some issue with Peers info

svn path=/trunk/; revision=48850
2013-04-15 08:42:12 +00:00
Evan Huus
ddb1685c93 From J. Bruce Fields via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8580
Add support for the NFSv4.1 test_stateid operation.

svn path=/trunk/; revision=48849
2013-04-14 23:04:50 +00:00
Evan Huus
5afbf48723 Update some of the old FSF addresses caught by the new licensecheck buildbot
step.

svn path=/trunk/; revision=48848
2013-04-14 18:55:28 +00:00
Pascal Quantin
6910f9428f From Tomasz Mon via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8503 :
Add USBPcap support

svn path=/trunk/; revision=48847
2013-04-14 16:00:34 +00:00
Pascal Quantin
1a37ac1aa7 From Loránd Jakab via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8578 :
Fix LISP site-ID dissection bug

svn path=/trunk/; revision=48836
2013-04-13 14:56:19 +00:00
Pascal Quantin
f8ff56424c Add dissection of USAT IMS Registration event
svn path=/trunk/; revision=48834
2013-04-13 11:17:43 +00:00
Evan Huus
59851d0ab7 From Sebastiano Di Paola via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8577
The length field for HPFEEDS is 4 bytes, so actually get the whole
thing from the tvb.

svn path=/trunk/; revision=48832
2013-04-12 16:27:20 +00:00
Evan Huus
374c1dd1e3 From Max Baker via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8431
Enhancements to usb scripts to add many more camera models by extracting data
from libgphoto2 (which is LGPL).

svn path=/trunk/; revision=48831
2013-04-12 15:50:55 +00:00
Pascal Quantin
fc153bf23b From Cal Turney via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8576 :
Add ACE4_INHERITED_ACE flag and NFS4ERR_DELEG_REVOKED error code.
Replace NFS4ERR_NODEV error code by NFS4ERR_DQUOT error code.
See RFC 5661 for details.

svn path=/trunk/; revision=48825
2013-04-11 20:00:28 +00:00
Jaap Keuter
be66273ae4 Mark unavailable XR record elements more clearly then just a comment.
svn path=/trunk/; revision=48824
2013-04-11 19:54:16 +00:00
Pascal Quantin
a37c044203 Update the ASN.1 based dissectors following the changes done in r48812
svn path=/trunk/; revision=48820
2013-04-11 18:14:53 +00:00
Evan Huus
4a5b3a62fe From Roland Knall via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8505
Numerous improvements and fixes for the OpenSafety dissector (too many to
usefully list here; see the bug).

As noted by Pascal, also fix a copy-paste error in the preferences registration.


svn path=/trunk/; revision=48817
2013-04-11 15:50:43 +00:00
Pascal Quantin
77a71eb936 From Cal Turney via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8575 :
Fix description of ACE4_APPEND_DATA

svn path=/trunk/; revision=48814
2013-04-11 08:41:28 +00:00
Gerald Combs
a6131151f5 Use consistent "generated automatically" wording which will hopefully be
picked up by licensecheck.

svn path=/trunk/; revision=48812
2013-04-10 21:24:19 +00:00
Anders Broman
b85877977a Add "Modern" STUN to the preference.
svn path=/trunk/; revision=48806
2013-04-10 11:46:31 +00:00
Martin Kaiser
2b59da3ff5 Coverity CID 280299
check return value of tvb_reported_length_remaining()

svn path=/trunk/; revision=48803
2013-04-09 21:16:29 +00:00
Martin Kaiser
83bee64565 Coverity CID 280448: Missing break in switch
svn path=/trunk/; revision=48802
2013-04-09 21:06:37 +00:00
Martin Kaiser
31435deea7 Coverity CID 281193: Dead code
svn path=/trunk/; revision=48801
2013-04-09 21:02:03 +00:00
Michael Tüxen
ba9bacfd81 Update packet format according to upcoming working group draft.
This is also supported by Firefox Nightly starting from tomorrow.

svn path=/trunk/; revision=48800
2013-04-09 19:52:43 +00:00
Jeff Morriss
c2ced4a2ab Don't try to open <home>/.wireshark on Windows: Wireshark hasn't written to
that directory since 2001 and reading from that directory was only left in for
backwards compatibility with versions prior to r4702.  I think it's now safe
to remove that backwards compatibility.

This eliminates the last argument of get_persconffile_path().

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

svn path=/trunk/; revision=48797
2013-04-09 02:48:03 +00:00
Jeff Morriss
cfd03173b4 Fix the fuzz failure reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8539 :
Bail out of the item length we get (which we use to increment the offset) is 0.
Otherwise the offset does not advance and we loop forever.

While we're in there: get the item length just once (there's no need to call
tvb_get_guint8() a half dozen times when one will do).

svn path=/trunk/; revision=48796
2013-04-09 02:05:39 +00:00
Pascal Quantin
435fe919d8 Fix bug https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8569 :
Do not display a warning when MCC/MNC is set to 0xffffff and identify country / network code as 'Unset'

svn path=/trunk/; revision=48793
2013-04-08 20:25:09 +00:00
Anders Broman
5f6b7f95bc Fix dissection of IMSI detach from non-EPS service type.
svn path=/trunk/; revision=48789
2013-04-08 16:44:15 +00:00
Alexis La Goutte
c078009625 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=48786
2013-04-07 18:57:06 +00:00
Alexis La Goutte
93873346ce Make fix-encodings-args Happy
svn path=/trunk/; revision=48785
2013-04-07 18:56:56 +00:00
Alexis La Goutte
ee448bc87f Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=48784
2013-04-07 18:56:46 +00:00
Alexis La Goutte
639315a3c3 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=48783
2013-04-07 18:56:35 +00:00
Alexis La Goutte
1ad2bb6aa9 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=48782
2013-04-07 18:56:23 +00:00
Alexis La Goutte
3f57c74724 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=48781
2013-04-07 18:55:54 +00:00
Alexis La Goutte
76d7baf32d From Masatake YAMATO via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8565
New dissector for PULSE protocol for Linux Virtual Server redundancy

very small dissector for PULSE protocol for Linux Virtual Server redundancy.
About pulse, see http://sourceware.org/piranha.

From me :
Add Modelines info
Replace tab by space

svn path=/trunk/; revision=48775
2013-04-07 17:32:03 +00:00
Alexis La Goutte
a0f8e6fd1c From Masatake YAMATO via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8565
New dissector for PULSE protocol for Linux Virtual Server redundancy

very small dissector for PULSE protocol for Linux Virtual Server redundancy.
About pulse, see http://sourceware.org/piranha.

From me :
Add Modelines info
Replace tab by space

svn path=/trunk/; revision=48773
2013-04-07 17:09:00 +00:00
Alexis La Goutte
0e3bb34fba From Loránd Jakab via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8555 More features for the Locator/ID Separation Protocol (LISP) dissector
This patch adds support in the LISP dissector for the following:

* dissect Map-Referral packet subtype
* dissect individual fields in mapping records, which are now filterable
* some code cleanup

The NAT traversal draft added another field to go together with the xTR-ID, the site-ID field.
Add support for this field as well.

svn path=/trunk/; revision=48772
2013-04-07 17:08:46 +00:00
Alexis La Goutte
b7844a673b From report of Mark Phillips via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8561 802.11 QoS decode broken from 1.9.2
Wrong encoding type (ENC_BIG_ENDIAN => ENC_LITTLE_ENDIAN)
Also fix a wrong increment offset about TXOP

svn path=/trunk/; revision=48769
2013-04-07 15:57:20 +00:00
Alexis La Goutte
8576eb409f Move #define OUI include in ieee80211 dissector to epan/oui.h Add Modelines to epan/oui.h
svn path=/trunk/; revision=48768
2013-04-07 15:57:11 +00:00
Alexis La Goutte
5bd548e9b5 From report TheDarkEye via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8554 Part of Ping Reply Message in ICMPv6 Reply Message is marked as "Malformed Packet"
(Wrong offset variable...)

#BACKPORT(1.8)

svn path=/trunk/; revision=48767
2013-04-07 15:57:01 +00:00
Alexis La Goutte
a09722c937 Enhance 802.11 Vendor Specific IE * Remove hf_ieee80211_tag_interpretation...
svn path=/trunk/; revision=48766
2013-04-07 15:56:52 +00:00
Alexis La Goutte
f84fde9439 Enhance 802.11(n) Vendor Specific IE HT * Remove hf_ieee80211_tag_interpretation...
svn path=/trunk/; revision=48765
2013-04-07 15:56:37 +00:00
Michael Mann
94ed99dc06 Made IP address fields filterable as well as a few others.
Also added a preference to determine where to put the PIM payload.  Per http://www.wireshark.org/lists/wireshark-dev/201304/msg00019.html, I made the default off of the main tree instead of a subtree of PIM.

svn path=/trunk/; revision=48760
2013-04-06 23:25:16 +00:00
Jaap Keuter
4d802ca4b9 Show the PIMv2 register flags in the correct tree.
svn path=/trunk/; revision=48757
2013-04-06 11:53:58 +00:00
Guy Harris
98938830d5 Fix some bugs that showed up as format warnings.
Use "offset +" in the calls to fill in the Info column, as presumably
the values being put into that column are the same as the values being
put into the protocol tree, and those have offsets based on the offset
variable.

svn path=/trunk/; revision=48755
2013-04-05 23:46:20 +00:00
Anders Broman
63d3ef878f Add dissection from BCMCS spec.
svn path=/trunk/; revision=48754
2013-04-05 22:16:02 +00:00
Pascal Quantin
00b3acf9c5 Highlight the correct byte for Timezone
svn path=/trunk/; revision=48751
2013-04-05 20:50:24 +00:00
Jeff Morriss
0e0c0f39ae Fix set-but-not-used warning turned error: use the newly created subtree in a few cases.
svn path=/trunk/; revision=48749
2013-04-05 14:07:34 +00:00
Michael Mann
3592313c82 Use uint instead of int
svn path=/trunk/; revision=48748
2013-04-05 13:50:49 +00:00
Michael Mann
4b4297a7ff Replace proto_tree_add_text with itemized filters
svn path=/trunk/; revision=48747
2013-04-05 13:41:32 +00:00
Anders Broman
352b96d735 From Cal Turney:
Patch 45480 introduced the following check: 

"tvb_ensure_bytes_exist(tvb, offset, neo ? neo : *bcp - ((unsigned)offset + 1));:     

When the last entry in the directory listing is processed, 'neo' the next entry offset is zero so bcp is checked. The 'bcp' variable is set to the remaining reported bytes in the tvb.  Subtracting the current offset +1 from *bcp usually produces a negative result and causes the error.

Removed "- ((unsigned)offset + 1)" and added "CHECK_BYTE_COUNT_SUBR(4);"

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

svn path=/trunk/; revision=48744
2013-04-05 05:20:41 +00:00
Anders Broman
198149f148 From Tim Ringenbach:
makes the TDMoE dissector call the LAPD bitstream dissector on the D-Channel. As a result, LAPD calls Q.931, and you can actually see call setup and tear down, instead of just a hex dump.

It adds a preference for which channel the D-Channel is.

It patches the LAPD code to fix a few bugs, not pass the checksum to Q.931 (who isn't expecting it), to register the lapd-bitstream dissector, and to mark packets with aborts or resets.

also storing more data on the lapd_byte_state_t.

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

svn path=/trunk/; revision=48743
2013-04-05 05:09:31 +00:00
Chris Maynard
95bad136a0 Fix Coverity CID 280402: Logically dead code.
svn path=/trunk/; revision=48740
2013-04-04 20:40:32 +00:00
Chris Maynard
3d7ea4a6b5 Fix Coverity CID 280404: Logically dead code.
svn path=/trunk/; revision=48739
2013-04-04 20:28:42 +00:00
Martin Kaiser
2a3dee91ff use mpeg_pmt_stream_tree for the descriptor loop
(this fixes a bug from my last commit)

svn path=/trunk/; revision=48737
2013-04-04 18:32:26 +00:00
Jaap Keuter
f4a29a59f6 Remove a shadow variable.
svn path=/trunk/; revision=48735
2013-04-04 17:15:10 +00:00
Anders Broman
b1fc95c5cf - Dissect Packet filters and QoS list(partly).
- Update value_strings.

svn path=/trunk/; revision=48734
2013-04-04 16:23:55 +00:00
Chris Maynard
38a02b35ad Fix the 2nd occurrence of Coverity CID 280417: Logically dead code. This, plus r48657, should resolve the CID.
svn path=/trunk/; revision=48733
2013-04-04 15:57:29 +00:00
Chris Maynard
e08b7c3a38 Fix encoding arg for proto_tree_add_item() and friends.
svn path=/trunk/; revision=48732
2013-04-04 15:33:14 +00:00
Pascal Quantin
3322a952f6 Try to fix compilation on Linux
svn path=/trunk/; revision=48731
2013-04-04 15:01:56 +00:00
Michael Mann
f39b47420b Fix checkAPI.pl complaints
svn path=/trunk/; revision=48730
2013-04-04 15:00:27 +00:00
Michael Mann
719dca4797 Enhancements to Ethernet/IP DLR dissector, bug 8560 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8560)
From Joakim Wiberg

svn path=/trunk/; revision=48729
2013-04-04 14:34:26 +00:00
Michael Mann
4e7e06ca3a RTPS Cleanup, Part 3 (final)
Merged packet-rtps.c and packet-rtps2.c into a single dissector.  It appears packet-rtps2.[ch] "API" needs to be externally available, otherwise I would have rolled (the newly merged) packet-rtps.h into packet-rtps.c as well.

Converted many of the remaining proto_tree_add_text to proto_tree_add_item/expert_info and cleaned up the manual string manipulation so checkAPIs.pl is happy.

Added a "cooked" capture file to the SampleCaptures page on the wiki for future fuzztesting/regression.

svn path=/trunk/; revision=48727
2013-04-04 12:22:04 +00:00
Pascal Quantin
595a893406 From Lukasz Wachowski via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8559 :
Fix dissection of RAN-INFORMATION-APPLICATION-ERROR RIM PDU Indications

svn path=/trunk/; revision=48726
2013-04-04 09:14:11 +00:00
Pascal Quantin
e157cf5bf4 From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8558 :
Fix incompatible field type for field name "btsdp.service_uuid"

svn path=/trunk/; revision=48725
2013-04-04 08:45:30 +00:00
Jeff Morriss
afb4cff52f Get rid of a shadowed variable and remove a set-but-not-used variable. Reindent a little.
svn path=/trunk/; revision=48723
2013-04-03 17:50:13 +00:00
Jeff Morriss
4508745e3b Get rid of non-ASCII characters.
svn path=/trunk/; revision=48722
2013-04-03 17:46:39 +00:00
Anders Broman
a54f786099 Sort LocalCode value string.
svn path=/trunk/; revision=48721
2013-04-03 16:53:53 +00:00
Anders Broman
7ddf39a340 Dissect more of 3GPP Object.
svn path=/trunk/; revision=48719
2013-04-03 16:50:35 +00:00
Anders Broman
c534f5e0db - Extend and correct value strings.
- Fix tree handling for QoS.
- Add references.

svn path=/trunk/; revision=48718
2013-04-03 16:49:55 +00:00
Pascal Quantin
a9833c921f Use extended value strings
svn path=/trunk/; revision=48714
2013-04-02 21:56:40 +00:00
Pascal Quantin
f28a077f97 Update E.164 dissection to ITU Operational Bulletin No. 991
svn path=/trunk/; revision=48711
2013-04-02 21:16:32 +00:00
Chris Maynard
ee5c5e9361 Both tvb_length_remaining and tvb_reported_length_remaining can return -1.
#BACKPORT(1.6,1.8 ... manually as other occurrences are in those trunks)

svn path=/trunk/; revision=48710
2013-04-02 21:13:02 +00:00
Martin Kaiser
33314c8106 use proto_mpeg_descriptor_loop_dissect() for the EIT
svn path=/trunk/; revision=48706
2013-04-02 19:04:25 +00:00
Martin Kaiser
9bdb946964 use proto_mpeg_descriptor_loop_dissect() in the BAT
svn path=/trunk/; revision=48705
2013-04-02 19:03:05 +00:00
Martin Kaiser
c851bd97f1 use proto_mpeg_descriptor_loop_dissect() for the PMT
svn path=/trunk/; revision=48704
2013-04-02 19:01:14 +00:00
Martin Kaiser
99c490d375 use proto_mpeg_descriptor_loop_dissect() for the TOT
svn path=/trunk/; revision=48703
2013-04-02 19:00:09 +00:00
Jeff Morriss
ba0b025dd3 Include padding length in the AVP's length.
svn path=/trunk/; revision=48702
2013-04-02 18:15:42 +00:00
Anders Broman
a9045908df Dissect more 3GPP2 extensions.
svn path=/trunk/; revision=48700
2013-04-02 16:58:18 +00:00
Evan Huus
0a26433321 From Sebastiano Di Paola via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8461
Enhancements for the Honeypot Feeds dissector.

From me: misc. cleanup, modelines, etc.

svn path=/trunk/; revision=48698
2013-04-02 15:55:35 +00:00
Pascal Quantin
e832253278 From Vineeth via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8450 :
Do not try to systematically fetch a third digit for Country Code: its length can be from 1 to 3 digits.

svn path=/trunk/; revision=48697
2013-04-02 13:09:15 +00:00
Pascal Quantin
36ad3475d9 Remove non ASCII characters
svn path=/trunk/; revision=48695
2013-04-02 08:34:09 +00:00
Anders Broman
3d2ca39863 Dissect more of 3GPP2_OBJECT.
svn path=/trunk/; revision=48694
2013-04-02 05:54:47 +00:00
Jaap Keuter
a62cc81d4b Now only if I can get the case right :)
svn path=/trunk/; revision=48686
2013-04-01 15:33:42 +00:00
Jaap Keuter
97136126bc Typo's. That is all.
svn path=/trunk/; revision=48685
2013-04-01 15:29:49 +00:00
Jaap Keuter
dfc87f20df Fix for bug 8548:
Allow the IRC command and response dissection functions to be called with
subsets of the original (full) message line. Therefore we need to calculate
with real lengths and offsets, not mixed with lengths of the subset itself.

svn path=/trunk/; revision=48684
2013-04-01 14:09:44 +00:00
Anders Broman
2328de7bf8 Unused parameter.
svn path=/trunk/; revision=48681
2013-03-31 22:27:58 +00:00
Anders Broman
1f74d7a1b2 Initial decoding of 3GPP2_OBJECT.
svn path=/trunk/; revision=48679
2013-03-31 22:08:00 +00:00
Martin Kaiser
5ae86d3b2f coverity 281315 logically dead code
svn path=/trunk/; revision=48676
2013-03-31 18:10:45 +00:00
Gerald Combs
84134c9e9c [Automatic manuf, services and enterprise-numbers update for 2013-03-31]
svn path=/trunk/; revision=48671
2013-03-31 14:03:28 +00:00
Martin Kaiser
421cd9eaac remove empty else-branches
svn path=/trunk/; revision=48670
2013-03-31 12:16:41 +00:00
Martin Kaiser
4f55532d59 TABs -> spaces
add editor modelines

svn path=/trunk/; revision=48669
2013-03-31 12:12:03 +00:00
Jaap Keuter
d2efac96b3 From Hauke Mehrtens:
Wireshark misses some new TLS and DTLS cipher suite names which are assigned by IANA.

svn path=/trunk/; revision=48664
2013-03-30 22:52:13 +00:00
Evan Huus
42ec0d8f0d Hopefully fix a false-positive warning in the Mac buildbot.
It complains that service_info may be used uninitialized, but my manual analysis
agrees with GCC 4.7 that it can't, so just defaulting it to NULL will be fine.

svn path=/trunk/; revision=48663
2013-03-30 22:00:43 +00:00
Evan Huus
ff9c205f94 From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8509
Add basic support for Bluetooth GNSS profile. It uses NMEA-0183, but that is not
free, so all we can do is add filtering and displaying for ASCII content.

Also add colors for DUN, GNSS to show them in contrast to RFCOMM.

svn path=/trunk/; revision=48662
2013-03-30 21:54:42 +00:00
Evan Huus
6976653023 From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8509
Unify bluetooth direction handling (sent vs rcvd).

svn path=/trunk/; revision=48661
2013-03-30 21:47:27 +00:00
Evan Huus
6d17f1153a From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8509
Round 3 of Bluetooth SDP updates. Update the list of company IDs and fix
service recognition.

svn path=/trunk/; revision=48660
2013-03-30 21:43:18 +00:00
Martin Kaiser
77c9d43ce4 coverity 993742: potential division by zero
svn path=/trunk/; revision=48659
2013-03-30 19:16:51 +00:00
Martin Kaiser
94ea9af46c fix indentation in one place
svn path=/trunk/; revision=48658
2013-03-30 19:15:29 +00:00
Martin Kaiser
3467c98afc coverity 280417: logically dead code
svn path=/trunk/; revision=48657
2013-03-30 18:57:44 +00:00
Jaap Keuter
4e09bed012 From Tyson Key:
The attached patch adds support for dissection of SAMConfiguration request packets, 
and updates the opcode table to identify their corresponding (null/empty) responses.

svn path=/trunk/; revision=48656
2013-03-30 17:09:26 +00:00
Evan Huus
02dff20783 From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8509
Round 2 of Bluetooth SDP updates:
- replace a lot of proto_tree_add_text with named fields
- dissect more of the protocol
- misc fixes

svn path=/trunk/; revision=48655
2013-03-30 15:53:04 +00:00
Martin Kaiser
9ca8ee6c06 dissect CI+ Protection Descriptor
svn path=/trunk/; revision=48651
2013-03-30 10:59:30 +00:00
Martin Kaiser
b3bad40c60 use proto_mpeg_descriptor_loop_dissect() in the SDT descriptor loop
this takes private descriptors into account

svn path=/trunk/; revision=48650
2013-03-30 10:41:37 +00:00
Evan Huus
e964ab4164 Bump two guint16 to guint32 to prevent overflow when reassembling a large
number of fragments, and add an extra bounds check.

Fixes
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8540
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8541

svn path=/trunk/; revision=48644
2013-03-29 22:20:04 +00:00
Evan Huus
016f8e8d8c Add some missing #includes to hopefully fix check-abi buildbot.
svn path=/trunk/; revision=48641
2013-03-29 17:43:14 +00:00
Evan Huus
ea6d7d8a34 From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8509
First round of fixes for Bluetooth SDP.

From me:
- rename one call of match_strval to try_val_to_str instead
- remove a few hf entries that really belong with the second patch (they
  weren't used in this one)

svn path=/trunk/; revision=48640
2013-03-29 17:25:23 +00:00
Pascal Quantin
5c46fcea6a From Dario Lombardo via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8506 :
Fix incompatible display filters using the same name

svn path=/trunk/; revision=48638
2013-03-29 13:22:53 +00:00
Michael Tüxen
7b7680f3ff Add support for new version of the ID which has been adopted as a WG item.
The now version will be supported by Firefox soon.

svn path=/trunk/; revision=48637
2013-03-29 13:01:52 +00:00
Evan Huus
03b48f94c2 Fix two instances of col_set_str being used with ephemeral memory returned
from val_to_str. Use col_add_str instead.

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

svn path=/trunk/; revision=48636
2013-03-29 02:46:06 +00:00
Evan Huus
a0d107beec Remove decode_enumerated_bitfield and decode_enumerated_bitfield_shifted.
Effectively inline the only remain call (and replace a static buffer with ep
memory). Much of the NFS dissector needs to be converted to use named fields
at which point this code can go away, but that's a much bigger job.

Also, add modelines to packet-nfs.c and mark some internal value_string
functions as WS_DLL_LOCAL.

svn path=/trunk/; revision=48635
2013-03-29 02:34:23 +00:00
Evan Huus
37600a157b Rename value string (and similar) functions to use a consistent pattern. This
was done using textual search+replace, not anything syntax-aware, so presumably
it got most comments as well (except where there were typos).

Use a consistent coding style, and make proper use of the WS_DLL_* defines.

Group the functions appropriately in the header.

I ended up getting rid of most of the explanatory comments since many of them
duplicated what was in the value_string.c file (and were out of sync with the
recent updates I made to those in r48633). Presumably most of the comments
should be in the .h file not the .c file, but there's enough churn ahead that
it's not worth fixing yet.

Part of https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8467

svn path=/trunk/; revision=48634
2013-03-29 00:26:23 +00:00
Chris Maynard
10260116f8 Fix incorrectly duplicated display filter for hf_openwire_throwable_linenumber.
#BACKPORT(1.8)

svn path=/trunk/; revision=48628
2013-03-28 18:16:52 +00:00
Chris Maynard
5e7d4af0d0 The uniqueness bit occurs in 2 different places, so go ahead and use both hf_nhrp_flag_U1 and hf_nhrp_flag_U2, but change the common display filter from "nhrp.flag.u1" to simply "nhrp.flag.u".
#BACKPORT(1.6, 1.8)???

svn path=/trunk/; revision=48626
2013-03-28 18:13:12 +00:00
Anders Broman
8e1b0ac304 Register a dissector table for Normal Vendor/Organization Specific Extension(NVSE) and use it for 3GPP2.
svn path=/trunk/; revision=48623
2013-03-28 16:55:06 +00:00
Chris Maynard
fc78e677a8 Fix Coverity CID's 280305-280306: Negative loop bound. (These are yet more annoying instances of not properly dealing with tvb_reported_length_remaining() possibly returning -1.)
#BACKPORT(1.6,1.8)

svn path=/trunk/; revision=48622
2013-03-28 16:02:41 +00:00
Chris Maynard
be892e31c0 Fix the remaining instances of Coverity CID's 741992 and 986498, which should have been committed with r47073 and r47830, respectively. (I find Coverity doesn't always make it so obvious that there's more than 1 instance for a given CID.)
svn path=/trunk/; revision=48621
2013-03-28 15:41:25 +00:00
Chris Maynard
bbf2beaa53 Fix Coverity CID's 281433 and 281434: Unintended sign extension. (18 instances)
Fix Coverity CID 702381: Missing break in switch.

Add an "XXX" note regarding the framing_rtp assignment, since something appears to be missing.

#BACKPORT(1.8)

svn path=/trunk/; revision=48620
2013-03-28 15:28:12 +00:00
Chris Maynard
64f0e71d07 first_flag should be static.
#BACKPORT(1.6,1.8)

svn path=/trunk/; revision=48619
2013-03-28 15:07:32 +00:00
Evan Huus
045152353c From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8536
Fix unrecognised CID session payload in bluetooth if there are multiple sessions
with the same DCID.

svn path=/trunk/; revision=48618
2013-03-28 15:05:46 +00:00
Evan Huus
63987d2894 From Dario Lombardo via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8506
Proper authorship and attribution information for
VITA 49 Radio Transport dissector.

svn path=/trunk/; revision=48617
2013-03-28 15:01:35 +00:00
Chris Maynard
476831d9de Fix the incorrectly duplicated display filter for hf_kdsp_source_name.
#BACKPORT(1.8)

svn path=/trunk/; revision=48616
2013-03-28 14:56:58 +00:00
Chris Maynard
c9004d102e Fix the incorrectly duplicated display filter for hf_gearman_data_content.
svn path=/trunk/; revision=48614
2013-03-28 14:49:41 +00:00
Chris Maynard
9c6325a069 Properly dissect lat and long according to 3GPP TS 23.032. Fix incorrect display filters for hf_gsm_a_geo_loc_deg_of_lat and hf_gsm_a_geo_loc_deg_of_long.
Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8532
#BACKPORT(1.6,1.8)

svn path=/trunk/; revision=48613
2013-03-28 14:23:07 +00:00