Commit graph

19017 commits

Author SHA1 Message Date
Chris Maynard
7d10a416a3 Reject the packet if data is NULL.
svn path=/trunk/; revision=53835
2013-12-07 23:27:36 +00:00
Guy Harris
a2b9f02e59 Fix some cases where STR_UNICODE was used with FT_DOUBLE.
svn path=/trunk/; revision=53831
2013-12-07 19:43:59 +00:00
Martin Kaiser
fa5083e8af make SAC message padding filterable
svn path=/trunk/; revision=53828
2013-12-07 17:40:02 +00:00
Jakub Zawadzki
7ab18667e5 Drop proto_tree_add_unicode_string() from IP, IPv6, JSON dissectors.
Set .display to STR_UNICODE (instead of STR_ASCII).

svn path=/trunk/; revision=53827
2013-12-07 15:48:35 +00:00
Pascal Quantin
e67762e343 From Peter Lemenkov via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9524 :
Fix typo in erldp dissector

svn path=/trunk/; revision=53825
2013-12-07 14:38:16 +00:00
Pascal Quantin
cff7d45f85 From Mathias Guettler via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9523 :
Fix ISO 10747 (IDRP) incorrect handling of data in IDRP ERROR PDU's

svn path=/trunk/; revision=53824
2013-12-07 14:36:54 +00:00
Jakub Zawadzki
1560949e4d gadu-gadu: use STR_UNICODE display instead of proto_tree_add_unicode_string().
svn path=/trunk/; revision=53823
2013-12-07 11:55:22 +00:00
Anders Broman
eb252d2d34 - Make local functions static.
- Forward declaration of register functions.

svn path=/trunk/; revision=53821
2013-12-07 11:37:58 +00:00
Jakub Zawadzki
c67d38cf15 Rename base_display_* to field_display
This is preparation to support ->display for FT_STRING values.

svn path=/trunk/; revision=53820
2013-12-07 10:41:42 +00:00
Jakub Zawadzki
113b078a4d Add new string proto encoding for windows-1250 (ENC_WINDOWS_1250)
- Move windows-1250 to unicode encoding table to charset.c
- Add tvb_get_string_unichar2, tvb_get_stringz_unichar2 functions which recode tvb-string to UTF-8.

svn path=/trunk/; revision=53819
2013-12-07 10:10:03 +00:00
Anders Broman
cc71d217a6 - Make local functions static.
- Forward declaration of register function.

svn path=/trunk/; revision=53817
2013-12-07 08:34:39 +00:00
Michael Mann
cc5543f824 Bluetooth enhancements. Bug 9446 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9446)
Bluetooth: SCO: Add Source/Destination addresses 
Bluetooth: HCRP: Use information from SDP to decoding PSM payload

From Michal Labedzki

svn path=/trunk/; revision=53816
2013-12-07 01:01:31 +00:00
Alexis La Goutte
895f83b37d Fix indent (use 4 spaces) Remove trailing whitespace Add Modelines
svn path=/trunk/; revision=53814
2013-12-06 16:41:05 +00:00
Alexis La Goutte
e820340996 Add Modelines info
svn path=/trunk/; revision=53813
2013-12-06 16:40:55 +00:00
Alexis La Goutte
d5c3c081d9 Fix (-W)unused-const-variable error found by Clang
svn path=/trunk/; revision=53812
2013-12-06 16:40:44 +00:00
Pascal Quantin
138cb0e1f1 Update svn properties
svn path=/trunk/; revision=53811
2013-12-06 16:37:20 +00:00
Irene Rüngeler
ae37302c39 Add assoc_index to the properties that can be filtered.
Find the association for each packet.

svn path=/trunk/; revision=53810
2013-12-06 14:45:06 +00:00
Alexis La Goutte
7a5cf63f04 Fix wireshark/epan/dissectors/packet-j1939.c:313: multiple definition of `proto_register_devicenet'
svn path=/trunk/; revision=53806
2013-12-06 08:37:48 +00:00
Alexis La Goutte
04a8ed2140 Fix packet-j1939.c:160:42: error: declaration of 'address' shadows a global declaration [-Werror=shadow]
svn path=/trunk/; revision=53805
2013-12-06 08:09:56 +00:00
Alexis La Goutte
f5136e3753 Fix unused parameter 'pinfo'
svn path=/trunk/; revision=53804
2013-12-06 08:04:09 +00:00
Michael Mann
643f9efce2 Add DeviceNet and J1939 dissectors. Both run on top of CAN (not necessarily always SocketCAN, but it did provide a good test environment)
svn path=/trunk/; revision=53802
2013-12-06 04:33:58 +00:00
Martin Kaiser
1f9d8c5726 dissect Operator Profile's error flag
svn path=/trunk/; revision=53799
2013-12-05 21:32:05 +00:00
Pascal Quantin
78c11720bb Remove non-ASCII character
svn path=/trunk/; revision=53795
2013-12-05 06:48:13 +00:00
Pascal Quantin
5331c54b10 Try to please OSX-10.5-x86 buildbot
svn path=/trunk/; revision=53794
2013-12-05 06:46:58 +00:00
Pascal Quantin
03085a5c9a Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9503 :
Fix dissection of STK SEND SHORT MESSAGE proactive command

svn path=/trunk/; revision=53793
2013-12-05 06:23:17 +00:00
Michael Mann
8d0dc9f935 CAN protocols have a CAN ID and up to 8 bytes of data. How the CAN ID and data are presented is the responsibility of the previous layer. Make the interface be passing the CAN ID in dissector data and have the (up to) 8 bytes be the tvb. CAN protocols should treat the CAN ID as "generated" data.
svn path=/trunk/; revision=53792
2013-12-05 03:36:49 +00:00
Jakub Zawadzki
0ccb4a7ef4 Regenerate ASN.1 dissectors
It seems that around r53700 GenericChargingDataTypesV1171.asn was called 3GPPGenericChargingDataTypesV1171.asn.

svn path=/trunk/; revision=53791
2013-12-04 23:59:31 +00:00
Anders Broman
d576ba0796 - Forward declaration of register functions.
svn path=/trunk/; revision=53789
2013-12-04 21:35:53 +00:00
Anders Broman
bbc4a2981c Try to fix a bunch of [-Wmissing-prototypes]
svn path=/trunk/; revision=53788
2013-12-04 21:33:38 +00:00
Jörg Mayer
53394aca2c Fix
[  5%] Building C object epan/CMakeFiles/epan.dir/dissectors/packet-diameter.c.o
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-diameter.c: In function ‘dissect_diameter_avp’:
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-diameter.c:621:37: error: ‘avp_str’ may be used uninitialized in this function [-Werror=maybe-uninitialized]
  if (avp_str) proto_item_append_text(avp_item," val=%s", avp_str);
                                     ^
cc1: all warnings being treated as errors
make[2]: *** [epan/CMakeFiles/epan.dir/dissectors/packet-diameter.c.o] Error 1


svn path=/trunk/; revision=53787
2013-12-04 21:32:16 +00:00
Anders Broman
1a7c42d40a - Make local functions static.
- Forward declaration of register function.

svn path=/trunk/; revision=53786
2013-12-04 21:12:16 +00:00
Anders Broman
5c40dde043 "RFC 6733 [5] specifies the Experimental-Result AVP containing Vendor-Id AVP and Experimental-Result-Code AVP. The Experimental-Result-Code AVP (AVP Code 298) is of type Unsigned32 and contains a vendor-assigned value representing the result of processing a request."
This means we have to store the value of the Vendor Id AVP in the grouped  Experimental-Result AVP to be able to dissect the value of 
Experimental-Result-Code according to the vendor specified values(if known). This patch implements that with a dissector table to register vendor dissectors for the result code.

svn path=/trunk/; revision=53785
2013-12-04 20:55:52 +00:00
Chris Maynard
a8ed2cf767 From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9446 - r53051 introduced an incorrect DISSECTOR_ASSERT(acl_data), which led me to believe that acl_data must not be NULL. Except for the removal of the DISSECTOR_ASSERT(acl_data), this patch basically reverts r53735 and r53743, as acl_data can be NULL.
svn path=/trunk/; revision=53784
2013-12-04 15:59:29 +00:00
Alexis La Goutte
50989f30a3 From Matt Texier
Enhance BGP Dissector : Communities

Use proto_tree_add_item

From me
Missing space for well known community

svn path=/trunk/; revision=53783
2013-12-04 15:13:24 +00:00
Alexis La Goutte
9252681be6 Add also heuristic for HTTP
svn path=/trunk/; revision=53781
2013-12-04 13:55:53 +00:00
Alexis La Goutte
2e0fbbfe26 Regenerate dissector after change to add prototype
svn path=/trunk/; revision=53779
2013-12-04 09:53:51 +00:00
Stig Bjørlykke
470a022c6d Fix for dissecting cdt without having a tree.
svn path=/trunk/; revision=53777
2013-12-04 09:39:19 +00:00
Jakub Zawadzki
b75354ebe8 Avoid including <epan/epan.h> in dissectors.
svn path=/trunk/; revision=53774
2013-12-03 23:49:51 +00:00
Pascal Quantin
477add4506 Dissect comprehension-tlv address object
svn path=/trunk/; revision=53773
2013-12-03 23:08:50 +00:00
Jakub Zawadzki
65db82872c When including <epan/prefs.h> don't force inclusion of <epan/uat.h>
svn path=/trunk/; revision=53769
2013-12-03 22:16:49 +00:00
Jakub Zawadzki
cedb73c7f7 Dissectors should not use dfilter.h, don't include it.
XXX ncp2222 dissector is using dfilter_compile(), why?

svn path=/trunk/; revision=53766
2013-12-03 21:31:04 +00:00
Pascal Quantin
8b3f82def1 Add request / response tracking to MBIM_FUNCTION_ERROR_MSG messages
svn path=/trunk/; revision=53762
2013-12-03 19:44:32 +00:00
Pascal Quantin
2d49720de6 Add Qualcomm proprietary UUID
svn path=/trunk/; revision=53760
2013-12-03 19:32:10 +00:00
Gerald Combs
a6dea7695e The ip.proto table isn't limited to the IPv4 dissector.
svn path=/trunk/; revision=53759
2013-12-03 18:16:38 +00:00
Alexis La Goutte
e55e69940f Fix encoding arg Remove tab and trailing whitespace Add modelines info
svn path=/trunk/; revision=53758
2013-12-03 13:48:08 +00:00
Alexis La Goutte
062f8a504a Manual fix of Dead Store (Dead assignement/Dead increment) warning found by Clang No found how to fix the generator...
svn path=/trunk/; revision=53757
2013-12-03 13:39:10 +00:00
Alexis La Goutte
043b37afa4 Regenerate idl dissector after last change in generator !
svn path=/trunk/; revision=53756
2013-12-03 13:38:56 +00:00
Alexis La Goutte
6efd311424 Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
svn path=/trunk/; revision=53755
2013-12-03 13:38:46 +00:00
Michael Mann
024c4fc8e3 Don't allow conversation_data to be NULL. Bug 9493 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9493)
svn path=/trunk/; revision=53744
2013-12-03 12:53:09 +00:00
Guy Harris
18e532be59 Remove some no-longer-necessary null pointer checks, as pointed out by
Coverity; dissect_btl2cap() now returns immediately if handed a null
private-data pointer.

svn path=/trunk/; revision=53743
2013-12-03 11:02:00 +00:00
Guy Harris
753811929d Clean up indentation.
svn path=/trunk/; revision=53742
2013-12-03 10:54:10 +00:00
Anders Broman
089e4d999f Try to fix [-Wmissing-prototypes]
svn path=/trunk/; revision=53741
2013-12-03 06:20:18 +00:00
Anders Broman
a21898cf69 - copy paste error in parlay
- Add pragmas to remove warnings, this should go into the generation script.

svn path=/trunk/; revision=53740
2013-12-03 05:22:47 +00:00
Chris Maynard
231e52a9ea Reject the packet if data is NULL without doing anything else.
svn path=/trunk/; revision=53737
2013-12-02 21:52:46 +00:00
Chris Maynard
ae2e12d1f7 Reject the packet if data is NULL without doing anything else.
svn path=/trunk/; revision=53735
2013-12-02 21:34:23 +00:00
Guy Harris
ce7b83123c No C++/C99 comments, as not all compilers handle them. Use #if 0/#endif
instead.

svn path=/trunk/; revision=53734
2013-12-02 21:18:25 +00:00
Chris Maynard
b5e3775535 eject the packet if data is NULL without doing anything else.
svn path=/trunk/; revision=53733
2013-12-02 21:13:29 +00:00
Chris Maynard
99d9c3d0f5 Reject the packet if data is NULL without doing anything else.
svn path=/trunk/; revision=53732
2013-12-02 21:05:11 +00:00
Anders Broman
ba0e04ed1b Character conversion error.
svn path=/trunk/; revision=53731
2013-12-02 20:31:42 +00:00
Anders Broman
c0407d6bc5 Add pragmas to remove warnings, this should go into the generation script.
svn path=/trunk/; revision=53730
2013-12-02 20:18:48 +00:00
Chris Maynard
baf569188a Reject the packet if data is NULL.
svn path=/trunk/; revision=53709
2013-12-02 02:31:33 +00:00
Chris Maynard
9b38829b34 Reject the packet if data is NULL without doing anything else.
svn path=/trunk/; revision=53708
2013-12-02 02:31:04 +00:00
Chris Maynard
acc5fd78e4 Reject the packet if data is NULL.
svn path=/trunk/; revision=53707
2013-12-02 02:18:21 +00:00
Chris Maynard
42a64c3557 If data is NULL, the bug, if any, is not with *this* dissector, but with whichever one failed to pass the data properly.
svn path=/trunk/; revision=53706
2013-12-02 02:07:42 +00:00
Chris Maynard
a9900375b4 Fix Coverity CID 1134045: Printf format string issue. (As documented in the printf man page for the ' option, "Note that many versions of gcc(1) cannot parse this option and will issue a warning." (r47940 reverted a similar change, so this keeps things consistent.)
svn path=/trunk/; revision=53705
2013-12-02 01:53:13 +00:00
Chris Maynard
87d36305f9 Fix Coverity CID 1134046: Structurally dead code.
svn path=/trunk/; revision=53704
2013-12-02 00:45:44 +00:00
Anders Broman
9baa93519c Update to V11.7.1 (2013-09)
svn path=/trunk/; revision=53700
2013-12-01 20:34:21 +00:00
Michael Mann
7ee8d48670 Add MPLS dissector to "ppp.protocol" table. Bug 9492 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9492)
From Peter Paluch

svn path=/trunk/; revision=53694
2013-12-01 13:47:11 +00:00
Jörg Mayer
402df00544 Looks like the problem with redefined symbols is not new, it
just got a few new ones.
Add HAVE_STRING_H and HAVE_STDLIB_H to the list.

svn path=/trunk/; revision=53691
2013-12-01 10:10:24 +00:00
Martin Mathieson
a9bd097e71 Start teid_data field from the correct offset
svn path=/trunk/; revision=53688
2013-12-01 08:52:06 +00:00
Martin Mathieson
da7af5c1f7 Also add filter and expert info for ICMPv6 requests with no responses.
svn path=/trunk/; revision=53687
2013-12-01 08:51:07 +00:00
Michael Mann
e2d2d12098 Replace "btsdp" tap with function to query service_infos tree, since that's all dissectors were doing with it. Not used outside of dissectors and cuts down on a few redundant global variables.
svn path=/trunk/; revision=53677
2013-11-30 19:26:18 +00:00
Guy Harris
d62b116380 Make the code testing the Rx MCS Bitmask subfield of the Supported MCS
Set field of the HT Capabilities element a bit clearer, and add
comments.

Fix it so it doesn't assign a variable to itself, as clang warns about
that.

svn path=/trunk/; revision=53674
2013-11-30 10:17:30 +00:00
Pascal Quantin
4e3d8291fe From Peter Lemenkov via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9490 :
Couple packets in RTPproxy dissector not only with CookieID but also with Call-IDs

svn path=/trunk/; revision=53673
2013-11-30 09:50:04 +00:00
Michael Mann
e1532f39ec Tx MCS set is not interpreted properly in WLAN beacon frame. Bug 8894 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8894)
#BACKPORT

svn path=/trunk/; revision=53670
2013-11-30 01:35:03 +00:00
Michael Mann
6d3d1556dc STANAG 5066 DTS Layer dissector. Bug 9217 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9217)
From İbrahim Can Yüce

From me: Update to new tcp_dissect_pdus format, minor whitespace issues noticed in wiretap files.

svn path=/trunk/; revision=53669
2013-11-30 01:18:22 +00:00
Michael Mann
00737f834b Add wifi display port to the RTSP dissector. Bug 9339 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9339)
From chaitanya

From me: Add another obsolete preference and cleanup whitespace

svn path=/trunk/; revision=53667
2013-11-30 00:30:56 +00:00
Pascal Quantin
68c8c7ef0a From Peter Lemenkov via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9487 :
Use RTP payload descriptions from RTP dissector in RTPproxy codec param value

svn path=/trunk/; revision=53658
2013-11-29 22:56:34 +00:00
Jakub Zawadzki
82e2675f45 Avoid including <wiretap/wtap.h> in dissectors.
svn path=/trunk/; revision=53655
2013-11-29 20:53:00 +00:00
Jakub Zawadzki
d99fdfda63 Replace macros: BSWAP16, BSWAP32, BSWAP64 with glib-version.
XXX, people are not aware that expression of this macros might be evaluated multiple times, like:
 -  BSWAP16(tvb_get_letohs(tvb, off)) : \
 +  GUINT16_SWAP_LE_BE(tvb_get_letohs(tvb, off)) : \

Should be tvb_get_ntohs() called?


svn path=/trunk/; revision=53653
2013-11-29 19:21:20 +00:00
Jakub Zawadzki
5ac6474c94 Rename some of pint.h macros to match common style (bits number on the end).
pntohs  -> pntoh16
   pntohl  -> pntoh32
   pletohs -> pletoh16
   pletohl -> pletoh32
   phtons  -> phton16
   phtonl  -> phton32


svn path=/trunk/; revision=53652
2013-11-29 18:59:06 +00:00
Jakub Zawadzki
288efa5128 Expand macros: htoles(), htolel(), htolell()
svn path=/trunk/; revision=53651
2013-11-29 18:44:00 +00:00
Michael Mann
9c9a038428 General "Prosody" placeholder parameter ("prosody-") is broken down to a 6 new "Prosody" specific parameters. Bug 9425 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9425)
From zeljko

svn path=/trunk/; revision=53650
2013-11-29 17:51:56 +00:00
Martin Mathieson
73f042aa35 Fix number of selected bytes for gtp.teid_data. Also remove some stray tabs and unneeded _U_
svn path=/trunk/; revision=53649
2013-11-29 17:42:08 +00:00
Michael Mann
bf9fdc8e8f Bugfix timestamp formatting of Gigamon trailer. Bug 9433 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9433)
From Sandeep Dahiya

svn path=/trunk/; revision=53646
2013-11-29 14:55:49 +00:00
Michael Mann
8821cb7e2d Bugfixes of r53636, part of bug 9423 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9423)
From DSR Corporation

svn path=/trunk/; revision=53645
2013-11-29 13:42:09 +00:00
Pascal Quantin
9a48c7e8da Improve request / response tracking in case you have several open / close commands in the capture
svn path=/trunk/; revision=53644
2013-11-29 10:38:00 +00:00
Alexis La Goutte
5cb8483d82 Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
svn path=/trunk/; revision=53642
2013-11-29 08:33:51 +00:00
Alexis La Goutte
09e1e860d4 Enable by default UDP conversation (Needed by udp.stream)
svn path=/trunk/; revision=53641
2013-11-29 08:02:39 +00:00
Alexis La Goutte
7e0645563a Add udp.stream display filter
The result is the same filter used by Follow UDP (may be reuse the new filter in Follow)

svn path=/trunk/; revision=53640
2013-11-29 08:02:30 +00:00
Alexis La Goutte
110795132b Add HTTP2 heuristic when it is encapsulated in SSL
the heuristic may be leak (only check if type > 10...)

svn path=/trunk/; revision=53638
2013-11-29 08:02:09 +00:00
Michael Mann
563cf65155 Improved ZCL dissectors. Bug 9423 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9423)
From DSR Corporation

svn path=/trunk/; revision=53636
2013-11-29 03:40:16 +00:00
Jakub Zawadzki
9e0cd5d1d8 Fix typo (r53633) in one more place, fix typo in filename, make hex numbers capital.
svn path=/trunk/; revision=53634
2013-11-28 23:09:55 +00:00
Guy Harris
26446f8882 Fix (presumed) tpyo.
svn path=/trunk/; revision=53633
2013-11-28 22:36:10 +00:00
Jakub Zawadzki
3bbfb68ffa Move MPEG section table id defines to packet-mpeg-sect.h
svn path=/trunk/; revision=53632
2013-11-28 22:31:55 +00:00
Pascal Quantin
37660f413b Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9478 :
GSM SMS User Data header fill bits are wrong when using a 7 bits ASCII / IA5 encoding

svn path=/trunk/; revision=53631
2013-11-28 21:59:02 +00:00
Guy Harris
710feed2e0 GUINT_TO_POINTER() does just enough casting to suppress complaints about
32-bit integers and 64-bit pointers, so it needs to be handed a guint
(or equivalent type); it doesn't suppress warnings about 8-bit or 16-bit
integers, so those have to be cast up to guint first.

svn path=/trunk/; revision=53630
2013-11-28 20:40:46 +00:00
Michael Mann
a31d10208b Bluetooth: HSP: Add support for HSP. Bug 9446 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9446)
HSP is modest version of HFP.

From Michal Labedzki.

svn path=/trunk/; revision=53629
2013-11-28 18:33:26 +00:00
Michael Mann
8dab82556c Bluetooth improvements. Bug 9446 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9446)
From Michal Labedzki.

1. Bluetooth: HFP: Fix recognizing roles. There is need to check which side SDP record is, then it is possible to recognize roles.
2. Bluetooth: RFCOMM/HFP: Fix recognizing services and roles. Direction bit means only that device is initiator of connection or not. But need information who is owner of connection (remote device or localhost), so use this information from L2CAP.
3. Bluetooth: HFP: Fix unexpected expert info
4. Bluetooth: HCI: Set addresses to host/controller. Also optimize a little handing of dissectors handles.

svn path=/trunk/; revision=53628
2013-11-28 18:11:02 +00:00
Balint Reczey
30ae01c73b Support long Domain Names in NTLMSSP v2
... instead of crashing on them. :-)

Discovered by Garming Sam <garming@catalyst.net.nz>

svn path=/trunk/; revision=53626
2013-11-28 16:39:04 +00:00