gd/wireshark/.git
7 years agoupdate WERR definitions from Samba's werror.h. master-clusapi
Günther Deschner [Tue, 29 Sep 2015 17:56:14 +0000 (19:56 +0200)]
update WERR definitions from Samba's werror.h.

Guenther

Signed-off-by: Günther Deschner <gd@samba.org>
7 years agoAdd autogenerated clusapi (Windows Cluster Management API) dissector.
Günther Deschner [Mon, 28 Sep 2015 21:45:06 +0000 (23:45 +0200)]
Add autogenerated clusapi (Windows Cluster Management API) dissector.

We avoid compiling clusapi_PROPERTY_LIST using pidl.

This struct contains inline arrays and is not strictly needed by clusapi
therefor disable it.

Guenther

Signed-off-by: Günther Deschner <gd@samba.org>
7 years agoKeep case from names.
Günther Deschner [Wed, 11 May 2016 13:41:02 +0000 (15:41 +0200)]
Keep case from names.

Guenther

Signed-off-by: Guenther Deschner <gd@samba.org>
7 years agoadd clusapi.idl and .cnf from Samba git tree.
Günther Deschner [Mon, 28 Sep 2015 21:39:43 +0000 (23:39 +0200)]
add clusapi.idl and .cnf from Samba git tree.

Guenther

Signed-off-by: Günther Deschner <gd@samba.org>
7 years agopidl: support HRESULT as return code in wireshark
Günther Deschner [Mon, 28 Sep 2015 05:28:28 +0000 (07:28 +0200)]
pidl: support HRESULT as return code in wireshark

Guenther

Signed-off-by: Günther Deschner <gd@samba.org>
7 years agowireshark: add support for Windows HRESULT error codes.
Günther Deschner [Mon, 28 Sep 2015 05:30:07 +0000 (07:30 +0200)]
wireshark: add support for Windows HRESULT error codes.

Guenther

Signed-off-by: Günther Deschner <gd@samba.org>
7 years agoEnsure to have a valid string pointer when writing OS SHB option
Pascal Quantin [Tue, 26 Jul 2016 11:58:55 +0000 (13:58 +0200)]
Ensure to have a valid string pointer when writing OS SHB option

Change-Id: Ib0b6dcdf1700e88383d30bf43739312fce10e1c7
Reviewed-on: https://code.wireshark.org/review/16696
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>
7 years agoeditcap: fix typos
Dario Lombardo [Tue, 26 Jul 2016 09:56:28 +0000 (11:56 +0200)]
editcap: fix typos

Change-Id: Ibdd81d8dbc779a8741a83d1269ccfb5ea156dd5a
Reviewed-on: https://code.wireshark.org/review/16691
Reviewed-by: Anders Broman <a.broman58@gmail.com>
7 years agoUpdate .mailmap
Alexis La Goutte [Tue, 26 Jul 2016 10:07:24 +0000 (12:07 +0200)]
Update .mailmap

Change-Id: Id725f28977282b289a2de26cac2fb92713babe6a
Reviewed-on: https://code.wireshark.org/review/16692
Reviewed-by: Anders Broman <a.broman58@gmail.com>
7 years agopacket-smb2: fix data type of share_type
Hiroshi Ioka [Tue, 26 Jul 2016 10:38:44 +0000 (19:38 +0900)]
packet-smb2: fix data type of share_type

According to spec,

https://msdn.microsoft.com/en-us/library/cc246499.aspx

share_type uses 1 byte.
But, current implementation allocates 2 bytes for it.

Change-Id: Ibf55c49168a417c16bde57aad368a1265040afae
Reviewed-on: https://code.wireshark.org/review/16695
Reviewed-by: Anders Broman <a.broman58@gmail.com>
7 years agoBGP: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
Alexis La Goutte [Tue, 26 Jul 2016 08:59:30 +0000 (10:59 +0200)]
BGP: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang

Change-Id: Iaec85cbe8fbced461a56f55f8813506054356369
Reviewed-on: https://code.wireshark.org/review/16688
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>
7 years agos1ap: fix indent (use 2 spaces) and modelines info
Alexis La Goutte [Tue, 26 Jul 2016 10:08:20 +0000 (12:08 +0200)]
s1ap: fix indent (use 2 spaces) and modelines info

Change-Id: I450f252d22b21438e55285b2af950f6a1c9f6d10
Reviewed-on: https://code.wireshark.org/review/16693
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>
7 years agoDNP dissector. Typo in comments
bartolootrit [Tue, 19 Jul 2016 16:38:49 +0000 (16:38 +0000)]
DNP dissector. Typo in comments

Change-Id: Ie77c7bba0e97cca87b443552c8efe9aaed45734d
Reviewed-on: https://code.wireshark.org/review/16545
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
7 years agoERSPAN: add link to protocol spec and refactoring.
William Tu [Tue, 26 Jul 2016 00:52:45 +0000 (17:52 -0700)]
ERSPAN: add link to protocol spec and refactoring.

Add link to ERSPAN protocol spec, remove obsolete comments, and
remove unnecessary 'if(tree)' check.

Change-Id: I1b4950777c84d62301c322afdfc876949db0d4ed
Signed-off-by: William Tu <u9012063@gmail.com>
Reviewed-on: https://code.wireshark.org/review/16675
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>
7 years agoFix decoding of MS Info Change Reporting Action
Marius Paliga [Mon, 25 Jul 2016 07:54:37 +0000 (09:54 +0200)]
Fix decoding of MS Info Change Reporting Action

Bug: 12642
Change-Id: I69b339ff4785a2fe3fb0e2111264616815339c1b
Reviewed-on: https://code.wireshark.org/review/16644
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
7 years agoFix some of the checkAPIs.pl warnings for g_warning.
Michael Mann [Tue, 26 Jul 2016 02:58:09 +0000 (22:58 -0400)]
Fix some of the checkAPIs.pl warnings for g_warning.

1. Create ws_g_warning for legitimate uses of g_warning
2. Use proto_tree_add_debug_text
3. Comment some out

Change-Id: Ida044bf40286b955fdd529c4f9907c8e09b3d7c5
Reviewed-on: https://code.wireshark.org/review/16678
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>
7 years agoGVSP: enforce heuristic (get some false positive with STUN)
Alexis La Goutte [Thu, 21 Jul 2016 21:27:05 +0000 (23:27 +0200)]
GVSP: enforce heuristic (get some false positive with STUN)

Change-Id: Ic1da51a71ee4fa60267751d7bb3f46225ad2f084
Reviewed-on: https://code.wireshark.org/review/16573
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>
7 years agoMP-BGP dissector: Fix EVPN route type 5 decoding
Matt Texier [Fri, 22 Jul 2016 00:10:54 +0000 (02:10 +0200)]
MP-BGP dissector: Fix EVPN route type 5 decoding

Route type 5 do have optional fields that was not properly decoded (MPLS labels)

Bug: 12631
Change-Id: I12d61ef170d4e0f6e6d2c7bf25f149db84c186d7
Reviewed-on: https://code.wireshark.org/review/16576
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>
7 years agopacket-smb2: add a dissector for STATUS_STOPPED_ON_SYMLINK
Hiroshi Ioka [Mon, 18 Jul 2016 07:59:31 +0000 (16:59 +0900)]
packet-smb2: add a dissector for STATUS_STOPPED_ON_SYMLINK

Bug: 12628
Change-Id: I666416d1a6facdbf8f4fa6230d6b061cad23dc7a
Reviewed-on: https://code.wireshark.org/review/16524
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
7 years agoSMB2: Always display reserved field
Alexis La Goutte [Mon, 25 Jul 2016 10:04:25 +0000 (12:04 +0200)]
SMB2: Always display reserved field

Change-Id: I2f4878d7b730d626d75ac5ed57a00acc8ec34990
Reviewed-on: https://code.wireshark.org/review/16658
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>
7 years agoWBXML: limit the recursion level
Pascal Quantin [Mon, 25 Jul 2016 15:39:10 +0000 (17:39 +0200)]
WBXML: limit the recursion level

Bug: 12663
Change-Id: Ibbab2f20f4eda9f42ea0ea5e88dcf553cce1b55c
Reviewed-on: https://code.wireshark.org/review/16670
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: Anders Broman <a.broman58@gmail.com>
7 years agoWAP: check that tvb_get_guintvar does not overflow
Pascal Quantin [Mon, 25 Jul 2016 15:08:26 +0000 (17:08 +0200)]
WAP: check that tvb_get_guintvar does not overflow

Bug: 12661
Change-Id: I2ef857d6be6595fd89f3dbb8d41c1c70d550ad93
Reviewed-on: https://code.wireshark.org/review/16665
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
7 years agoproto.c: add bounds check to proto_tree_add_text(_valist)_internal
Pascal Quantin [Mon, 25 Jul 2016 09:19:05 +0000 (11:19 +0200)]
proto.c: add bounds check to proto_tree_add_text(_valist)_internal

Bug: 12659
Change-Id: I44cb3ce8e647ae2816d5ffa95435068c435a1e5c
Reviewed-on: https://code.wireshark.org/review/16648
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
7 years agoUse a variable consistently.
Gerald Combs [Mon, 25 Jul 2016 17:15:46 +0000 (10:15 -0700)]
Use a variable consistently.

We test against "field" in ServiceResponseTimeDialog::filterExpression.
Make sure we use it within the test as well.

Bug: 12627
Change-Id: If11ab9fcdb8394f4366569185808ec1ddfc34dfe
Reviewed-on: https://code.wireshark.org/review/16672
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
7 years agoIPv6: Add fragment header size #define
João Valverde [Mon, 25 Jul 2016 23:18:09 +0000 (00:18 +0100)]
IPv6: Add fragment header size #define

Change-Id: I536324da9ec761279cc3d3d5df681a4217d5b5fc
Reviewed-on: https://code.wireshark.org/review/16676
Reviewed-by: João Valverde <j@v6e.pt>
7 years agoeditcap: fix typos
Dario Lombardo [Mon, 25 Jul 2016 15:12:30 +0000 (17:12 +0200)]
editcap: fix typos

Change-Id: Ic5eb5daca1ab7463723ee2b299482929f3e8be56
Reviewed-on: https://code.wireshark.org/review/16666
Reviewed-by: Anders Broman <a.broman58@gmail.com>
7 years agovxlan(.h): fix no newline at end of file [-Wnewline-eof]
Alexis La Goutte [Mon, 25 Jul 2016 14:03:23 +0000 (16:03 +0200)]
vxlan(.h): fix no newline at end of file [-Wnewline-eof]

Change-Id: Ib53a0234eb8b6a24470e1e6beabe26515b6ef421
Reviewed-on: https://code.wireshark.org/review/16664
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>
7 years agoSMB2: (Re)indent hf_register_info hf (use tab)
Alexis La Goutte [Mon, 25 Jul 2016 10:27:43 +0000 (12:27 +0200)]
SMB2: (Re)indent hf_register_info hf (use tab)

Change-Id: I872baa7bf44cc6c675366206e749c50001cee067
Reviewed-on: https://code.wireshark.org/review/16659
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agovsock: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
Alexis La Goutte [Mon, 25 Jul 2016 09:51:38 +0000 (11:51 +0200)]
vsock: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang

Change-Id: I266b0542597eec755b7998d9d5abbae8e804b192
Reviewed-on: https://code.wireshark.org/review/16651
Reviewed-by: Anders Broman <a.broman58@gmail.com>
7 years agoLDSS: check if a conversation already exists before recreating it
Pascal Quantin [Mon, 25 Jul 2016 11:32:45 +0000 (13:32 +0200)]
LDSS: check if a conversation already exists before recreating it

Bug: 12662
Change-Id: I81d91d54544e5865336dc08ffda9fe109fc643ed
Reviewed-on: https://code.wireshark.org/review/16660
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: Anders Broman <a.broman58@gmail.com>
7 years agoSHIM6: rename p variable by offset
Alexis La Goutte [Mon, 25 Jul 2016 09:26:08 +0000 (11:26 +0200)]
SHIM6: rename p variable by offset

Change-Id: I3f7e3291e119eb51c85381d1141bd79b2d61ec18
Reviewed-on: https://code.wireshark.org/review/16649
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>
7 years ago[S1AP] Add dissection of the content of UERadioCapabilityForPaging.
AndersBroman [Mon, 25 Jul 2016 09:34:22 +0000 (11:34 +0200)]
[S1AP] Add dissection of the content of UERadioCapabilityForPaging.

Change-Id: I7f6686a9324fdd364653404ed4b3315d6ca36716
Reviewed-on: https://code.wireshark.org/review/16650
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>
7 years ago[GTPv2] Dissect TWAN Identifier and other minor updates.
AndersBroman [Fri, 22 Jul 2016 12:35:56 +0000 (14:35 +0200)]
[GTPv2] Dissect TWAN Identifier and other minor updates.

Bug:12638
Change-Id: I13446727a46b4df4fe3e667723aa43d83efe1159
Reviewed-on: https://code.wireshark.org/review/16585
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>
7 years agoIPv6: Use wmem_packet_scope for ws_ip address allocation
João Valverde [Mon, 25 Jul 2016 03:55:06 +0000 (04:55 +0100)]
IPv6: Use wmem_packet_scope for ws_ip address allocation

Change-Id: I7e386fe0f8cb3a19a91a16c1152ce500367c13fd
Reviewed-on: https://code.wireshark.org/review/16654
Reviewed-by: João Valverde <j@v6e.pt>
7 years agoIPv6: Use pinfo->pool scope for ipv6_pinfo
João Valverde [Mon, 25 Jul 2016 03:21:21 +0000 (04:21 +0100)]
IPv6: Use pinfo->pool scope for ipv6_pinfo

Change-Id: I415103eaba23b1a616667cf7c72af3b391a9e5ab
Reviewed-on: https://code.wireshark.org/review/16653
Reviewed-by: João Valverde <j@v6e.pt>
7 years agoIPv6: Say "unknown" for unknown ip protocol column info
João Valverde [Mon, 25 Jul 2016 03:07:31 +0000 (04:07 +0100)]
IPv6: Say "unknown" for unknown ip protocol column info

Change-Id: I99424f9382dd602d3f29251cdbf7d32666409d90
Reviewed-on: https://code.wireshark.org/review/16652
Reviewed-by: João Valverde <j@v6e.pt>
7 years agoIPv6: Use ipv6_pinfo_t instead of ws_ip to keep some state
João Valverde [Sun, 24 Jul 2016 18:11:01 +0000 (19:11 +0100)]
IPv6: Use ipv6_pinfo_t instead of ws_ip to keep some state

To perform IPv6 defragmentation we need to compute the IPv6 fragment header
payload length by subtracting the length of intermediate extension headers
from the IPv6 payload length.

Add a new frag_plen field to ipv6_pinfo_t to do that instead of (ab)using
struct ws_ip.

Note: The RFC 2460 rules for fragment header order are stricter than the code
suggests but that shouldn't be a problem here.

Change-Id: I76f3cb3a1a29d96b080d3d53c0f493f9d0b2786c
Reviewed-on: https://code.wireshark.org/review/16637
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>
7 years agoRLC: fix a variable overflow in rlc_decode_li function
Pascal Quantin [Mon, 25 Jul 2016 07:37:25 +0000 (09:37 +0200)]
RLC: fix a variable overflow in rlc_decode_li function

Bug: 12660
Change-Id: I20a423eb9aa72383ac28d176bc60751ed36be9bd
Reviewed-on: https://code.wireshark.org/review/16639
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>
7 years agoRLC: fix a stack overflow in rlc_decode_li function
Pascal Quantin [Mon, 25 Jul 2016 07:54:06 +0000 (09:54 +0200)]
RLC: fix a stack overflow in rlc_decode_li function

The test to check whether the array was full or not was off by 1

Bug: 12664
Change-Id: If2057b71d92c7f03e05b0f4676abc62d5a03ae73
Reviewed-on: https://code.wireshark.org/review/16640
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
7 years agoAdd vSocket dissector
Gerard Garcia [Mon, 25 Jul 2016 01:33:41 +0000 (21:33 -0400)]
Add vSocket dissector

Header definition:
https://github.com/GerardGarcia/linux/blob/vsockmon/include/uapi/linux/vsockmon.h

Bug: 12623
Change-Id: I9af4b5069f69b847779a8b25abb3939e672dc9c3
Reviewed-on: https://code.wireshark.org/review/16308
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>
7 years agoFix checkAPI.pl warnings about printf
Michael Mann [Sun, 24 Jul 2016 12:53:39 +0000 (08:53 -0400)]
Fix checkAPI.pl warnings about printf

Many of the complaints from checkAPI.pl for use of printf are when its embedded
in an #ifdef and checkAPI isn't smart enough to figure that out.
The other (non-ifdef) use is dumping internal structures (which is a type of
debug functionality)
Add a "ws_debug_printf" macro for printf to pacify the warnings.

Change-Id: I63610e1adbbaf2feffb4ec9d4f817247d833f7fd
Reviewed-on: https://code.wireshark.org/review/16623
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>
7 years agoPacify GTK checkAPIs.pl warnings.
Michael Mann [Sun, 24 Jul 2016 18:16:19 +0000 (14:16 -0400)]
Pacify GTK checkAPIs.pl warnings.

Add "Wireshark" macros to old-gtk-compat.h for GTK APIs that have been deprecated.
The macros are setup by version number to limit their proliferation (not that I
suspect much development will really be done there since GTK is deprecated).
Just want to make buildbots happy for the time being.

Change-Id: I095f850065166a0bc2e2456fb2e886ab64fdd97d
Reviewed-on: https://code.wireshark.org/review/16635
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agozvt: use a hash table for the bitmaps
Martin Kaiser [Sun, 24 Jul 2016 16:43:14 +0000 (18:43 +0200)]
zvt: use a hash table for the bitmaps

table entries contain the length (if known and constant) and a function
to dissect the payload

this should clean up the code for bitmap dissection and make it easier
to add new entries

Change-Id: Id0ef5ff9e53c82171789c8a3352e56d3997d82b9
Reviewed-on: https://code.wireshark.org/review/16632
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
7 years agoUse 'nxt' argument in ipv6_dissect_next()
João Valverde [Sun, 24 Jul 2016 18:10:56 +0000 (19:10 +0100)]
Use 'nxt' argument in ipv6_dissect_next()

Change-Id: I7190aa5301ba54be4c179dc7815c4be82987c949
Reviewed-on: https://code.wireshark.org/review/16636
Reviewed-by: João Valverde <j@v6e.pt>
7 years agozvt: rename dissect_zvt_bitmap_apdu() to dissect_zvt_bitmap_seq()
Martin Kaiser [Sun, 24 Jul 2016 17:23:48 +0000 (19:23 +0200)]
zvt: rename dissect_zvt_bitmap_apdu() to dissect_zvt_bitmap_seq()

the sequence of bitmaps can either be the complete APDU payload or a
part of it

Change-Id: I3e3d176f29a5c2a0ad2c7fb61102c46255f436da
Reviewed-on: https://code.wireshark.org/review/16631
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
7 years agozvt: rename bitmap to bmp
Martin Kaiser [Sun, 24 Jul 2016 16:24:08 +0000 (18:24 +0200)]
zvt: rename bitmap to bmp

It looks like the specs call the first byte BMP and the whole record
(BMP + content) is called the bitmap.

Change-Id: I60ce75b131b3cddc59f614b8ca156ceacc890cf8
Reviewed-on: https://code.wireshark.org/review/16630
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
7 years agoAdd Ericsson A-bis P-GSL dissector
Harald Welte [Sat, 16 Jul 2016 18:36:11 +0000 (20:36 +0200)]
Add Ericsson A-bis P-GSL dissector

Ericsson uses a vendor-specific packetized PCU-CCU interface on their
packetized A-bis, which can be encapsulated in their own variant of HDLC
on top of L2TP.

The new P-GSL dissector is called from packet-ehdlc.c, which in turn
integrates with packet-l2tp.c.

Change-Id: Ifca190577b1c9691209221d79e3ef034dc3ca650
Reviewed-on: https://code.wireshark.org/review/16510
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agoReplace strlen with NULL checks to pacify checkAPIs.pl
Michael Mann [Sun, 24 Jul 2016 14:04:52 +0000 (10:04 -0400)]
Replace strlen with NULL checks to pacify checkAPIs.pl

Change-Id: I5db39cbd531c228da73447bf8899599f82e1889d
Reviewed-on: https://code.wireshark.org/review/16624
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agoFix shadow variable warnings.
Michael Mann [Sun, 24 Jul 2016 14:14:48 +0000 (10:14 -0400)]
Fix shadow variable warnings.

Change-Id: I1e6bd722b3f04f171b462fc680ca080bb7ec03c7
Reviewed-on: https://code.wireshark.org/review/16625
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years ago[Automatic update for 2016-07-24]
Gerald Combs [Sun, 24 Jul 2016 15:07:54 +0000 (08:07 -0700)]
[Automatic update for 2016-07-24]

Update manuf, services enterprise-numbers, translations, and other items.

Change-Id: I9a88b1d2ac3fd54cd2b7bfbb652ba504db81df65
Reviewed-on: https://code.wireshark.org/review/16626
Reviewed-by: Gerald Combs <gerald@wireshark.org>
7 years agoAdd basic dissector for Ericsson Packet A-bis TFP Protocol
Harald Welte [Sat, 16 Jul 2016 16:34:34 +0000 (18:34 +0200)]
Add basic dissector for Ericsson Packet A-bis TFP Protocol

This dissector currently onl dissects the TFP header, treating the
payload (TRAU) as opaque data.  Still, it is an improvement to see the
header information like timeslot, sequence number, delay and frame type.

The new TFP dissector is called from packet-ehdlc.c, which in turn is
used inside Ericsson-specific L2TP.

Change-Id: I8835c07e259ec9a324ec92aac39abbef2c902af3
Reviewed-on: https://code.wireshark.org/review/16509
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agoL2TP: Add some more Ericsson-specific AVPs
Harald Welte [Mon, 18 Jul 2016 14:09:56 +0000 (16:09 +0200)]
L2TP: Add some more Ericsson-specific AVPs

Change-Id: I3d0eb7f9b5641c388493c7188c128bfb14dfbf60
Reviewed-on: https://code.wireshark.org/review/16622
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agoFix indentation (no tabs).
Guy Harris [Sun, 24 Jul 2016 08:47:15 +0000 (01:47 -0700)]
Fix indentation (no tabs).

Change-Id: Ic45c0aa526e90bd51c0c501cdd349255ce0b43f5
Reviewed-on: https://code.wireshark.org/review/16621
Reviewed-by: Guy Harris <guy@alum.mit.edu>
7 years agoMore null "IP information" pointer checks.
Guy Harris [Sun, 24 Jul 2016 08:44:58 +0000 (01:44 -0700)]
More null "IP information" pointer checks.

Bug: 12645

Change-Id: I356b6570f9a33fd495523a5e1fa6ada56047dc45
Reviewed-on: https://code.wireshark.org/review/16620
Reviewed-by: Guy Harris <guy@alum.mit.edu>
7 years agoDon't even *mention* the TTL/hop limit if we don't have it.
Guy Harris [Sun, 24 Jul 2016 08:32:34 +0000 (01:32 -0700)]
Don't even *mention* the TTL/hop limit if we don't have it.

That's cleaner than reporting it as 0.

Change-Id: I862130c98131ba83f9689201d852e2f1aab34770
Reviewed-on: https://code.wireshark.org/review/16619
Reviewed-by: Guy Harris <guy@alum.mit.edu>
7 years agoMore null "IP information" pointer checks.
Guy Harris [Sun, 24 Jul 2016 08:21:26 +0000 (01:21 -0700)]
More null "IP information" pointer checks.

Bug: 12645
Change-Id: Iac662bec3c23b0b3d228766ad7a094f615770072
Reviewed-on: https://code.wireshark.org/review/16618
Reviewed-by: Guy Harris <guy@alum.mit.edu>
7 years agoPass the next protocol value to ip_try_dissect() as an argument.
Guy Harris [Sun, 24 Jul 2016 08:05:23 +0000 (01:05 -0700)]
Pass the next protocol value to ip_try_dissect() as an argument.

That way, we don't rely on the ws_ip pointer being non-null.

Based on changes from Ib73410fd8575ad6c836311bbda87a0580e5640ac.

Change-Id: If8c437572c725481ac4148c8095a1a479b4fb0f8
Reviewed-on: https://code.wireshark.org/review/16617
Reviewed-by: Guy Harris <guy@alum.mit.edu>
7 years agoPass the next header value to ipv6_dissect_next() as an argument.
Guy Harris [Sun, 24 Jul 2016 07:59:06 +0000 (00:59 -0700)]
Pass the next header value to ipv6_dissect_next() as an argument.

That way, we don't rely on the ws_ip pointer being non-null.

Based on changes from Ib73410fd8575ad6c836311bbda87a0580e5640ac.

Bug: 12645
Change-Id: I8c74ba57637b6a125593c4711d7c21b9693c2c85
Reviewed-on: https://code.wireshark.org/review/16616
Reviewed-by: Guy Harris <guy@alum.mit.edu>
7 years agoMore null pointer checks.
Guy Harris [Sun, 24 Jul 2016 07:48:41 +0000 (00:48 -0700)]
More null pointer checks.

Taken from Ib73410fd8575ad6c836311bbda87a0580e5640ac.

Bug: 12645
Change-Id: Ie08c113b6193da40ce0e438faefd78ad36b4d475
Reviewed-on: https://code.wireshark.org/review/16615
Reviewed-by: Guy Harris <guy@alum.mit.edu>
7 years agoDon't assume we've been passed a non-null data pointer.
Guy Harris [Sun, 24 Jul 2016 07:26:45 +0000 (00:26 -0700)]
Don't assume we've been passed a non-null data pointer.

There is no guarantee of that.

Bug: 12645
Change-Id: Icb3310e5df37acfd113a9e2b1fee34e59ef28962
Reviewed-on: https://code.wireshark.org/review/16614
Reviewed-by: Guy Harris <guy@alum.mit.edu>
7 years agoEnable "Save As..." iff cf_can_save_as() returns TRUE.
Guy Harris [Sun, 24 Jul 2016 02:16:36 +0000 (19:16 -0700)]
Enable "Save As..." iff cf_can_save_as() returns TRUE.

Currently, cf_can_save() really means "*there's something to save* and
we can write it out"; "Save As..." should be enabled even if there are
no changes to save, in case the user just wants to write the existing
file contents out to a new file and have the new file be the current
file.  That matches the behavior of the GTK+ version.

(We might want to enable "Save" even if there are no changes to save;
some other programs do that, such as the TextEdit, WordPad, KWrite, and
gedit simple text editors.  If so, however, we should make "Save" write
stuff out even if there are no changes to save.

Note, however, that we're a bit different from most "editors", in that
we don't read the entire file into memory - we keep the file open and
read packet data from it, because we want to be able to read files that
won't fit into memory.  That *might* change what we ultimately want to
do with "Save".)

Bug: 12630
Change-Id: I8a2327b5d6ddab7c4f0367f132460b507da38577
Reviewed-on: https://code.wireshark.org/review/16612
Reviewed-by: Guy Harris <guy@alum.mit.edu>
7 years agoReplace an #ifdef with g_path_is_absolute()
João Valverde [Sat, 23 Jul 2016 01:28:51 +0000 (02:28 +0100)]
Replace an #ifdef with g_path_is_absolute()

Change-Id: I0df8ea363502bb5e313192b6a10f6df032031699
Reviewed-on: https://code.wireshark.org/review/16601
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
7 years agopacket-ehdlc: Update with results from better understanding the protocol
Harald Welte [Sat, 16 Jul 2016 16:33:55 +0000 (18:33 +0200)]
packet-ehdlc: Update with results from better understanding the protocol

The Ericsson HDLC format inside L2TP is not publicly documented, so when
I originally wrote the code, I was basically just looking at hex-dumps
of protocol traces and trying to ge an initial understanding. By now,
that understanding has significantly matured, so let's update the
dissector accordingly.

The major changes are regarding the understanding that there is not a
message type, but in fact a compressed SAPI and compressed TEI field.

Based on this, we can discriminate on whether there will be a HDLC/LAPD
header to follow, or whether there's actual user data (TRAU frame
replacement) following.

Change-Id: Ic29d2d295678c4dc5f93cd8404b2e832f4532daf
Reviewed-on: https://code.wireshark.org/review/16508
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agoAdd support for USB3-specific Hub Class Feature Selectors
Sean O. Stalley [Fri, 22 Jul 2016 20:30:52 +0000 (13:30 -0700)]
Add support for USB3-specific Hub Class Feature Selectors

Add Hub Class Feature Selectors (defined in USB3.1 spec, table 10-9) to USBHUB dissector.

Change-Id: I53f73b5d689b8921907514e0fcd74a152abc2b49
Signed-off-by: Sean O. Stalley <sean.stalley@intel.com>
Reviewed-on: https://code.wireshark.org/review/16593
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>
7 years agopacket-socketcan.c - Add subdissector name to layer list.
Michael Mann [Sat, 23 Jul 2016 18:03:32 +0000 (14:03 -0400)]
packet-socketcan.c - Add subdissector name to layer list.

This allows GTK Decode As to function properly if CAN subdissector
has a dissector table.

Change-Id: I5eb3642c34642302939d27e844fe93f626ba039c
Reviewed-on: https://code.wireshark.org/review/16606
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agofilesystem.c: Don't constify mallocated pointer
João Valverde [Sat, 23 Jul 2016 02:52:10 +0000 (03:52 +0100)]
filesystem.c: Don't constify mallocated pointer

Change-Id: I8991682bda256c5e1c09a303b0243e240b276101
Reviewed-on: https://code.wireshark.org/review/16602
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agoSuggest using a task dialog, so we can label the buttons.
Guy Harris [Sat, 23 Jul 2016 08:56:12 +0000 (01:56 -0700)]
Suggest using a task dialog, so we can label the buttons.

Change-Id: I2827ab8b5d4a9c17e6c178d9397fcf897a356c9f
Reviewed-on: https://code.wireshark.org/review/16603
Reviewed-by: Guy Harris <guy@alum.mit.edu>
7 years agoZigBee: implement dissector for Parent_Annce_rsp; minor fixes
dsrsupport [Thu, 21 Jul 2016 14:35:24 +0000 (17:35 +0300)]
ZigBee: implement dissector for Parent_Annce_rsp; minor fixes

Implement dissector for User Descriptor Response.
Fix Number OfChild foield or Parent_Annce.
Fix name of User Descriptor Response cluster.

Change-Id: Ia48277a76bc7742021a407a45ca18e2c51a35046
Reviewed-on: https://code.wireshark.org/review/16570
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>
7 years agoQt follow stream: don't clear the text widget when doing Save-As.
Jeff Morriss [Mon, 18 Jul 2016 02:42:32 +0000 (22:42 -0400)]
Qt follow stream: don't clear the text widget when doing Save-As.

... Otherwise the user will see an empty stream after the Save-As operation.

Change-Id: Ibafcb4e4b670807702a8d8a5756544471f2eccc3
Reviewed-on: https://code.wireshark.org/review/16521
Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agoUpdate struct ws_ip with flow label and comments
João Valverde [Tue, 19 Jul 2016 21:06:31 +0000 (22:06 +0100)]
Update struct ws_ip with flow label and comments

Change field ip_v_hl to version.

Change-Id: Ic7ce8d6d083f6413284a7b9ba91a2387b11b29fb
Reviewed-on: https://code.wireshark.org/review/16555
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>
7 years agoUse wmem_new0() to allocate struct ws_ip
João Valverde [Sat, 23 Jul 2016 00:10:33 +0000 (01:10 +0100)]
Use wmem_new0() to allocate struct ws_ip

Change-Id: I0e76ffc2dc0c3e3d7bd081ff433c95741b9aa906
Reviewed-on: https://code.wireshark.org/review/16598
Reviewed-by: João Valverde <j@v6e.pt>
7 years agopacket-diameter_3gpp.c: Convert many fields to use proto_tree_add_bitmask_with_flags
Michael Mann [Fri, 22 Jul 2016 23:30:34 +0000 (19:30 -0400)]
packet-diameter_3gpp.c: Convert many fields to use proto_tree_add_bitmask_with_flags

Change-Id: I1936ec4ca6003d3268674079b79da0b009a62f10
Reviewed-on: https://code.wireshark.org/review/16597
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agoIPv6: Another get_jumbo_plen cleanup
João Valverde [Fri, 22 Jul 2016 22:24:13 +0000 (23:24 +0100)]
IPv6: Another get_jumbo_plen cleanup

Change-Id: I81e618cd889aa1425e03b7dcb6e0af3d995b1d54
Reviewed-on: https://code.wireshark.org/review/16595
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>
7 years agosshdump: Change ws_close to closesocket
Roland Knall [Fri, 22 Jul 2016 11:31:07 +0000 (13:31 +0200)]
sshdump: Change ws_close to closesocket

ws_close just calls _close(); that doesn't close sockets.  closesocket()
is the API to close a socket on Windows, and is defined as close()
on UN*X, so using closesocket() will close sockets on Windows and UN*X.

This way, we close the pipe socket correctly on Windows.

Change-Id: I6d50e26bfabac5618c74a180cbe94d444b591bd4
Reviewed-on: https://code.wireshark.org/review/16582
Reviewed-by: Guy Harris <guy@alum.mit.edu>
7 years agoUse ws_printf routines everywhere in column-utils.c.
Gerald Combs [Fri, 22 Jul 2016 17:15:07 +0000 (10:15 -0700)]
Use ws_printf routines everywhere in column-utils.c.

Change-Id: I8764b67b5ab320323c96fe21e5ebaa03815905fd
Reviewed-on: https://code.wireshark.org/review/16591
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
7 years agoQt: Don't force a repaint in update_progress_dlg.
Gerald Combs [Fri, 22 Jul 2016 17:01:03 +0000 (10:01 -0700)]
Qt: Don't force a repaint in update_progress_dlg.

Remove a call to update() in order to force a repaint for large capture
files. Doing so incurs a small-but-nonzero delay on Windows and it should
no longer be needed since we switched to timer-based updates in gb5a585c.

Change-Id: I01ff2eed165d15dd1d3218550baa664f43dd442a
Reviewed-on: https://code.wireshark.org/review/16589
Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
7 years agoGet rid of all references to new_create_dissector_handle().
Guy Harris [Fri, 22 Jul 2016 19:13:06 +0000 (12:13 -0700)]
Get rid of all references to new_create_dissector_handle().

It went away a long time ago; use create_dissector_handle().

Change-Id: I28e90821033621bc7a5572243ff5871b4e67d60d
Reviewed-on: https://code.wireshark.org/review/16592
Reviewed-by: Guy Harris <guy@alum.mit.edu>
7 years agoMPTCP: fix offset used for AddrID field in MP_JOIN and MP_PRIO messages
Pascal Quantin [Fri, 22 Jul 2016 11:48:58 +0000 (13:48 +0200)]
MPTCP: fix offset used for AddrID field in MP_JOIN and MP_PRIO messages

Bug: 12641
Change-Id: I7ba5cbf795eef3e77a7161b8dc8752d9c10610f8
Reviewed-on: https://code.wireshark.org/review/16583
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
7 years agoAdd support for new AVPs defined in 29.273
Marius Paliga [Fri, 22 Jul 2016 11:26:12 +0000 (13:26 +0200)]
Add support for new AVPs defined in 29.273

Bug: 12643
Change-Id: Ic9c26dc864b2b016ba722620098caf44a800f0f4
Reviewed-on: https://code.wireshark.org/review/16581
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
7 years agoAdded decoding of MS Info Change Reporting Action IE
Marius Paliga [Fri, 22 Jul 2016 07:34:35 +0000 (09:34 +0200)]
Added decoding of MS Info Change Reporting Action IE

Bug: 12642
Change-Id: I845687763a261566036c7d38c310656d38b06fa5
Reviewed-on: https://code.wireshark.org/review/16579
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
7 years agoQt: Add hovered byte lock on left-click
João Valverde [Wed, 20 Jul 2016 23:37:15 +0000 (00:37 +0100)]
Qt: Add hovered byte lock on left-click

Allows marking/unmarking a single byte in the bytes view pane.

Ping-Bug: 11547
Change-Id: I574ad7c6218eb08018094ea92ba79b69dbe4b45d
Reviewed-on: https://code.wireshark.org/review/16563
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
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>
7 years agoDecouple extension headers from the IPv6 dissector loop
João Valverde [Sun, 17 Jul 2016 04:02:29 +0000 (05:02 +0100)]
Decouple extension headers from the IPv6 dissector loop

Register MIPv6 too in "ipv6.nxt". Fixes bug 10705.

Bug: 10705
Change-Id: I297d8983d65ee7585e1201a81d10396001e0d167
Reviewed-on: https://code.wireshark.org/review/16561
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>
7 years agoAdd Nordic semiconductors dissector to read files produced by their BTLE
AndersBroman [Thu, 21 Jul 2016 07:55:03 +0000 (09:55 +0200)]
Add Nordic semiconductors dissector to read files produced by their BTLE
sniffer.
Code downloaded from
https://www.nordicsemi.com/eng/Products/Bluetooth-low-energy/nRF-Sniffer
and cleaned up and modified to comple with current Wireshark version.

Bug 12637
Change-Id: Ic73122f35039b4245d6219b825a28c10f22f36ad
Reviewed-on: https://code.wireshark.org/review/16569
Reviewed-by: Anders Broman <a.broman58@gmail.com>
7 years agoConvert more glib memory to wmem pinfo pool
Pascal Quantin [Wed, 20 Jul 2016 21:54:35 +0000 (23:54 +0200)]
Convert more glib memory to wmem pinfo pool

Change-Id: I4cc23bc19a6bd8c6a8e0389eaf939dbb60fe0ca3
Reviewed-on: https://code.wireshark.org/review/16562
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: Anders Broman <a.broman58@gmail.com>
7 years agoMinimize allocations for frame tvbuffs and Buffers.
Gerald Combs [Fri, 22 Jul 2016 00:34:56 +0000 (17:34 -0700)]
Minimize allocations for frame tvbuffs and Buffers.

Try to minimize the number of times we allocate memory for Buffers and
Buffer data.

Change-Id: I738fdc64e571772ef4ba6335d49087277dd7b430
Reviewed-on: https://code.wireshark.org/review/16577
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
7 years agoFix ERSPAN type II and type III offset.
William Tu [Thu, 21 Jul 2016 04:38:47 +0000 (21:38 -0700)]
Fix ERSPAN type II and type III offset.

For ERSPAN type II (version == 1), the offset is shifted by 4 at the
end. As a result, the 'offset+=2' at the end of ERSPAN type III should
be in its own 'else' scope.

Change-Id: I64a55d5722e3f4f5672ca2a4228583b3b51559e1
Reviewed-on: https://code.wireshark.org/review/16568
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.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>
7 years ago2.1.2 → 2.3.0.
Gerald Combs [Thu, 21 Jul 2016 22:53:54 +0000 (15:53 -0700)]
2.1.2 → 2.3.0.

Change-Id: I133af2d3d05ae77c1030cf35812bb1f969f6a68b
Reviewed-on: https://code.wireshark.org/review/16575
Reviewed-by: Gerald Combs <gerald@wireshark.org>
7 years agoUse Windows CRT string functions in some places.
Gerald Combs [Fri, 15 Jul 2016 20:59:23 +0000 (13:59 -0700)]
Use Windows CRT string functions in some places.

Copy wsutil/wsprintf.h from change 16537. Update it to use functions
appropriate to Visual C++ >= 2015, < 2015, and everything else. Add
notes about specific API issues.

Update epan/expert.c to use ws_snprintf, since the VS profiler shows it
as a minor hot spot. This reduces load time for a large-ish capture from
~14s to ~12s here.

Migrate a previous column-utils change.

Change-Id: Id4064b7c06c35fd447b63c73f731afee181df4f9
Reviewed-on: https://code.wireshark.org/review/16483
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
7 years agoQt: Set the LabelStack CSS only when it changes.
Gerald Combs [Thu, 21 Jul 2016 17:27:45 +0000 (10:27 -0700)]
Qt: Set the LabelStack CSS only when it changes.

We call fillLabel repeatedly while loading a capture. Try to avoid
applying a style sheet when we do since it can affect performance.

Change-Id: I9ee188cb79f7cad340ba35b12011b82004ed8262
Reviewed-on: https://code.wireshark.org/review/16571
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
7 years agoAdd proto_tree_add_checksum.
Michael Mann [Mon, 11 Jul 2016 03:47:28 +0000 (23:47 -0400)]
Add proto_tree_add_checksum.

This is an attempt to standardize display/handling of checksum fields for all dissectors.
The main target is for dissectors that do validation, but dissectors that just report the
checksum were also included just to make them easier to find in the future.

Bug: 10620
Bug: 12058
Ping-Bug: 8859
Change-Id: Ia8abd86e42eaf8ed50de6b173409e914b17993bf
Reviewed-on: https://code.wireshark.org/review/16380
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
7 years agoConstify a few value_strings which were generated at run-time
Balint Reczey [Mon, 20 Jun 2016 21:18:46 +0000 (23:18 +0200)]
Constify a few value_strings which were generated at run-time

Change-Id: Idc479a89a34fd21b743faee07020be284f828e2c
Reviewed-on: https://code.wireshark.org/review/16298
Petri-Dish: Balint Reczey <balint@balintreczey.hu>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
7 years agoDon't pass NULL to wtap_block_set_string_option_value().
Guy Harris [Thu, 21 Jul 2016 02:53:33 +0000 (19:53 -0700)]
Don't pass NULL to wtap_block_set_string_option_value().

To remove OPT_SHB_HARDWARE, use wtap_block_remove_option().

To get the string value from a GString, use g_string_free(string,
FALSE), not g_string_free(string, TRUE) - the latter will free the
string value and return NULL.

Change-Id: I0c5a9f818543f6752f455f04fb3c024208e23954
Reviewed-on: https://code.wireshark.org/review/16567
Reviewed-by: Guy Harris <guy@alum.mit.edu>
7 years agoRemove more string option value null checks.
Guy Harris [Thu, 21 Jul 2016 00:45:07 +0000 (17:45 -0700)]
Remove more string option value null checks.

Also, rename routines that write out an option write_wtap_XXb_option()
from write_wtap_XXb_block().

Change-Id: I4884a2f5275a5e2e32137b47255fac6995f311ef
Reviewed-on: https://code.wireshark.org/review/16566
Reviewed-by: Guy Harris <guy@alum.mit.edu>
7 years agoNo need to check for string option values being null.
Guy Harris [Thu, 21 Jul 2016 00:27:36 +0000 (17:27 -0700)]
No need to check for string option values being null.

A string option, if present, always has a value; it might be a null
*string*, but you won't get a null pointer (if the option isn't present,
it simply isn't present).

Fix some comments while we're at it.

Change-Id: I9c1420f56998a7d04de5c5cc2e92631b181f303a
Reviewed-on: https://code.wireshark.org/review/16564
Reviewed-by: Guy Harris <guy@alum.mit.edu>
7 years agoConvert uses of g_alloced data with tvb_new_child_real_data to use pinfo->pool instead.
Michael Mann [Wed, 20 Jul 2016 02:53:28 +0000 (22:53 -0400)]
Convert uses of g_alloced data with tvb_new_child_real_data to use pinfo->pool instead.

Aldo update documentation to suggest using wmem pinfo->pool instead of glib memory

Change-Id: I5d34cc6c1515aa9f0d57784b38da501ffcb95ccc
Reviewed-on: https://code.wireshark.org/review/16551
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: Evan Huus <eapache@gmail.com>
7 years agoIPv6: Add option type encodings
João Valverde [Wed, 20 Jul 2016 03:11:07 +0000 (04:11 +0100)]
IPv6: Add option type encodings

Change-Id: I9c8811dd30fed59591edb84166d2c854fd5b1885
Reviewed-on: https://code.wireshark.org/review/16553
Reviewed-by: João Valverde <j@v6e.pt>
7 years ago[RRC] Update to V13.3.0 (2016-07)
AndersBroman [Wed, 20 Jul 2016 13:45:14 +0000 (15:45 +0200)]
[RRC] Update to V13.3.0 (2016-07)

Change-Id: Ide2017d2610a55345a4ab1ef631b1da57a06ceb7
Reviewed-on: https://code.wireshark.org/review/16560
Reviewed-by: Anders Broman <a.broman58@gmail.com>
7 years agoIPv6: Mark ENDI option as deprecated (do not ignore)
João Valverde [Wed, 20 Jul 2016 12:57:02 +0000 (13:57 +0100)]
IPv6: Mark ENDI option as deprecated (do not ignore)

As requested by Alexis.

Change-Id: I33e91aa0234e7c07869d69b5da6d0df8f94254ba
Reviewed-on: https://code.wireshark.org/review/16559
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
7 years agoPCP: add a missing cast
Pascal Quantin [Wed, 20 Jul 2016 12:50:09 +0000 (14:50 +0200)]
PCP: add a missing cast

Change-Id: I3fd85defefb5ba3c27ef7c7cc5e83a8193cf1263
Reviewed-on: https://code.wireshark.org/review/16558
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
7 years agoConvert some g_ APIs to wmem.
Michael Mann [Wed, 20 Jul 2016 02:49:55 +0000 (22:49 -0400)]
Convert some g_ APIs to wmem.

Change-Id: I7fb0b60fc54004326680f07298fe43e8c48e9b39
Reviewed-on: https://code.wireshark.org/review/16550
Reviewed-by: Anders Broman <a.broman58@gmail.com>