Commit Graph

19656 Commits

Author SHA1 Message Date
Pascal Quantin 129bc4c8de VP8 RTP: fix Windows build failure
Fix Windows build errors:
packet-vp8.c(179) : error C2220: warning treated as error - no 'object' file generated
packet-vp8.c(179) : warning C4101: 'vp8_payload_tree' : unreferenced local variable
packet-vp8.c(291) : warning C4101: 'ti' : unreferenced local variable
packet-vp8.c(599) : warning C4101: 'vp8_name_handle' : unreferenced local variable
While we are at it, remove useless _U_ modifiers and NULL assignments.

Change-Id: I3d28de7f27a8019cc5424dafc4264107742d7c86
Reviewed-on: https://code.wireshark.org/review/158
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-02-10 20:05:14 +00:00
Peter Lemenkov 3d9547a835 Use IP types instead of plain strings where possible
Change-Id: Ia4a78e1ef3a7c45761cc271ecc17e7868b8456d9
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
Reviewed-on: https://code.wireshark.org/review/157
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-10 19:12:57 +00:00
Owen Williams 5eb4b6218c VP8 RTP dissector
Change-Id: Ic21d13bf8ca77ff37c2d2d229c4e8c9d8f053677
Reviewed-on: https://code.wireshark.org/review/124
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-10 19:11:37 +00:00
Gerald Combs fe0ed97e35 [Automatic manuf, services and enterprise-numbers update for 2014-02-09]
Change-Id: I8ca5845c85a086cd88af5b95bb9fee09e9b05850
Reviewed-on: https://code.wireshark.org/review/151
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-02-09 16:26:30 +00:00
Alexis La Goutte 183e0385ea Fix typo about encoding in MIP6 dissector...
Change-Id: Id0b50ddacf2e3cae008590456316586d262e6029
Reviewed-on: https://code.wireshark.org/review/146
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-08 14:47:31 +00:00
Alexis La Goutte f2f94d918f Fix some typo in MIP6 dissector
Fix indent (use 4 spaces)
Add modelines info
Fix warning found by fix encoding args tools

Change-Id: I4de8e3c0729c550eeceddd8e1a67fb6aa063844a
Reviewed-on: https://code.wireshark.org/review/144
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-08 14:33:13 +00:00
Pascal Quantin 373bf9bd86 Parse SIP sec-mechanism
From Anders Broman: parse security mechanism as specified in RFC 3329

Change-Id: I37300aa45740a11679149550943b3a1614ac8423
Reviewed-on: https://code.wireshark.org/review/138
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Tested-by: Anders Broman <a.broman58@gmail.com>
2014-02-07 15:45:01 +00:00
Pascal Quantin 04959a0c05 Register SSH dissector by name
Change-Id: Ia9ad45ce9196486129897cd616707d622778e9dd
Reviewed-on: https://code.wireshark.org/review/137
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-02-07 12:51:33 +00:00
Bill Meier ff85833235 Fix Bug #9690: DHCPv6 Packet dissector incorrectly handling FQDN in option 17.2171.6
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9690

Change-Id: I606bb73f4a226cbf1eb56cc0a27b926b97a453a0
Reviewed-on: https://code.wireshark.org/review/131
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-02-06 23:27:34 +00:00
Gregor Jasny 02b5bf9718 Extend RTMPT video types table
Change-Id: Ic97edfa64bb2d69b97295564e2f11cd07a0fe54c
Reviewed-on: https://code.wireshark.org/review/129
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-06 22:21:14 +00:00
Pascal Quantin b1bea543d9 Introduce end-of-line normalization
Change-Id: Ie6991af2432b193fbdc23bbbd335f83c091f14e8
Reviewed-on: https://code.wireshark.org/review/114
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-02-05 22:28:01 +00:00
Evan Huus 32e4d901fc Two fixes for license headers
- packet-bencode.c had the wrong FSF address
- wslua_int64.c had the license as a footer instead of a header

Change-Id: I71204b36a1034af72874d6fe87929c31c9ff03df
Reviewed-on: https://code.wireshark.org/review/123
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
Tested-by: Evan Huus <eapache@gmail.com>
2014-02-05 21:43:59 +00:00
Anders Broman 5236d89e26 Dissector assert in packet-nbap.c. num_items isn't reset before calling a sequence filling the array.
Closed-bug #9726

Change-Id: Ie4bc538b0788eb32895c9eedf8e0277c6d9ed1b2
Reviewed-on: https://code.wireshark.org/review/120
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Tested-by: Anders Broman <a.broman58@gmail.com>
2014-02-05 16:03:54 +00:00
Alexis La Goutte 2c3f022314 Add Aruba Intant AP dissector
There is no public spec, based only on analyze of packet
It is more easy to found the address IP of Intant AP

Change-Id: I3baf205c5e4ad699b954f4a9fbf4b9e65f82cb36
Reviewed-on: https://code.wireshark.org/review/121
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-05 15:28:48 +00:00
Evan Huus 953c3ef517 Fix dissection of GTP MM Context RAND field.
As suggested by Lükő Bálint to fix bug #9722.

Change-Id: I177f7632a0936f105b1acff5e7c20bcce2328957
Reviewed-on: https://code.wireshark.org/review/109
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-02-04 15:42:01 +00:00
Jelmer Vernooij 53404776be Split out bencode dissector and use it in the bzr dissector.
Change-Id: I5b2ef173faf7670fad64298d67f2aaf055b8d6d8
Signed-Off-By: Jelmer Vernooij <jelmer@samba.org>
Reviewed-on: https://code.wireshark.org/review/82
Reviewed-by: Evan Huus <eapache@gmail.com>
Tested-by: Evan Huus <eapache@gmail.com>
2014-02-04 14:24:13 +00:00
Michal Labedzki 1987306015 Bluetooth: btle: Make RxAdd field reserved in some cases
Specification: "If the TxAdd or RxAdd fields are not
defined as used in a given PDU then they shall be considered
Reserved for Future Use."

Change-Id: I767c0df0366afe789624046cda2d49c9875ffe60
Reviewed-on: https://code.wireshark.org/review/103
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-04 13:15:55 +00:00
Michal Labedzki 4ba8609d10 Bluetooth: AVDTP: Fix offset in case with Error Code
Change-Id: I6e97781bfd1775dcc13c4488af11d615ef6594fb
Reviewed-on: https://code.wireshark.org/review/102
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-04 13:15:35 +00:00
Alexis La Goutte 5fd025e8d3 Fix indent (Remove tabs and use 4 spaces)
Change-Id: Ide617723ffbe0c813f08b44804cd4ca52884a875
Reviewed-on: https://code.wireshark.org/review/107
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-04 13:05:24 +00:00
Alexis La Goutte 9f96c730d8 Fix indent (Remove tabs and use 4 spaces)
Change-Id: Ide85336be3dca4059619bb91707bfc49e25af63d
Reviewed-on: https://code.wireshark.org/review/108
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-04 13:05:07 +00:00
Alexis La Goutte 6d0f3d894d Fix indent (Use tabs)
Change-Id: I5c16950394915091a1dfb76e480ae7f2cba53e3f
Reviewed-on: https://code.wireshark.org/review/106
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-04 13:03:07 +00:00
Michal Labedzki e07e697e4d USB: Fix Linux header byte-order
Linux USB Header should be in Host Endian.
Also add ENC_HOST_ENDIAN to simplify code.

Change-Id: I95e7d97014633e8fc1d7739d0728780d70c60442
Reviewed-on: https://code.wireshark.org/review/15
Reviewed-by: Evan Huus <eapache@gmail.com>
Tested-by: Evan Huus <eapache@gmail.com>
2014-02-04 13:01:23 +00:00
Pascal Quantin 8f547d74dc Upgrade RRC dissector to v11.8.0
Change-Id: If43fc7ec8b5f997e573a9d84fda03f2ca2bf6dc7
Reviewed-on: https://code.wireshark.org/review/94
Tested-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-02-03 22:25:12 +00:00
Evan Huus 6d2f865b35 Add a cast to fix g4cc694839d.
Apparently very recent gcc versions *do* complain about the cast from gint to
enum, despite the comment to the contrary.

Change-Id: I422df9950f1c7c46ca8ea37a0e3abd7aa8fc1c7d
Reviewed-on: https://code.wireshark.org/review/89
Reviewed-by: Evan Huus <eapache@gmail.com>
Tested-by: Evan Huus <eapache@gmail.com>
2014-02-03 13:16:43 +00:00
Stig Bjørlykke f9dbf32c97 Fix one -fstrict-alias warning missed in g4cc69483
Change-Id: I99aa593c188ca77dd20dba8e4305cc9ffdf50416
Reviewed-on: https://code.wireshark.org/review/87
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-02-03 11:19:00 +00:00
Gilbert Ramirez 4cc694839d Fix all -fstrict-alias warnings found by gcc 4.1.2
The majority of the fixes are for calls to uat_new(). Instead of
having each caller cast its private data to (void**), we use void*
in the uat_new() API itself. Inside uat_new(), we cast the void*
to void**.

Some dissectors use val64_string arrays, so a VALS64() macro was
added for those, to avoid using VALS(), which is useful only for
value_string arrays.

packet-mq.c was changed because dissect_nt_sid() requires
a char**, not a guint**. All other callers of dissect_nt_sid() use
char*'s (and take the address of it) for their local storage. So,
this was changed to follow the other practices.

A confusion between gint and absolute_time_display_e in packet-time.c
was cleared up.

The ugliest fix is the addition of ip6_guint8_to_str(), for exactly
one caller. The caller uses one type of ip6 address byte array,
while ip6_to_str() expects another. This new function is in place
until the various address implementations can be consolidated.

Add VALS64() to the developer documentation.

Change-Id: If93ff5c6c8c7cc3c9510d7fb78fa9108e4552805
Reviewed-on: https://code.wireshark.org/review/48
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-03 09:26:10 +00:00
Alexis La Goutte 479d27c69e QUIC dissector : Update from last Design Document and Specification (12/2/2013)
Changed “GUID” to “CID” (Connection Identifier), as the original term carried common meaning and baggage that was not intended

Change-Id: I04986331aee33be237dab6963c0ff39accf507cd
Reviewed-on: https://code.wireshark.org/review/81
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-02 20:21:58 +00:00
Peter Wu d252d911a0 Fix dissector exception when GUID is empty in flags
When the GUID (CID or Connection Identifier in a more recent spec) field in Public Flags is 0, a zero-length item would be added.

This trivial patch prevents a dissector exception by checking the length first.

Change-Id: Idf6d970bc1b0b3f1a8e47618a8759f6a0cd54c65
Reviewed-on: https://code.wireshark.org/review/78
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-02 19:24:36 +00:00
Martin Kaiser 06510129bb dissector for HDMI (High-Definition Multimedia Interface)
messages on the Data Display Channel (DDC)

this dissector is available as an option for I2C messages

it handles EDID messages (Extended Display Identification Data)
and passes HDCP messages on to the HDCP dissector

Change-Id: Ia8d8e73c36e2a1ad560b911dd4c1c9f34997b5c2
Reviewed-on: https://code.wireshark.org/review/63
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-02-02 17:41:35 +00:00
Stefan Metzmacher cf48ff0244 packet-iwarp-mpa: give more information if the ULPDU length doesn't match
Try to dissect even it the size is not as expected.
Windows doesn't use alignment for smb-direct.

Change-Id: I66c465d331aaab5caf28385a6dd3a43b63af2208
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-on: https://code.wireshark.org/review/56
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
Tested-by: Evan Huus <eapache@gmail.com>
2014-01-31 22:30:04 +00:00
Martin Kaiser f30b717f34 remove some of the unnecessary if(tree) checks
Change-Id: Ie1b684327a77c265188d916c1242d335c55aa8cb
Reviewed-on: https://code.wireshark.org/review/65
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-01-31 20:14:09 +00:00
Martin Kaiser 95477a933a TABs -> spaces
add editor modelines

Change-Id: I5433e0d41a30043264a0f60c2166de471c80745c
Reviewed-on: https://code.wireshark.org/review/64
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-01-31 20:13:29 +00:00
Stefan Metzmacher dc9c107967 packet-iwarp-ddp-rdmap: make it possible to register "iwarp_ddp_rdmap" payload dissectors
Change-Id: I4621cda936cb54c70de7e294cc760b9baff38961
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-on: https://code.wireshark.org/review/54
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-01-31 16:41:20 +00:00
Stefan Metzmacher 7feac74603 Revert "In get_unicode_or_ascii_string(), check if the length is odd/even, not the offset. Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5778 - Volume label field ... is not displayed correctly ..."
This is wrong it breaks all sort of things. The "Volume label field"
is a special case, which can be fixed by using nopad=TRUE.

Change-Id: I3cd3f30ff0076d5e31a735391b175fd68e5fa142
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-on: https://code.wireshark.org/review/26
Reviewed-by: Evan Huus <eapache@gmail.com>
Tested-by: Evan Huus <eapache@gmail.com>
2014-01-31 16:38:21 +00:00
Stefan Metzmacher 505af30e01 packet-smb.c: real fix for https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5778
Change-Id: I33308c44791b487844f23db07d152897380d7cf1
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-on: https://code.wireshark.org/review/25
Reviewed-by: Evan Huus <eapache@gmail.com>
Tested-by: Evan Huus <eapache@gmail.com>
2014-01-31 16:36:25 +00:00
Alexis La Goutte b84d5ac17e Enhance / Update ICMPv6 dissector
* Update to the last IANA icmpv6-parameters (2014-01-30)
* Update to final draft (for RFC 6743 and RFC 6775)
* Add RFC 7112 (Implications of Oversized IPv6 Header Chains) support (Add new Parameter Problem code)
* Fix a encoding arg

Change-Id: I90f65dfc54e5c0aff21a0e7ec2c937304aced02d
Reviewed-on: https://code.wireshark.org/review/62
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-01-31 16:08:23 +00:00
Alexis La Goutte b4f90d96a5 Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: Id7bab3a69514f159eda8d1285ca7f8f2d42e34ad
Reviewed-on: https://code.wireshark.org/review/61
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-01-31 15:56:33 +00:00
Alexis La Goutte 2516e54202 Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: I695824b95f5e8978c2b58c4e98471d1ed204d686
Reviewed-on: https://code.wireshark.org/review/60
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-01-31 15:56:18 +00:00
Stefan Metzmacher 848546ece8 packet-smb2: dissect SMBDirect Buffer Descriptors
Change-Id: Ie91c19078a92f36044b4eee55c3228e3257bf45d
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-on: https://code.wireshark.org/review/53
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-01-31 14:25:52 +00:00
Evan Huus 21e0a63b29 Add remove_last_data_source and fix bug 9169
The OP asked 9169 to be reopened because the capture was spewing ~40GB of output
when dissected with tshark. Investigation showed this was because the HTTP
dissector was requesting ONE_MORE_PACKET reassembly a lot, and TCP was adding
each step as a data-source which was being printed by tshark's hex dump. This
was leading to O(n^2) of output.

To fix, introduce function remove_last_data_source which removes the most recent
data source from the list. If the subdissector in TCP reassembly asks for
ONE_MORE_PACKET, assume it hasn't added any tree items (since it shouldn't have)
and remove the data source since it is unnecessary.

This may break dissectors which add tree items and *then* return
ONE_MORE_PACKET, since they will have their data source removed out from under
them. I believe those cases should be fixed to not add tree items until they're
sure they have enough data.

Change-Id: Iff07f959b8b8bd1acda9bff03f7c8684901ba8aa
Reviewed-on: https://code.wireshark.org/review/38
Reviewed-by: Evan Huus <eapache@gmail.com>
Tested-by: Evan Huus <eapache@gmail.com>
2014-01-30 22:11:41 +00:00
Jiri Engelthaler 458b835683 IEC60870-5-104: Added decoding of integrated totals without time tag, fixed inverted logic of "Overflow" and "Adjusted" bits, some minor code style changes.
Change-Id: I76af5eabfd08f312f37547bcc10e3ffe10b17f2a
2014-01-30 12:00:46 +00:00
Alexis La Goutte 40c459e759 Merge "openSAFETY: Fixing field / byte assignment" 2014-01-30 10:36:25 +00:00
Roland Knall 88e82bd69b openSAFETY: Fixing field / byte assignment
- SNMT messages where presented in a way, where the value of the
   field was not pointing to the correct bytes where it came from
 - Sender / Receiver where renamed to be better understandable
 - SN send to (Receiver) now comes first as it does in the byte
   stream

Change-Id: I364cb248bed9489c0cf9c7bf9fbd37b0225dbd78
2014-01-30 10:50:57 +01:00
Michal Labedzki 2c28c5d93f MIME: Rename image dissectors to file dissectors.
Change-Id: Ie160733ceeed23ff96ddccfbf0ca2e7694789ff8
2014-01-29 23:17:33 +01:00
Stefan Metzmacher 6167a0f6ed packet-smb2: fix lease epoch fields
Bug: 9703

Change-Id: I1955360adaee53846f084434c59180d715e19fcd
Signed-off-by: Stefan Metzmacher <metze@samba.org>
2014-01-29 17:42:51 +00:00
Alexis La Goutte cac3024d70 Merge "smb2: Lease Epoch is only 16 bit" 2014-01-29 17:42:10 +00:00
Volker Lendecke fc216102e3 smb2: Lease Epoch is only 16 bit
See [MS-SMB2] 2.2.14.2.12

Bug: 9703

Change-Id: Ia9c9c658bd5020e0dad84fc74617fed60ce7df06
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
2014-01-29 17:41:31 +00:00
Alexis La Goutte a5b2a9c93c Merge "smb2: Fix a typo" 2014-01-29 17:39:22 +00:00
Gilbert Ramirez a20d788da3 Add newlines at end of files that are missing them.
gcc 4.1.2 complained with:
    No newline at end of file

Change-Id: I813af88737e725a328713eea4a7096d28942f9b2
2014-01-29 05:11:10 -08:00
Volker Lendecke 05a7306482 smb2: Fix a typo
Bug: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9703

Change-Id: I8ebb20a48e1131fcf14ee55e5e1822a8dcd713d2
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
2014-01-29 11:34:47 +01:00