Commit Graph

32925 Commits

Author SHA1 Message Date
Dario Lombardo 53c91974c7 kismet: use cast in ws_strtou.
Fix the warning:

packet-kismet.c: In function 'dissect_kismet':
packet-kismet.c:242:58: error: passing argument 3 of 'ws_strtou64' from incompatible pointer type [-Werror]
       if (ws_strtou64(format_text(line, tokenlen), NULL, &t.secs)) {
                                                          ^
In file included from packet-kismet.c:34:0:
../../wsutil/strtoi.h:49:24: note: expected 'guint64 *' but argument is of type 'time_t *'
 WS_DLL_PUBLIC gboolean ws_strtou64(const gchar* str, const gchar** endptr, guint64* cint);

Change-Id: Ifd31de22db22f39f78359cc9432eb7da187f73a6
Reviewed-on: https://code.wireshark.org/review/17990
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Uli Heilmeier <openid@heilmeier.eu>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
2016-09-30 13:57:51 +00:00
Anders Broman c5655dcfbf Revert "LLDP: fix indent (use tab)"
This reverts commit f97372bfcc.

Change-Id: I750b232fa710e64815875671e713533bb0f42e24
Reviewed-on: https://code.wireshark.org/review/17995
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-09-30 11:54:03 +00:00
Alexis La Goutte f97372bfcc LLDP: fix indent (use tab)
Change-Id: I7f9aa2733401fc99a10d5d5a83a175e923562f50
Reviewed-on: https://code.wireshark.org/review/17991
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-09-30 11:27:12 +00:00
Daniel Willmann fdbf443d27 Add dissector for the osmux protocol
The Osmux protocol bundles multiple AMR frames inside one UDP packet to avoid
the overhead of having one IP/UDP/RTP packet per AMR frame. It is used by the
osmocom project.

Sponsored-by: On-Waves ehf
Change-Id: I8fb21e54adec8d8bd7ac5ebd2154100a73ab71c9
Reviewed-on: https://code.wireshark.org/review/16996
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-09-30 03:10:33 +00:00
Birol Capa 11da041bab LLDP: Update column info according to PROFINET requirements
Column information of LLDP frames should be updated according to PROFINET
requirements without changing the default behavior of column information.

Therefore, a new protocol setting is added.
This setting is used to display PROFINET specialized column information:
Edit-> Preferences -> Protocols -> Select LLDP

Bug: 12937
Change-Id: I48b78d0a3f6b3425f6f9c1d4be20dc24b143346d
Reviewed-on: https://code.wireshark.org/review/17081
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-09-30 00:21:17 +00:00
Dario Lombardo d86214e867 kismet: use ws_strtou64.
Add also an expert info when the time is invalid.

Change-Id: I8b3639aade41574cf1bda38f3ae1d02b09d0711c
Reviewed-on: https://code.wireshark.org/review/17678
Reviewed-by: Dario Lombardo <lomato@gmail.com>
2016-09-29 13:52:49 +00:00
Benjamin Parzella 85df9217f0 Added HSMS dissector
Bug: 12942
Change-Id: I69ab22caa9938167db421ca2f0346ca086280823
Reviewed-on: https://code.wireshark.org/review/17890
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: Dario Lombardo <lomato@gmail.com>
2016-09-29 13:46:49 +00:00
AndersBroman c205bce8ef proto.c use g_list_prepend when adding heuristic dissectors and plugins.
Change-Id: If55938f0bad556a002fc85466c0b4f0e904991dc
Reviewed-on: https://code.wireshark.org/review/17981
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>
2016-09-29 12:55:21 +00:00
Alexis La Goutte b3166fd87c TLS: Fix indent of SNI hello extension
use 4 spaces

Change-Id: I0cbde19997f51046e6d5f22213b994a94a2998d6
Reviewed-on: https://code.wireshark.org/review/17978
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-09-29 08:46:34 +00:00
Uli Heilmeier 12d55fb917 TCP: Fix next sequence number for SYN/FIN packets with payload
The next sequence number is off by one when there is TCP payload
in a SYN or FIN packet (e.g. when using TCP FastOpen).

Bug: 12579
Bug: 12838
Change-Id: Idb68cea4b4dcba39461019c08db09367cbfc6d68
Reviewed-on: https://code.wireshark.org/review/16239
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-09-29 02:48:11 +00:00
Sergey Avseyev ef2aae1d8c packet-couchbase.c: dissect body of DCP_FAILOVER_LOG response
Change-Id: Icbadcc83b5fedea4373d4c65a11700d73b3dc32e
Reviewed-on: https://code.wireshark.org/review/17972
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-09-29 01:55:53 +00:00
Dirk Jagdmann 14be63a807 set PDML and PSML encoding to UTF-8. replace fputs() with fprintf() in writing PSML and PDML preambles for more consistent code formatting.
Change-Id: I57dbb27cbf935dd31342639b315d1fc98bd27d77
Reviewed-on: https://code.wireshark.org/review/17895
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-09-29 01:20:05 +00:00
Parav Pandit 7aa243c0c7 packet-infiniband: Fix setting rocev2 udp port number
This patch sets RoCE-v2 (RRoCE) UDP port number to right value of
4791 as assigned by IANA described in below link.

http://www.iana.org/assignments/service-names-port-numbers/service-names-port-numbers.xhtml?search=RoCE#InfiniBand_Trade_Association

Change-Id: I97b82fb53fd63d9107ee5d4c64b94840e743fc72
Tested-by: pandit.parav@gmail.com
Reviewed-on: https://code.wireshark.org/review/17971
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-09-29 00:54:13 +00:00
Simon Zhong f72f937623 pcep: Added rfc 7334 support.
Updated PCEP-ERROR Object Error Types and Values base on Path Computation Element Protocol (PCEP) Numbers 2016-08-09 version

Change-Id: Ife0b49119a2b634279e33ab8f699a5dc57ecb34b
Reviewed-on: https://code.wireshark.org/review/17957
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-09-28 14:44:32 +00:00
Dario Lombardo 4f636d100e eap: check scanf return value (CID 1373396).
Change-Id: I4b602110fc3959dd7214fe15e9c37e3870794c1d
Reviewed-on: https://code.wireshark.org/review/17967
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
2016-09-28 13:17:36 +00:00
AndersBroman 148e4f77e9 When regestering taps, only loop trough the list of taps once when adding
new taps.

Change-Id: Ida5ad2375c95664ee1b911d265cb69672db2be2d
Reviewed-on: https://code.wireshark.org/review/17964
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>
2016-09-28 12:36:26 +00:00
Pascal Quantin 152e245804 proto_tree_add_item_ret_(u)int/proto_tree_add_bitmask_with_flags_ret_uint64: return real value
Apply mask and bit shift on the returned value.

Change-Id: I00aebc854756f01a25199a259d6d5252abea4349
Reviewed-on: https://code.wireshark.org/review/17958
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-09-28 06:07:01 +00:00
AndersBroman 5972c3d529 [proto.c] proto_all_finfos(), pre-allocate array to hold all fields.
Change-Id: I0d41e417e57e656ccee1c2ce6bd406af4ed23d10
Reviewed-on: https://code.wireshark.org/review/17948
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>
2016-09-27 10:20:20 +00:00
Alexis La Goutte d39d272e80 TLS(1.3): Add Early Data (42) Hello extension
Bug:12779
Change-Id: I97470c6e6be6e3df707cf2f3634f2c1e9da26bc2
Reviewed-on: https://code.wireshark.org/review/17885
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-09-27 03:53:44 +00:00
Peter Wu b5eb01c1a5 ssl: fix crash when setting RSA key file without valid protocol
If ssl_association_add is passed a NULL app_handle argument, it will
trigger DISSECTOR_ASSERT which fails due to the bad wmem scope
(wmem_packet_scope). Arguably DISSECTOR_ASSERT should not be used there,
but its alternative is g_warning/g_assert are not much different...

Fix the crash (assertion failure) by checking that the UAT-supplied
protocol is really valid. Normally the post_update_cb should not be
invoked if any of the fields are invalid, but that requires larger
changes in the Qt UAT dialog code.

Change-Id: Ie245213b650b1de9640db8dadd08f3ed2bff335f
Reviewed-on: https://code.wireshark.org/review/17906
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>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-09-27 03:49:39 +00:00
Simon Zhong 7bca5e1688 pcep: Added missed pieces of RFC 6006 support.
Added display Object-Type number in string.

Change-Id: Icbb44aae2379f308f49bef7355e8c8c901889c15
Reviewed-on: https://code.wireshark.org/review/17910
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>
2016-09-27 03:47:08 +00:00
Mirko Parthey e239f72585 ISAKMP: Rename identifiers and change item labels
Rename identifiers and change item labels to reflect their purpose:
* ISAKMP Phase 1 = IKE
* ISAKMP Phase 2 = IPsec
* IKEv2 Attribute = Transform Attribute
Remove "transform" and "type" where they do not apply.

External users of isakmp.tf.* field names, such as display filters,
have to be updated after this commit to use isakmp.ipsec.* instead.

old                                     new
--------------------------------------------------------------------
dissect_transform_attribute()           dissect_ipsec_attribute()
dissect_transform_ike_attribute()       dissect_ike_attribute()

ISAKMP_                                 IPSEC_

hf_isakmp_tf_attr                       hf_isakmp_ipsec_attr
isakmp.tf.                              isakmp.ipsec.

transform_ike_attr_type                 ike_attr_type
transform_isakmp_attr_type              ipsec_attr_type
transform_attr_sa_life_type             attr_life_type
transform_dh_group_type                 dh_group
transform_attr_encap_type               ipsec_attr_encap_mode
transform_attr_auth_type                ipsec_attr_auth_algo
transform_attr_ecn_type                 ipsec_attr_ecn_tunnel
transform_attr_ext_seq_nbr_type         ipsec_attr_ext_seq_nbr
transform_attr_addr_preservation_type   ipsec_attr_addr_preservation
transform_attr_sa_direction_type        ipsec_attr_sa_direction
transform_attr_enc_type                 ike_attr_enc_algo
transform_attr_hash_type                ike_attr_hash_algo
transform_attr_authmeth_type            ike_attr_authmeth
transform_attr_grp_type                 ike_attr_grp_type

Type Payload                            Payload
Transform IKE Attribute Type            IKE Attribute
Transform Attribute Type                IPsec Attribute
Transform IKE2 Attribute Type           Transform Attribute
Config Attribute Type                   Config Attribute
ISAKMP (v1)                             IKEv1
ISAKMP (v2)                             IKEv2
--------------------------------------------------------------------

Change-Id: Ib02a0bad100f932a290cae35ea4bd75b191f797b
Reviewed-on: https://code.wireshark.org/review/17914
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>
2016-09-27 03:44:17 +00:00
AndersBroman 1a384ef416 [proto.c] Add proto_find_first_finfo() to find first occurance of a field.
Change-Id: I11f50d7b00851880f77067260e2496175d227e76
Reviewed-on: https://code.wireshark.org/review/17937
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>
2016-09-27 03:39:28 +00:00
Guy Harris 06352a27b1 Reorganize the source lists.
For the different classes of generated dissectors, have
CLEAN_xxx_DISSECTOR_SRC with the ones that compile without warnings,
DIRTY_xxx_DISSECTOR_SRC for the ones that get warnings, and
xxx_DISSECTOR_SRC which is the combination of the two.

Add a new NCP2222_DISSECTOR_SRC for the packet-ncp2222.c dissector
generated by tools/ncp2222.py.  Add a new source group for it.

Move register.c to DISSECTOR_SUPPORT_SRC.  Get rid of
DISSECTOR_GENERATED_FILES; it's kind of a "none of the above" category,
and we now have an "above" for all files.

Include NCP2222_DISSECTOR_SRC in DISSECTOR_FILES.

Add an ALL_DISSECTOR_SRC that includes DISSECTOR_FILES and
CORBA_IDL_DISSECTOR_SRC (why are those kept separate?).  Use it for the
list of files we use to generate register.c.

Add NCP2222_DISSECTOR_SRC to CLEAN_FILES.

(Hopefully this makes it less likely that we'll forget to use -Werror
for clean dissector files or forget to use them to generate register.c.)

Change-Id: Ib9a7d10e1b9045516ef1f014046c6ff777c42be2
Reviewed-on: https://code.wireshark.org/review/17944
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-09-26 22:47:28 +00:00
Peter Wu 7b279d26aa Register ncp2222 dissector
Otherwise a lot of ncp fields are missing.

Bug: 12945
Fixes: v2.1.0rc0-2918-g2e23b50 ("Add checkAPI calls to CMake.")
Change-Id: Ic46dc12c9a98b38d78ef988c0ce71f38e3163549
Reviewed-on: https://code.wireshark.org/review/17941
Petri-Dish: Jim Young <jim.young.ws@gmail.com>
Reviewed-by: Jim Young <jim.young.ws@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-09-26 17:24:47 +00:00
Peter Palúch 0850c1f1db BGP: Support for Cost, EIGRP and OSPF extended communities
Bug: 12891
Change-Id: I70ed7f8a08122c559128b8df4d65e03be8201e1a
Reviewed-on: https://code.wireshark.org/review/17683
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Palúch <Peter.Paluch@fri.uniza.sk>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-09-26 05:00:28 +00:00
Stig Bjørlykke 91ab8cf345 btle: Fix Feature support bit positions
From BT spec 4.2 volume 6 part B section 4.6, Feature support.

Bug: 12946
Change-Id: I065e9bc9af88bb1daf53d26ae683d7ddedbb8ebf
Reviewed-on: https://code.wireshark.org/review/17911
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-09-26 03:43:52 +00:00
Stig Bjørlykke 37a92ddebd btle: Show full LL_VERSION_IND SubVersNr
The BT spec does not specify a bitmask for Subversion Number.

Change-Id: If6f384badc4228ea1e1c30ec8156f382ca5959e0
Reviewed-on: https://code.wireshark.org/review/17936
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-09-25 20:20:21 +00:00
Stig Bjørlykke 156584660b btle: Add LL_LENGTH_REQ/RSP control data
Change-Id: Ib09232a25c70fc319b1df90dc09a89a34cf59c3e
Reviewed-on: https://code.wireshark.org/review/17932
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-09-25 20:08:24 +00:00
Guy Harris 79ae8c1d07 Report failure to compile a filter as an error.
The NCP dissector relies on those filters being compiled, and we end up
doing a g_assert() anyway; use g_error() to make sure the error gets
printed.

Change-Id: Ibc20407c1c08f0baaa626f269e9552ae11b36083
Ping-Bug: 12945
Reviewed-on: https://code.wireshark.org/review/17921
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-09-25 18:03:04 +00:00
AndersBroman f3fede0099 [iscsi] Add a cast "packet-iscsi.c(625): warning C4267: 'function' :
conversion from 'size_t' to 'guint', possible loss of data"

Change-Id: I63ddf1384acdebc176a052489891d55d7a1b21ce
Reviewed-on: https://code.wireshark.org/review/17920
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-09-25 17:11:52 +00:00
Gerald Combs fce2531169 [Automatic update for 2016-09-25]
Update manuf, services enterprise-numbers, translations, and other items.

Change-Id: Ie3096d67f82b93b751640e063ebe231fc235f83f
Reviewed-on: https://code.wireshark.org/review/17917
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-09-25 15:14:17 +00:00
Masashi Honma e6ea68c72e ieee80211: Fix EOSP flag dissection for mesh case
Change-Id: Ia8d4d74a7f0f5795790f930fc1e894a7ee202da7
Signed-off-by: Masashi Honma <masashi.honma@gmail.com>
Reviewed-on: https://code.wireshark.org/review/17550
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>
2016-09-25 07:34:45 +00:00
rosemountSkp 0ee1445ada Improve HART dissector
Fixed short command 0 short address,
command 0 that has less bytes,
command 9 byte count,
command 48 parse first 6 bytes instead of 5 and
the command may has less bytes, pass correct byte count into the
dissect_parse_hart_cmds() function.

Added support HART published and NAK message types and more HART commands.

Bug: 12817
Change-Id: I4a9e7f9b342346ff4ecdcd06a73238c1a08d00fc
Reviewed-on: https://code.wireshark.org/review/17325
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>
2016-09-25 07:32:47 +00:00
Dario Lombardo 870822b9c6 eap: add imsi to wlan identity dissection.
Change-Id: Ic8ff4e1846e8c0a11ee19ffbc4897635388dfa62
Reviewed-on: https://code.wireshark.org/review/17888
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-09-25 07:27:58 +00:00
Dario Lombardo 31cd04e901 ssh: use ws_strtoi function.
Change-Id: Iafcb721eb6081902dd6b5c3a2258ae5c2ccd95e9
Reviewed-on: https://code.wireshark.org/review/17822
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-09-25 03:11:48 +00:00
Dario Lombardo 8ca846436d idl2wrs: use ws_strtou function
Change-Id: I90173b0defc04ac80054170153afe9389def620b
Reviewed-on: https://code.wireshark.org/review/17837
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-09-25 02:56:50 +00:00
Dario Lombardo 3c9fb07119 iscsi: use ws_strtou functions.
Add expert info for failed conversion.

Change-Id: I03d5e2db791f81d43384bb047c268d07709a6099
Reviewed-on: https://code.wireshark.org/review/17863
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-09-25 02:55:52 +00:00
Andreas Leibold 06b09eea72 Changes to 1722.1 / MAAP to work with 1722 draft15
The C/D control flag was integrated in the subtype field of 1722 after
draft 6. These changes are now added to the 1722-1 and MAAP protocol.

Change-Id: I19b2e8237fb87d42ec7bcb6f9f53e8cc8605731d
Reviewed-on: https://code.wireshark.org/review/17664
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>
2016-09-25 01:11:29 +00:00
Peter Wu 75ae538514 ssl: fix exact matching of ALPN protocol names
The "name_length >= alpn_proto->proto_name_len" condition always failed
to match for short names (like "h2" where the reported length is 2, but
the proto_name_len would be 3).

This fixes recognition of HTTP/2 traffic, without this patch it would be
interpreted as http-over-tls as reported on
https://ask.wireshark.org/questions/55720/how-to-install-http2-dissector-plugin

Change-Id: Idc3eae0b6d593c8f3c435230ef76da90a4b1e7fc
Reviewed-on: https://code.wireshark.org/review/17907
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>
2016-09-25 00:39:25 +00:00
Peter Wu 8b047554ee ssl-utils: fix decryption of NULL ciphers
A dissector bug was reported:

    epan/dissectors/packet-ssl-utils.c:1615: failed assertion "data"

and fair enough, the MAC Key is indeed NULL because of our special
handling for NULL ciphers. Just ignore the MAC key then.

Change-Id: I12d2be5e84520badb44a99fc965c48c3afa89346
Fixes: v2.3.0rc0-697-gb1d36fe ("ssl-utils: remove block and key sizes from cipher suites table")
Reviewed-on: https://code.wireshark.org/review/17903
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>
2016-09-24 12:34:45 +00:00
Alexis La Goutte 989dcef317 TLS: Update Hello ExtensionType list
use same name and display in dec from http://www.iana.org/assignments/tls-extensiontype-values/tls-extensiontype-values.xhtml

Change-Id: Ia4a959571204b611dbf275311c9ce58c594b6716
Reviewed-on: https://code.wireshark.org/review/17886
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-09-24 08:25:34 +00:00
szhong d1b99809b5 pcep: add Conveying Vendor-Specific Constraints (RFC7470) support
Added capability to expand Private Enterprise Number to string.

Change-Id: Id3df604a47c3067febb878caf89087aa00ecf038
Reviewed-on: https://code.wireshark.org/review/17770
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-09-23 17:10:44 +00:00
Alexis La Goutte 2e0cbb7ae7 TLS: use define value for ssl_versions value string
and also move on the top and not too far from ssl_version_short value_string

Change-Id: I9012d0d0839fd29da500a7f37a83ecc982f0fb5b
Reviewed-on: https://code.wireshark.org/review/17887
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-09-23 13:40:21 +00:00
Dario Lombardo 2fa327ae0c eap: fix cast warning.
Change-Id: I94a4a927c91552f58ecec3d0d78efcf699bf77de
Reviewed-on: https://code.wireshark.org/review/17881
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-09-23 10:25:20 +00:00
Dario Lombardo 064f4d18db eap: dissect eap wlan identity.
EAP identities can be of different kind. This change adds a sort
of heuristic that dissects the wlan identity in the form of
<imsi>@wlan.mnc<mnc>.mcc<mcc>.3gppnetwork.org. A general purpose
dissection function, acting as a proxy, has been created to make
room for other specific dissections.

Bug: 12921
Change-Id: Ic48aee004fa7df5ee4dbeca091ed31616d155890
Reviewed-on: https://code.wireshark.org/review/17796
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-09-23 04:32:46 +00:00
Stefan Metzmacher 1ec28b4a08 packet-dcerpc: let dissect_dcerpc_cn_auth() always dissect the whole auth_info
As all this information belongs together I'm moving it into a subtree.

Change-Id: I839a5a6294360976a78b4b43f219e30381b4f516
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-on: https://code.wireshark.org/review/17878
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>
2016-09-23 04:27:11 +00:00
Alexis La Goutte 68dbc6431f ISAKMP: fix Argument with 'nonnull' attribute passed null found by Clang Analyzer
Change-Id: I8d7ebc6dd46e0d6494d412653ec423b8c0fde9c8
Reviewed-on: https://code.wireshark.org/review/17203
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>
2016-09-23 03:00:27 +00:00
Priyanka Mondal eeb4361e57 Dropped packet: Add dropped packets info in netscaler trace
Change-Id: I2a9806026413c5971e5ecad17cd80787130cb9ed
Reviewed-on: https://code.wireshark.org/review/17803
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>
2016-09-22 21:42:27 +00:00
Alexis La Goutte a156a0021d CDP: Add CDP over GRE
http://www.cisco.com/c/en/us/td/docs/wireless/access_point/15-3-3-JB/configuration/guide/cg_book/cg-appA-protfilters.html

Bug:12934
Change-Id: If6498446c86f509a44dc28d3c2e4d86cc61cd167
Reviewed-on: https://code.wireshark.org/review/17853
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-09-22 21:41:09 +00:00
Pascal Quantin 0b1fd7e8fb 6LowPAN: initialize interface identifier even when no data-link source is found
Bug: 12939
Change-Id: Ib4e8adbff3e335e602da5e6857bfc801601fd25e
Reviewed-on: https://code.wireshark.org/review/17871
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>
2016-09-22 21:38:56 +00:00
Pascal Quantin 14fcb720dd BTHCI ACL: ensure to initialize the full bthci_acl_data_t structure
Change-Id: Ie1a020bf5dddde3f9476a6fdf307da9effb4bf8c
Ping-Bug: 12939
Reviewed-on: https://code.wireshark.org/review/17870
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-09-22 19:06:03 +00:00
Pascal Quantin 8438c1d5a6 LDSS: fix a memory leak caught by ASan
Change-Id: I988b0ac0fbadb782c1ba499a086c29522a564618
Reviewed-on: https://code.wireshark.org/review/17869
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-09-22 18:56:47 +00:00
Pascal Quantin cf12e448b1 proto.c: avoid dereferencing a NULL pointer
Some sub protocols do not register fields

Follow-up of gf4a521e

Change-Id: Iec3165d6204cc6acc0ec31a7266f860012463cd0
Reviewed-on: https://code.wireshark.org/review/17868
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-09-22 18:56:17 +00:00
AndersBroman f4a521ee74 [proto.c] As we know the size of the hf array use g_ptr_array_sized_new()
to allocate the arry to hold them. This should be more efficient.

Change-Id: I84b1095b6eb110fdcc1b2630949c76b51f3a47b6
Reviewed-on: https://code.wireshark.org/review/17866
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-09-22 15:08:58 +00:00
AndersBroman 0b3d679368 Don't call proto_register_field_array() or expert_register_protocol() with
proto = -1

Change-Id: I60f899ad748b5d3e17f237552af7d2dbc8f27bd2
Reviewed-on: https://code.wireshark.org/review/17864
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-09-22 14:13:12 +00:00
Michael Mann d29b369bdc Add range_add_value and range_remove_value.
These APIs can insert or remove a single value into a range structure.
Adding a value may extend an existing range or create a new one.
Removing a value may remove a range item.

Change-Id: Ia6995ecf7760aca1fb7fd9b4c53972298a57675f
Reviewed-on: https://code.wireshark.org/review/17836
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-09-22 13:49:42 +00:00
Alexis La Goutte 69dfe97251 iwarp: Add RDMA Atomic operations (RFC 7306)
Bug:12928
Change-Id: Id3f9e41a62a90e36f19e1d55226826e7f9ffa3f4
Reviewed-on: https://code.wireshark.org/review/17855
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: Michael Mann <mmann78@netscape.net>
2016-09-22 12:47:49 +00:00
Juanjo Martin dedf926540 RTPS: Added DTLS locator dissection
Change-Id: I168d728a56479bd3eeac4baa2d7708dbc3d09bed
Reviewed-on: https://code.wireshark.org/review/17814
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>
2016-09-22 09:10:20 +00:00
Alexis La Goutte 48a075b104 MACsec: Fix typo
macsec/MACSEC => MACsec

Change-Id: I1016396edaf3f8bf025dd9b840d0d2f588546d49
Reviewed-on: https://code.wireshark.org/review/17854
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-09-22 08:55:16 +00:00
AndersBroman b9d493f8de [print.c] Use pinfo and frame_info to print geninfo.
Change-Id: Ie77292bfb2d962b326cb4dd9273d7258586f18b5
Reviewed-on: https://code.wireshark.org/review/17841
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-09-22 04:08:52 +00:00
AndersBroman fe1d006016 [print.c] Get timestamp directly from pinfo rather than going via field
info.

Change-Id: I266775b0880931bbce5ec0ed9bc9d8b0dbce7246
Reviewed-on: https://code.wireshark.org/review/17840
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>
2016-09-22 04:07:23 +00:00
Dario Lombardo 479323072c gsm_map: use ws_strtoi in template.
Change-Id: I682955b3c58695d831d6d8013eaa77d347a0ec2e
Reviewed-on: https://code.wireshark.org/review/17820
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-09-22 03:41:23 +00:00
Davide Caratti f513dd35c1 ethertype: add missing value_string row for MACSEC
Change-Id: Ie062054249d847e4cc430818ce2deca96b2c7d90
Reviewed-on: https://code.wireshark.org/review/17845
Reviewed-by: d. caratti <davide.caratti@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: Anders Broman <a.broman58@gmail.com>
2016-09-21 22:06:48 +00:00
Olga Kornievskaia c2b7a74c14 nfs: Fixing OFFLOAD_STATUS reply decoding
commit b5aa0ff1a4

    nfs: Add NFSv4.2 ops OFFLOAD_CANCEL and OFFLOAD_STATUS

As coded, the reply of the OFFLOAD_STATUS decodes a stateid.
However, in the spec, the reply is count and an array of
statuses. I propose the following fix to match the spec
for the OFFLOAD_STATUS.

Change-Id: Ibaddba96446b8d9b520ca977f0b1ed66749d3388
Reviewed-on: https://code.wireshark.org/review/17805
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>
2016-09-21 20:43:15 +00:00
Stig Bjørlykke eafa0a061d dmp: Restore checksum incorrect info
The "Checksum incorrect" note in COL_INFO was inadvertently
broken in gad6fc87d6.

Change-Id: I064c3c79aa3e1ae72d3a8167538e709d0b5fe94a
Reviewed-on: https://code.wireshark.org/review/17842
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-09-21 19:30:08 +00:00
Alexis La Goutte b9d4a18ad2 TLS: no extension length on padding extension
also remove padding function (don't needed)

Bug: 12922
Change-Id: Ie049ee21193ec82b8dc873a7dff78e9d058c7935
Reviewed-on: https://code.wireshark.org/review/17825
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-09-21 11:41:30 +00:00
Pascal Quantin 7be73201a0 BTL2AP: compare strings with strcmp, not memcp
Otherwise a string shorter than 7 characters will trigger an out of bounds access

Bug: 12825
Change-Id: I54a7909d74838dcb56583374e5753f877ff74fe2
Reviewed-on: https://code.wireshark.org/review/17826
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2016-09-21 11:20:33 +00:00
Dario Lombardo 73899237f0 camel: use ws_strtoi in template.
Change-Id: Ida61cc61d6a6a1c34eb42ceaba31621276f93966
Reviewed-on: https://code.wireshark.org/review/17821
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-09-20 20:26:26 +00:00
AndersBroman 920df263e3 [GTPv2] Export dissect_gtpv2_tai()
Change-Id: I3ec15b0411d8e9639cc31b36aa25ce74054395da
Reviewed-on: https://code.wireshark.org/review/17819
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-09-20 13:40:17 +00:00
AndersBroman 962c3b20c2 [GTPv2] Export dissect_gtpv2_tai()
Change-Id: If4daaf8d53734c00ba922ca61d21db3c09e859d1
Reviewed-on: https://code.wireshark.org/review/17818
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-09-20 12:36:58 +00:00
AndersBroman 7933d8002b [Diameter 3GPP] hf_diameter_3gpp_feature_list1_sh_flags_spare_bits missing
bitmask.

Change-Id: I999fb71a26e90a46e11bd2907c3fcb8566e92562
Reviewed-on: https://code.wireshark.org/review/17817
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-09-20 12:32:37 +00:00
Alexis La Goutte ece9c28619 selfm: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
Change-Id: I758ff81bdfcb9c18810baad12554d7f7f0e7705f
Reviewed-on: https://code.wireshark.org/review/17707
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>
2016-09-20 11:47:04 +00:00
AndersBroman 980a0a300a Add define for vendor dacom
Change-Id: Ie7411d4d41e3f0a0ea98ed4a14d40c5715535c8a
Reviewed-on: https://code.wireshark.org/review/17815
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-09-20 11:46:21 +00:00
Alexis La Goutte b83c730ff0 TLS(1.3): Add Pre-Shared Key (41) Hello extension
Bug: 12779
Change-Id: I64ef80db0a8b51ee569fed3b87099144e57eedc2
Reviewed-on: https://code.wireshark.org/review/17320
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: Peter Wu <peter@lekensteyn.nl>
2016-09-20 09:14:07 +00:00
Hauke Mehrtens 811bb3302b netlink: make dissect_netlink_attributes() endianness aware
Always give the netlink data struct to dissect_netlink_attributes() so
we can extract which endianness we should use. This fixes the netlink
dissector on big endian.

Change-Id: Ia485a29035c947908c29a9e30d0aba8d4fc94093
Signed-off-by: Hauke Mehrtens <hauke.mehrtens@intel.com>
Reviewed-on: https://code.wireshark.org/review/17636
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: Peter Wu <peter@lekensteyn.nl>
2016-09-20 09:13:20 +00:00
Hauke Mehrtens b1bbfaa9f7 netlink: try to detect endianness
There is no field which indicates which endianness is used for netlink
data, try to guess it by checking if the length in little or big endian
fits better.

Change-Id: I02884763931f3f3589b7ac5bff2781797c1d0f87
Signed-off-by: Hauke Mehrtens <hauke.mehrtens@intel.com>
Reviewed-on: https://code.wireshark.org/review/17635
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: Peter Wu <peter@lekensteyn.nl>
2016-09-20 09:08:17 +00:00
Chris Bontje 927a050979 [SELFM] - Further additions to re-assembly efforts (Multiple PDUs spanning additional TCP packets)
Change-Id: I35db77ee05c3c873577b4f40c41f283e5666a4e2
Reviewed-on: https://code.wireshark.org/review/17701
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>
2016-09-20 04:24:55 +00:00
Stefan Metzmacher eb4c70616f packet-dcerpc: dissect the auth verifier of PDU_CO_CANCEL, PDU_ORPHANED and PDU_FAULT
Change-Id: I28325d655ccd5d363aac89e49e5333b3d75f68a2
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-on: https://code.wireshark.org/review/17810
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-09-20 01:57:05 +00:00
Stefan Metzmacher 01d80d649f packet-dcerpc: The opnum field is generated for PDU_RESP and PDU_FAULT
Change-Id: Ieeb9de0f54a22afc3adcd52d8af2c45e8b82b0ab
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-on: https://code.wireshark.org/review/17808
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-09-20 01:56:38 +00:00
Stefan Metzmacher 9058363ed7 packet-dcerpc: nca_s_fault_sec_pkg_error
Change-Id: I951a317da795c94ac6518be73cb2c836e7afb836
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-on: https://code.wireshark.org/review/17807
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-09-20 01:56:10 +00:00
Peter Wu cdfc47d58d http: add spdy Upgrade support
Not found in any specification, but it appears to be implemented by
kubernetes (using "SPDY/3.1" value).

Ping-Bug: 12874
Change-Id: I9fc7ad2f657a739b415f6801fe0f43f6ef75ca70
Reviewed-on: https://code.wireshark.org/review/17786
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>
2016-09-19 16:57:03 +00:00
Guy Harris d7fe514fc0 Improve support for single-character fields and filter expressions.
Add an FT_CHAR type, which is like FT_UINT8 except that the value is
displayed as a C-style character constant.

Allow use of C-style character constants in filter expressions; they can
be used in comparisons with all integral types, and in "contains"
operators.

Use that type for some fields that appear (based on the way they're
displayed, or on the use of C-style character constants in their
value_string tables) to be 1-byte characters rather than 8-bit numbers.

Change-Id: I39a9f0dda0bd7f4fa02a9ca8373216206f4d7135
Reviewed-on: https://code.wireshark.org/review/17787
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-09-19 02:51:13 +00:00
Martin Kaiser b914ec30ce bootp: dissect option 82, sub-option 12 (Relay Agent Identifier)
as defined in RFC6925

Bug: 12907
Change-Id: I546d243f4b188025d8c96a1eaa0798b70a847a25
Reviewed-on: https://code.wireshark.org/review/17775
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-09-18 20:32:33 +00:00
Niels de Vos 763f7510e3 glusterfs: decode upcall flags for cache-invalidation
Add decoding of the upcall->flags value. This mask currently used do
give hints about the cache-invalidation structures.

Change-Id: I4a3ab03bec6e2a2c9f8c7bbf17babb2bc93c9d7b
Signed-off-by: Niels de Vos <ndevos@redhat.com>
Reviewed-on: https://code.wireshark.org/review/17776
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>
2016-09-18 20:31:14 +00:00
Joerg Mayer 9dad78a6fc UDLD has been an informational RFC for a while
Fix some whitespace

Change-Id: I7438b6b394078a23eda6d77fbda789d5413e0417
Reviewed-on: https://code.wireshark.org/review/17782
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2016-09-18 19:13:34 +00:00
Gerald Combs baa0feee4d [Automatic update for 2016-09-18]
Update manuf, services enterprise-numbers, translations, and other items.

Change-Id: I1fb3ac4b7bd4f44dfcf7b40b28b0b2aa89ca4d3e
Reviewed-on: https://code.wireshark.org/review/17778
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-09-18 15:13:42 +00:00
Mirko Parthey 553e119672 ISAKMP: Reduce code duplication
Equalize attribute dissecting functions:
* Convert all attribute type names to range_string.
  Add "Unassigned" and "Private use" ranges while we are at it.
* Swap the order of format and type fields for config attributes.

Move common code into the new function dissect_attribute_header().
Try to keep the parameter list short:
* Group the hfindex values for attribute details into a struct.
* Merge attribute subtree types.

Add a colon in the main attribute item label for visual separation.

Skip dissection of config attributes for unknown IKE versions.

Change-Id: I6e6286f3d4cf16f3cd16a23aca540c4af72f3442
Reviewed-on: https://code.wireshark.org/review/17663
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-09-18 13:58:22 +00:00
BACdaBASpert a978ad7ce3 update bacapp vendor id to name mapping from BACnet
Change-Id: Ibd09e3d8ec167a9270545e37365a2370ac6c2c28
Reviewed-on: https://code.wireshark.org/review/17753
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>
2016-09-18 08:15:07 +00:00
Guy Harris 205b67f7c9 The full identity string was added above.
Change-Id: I0945cb9cb6a9d5ccf3756b887654d73a28035a49
Reviewed-on: https://code.wireshark.org/review/17768
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-09-17 20:45:30 +00:00
Guy Harris db839fc525 Update a comment.
In one of the two cases where we treat the first byte of an identity as
a prefix, we know it's EAP-AKA.  (In the other, we do *not* know that!)

Change-Id: I16625f7193eb3ab0840739ec37dbd64e2a5a0fb5
Reviewed-on: https://code.wireshark.org/review/17767
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-09-17 20:27:08 +00:00
Guy Harris 39c3ddf861 Fix handling of EAP identity.
There's no guarantee that the identity is a string whose first character
is a prefix indicating the type of identity; only display it as a prefix
if it's one of the known types.  We really may need some other mechanism
to determine how to parse the identity, perhaps based on what the
protocol layers below it are.

Put back the display of the full string in one case where that was
inadvertently removed.

Change-Id: I2e3324f964fa25ebd7065ddb0de82ffae6597509
Reviewed-on: https://code.wireshark.org/review/17764
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-09-17 20:14:39 +00:00
Martin Kaiser ede1af20ba eap: make eap_identity_prefix a numeric item
This used to be string item, its value was not 0-terminated. This
resulted in out-of-bounds mem acceess when eap_identity_prefix was used
by proto_tree_add_string_format().

==14744== Conditional jump or move depends on uninitialised value(s)
==14744==    at 0x4C294F8: strlen (mc_replace_strmem.c:390)
==14744==    by 0xC19C97F: g_strdup (gstrfuncs.c:355)
==14744==    by 0x739CA75: string_fvalue_set_string (ftype-string.c:51)
==14744==    by 0x67136A9: proto_tree_add_string (proto.c:3515)
==14744==    by 0x6713870: proto_tree_add_string_format (proto.c:3547)
==14744==    by 0x69BB494: dissect_eap (packet-eap.c:838)
==14744==    by 0x66FD0B4: call_dissector_work (packet.c:649)

As the content is a number anyway, the simplest solution is to make
eap_identity_prefix a numeric item and use
proto_tree_add_uint_format_value().

Bug: 12913
Change-Id: I907b1d3555a96e9662b1d8253d17d35adfdada48
Reviewed-on: https://code.wireshark.org/review/17760
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-09-17 19:49:49 +00:00
Martin Kaiser 983a9691a9 eap: (trivial) reformat a comment
Change-Id: I2c8a8066f1591004ace6362e24be57b6cec747d1
Reviewed-on: https://code.wireshark.org/review/17762
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-09-17 17:13:06 +00:00
Martin Kaiser 3c83afa472 eap: remove unnecessary if (tree) checks
Change-Id: If42a5d610eea7c7818a0d37dd5878c84ba7f7d81
Reviewed-on: https://code.wireshark.org/review/17761
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-09-17 17:12:55 +00:00
Pascal Quantin c82303610d ISUP: do not display Called Party Number twice
Bug: 12911
Change-Id: I3632ffbeb85a96d9268eca6ddc0f8b38587688c4
Reviewed-on: https://code.wireshark.org/review/17758
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-09-17 16:38:37 +00:00
Pascal Quantin 22257e8cf5 p_XXX_proto_data: only allow the use of pinfo and file scopes
Those are the only ones meaningful. Let's convert the buggy dissectors
and add an assert to avoid the misuse of the pool parameter in the future

Change-Id: I65f470b757f163f11a25cd352ffe168d1f8a86d3
Reviewed-on: https://code.wireshark.org/review/17748
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>
2016-09-17 15:46:36 +00:00
Alexis La Goutte 41567191d8 TLS(1.3): Add Share Key (40) Hello extension
Bug: 12779
Change-Id: I5cbc911f2c7818558c5182d2e3ccf9235be9281b
Reviewed-on: https://code.wireshark.org/review/17301
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-09-16 22:39:29 +00:00
Alexis La Goutte 5540df7a82 TLS: Pass directly the handshake_type to dissect_hnd_hello_ext
with TLS 1.3, there is a new 'Hello' type (Hello Retry Request)

Change-Id: If7a11b70a5b0a69044126c50e1d6ab4e1d443f77
Reviewed-on: https://code.wireshark.org/review/17573
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-09-16 22:35:19 +00:00
Alexis La Goutte c1d9ce47b5 TLS(1.3): Add new Hello extension list
* Key share (40)
* Pre-Shared Key (41)
* Early Data (42)
* Cookie (44)

Bug: 12779
Change-Id: I16e3cf691ae66e244608db233db180e24538a68d
Reviewed-on: https://code.wireshark.org/review/17239
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-09-16 22:33:37 +00:00
Alexis La Goutte d32b116d40 TLS(1.3): Add (experimental) extension 'Draft version TLS 1.3'
Coming from https://github.com/tlswg/tls13-spec/wiki/Implementations#version-negotiation

Bug: 12779
Change-Id: Ieca74eac737b5ba6c101b719e2e5e3aecf931279
Reviewed-on: https://code.wireshark.org/review/17226
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-09-16 22:31:43 +00:00
Alexis La Goutte 7319887c31 TLS(1.3): Fix Server Hello
There is no session_id and compression method with TLS 1.3 Server Hello

Also no time on first bytes of random field

Bug: 12779
Change-Id: Id79221c2ad50695cf6d46cd5c9255deab99e2d2c
Reviewed-on: https://code.wireshark.org/review/17225
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-09-16 22:30:29 +00:00
Alexis La Goutte 778f7c52cc TLS(1.3): Add TLS 1.3 value for version Handshake
Bug: 12779
Change-Id: I298ecf4a0537df2e88354aed6912d4298a094216
Reviewed-on: https://code.wireshark.org/review/17224
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-09-16 22:28:34 +00:00
Pascal Quantin ef527fa961 M3AP: remove Procedure Code from info column
Change-Id: I69aebed5000f6544eede69e7435fb49e4e0ce179
Reviewed-on: https://code.wireshark.org/review/17744
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-09-16 19:18:02 +00:00
Pascal Quantin 953b85c1d4 M2AP: remove Procedure Code from info column
Change-Id: I965cc0455f5f3ac8a676cc0e3453e8a449d76109
Reviewed-on: https://code.wireshark.org/review/17743
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-09-16 19:17:36 +00:00
Dario Lombardo 547a5c8c9e eap: add identity details.
Change-Id: I60e017ac48d9daf52b8a40809625dc1ae09c9d8e
Reviewed-on: https://code.wireshark.org/review/17735
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-09-16 15:24:22 +00:00
Michael Mann 3120536012 Have TPKT support a TCP port range preference instead of having "subdissectors?" register their own.
There are a number of dissectors who are subdissectors of TPKT (and OSITP) that are
not called by TCP dissector directly, yet can possibly register a TCP port "on the
behalf" of TPKT.  Just allow TPKT to support a range of ports to possibly include
these protocols.
Remove the preferences from these dissectors, but add backwards compatibility for
the preferences by hooking into set_prefs and have the preferences just hook into
Decode As functionality directly.

Change-Id: Ic1b4959d39607f2b6b20fa6508da8d87d04cf098
Reviewed-on: https://code.wireshark.org/review/17476
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-09-16 14:58:24 +00:00
Alexis La Goutte 2492fe41ba VTP: Always display reserved/unsed fields
Change-Id: Ib0b065c20e599567224c05068dad5bd24a711609
Reviewed-on: https://code.wireshark.org/review/17728
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-09-16 13:02:33 +00:00
Kenneth Soerensen e4aa7be949 ZigBee: Fix reassembly of APS fragments.
The unsigned variable num_blocks was initialized to -1. Which caused the
dissector to set the total length to 4294967295 fragments when the second
fragment was processed. This made the dissector unable to reassemble data
made of more than two fragments.

Change-Id: I120af090ed29ac73a1fa699bea2bfc91798ef92b
Reviewed-on: https://code.wireshark.org/review/17712
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>
2016-09-16 13:01:19 +00:00
Peter Wu 663031e4a8 ssl-utils: fix -Wshorten-64-to-32 and other warnings
Fixes -Wshorten-64-to-32 from v2.3.0rc0-697-gb1d36fe ("ssl-utils: remove
block and key sizes from cipher suites table"), -Wpointer-sign,
-Wunreachable-code-break.

Change-Id: I37ca5e9effe5d6560d49ccef53e9feb096cd2ad6
Reviewed-on: https://code.wireshark.org/review/17727
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>
2016-09-16 11:27:39 +00:00
Guy Harris 689ff93474 Squelch some compiler warnings.
gcry_cipher_get_algo_keylen() returns a size_t, which is bigger than a
guint on most if not all 64-bit platforms; however, if the key is bigger
than 2^32 bytes, we have bigger problems, so just cast it down.

Change-Id: Ia7c97d2742686daf2e42f634c6e349cb580fa9df
Reviewed-on: https://code.wireshark.org/review/17731
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-09-16 10:00:15 +00:00
Peter Wu 1cd3587b73 ssl-utils: fix runtime memory leak
Ensure that Libgcrypt and zlib memory are freed when closing a pcap.

Change-Id: I420f9950911d95d59ff046fee57900ca6f7e9621
Reviewed-on: https://code.wireshark.org/review/17718
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>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-09-16 07:50:46 +00:00
Peter Wu b1d36fe0df ssl-utils: remove block and key sizes from cipher suites table
There was an implicit dependency between the block size in the cipher
suites table and the size expected by Libgcrypt. Just remove the block
size from the table and rely on the value from Libgcrypt to avoid the
risk of mismatching values (which could lead to a buffer overflow).

While at it, remove the size of the key ("bits") and the size of key
material ("eff_bits") too. Move the key material sizes for export
ciphers away from the table and use byte quantities instead of bits.

Additionally, this fixes an issue where 8 bytes of uninitialized stack
memory is written to the SSL debug log for stream ciphers like RC4.
The size of the Write Key is also corrected for export ciphers, now it
prints the actual (restricted) number of bytes that are used.

Change-Id: I71d3c83ece0f02b2e11e45455dc08c41740836be
Reviewed-on: https://code.wireshark.org/review/17714
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>
2016-09-16 07:29:40 +00:00
Peter Wu 979df813dc ssl-utils: fix buffer overrun (read) with AEAD cipher suites
ssl_cipher_init should only set the IV for CBC cipher suites. NULL
cipher suites will not invoke gcry_cipher_setiv and AEAD ciphers will
set the nonce in a different place anyway.

Fixes a buffer overrun (read) by 12 bytes for any AES-CCM and AES-GCM
cipher suite because the "block size" is set to 4 bytes while the
reported block size for AES is 16 bytes (128 bit). (The four bytes are
the "salt" part of the nonce that is extracted from the "client/server
write IV" part of the key block.)

Observed with the DTLS packet capture from
https://ask.wireshark.org/questions/55487/decrypt-application-data-pending-dtls-abbreviated-handshake-using-psk

Change-Id: I4cc7216f2d77cbd1eac9a40dca3fdfde7e7b3680
Reviewed-on: https://code.wireshark.org/review/17713
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>
2016-09-16 05:28:40 +00:00
AndersBroman 251bc5ca13 [SIP] Make it possible to call a subdisector for the VIA branch parameter.
Change-Id: I7d91780f130105f04648489d6ed0bf2a320edce9
Reviewed-on: https://code.wireshark.org/review/17711
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>
2016-09-15 15:47:14 +00:00
Pascal Quantin c5a477e72a S1AP: add dissection of NB-IoT transparent containers
To do so, memorize whether a given eNB UE S1AP ID belongs to a NB-IoT
TAI or not.
Also add a preference allowing to force dissection as legacy LTE or
NB-IoT if automatic mode fails.
While we are at it, let's remove the global variables and introduce
a S1AP private data info stored in pinfo.

Change-Id: I7e30b3d59d909684e5cfe13510293ed38ad52574
Reviewed-on: https://code.wireshark.org/review/17709
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>
2016-09-15 12:31:02 +00:00
Peter Wu f2e79776a7 eap: fix EAPOL conversation tracking, fixes TLS decryption
Use new heuristics based on the EAP Code field to determine whether a
field originates from the client or server. This is more reliable than
using "pinfo->match_uint" for two reasons: (1) the heuristics dissector
does not set "match_uint" (resulting in an arbitrary match on the
previous value) and (2) with EAP over EAPOL, there is no matching port
number (resulting in two conversations with different addresses and port
number zero).

To fix TLS decryption, make sure to create a single conversation for
both direction and allow the port type to be PT_NONE (to avoid reporting
all packets as originating from the server).

Bug: 12879
Change-Id: I7b4267a27ffcf68bf9d3f6a90d6e6e2093733f51
Reviewed-on: https://code.wireshark.org/review/17703
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>
2016-09-15 04:25:08 +00:00
Pascal Quantin 0dc96da1b9 X2AP: remove Procedure Code from info column
Change-Id: I8d4632ef3b338063e96f4a417f0e3280489968a4
Reviewed-on: https://code.wireshark.org/review/17692
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-09-13 22:09:22 +00:00
Pascal Quantin c644651bac S1AP: remove Procedure Code from info column
Change-Id: I53ece74627adc038ee6ff2af2959f2dae76ab879
Reviewed-on: https://code.wireshark.org/review/17691
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-09-13 22:09:04 +00:00
Pascal Quantin 48433e98b9 NAS EPS: add an option to dissect User Data Container as IP packet
Change-Id: I7d1196b79c22df5abe7d399bd9bea5c3d60bff7f
Reviewed-on: https://code.wireshark.org/review/17690
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>
2016-09-13 21:52:59 +00:00
Tom Haynes 1e3c57b486 nfs: Primary Data's NFSv4 DataSphere filehandle decoder
Change-Id: I0d339f69f37fd3b6a2f7b37b1c239edb2a4cf7a5
Signed-off-by: Tom Haynes <loghyr@primarydata.com>
Reviewed-on: https://code.wireshark.org/review/17676
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>
2016-09-13 19:04:08 +00:00
Dario Lombardo 8d2016da97 addr_resolv: use ws_strtou8 function.
This change prevents to accept netmasks as /24x. The
mask must be an clean integer.

Change-Id: I46aeb089dd6538b5cc4bde7efd4dc317621a5245
Reviewed-on: https://code.wireshark.org/review/17612
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-09-13 08:55:46 +00:00
Guy Harris 3fd70302ef Fix indentation.
Change-Id: I2b2d1cd584eb1ec56ec5cdcd33fb789843c8192c
Reviewed-on: https://code.wireshark.org/review/17680
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-09-13 08:51:43 +00:00
Michal Labedzki b616554665 Bluetooth: HCI vendor: Add support for some Intel commands/events
This change based on BlueZ code on the same license that Wireshark is.
It seems that a lot of commands/events are incomplete or unknown,
however better to have them.

Also rename variables (etc.) of the first dissector to contain
vendor name like new one, to distinguish them.

Change-Id: I2db3ed73d477699032a44bac2d3c88a9230b0095
Reviewed-on: https://code.wireshark.org/review/17657
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-09-13 06:54:48 +00:00
Dario Lombardo 6c4b0ffe91 telnet: get rid of atoi().
Change-Id: Id445aef1af21fcf176611122a757482c0b22f4bd
Reviewed-on: https://code.wireshark.org/review/17662
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-09-12 17:37:42 +00:00
Stig Bjørlykke 3c70e6d684 dmp: Code cleanup
Change-Id: I06c80ca44e8f727c9dc8ec552117ff60e44a7ef4
Reviewed-on: https://code.wireshark.org/review/17659
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-09-12 10:03:12 +00:00
Stig Bjørlykke 68fafcf43f dmp: Remove obsolete structured id handling
The structured id handling is not in use by anyone.

Change-Id: I643fb03f642a5c1900aaec7d41e2b66dba5a2b05
Reviewed-on: https://code.wireshark.org/review/17655
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-09-12 09:29:17 +00:00
AndersBroman 2e42199e11 [SELFM] Fix reassembly, tcp_dissect_pdus() can't be used as the real
length of the PDU is not known(length is exluding escape bytes).

Change-Id: I762419f12ca80f6597163e232c4b853819927b65
Reviewed-on: https://code.wireshark.org/review/17302
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>
2016-09-12 08:40:35 +00:00
Pascal Quantin 4fe91cf9f5 S1AP: add missing messages in info column
While we are at it, let's reorder them in the .cnf file to match their
definition in S1AP-PDU-Contents.asn and ease review

Change-Id: I4c433fa862d83053d8b01cc951e756379356fa57
Reviewed-on: https://code.wireshark.org/review/17649
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-09-12 04:08:11 +00:00
Peter Wu 032a6ac3be Fix memleaks in capture file dialog
Tried to poke various fields (including the capture filter field), this
revealed some memleaks.

Change-Id: I1eca431a09839906a4b3c902ad85e55bffc71ca8
Reviewed-on: https://code.wireshark.org/review/17648
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-09-12 01:33:38 +00:00
Peter Wu 71c41a0a13 epl: fix memleaks
Fixes a memleak that occurs on (re)loading a pcap. While at it, remove
some unnecessary variables.

Change-Id: Ibb662e5c608881bc7dfde9d12cdb77f699ff6542
Reviewed-on: https://code.wireshark.org/review/17639
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-09-12 01:20:55 +00:00
Pascal Quantin 5c505e7d43 X2AP: add dissection of X2AP-Message information element
Change-Id: I2993e1a9ebad1660573bce8a61b44962af08bbb3
Reviewed-on: https://code.wireshark.org/review/17652
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>
2016-09-11 22:08:47 +00:00
Stig Bjørlykke 9360f41959 mqtt: Only suback has failure in QoS values
Change-Id: Ib308090dfc0911a9bb7580e601cab0bfbfe58efe
Reviewed-on: https://code.wireshark.org/review/17644
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-09-11 18:29:33 +00:00
Stig Bjørlykke c2b858e26d mqtt: Fix subscribe/suback QoS values
Change-Id: I15424b768e6e0fe2e8268db69b82d81351146155
Reviewed-on: https://code.wireshark.org/review/17643
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-09-11 18:23:20 +00:00
Matt Lawrence bb46efdca9 MySQL: verify connection state before dissecting as greeting/login.
Change-Id: I419fad047c91ff1d8544eb3458534c132ec23821
Bug: 12791
Reviewed-on: https://code.wireshark.org/review/17368
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-09-11 17:24:36 +00:00
Stig Bjørlykke c31527d406 mqtt: Added elements from version 3.1.1
Added version 3.1.1 CONNACK session present flag and SUBACK failure
indication.  Adjusted SUBSCRIBE and SUBACK QoS values.

Added string length values.  Removed the message type subtree as it
had no purpose.  Put the message type in the top tree mqtt node instead.

Removed unused code and fixed code layout.

Change-Id: I8a9ae26ac9a2af04dc6f8d08ac46aa305c225c4f
Reviewed-on: https://code.wireshark.org/review/17590
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>
2016-09-11 17:23:28 +00:00
Alexis La Goutte e954569f32 CQL: rename code for don't only support v3
There is a v4 (and v5) with some change (patches coming !)

Change-Id: I3107727e2b86f7f6c0019ba6f2638bb40b41c0fb
Reviewed-on: https://code.wireshark.org/review/17626
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>
2016-09-11 17:21:10 +00:00
Gerald Combs 1d493ce156 [Automatic update for 2016-09-11]
Update manuf, services enterprise-numbers, translations, and other items.

Change-Id: I29e1c1ae96c686a2c97609e939c2c35845d2d9ee
Reviewed-on: https://code.wireshark.org/review/17640
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-09-11 15:13:19 +00:00
Alexis La Goutte 2fb9cbd9ad TLS: Enhance display of Hello Extension
Append the length to the extension and display the contents of
unknown extensions as bytes.

Change-Id: Iba1204a1d5e187f28cb41c4369b10eeb86e6b43a
Reviewed-on: https://code.wireshark.org/review/17265
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-09-11 04:32:27 +00:00
Guy Harris e8f1d2abda Fix indentation.
Change-Id: I440eac95172fe040255ab010fd17a17b21b68ae8
Reviewed-on: https://code.wireshark.org/review/17630
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-09-10 19:54:38 +00:00
Dario Lombardo ac7c05f915 sll: add unused bytes to tree.
The bytes that are not part of the address are not dissected.
Added them to the tree as "unused", to have a complete dissection
of the packet.

Found by incomplete dissector check.

Change-Id: Iafffebe8bc0f8254ac0b451d007e0a99aab91924
Reviewed-on: https://code.wireshark.org/review/17608
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-09-10 17:34:18 +00:00
Alexis La Goutte f9fc92aa01 CQL: fix indent modelines
Change-Id: Ie7ad09b3141fa6f4753981bd814736ee88c817d1
Reviewed-on: https://code.wireshark.org/review/17627
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-09-10 15:36:55 +00:00
Michael Mann 7fad354a3e Add Socket CANFD dissector.
Bug: 12687
Change-Id: Ib489b4c6aff1e0611e9b8a086054e56284f24b84
Reviewed-on: https://code.wireshark.org/review/16787
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-09-10 15:24:34 +00:00
Pascal Quantin d6f91a7ca4 S1AP: prettify dissection
Change-Id: I2b4339e489d11ade2751cad8874ba220d12fe3db
Reviewed-on: https://code.wireshark.org/review/17615
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>
2016-09-10 07:47:48 +00:00
Pascal Quantin ecd82d08a1 X2AP: shorten field description
Change-Id: I37828fe5611fa835050427ac0c73e979aa7a1ddf
Reviewed-on: https://code.wireshark.org/review/17614
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-09-09 20:17:17 +00:00
Michael Mann ae7c4ad3c0 Remove "Elasticsearch HTTP" dissector.
It was just a wrapper over regular HTTP dissector, which can already
pick its own ports to use.

Also some other minor cleanup related to removal.

Change-Id: I20dd37670c676551a06aaeb69fd657684af9685d
Reviewed-on: https://code.wireshark.org/review/17567
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>
2016-09-09 13:18:23 +00:00
Stig Bjørlykke 82f1d14dae nordic_ble: Capitalize short name
Change-Id: I2130b012f28b23342679f33e1e19a4e5e0943090
Reviewed-on: https://code.wireshark.org/review/17607
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-09-09 11:32:15 +00:00
Adrien Aubry cb96331602 CANopen: EMCY manufacturer error field size bug fix
-Manufacturer error field has 5 bytes (not 4)
-corrected two descriptions

Change-Id: Ic6f3e8fdf08c52f1d4f987410e1e0597a9f6aaed
Reviewed-on: https://code.wireshark.org/review/17575
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-09-09 11:27:50 +00:00
Peter Wu f7a59da905 ssl: set protocol column to "TLS" when possible
The protocol version from a SSL/TLS record contains the minimum
supported SSL/TLS version and is the best guess for Client Hello
handshake messages if no authorative version is available.

By considering the version from the conversation for the initial
col_set_str call, we can also remove some other calls down the road.

Change-Id: I4be25f5c9057ffd0abcea7280d826867c135fed7
Reviewed-on: https://code.wireshark.org/review/17490
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: Peter Wu <peter@lekensteyn.nl>
2016-09-09 10:42:23 +00:00
Jeff Layton 1948f7bd75 nfs: add dissector for CB_NOTIFY_LOCK args
Show the filehandle and lockowner for the callback.

Change-Id: Id09b260d4b31f8fa35ba8452dc143095e5cc88ec
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Reviewed-on: https://code.wireshark.org/review/17574
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>
2016-09-09 03:00:58 +00:00
Makoto Shimamura 6519f8e4e8 OCFS2: dissector incorrectly parses LVB data and claims malformed message
Some messages related to LVB data are mistakenly treated as malformed.
This patch fixes it by checking LVB flags before parsing LVB data.
I found that "Convert lock" and "Unlock" use PUT_LVB flags, but "Proxy AST" uses GET_LVB flags.

Ping-Bug: 12122
Change-Id: I2c62c8cc9f9bd84abaf92de9f216550101962520
Reviewed-on: https://code.wireshark.org/review/17532
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: Michael Mann <mmann78@netscape.net>
2016-09-08 21:01:39 +00:00
Pascal Quantin f1a7497b53 IRemUnknown: initialize remunk_remqueryinterface_call_t structure
Bug: 12841
Change-Id: I5916c30a18029d0872e0439d3393eaa6d27964dd
Reviewed-on: https://code.wireshark.org/review/17589
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>
2016-09-08 20:09:39 +00:00
Pascal Quantin fb85325d69 IPP: fix use after free error
Packet memory pool is already freed when columns are printed

Bug: 12840
Change-Id: If3e63586f14872aafe701612998370fffe506443
Reviewed-on: https://code.wireshark.org/review/17584
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>
2016-09-08 20:07:52 +00:00
Pascal Quantin 2f0a99eab3 M2AP: fix a typo leading to an expert info when decoding an IPv6 address
Change-Id: I10b67541427ca39a8f1d0989d680841b9d7883c9
Reviewed-on: https://code.wireshark.org/review/17581
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-09-08 19:32:22 +00:00
Pascal Quantin d0e55f0f6d M3AP: fix dissection of IP address
Change-Id: I96faed61c33f6fe14cc4196c3440d873b69d5334
Reviewed-on: https://code.wireshark.org/review/17585
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>
2016-09-08 19:31:55 +00:00
Pascal Quantin 468acff2bd PER: only display internal extension presence bit if activated in
preferences

Change-Id: I889b32c5e609c8c10ed2a8aa5a5e6d5b88baadc4
Reviewed-on: https://code.wireshark.org/review/17580
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>
2016-09-08 17:50:06 +00:00
Pascal Quantin 6652620f27 M2AP: display IP address in a subtree
Change-Id: Ic1853e1d265797e482495b8d07aa324545a7442e
Reviewed-on: https://code.wireshark.org/review/17579
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
2016-09-08 17:47:35 +00:00
Pascal Quantin 1e83b59af8 U3V: ensure that gencp_transaction_t structure is fully initialized
Bug: 12829
Change-Id: Iee8817fc0331af037284e5ec21b30671c6b3bd7d
Reviewed-on: https://code.wireshark.org/review/17569
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-09-08 05:26:34 +00:00
Alexis La Goutte b20b9c9b67 QUIC: Add FHOL (Force Head Of Line blocking) tag from Q036
Change-Id: Ieb0d1d0b2ebe2a6f325cdd18ef51677ee1a5535e
Reviewed-on: https://code.wireshark.org/review/17564
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>
2016-09-08 03:09:49 +00:00
Alexis La Goutte 03e4307cb2 NBT: fix Bad description for NBSS error code 0x81
Issue reported by Pavel Kankovsky
https://tools.ietf.org/html/rfc1002#section-4.3.4

Bug:12835
Change-Id: Iac7e58b9fd61f1f0dfd86960ef4f306ac6ed5a9c
Reviewed-on: https://code.wireshark.org/review/17565
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-09-08 03:06:41 +00:00
Michael Sweet 35affe3be4 Changes to the IPP dissector:
- xxx-time values are not UNIX timestamps (that is a CUPS-ism - they are
      time since bootup in IPP itself)
    - Change all of the display strings to use the official IANA values
      (confusing otherwise)
    - Add support for newer value/group tags.
    - Add support for all enum attribute values.
    - Add request/response tracking so you can easily match things up.
    - Decode octetString, rangeOfInteger, textWithLanguage, nameWithLanguage,
      dateTime, and resolution values.
    - Don't treat integers and enums as interchangeable (they aren't).
    - Integers and enums are signed integers.
    - Put operation id or status code in info column.

Change-Id: I9fb5cd89d3c386a2b3932ef4c75967ce2547bc22
Reviewed-on: https://code.wireshark.org/review/17192
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Smith Kennedy <smith.kennedy@hp.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-09-07 21:42:19 +00:00
João Valverde f90d436a7e ICMP: Avoid spurious reply not found for broadcast ping
Bug: 12830
Change-Id: Ie73b2b6e75c396660d0d2f2fc975c57bbb58d2eb
Reviewed-on: https://code.wireshark.org/review/17541
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
2016-09-07 14:43:23 +00:00
Pascal Quantin 859cf86c8d M2AP: fix dissection of procedure codes
Change-Id: I6c8f01e65a16561ff78593edc263fb26d99c182b
Reviewed-on: https://code.wireshark.org/review/17552
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-09-07 08:55:37 +00:00
Pascal Quantin 773c71f0bc M3AP: display short protocol name in protocol column
Change-Id: I7575caad67101d394c2c80d4bfd81f83389043aa
Reviewed-on: https://code.wireshark.org/review/17551
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-09-07 08:34:03 +00:00
Alexis La Goutte affa9df885 QUIC: Add preference to force decode all payload
For debugging...

Change-Id: I23eb70c89ac95371e1d7b05a52ffeed4f993a52a
Reviewed-on: https://code.wireshark.org/review/17135
Reviewed-by: Lucas Pardue <lucas.pardue@bbc.co.uk>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-09-07 06:17:32 +00:00
Makoto Shimamura c95c536f47 OCFS2: dissector incorrectly takes pdu length as little endian
This patch fixes incorrect endian conversion in pdu length.
Actually pdu length is big endian.

Ping-Bug: 12122
Change-Id: I9f8827293e684a5b4c957138f5879efdd140c500
Reviewed-on: https://code.wireshark.org/review/17533
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-09-07 04:28:19 +00:00
Makoto Shimamura a4c95ebe03 OCFS2: dissector incorrectly treats keepalive messages as unknown type
Keepalive req/resp messages are shown as "Unknown type (0x00)" in info column.
This patch fixes them to "Keepalive Request" and "Keepalive Response".

Ping-Bug: 12122
Change-Id: If09192067736b78c7785ba1ff05ae62a05d3dc23
Reviewed-on: https://code.wireshark.org/review/17497
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-09-07 04:24:36 +00:00
Pascal Quantin 9fb9e9f5a9 X2AP: prettify info column
Change-Id: I1630199383e0b83bf14e8d9850870268d7db777c
Reviewed-on: https://code.wireshark.org/review/17542
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-09-06 21:04:27 +00:00
Pascal Quantin 9be89dd8e8 X2AP: upgrade dissector to v13.4.0
Change-Id: I97250d022a40ac888522f885968e7cd3c86e3485
Reviewed-on: https://code.wireshark.org/review/17540
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>
2016-09-06 20:30:46 +00:00
Peter Wu 7a674c006b ssl: fix TLS renegotiation, add test for this
A handshake starts a new session, be sure to clear the previous state to
avoid creating a decoder with wrong secrets.

Renegotiations are also kind of transparant to the application layer, so
be sure to re-use an existing SslFlow. This fixes the Follow SSL stream
functionality which would previously ignore everything except for the
first session.

The capture file contains a crafted HTTP request/response over TLS 1.2,
interleaved with renegotiations. The HTTP response contains the Python
script used to generate the traffic. Surprise!

Change-Id: I0110ce76893d4a79330845e53e47e10f1c79e47e
Reviewed-on: https://code.wireshark.org/review/17480
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-09-06 13:45:30 +00:00
Peter Wu 10e84a612b ssl: really fix session resumption expert info
In a two-pass dissection with renegotiated sessions, the
is_session_resumed flag is not updated according to the current protocol
flow. Fix this by performing detection of abbreviated handshakes in
all cases, do not limit it to the decryption stage (where ssl != NULL).

Reset the resumption assumption after the first ChangeCipherSpec
(normally from the server side, but explicitly add this in case client
packets somehow arrive earlier in the capture). This should not have a
functional effect on normal TLS captures with Session Tickets.

Bug: 12793
Change-Id: I1eb2a8262b4e359b8c1d3d0a1e004a9e856bec8c
Reviewed-on: https://code.wireshark.org/review/17483
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-09-06 11:53:31 +00:00
Alexis La Goutte c8de455f4b zvt: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
Change-Id: I68b4fa08a7f65b92e56a6e72a6bb113e72ee33da
Reviewed-on: https://code.wireshark.org/review/17524
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-09-06 10:19:02 +00:00
Alexis La Goutte 27d522dad3 SMB2: Always display reserved field
Change-Id: Ic26603488cb020da3885f5bc97c65aae18fdf191
Reviewed-on: https://code.wireshark.org/review/17517
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-09-06 07:46:03 +00:00
Alexis La Goutte 3b3c515ab2 smb2: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
Change-Id: I714e2ea4808213901a8be64e65a0cb37c3002372
Reviewed-on: https://code.wireshark.org/review/17516
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-09-06 07:45:18 +00:00
Mirko Parthey 70f3737c3e ISAKMP: Fix handling of cert requests without CA
Check IKEv1 Certificate Request Payloads for an empty
Certificate Authority field, which is allowed by RFC 2408.
Suppress dissection of this field if it is indeed empty.

Change-Id: Ifb997e460a4c12003215fde86c374cfc769c5d72
Reviewed-on: https://code.wireshark.org/review/17501
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>
2016-09-05 18:56:13 +00:00
Pascal Quantin 87519e4c06 S1AP: fix dissection of TransportLayerAddress IE when it contains both IPv4 and IPv6
Change-Id: I8c257d79b4e842da6853ea3c53ae479f33a8047a
Reviewed-on: https://code.wireshark.org/review/17491
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>
2016-09-04 21:25:20 +00:00
Martin Kaiser 98b5820546 zvt: dissect Initialisation message
It contains the same password field that appears in the Registration
message. Make this field generic and reuse it here.

Change-Id: I7be9a99b5da1713937ffca5624be66150ff453d1
Reviewed-on: https://code.wireshark.org/review/17489
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-09-04 17:01:36 +00:00
Martin Kaiser 397a9d0b2e zvt: start dissecting Intermediate Status Information
Change-Id: I351621f1def5ad6da577a9b0d1b2c5ab49018564
Reviewed-on: https://code.wireshark.org/review/17488
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-09-04 17:01:26 +00:00
Martin Kaiser 6c462790a1 zvt: dissect the currency code bitmap
add the value for euro

Change-Id: Id8624e356ad4fcddcf77483a721428782c6bb0b2
Reviewed-on: https://code.wireshark.org/review/17487
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-09-04 17:01:08 +00:00
Gerald Combs 54b2f2d95d [Automatic update for 2016-09-04]
Update manuf, services enterprise-numbers, translations, and other items.

Change-Id: I11d066907492642f5baaa38a79b8bcd086a579c4
Reviewed-on: https://code.wireshark.org/review/17484
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-09-04 15:13:06 +00:00
Jaap Keuter 668e6bc831 ANSI_A: Rationalize test expession (CID-1372216 ... 1372267)
Implement the same changes in the ELEM_TLV() and ELEM_TV() macros as in
packet-gsm_a_common.h, to remove superfluous code and squelch about 50
Coverity issues.

Change-Id: I262dc60fdfa3482876d8525b34f6b1dbbe371257
Reviewed-on: https://code.wireshark.org/review/17478
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>
2016-09-04 13:53:30 +00:00
Peter Wu 7c7497a77e ssl,http: rename http-over-ssl to http-over-tls
This name is displayed in the SSL prototcol tree (Application Data
Protocol: http-over-tls), rename to avoid possible user confusion.

Modify the SSL dissector such that both "http" and "http-over-tls"
invoke the same dissector function.

Change-Id: I2d52890a8ec8fa88b6390b133a11df607a5ec3dc
Reviewed-on: https://code.wireshark.org/review/17481
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-09-04 13:18:54 +00:00
Uri Simchoni 4ec5cbe2d4 SMB2: dissect the buffer of getinfo quota request
Source: [MS-SMB2] 2.2.37.1

Change-Id: I526066700a88398366f31cd51552f9fa8bb761b8
Signed-off-by: Uri Simchoni <urisimchoni@gmail.com>
Reviewed-on: https://code.wireshark.org/review/17447
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>
2016-09-04 09:49:13 +00:00
Pascal Quantin 3b9771a424 M2AP: fix registration of extensions in proper dissector table
Change-Id: If529448539f9e8d740fd20009221e9221db83b2b
Reviewed-on: https://code.wireshark.org/review/17475
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-09-03 21:24:12 +00:00
Pascal Quantin 4a3b320c98 S1AP: add more LTE-RRC transparent containers dissection
Change-Id: I08246d3fa97ceafefd3a1ab5c36de50a5728fd19
Reviewed-on: https://code.wireshark.org/review/17474
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>
2016-09-03 19:06:37 +00:00
Pascal Quantin 8f5ab27b4f Add M2AP dissector (3GPP 36.443 v13.3.0)
Change-Id: I1a5d4390e91c5a758e52feba6059407d873adf7a
Reviewed-on: https://code.wireshark.org/review/17472
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>
2016-09-03 16:22:06 +00:00
Uri Simchoni a547dfb8de SMB2: dissect getinfo request fixed parameters
Dissect SMB2 getinfo request fix-sized parameters according
to [MS-SMB2] section 2.2.37.

This does not include extended attributes at the moment.

Change-Id: I5281edf0c21517cdf43ef00e89b5680b8174c383
Signed-off-by: Uri Simchoni <urisimchoni@gmail.com>
Reviewed-on: https://code.wireshark.org/review/17444
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>
2016-09-03 07:52:45 +00:00
Uri Simchoni dae5f88339 SMB: dissect FILE_GET_QUOTA_INFORMATION
Add a function that dissects FILE_GET_QUOTA_INFORMATION
structure ([MS-FSCC] 2.4.33.1)

This structure is used to define a set of SIDs whose quota
is to be fetched.

Change-Id: I81f6bca98fb239935ca593bd8725cebbb2037fbe
Signed-off-by: Uri Simchoni <urisimchoni@gmail.com>
Reviewed-on: https://code.wireshark.org/review/17445
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>
2016-09-03 06:43:50 +00:00
Gerald Combs 5846524f0b Qt: Conversation time column updates.
Add a checkbox which lets you toggle between absolute and relative start
times. Use the local time for now. Fixes bug 11618.

Adjust our time precision based on the capture file's time precision.
Fixes bug 12803.

Update the User's Guide accordingly.

Bug: 11618
Bug: 12803
Change-Id: I0049d6db6e4d0b6967bf35e6d056a61bfb4de10f
Reviewed-on: https://code.wireshark.org/review/17448
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-09-02 23:53:37 +00:00
Dario Lombardo 2ddb46dbee btavctp: rework the reassemble routine (CID 1355682).
The CID is about the lack of check of wmem_tree_lookup32_le()
return value, but the old code worths a bit of rework.

Change-Id: I3adb868d2baa1c8aea3f914f7fb9fdf75f222960
Reviewed-on: https://code.wireshark.org/review/17322
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-09-02 20:00:20 +00:00
Peter Palúch f01190ca90 Reworked dissection of BGP Extended Community attributes
This patch contains a partial rewrite of the BGP dissector for Extended
Communities.  The changes were primarily motivated by my dissatisfaction
with the generally unreadable way in which the types, names and values of
BGP Extended Communities were displayed in Wireshark GUI.  The rewrite
provides a hopefully more readable and eye-pleasing way of displaying the
extended communities.  I have also corrected numerous other flaws with the
Extended Community dissector I stumbled across.

In particular, the changes encompass the following:

1.) The Type octet of an Extended Community is now analyzed including its
Authority and Transitivity bits.  These were not dissected before.

2.) Dissection for EVPN Extended Community was improved.  The original
implementation blindly assumed that there is just a single subtype and
decoded the community ignoring the actual subtype.

3.) I have removed the hf_bgp_ext_com_value_unknown16 and ..._unknown32.
The current code uses a different approach to display values of unrecognized
communities, and for recognized communities, there are no "unknown"
subfields.

4.) Removed a couple of variables declared at the
dissect_bgp_update_ext_com() level.  These stored the result of a
tvb_get_...() call but the value was used only once.  I have replaced them
with the direct use of tvb_get_...()

5.) Moved duplicate code to add the Type value into the community_tree from
each branch in the switch(com_type_high_byte) out of it and placed it before
the switch().

6.) Reworked the style in which individual communities are displayed.  Each
community item (collapsed) is now displayed using the following label
format:

Community name: Values [Generic community type]

Examples:

Route Target: 1:1 [Transitive 2-Octet AS-Specific]
Unknown subtype 0x01: 0x8081 0x0000 0x2800 [Non-Transitive Opaque]
Unknown type 0x88 subtype 0x00: 0x0000 0x0000 0x0000 [Unknown community]

6.) To keep the filter names more consistent, changed names of selected filters:

bgp.ext_com.type_high -> bgp.ext_com.type
bgp.ext_com.type_low -> bgp.ext_com.stype_unknown

In particular, I do not want to call the subtype as bgp.ext_com.type_low
because that filter applied only to unrecognized subtypes even though its
name would suggest to users that they can filter any community based on it.

7.) Numerous corrections in text labels, names and labels that have been
incorrect or incomplete.

Bug: 12794
Change-Id: I9653dbbc8a8f85d0cd2753dd12fd537f0a604cf3
Reviewed-on: https://code.wireshark.org/review/17377
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-09-02 19:59:30 +00:00
Dario Lombardo d68f62244d aruba_erm: register dissector by name.
Change-Id: Ifad70ed2ee2a554cdc31496ad47148728071abdb
Reviewed-on: https://code.wireshark.org/review/17458
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-09-02 19:57:41 +00:00
AndersBroman 12eee84205 [SIP] Call sub dissectors for Diagnostics in SIP reason texts.
Change-Id: I68cbcf257b63a86ee37e1357876a90ea683a1d5a
Reviewed-on: https://code.wireshark.org/review/17455
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>
2016-09-02 15:31:06 +00:00
Binh Trinh 2c5a485eef GTP: continuation of patch for Target Identification, correction of PLMN in the case of non-compliance
Change-Id: Id848574ea748786ccd6808d370cb480caa948cfb
Reviewed-on: https://code.wireshark.org/review/17433
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>
2016-09-02 13:02:22 +00:00
Anthony Coddington e2b0aa21ea ERF: Fix dissector abort on short meta tags and typos
Fix dissector abort on short tags.
Fix value typo in hash mode enum.
Differentiate unexpectedly short value, zero length (deliberate invalid)
and off-end-of-record tags through expertinfo.
Continue to use proto_tree_add_*() length mismatch warnings for unxepectedly
long tags for now.
Change WWN tags to FT_BYTES for now as they are 16 not 8 byte WWN. Not
currently implemented outside Wireshark anyway.

Ping-Bug: 12303
Change-Id: I79fe4332f0c1f2aed726c69acdbc958eb9e08816
Reviewed-on: https://code.wireshark.org/review/17382
Reviewed-by: Anthony Coddington <anthony.coddington@endace.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>
2016-09-02 11:55:54 +00:00
Uri Simchoni e0e2396bdb SMB2: dissect class and infolevel in get quota info request
(actually, in [MS-SMB2] those are called "InfoType" and
"FileInfoClass", respectively)

Change-Id: Id583be4574cea5ce092c374a5624a4bd17d5d4c6
Signed-off-by: Uri Simchoni <urisimchoni@gmail.com>
Reviewed-on: https://code.wireshark.org/review/17443
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-09-02 11:43:04 +00:00
Uri Simchoni 79b50207ba SMB2: dissect quota info
This info appears in the request buffer of setinfo quota,
or in the response buffer of getinfo quota.

Change-Id: I5c8d96a05eddfa123547a7dd2577a01ac8cbd32d
Signed-off-by: Uri Simchoni <urisimchoni@gmail.com>
Reviewed-on: https://code.wireshark.org/review/17442
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>
2016-09-02 11:42:29 +00:00
Uri Simchoni aa2471dfd5 SMB: make dissect_nt_user_quota public
To be usable by SMB2 dissector

Change-Id: I7f5b9a021951c2529f8058cd2fc160eff2e865c6
Signed-off-by: Uri Simchoni <urisimchoni@gmail.com>
Reviewed-on: https://code.wireshark.org/review/17441
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-09-02 06:05:27 +00:00
Uri Simchoni 416bd9a108 smb: parse user quota change time
In SMB user quota records, parse unknown 8-byte field
as quota record's last change time

(source - [MS-FSCC] 2.4.33)

Change-Id: I1f2839934fc0ab8e3d38105e02ef91a547256a70
Signed-off-by: Uri Simchoni <urisimchoni@gmail.com>
Reviewed-on: https://code.wireshark.org/review/17440
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>
2016-09-02 06:05:09 +00:00
Uli Heilmeier 1ba3426f18 GSM MAP: Add OSM URI for locationEstimate
As requested by bug 10969 add a link to OSM for locationEstimate.

Bug: 10969
Change-Id: I715b3b5eae9728999d5c8f8c155bbcef3911ee93
Reviewed-on: https://code.wireshark.org/review/17375
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>
Reviewed-by: Roland Knall <rknall@gmail.com>
2016-09-02 05:59:54 +00:00
Peter Wu 80181532b6 uat: fix memleak after parsing and on errors
Memleaks could occur in these scenarios:
 - Two consecutive fields fail in their chk callback, overwriting the
   first heap-allocated error message.
 - After parsing one record, the internal record was never freed.
 - Syntax errors abort the parsing process and leaks the record and
   current field value.

These leaks will only happen at startup, when the UAT files are read or
when UAT strings are loaded (e.g. from the ssl.keys_list preference).

Change-Id: I4cf7cbc8131f71493ba70916a8f60168e5d65148
Reviewed-on: https://code.wireshark.org/review/17432
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-09-01 21:11:51 +00:00
Pascal Quantin 27164ddc5b E.212: update Chinese PLMN list
Bug: 12798
Change-Id: Id9569cb0f79094d5152ea5949d398eb7384ee76f
Reviewed-on: https://code.wireshark.org/review/17439
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-09-01 19:37:23 +00:00
Peter Wu e7cac432fb uat: clarify documentation
No functional change, fixes typos, adds some meaningful function
parameters and tries to clarify the memory management concerns.

Also fix a -Wdocumentation issue in epan/proto.h

Change-Id: I59d1fcd2ce96178e0a64a0709409a9a7a447c7c6
Reviewed-on: https://code.wireshark.org/review/17431
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-09-01 19:06:49 +00:00
Binh Trinh 1bffa8ec04 GTP: Added dissection of UTRAN Container for Forward Rel Req/Resp Messages
Change-Id: I8330e7e57d3ad09e526da0d7a0970f96fedd03a6
Reviewed-on: https://code.wireshark.org/review/17434
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>
2016-09-01 08:47:00 +00:00
Peter Wu 717ca58264 ipv6: fix build with old 32-bit glib headers (master only)
Introduced with v2.3.0rc0-112-gdcb7b71, nxt is only a guint8* which
fails on 32-bit glib before 2.31.2.

Change-Id: Ide1816a971fa213f5669a7fa71bc111d5b1cc921
Reviewed-on: https://code.wireshark.org/review/17418
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-09-01 08:22:35 +00:00
Peter Wu 71f867490d ipsec: fix build with old 32-bit glib headers
In commit v2.3.0rc0-121-gb6d13ef, GUINT_TO_POINTER(ah_nxt) was added,
but on 32-bit glib before 2.31.2 this results in a type error. Change
the type of ah_nxt since all its users take a guint anyway.

Change-Id: I2fb030f79011b8a7159a0b0df26d3545b0ce3c06
Reviewed-on: https://code.wireshark.org/review/17419
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-09-01 08:22:12 +00:00
Pascal Quantin 717215df61 E.212: update list to Operational Bulletin No. 1106 (15.VIII.2016)
Also manually add PLMN 460 02 (Chian Mobile) as it is not listed by ITU yet

Bug: 12622
Bug: 12798
Change-Id: I7c6fab9dcb9da90178186e94f624301ef1861421
Reviewed-on: https://code.wireshark.org/review/17428
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>
2016-08-31 21:10:33 +00:00
Jaap Keuter cb2f8fc891 OSSP: Retrieve OUI at proper offset in packet
Bug: 12801
Change-Id: Ic70f0d93bbffc99ceacf6b2963b04d7477e4914b
Reviewed-on: https://code.wireshark.org/review/17425
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-08-31 20:59:08 +00:00
Alexis La Goutte ce2fa7b30a NFS: fix indent (remove some trailing spaces)
Change-Id: Ic72d264686c3b37ac15118eec07057c7bb8a2a50
Reviewed-on: https://code.wireshark.org/review/17422
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>
2016-08-31 16:56:00 +00:00
Peter Wu 5c2d82a6c2 diam_dict.l: remove use of strdup
This should fix crashes on Windows, _strdup should not be mixed with
g_free. This was only uncovered in v2.3.0rc0-474-ga04b6fc, before that
ddict_free was never called.

Change-Id: I34111385c82715de70fb42fe44b99b89e132a374
Reviewed-on: https://code.wireshark.org/review/17423
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-08-31 16:52:27 +00:00
Jonathan Brucker bccbae58a1 rftap: add new dissector
The RFtap protocol is a simple metadata header designed to provide
Radio Frequency (RF) metadata about frames.

For official specifications see: https://rftap.github.io/

Signed-off-by: Jonathan Brucker <jonathan.brucke@gmail.com>
Change-Id: I0d008b2baadcc5cc9577113e9795eef2691b961a
Reviewed-on: https://code.wireshark.org/review/17355
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: Michael Mann <mmann78@netscape.net>
2016-08-31 11:41:03 +00:00
Guy Harris 6362183825 Revert "Revert "diameter: fix 400kb leaked memory on exit""
This reverts commit 5fea2b5f41.

I.e., it puts back the change; the reverted version passed the tests on which the versions with this change crashed.

Change-Id: Idcc0eb11588cf14e2fe666de1905ee63917b0fcf
Reviewed-on: https://code.wireshark.org/review/17413
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-08-31 08:16:31 +00:00
Guy Harris 5fea2b5f41 Revert "diameter: fix 400kb leaked memory on exit"
This reverts commit a04b6fcb3d.

Temporary revert to see if this prevents the "tshark -G" crashes being seen on the 64-bit Windows buildbot.

Change-Id: I561439039ca2667b72d7e2319a6f3f5f97e18d15
Reviewed-on: https://code.wireshark.org/review/17412
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-08-31 07:42:44 +00:00
Guy Harris c8869f68db OK, it probably crashed in proto_initialize_all_prefixes().
Remove the debugging printouts.

The changes that were committed between the last build that didn't crash
and the first build that did were:

commit 961f743d69
Author: Peter Wu <peter@lekensteyn.nl>
Date:   Mon Aug 29 01:34:22 2016 +0200

    xml: fix some memleaks

    No more memleaks reported for the attachment in bug 12790 :-)

    Change-Id: I8472e442143b332edfacdf9ef3b8b893f1ec4386
    Ping-Bug: 12790
    Reviewed-on: https://code.wireshark.org/review/17365
    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: Peter Wu <peter@lekensteyn.nl>

commit a04b6fcb3d
Author: Peter Wu <peter@lekensteyn.nl>
Date:   Sun Aug 28 22:19:29 2016 +0200

    diameter: fix 400kb leaked memory on exit

    Before:

        SUMMARY: AddressSanitizer: 399684 byte(s) leaked in 17208 allocation(s).

    After addressing to-do by calling ddict_free:

        SUMMARY: AddressSanitizer: 3024 byte(s) leaked in 256 allocation(s).

    After fixing all remaining leaks cases in the flex file for diameter:

        SUMMARY: AddressSanitizer: 735 byte(s) leaked in 58 allocation(s).

    Not bad huh :-)

    Ping-Bug: 12790
    Change-Id: I0c730ad77ae15c69390bc6cf0a3a985395a64771
    Reviewed-on: https://code.wireshark.org/review/17364
    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
    Reviewed-by: Michael Mann <mmann78@netscape.net>
    Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
    Reviewed-by: Peter Wu <peter@lekensteyn.nl>

commit 14312835c6
Author: Peter Wu <peter@lekensteyn.nl>
Date:   Sun Aug 28 19:20:59 2016 +0200

    pcapng: do not leak blocks

    pcapng_open and pcapng_read have 'wblock' allocated on the stack, so if
    they return, they do not have to set wblock.block to NULL.

    pcapng_read_block always sets wblock->block to NULL and may initialize
    it for SHB, IDB, NRB and ISB. Be sure to release the memory for IDB and
    ISB. It is better to have more wtap_block_free calls on a NULL value
    than missing them as this would be a memleak (on the other hand, do not
    release memory that is stored elsewhere such as SHB and NRB).

    Ping-Bug: 12790
    Change-Id: I081f841addb36f16e3671095a919d357f4bc16c5
    Reviewed-on: https://code.wireshark.org/review/17362
    Petri-Dish: Peter Wu <peter@lekensteyn.nl>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
    Reviewed-by: Peter Wu <peter@lekensteyn.nl>

*If* one of those is the cause, my guess is that it's the Diameter one,
as the crash happens before any file is read (so it's probably not the
pcapng one) and thus before any dissection is done (so it's probably not
the XML dissector one).

Change-Id: I816c1bbd6078eab251efd02ebb7c3195f6dd1483
Reviewed-on: https://code.wireshark.org/review/17411
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-08-31 07:40:39 +00:00
Binh Trinh 1178ee68fb GTP: patch for Target identification for non-compliance workaround
bug 3974

Change-Id: I2faa473c725a803056d6ffd0cb34b46d75121061
Reviewed-on: https://code.wireshark.org/review/17410
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>
2016-08-31 06:27:59 +00:00
Chaitanya T K 5be39d98fb ieee80211: Fix the BAR Ack policy values
As per 802.11-2012 table 8-15 the string should be reverse.
0 - Send Immediate Ack (False)
1 - Dont't Send Immediate Ack (True)

Change-Id: Iea3b179e11781f891d2294b0bcdf92de2bdba7ba
Reviewed-on: https://code.wireshark.org/review/17394
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>
2016-08-31 04:53:42 +00:00
Tom Haynes a68fb134c7 nfs4: Handle CB_GETATTR
Change-Id: Ifb68af443c6f13dfab99e32488d86c148621a316
Signed-off-by: Tom Haynes <loghyr@primarydata.com>
Reviewed-on: https://code.wireshark.org/review/17399
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>
2016-08-31 04:46:57 +00:00
Guy Harris 1512ee7d84 Crashing in proto_initialize_all_prefixes()? Debugging output.
Change-Id: I6db711b1730b95460983ee190762753198c1959e
Reviewed-on: https://code.wireshark.org/review/17409
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-08-31 03:04:27 +00:00
Sean O. Stalley 18a873d576 MAUSB: Add Cancellation Status values defined in v1.0a Spec
Change-Id: I72812fa0650da0cde37ea6cbef81a3c7a9ba333d
Reviewed-on: https://code.wireshark.org/review/17373
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>
2016-08-31 02:34:59 +00:00
Juanjo Martin 290e23299d RTPS: Fixed data holder dissection to match the standard
The OMG standard has changed in this new version. I have fixed
the implementation.

Change-Id: Ie9054ed52c66580c76096af86e0fb8e34a44e9d1
Reviewed-on: https://code.wireshark.org/review/17348
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>
2016-08-31 01:37:46 +00:00
Tom Haynes 436ed87580 nfs: Fix style in switch
Change-Id: Ica9fc960946542badb64af12769e7dfa3793db82
Signed-off-by: Tom Haynes <loghyr@primarydata.com>
Reviewed-on: https://code.wireshark.org/review/17397
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-08-31 01:28:52 +00:00
Guy Harris a4c8ebc18b Don't do any Decode As stuff for dissector tables not used with Decode As.
Have all dissector tables have a "supports Decode As" flag, which
defaults to FALSE, and which is set to TRUE if a register_decode_as()
refers to it.

When adding a dissector to a dissector table with a given key, only add
it for Decode As if the dissector table supports it.

For non-FT_STRING dissector tables, always check for multiple entries
for the same protocol with different dissectors, and report an error if
we found them.

This means there's no need for the creator of a dissector table to
specify whether duplicates of that sort should be allowed - we always do
the check when registering something for "Decode As" (in a non-FT_STRING
dissector table), and just don't bother registering anything for "Decode
As" if the dissector table doesn't support "Decode As", so there's no
check done for those dissector tables.

Change-Id: I4a1fdea3bddc2af27a65cfbca23edc99b26c0eed
Reviewed-on: https://code.wireshark.org/review/17402
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-08-31 00:08:01 +00:00
Juanjo Martin 1dbd2216ed RTPS: Allowing duplicates in the rtps.type_name table
Change-Id: Ie7a35b0bb3275a0895fad646bf9a81406eadf37c
Reviewed-on: https://code.wireshark.org/review/17393
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-08-30 22:58:07 +00:00
Tom Haynes 8b705b3753 nfs: Standardize on FileHandle vs filehandle
Change-Id: Ib945ddee4a35bf984a9411e56ed3801cde70c6c4
Signed-off-by: Tom Haynes <loghyr@primarydata.com>
Reviewed-on: https://code.wireshark.org/review/17398
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-30 21:42:45 +00:00
Guy Harris afa2605e43 Support Decode As for {SSL,TLS}-over-TCP.
We register dissectors for "Decode As" for {SSL,TLS}-over-TCP, so we
should actually set up the "Decode As" stuff for it.

Change-Id: I2a738667efdec1007069df74885a4fe8fc3fcbab
Reviewed-on: https://code.wireshark.org/review/17400
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-08-30 20:38:44 +00:00
AndersBroman 68b7398119 [Diameter] Improve dissection of malformed packets by continnuing
dissection and display the problem more prominetly.

Change-Id: Ia1a32667a18e1e5b60b5c167da9b6dd945ba3dfc
Reviewed-on: https://code.wireshark.org/review/17385
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>
2016-08-30 19:24:19 +00:00
Peter Wu 7c75370224 ssl: fix wrong detection of non-resumed renegotiated session
If the heuristics fail to detect a resumed session, then it must mark
the session as a normal session. This will also prevent from
applying secrets that do not apply to this renegotiated session.

Bug: 12793
Change-Id: I90f794a7bbaf7f1839e39656ac318183ecf48887
Reviewed-on: https://code.wireshark.org/review/17376
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>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-30 08:15:14 +00:00
Binh Trinh cbd3648738 GTP: add new RAT Type values
Change-Id: Ia3d8956197faff9366de2635a9bd29f2bfc40f0d
Reviewed-on: https://code.wireshark.org/review/17381
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-30 06:18:06 +00:00
Peter Wu 961f743d69 xml: fix some memleaks
No more memleaks reported for the attachment in bug 12790 :-)

Change-Id: I8472e442143b332edfacdf9ef3b8b893f1ec4386
Ping-Bug: 12790
Reviewed-on: https://code.wireshark.org/review/17365
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: Peter Wu <peter@lekensteyn.nl>
2016-08-29 22:09:22 +00:00
Peter Wu a04b6fcb3d diameter: fix 400kb leaked memory on exit
Before:

    SUMMARY: AddressSanitizer: 399684 byte(s) leaked in 17208 allocation(s).

After addressing to-do by calling ddict_free:

    SUMMARY: AddressSanitizer: 3024 byte(s) leaked in 256 allocation(s).

After fixing all remaining leaks cases in the flex file for diameter:

    SUMMARY: AddressSanitizer: 735 byte(s) leaked in 58 allocation(s).

Not bad huh :-)

Ping-Bug: 12790
Change-Id: I0c730ad77ae15c69390bc6cf0a3a985395a64771
Reviewed-on: https://code.wireshark.org/review/17364
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-08-29 22:08:50 +00:00
Sean O. Stalley 22ba931e15 MAUSB: Add Status value defined in v1.0a Spec
Change-Id: Ie8e77fffd54eb9b1918d90999a4419a80de8bc5e
Reviewed-on: https://code.wireshark.org/review/17374
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-29 17:46:20 +00:00
Dario Lombardo 09a6383c12 telnet: remove meaningless line (CID 1372125).
Change-Id: I3b9bc01a4f72e2e0de3f83426a9b8e7060d0c89a
Reviewed-on: https://code.wireshark.org/review/17366
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-29 11:49:40 +00:00
Peter Wu 9b272d8c80 tproxy: fix memleak in is_banner_exchange_for
strdup and strcmp is a recipe for leaking.

Change-Id: I522c71964e39f671a4101df9b2b432433fc1c12e
Reviewed-on: https://code.wireshark.org/review/17363
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-08-29 01:05:28 +00:00
Peter Wu 0bae8424fe tvbparse: fix memleak
Use same wmem_epan_scope() as "w" (tvbparse_wanted_t).

Change-Id: I73fdb1fb3b55a91b7bb0fc36e435024c6f0b3d73
Ping-Bug: 12790
Reviewed-on: https://code.wireshark.org/review/17361
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-08-28 22:07:22 +00:00
Gerald Combs 7da7691679 [Automatic update for 2016-08-28]
Update manuf, services enterprise-numbers, translations, and other items.

Change-Id: Ic4d32253800cb94d52c817f1cd40179d878323cb
Reviewed-on: https://code.wireshark.org/review/17358
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-08-28 15:14:44 +00:00
Mirko Parthey 294fcd11bf ISAKMP: fix # of SPIs field name in Delete payload
Fix the "Number of SPIs" field name in the Delete payload.
References: RFC 2408, RFC 7296

Change-Id: I205fb830275fc011e6605fdae53c6b9141e1628b
Reviewed-on: https://code.wireshark.org/review/17353
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>
2016-08-28 14:41:06 +00:00
Stig Bjørlykke 9a935d334a xmpp: Improve stanza reassembly.
A XMPP stanza may be fragmented inside a conversation, so don't
check for this only when starting a new conversation.

Change-Id: I63b987184f52645e6c72c3c4155b39b7948de828
Reviewed-on: https://code.wireshark.org/review/17344
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-28 06:09:37 +00:00
Jaap Keuter d0565ad22b Properly end address type search by name (CID-1362742)
Search address type by name iterates over an array, but fails to find its end.
Therefore it may dereference invalid pointers, or NULL.

Add the proper check in the for loop and make sure an end condition is always
there in the array searched.

Change-Id: I60ade9d438dc394340b6483b4fcb23e5ce432000
Reviewed-on: https://code.wireshark.org/review/17337
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>
2016-08-26 16:49:57 +00:00
Jaap Keuter 18e1ee7160 SDP: Restore usability of conversation debug feature.
Some type changes were not carried forwared into the conversation
debugging code. These changes allow compilation again.

Change-Id: I90dde7cc94496828cf8931d74225773c2cea42a1
Reviewed-on: https://code.wireshark.org/review/17336
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>
2016-08-26 16:47:26 +00:00
Juanjo Martin e19c176f7b RTPS: Added missing parameters
Added the dissection of three parameters.

Change-Id: I07e7b655ad7fd3462625c2fb565e41593c62f897
Reviewed-on: https://code.wireshark.org/review/17346
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-08-26 16:43:30 +00:00
Alexis La Goutte fa320f8822 QUIC: Update COL_INFO when packet is RST Stream and use rst stream code error
Issue reported by Lucas Pardue
Change-Id: Ic3c53fce9751a556c5f1aa30d55687a60c9c6a4d
Reviewed-on: https://code.wireshark.org/review/17345
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Lucas Pardue <lucas.pardue@bbc.co.uk>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-08-26 13:41:04 +00:00
Alexis La Goutte 14bd8793f7 QUIC: Update COL_INFO when packet is GOAWAY
Issue reported by Lucas Perdue
Change-Id: I4852f6bad7a4c98b345ff198b33ab560eacb5ed0
Reviewed-on: https://code.wireshark.org/review/17341
Reviewed-by: Lucas Pardue <lucas.pardue@bbc.co.uk>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-08-26 13:40:01 +00:00
Alexis La Goutte df28c8266f QUIC: Fix some typo (copy/paste error) on GOAWAY/CONNECTION_CLOSE Frame
Issue reported by Lucas Perdue

Change-Id: I9c4ede6ba2fb0303aab05f1d59835e5a8b386a3e
Reviewed-on: https://code.wireshark.org/review/17340
Reviewed-by: Lucas Pardue <lucas.pardue@bbc.co.uk>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-08-26 13:39:10 +00:00
Guy Harris c8157aa6b4 Go back to having only one SocketCAN LINKTYPE_ value.
Libpcap just backed out the "host-endian" SocketCAN LINKTYPE_ value; we
don't need it any more.

Change-Id: I33a7dc21207a0009e20b4abaefe1119eb649c39a
Reviewed-on: https://code.wireshark.org/review/17327
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-08-25 21:14:48 +00:00
Stig Bjørlykke ce9a4b212e xmpp/xml: Store item length in xml_frame.
The created XML proto_item can be faked (if not visible and not referenced),
so ensure we store the correct item length to be used in XMPP.

This will avoid an invalid "Malformed Packet" for some XMPP packets.

Change-Id: I79d805b725dbeb93f26a38b72bdcc84187aee16f
Reviewed-on: https://code.wireshark.org/review/17324
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-08-25 15:13:26 +00:00
Stig Bjørlykke c661da414d xmpp: Add whitespace keepalive indication
RFC 6120 section 4.6.1 defines the use of a single whitespace as
"whitespace keepalive", so indicate this in the Info column.

Change-Id: I685431d91be2a37fbd66f8d1cdabe53f33092e93
Reviewed-on: https://code.wireshark.org/review/17323
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-08-25 11:57:40 +00:00
Guy Harris 8ce301704b Expand comments.
Change-Id: I4e3de542d24c567434f4554917e826ccbd64cb6c
Reviewed-on: https://code.wireshark.org/review/17319
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-08-25 02:24:08 +00:00
Dario Lombardo 4cf9a1dca0 dtls: remove unneeded checks (CID 1158712 & 1158716).
Change-Id: Id463f7746880f71f317bb52b40dc8b298965b4ec
Reviewed-on: https://code.wireshark.org/review/17300
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-24 21:34:24 +00:00
Alexis La Goutte 47a95f6535 HTTP2: Display PUSH_PROMISE Header in bytes
and also use the name of spec for field (Header BLock Fragment

Change-Id: I5a3884186258dac1f243f991a3392c875403eb97
Reviewed-on: https://code.wireshark.org/review/17310
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>
2016-08-24 21:33:03 +00:00
Martin Kaiser c7986c5b02 zbee-nwk-gp: don't THROW() an exception from a dissector
show expert infos and return the number of bytes we dissected

Change-Id: Ibb12372e8670380137f4fc3d012d0b0afa4cd638
Reviewed-on: https://code.wireshark.org/review/17313
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-24 21:31:45 +00:00