metze/wireshark/wip.git
3 years agopacket-simple: also dissect SIMPLE over TCP
Peter Ross [Sat, 30 Jul 2016 02:41:57 +0000 (12:41 +1000)]
packet-simple: also dissect SIMPLE over TCP

Change-Id: I9310a6fa0b50e54a9e7febb955cdfdab560c4ba9
Reviewed-on: https://code.wireshark.org/review/16779
Reviewed-by: Michael Mann <mmann78@netscape.net>
3 years agoREADME.dissector: Add proto_tree_add_bitmask_with_flags()
Uli Heilmeier [Sat, 30 Jul 2016 09:36:15 +0000 (11:36 +0200)]
README.dissector: Add proto_tree_add_bitmask_with_flags()

Extend README with proto_tree_add_bitmask_with_flags() function.

Change-Id: Ia984080eda77ab93b063771d625bc45b5b0fc6d2
Reviewed-on: https://code.wireshark.org/review/16785
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
3 years agoMove IPv6 inet definitions to wsutil/inet_ipv6.h
João Valverde [Fri, 29 Jul 2016 20:35:03 +0000 (21:35 +0100)]
Move IPv6 inet definitions to wsutil/inet_ipv6.h

Change-Id: I880adf7fc1e131639f318cdecf7d8e59262d89fb
Reviewed-on: https://code.wireshark.org/review/16784
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>
3 years agoAdd GeoIP database UN*X system path
João Valverde [Fri, 29 Jul 2016 17:29:00 +0000 (18:29 +0100)]
Add GeoIP database UN*X system path

Most distros provide GeoIP database packages that install to /usr/share/GeoIP.
Use this as a system default.

Change-Id: I2b4ddf7e2467263491b18a97e908a247db0ac9a3
Reviewed-on: https://code.wireshark.org/review/16767
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
3 years agoIPv6: Add deprecation expert infos
João Valverde [Fri, 29 Jul 2016 14:12:01 +0000 (15:12 +0100)]
IPv6: Add deprecation expert infos

Change-Id: I111fd8f74388e9e4b7a9d7fd1b582d2fff86cf59
Reviewed-on: https://code.wireshark.org/review/16764
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>
3 years agoIPv6: Add experimental routing header types
João Valverde [Sat, 30 Jul 2016 04:08:45 +0000 (05:08 +0100)]
IPv6: Add experimental routing header types

Change-Id: I22dfa604abd8ade21d240104bf84af815aa2bc24
Reviewed-on: https://code.wireshark.org/review/16783
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>
3 years agoieee80211: PMKID is incorrectly decoded under RSN Vendor specific IE in EAPOL packet 1
Alexis La Goutte [Fri, 29 Jul 2016 13:11:03 +0000 (15:11 +0200)]
ieee80211: PMKID is incorrectly decoded under RSN Vendor specific IE in EAPOL packet 1

Issue reported by Padmaja Reddy

Bug:12675
Change-Id: I17323a70fdbe6f52c350a875c467c233877f4505
Reviewed-on: https://code.wireshark.org/review/16761
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
3 years agoUpgrade to libtool 2.4.6.
Guy Harris [Fri, 29 Jul 2016 20:21:13 +0000 (13:21 -0700)]
Upgrade to libtool 2.4.6.

As per bug 12689, earlier versions of libtool had a bug wherein they
assumed a 1-digit second component of the OS version number, and thought
OS X 10.10 was OS X 10.1 and used the wrong linker flags.  A build from
Git would succeed, but a build from the source tarball wouldn't.

Change-Id: I412d1e0b02976f44c573f9ff1b62465f5eeaeb05
Ping-Bug: 12689
Reviewed-on: https://code.wireshark.org/review/16773
Reviewed-by: Guy Harris <guy@alum.mit.edu>
3 years agoWiX: Set the "Programs and Features" icon.
Gerald Combs [Fri, 29 Jul 2016 18:01:38 +0000 (11:01 -0700)]
WiX: Set the "Programs and Features" icon.

Use our normal application icon in "Programs and Features".

Change-Id: I480fcd16b9de1b58852ee8fb5226062da8ed7419
Reviewed-on: https://code.wireshark.org/review/16768
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: Michael Mann <mmann78@netscape.net>
3 years agoIPv6: Use some macros to set/allocate addresses
João Valverde [Fri, 29 Jul 2016 01:38:13 +0000 (02:38 +0100)]
IPv6: Use some macros to set/allocate addresses

Change-Id: I30430841ff6f3b89cb778aed9e109a885b412a01
Reviewed-on: https://code.wireshark.org/review/16766
Reviewed-by: João Valverde <j@v6e.pt>
3 years agoGTPv2: fix test for flags in TWAN Identifier IE (CID 1364616)
Pascal Quantin [Fri, 29 Jul 2016 19:05:25 +0000 (21:05 +0200)]
GTPv2: fix test for flags in TWAN Identifier IE (CID 1364616)

Change-Id: I7b87624bd60f514f2f5e9aafe19bcebf7799bcd1
Reviewed-on: https://code.wireshark.org/review/16772
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
3 years agoGTP: fix dissection of NSAPI
Pascal Quantin [Fri, 29 Jul 2016 18:26:19 +0000 (20:26 +0200)]
GTP: fix dissection of NSAPI

Bug: 12686
Change-Id: Icdf1fd0f24a2f667b27bb957fd932bd9c17ef0f4
Reviewed-on: https://code.wireshark.org/review/16769
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
3 years agoIPv6: Dissect unknown routing header types as data
João Valverde [Fri, 29 Jul 2016 13:54:06 +0000 (14:54 +0100)]
IPv6: Dissect unknown routing header types as data

Change-Id: I1fa840d24d56643515c6fc8d73967307bf1951d6
Reviewed-on: https://code.wireshark.org/review/16762
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>
3 years agoRegister IPv6 extension header dissectors to "ip.proto" table
João Valverde [Mon, 25 Jul 2016 23:18:38 +0000 (00:18 +0100)]
Register IPv6 extension header dissectors to "ip.proto" table

We may want to add expert infos for IPv6 extension headers over IPv4 (TODO).
Any side-effects that don't make sense (e.g: IPv6 Routing over IPv4) are
ignored.

The IPv6 Next Header decode as is replaced by IP Proto decode as. It
didn't fit a conceptual model well and it also was not working very well
in practice (for multiple extension headers).

We now support decoding any IP Protocol number as an extension header.

Bug: 12673
Change-Id: Icbde019aba8990cc556ef2bd832f64cba76c24b6
Reviewed-on: https://code.wireshark.org/review/16681
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>
3 years agoeditcap: fix typos
Dario Lombardo [Fri, 29 Jul 2016 12:07:09 +0000 (14:07 +0200)]
editcap: fix typos

Change-Id: I24c455afc51749a665e452312332d167831f19d2
Reviewed-on: https://code.wireshark.org/review/16760
Reviewed-by: Michael Mann <mmann78@netscape.net>
3 years agoUse xz to compress the source tarball.
Gerald Combs [Wed, 27 Jul 2016 22:31:06 +0000 (15:31 -0700)]
Use xz to compress the source tarball.

Compress the source tarball using xz instead of bzip2. Other open source
projects (including many of our dependencies) have been using xz for a
while so hopefully this won't be too much of a shock.

Remove the patch-bzip2 Autotools target while we're here.

Change-Id: I456d27b6cd56a43aba829bd45938f98568eb7b1d
Reviewed-on: https://code.wireshark.org/review/16735
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
3 years agoDon't discard unknown coloring rules.
Gerald Combs [Mon, 25 Jul 2016 17:49:30 +0000 (10:49 -0700)]
Don't discard unknown coloring rules.

When processing the colorfilters file, keep and disable unknown coloring
rules instead of skipping over and discarding them. This should
hopefully keep people from losing the standard "Checksum Errors" rule
(and it's less rude in general).

Change-Id: I21796c25045d9dbf7612238ce3d27b613f1ec75f
Reviewed-on: https://code.wireshark.org/review/16673
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: Michael Mann <mmann78@netscape.net>
3 years agoextcap: Restore functionality for options
Roland Knall [Tue, 29 Dec 2015 06:57:36 +0000 (07:57 +0100)]
extcap: Restore functionality for options

Allow stored options to be restored to their default values. This
adds a global cleanup method for extcap and globally defined
preference values, which fixes the parameter problem with windows

Change-Id: I48e0cf846ef81f4732d652c6a2ad0020db5df08e
Reviewed-on: https://code.wireshark.org/review/13741
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
3 years agoGive the WiX installer a full name.
Gerald Combs [Thu, 28 Jul 2016 23:51:36 +0000 (16:51 -0700)]
Give the WiX installer a full name.

Append the platform and version to the WiX installer name similar to
our other installers.

Change-Id: Idb3e7917dda3a8e831062538d3e7d1b1c8b78d42
Reviewed-on: https://code.wireshark.org/review/16757
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
3 years agoEnable airpdcap debugging explicitly.
Gerald Combs [Thu, 28 Jul 2016 19:26:19 +0000 (12:26 -0700)]
Enable airpdcap debugging explicitly.

Enable airpdcap debugging with explicitly with AIRPDCAP_DEBUG instead
of _DEBUG. _DEBUG might be defined automatically by Visual C++ depending
on your build type and the extra output breaks the decryption tests.

Change-Id: If6d918beb4d91233b07a3bc7b6f2f7e1849171f0
Reviewed-on: https://code.wireshark.org/review/16755
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
3 years agoAdd an ESP decryption test.
Gerald Combs [Wed, 27 Jul 2016 21:48:18 +0000 (14:48 -0700)]
Add an ESP decryption test.

Add an ESP decryption test using the capture+keys from bug 12671.

Change-Id: I5f7ce477ec74d59c1043345728a1444842912b96
Ping-Bug: 12671
Reviewed-on: https://code.wireshark.org/review/16733
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Tested-by: Gerald Combs <gerald@wireshark.org>
3 years agoFix build on NetBSD.
Thomas Klausner [Thu, 28 Jul 2016 14:31:44 +0000 (16:31 +0200)]
Fix build on NetBSD.

sys/siginfo.h (which is included by this file) defines si_code.

Change-Id: I59cfe1ea3ec01345965028db4bba3223752459e3
Reviewed-on: https://code.wireshark.org/review/16750
Reviewed-by: Guy Harris <guy@alum.mit.edu>
3 years agoIPv6: Fix Decode As to distinguish a null from a hop-by-hop next header.
João Valverde [Thu, 28 Jul 2016 10:38:45 +0000 (11:38 +0100)]
IPv6: Fix Decode As to distinguish a null from a hop-by-hop next header.

Both display as zero in the UI. We shouldn't have null values for
decode as, but we do for IPv6, and the user (also the developer) can't
tell them apart from an IPv6 Hop-by-hop Option extension header.

NULL values are represented as IP Protocol 255 (Reserved) in the UI,
intead of IP Protocol 0 (Hop-By-Hop extension header).

Change-Id: I840db99df212a3bee03027b91fdec9c01886004d
Reviewed-on: https://code.wireshark.org/review/16746
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>
3 years agoIPv6: Reduce some expert info PI_PROTOCOL severities
João Valverde [Thu, 28 Jul 2016 05:12:31 +0000 (06:12 +0100)]
IPv6: Reduce some expert info PI_PROTOCOL severities

Change-Id: I87bcc47eeee05ea22c646f7ecce9374c070b1ea6
Reviewed-on: https://code.wireshark.org/review/16743
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>
3 years agoCIP: ensure to give a valid tvb pointer when calling proto_tree_add_XXX functions
Pascal Quantin [Thu, 28 Jul 2016 12:44:11 +0000 (14:44 +0200)]
CIP: ensure to give a valid tvb pointer when calling proto_tree_add_XXX functions

Bug: 12676
Change-Id: I1567ecd70d0975ed47d8c659b9086206c2a0a89a
Reviewed-on: https://code.wireshark.org/review/16748
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>
3 years agoIPv6: Fix an incorrect bitmask
João Valverde [Thu, 28 Jul 2016 11:54:40 +0000 (12:54 +0100)]
IPv6: Fix an incorrect bitmask

Change-Id: I81dfcb4fb4b10a9d951247460783f81f464c50b7
Reviewed-on: https://code.wireshark.org/review/16747
Reviewed-by: João Valverde <j@v6e.pt>
3 years ago[BTLE] Add Version 4.2 to ll_version_number_vals
AndersBroman [Thu, 28 Jul 2016 09:13:15 +0000 (11:13 +0200)]
[BTLE] Add Version 4.2 to ll_version_number_vals

Change-Id: I88e988e11e1cae6f2f6f6d190890b62f2beb1e92
Reviewed-on: https://code.wireshark.org/review/16745
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years agoFixed compile error in packet-ssl-utils.c when HAVE_LIBCRYPT not defined
Kim Kempf [Thu, 28 Jul 2016 02:34:51 +0000 (19:34 -0700)]
Fixed compile error in packet-ssl-utils.c when HAVE_LIBCRYPT not defined

Bug: 12680
Change-Id: I7219e38be48d1115e7e80b41337423be64776e5a
Reviewed-on: https://code.wireshark.org/review/16742
Reviewed-by: João Valverde <j@v6e.pt>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
3 years agoIPv6: Add expert info for option extension header type mismatch
João Valverde [Tue, 26 Jul 2016 23:04:58 +0000 (00:04 +0100)]
IPv6: Add expert info for option extension header type mismatch

Change-Id: If9c4e609528a1b72e6d5a002292734e21650e1eb
Reviewed-on: https://code.wireshark.org/review/16713
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>
3 years agoIPv6: Add support for SMF_DPD option (RFC 6621)
João Valverde [Wed, 27 Jul 2016 00:51:54 +0000 (01:51 +0100)]
IPv6: Add support for SMF_DPD option (RFC 6621)

Change-Id: I61a1246a3f68aa03e12949e8271dd4cac055b9db
Reviewed-on: https://code.wireshark.org/review/16712
Reviewed-by: João Valverde <j@v6e.pt>
3 years agoCopy over change from Samba repository:
Guy Harris [Wed, 27 Jul 2016 23:21:46 +0000 (16:21 -0700)]
Copy over change from Samba repository:

  commit ed11ce8f12d567a3e0edc1d24aab1784a171ac33
  Author: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
  Date:   Wed May 4 16:51:37 2016 +1200

    Python pidl: avoid segfault with "del obj->attr"

    Deleting an attribute in Python (using the "del" statement) is (at
    some stages along a winding path, for C objects) converted into
    setting the attribute to NULL. Not None, actual NULL. The way we
    handled this NULL was to dereference it. This changes the behaviour to
    raising an AttributeError, which is more or less what Python does in
    similar situations with builtin objects.

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Shouldn't affect us, but it makes diffing cleaner.

Change-Id: I8e681dc79c8f4e62b74e2aa5ac2b4924134735c4
Reviewed-on: https://code.wireshark.org/review/16741
Reviewed-by: Guy Harris <guy@alum.mit.edu>
3 years agoCopy over change from Samba repository:
Guy Harris [Wed, 27 Jul 2016 23:19:52 +0000 (16:19 -0700)]
Copy over change from Samba repository:

  commit f6c79072ca50e05a68b73a80a0ebd635a9bac068
  Author: Andrew Bartlett <abartlet@samba.org>
  Date:   Thu Apr 21 21:44:56 2016 +1200

    pidl: Correct string handling to use talloc and be in common

    The previous string handling assumed the python variables referenced
    by PyString_AS_STRING had infinite life.  When they were re-used
    the C structure started to point at unexpected things.

    We now check correctly for Unicode in every case, and we always
    duplicate the string with talloc_strdup()

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Shouldn't affect us, but it makes diffing cleaner.

Change-Id: Ib54b62f5630df46cff6fb0582acd109b263142d2
Reviewed-on: https://code.wireshark.org/review/16740
Reviewed-by: Guy Harris <guy@alum.mit.edu>
3 years agoCopy over change from Samba repository:
Guy Harris [Wed, 27 Jul 2016 23:17:44 +0000 (16:17 -0700)]
Copy over change from Samba repository:

  commit 90bf114f6370ee837d97e36eb25f38f8234dcd39
  Author: Andrew Bartlett <abartlet@samba.org>
  Date:   Thu Feb 25 13:57:37 2016 +1300

    pidl: Use a tmp_ctx helper variable

    This is so we free the ndr_push_struct_blob() return value after
    we make it into a string

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
Shouldn't affect us, but it makes diffing cleaner.

Change-Id: I52ee911f89813e6f5a90445be4eb52494e3f69d3
Reviewed-on: https://code.wireshark.org/review/16739
Reviewed-by: Guy Harris <guy@alum.mit.edu>
3 years agoCopy change from Samba repository:
Guy Harris [Wed, 27 Jul 2016 23:15:35 +0000 (16:15 -0700)]
Copy change from Samba repository:

  commit dffa2dbfabca14f07af12663fc93c8dc3bc837cf
  Author: Andrew Bartlett <abartlet@samba.org>
  Date:   Thu Feb 25 13:57:00 2016 +1300

    pidl: Use the $mem_ctx helper variable

    This is already set to pytalloc_get_mem_ctx(py_obj)

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
Shouldn't affect us, but it makes diffing cleaner.

Change-Id: I60fddc0a1055095ecad51180c9e1fc2223d2c017
Reviewed-on: https://code.wireshark.org/review/16738
Reviewed-by: Guy Harris <guy@alum.mit.edu>
3 years agoCopy over change from Samba repository:
Guy Harris [Wed, 27 Jul 2016 23:13:55 +0000 (16:13 -0700)]
Copy over change from Samba repository:

  commit 9e07f3a13b41be1f019887581b2a2bd049039a3d
  Author: Andrew Bartlett <abartlet@samba.org>
  Date:   Tue Feb 16 14:06:28 2016 +1300

    pidl: Fix our python reference handling

    The new talloc.BaseObject allow us to hold a talloc context per
    python object (there may be many referring to the same C object)
    and the talloc context that the actual object pointer is under.

    Another advantage is that talloc.BaseObject(), has less of
    an ABI surface.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
Shouldn't affect us, but it makes diffing cleaner.

Change-Id: If4a7d9d3f5eb0acf9f94b10af870a0e01fa52b5c
Reviewed-on: https://code.wireshark.org/review/16737
Reviewed-by: Guy Harris <guy@alum.mit.edu>
3 years agoPick up changes from the Samba repository:
Guy Harris [Wed, 27 Jul 2016 22:53:21 +0000 (15:53 -0700)]
Pick up changes from the Samba repository:

  commit 59d530c0b692dae41ea271bfdb473f212615041b
  Author: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
  Date:   Tue Mar 1 14:18:52 2016 +1300

    ndr: Use ndr_steal to avoid long lists

    When pulling complex structures like nt-acls, a long list of tokens may
    be produced. By removing tokens along the way with ndr_token_steal,
    future calls to retrieve from the token list are not as expensive.

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
  commit 9af628a488d2b628e6c33917be7030602eeb5fde
  Author: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
  Date:   Fri Feb 26 17:01:37 2016 +1300

    ndr: avoid unnecessary searches of token list

    When pulling complex structures like nt-acls, a long list of tokens
    may be produced. This change means the token list won't be walked in the
    buffers case if the switch value is not needed.

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
Change-Id: I0e0ce345e5184e0cd180b0079dd693a7ed3f31ef
Reviewed-on: https://code.wireshark.org/review/16736
Reviewed-by: Guy Harris <guy@alum.mit.edu>
3 years agoAdd IPv6 to the randpkt manpage
João Valverde [Wed, 27 Jul 2016 21:36:23 +0000 (22:36 +0100)]
Add IPv6 to the randpkt manpage

Change-Id: Ie8a46f727861319ec51b8390c53da8a0f36ab9ef
Reviewed-on: https://code.wireshark.org/review/16732
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
3 years agoFix from the Samba repository:
Guy Harris [Wed, 27 Jul 2016 22:06:23 +0000 (15:06 -0700)]
Fix from the Samba repository:

  Author: Aurelien Aptel <aaptel@suse.com>
  Date:   Wed May 18 14:23:56 2016 +0200

    pidl/ws: fix failing tests

    This commit fixes 2 test failures in Pidl test suite.

    - commit 02cd7808 changed the error the test was expecting
      => update expected output in the test
    - commit c76b65e changed whitespaces in the output
      => revert to the old output in the generator

Signed-off-by: Aurelien Aptel <aaptel@suse.com>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: David Disseldorp <ddiss@samba.org>
Change-Id: I142d4ae405edfff760c00b95e0475502a1eac2f0
Reviewed-on: https://code.wireshark.org/review/16734
Reviewed-by: Guy Harris <guy@alum.mit.edu>
3 years agoIf we don't get any OS information, remove the old OS information.
Guy Harris [Wed, 27 Jul 2016 21:31:21 +0000 (14:31 -0700)]
If we don't get any OS information, remove the old OS information.

The old information is copied over from one of the input files; if we
don't have information about the OS on the machine writing the *output*
file, just throw the old information away.

(We need a better way to preserve information from the input files;
perhaps this:

   http://www.winpcap.org/pipermail/pcap-ng-format/2016-June/000362.html

might work.)

Change-Id: Ia25771736d267173f2b6949a91e81e217ee7d16f
Reviewed-on: https://code.wireshark.org/review/16730
Reviewed-by: Guy Harris <guy@alum.mit.edu>
3 years agoMake randpkt generate the correct IP version for IPv6
João Valverde [Tue, 26 Jul 2016 21:21:23 +0000 (22:21 +0100)]
Make randpkt generate the correct IP version for IPv6

IP version is always 6 and as a consequence of setting the
first byte to 0x60 the 4 high-order bits for the
traffic class field are set to zero.

Otherwise the IPv6 dissector does not look past the first TVB
byte, making randpkt useless to exercise the dissector code.

Change-Id: I372ab7f71e6c972106f9dd46edec642ca53b9557
Reviewed-on: https://code.wireshark.org/review/16708
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
3 years ago[BTLE] Add new Link layer Feature flags.
AndersBroman [Wed, 27 Jul 2016 12:48:00 +0000 (14:48 +0200)]
[BTLE] Add new Link layer Feature flags.

Change-Id: Ib646d90c6e44075e7ae67f2022dc633fe6423c20
Reviewed-on: https://code.wireshark.org/review/16724
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>
3 years agoIPSec: fix decryption broken in g8cd167a
Pascal Quantin [Wed, 27 Jul 2016 07:14:43 +0000 (09:14 +0200)]
IPSec: fix decryption broken in g8cd167a

Having no matching in sscanf is a valid use case as the object is already initialized

Bug: 12671
Change-Id: Iee7185290ea72968437159c344a376defe464dd4
Reviewed-on: https://code.wireshark.org/review/16711
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>
3 years agossl-utils: ensure that the cipher suite matches decoder
Peter Wu [Mon, 25 Jul 2016 22:14:40 +0000 (00:14 +0200)]
ssl-utils: ensure that the cipher suite matches decoder

When the cipher suite for the current decryption session is changed via
a Server Hello, it should not change the cipher suite field of the
decoder. Otherwise there is a mismatch between the cipher suite and the
capabilities of the decoder.

Fix this issue by making the decoder hold a pointer to the (constant)
SslCipherSuite structure rather than making a copy (and have the decoder
point to that data).

I also considered resetting the decoder once the cipher suite changes in
the Server Hello, but that breaks renegotiation.

Bug: 12665
Change-Id: Ieff38a535cd111d95933ec383378643b6fbab7bf
Reviewed-on: https://code.wireshark.org/review/16674
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: Peter Wu <peter@lekensteyn.nl>
3 years agoIPv6: Fix dissection with IPv6 No Next Header
João Valverde [Wed, 27 Jul 2016 05:14:35 +0000 (06:14 +0100)]
IPv6: Fix dissection with IPv6 No Next Header

Change-Id: I250e1a7ee236ab50b6da1a9b5d846adc9c970e7e
Reviewed-on: https://code.wireshark.org/review/16710
Reviewed-by: João Valverde <j@v6e.pt>
3 years agoERSPAN: support platform specific sub-header.
William Tu [Tue, 26 Jul 2016 15:16:33 +0000 (08:16 -0700)]
ERSPAN: support platform specific sub-header.

The patch adds support for parsing the 4 types of ERSPAN III platform
specific sub-header, if presented.

Change-Id: I1719fceb71ed40918e6b16f25a6355d78840f6c6
Signed-off-by: William Tu <u9012063@gmail.com>
Reviewed-on: https://code.wireshark.org/review/16702
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years agoFollow up for proto_tree_add_checksum.
Michael Mann [Thu, 21 Jul 2016 14:21:25 +0000 (10:21 -0400)]
Follow up for proto_tree_add_checksum.

Fill in the "gaps" so that all dissectors that verify checksums have both a
status and expert info field.

Also address comments from original proto_tree_add_checksum patch that didn't make it.

Ping-Bug: 8859
Change-Id: I2e6640108fd6bb218cb959fe9e4ba98a13e43a2f
Reviewed-on: https://code.wireshark.org/review/16590
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>
3 years ago[BTLE] Use the correct struct.
AndersBroman [Tue, 26 Jul 2016 14:36:58 +0000 (16:36 +0200)]
[BTLE] Use the correct struct.

Change-Id: I5b26e97a6b1a0724f4290084418cdd43661ff8d0
Reviewed-on: https://code.wireshark.org/review/16701
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>
3 years agoIPv6: Remove an unused function and unused macros.
Gerald Combs [Tue, 26 Jul 2016 23:21:15 +0000 (16:21 -0700)]
IPv6: Remove an unused function and unused macros.

Remove _ipv6_hdr_tcls, IPv6_HDR_VERS, IPv6_HDR_TCLS, and IPv6_HDR_FLOW.

Change-Id: Idd18c101db6aa6d523a236e81086ff7ef25e6923
Reviewed-on: https://code.wireshark.org/review/16709
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>
3 years agorandpkt: Add support to generate IPv6
João Valverde [Tue, 26 Jul 2016 21:15:25 +0000 (22:15 +0100)]
randpkt: Add support to generate IPv6

Change-Id: I23e68ef204486f6e3e388172cfa8701a595fcedc
Reviewed-on: https://code.wireshark.org/review/16707
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
3 years agoMove airpdcap's print_debug_line() to airpdcap_debug.h
Michael Mann [Tue, 26 Jul 2016 13:27:07 +0000 (09:27 -0400)]
Move airpdcap's print_debug_line() to airpdcap_debug.h

It saves a little on file pollution and the g_warning call isn't
bothered in the header file.

Change-Id: Ia9bdd96d9d93bbba6811769c4e6e1ed9124c2e5a
Reviewed-on: https://code.wireshark.org/review/16698
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>
3 years agoCLI/GTK: Fix compare_stat checksum to include IPv4 offset again
João Valverde [Tue, 26 Jul 2016 17:52:02 +0000 (18:52 +0100)]
CLI/GTK: Fix compare_stat checksum to include IPv4 offset again

BYTES was not changed to account for the change of ip_len from 16 to 32 bits.

Change-Id: I37b472971fe42a05eb612f88bd38c753f5cf0a08
Reviewed-on: https://code.wireshark.org/review/16706
Reviewed-by: João Valverde <j@v6e.pt>
3 years agoIPv6: Add "ipv6_ws" tap providing a ws_ip structure
João Valverde [Mon, 25 Jul 2016 03:25:05 +0000 (04:25 +0100)]
IPv6: Add "ipv6_ws" tap providing a ws_ip structure

Also remove code dependency on ip6_hdr pointer. It is used solely for the
"ipv6" tap now.

Change-Id: I07150bfae8bf94bf3c585f20c27b60db78688a7b
Reviewed-on: https://code.wireshark.org/review/16655
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>
3 years agoCleanup some checkAPI warnings that were missed in previous patches.
Michael Mann [Tue, 26 Jul 2016 16:06:57 +0000 (12:06 -0400)]
Cleanup some checkAPI warnings that were missed in previous patches.

Some search/replace of printf, g_warning and GTK APIs were changed to use a
ws_ prefix

Change-Id: I9beb763a975530a4006d1afbcad079a7d8d4ebf9
Reviewed-on: https://code.wireshark.org/review/16704
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
3 years agoUse ws_g_warning in wslua.
Michael Mann [Tue, 26 Jul 2016 13:54:46 +0000 (09:54 -0400)]
Use ws_g_warning in wslua.

The g_warning calls seem legitimate, so "hide" them from checkAPIs.pl.

Change-Id: I6d25b08e22aeeb0244e07836385f2b67d6261546
Reviewed-on: https://code.wireshark.org/review/16703
Reviewed-by: Michael Mann <mmann78@netscape.net>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>
3 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>