Commit graph

23318 commits

Author SHA1 Message Date
Alexis La Goutte
04f08471b3 IEEE 802.11: Add a option for disable FCS check
Bug:11205
Change-Id: Ia3bc63dbb1504381b58f9e31b56412574ec96f4e
Reviewed-on: https://code.wireshark.org/review/8675
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-06-06 09:48:06 +00:00
Alexis La Goutte
ac51c091a9 Aruba ERM: Use decode AS for decode Aruba ERM Type..
Change-Id: I4c0813a273e88b16dcad7996dc1dcaaac3d01944
Reviewed-on: https://code.wireshark.org/review/8712
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-06-06 09:47:58 +00:00
Alexis La Goutte
7e2e8ef04c Aruba ERM: Fix FCS for Type 1 (PEEK)
Type 1 is Peek type (using Peek dissector)
Peek dissector is also update for Cisco AP, Pass info to peek dissector it is "Aruba PEEK" (with buggy FCS)

Add also check of signal value (when signal strength = 100%) it is a TX packet and there is no FCS

Bug:11204

Change-Id: I435e0e3275bc0a03fa534e49e86251114f568040
Reviewed-on: https://code.wireshark.org/review/8710
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-06-06 09:47:35 +00:00
Alexis La Goutte
8d46c411e9 Aruba ERM: Fix FCS for Type 3
Add a check of signal value (when signal strength = 100%) it is a TX packet and there is no FCS
Only work for Type3 (no signal information on Type 0)

For type 0, Always display the FCS

Bug:11204
Change-Id: I837f8c01c0d0284ecb218b6b03fa9ac025fac5f2
Reviewed-on: https://code.wireshark.org/review/8569
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-06-06 09:46:00 +00:00
Alexis La Goutte
c365dffd26 TCP: Add (generated) field with first letter of TCP Flags
from help TCP Troubleshooter
Based on http://blog.didierstevens.com/2014/04/28/tcp-flags-for-wireshark/

Change-Id: I115717f738a77dd1b22cefa8f646bcdbe9884ec2
Reviewed-on: https://code.wireshark.org/review/8733
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-06-06 09:45:36 +00:00
Alexis La Goutte
a36f6c58ca BGP: MP (UN)REACH NLRI SAFI is 1 octet long
Break when remove proto_tree_add_text (g1307c2255f)

Change-Id: Id5512424180b4834c20fa5416499fc939c06d1ea
Reviewed-on: https://code.wireshark.org/review/8774
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-05 11:28:14 +00:00
Matthieu Texier
be8a7c3750 BGP: Add EVPN draft-rabadan-l2vpn-evpn-prefix-advertisement support
Bug: 11252
Change-Id: I125e3075125451d2cbeac6cc183977e73040887f
Reviewed-on: https://code.wireshark.org/review/8767
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-06-05 10:33:14 +00:00
Pascal Quantin
5061da3f96 iSCSI: handle repetition of InitiatorTaskTag fore request / response tracking
Use a red-black tree instead of a hash map so as to take he current frame number into account
Only insert entries in the red-black tree on first pass

Bug: 11250
Change-Id: Ic6e4a5e4f3cd4a22c2df0b8851c6651695648fa8
Reviewed-on: https://code.wireshark.org/review/8763
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-06-05 05:34:48 +00:00
David Ameiss
509eb46981 Add dissector for the Aeron protocol.
Bug: 11164

Change-Id: I7ed6a3fd18aaadfc9b7b9619b1035206e86f46d6
Reviewed-on: https://code.wireshark.org/review/8240
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-06-05 05:28:27 +00:00
Martin Kaiser
d3c0b50df1 ZVT: start dissecting the tlv container
Change-Id: I555e4f487fb5aafa61dabfcab784dad5e71510ec
Reviewed-on: https://code.wireshark.org/review/8769
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-06-04 22:35:39 +00:00
Martin Kaiser
dd26d59fb5 DVB-CI: minor cleanup
tvb_length -> tvb_captured_length
copyright ... - 2015

Change-Id: Id3043725edda2b59c06d17de41c8dfc8ea4ae11c
Reviewed-on: https://code.wireshark.org/review/8768
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-06-04 22:34:52 +00:00
Kevin Grigorenko
5f9a52dc95 SSL: Add support for private key password when decrypting
SSL traffic from tshark with -o ssl.keys_list.


For example, as used in a new test also added in this commit:

-o "ssl.keys_list: 127.0.0.1,9131,http,$TEST_KEYS_DIR/key.p12,WebAS"

Change-Id: Ia6960fa4ae88182277f6d22d84ec9170ea74d54e
Reviewed-on: https://code.wireshark.org/review/8746
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-06-04 15:49:45 +00:00
Anders
505d3038fc packet-pmproxy.c:94: warning: implicit conversion shortens 64-bit value
into a 32-bit value

Change-Id: Ib741ad1c4f237ca921c01c86a521a238cdf25e8f
Reviewed-on: https://code.wireshark.org/review/8761
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-04 13:39:28 +00:00
Anders
8d78077d0d [MSVC2015] TRy to fix Warnings turned errors.
Change-Id: I1156e66daad84004f4f7acae0175fcbb475db71a
Reviewed-on: https://code.wireshark.org/review/8760
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-04 13:32:17 +00:00
Alexis La Goutte
97255b3a7c P1: fix request for implicit conversion from 'gpointer' to 'struct p1_address_ctx_t *' not permitted in C++ [-Wc++-compat]
Change-Id: I43364dda21abe3281fbd15ad953232093bb1fffa
Reviewed-on: https://code.wireshark.org/review/8756
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-06-04 11:01:16 +00:00
Alexis La Goutte
1ab7a461f6 rtp/pm proxy: fix implicit conversion shortens 64-bit value into a 32-bit value
packet-pmproxy.c:93: warning: implicit conversion shortens 64-bit value into a 32-bit value
packet-pmproxy.c:94: warning: implicit conversion shortens 64-bit value into a 32-bit value
packet-pmproxy.c:95: warning: implicit conversion shortens 64-bit value into a 32-bit value
packet-rtpproxy.c:831: warning: implicit conversion shortens 64-bit value into a 32-bit value

Change-Id: Ibf1491c1e56dfe6684fe2fe67edc1a721d5de56f
Reviewed-on: https://code.wireshark.org/review/8753
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-06-04 09:19:29 +00:00
Alexis La Goutte
83b6af0345 ISAKMP: fix build about unused variable
Change-Id: Id55eeb6d4c29088dec97b270aca61f8c5d777a46
Reviewed-on: https://code.wireshark.org/review/8752
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-06-04 09:09:39 +00:00
Ryan Doyle
d67c163eba Dissection support for pmproxy
Implements dissection for the Performance Co-Pilot proxy protocol. Its a
simple protocol that exchanges host and port information and then passes
all traffic via the usual PCP protocol.

Change-Id: I54fbf6b7755b7b1c60e0e1696ac9c4f0d98d8fe7
Reviewed-on: https://code.wireshark.org/review/8704
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-04 06:29:36 +00:00
Peter Lemenkov
305960174d [RTPproxy] Simplify positive reply parsing and minor cleanups
* Merge both 'positive reply' and 'version ack' processing into one block.
* Also use realsize where possible instead of recalculating packet's size
again.
* Add a bit more comments.
* Remove some 'magic' numbers. Use actual string sizes instead.
* Skip trailing zeroes inserted by some old SIP-servers.

Change-Id: Ie66aa4d6e807a1f351b62d36333301fdec1550fa
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
Reviewed-on: https://code.wireshark.org/review/8738
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-04 06:26:14 +00:00
Michael Mann
8ccf65bfb2 Eliminate proto_tree_add_text from a few dissectors.
Change-Id: Ia6b62fae76ae76a2859ec47229e1c299bddb5a31
Reviewed-on: https://code.wireshark.org/review/8749
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-04 06:23:54 +00:00
Jeff Morriss
524ed1df6e WCCP: Fix up storing and decoding of IP addresses.
Try to decode as many IP addresses as we can, even if they don't fit in the
table we store them in.

Only add IP addresses in the table once.  We could theoretically reallocate
the table but the original code seems to assume the addresses should (in
non-fuzzed captures) only show up once per PDU.  This part of the change fixes
the fuzz failure.

Bug: 11153
Change-Id: I56b9854ac1342080c9f32699a3f97750fa335696
Reviewed-on: https://code.wireshark.org/review/8748
Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-04 06:17:25 +00:00
Pascal Quantin
e309d9e8a7 MIME Multipart: fix display of the last IMF field
Regression was introduced in g23f0e16

Bug: 11249
Change-Id: I2822a4452d3cdf2e53e5f3f1f3034e758fec129b
Reviewed-on: https://code.wireshark.org/review/8747
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-06-04 05:50:34 +00:00
6148cd3c6b Update mobile network codes of South Korean mobile networks.
Change-Id: I4f988da98846ebeeba47ace270f64911baaca0b7
Reviewed-on: https://code.wireshark.org/review/8745
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-06-03 16:52:59 +00:00
Alexis La Goutte
ee5166185e IS-IS (LSP) Add Shared Risk Link Group (SRLG) clv (138)
Bug:11246
Change-Id: I303de72cda8e667dcd3ccd1af3f2989123718544
Reviewed-on: https://code.wireshark.org/review/8743
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-06-03 13:52:19 +00:00
Roland Knall
53f3d7caad openSAFETY: Fix false-positive
- The starting offset for a consecutive frame search was off by 1

Change-Id: Ife77f9823e7e6d9a6601dba9c4cca74984e4ed40
Reviewed-on: https://code.wireshark.org/review/8741
Reviewed-by: Roland Knall <rknall@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-06-03 11:46:01 +00:00
Anders
360a7ec9ae G_STRUCT_OFFSET gives warnings turned errors with MSVC2015,
use offsetof if defined or define it ourselfs as done in other
places in our code base.

Change-Id: Ia1c72c9648336e93ba8c14d4bc0371d782835370
Reviewed-on: https://code.wireshark.org/review/8735
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-03 10:44:16 +00:00
Martin Mathieson
bef4da8f98 ISAKMP: Don't complain about zero-length config attributes in request messages - this is expected
Change-Id: I1cedb7d84ca7e4c2af30405f5624a327fd796c86
Reviewed-on: https://code.wireshark.org/review/8739
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2015-06-03 09:10:00 +00:00
Peter Lemenkov
32177ceec8 [RTPproxy] Set column name to RTPProxy-ng
Set column name to RTPProxy-ng if a new protocol is used.

Change-Id: I8c79ad5426808ad6944060e9c12fa4ac1f02e432
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
Reviewed-on: https://code.wireshark.org/review/8737
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-02 19:05:55 +00:00
Anders Broman
4ed7cc7ef2 Revert "MSVC 2015RC does not like the #defines using OFFSETOF replace them by absoulute numbers."
This reverts commit 0808f4c958.

Change-Id: I899cbeec86f34a00ded41040257e5de3ab537175
Reviewed-on: https://code.wireshark.org/review/8736
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-02 13:28:23 +00:00
Anders
0808f4c958 MSVC 2015RC does not like the #defines using OFFSETOF replace them by
absoulute numbers.

Change-Id: I1de97be98c06bee2d7ddca38496a72e93567cbcf
Reviewed-on: https://code.wireshark.org/review/8734
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-02 11:38:40 +00:00
Pascal Quantin
d7512052eb ISAKMP: do not try to defragment IKEv1 packets
Bug: 11242
Change-Id: I289a5eeb056822299f6cb436047418aec785dca5
Reviewed-on: https://code.wireshark.org/review/8728
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2015-06-02 11:27:27 +00:00
Alexis La Goutte
0f7c74acaf AFS: Fix Mac OS X buildbot (-Wshadow)
Rename index -> idx

Change-Id: I22b23535e3d24866bdbe63be8f242a3c3ebcc6ba
Reviewed-on: https://code.wireshark.org/review/8726
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-06-01 17:53:27 +00:00
Michael Mann
fb5e9e43c1 Convert AFS dissector to use ptvcursor API.
The dissector was written in all macros, presumably to get just a single lines to display a field.  The ptvcursor API is good for that, and using it over macros more than halves the object size.  Real code (vs macros) is also much easier to use in a debugger.  It also makes it easier for the check* scripts to find possible errors.

Also eliminate proto_tree_add_text.

Change-Id: Id07e015b5a2d1a98a4b36e40a426442d826d9a09
Reviewed-on: https://code.wireshark.org/review/8723
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-06-01 15:59:24 +00:00
Michael Mann
11b3d6445a Eliminate proto_tree_add_text from packet-sip.c
Change-Id: I560b2b0660ce2274507721450534d4d50fb6aec5
Reviewed-on: https://code.wireshark.org/review/8713
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-01 07:45:27 +00:00
Alexis La Goutte
2be0042781 Websocket: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: Ica45c5d316d04df977449a12f824c76642d6c4bd
Reviewed-on: https://code.wireshark.org/review/8722
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-01 07:35:02 +00:00
Michael Mann
6abf51316b Eliminate proto_tree_add_text from packet-http.c
Change-Id: Ib94eabeea865ef5c5d9ce4cef26d9faa51c5659d
Reviewed-on: https://code.wireshark.org/review/8715
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-05-31 21:09:13 +00:00
Michael Mann
4d74d0dccd Eliminate proto_tree_add_text from packet-dcerpc-ndr.c and packet-dcerpc-netlogon.c
Change-Id: I65eff9c8087424087a307f18b96a202f0364e371
Reviewed-on: https://code.wireshark.org/review/8714
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-05-31 21:08:59 +00:00
Mikhail Koreshkov
7da74dff21 VGCS/VBS Assignment Request: Add param dissector
Function for dissect Assignment Requirement parameter

Change-Id: I0ed8748913e5fe3dd509a78a5285520f6f63abac
Reviewed-on: https://code.wireshark.org/review/8700
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-05-31 17:35:19 +00:00
Peter Wu
d555aa759b websocket: restructure tree, always unmask payload
Changes:
 - Instead of special-casing masked and unmasked payload data, always
   unmask the payload before using it. This fixes handling of SIP
   requests which are masked and would previously not be dissected by
   the SIP handle. (As a result, many fields are removed).
 - Dissected text protocols (for example SIP) are now shown below the
   Websocket layer instead of inside the payload tree.
 - Use line-based text dissector as fallback for text decoding, and use
   data dissector for binary decoding.
 - Treat the optional close reason as UTF-8 instead of ASCII.
 - Group the close fields (status code, reason) in a subtree below close
   to avoid confusion. Make Close FT_NONE to avoid displaying hex.
 - Split dissection of the payload in separate functions for control and
   data frames.

Change-Id: I78b0078d51271bef94229d4b7c6c528b5e3a424d
Reviewed-on: https://code.wireshark.org/review/7294
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-05-31 16:27:37 +00:00
Alexis La Goutte
a461e23d0e BGP: remove proto_tree_add_text call
Part7
Fix last proto_tree_add_text (use expert info)

Change-Id: I9c4c053e5fc94f57608c7ee8355e6e16f8af6bd1
Reviewed-on: https://code.wireshark.org/review/8697
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-05-30 11:42:32 +00:00
Alexis La Goutte
392d3a5002 BGP: remove proto_tree_add_text call
Part6
Update SAFNUM_TUNNEL

Change-Id: I4a3486f3fd12a624caa11e4ab424b26081b5b9ab
Reviewed-on: https://code.wireshark.org/review/8696
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-05-30 11:33:24 +00:00
Alexis La Goutte
2d40489497 BGP: remove proto_tree_add_text call
Part 5
Update SAFNUM_LAB_VPNUNIMULC/SAFNUM_LAB_VPNMULCAST/SAFNUM_LAB_VPNUNIMULC
Simplify code but no tested on real pcap

Change-Id: I02fc1bc8d4b406f34918130d1eb24d514c24385c
Reviewed-on: https://code.wireshark.org/review/8695
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-05-30 11:28:11 +00:00
Mikhail Koreshkov
db3c821084 Q955.3 MLPP Dissector
Added ASN.1 dissector for MLPP (Multi-Level Precedence and Preemption)
protocol Q955.3

Change-Id: Ic1c855dfbf1fb1295a43cfe3a5ad7087b5b89c12
Reviewed-on: https://code.wireshark.org/review/8689
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-05-30 11:08:00 +00:00
Alexis La Goutte
78c0aa320c SCSI: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: Ie71203081f807401d3eee5601a1885e9a311f81e
Reviewed-on: https://code.wireshark.org/review/8698
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-30 08:04:11 +00:00
Alexis La Goutte
c2bad0cec4 BGP: Remove proto_tree_add_text call
Part 4
Update BGP Type TUNNEL_ENCAPS_ATTR

Change-Id: Ib166cf42e4eee3513f4c2f64e18eb5de2ed4acf2
Reviewed-on: https://code.wireshark.org/review/8694
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-30 05:55:51 +00:00
Alexis La Goutte
1307c2255f BGP: Remove proto_tree_add_text call
Part 3
Update BGP Type MP REACH NLRI, MP UNREACH NLRI and SAFI_SPECIFIC_ATTR

Change-Id: I28bc1385cf75b99739946e91d52c4d654ba525d3
Reviewed-on: https://code.wireshark.org/review/8693
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-30 05:53:27 +00:00
Jeff Morriss
e47c4d5775 NULL terminate the list of hfs given to proto_tree_add_bitmask*().
This fixes a number of recent fuzz failures.

Bug: 11195
Change-Id: Ifa6cc380fd3f610469d3c795e234e6986cfaf674
Reviewed-on: https://code.wireshark.org/review/8699
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-30 05:47:57 +00:00
Pascal Quantin
486a530451 ISAKMP: fix compilation without libgcrypt
Change-Id: Ie0d9cc3d81b57f81fe50791bf0c5762578a22b19
Reviewed-on: https://code.wireshark.org/review/8692
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-05-29 20:34:13 +00:00
Pascal Quantin
ba2e1108cd ISAKMP: fix some compilation warnings
Change-Id: If682a12e057f35991893db18dc5e6c4df5434973
Reviewed-on: https://code.wireshark.org/review/8690
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-05-29 20:18:25 +00:00
Martin Mathieson
00a2cf0367 ISAKMP: implement RFC7383: Internet Key Exchange Protocol Version 2 (IKEv2) Message Fragmentation
Change-Id: Ib6660e245729bf9d4399fa8aa1858877ec3244da
Reviewed-on: https://code.wireshark.org/review/8685
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-05-29 19:43:35 +00:00
Pascal Quantin
6c58665540 ANSI IS-637 A: fix byte highlighting of destination address when using ASCII encoding
Change-Id: I11d5de26bd73bada742e808f582e0dd746032aa2
Reviewed-on: https://code.wireshark.org/review/8684
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-05-29 12:08:11 +00:00
Stig Bjørlykke
65f873fb7b idmp: Sync with asn1 source
Change-Id: Ie46a86c696b6b8889032db0fc6678768f18e1fc1
Reviewed-on: https://code.wireshark.org/review/8682
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-05-29 07:31:42 +00:00
Andy Ling
c58f51b321 HTTP: Add support of PATCH method (RFC 5789)
Bug: 11229
Change-Id: I915d2efb873bfa72d500070f382dad10a991ecd4
Reviewed-on: https://code.wireshark.org/review/8673
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-29 05:24:13 +00:00
Anish Bhatt
b610db61da Update scsi lun id dissector, add support to handle all 4 addressing
methods

Bug 11078

Change-Id: I7a9ff07d83b4bb5f5512c04d71aa7f1d3baa0edd
Reviewed-on: https://code.wireshark.org/review/8181
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-29 05:22:15 +00:00
Guy Harris
afb0791e0c Use FT_FLOAT for a floating-point number.
Change-Id: If74df214c41baac425fd89e8476578962a5cfde7
Reviewed-on: https://code.wireshark.org/review/8681
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-29 04:30:00 +00:00
Artur Nowosielski
7e3d4f6eb8 enabled decoding of longlong and ulonglong in GIOP
Change-Id: I21323ab6c44583494c4353650caea0d23ef3f30c
Reviewed-on: https://code.wireshark.org/review/8679
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-29 00:22:52 +00:00
Gerald Combs
e08bc0dd62 Don't warn about overwriting filename preferences.
When specifying a filename preference (e.g. the SSL pre-master secret
log filename) don't warn about overwriting the file. Most of the time
we're reading the file and when we're not (e.g. for the SSL debug log)
overwriting it is kind of the point.

Preference descriptions are plain text. We display them in tooltips as
rich text. Convert them accordingly.

Fixup some of the SSL preference descriptions.

Bug: 11010
Change-Id: I4f1b1f3dd270c01648d9dd52ae20381c3c0d2e37
Reviewed-on: https://code.wireshark.org/review/8665
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-05-28 02:21:33 +00:00
Pascal Quantin
82503258ff ANSI IS-637 A: dump bytes when SMS encoding format is set to octet
Change-Id: I3d8a72a9549d170e0b1d54ad930da8c9dd510134
Reviewed-on: https://code.wireshark.org/review/8663
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-05-27 15:56:19 +00:00
Michael Mann
4963c77285 Convert proto_tree_add_boolean to proto_tree_add_bitmask_[value|value_with_flags|list]
Final part.

While there change deprecated tvb_length-xxx() calls

Change-Id: I8b0cf823c2d37a92c58fcb653f7fe1e8fdad5a79
Reviewed-on: https://code.wireshark.org/review/8642
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-27 11:02:30 +00:00
Michael Mann
a25c46bc7b Remove proto_tree_add_text from some dissectors.
Change-Id: Id7ef95a56d9d8cc01f9a1a4556ad056b8bb7f8bc
Reviewed-on: https://code.wireshark.org/review/8654
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-26 15:20:46 +00:00
Michael Mann
c6b0a61ab3 Remove proto_tree_add_text from packet-ssl-utils.c
Change-Id: I64998e93e8d72faa76e0e7809abfd9ccae10ab36
Reviewed-on: https://code.wireshark.org/review/8653
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-26 15:14:23 +00:00
Peter Lemenkov
27f16ade80 [RTPproxy] Remove non-existent reply
This reply message was never implemented anywhere. Current protocol spec
doesn't mention this type of a reply either:

* https://github.com/sippy/rtpproxy/wiki/RTPP-%28RTPproxy-protocol%29-technical-specification#information

So we should remove this.

Change-Id: I4e5efef24c6859d5a4a0ba08e3e4cca6d7b217f2
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
Reviewed-on: https://code.wireshark.org/review/8656
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-26 15:10:38 +00:00
Michael Mann
a713b1314d Duplicate the presence of the "ignored" field in order to remove proto_tree_add_text.
Change-Id: I0906c28656a104210f6fd1f95c9cee7899308538
Reviewed-on: https://code.wireshark.org/review/8619
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-26 12:09:28 +00:00
Alexis La Goutte
da93752b6d ATM: Add reserved field
Always display reserved field

Change-Id: Ic9d7ea269bd31fc25bc9ef0430a49f37fa66a937
Reviewed-on: https://code.wireshark.org/review/8652
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-26 11:10:14 +00:00
Alexis La Goutte
4d15e49793 ATM: fix indent (use spaces)
Change-Id: I6d8bae2124a5472448e2f2629340a20f5a899076
Reviewed-on: https://code.wireshark.org/review/8651
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-26 11:09:47 +00:00
Alexis La Goutte
dd22928472 AIM: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
remove also orig_offset (no longer needed)

Change-Id: Idc65b45fb67bae6acdca33962f3352a50296a6e5
Reviewed-on: https://code.wireshark.org/review/8650
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-26 11:07:56 +00:00
Michael Mann
f91f7d4d9f Remove proto_tree_add_text from file-elf.c
Change-Id: Ib7df1e2c40ad86866f5a3d6902a7a92144028be7
Reviewed-on: https://code.wireshark.org/review/8620
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-05-26 10:33:20 +00:00
Anish Bhatt
751989629a Replace deprecated tvb_length* apis
Change-Id: Ia23a6cbc61dfaf65002ce63160e87877963a3cca
Reviewed-on: https://code.wireshark.org/review/8643
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-05-26 10:22:33 +00:00
Alexis La Goutte
8817fd06b2 CAPWAP: Add Vendor Specific from Cisco
Based on work of actube https://github.com/7u83/actube

Change-Id: I4f9b3bfa263446fb380127640ba99ecb0043eef2
Reviewed-on: https://code.wireshark.org/review/8307
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-05-26 09:22:36 +00:00
Michael Mann
00041a4efe Revert "[AIM] Fix string length"
It's a FT_UINT_STRING field type

This reverts commit dc14e3ce0d.

Change-Id: I1185efbad459887fb9c16fb01e670bc43e6f2d84
Reviewed-on: https://code.wireshark.org/review/8623
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-05-26 09:10:44 +00:00
Guy Harris
2638402727 Fix variable that needs to survive a longjmp().
Pointed out by a warning in a compilation for ARM.

Change-Id: Iab2748adbdc88c9e6749da1c3835896683a1a091
Reviewed-on: https://code.wireshark.org/review/8648
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-26 08:54:24 +00:00
Martin Kaiser
ecdaa11f50 jpeg: remove some more unnecessary initialisations
Change-Id: If66a3951037d01c1aa502c0695ea11c62cc4d208
Reviewed-on: https://code.wireshark.org/review/8633
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-05-25 16:31:20 +00:00
Martin Kaiser
1e5ca4fc6a jpeg: replace an empty switch-case with a todo comment
Change-Id: I656fa2f69453916dd5466265220e2b4590d3631c
Reviewed-on: https://code.wireshark.org/review/8632
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-05-25 16:30:59 +00:00
Martin Kaiser
73ef7b06ef jpeg: some more code cleanup
delete unnecessary initialisations
declare variables at the start of a function

Change-Id: Ib427790c51c1fc7433d0f3c17dc9fa4748585180
Reviewed-on: https://code.wireshark.org/review/8631
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-05-25 16:30:23 +00:00
Martin Kaiser
630be088bf DVB-CI: clean up the expert info definitions
sort them by layer
wrap long lines
make the filter strings consistent

Change-Id: Ibbeb405c6356abe61dd9a0194af1c072d2c1c971
Reviewed-on: https://code.wireshark.org/review/8630
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-05-25 15:37:52 +00:00
Anders
02640a0b45 [GTP] Dissect eNodeB ID IE
Change-Id: I7b6800ca71c9a0d2be4f30be55b49eec237ac908
Reviewed-on: https://code.wireshark.org/review/8629
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-25 15:32:49 +00:00
Martin Kaiser
5dd44006b6 DVB-CI: kill the last two proto_tree_add_text() calls
Change-Id: I53f9df7bf193551e786ad4ece368f3de702ce8de
Reviewed-on: https://code.wireshark.org/review/8628
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-05-25 14:59:19 +00:00
Martin Kaiser
886b25e2bb iso7816: remove one proto_tree_add_text() call
Change-Id: I3905fb83f5f70ee80e54fba479c0e8caca5baa6c
Reviewed-on: https://code.wireshark.org/review/8627
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-05-25 14:58:58 +00:00
Martin Kaiser
16715e01b6 DVB-CI: remove NULL-checks for proto_item_append_text()'s first argument
Change-Id: I6648c20a003392a7435ca0461d2b004a1d415d51
Reviewed-on: https://code.wireshark.org/review/8626
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-05-25 14:58:29 +00:00
Martin Kaiser
e37a8050b6 jpeg: clean up the sos header dissection
Change-Id: Id3e6258036112a64e4111d0483c572697681eb89
Reviewed-on: https://code.wireshark.org/review/8625
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-05-25 14:58:01 +00:00
Graham Bloice
2fde6ffc8f Fix out of tree builds
Stop out of tree builds picking up the in-tree version and config.h

Change-Id: Icadc46cab66db72af2d475eac31b28d0ca10df90
Reviewed-on: https://code.wireshark.org/review/8204
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-25 10:42:59 +00:00
Anders
dc14e3ce0d [AIM] Fix string length
Change-Id: I64f73bd5cb131ad6efc64eea6a7eb66af9cee5c4
Reviewed-on: https://code.wireshark.org/review/8622
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-25 07:40:10 +00:00
Stephane Bryant
7410afb64e reload-framing: add range checks before bit-shifts
Change-Id: I1422b581157ffa389f121306de4dc9241ffb4061
Reviewed-on: https://code.wireshark.org/review/7595
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-25 04:37:22 +00:00
Andreas Gruenbacher
cc3a96c744 NFS: Remove the hidden acl, dacl, and sacl items
These attributes are already represented by hf_nfs4_reco_attr items.

Change-Id: Ib3804e2d30921764913f483863c003ffb55118ca
Reviewed-on: https://code.wireshark.org/review/8586
Reviewed-by: Evan Huus <eapache@gmail.com>
Petri-Dish: Evan Huus <eapache@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-25 04:30:45 +00:00
Michael Mann
df38a2d3a8 Remove proto_tree_add_text from AIM dissectors.
Change-Id: Ic7385d0555d72aa8ea2b9beb284ca1f6a115b174
Reviewed-on: https://code.wireshark.org/review/8616
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-05-25 04:19:37 +00:00
Michael Mann
f3ce5d2b4b Remove proto_tree_add_text from packet-osi-options.c and packet-esis.c
Change-Id: Ifb404f5bab58d06d7e1f0106f284c7ae9858a502
Reviewed-on: https://code.wireshark.org/review/8617
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-05-25 04:19:18 +00:00
Evan Huus
82bd00a5e5 ceph: remove an unnecessary DISSECTOR_ASSERT
coverity picked up on this being effectively dead code, and it's trivial to
prove it will never trigger

Change-Id: I5a2893671a764914f483d4ff6bcc835c9b0d3b28
Reviewed-on: https://code.wireshark.org/review/8615
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-05-25 03:49:09 +00:00
Michael Mann
80346da06c Remove proto_tree_add_text from packet-ehs.c
Change-Id: Ia56d41d3591f759619f13d6df679579f9d9888f7
Reviewed-on: https://code.wireshark.org/review/8621
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-05-25 03:17:14 +00:00
Michael Mann
9d67d9fb93 Make protocol name/key combo string filterable.
Change-Id: I1ff863d0a4e114223b8fe283b1dc894e39fcefd7
Reviewed-on: https://code.wireshark.org/review/8618
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-05-25 03:16:35 +00:00
Michael Mann
776ba4c7a6 Create a PTP/IP preference for "vendors" to break up the duplicate values in the ptp_opcode_names and ptp_respcode_names value_strings.
Bug: 8573
Change-Id: I65a71a2c12cda61ed4c4b52a8ea0441261782942
Reviewed-on: https://code.wireshark.org/review/8597
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-23 07:42:02 +00:00
Stig Bjørlykke
a34d696377 p1: Fixed do_address for extension attributes
This is not an optimal solution, but fixes the reported problem.
The do_address functionality should probably be rewritten to
only use pinfo for storing data.

Bug: 11210
Ping-Bug: 8515
Change-Id: I2625cc4044ab93b6e943a3c2d2ffd1b26149da29
Reviewed-on: https://code.wireshark.org/review/8585
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-22 16:11:45 +00:00
anilkumar911
3bc42dbf8e Netscaler: Add support to read MTCP record.
Change-Id: I73aadb10e44aa64c6f4c9cc2145a63f5bd9c74e5
Reviewed-on: https://code.wireshark.org/review/8580
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-22 16:10:30 +00:00
Anders
1942039466 [Diameter] Show Visited-PLMN-Id
Change-Id: If528f459535fde03bd936445113a3b12f34d42e5
Reviewed-on: https://code.wireshark.org/review/8590
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-22 16:08:51 +00:00
Martin Mathieson
1f994e89c2 ISAKMP: Add recent notify message types to range_string, and show names in notification root node
Change-Id: I3849868f6fbc8c5243757f6a39806365ca7a3609
Reviewed-on: https://code.wireshark.org/review/8587
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2015-05-22 14:34:41 +00:00
Joerg Mayer
8d36cda3ea Fix packet-ieee80211-radiotap-iter.c:159:36: runtime error:
left shift of 1 by 31 places cannot be represented in type 'int'

Change-Id: I0135b73c14bab05153a9ba2f5477f8651388037d
Reviewed-on: https://code.wireshark.org/review/8588
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2015-05-22 14:29:42 +00:00
Andreas Gruenbacher
78593c2e91 NFS: Fix NFSv4 attribute offsets and lengths
NFSv4 attributes are transferred as a bitmask, followed by each of the
attributes in the bitmask.  The offset and length of the dissected attribute
values should point at where the attribute values are; instead, they were
pointing at the bitmap. Fix that.

Change-Id: I4f93b7fffd7497306ae828a2fbd3c0e9b0accd1c
Reviewed-on: https://code.wireshark.org/review/8536
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-05-22 14:06:13 +00:00
Andreas Gruenbacher
03577f6ba4 NFS: Dissect NFSv4.1 dacl and sacl attributes
The NFSv4.1 dacl and sacl attributes consist of a 32-bit acl flags field,
followed by an access control list in the same format as the acl attribute.

Bug: 11208
Change-Id: I5fb08f9764c21cd6abb4ee02265e4e6b4ed54f01
Reviewed-on: https://code.wireshark.org/review/8526
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-05-22 14:05:37 +00:00
Alexis La Goutte
e6b5ae74c9 Diameter: fix indent (Use 4 spaces)
Change-Id: Ie82f243af15f6851021d297018005c672a3fb28b
Reviewed-on: https://code.wireshark.org/review/8584
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-05-22 12:38:22 +00:00
Anders
a0fcd0b726 [Diameter] Added feature list dissection for 3GPP Sh interface
Bug: 11218
Change-Id: I83838cc4af1d3eeaed04032c3127f2d4707d0fd3
Reviewed-on: https://code.wireshark.org/review/8583
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-22 11:09:06 +00:00
Anders
99e43f93f6 [Diamater] Sub dissect Suported-Vendor-Id
Change-Id: I5c0014449ef9886ba74abdf8f609860ef37a7831
Reviewed-on: https://code.wireshark.org/review/8582
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-22 11:08:34 +00:00
Anders
6b72a528e6 [SIP] Add hf for header Session-Id
Change-Id: I9b1dc7822fd1753d9b5af9c00a7eda928f423a67
Reviewed-on: https://code.wireshark.org/review/8581
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-22 10:19:50 +00:00
Peter Lemenkov
4fc571cde9 Cosmetic - adjust comments according to the proto
Change-Id: I75b422d3181e93e12d6758d891538fa9fea7d1f7
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
Reviewed-on: https://code.wireshark.org/review/8574
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-22 09:14:20 +00:00
Peter Lemenkov
b738857041 Typo
Change-Id: Ib50768ccca6e0354d287793ce639e28bee2c9865
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
Reviewed-on: https://code.wireshark.org/review/8573
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-22 09:13:28 +00:00
Peter Lemenkov
3ddbda55e8 Don't treat packets w/o line feed differently
Change-Id: I7ddd0ecf5e4f02f66b9fea528725a5e29c1062ea
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
Reviewed-on: https://code.wireshark.org/review/8572
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-22 09:10:55 +00:00
Peter Lemenkov
5addf12c5f Change unofficial extension parameter
A character "v" was mapped to a different command parameter. So we
should replace it.

Change-Id: Ia668b0b0bead7bb4c4ba0a60f51f53daf2095a36
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
Reviewed-on: https://code.wireshark.org/review/8571
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-22 09:08:48 +00:00
Jeff Morriss
4dfc5a7204 MSRP has a registered port now, register the dissector for it.
Presumably it got the port when it became an RFC.

Change-Id: I0afb815bcfe4b36b896fa6f7e62f93047a36b05b
Reviewed-on: https://code.wireshark.org/review/8576
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-05-22 08:07:36 +00:00
Guy Harris
2aea664d60 Expand a comment.
As either Grace Hopper or Andrew Tanenbaum, depending on which claim you
read, said, "The {wonderful,good} thing about standards is that there
are so many to choose from." Which standard for Lawful Intercept headers
do you want?

Change-Id: I8633e3d3e3d9a205f643d63980a80986e59d43f4
Reviewed-on: https://code.wireshark.org/review/8579
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-22 03:14:59 +00:00
Anders
0289d5c2b5 [NSIP GPRS-NS] Fix a crash due to not NULL terminated hf arrays for
proto_tree_add_bitmask().

Change-Id: I65adad6a33b3d6b199d54160bce85759a35607d6
Reviewed-on: https://code.wireshark.org/review/8575
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-21 15:33:23 +00:00
Anders
8999634b17 [GTP] Add a couple of new IEs as "Not dissected yet"
Change-Id: If7a083ab3a56801168853a43dff85e1066d6bec5
Reviewed-on: https://code.wireshark.org/review/8570
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-21 13:43:17 +00:00
Alexis La Goutte
90a1303846 802.11: Remove duplicate RIC Descriptor display
Change-Id: I0fa523dd0e62f94e478ad35b216fc3dc5651718c
Reviewed-on: https://code.wireshark.org/review/8547
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-21 06:11:13 +00:00
Pascal Quantin
22aa241eff MBIM: fix GSM SMS transmitted PDU length
Change-Id: I5568d6048f620f5332577e2cf0d36ffa20200ebf
Reviewed-on: https://code.wireshark.org/review/8556
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-05-20 20:41:36 +00:00
Pascal Quantin
af3cb5e06b PCEP: reorder pcep_class_vals extended value string
Change-Id: Iaa270bc085cbee41be9881eab2749c0ed26ef359
Reviewed-on: https://code.wireshark.org/review/8554
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-05-20 20:20:57 +00:00
Oscar Gonzalez de Dios
734032a38f Added support to RFC 6006, in particular, SERO and SSRO Objects and P2MP Endpoints Object.
Trailing whitespaces, indent and typo fixed, used value_string.
Fixed EOF Problem (Ubuntu Petri Dish failed)

Bug:11213

Change-Id: I4ecc11b17c34dd993a72903ad4314c51ada64e02
Reviewed-on: https://code.wireshark.org/review/8532
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-05-20 17:33:02 +00:00
Pascal Quantin
2acb57d703 GSM SMS: update some (value|range)_string tables for MTC Device Trigger feature
Change-Id: Iffc62744310688d2f5f4d6689ff2f9d96fd4f6f1
Reviewed-on: https://code.wireshark.org/review/8552
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-05-20 17:21:31 +00:00
Michael Mann
344c990159 Improve VN-Tag dissector.
Bug: 7496
Change-Id: Ic1648f1c111913b7370b2eaf5557c4d8ea078033
Reviewed-on: https://code.wireshark.org/review/8546
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-20 14:57:51 +00:00
Alexis La Goutte
390299c953 Aruba ERM: fix typo
Double space between Signal Strength and [percent]

Change-Id: Ibf645a9e44d2e642df8fd53afd0a6ccbbb2adde0
Reviewed-on: https://code.wireshark.org/review/8549
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-20 14:53:33 +00:00
cbontje
713ed3f817 Fixed Modbus RTU Serial message direction detection.
("And that, children, is why we always test different message types before submitting").

Change-Id: I29c730c01db4596a2326dcadfcffa3a20758569a
Reviewed-on: https://code.wireshark.org/review/8539
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-05-20 09:07:42 +00:00
Benjamin Roch
efe3486f83 Enhanced info output of packet-tte dissector.
Change-Id: I2df393e9913d3a52db632778410d7b8932f78f8b
Reviewed-on: https://code.wireshark.org/review/7637
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-05-20 09:06:00 +00:00
Martin Kaiser
b687f719a3 DVB-CI: change two proto_tree_add_text() calls into expert info
Change-Id: Ic5f87480273e0a097900ace6a7538c34b2a89444
Reviewed-on: https://code.wireshark.org/review/8545
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-05-20 07:54:44 +00:00
Martin Kaiser
2b68570100 DVB-CI: remove some more proto_tree_add_text() calls
Change-Id: I02349c2e7aa00c1b105ab069a9fe9b66d130bc7d
Reviewed-on: https://code.wireshark.org/review/8543
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-05-19 21:16:08 +00:00
Anders
1f34e047e4 [GTP]Target identification can have a length of 0.
Change-Id: Ica74dc4ce891f226c05d031c29465d386957edf4
Reviewed-on: https://code.wireshark.org/review/8541
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-19 19:53:18 +00:00
Guy Harris
c19b8eb7db Apparently "H" stands for "HOSC", not "HSC", at least these days.
Change-Id: I90807b5b40afa53fbfd31b48a322918ef4a7cc27
Reviewed-on: https://code.wireshark.org/review/8540
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-19 19:06:27 +00:00
Stig Bjørlykke
f1ea2fae57 p1: Handle OrganizationalUnitName
Added back code removed in commit for bug 8515.

Bug: 11210
Change-Id: I23bf56f88d8a1320da8404a82a8d9d3aacc3dace
Reviewed-on: https://code.wireshark.org/review/8537
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-05-19 12:13:48 +00:00
Alexis La Goutte
cff7bcd90b BGP: Remove proto_tree_add_text call
Part 2
Update VPLS-BGP and BGP-AD

Change-Id: I6a311bfc69d9666be6f83e38042745162701aaac
Reviewed-on: https://code.wireshark.org/review/8485
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-05-19 11:50:00 +00:00
Andreas Gruenbacher
75be35d8e3 NFS: Move attribute definitions higher up in the nfs dissector
The next commit will use some of these definitions before their (previous)
point of definition.

Change-Id: Ic7c96bc48d338bb7b44bf295af3fadc3e7bec370
Reviewed-on: https://code.wireshark.org/review/8525
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-05-19 11:34:02 +00:00
Michael Mann
a80c88a10f Improve Firebird/Interbase dissector.
Inspired by the patch in bug 3749, added better dissection of opcodes and better (but not complete) support of multiple messages in a frame.

Provided links to firebird source.

Bug: 3749
Change-Id: I403728d32d634c23e1af7ce842f9aaca4014ed78
Reviewed-on: https://code.wireshark.org/review/8494
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-05-19 02:35:08 +00:00
Martin Kaiser
376ba916d4 DVB-CI: remove proto_tree_add_text() calls from the appmmi resource
Change-Id: I422e8644445d7bb8a8ae43f426183db6b8974839
Reviewed-on: https://code.wireshark.org/review/8530
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-05-18 21:10:33 +00:00
Martin Kaiser
b4f895ced7 DVB-CI: remove proto_tree_add_text() calls from the operator profile resource
rename some variables and remove obsolete comments while we're at it

Change-Id: Ib400c371ea52c3681fbc1d25ef42791e4aeff9e4
Reviewed-on: https://code.wireshark.org/review/8529
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-05-18 21:10:00 +00:00
Martin Kaiser
fcb284db97 DVB-CI: remove proto_tree_add_text() calls from the transport layer
Change-Id: I593527fafa38312d5d4e8f778e9af0d6294bb3f8
Reviewed-on: https://code.wireshark.org/review/8528
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-05-18 21:09:30 +00:00
Martin Kaiser
f33aa0c6d4 DVB-CI: fix a TPDU parsing error
if the response TPDU starts with 0x80 (T_SB), this is not an unknown
tag, it simply indicates that the optional header and body are absent

this bug was introduced in e597acdc48

Change-Id: I076a0c9f0ea124e11edbb7a0bc0e41d1ab6f374a
Reviewed-on: https://code.wireshark.org/review/8527
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-05-18 21:08:57 +00:00
Guy Harris
9d5a9fb1ff Don't put the NTLMv2 ChallengeFromClient into the protocol tree twice.
It's already put there by dissect_ntlmv2_response(); no need to do it
again.

Also, rename "NTLM Client Challenge" to "LMv2 Client Challenge", as
that's what it is (ChallengeFromClient from 2.2.2.4 LMv2_RESPONSE), and
rename "Client Challenge" to "NTLMv2 Client Challenge", as that's what
*it* is (ChallengeFromClient from 2.2.2.7 NTLM v2:
NTLMv2_CLIENT_CHALLENGE).

Change-Id: If95e2c77323cb597df7e400bf9ffc045d94c60e2
Reviewed-on: https://code.wireshark.org/review/8524
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-18 17:18:26 +00:00
Guy Harris
65b17d4323 Reorganize the NTLMSSP blob and AUTHENTICATE message parsing.
The "result" argument to dissect_ntlmssp_blob() is never null, so don't
check for it being null.

Have separate clauses for LmChallengeResponse and NtChallengeResponse,
and do the checks for NTLMv1 vs. NTLMv2 inside those clauses.

Do the copy to client_challenge within the AUTHENTICATE message parsing
only if we've already determined that it's an NTLMv2 message.

Add some comments to better explain what's being done and to ask some
questions.

Change-Id: I52345eaeac4252d928b2e477751817084bf4e363
Reviewed-on: https://code.wireshark.org/review/8523
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-18 17:01:36 +00:00
Michal Labedzki
930f5b5402 Bluetooth: OBEX: Fix crash when there is no Type/Name header in request
Not all requests have them, so check for them to avoid crash.

Change-Id: I265fb8ad9f63132bee6eeb1aa521cae8b8df82b9
Reviewed-on: https://code.wireshark.org/review/8521
Reviewed-by: Michal Orynicz <michal.orynicz@tieto.com>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-05-18 12:03:10 +00:00
Alexis La Goutte
9b99bdb09f IPDR: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: Icf1686e9f1530a602ec5b03572be53d4f245d70c
Reviewed-on: https://code.wireshark.org/review/8520
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-05-18 11:18:22 +00:00
Alexis La Goutte
89b2e087cb IPDR: fix comma at end of enumerator list [-Wpedantic]
Change-Id: I4f78a3a15aa04c52042f7461d11b31c95f7e9590
Reviewed-on: https://code.wireshark.org/review/8519
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-05-18 11:16:54 +00:00
Alexis La Goutte
0215ad2bd4 fix make distcheck (add packet-bthci_sco.h to list of distributed file)
Don't forget to add *.h files to distributed file

Change-Id: I37459a4836e495f66185fd4d07306bb8963667f6
Reviewed-on: https://code.wireshark.org/review/8518
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-05-18 08:16:54 +00:00
Guy Harris
408de59e41 Fix a comment.
Change-Id: I0f777121a4897983a48794fcdfb13efc26266bdc
Reviewed-on: https://code.wireshark.org/review/8517
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-18 07:31:54 +00:00
Michal Labedzki
66e849eacf Ubertooth: Add WriteRegister command
Change-Id: Ie1cea754bcf732bf3985b777245e8b08606757f0
Reviewed-on: https://code.wireshark.org/review/8515
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-05-18 07:10:46 +00:00
Michal Labedzki
f837dab1b2 Bluetooth: HCI: Add command-event tracking
HCI Commands in most cases generate response in Event queue, so try
to map event to command and give user response time information.

Change-Id: Ib4956829b7d0064ab528aa3202f8f959d8d371b7
Reviewed-on: https://code.wireshark.org/review/8514
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-05-18 07:10:37 +00:00
Michal Labedzki
21b41e89dc Bluetooth: HCI: Add new LE Event numbers
New event will be added later, for now all number are useful.

Change-Id: I83b77627dfb0c511710c3080aaac0f6857f76137
Reviewed-on: https://code.wireshark.org/review/8513
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-05-18 07:09:54 +00:00
Michal Labedzki
ac747a3a5d Bluetooth: BTLE: Fix data handling from previous dissector
Check previous dissector before cast data parameter.
That also causes Head overflow too.

Change-Id: I8f6ce2ec183e4c757613fd7e1959d9d0e4cfc89e
Reviewed-on: https://code.wireshark.org/review/8512
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-05-18 07:09:47 +00:00
Michal Labedzki
72ea3b1ca2 Bluetooth: SCO: Add Stream Number generated field
It is used to distinguish SCO streams.
Stream Number increase any time when new SCO connection is created.

Change-Id: I6cf68914112980cdbad345e52469bf2baf214551
Reviewed-on: https://code.wireshark.org/review/8510
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-05-18 07:09:15 +00:00
Michal Labedzki
f169900be9 Bluetooth: SCO: Add Connect/Disconnect tracking
Change-Id: I4db44628d60ec8ae22b625649e971b344f450ed9
Reviewed-on: https://code.wireshark.org/review/8509
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-05-18 07:09:04 +00:00
Michal Labedzki
586ce7c77e Bluetooth: SCO: Add Missing fields
Missing fields are: Reserved, Packet Status.

Change-Id: Ia9edb23e3fc8c45d12931200dd02f0d3eef87c48
Reviewed-on: https://code.wireshark.org/review/8508
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-05-18 07:08:45 +00:00
Michal Labedzki
187dedee03 Bluetooth: ATT: Enable UUID128 field
API used by this field is implemented, so field can be enabled now.

Change-Id: Ifc8de81157c9b125ba769d14ec57a498d9810c5f
Reviewed-on: https://code.wireshark.org/review/8507
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-05-18 07:08:33 +00:00
Michal Labedzki
b936c23ecd Bluetooth: OBEX: Add DecodeAs by Type aka MIME Type
Also map some Types to Dissector Table dissectors.

Change-Id: I1a1924924ac569368b3a4fafdc05c98e4a8d4841
Reviewed-on: https://code.wireshark.org/review/8506
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-05-18 07:08:23 +00:00
Michal Labedzki
381a8c3454 Bluetooth: OBEX: Add Current Path tracking info
It will be useful for analysis. Also support partialy known path,
unknown part is shown as "?".

Change-Id: I0299e64d233022d1941b364afc4a6be0c9f4d23e
Reviewed-on: https://code.wireshark.org/review/8505
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-05-18 07:08:05 +00:00
Evan Huus
4a4871a831 ntlmssp: swap bounds check and length for memcpy
The values make more sense swapped (and the code is super-old) so I'm assuming
this was just a long-uncaught typo. Fixes a valgrind error at any rate.

Also replace a malloc+memcpy with a memdup for simplicity.

Bug: 11203
Change-Id: I74c0aff548b844cf90610db56a143f3eac172658
Reviewed-on: https://code.wireshark.org/review/8493
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>
2015-05-18 01:57:54 +00:00
Guy Harris
d934d40f96 Update some comments.
There's all sorts of interesting stuff out there on the Intertubes if
you happen to be searching for the right thing.

Change-Id: Ib5e18ece5dfaa284ece8cfda23887a9408c8318e
Reviewed-on: https://code.wireshark.org/review/8503
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-17 21:50:19 +00:00
Michael Mann
ba3f9f594d Add IPDR dissector
Bug: 2771
Change-Id: Ic2904c981a182be5859c3840025e7ffa9ea387ed
Reviewed-on: https://code.wireshark.org/review/8501
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-05-17 21:45:39 +00:00
Guy Harris
36af2c61e8 Improve comments, fix capitalization of "Aruba".
Give better comments describing the 5 different formats Aruba equipment
can use.

It's "Aruba Networks", not "ARUBA" anything.

Change-Id: I300d77375e8182b60e830cb545d8802c1a49569c
Reviewed-on: https://code.wireshark.org/review/8500
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-17 19:43:19 +00:00
Guy Harris
83787bb6ee Make the human-readable names the same in the preferences and the packets.
Change-Id: Ie00c81e9893412cc322cfb08e8b5b5f4e5ce47e4
Reviewed-on: https://code.wireshark.org/review/8499
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-17 19:20:30 +00:00
Guy Harris
e16d37b8d9 Update a URL.
Change-Id: I51e884815a83bd44b528d5dd86f98d0ea51719f9
Reviewed-on: https://code.wireshark.org/review/8498
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-17 18:18:11 +00:00
Alexis La Goutte
7b2453a862 HTTP2: Update to final RFC
Change-Id: I0b19d4576b652dc9dd94346c75945e0bdc554a0e
RFC7540: Hypertext Transfer Protocol Version 2 (HTTP/2)
RFC7541: HPACK: Header Compression for HTTP/2
Reviewed-on: https://code.wireshark.org/review/8478
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-05-17 15:03:51 +00:00
Joerg Mayer
53b7a059a2 packet-skinny.c is a generated file nowadays.
Apply commit 0970872a4c to the source file
as well.

Change-Id: I9cc69bf5de3318b9a930bde3455a320880976af7
Reviewed-on: https://code.wireshark.org/review/8492
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2015-05-17 07:15:19 +00:00
Alexis La Goutte
b4a68bcd49 SIP: Fix typo lenght => length
Change-Id: Ib533bd2526c27cf5f1161616fcf52136e40c827a
Reviewed-on: https://code.wireshark.org/review/8484
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-05-16 20:55:51 +00:00
Evan Huus
185697ad9a megaco: handle missing tokens
Fix an infinite loop when no transaction end offset is present and
`megaco_tvb_find_token` returns -1.

Bug: 11193
Change-Id: I82c7b795e522efca674787e504427f64b8c28fc4
Reviewed-on: https://code.wireshark.org/review/8483
Reviewed-by: Evan Huus <eapache@gmail.com>
Petri-Dish: Evan Huus <eapache@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-05-16 20:52:10 +00:00
Pascal Quantin
3acebb469a MBIM: add checks on the maximum string or PDU size allowed
Change-Id: I10912bbe5a4ee38732a200b595b8d34dfa40c698
Reviewed-on: https://code.wireshark.org/review/8475
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-05-15 17:49:38 +00:00
Pascal Quantin
97f1fd3626 USB COM: add dissection of Ethernet Networking Functional Descriptor
Change-Id: Id5023090b5b80ca12695fc9e012a59f53b30479c
Reviewed-on: https://code.wireshark.org/review/8461
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-05-14 17:23:36 +00:00
cff339
f11def94b1 GSM A RR: fix 'packet channel description' dissection
It should support decoding 'MA_NUMBER_IND' and 'CHANGE_MARK_1'.

Signed-off-by: cff339 <cff339@gmail.com>

Change-Id: I634f326b4741b8853a631e6da2e9c056f60781ef
Reviewed-on: https://code.wireshark.org/review/8458
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-05-14 10:28:11 +00:00
Guy Harris
0db5490f26 Register the IPv4 and IPv6 dissectors directly with WTAP_ENCAP_RAW_IP{4,6}.
No need to run them through the "raw IP" dissector.

Change-Id: I63639651873f00326a20b88a08ecb4ab3b9a83b3
Reviewed-on: https://code.wireshark.org/review/8459
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-14 07:47:17 +00:00
Jeff Morriss
2ddf0e6db3 Don't put an expert info on every single raw frame (even if it was just a Note).
It's completely normal that there's no link information when you're dissecting
raw packets.  This does leave the Raw protocol tree without any children
(which looks a little funny) but I don't want to take it out and I don't see
anything useful to put under it.

Also change the Raw protocol item to cover all the bytes of the TVB (like the
frame item).

Change-Id: I44c1ac954c9989273d0c461ba366caba0a480ea6
Reviewed-on: https://code.wireshark.org/review/8454
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-05-14 01:46:48 +00:00
AndersBroman
cf82e68d58 [Thrift] Strengthen the heuristic.
Change-Id: I9e0676f36f8c5cb7fb344640333c8d32990e0a1e
Reviewed-on: https://code.wireshark.org/review/8452
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-13 15:59:09 +00:00
Francesco Fondelli
46d89bd27f PCEP: fix SID parsing, label is the first 20 bits
Change-Id: I13d2ff79b171b232dd4e1e1082beeae2e36dec51
Signed-off-by: Francesco Fondelli <francesco.fondelli@gmail.com>
Reviewed-on: https://code.wireshark.org/review/8451
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-13 15:10:55 +00:00
Alexis La Goutte
232f260050 MEGACO: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: Iee615c46fcb5dd0ced55d971c5f70bc7c970f9a6
Reviewed-on: https://code.wireshark.org/review/8448
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-13 12:37:00 +00:00
Guy Harris
1e4aa6cbcd Remove trailing whitespace.
Change-Id: I7be78c8759255f14efd1b794bfefad9a18428670
Reviewed-on: https://code.wireshark.org/review/8444
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-12 22:23:50 +00:00
Guy Harris
613d4f385c More cleanly handle 3-byte IPv4 addresses.
Make a union of the 4 bytes of the address and the address as a 32-bit
integer, and fill in the bytes differently based on whether it's an
interior or exterior route.  Rather than just casting a pointer to a
byte to a pointer to a 4-byte integer - which may not be safe, as the
byte array might not be properly aligned - just use the integer member
of the union.

Change-Id: Ic0e78a832cedb9a5a8d435a6c911409b17e41685
Reviewed-on: https://code.wireshark.org/review/8443
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-12 22:22:07 +00:00
Gerald Combs
384141b4f9 Add casts to fix clang warnings.
Change-Id: I0059536cb68fb3ef313f3166bf18444a89b4eea3
Reviewed-on: https://code.wireshark.org/review/8442
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-05-12 22:10:21 +00:00
Guy Harris
e16500e80f Fix check for NUL at the end of a string.
*seq[slength - 1] means *(seq[slength - 1]), where seq points to a
"const gchar *", so it fetches the pointer at an offset of slength - 1
from the pointer to which seq points, and dereferences that pointer.
What's wanted is (*seq)[slength - 1], i.e. fetch the pointer to which
seq points, and fetch the byte at an offset of slength - 1 from the byte
to which said pointer points.

Change-Id: I7246f5e6093d035bad59be530893f3fc54dad97e
Reviewed-on: https://code.wireshark.org/review/8441
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-12 22:10:13 +00:00
Pascal Quantin
79ba6e6d53 OSPF: fix dissection of Router Address TLV
Bug: 11190
Change-Id: Ic6585e44767c1c80a7090dc94205eb33cf15c083
Reviewed-on: https://code.wireshark.org/review/8437
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-05-12 21:58:00 +00:00
Pascal Quantin
2e7ec36cd8 USB: allow to call sub dissectors for setup response packets without transaction available
This is useful when people export displayed packets of a USB sub dissector (like MBIM) without keeping
the USB setup requests and still expect to have "Decode As" functionality working

Change-Id: Iad32ddc7b87544ff568a091f03e393a106f38554
Reviewed-on: https://code.wireshark.org/review/8430
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-05-12 17:59:15 +00:00
Alexis La Goutte
8de774af16 PIM: Add PIM IP version field for PIMv1 too
Change-Id: I455a4f81798c7a99a48551ae362dabf2b697cf88
Reviewed-on: https://code.wireshark.org/review/8427
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-05-12 15:25:21 +00:00
Michael Mann
e1106646cd Overhaul the MEGACO dissector.
1. Have megaco dissector display fields as their are "interpreted", not as raw data with "interpretation" as a subtree
2. Replace/remove proto_tree_add_text
3. Convert some "numeric string fields" into numeric values.
4. Add some more dissection discovered while looking for sample captures.

Bug: 6732
Ping-Bug: 10909
Change-Id: Ie051a8a16ef2355681a24be8789bae0971632cd1
Reviewed-on: https://code.wireshark.org/review/8382
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-12 15:11:00 +00:00
Alexis La Goutte
8f962a70de PIM: Remove trailing whitespace before comma
Change-Id: I7798ddd6db4a98cfe9cc96275f56837ef3bf0b1e
Reviewed-on: https://code.wireshark.org/review/8399
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-12 15:00:06 +00:00
Alexis La Goutte
2943acdff5 PIM: Enhance code
Use proto_tree_add_item when it is possible
Add display of reserved field...

Change-Id: Id47c237f06e28e7d5dfbd92848dc26a7496cf799
Reviewed-on: https://code.wireshark.org/review/8398
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-12 14:58:42 +00:00
Alexis La Goutte
1aad9e051f PIM: Remove proto_tree_add_text
rewrite display of PIM(v1) Address and remove last proto_tree_add_text call :)

Change-Id: I020970e80338d15dbe68e32713b8ada31fd0a4e2
Reviewed-on: https://code.wireshark.org/review/8397
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-12 14:55:57 +00:00
Alexis La Goutte
92694a4b7b PIM: Remove proto_tree_add_text
only 2 proto_tree_add_text calls, (it will be remove on another patch)

Change-Id: I670e37bbbe1cc3ae740a94cd620fa14f20cb9feb
Reviewed-on: https://code.wireshark.org/review/8396
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-05-12 13:33:35 +00:00
Jeff Morriss
d1f78230c9 Fix Diameter reassembly when the captured tvb length is less than 5 bytes.
Since Diameter does heuristic checks before calling tcp_dissect_pdus() we
have to "manually" ask for more data if the tvb is too short for our
heuristics.

Bug: 11183
Change-Id: I14c36042306b532b53df80cc3971866b76094084
Reviewed-on: https://code.wireshark.org/review/8405
Reviewed-by: Evan Huus <eapache@gmail.com>
Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-05-12 13:09:41 +00:00
Pascal Quantin
cc3a66a309 MBIM: fix dissection of captures taken on a Linux host
- ensure that MBIM tree is not below URB setup one
- do not try to dissect an empty tvb

Change-Id: I8c6655727eec7df84882fd861d5581848340e0f3
Reviewed-on: https://code.wireshark.org/review/8410
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-05-12 11:35:40 +00:00
Pascal Quantin
d3dbb2b33a USB COM: add dissection of ECM Management Element Notifications
Change-Id: I9395c5e7974526d9be5cceca479e840dca5ff71e
Reviewed-on: https://code.wireshark.org/review/8409
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-05-12 11:35:19 +00:00
Guy Harris
2693e1d108 In the name of God and all that is holy, don't do that.
http://www.bitterfilms.com/rejected.html

1) There is *NO* guarantee that you can safely dereference a misaligned
pointer.

2) There is *NO* guarantee that you are running on a little-endian
machine, so that an attempt to fetch a 32-bit integer through such a
pointer will fetch it in little-endian form.

Instead, fetch it using tvb_get_letohl(), which 1) doesn't care about
alignment and 2) always fetches in little-endian order.

Change-Id: I44721cbf3c4456797990cc741836c9dd8c6c3696
Reviewed-on: https://code.wireshark.org/review/8423
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-12 02:42:58 +00:00
Guy Harris
5862c94e90 In the name of God and all that is holy, don't do that.
http://www.bitterfilms.com/rejected.html

1) There is *NO* guarantee that you can safely dereference a misaligned
pointer.

2) There is *NO* guarantee that you are running on a little-endian
machine, so that an attempt to fetch a 32-bit integer through such a
pointer will fetch it in little-endian form.

Instead, fetch it using tvb_letohl(), which 1) doesn't care about
alignment and 2) always fetches in little-endian order.

Change-Id: I30ad6607b7c6d5047245bfcfdcbe757b02d02172
Reviewed-on: https://code.wireshark.org/review/8422
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-12 00:22:57 +00:00
Guy Harris
0970872a4c Don't cast pointers when they're assigned to the data field of an address.
That field is just a void *, so there's no need to cast them, and at
least one of those casts generates alignment warnings with -Wcast-align.

Change-Id: I88e22a794a8c990b01e7ed8f45951a2665febbc1
Reviewed-on: https://code.wireshark.org/review/8421
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-12 00:15:20 +00:00
Guy Harris
61749e5450 Get rid of now-empty and unneeded structure.
Change-Id: I4c557c49a6d6013dff129515cdfadb496529ff35
Reviewed-on: https://code.wireshark.org/review/8414
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-11 22:46:02 +00:00
Guy Harris
8045cd6481 Do not assume the data field of an address structure is an aligned pointer.
There is *no* guarantee that it's aligned on a 4-byte boundary, and
there is *no* guarantee that you can safely dereference an unaligned
pointer.  See bug 11172 for a crash on Solaris/SPARC caused by those
assumptions both being false.

Change-Id: I30d97aebd42283545f5b8f6d50fa09c5b476ec47
Reviewed-on: https://code.wireshark.org/review/8412
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-11 22:11:21 +00:00
Guy Harris
e3e5d3032e Pull the MIMO control code into the beamforming report code.
Hopefully, that'll convince Microsoft's static analyzer that nr will
always be >= 1, so you can safely subtract 1 from it and use it as an
array index.

Get rid of the vht_mimo_control_t structure in favor of a few variables
for the bitfields we actually use.

Make some tables static - no need to initialize them every time we enter
the routine.

Change-Id: Icde05a768ea1a9c897b69003afcab1dddeffaaf5
Reviewed-on: https://code.wireshark.org/review/8411
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-11 21:58:45 +00:00
Francesco Fondelli
2c96aacef3 MPLS PM: add timestamp2 field decoding
Bug: 11180
Change-Id: I28e8d72d80047a08f754593327bdd5900633574a
Signed-off-by: Francesco Fondelli <francesco.fondelli@gmail.com>
Reviewed-on: https://code.wireshark.org/review/8395
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-05-11 15:40:46 +00:00
Alexis La Goutte
87bfae7ec4 BGP: Remove proto_tree_add_text call
Part 1

Change-Id: Icbc73690370eba07e77b35d2815346f1d5a44347
Reviewed-on: https://code.wireshark.org/review/8386
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-05-11 14:25:28 +00:00
Evan Huus
f1e736772b giop: ignore NULL-terminator in CDR strings
CDR strings appear to be both counted *and* NULL-terminated in many cases,
which is rather weird, so if we see a NULL-terminator, ignore it in the count;
otherwise we print a trailing '\000' on all the strings we put in the tree.

Bug: 11126
Change-Id: I45b6b414683a6f646d37c2e2001b7319d5c80be5
Reviewed-on: https://code.wireshark.org/review/8390
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-11 04:28:24 +00:00
cjdunlop
e997aaabe9 packet-cipmotion.c: Modified CIP motion parser
Modified CIP Motion parser to include newly-defined Axis Safety related
fields in the status data set section.

Change-Id: I70c6dd345ae9353b87e6f7c1300b60687f41a1f6
Reviewed-on: https://code.wireshark.org/review/8342
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-11 04:26:57 +00:00
Pascal Quantin
040641dc59 Copy PTK key in its dedicated array, and not at the address of the array
While we are at it, put back some debug logs that were removed in g1439eb6 (otherwise msgbuf is no more initialized)

Change-Id: Ie34c4f2e638bc3ee77a0565446de37a15385dc0d
Reviewed-on: https://code.wireshark.org/review/8389
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-05-10 19:48:52 +00:00
Martin Kaiser
b230a03306 ZVT: show positive, negative completion in the info column
Change-Id: I2488a505e6634da5cbcaf2e86505414d34823b8e
Reviewed-on: https://code.wireshark.org/review/8381
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-05-10 15:54:51 +00:00
Martin Kaiser
b105ce27eb DVB-CI: remove some more proto_tree_add_text() calls
Change-Id: If2f5ee4629b48fe0ffbe76c49952de8fb14fb64e
Reviewed-on: https://code.wireshark.org/review/8380
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-05-10 15:52:15 +00:00
Gerald Combs
af7bdfcbee [Automatic update for 2015-05-10]
Update manuf, services enterprise-numbers, translations, and other items.

Change-Id: I9ee8a6cb84ceb23340af3562cfa9927357319ee6
Reviewed-on: https://code.wireshark.org/review/8376
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-05-10 15:07:36 +00:00
Mikhail Koreshkov
c1567a0948 Q931: separate ett for each information element
Add separate ett for all possible information elements.
It's better to expand only necessary subtree but not all

Change-Id: If84359e28547ce5dcf753dc1bee691ece7f29ace
Reviewed-on: https://code.wireshark.org/review/8054
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
2015-05-10 11:18:12 +00:00
Guy Harris
acf7985f73 Define the SHA-1 digest length in wsutil/sha1.h and use it.
Hopefully that'll make it a little easier to make sure that we're not
overflowing arrays.

Change-Id: I770df045ef9a45fd486c1271ea424b3334bb39d2
Reviewed-on: https://code.wireshark.org/review/8370
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-09 23:36:11 +00:00
Alexis La Goutte
89f0c5e7c8 ICMP: Fix Logically dead code (CID 1295678)
Mistake when remove proto_tree_add_text calls

Change-Id: I820264b7a90a2563f846b6e6472416cd3e3278a4
Reviewed-on: https://code.wireshark.org/review/8368
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-05-09 17:48:23 +00:00
Francesco Fondelli
652f5ad173 PCEP: Update to last draft
- fix PLSP-ID parsing, is a 20 bits field
- fix SID parsing, is in network order on the wire
- fix PATH-SETUP-TYPE and SR-PCE-CAPABILITY code points

Change-Id: If26035181462a9cad77a4a594aab3c007b4d00a2
Signed-off-by: Francesco Fondelli <francesco.fondelli@gmail.com>
Reviewed-on: https://code.wireshark.org/review/8351
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-05-09 16:57:37 +00:00
Jamil Nimeh
6cf626e3ad SSL: fix dissection of CertificateStatus message with OCSP_MULTI
Bug: 11181
Change-Id: I05769e254f2e276e1594d7ed5cb50496e16cfc2f
Reviewed-on: https://code.wireshark.org/review/8356
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-05-09 07:44:55 +00:00
Martin Mathieson
9f613e3305 RRC: add domain and release cause information to the INFO column.
Change-Id: If0bee7f283d6c4dd44618221d528fb55e30f510a
Reviewed-on: https://code.wireshark.org/review/8353
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-09 07:16:41 +00:00