Commit Graph

16786 Commits

Author SHA1 Message Date
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
Pascal Quantin 750b7659bb Add dissection of Terminal Profile byte 32
svn path=/trunk/; revision=48611
2013-03-28 14:04:23 +00:00
Anders Broman dafdc19d9e -Wmissing-prototypes
svn path=/trunk/; revision=48609
2013-03-28 07:34:13 +00:00
Evan Huus aee73d6d9e From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8530
Enable "Decode As" for Bluetooth over USB.

svn path=/trunk/; revision=48605
2013-03-28 03:06:30 +00:00
Ronnie Sahlberg 37de47688f ISCSI: When printing the task management function, strip of the high bit which is always 1 before resoving the index into a name
svn path=/trunk/; revision=48604
2013-03-28 00:06:19 +00:00
Chris Maynard 15dbffefc8 Fix the incorrectly duplicated display filter for hf_ixveriwave_vw_info_retryCount.
#BACKPORT(1.8)

svn path=/trunk/; revision=48602
2013-03-27 22:04:46 +00:00
Chris Maynard 186d0c2006 Fix another incorrectly duplicated display filter, this time for hf_gsm_map_etsi_pdp_type_number.
#BACKPORT(1.6,1.8)

svn path=/trunk/; revision=48601
2013-03-27 21:41:56 +00:00
Alexis La Goutte 269c4fd8c2 From Johannes Berg via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8534 802.11: doesn't parse extended channel switch announcement frames correctly
There are more fixed fields in extended channel switch announcement frames.

svn path=/trunk/; revision=48599
2013-03-27 21:07:45 +00:00
Chris Maynard 8d02cc0d00 Regenerate the dissector.
svn path=/trunk/; revision=48598
2013-03-27 20:48:45 +00:00
Chris Maynard da30b9eb92 Fix the incorrectly duplicated display filter for hf_gsm_map_dlci.
#BACKPORT(1.6, 1.8)

svn path=/trunk/; revision=48597
2013-03-27 20:44:47 +00:00
Chris Maynard f44b2c8088 Fix the incorrectly duplicated display filters for hf_tp_bip_tcp_local and hf_tp_bip_udp_local.
svn path=/trunk/; revision=48596
2013-03-27 20:26:06 +00:00
Chris Maynard 96e835cf27 Fix the incorrectly duplicated display filter for hf_om2k_cbi.
#BACKPORT(1.8)

svn path=/trunk/; revision=48595
2013-03-27 20:21:19 +00:00
Alexis La Goutte 59669d270c From G.Gerrits via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8501 HomeplugAV dissector: Decoding HPAV-1.1 Tone Map Tx/Rx Characteristics Req/Conf (0xA070/0xA071/0xA090/0xA091)
Dissecting HPAV-1.1 Tone Map Characteristics Req/Conf (0xA070/0xA071) was not correct.
Also found that MMType 0xA070/0xA071 is used for the Tx ToneMaps and the MMType 0xA090/0xA091 for the Rx ToneMaps. Added types and dissector for the Rx MMType. Although the Rx-Conf-Structure is almost identical to the Tx is did duplicate the dissector code to avoid mixups.
Added some additional Infos to the carrier dissector output (Carrier#, #Modulated-Bits, Average#Modulated-Bits/Carrier).

Also extended the homeplug_av_tone_map_vals with 0x08 for 12bit 4096-QAM (the AR74xx should support this kind of modulation) and changed the mask to 0x0f accordingly

svn path=/trunk/; revision=48592
2013-03-27 18:16:22 +00:00
Chris Maynard 8aa0a23246 tvb_reported_length_remaining() can return -1, so be sure to properly handle it if it does.
#BACKPORT(1.6, 1.8)

svn path=/trunk/; revision=48578
2013-03-27 03:13:56 +00:00
Chris Maynard 05308f904d Fix Coverity CID 281471: Logically dead code. (addr_type can only be 1 or 2 due to the return statement in the default case)
svn path=/trunk/; revision=48577
2013-03-27 02:46:45 +00:00
Martin Kaiser 6c4b5b5929 add program number to the cc item tree
svn path=/trunk/; revision=48569
2013-03-26 20:39:58 +00:00
Chris Maynard 67ffb10e64 Add checksum_bad, set to FALSE to the tree when the checksum is correct. Use PROTO_ITEM_SET_HIDDEN instead of PROTO_ITEM_SET_GENERATED so ICMP and ICMPv6 are consistent.
See: http://ask.wireshark.org/questions/19844/icmp-display-filter-checksum_bad-ignored

#BACKPORT(1.6, 1.8)

svn path=/trunk/; revision=48563
2013-03-26 18:08:05 +00:00
Anders Broman a6fbd905a5 Make the oid memeber a const.
svn path=/trunk/; revision=48558
2013-03-26 05:20:55 +00:00
Guy Harris 606e1ed681 Fix two errors in ieee80211_status_code - one out-of-order entry and one
(presumed) typo (61 would be a duplicate, and was between 70 and 72, so
I assume it was supposed to be 71).

svn path=/trunk/; revision=48556
2013-03-26 01:11:06 +00:00
Guy Harris 021e41ea66 Fix RFC number.
svn path=/trunk/; revision=48553
2013-03-25 22:04:51 +00:00
Evan Huus 0834a38bad From Dario Lombardo, Alexander Chemeris and Ivan Klyuchnikovhis via
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8506
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8507

Dissectors for the VRT (VITA 49 Radio Transport) and UHD protocols.

From me: modelines and misc trivial cleanups.


svn path=/trunk/; revision=48550
2013-03-25 17:06:11 +00:00
Evan Huus 7097d6465b From Audric Schiltknecht via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8520
Fix typo in DVB-S2 dissector: s/lable/label/.

svn path=/trunk/; revision=48547
2013-03-25 12:40:37 +00:00
Pascal Quantin 88c0e8e873 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8517 :
Do not tap an unknown Opration Code

svn path=/trunk/; revision=48539
2013-03-24 21:53:53 +00:00
Pascal Quantin bda771b86b Do not initialize ett_tree and msg_fcn_p when match_strval_idx_ext does not find a match
svn path=/trunk/; revision=48538
2013-03-24 21:52:19 +00:00
Guy Harris f3e5fa224c Put items into the protocol tree as we extract them, so that the header
fields that were captured show up even if the packet was cut short by a
snapshot length.  Advance the offset variable as we do so.

Be a little clearer in some comments.

svn path=/trunk/; revision=48537
2013-03-24 18:51:27 +00:00
Guy Harris 5947200d55 Don't cast away constness.
svn path=/trunk/; revision=48536
2013-03-24 18:28:40 +00:00