metze/wireshark/wip.git
3 years agoHandle ETH_P_CANFD as well as ETH_P_CAN.
Guy Harris [Thu, 25 Aug 2016 23:58:25 +0000 (16:58 -0700)]
Handle ETH_P_CANFD as well as ETH_P_CAN.

Both of them need to have the CAN ID/flags field of the header
byte-swapped as necessary to make sure it's in the *reading* host's byte
order, not the *writing* host's byte order, if the two are different.

Change-Id: Iac1589fdd9fe4d9ee6fbac8d821b48694d68919b
Reviewed-on: https://code.wireshark.org/review/17333
Reviewed-by: Guy Harris <guy@alum.mit.edu>
3 years agoOne more change for the removal of LINKTYPE_SOCKETCAN_HOSTENDIAN.
Guy Harris [Thu, 25 Aug 2016 21:39:42 +0000 (14:39 -0700)]
One more change for the removal of LINKTYPE_SOCKETCAN_HOSTENDIAN.

Change-Id: If1615e23efa30119fff5eb2935335c2cde34b89e
Reviewed-on: https://code.wireshark.org/review/17330
Reviewed-by: Guy Harris <guy@alum.mit.edu>
3 years agoGo back to having only one SocketCAN LINKTYPE_ value.
Guy Harris [Thu, 25 Aug 2016 21:14:11 +0000 (14:14 -0700)]
Go back to having only one SocketCAN LINKTYPE_ value.

Libpcap just backed out the "host-endian" SocketCAN LINKTYPE_ value; we
don't need it any more.

Change-Id: I33a7dc21207a0009e20b4abaefe1119eb649c39a
Reviewed-on: https://code.wireshark.org/review/17327
Reviewed-by: Guy Harris <guy@alum.mit.edu>
3 years agoxmpp/xml: Store item length in xml_frame.
Stig Bjørlykke [Thu, 25 Aug 2016 13:39:40 +0000 (15:39 +0200)]
xmpp/xml: Store item length in xml_frame.

The created XML proto_item can be faked (if not visible and not referenced),
so ensure we store the correct item length to be used in XMPP.

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

Change-Id: I79d805b725dbeb93f26a38b72bdcc84187aee16f
Reviewed-on: https://code.wireshark.org/review/17324
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
3 years agoextcap: add binary name and version to help message.
Dario Lombardo [Wed, 24 Aug 2016 13:10:51 +0000 (15:10 +0200)]
extcap: add binary name and version to help message.

Change-Id: I8f8083c817065cf66fd006a1caeb309d26209509
Reviewed-on: https://code.wireshark.org/review/17305
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
3 years agoxmpp: Add whitespace keepalive indication
Stig Bjørlykke [Thu, 25 Aug 2016 10:44:41 +0000 (12:44 +0200)]
xmpp: Add whitespace keepalive indication

RFC 6120 section 4.6.1 defines the use of a single whitespace as
"whitespace keepalive", so indicate this in the Info column.

Change-Id: I685431d91be2a37fbd66f8d1cdabe53f33092e93
Reviewed-on: https://code.wireshark.org/review/17323
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
3 years agoExpand comments.
Guy Harris [Thu, 25 Aug 2016 02:23:09 +0000 (19:23 -0700)]
Expand comments.

Change-Id: I4e3de542d24c567434f4554917e826ccbd64cb6c
Reviewed-on: https://code.wireshark.org/review/17319
Reviewed-by: Guy Harris <guy@alum.mit.edu>
3 years agodebian: Fix libwscodecs' symbols file
Balint Reczey [Tue, 23 Aug 2016 01:01:32 +0000 (03:01 +0200)]
debian: Fix libwscodecs' symbols file

Change-Id: I842fd2339788c2cbe5ca88294aaf74bf9adc5ae2
Reviewed-on: https://code.wireshark.org/review/17285
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 agowsutil: fix indentation of interface.c
Dario Lombardo [Wed, 24 Aug 2016 14:54:02 +0000 (16:54 +0200)]
wsutil: fix indentation of interface.c

Change-Id: Icf0c0c4ce1e3763eb385de24dc608a120e0f4af2
Reviewed-on: https://code.wireshark.org/review/17307
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
3 years agodtls: remove unneeded checks (CID 1158712 & 1158716).
Dario Lombardo [Wed, 24 Aug 2016 10:00:54 +0000 (12:00 +0200)]
dtls: remove unneeded checks (CID 1158712 & 1158716).

Change-Id: Id463f7746880f71f317bb52b40dc8b298965b4ec
Reviewed-on: https://code.wireshark.org/review/17300
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years agoHTTP2: Display PUSH_PROMISE Header in bytes
Alexis La Goutte [Wed, 24 Aug 2016 17:53:04 +0000 (19:53 +0200)]
HTTP2: Display PUSH_PROMISE Header in bytes

and also use the name of spec for field (Header BLock Fragment

Change-Id: I5a3884186258dac1f243f991a3392c875403eb97
Reviewed-on: https://code.wireshark.org/review/17310
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years agozbee-nwk-gp: don't THROW() an exception from a dissector
Martin Kaiser [Sat, 6 Aug 2016 17:57:23 +0000 (19:57 +0200)]
zbee-nwk-gp: don't THROW() an exception from a dissector

show expert infos and return the number of bytes we dissected

Change-Id: Ibb12372e8670380137f4fc3d012d0b0afa4cd638
Reviewed-on: https://code.wireshark.org/review/17313
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years agoextcap: remove unused #define from ssh-base.
Dario Lombardo [Wed, 24 Aug 2016 14:42:16 +0000 (16:42 +0200)]
extcap: remove unused #define from ssh-base.

Change-Id: I52d26cb1e60452f8fa4d79f988fde2268486fc1c
Reviewed-on: https://code.wireshark.org/review/17306
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
3 years agoIEEE 1722: Fixup ranges.
Gerald Combs [Wed, 24 Aug 2016 17:03:38 +0000 (10:03 -0700)]
IEEE 1722: Fixup ranges.

Use RVALS + BASE_RANGE_STRING for range_strings. This should fix the "-G
values" failure on the Win32 buildbot.

Change-Id: I9a42b66a22b615d3de9c04b485adc7b9aa2cc154
Reviewed-on: https://code.wireshark.org/review/17309
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
3 years agoFuzz test: Make Valgrind error detection more verbose.
Gerald Combs [Tue, 23 Aug 2016 23:55:16 +0000 (16:55 -0700)]
Fuzz test: Make Valgrind error detection more verbose.

When we set VG_ERR_CNT=1 print the reason.

Change-Id: Icb8f2a1e7074044521873b116fc891cc4be4b204
Reviewed-on: https://code.wireshark.org/review/17287
Reviewed-by: Gerald Combs <gerald@wireshark.org>
3 years agoQt: add initializer (CID 1328485).
Dario Lombardo [Wed, 24 Aug 2016 09:10:10 +0000 (11:10 +0200)]
Qt: add initializer (CID 1328485).

Change-Id: I1ce4ddc8bfb66522d4e472c258de2f928d5c776f
Reviewed-on: https://code.wireshark.org/review/17298
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
3 years agoextcap: make extcaps use the version registered in config.
Dario Lombardo [Wed, 24 Aug 2016 08:43:11 +0000 (10:43 +0200)]
extcap: make extcaps use the version registered in config.

Change-Id: I12d0d0bec06e02af0a9d0877c0f0f1d86261d752
Reviewed-on: https://code.wireshark.org/review/17296
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
3 years agocall_heur_dissector_direct: do not trigger an assert if heuristic dissector rejects...
Pascal Quantin [Tue, 23 Aug 2016 20:10:08 +0000 (22:10 +0200)]
call_heur_dissector_direct: do not trigger an assert if heuristic dissector rejects packet

This can happen for example is the heuristics changed between the Wireshark
version used to export PDUs, and the one used to open the file.
Instead, call data dissector.

Change-Id: I29f7754f883fd710c3557a610583ef988ca13e43
Reviewed-on: https://code.wireshark.org/review/17280
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years agoSCSI: Mode Sense 10: Wrong block descriptor length
Alexis La Goutte [Tue, 23 Aug 2016 17:41:46 +0000 (19:41 +0200)]
SCSI: Mode Sense 10: Wrong block descriptor length

Issue reported by Sharon Samuel Enoch

Bug:12780
Change-Id: I94ad5355cdfa4d8cd3915c9e261931ff56dc765b
Reviewed-on: https://code.wireshark.org/review/17272
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 agoIPMI: do not use col_set_str with non const strings
Pascal Quantin [Wed, 24 Aug 2016 06:10:27 +0000 (08:10 +0200)]
IPMI: do not use col_set_str with non const strings

Bug: 12782
Change-Id: Ia082ccf5355d7f8dd6073861c59c804fecc96266
Reviewed-on: https://code.wireshark.org/review/17289
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
3 years agoISAKMP: remove useless callback
Pascal Quantin [Tue, 23 Aug 2016 21:37:12 +0000 (23:37 +0200)]
ISAKMP: remove useless callback

isakmp_cleanup_protocol() and isakmp_init_protocol() are already registered
as cleanup and init routines

Change-Id: I4fd2348dc507c8bc933aebd5abfb2522b57da0b4
Reviewed-on: https://code.wireshark.org/review/17284
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 agoISAKMP: fix DOI field read size
Mirko Parthey [Tue, 23 Aug 2016 14:29:57 +0000 (16:29 +0200)]
ISAKMP: fix DOI field read size

Read 4 bytes from the packet instead of 1 because that is the
correct size of the DOI field.
Reference: RFC 2408

Change-Id: I5745363811bb46af307a925d688ec36cfb29984b
Reviewed-on: https://code.wireshark.org/review/17271
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 agoCMake: Allow setting per target compiler warnings
João Valverde [Tue, 16 Aug 2016 21:21:59 +0000 (22:21 +0100)]
CMake: Allow setting per target compiler warnings

Setting our compiler warning flags in CMAKE_C_FLAGS does not allow
using different flags per target.

Allow for that possibility by setting the internal WS_WARNINGS_{C,CXX}_FLAGS
and using the COMPILE_OPTIONS property to set them.

This change is just setting mechanism and there should be no difference
in generated warnings.

The check_X_compiler_flag cmake test is changed to test each flag individually.
We need a list, not a space separated string, and the aggregate test is not
significant.

Change-Id: I59fc5cd7e130c7a5e001c598e3df3e13f83a6a25
Reviewed-on: https://code.wireshark.org/review/17150
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 agoisakmp Fix IKEv2 modification UAT crash
Michał Skalski [Mon, 22 Aug 2016 23:12:59 +0000 (01:12 +0200)]
isakmp Fix IKEv2 modification UAT crash

Problem is that not all fields of UAT are updated on change (only those
defined in UAT definition with ikev2_uat_flds, specifically pointers to
encr_spec and auth_spec in ike2_decr_data_t were set to NULL.

Fixed by re-setting pointers after update table callback was called.

Also fixed memory leaks after UAT modification.

Bug was partially resolved with change
Ibdab979b5959eb561635cbcb446e17138baca87b
https://code.wireshark.org/review/17078

which eliminated crash, but decryption still didn't work after UAT
modification (DISSECTOR BUG was displayed).

Bug: 12748
Change-Id: I8209edd8e214d62e34b641fdd2e046b9ff4c95eb
Reviewed-on: https://code.wireshark.org/review/17249
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
3 years ago[lg8979] - Fix dissection of 'Analog Group Change Report' Responses (FC2)
Chris Bontje [Tue, 23 Aug 2016 14:42:59 +0000 (08:42 -0600)]
[lg8979] - Fix dissection of 'Analog Group Change Report' Responses (FC2)

They follow the same dissection as normal 'Analog Change Report' Responses (FC0)

Change-Id: I854084f43fd0cc52ba02b6f1e760a63033ab48dd
Reviewed-on: https://code.wireshark.org/review/17270
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: Jaap Keuter <jaap.keuter@xs4all.nl>
3 years agoRemove now-redundant check.
Guy Harris [Tue, 23 Aug 2016 18:50:51 +0000 (11:50 -0700)]
Remove now-redundant check.

We now check much earlier for an invalid message length; remove the
check done afterwards.

Also, note that dissect_netlink_error() should also check the message
length, to make sure it doesn't run past the end of the message, and
indicate why we are assuming an "integer" is 4 bytes (it's because the
RFC is vague here).

Change-Id: Ie0b5074acc852cdeaa008fee1125130a6c8771a1
Reviewed-on: https://code.wireshark.org/review/17279
Reviewed-by: Guy Harris <guy@alum.mit.edu>
3 years agoGet rid of trailing tabs.
Guy Harris [Tue, 23 Aug 2016 18:41:24 +0000 (11:41 -0700)]
Get rid of trailing tabs.

Change-Id: I0c26f02a63a12acc900637cd6a106d26e386a7a8
Reviewed-on: https://code.wireshark.org/review/17278
Reviewed-by: Guy Harris <guy@alum.mit.edu>
3 years agoCatch too-short netlink message lengths.
Guy Harris [Tue, 23 Aug 2016 18:39:56 +0000 (11:39 -0700)]
Catch too-short netlink message lengths.

0 would cause an infinite loop. and any value < 16 is clearly wrong, so
if we see such a packet, just show the header's length field and stop
dissecting.

Bug: 12776
Change-Id: Iefc56b26b83ff5424968d065bdb9fa84a7a65481
Reviewed-on: https://code.wireshark.org/review/17277
Reviewed-by: Guy Harris <guy@alum.mit.edu>
3 years agoMAC LTE: fix dissection of CE Mode A RAR message
Pascal Quantin [Tue, 23 Aug 2016 17:41:48 +0000 (19:41 +0200)]
MAC LTE: fix dissection of CE Mode A RAR message

The Msg3 PUSCH narrowband index parameter depends on the UL bandwidth

Change-Id: Ib57c85ffbd4c108e9c8f3d14fa53a48f0df1b0e6
Reviewed-on: https://code.wireshark.org/review/17274
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 agoDocumentation with unset license is under project's license (GPL-2+)
Balint Reczey [Tue, 23 Aug 2016 11:53:23 +0000 (13:53 +0200)]
Documentation with unset license is under project's license (GPL-2+)

doc/idl2deb.pod is licensed explicitly under GPL-2+ it is just
not recognized by the check.

Change-Id: Iabc7ee6bd6fe9080d6cdd28a29bb4c5f97b0ece9
Reviewed-on: https://code.wireshark.org/review/17268
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
Petri-Dish: Balint Reczey <balint@balintreczey.hu>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
3 years agodissector ISAKMP IKEv2: fixed bug with libgcrypt-1.6.x and AEAD ciphers
Michał Skalski [Sun, 21 Aug 2016 20:00:44 +0000 (22:00 +0200)]
dissector ISAKMP IKEv2: fixed bug with libgcrypt-1.6.x and AEAD ciphers

IKEv2:
Fixed bug with AEAD ciphers with 8- and 12-byte length ICVs and
libgcrypt 1.6.x - gcry_cipher_checktag() returned INVALID_LENGTH.
Fixed for merged changeset https://code.wireshark.org/review/17078

Added support for verification of encrypted data with HMAC_MD5_128
[RFC4595] and HMAC_SHA1_160 [RFC4595] integrity algorithms

Added IKEv2 decryption suite for few combinations of encryption and
integrity algorithms: 3DES-CBC/SHA1_160, AES-128-CCM-12, AES-128-CCM-12
(using CTR mode), AES-192-CTR/SHA2-512, AES-256-CBC/SHA2-256,
AES-256-CCM-16, AES-256-GCM-16, AES-256-GCM-8

Change-Id: Ic564b25f1fd41e913c605322b7b8aa030cf90ddf
Reviewed-on: https://code.wireshark.org/review/17213
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
3 years agoIEEE 802.15.4:dissecting header & payload information elements used by 6tisch.
Jonathan Muñoz [Tue, 5 Jul 2016 15:13:14 +0000 (17:13 +0200)]
IEEE 802.15.4:dissecting header & payload information elements used by 6tisch.

This patch shows the Information Elements (IE) defined by the
IEEE802.15.4. It dissects the information of those IE which are used
by the IETF WG 6tisch and announces the others. Here the list of the
fully dissected ones:

- For the header IEs:
    - Time Correction.
    - Header Termination 1.
    - Header Termination 2.

- For the payload IEs:
    - MLME:
        - Nested Shorts:
            - TSCH Synchronization IE.
            - TSCH Timeslot IE.
            - TSCH Slotframe and Link IE.
        - Nested Longs:
            - Channel Hopping IE.
    - Payload Termination IE.

For the rest of the IEs defined in the standart, this patch shows them
but does not analyze their inner fields.

References:
https://datatracker.ietf.org/doc/draft-ietf-6tisch-minimal/
IEEE Standard for Low-Rate Wireless Personal Area Networks (WPANs).

Change-Id: I45292315fa532f08be6a218eb5756284a22eeee4
Reviewed-on: https://code.wireshark.org/review/16671
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 agoisakmp: fix type confusion
Peter Wu [Mon, 22 Aug 2016 20:29:21 +0000 (22:29 +0200)]
isakmp: fix type confusion

Caught by ASAN with WIRESHARK_DEBUG_WMEM_OVERRIDE=simple set.

Manually inspection of all type casts to decrypt_data_t and
ikev2_decrypt_data_t showed no other users that do not check
isakmp_version first.

Change-Id: If889afff85a20e31222d33cbea8db3a91a77f389
Reviewed-on: https://code.wireshark.org/review/17246
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michał Skalski <mskalski13@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years agoSee if *this* convinces the compiler that valuelen and value will be set.
Guy Harris [Tue, 23 Aug 2016 03:36:24 +0000 (20:36 -0700)]
See if *this* convinces the compiler that valuelen and value will be set.

Change-Id: I2a7715ac3255502f244a0d0a7e588b3a44c34f11
Reviewed-on: https://code.wireshark.org/review/17258
Reviewed-by: Guy Harris <guy@alum.mit.edu>
3 years agoMore fields, more pre-allocated memory for fields.
Guy Harris [Tue, 23 Aug 2016 02:57:22 +0000 (19:57 -0700)]
More fields, more pre-allocated memory for fields.

Change-Id: I8362e64354c4ca985dbabc190cfb75d2bd31a5ad
Reviewed-on: https://code.wireshark.org/review/17257
Reviewed-by: Guy Harris <guy@alum.mit.edu>
3 years agoFix handling of parameters with no value.
Guy Harris [Tue, 23 Aug 2016 02:28:24 +0000 (19:28 -0700)]
Fix handling of parameters with no value.

Return a value length of 0 if there's no parameter value.

(And don't return anything if the pointers through which we return them
are null.)

If no value is present, return NULL from ws_find_media_type_parameter().

Change-Id: I32b57623d7651bcf065af5b81f2390a600988b21
Reviewed-on: https://code.wireshark.org/review/17255
Reviewed-by: Guy Harris <guy@alum.mit.edu>
3 years agoAdd cast to squelch "building with a C++ compiler" warnings.
Guy Harris [Tue, 23 Aug 2016 01:25:33 +0000 (18:25 -0700)]
Add cast to squelch "building with a C++ compiler" warnings.

Change-Id: Ia95c40096018479aec99fafd93d7b95d31ba4723
Reviewed-on: https://code.wireshark.org/review/17253
Reviewed-by: Guy Harris <guy@alum.mit.edu>
3 years agoHandle quoted-pairs in quoted-strings correctly.
Guy Harris [Tue, 23 Aug 2016 00:53:10 +0000 (17:53 -0700)]
Handle quoted-pairs in quoted-strings correctly.

Backslash, in a quoted-string, escapes quotes (and any other characters,
although the only ones that *need* escaping are a double-quote and a
backslash).

This means that the value of a parameter isn't just the raw characters
from the parameters string; for a quoted string, it needs to be
un-escaped, and for a *non*-quoted string, it has to stop at the first
non-token character (you can put comments in).  So
ws_find_media_type_parameter() must return an allocated string with the
actual value.

Get rid of index_of_char(); it doesn't do anything that strchr() does.

Change-Id: I36328ea71c28fe6ac4918a8e73c281a25f6be844
Reviewed-on: https://code.wireshark.org/review/17251
Reviewed-by: Guy Harris <guy@alum.mit.edu>
3 years agoUpdate docbook/README.txt
Gerald Combs [Mon, 22 Aug 2016 22:10:24 +0000 (15:10 -0700)]
Update docbook/README.txt

Update to reflect current reality. Still needs a lot of work.

Change-Id: Id6bb12f5e8ca42bbadc237f148bb388b54a321e2
Reviewed-on: https://code.wireshark.org/review/17247
Reviewed-by: Gerald Combs <gerald@wireshark.org>
3 years agoIKEv2: Add D-H Transform IDs for Brainpool Curves
Mirko Parthey [Mon, 22 Aug 2016 11:25:33 +0000 (13:25 +0200)]
IKEv2: Add D-H Transform IDs for Brainpool Curves

Add Diffie-Hellman Group Transform IDs for the ECC Brainpool Curves.

References: RFC 6932, RFC 6954

Change-Id: I1ca0da8e5e06abbd1c53a591d01c1f05aa60c35a
Reviewed-on: https://code.wireshark.org/review/17231
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 agoMake index_of_char() static again
Balint Reczey [Mon, 22 Aug 2016 11:26:14 +0000 (13:26 +0200)]
Make index_of_char() static again

Change-Id: I1c0d344c50ee5d78dd8247ccfe795ce0cd94aaa2
Reviewed-on: https://code.wireshark.org/review/17230
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
3 years agodebian: Update symbols file with new symbols
Balint Reczey [Mon, 22 Aug 2016 12:11:32 +0000 (14:11 +0200)]
debian: Update symbols file with new symbols

Some symbols are marked as appearing in 2.2 intentionally,
because they are cherry-picked to master-2.2.

Change-Id: Ia7807b3bddab0a069812f56c1be2eca8bf7d1cd4
Reviewed-on: https://code.wireshark.org/review/17232
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
Petri-Dish: Balint Reczey <balint@balintreczey.hu>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
3 years agoRename find_parameter() to ws_find_media_type_parameter()
Balint Reczey [Mon, 22 Aug 2016 10:59:01 +0000 (12:59 +0200)]
Rename find_parameter() to ws_find_media_type_parameter()

The symbols exported from libs should use less generic. preferably
prefixed names to avoid name collisions with other shared library
symbols.

Change-Id: I8323b3e194a7ee4d61baec0c007342fab6cbde84
Reviewed-on: https://code.wireshark.org/review/17229
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
3 years agoFixed a bug which might have caused a division by 0.
Andreas Leibold [Mon, 22 Aug 2016 10:51:05 +0000 (12:51 +0200)]
Fixed a bug which might have caused a division by 0.

Variable "channels_per_frame" could have caused a division by 0.
This is now changed, by stopping dissection in this case. A warning is
shown for this case.

Change-Id: I6d4dcb91b833a7d7f0759e28f56950b94ab1ed7e
Reviewed-on: https://code.wireshark.org/review/17228
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
3 years agoRANAP: Add an heuristic to decode the HO-to-UTRAN Command embedded in the RRC Contai...
Binh Trinh [Mon, 15 Aug 2016 03:41:48 +0000 (23:41 -0400)]
RANAP:  Add an heuristic to decode the HO-to-UTRAN Command embedded in the RRC Container within the TargetRNC-to-SourceRNC Transparent Container

Change-Id: Iea7c8d24f52cf8bd11e13a53853e11ec1ecdcd36
Reviewed-on: https://code.wireshark.org/review/17058
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>
3 years agoipp: fix typo indent
Alexis La Goutte [Mon, 22 Aug 2016 09:55:52 +0000 (11:55 +0200)]
ipp: fix typo indent

Change-Id: Ibc44ab1e009f2dc07258b702f0e08aced38a66e2
Reviewed-on: https://code.wireshark.org/review/17223
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years ago[Diameter] Add Command codes 8388718 - 8388722.
AndersBroman [Mon, 22 Aug 2016 10:33:08 +0000 (12:33 +0200)]
[Diameter] Add Command codes 8388718 - 8388722.

Bug: 12774
Change-Id: I413ba4a195ee1bd3d7de66399d1be714ef77d7e2
Reviewed-on: https://code.wireshark.org/review/17227
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years agowmem_array_index() returns a *pointer* to the array element.
Guy Harris [Mon, 22 Aug 2016 07:37:42 +0000 (00:37 -0700)]
wmem_array_index() returns a *pointer* to the array element.

The array is an array of guint8 *'s that point to strings;
wmem_array_index() doesn't return a pointer to the string, it returns a
pointer to a pointer to the string, and you have to dereference the
result of the wmem_array_index() call to get a pointer to the string.

Change-Id: I8c7b3320f0979b01383ad255419c21cdeb7df4c7
Reviewed-on: https://code.wireshark.org/review/17221
Reviewed-by: Guy Harris <guy@alum.mit.edu>
3 years agoLook up the XML dissector the right way.
Guy Harris [Mon, 22 Aug 2016 06:43:38 +0000 (23:43 -0700)]
Look up the XML dissector the right way.

Looking up "text/xml" in the "media_type" dissector is somewhat of a
long-way-around way of finding the XML dissector; just look for it by
name.

Change-Id: Ifafeabc563bf7bfa529bc44ba31bf6ae376a09c8
Reviewed-on: https://code.wireshark.org/review/17219
Reviewed-by: Guy Harris <guy@alum.mit.edu>
3 years agoGet rid of trailing blank line.
Guy Harris [Mon, 22 Aug 2016 06:36:54 +0000 (23:36 -0700)]
Get rid of trailing blank line.

Change-Id: I409a843b48983355c242708f6c9972bd8f337bf6
Reviewed-on: https://code.wireshark.org/review/17218
Reviewed-by: Guy Harris <guy@alum.mit.edu>
3 years agoPass an HTTP message type to all HTTP subdissectors.
Guy Harris [Mon, 22 Aug 2016 06:33:23 +0000 (23:33 -0700)]
Pass an HTTP message type to all HTTP subdissectors.

This gets complicated, because those subdissectors might be called by
other dissectors as well.  We need a better way of passing that sort of
out-of-bound information.

Pull some routines used for processing Content-Type parameters into
common code; we can't guarantee that the media parameters passed in
would be writable (passing it as *the* data hid that; passing a
structure with that *and* the HTTP message type revealed it), so don't
convert it to lower-case in place.

Use that information, if available, to determine whether an IPP message
is a requet or a response.

Change-Id: I4bccc9f05cd0b14ad445be7ab37b3d884d841325
Reviewed-on: https://code.wireshark.org/review/17216
Reviewed-by: Guy Harris <guy@alum.mit.edu>
3 years agoISUP: Enhance display of unknown (opt) parameter
Alexis La Goutte [Wed, 17 Aug 2016 08:39:54 +0000 (10:39 +0200)]
ISUP: Enhance display of unknown (opt) parameter

Ping-Bug:12674
Change-Id: If67920246a9122dc693a71a4afcea212fb7f84ab
Reviewed-on: https://code.wireshark.org/review/17108
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 agoMerge the CaveBear list into manuf.tmpl.
Gerald Combs [Sun, 21 Aug 2016 18:23:20 +0000 (11:23 -0700)]
Merge the CaveBear list into manuf.tmpl.

If the following lines at the top of "Ethernet.txt" are anything to go
by

----
$Revision: 2.83 $
$Date: 1999/03/09 11:36:19 $
$Author: map $
$Id: Ethernet.txt,v 2.83 1999/03/09 11:36:19 map Exp $
----

we've been fetching the same list over and over for quite some time.  Go
ahead and merge the CaveBear list with manuf.tmpl and stop fetching it
remotely.

Fixup the way we split the lines we get from the IEEE while we're here,
otherwise we log carriage returns in the middle of lines.

The following CaveBear lines were skipped during the merge:

Change-Id: I2110a7480a01a1bc5cbb6adf858acd9b5f75204c
00:00:10 - Skipping CaveBear "Hughes LAN Systems (formerly Sytek)" in favor of "Hughes"
00:00:11 - Skipping CaveBear "Tektronix" in favor of "Tektrnix"
00:00:1A - Skipping CaveBear "AMD (?)" in favor of "AMD"
00:00:20 - Skipping CaveBear "DIAB (Data Intdustrier AB)" in favor of "DIAB"
00:00:21 - Skipping CaveBear "SC&C (PAM Soft&Hardware also reported)" in favor of "SC&C"
00:00:24 - Skipping CaveBear "Olicom" in favor of "Olicom"
00:00:3D - Skipping CaveBear "AT&T" in favor of "AT&T"
00:00:46 - Skipping CaveBear "ISC-Bunker Ramo, An Olivetti Company" in favor of "ISC-BR"
00:00:4B - Skipping CaveBear "APT -ICL also reported" in favor of "APT"
00:00:55 - Skipping CaveBear "AT&T" in favor of "AT&T"
00:00:5A - Skipping CaveBear "Xerox 806 (unregistered)" in favor of "SkSchnei               # SK (Schneider & Koch in Europe and Syskonnect outside of Europe)"
00:00:62 - Skipping CaveBear "Honeywell" in favor of "Hneywell # Honeywell"
00:00:63 - Skipping CaveBear "Hewlett-Packard LanProbe" in favor of "HP"
00:00:69 - Skipping CaveBear "Concord Communications, Inc (although someone said Silicon Graphics)" in favor of "SGI"
00:00:6B - Skipping CaveBear "MIPS" in favor of "MIPS"
00:00:7A - Skipping CaveBear "Ardent" in favor of "Ardent"
00:00:7D - Skipping CaveBear "Cray Research Superservers,Inc [Also Harris (3M) (old)]" in favor of "Cray"
00:00:A3 - Skipping CaveBear "Network Application Technology (NAT)" in favor of "NAT"
00:00:A5 - Skipping CaveBear "Compatible Systems Corporation" in favor of "CSC"
00:00:A7 - Skipping CaveBear "Network Computing Devices (NCD) X-terminals" in favor of "NCD"
00:00:A9 - Skipping CaveBear "Network Systems" in favor of "NetSys # Network Systems"
00:00:DD - Skipping CaveBear "Gould" in favor of "Gould"
00:00:DE - Skipping CaveBear "Unigraph" in favor of "Unigraph"
00:00:E1 - Skipping CaveBear "Hitachi (laptop built-in)" in favor of "Hitachi"
00:00:F6 - Skipping CaveBear "A.M.C. (Applied Microsystems Corp.)" in favor of "Madge"
00:01:FA - Skipping CaveBear "Compaq (PageMarq printers)" in favor of "Compaq"
00:02:04 - Skipping CaveBear "Novell NE3200" in favor of "Novell"
00:07:01 - Skipping CaveBear "Racal-Datacom" in favor of "Cisco # RACAL-DATACOM"
00:20:85 - Skipping CaveBear "3COM SuperStack II UPS management module" in favor of "3Com"
00:40:0B - Skipping CaveBear "Crescendo (now owned by Cisco)" in favor of "Cresc"
00:40:96 - Skipping CaveBear "Telesystems SLW Inc" in favor of "Aironet # Cisco Systems, Inc."
00:60:B0 - Skipping CaveBear "Hewlett-Packard" in favor of "HP"
00:80:0F - Skipping CaveBear "SMC (Standard Microsystem Corp.)" in favor of "SMC"
00:80:1C - Skipping CaveBear "Cisco" in favor of "Cisco # NEWPORT SYSTEMS SOLUTIONS"
00:80:96 - Skipping CaveBear "HDS (Human Designed Systems) X terminals" in favor of "HDS"
00:80:AD - Skipping CaveBear "CNet Technology Used by Telebit (among others)" in favor of "Telebit"
00:90:B1 - Skipping CaveBear "Cisco" in favor of "Cisco"
00:E0:98 - Skipping CaveBear "Linksys PCMCIA card" in favor of "Trend"
02:07:01 - Skipping CaveBear "Racal-Datacom" in favor of "Interlan               # Interlan [now Racal-InterLAN] DEC (UNIBUS or QBUS), Apollo, Cisco"
02:CF:1F - Skipping CaveBear "CMC Masscomp; Silicon Graphics; Prime EXL" in favor of "CMC"
08:00:02 - Skipping CaveBear "3Com (formerly Bridge)" in favor of "3Com"
08:00:03 - Skipping CaveBear "ACC (Advanced Computer Communications)" in favor of "ACC"
08:00:08 - Skipping CaveBear "BBN (Bolt Beranek and Newman, Inc.)" in favor of "BBN"
08:00:09 - Skipping CaveBear "Hewlett-Packard" in favor of "HP"
08:00:1A - Skipping CaveBear "Tiara? (used to have Data General)" in favor of "DataGenl # Data General"
08:00:38 - Skipping CaveBear "Bull" in favor of "Bull"
08:00:3E - Skipping CaveBear "Motorola VME bus processor modules" in favor of "Motorola"
08:00:69 - Skipping CaveBear "Silicon Graphics" in favor of "SGI"
08:00:79 - Skipping CaveBear "Silicon Graphics" in favor of "SGI"
08:00:90 - Skipping CaveBear "Retix, Inc. Bridges" in favor of "Retix"
09:00:6A - Skipping CaveBear "AT&T" in favor of "AT&T"
10:00:90 - Skipping CaveBear "Hewlett-Packard Advisor products" in favor of "HP"
10:00:D4 - Skipping CaveBear "DEC" in favor of "DEC"
3C:00:00 - Skipping CaveBear "3Com dual function (V.34 modem + Ethernet) card" in favor of "3Com"
44:45:53 - Skipping CaveBear "Microsoft (Windows95 internal "adapters")" in favor of "Microsoft"
Reviewed-on: https://code.wireshark.org/review/17212
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years agoAdd "Modbus/TCP over UDP"
Michael Mann [Sun, 21 Aug 2016 22:04:42 +0000 (18:04 -0400)]
Add "Modbus/TCP over UDP"

There already is "ModbusRTU over UDP", this is the Modbus/TCP format over UDP.

Bug: 12768
Change-Id: I883aa8e88f8a1640459115434be84354e22bb361
Reviewed-on: https://code.wireshark.org/review/17215
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 agoLoosen HTTP token sting requirements so HTTP 1.0 can be included.
Tom [Sun, 21 Aug 2016 14:29:11 +0000 (10:29 -0400)]
Loosen HTTP token sting requirements so HTTP 1.0 can be included.

Bug: 12770
Change-Id: I5f71072231a752ce6cdedf6f22ce8931a61c39c7
Reviewed-on: https://code.wireshark.org/review/17214
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 agonflog: add fields for interface indices
Peter Wu [Sat, 20 Aug 2016 16:33:27 +0000 (18:33 +0200)]
nflog: add fields for interface indices

Allows me to see the interface indices in a column.

Change-Id: I0dd31d7ec06eb860e7c80a4273779ec9034ee42d
Reviewed-on: https://code.wireshark.org/review/17193
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 agoRANAP: fix indent (use 2 spaces) and modelines
Alexis La Goutte [Sun, 21 Aug 2016 13:54:43 +0000 (15:54 +0200)]
RANAP: fix indent (use 2 spaces) and modelines

Change-Id: I84e3157a9303572dcd3d9ff5df6802c42553e62f
Reviewed-on: https://code.wireshark.org/review/17197
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 agomongo: add support for new mongodb 3.2 wire protocol opcodes
Alexis La Goutte [Fri, 19 Aug 2016 09:03:17 +0000 (11:03 +0200)]
mongo: add support for new mongodb 3.2 wire protocol opcodes

Add OP_COMMAND (2010) and OP_COMMANDREPLY (2011)

Bug:12723
Change-Id: Ib66e7136c7a6589286bbea11db2cff76d689db35
Reviewed-on: https://code.wireshark.org/review/17166
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>
3 years agonflog: support NFLOG bridge (ebtables) dissection
Peter Wu [Sat, 20 Aug 2016 13:10:21 +0000 (15:10 +0200)]
nflog: support NFLOG bridge (ebtables) dissection

See net/netfilter/nfnetlink_log.c, that is the only place that sets
NFULA_PACKET_HDR to struct nfulnl_msg_packet_hdr.

Tested with nflog-ebtables.pcapng from SampleCaptures wiki.

Change-Id: I7e21f8f584f3911b3aa7d0d027ff9624886bef73
Reviewed-on: https://code.wireshark.org/review/17191
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
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>
3 years agoCDP: Don't read outside payload for Port ID
Uli Heilmeier [Sun, 21 Aug 2016 15:27:39 +0000 (17:27 +0200)]
CDP: Don't read outside payload for Port ID

Check if tvb remaining length is greater than expected length.

Bug: 12767
Change-Id: Ia04b559432af417db519cfcfbec06e6010b496bf
Reviewed-on: https://code.wireshark.org/review/17208
Petri-Dish: Jim Young <jim.young.ws@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
3 years agoLLC/STP (Cisco): Add Cisco Root Link Query PDU (STP)
Alexis La Goutte [Sun, 21 Aug 2016 14:54:13 +0000 (16:54 +0200)]
LLC/STP (Cisco): Add Cisco Root Link Query PDU (STP)

Cisco RLQ BPDUs, request (PID 0x0108) and response (PID 0x0109) used to support Cisco's extension (Backbone Fast [1]) to original 802.1D spanning-tree protocol. The format of the BPDUs is same as original STP configuration BPDUs
[1] http://www.cisco.com/c/en/us/support/docs/lan-switching/spanning-tree-protocol/12014-18.html
[2] http://www.cisco.com/c/en/us/support/docs/lan-switching/spanning-tree-protocol/12014-18.html#anc9

Issue reported by Garri

Bug:12772
Change-Id: I0ffd169bf252ae11817c7a44ca3a67dfd4e221eb
Reviewed-on: https://code.wireshark.org/review/17204
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-08-21]
Gerald Combs [Sun, 21 Aug 2016 15:05:53 +0000 (08:05 -0700)]
[Automatic update for 2016-08-21]

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

Change-Id: I92e3eefcb4670994fcab0d089c184ba5da2ab788
Reviewed-on: https://code.wireshark.org/review/17205
Reviewed-by: Gerald Combs <gerald@wireshark.org>
3 years agoieee1722: fix Division by Zero found by Clang Analyzer and Coverity (CID 1371610)
Alexis La Goutte [Sun, 21 Aug 2016 14:21:40 +0000 (16:21 +0200)]
ieee1722: fix Division by Zero found by Clang Analyzer and Coverity (CID 1371610)

Change-Id: Iac0ef122062f8dc3160e112d76c35a256f8d8c2a
Reviewed-on: https://code.wireshark.org/review/17201
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
3 years agonstrace: fix Control flow issues (UNREACHABLE) found by Coverity (CID 1371612)
Alexis La Goutte [Sun, 21 Aug 2016 14:24:45 +0000 (16:24 +0200)]
nstrace: fix Control flow issues (UNREACHABLE) found by Coverity (CID 1371612)

Change-Id: I76b3956d5b346412af5ff3aa5e0f6263dcb525a4
Reviewed-on: https://code.wireshark.org/review/17202
Reviewed-by: Michael Mann <mmann78@netscape.net>
3 years agonetlink-netfilter,nflog: use NFPROTO_xxx instead of AF_xxx
Peter Wu [Sat, 20 Aug 2016 11:22:30 +0000 (13:22 +0200)]
netlink-netfilter,nflog: use NFPROTO_xxx instead of AF_xxx

These constants are mostly overlapping, except for NFPROTO_ARP. A manual
study of the Linux v4.7 code shows which fields to use and also reveal
that nflog.family can never be NFPROTO_ARP because (1) bridge traffic
use NFPROTO_BRIDGE and (2) arptables has no ULOG/NFLOG target.

This patch affects how some family fields are displayed but do not
affect subdissector calls.

Change-Id: I7cc73a8dcf73fe68c7ccaaa0f3b329fe484c8bfe
Reviewed-on: https://code.wireshark.org/review/17190
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>
3 years agoTCPROS - Protocol dissector improvements
Guillaume Autran [Tue, 12 Jan 2016 19:48:57 +0000 (14:48 -0500)]
TCPROS - Protocol dissector improvements

 - Added specific dissector for ROS Clock messages
 - Added dissector heuristics
 - Improve ROS traffic detection

Problems to resolve:
 - Some topics are mistaken for Clock messages. These includes the wheel encoder topic.
 - ROS Services are not detected.
 - Ideally, the TF topic should be dissected as it is a very common topic

Bug: 12749
Change-Id: I14255cbb42ae36b7e39f64dc1a5c6efffe19c8b1
Reviewed-on: https://code.wireshark.org/review/17086/
Reviewed-on: https://code.wireshark.org/review/17086
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>
3 years agoCOAP: ensure that key_token is always initialized
Pascal Quantin [Sat, 20 Aug 2016 19:03:02 +0000 (21:03 +0200)]
COAP: ensure that key_token is always initialized

Even when the token length is 0.

Bug: 12771
Change-Id: I0d77f0411fe90a6702d1f23ba9cd4b61433a5995
Reviewed-on: https://code.wireshark.org/review/17194
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 agoBOOTP: Catch undefined Client Identifier (Option 61)
Uli Heilmeier [Fri, 19 Aug 2016 19:21:29 +0000 (21:21 +0200)]
BOOTP: Catch undefined Client Identifier (Option 61)

[1] stats "A hardware type of 0 (zero) should be used when the value field
contains an identifier other than a hardware address (e.g. a fully
qualified domain name)."

This commit displays these other identifier.

[1] https://tools.ietf.org/html/rfc2132#section-9.14

Bug: 12766
Change-Id: I3d991164641b41fb95891b2f78411d2e98a22e0d
Reviewed-on: https://code.wireshark.org/review/17180
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
3 years agoICMPv6: Add support for MPL Control Message (RFC 7731)
Yasuyuki Tanaka [Wed, 17 Aug 2016 16:48:24 +0000 (18:48 +0200)]
ICMPv6: Add support for MPL Control Message (RFC 7731)

Bug: 12757
Change-Id: I454c8a9a85c703a746e5152157817b1d8a48accf
Reviewed-on: https://code.wireshark.org/review/17115
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years agoISAKMP: Add regression tests
Mirko Parthey [Sun, 14 Aug 2016 21:50:25 +0000 (23:50 +0200)]
ISAKMP: Add regression tests

Add regression tests for bugs 12610 and 12620

Bug: 12610
Bug: 12620
Change-Id: I6325a3ccb3e27fd4d3be52190e8763737b99fe73
Reviewed-on: https://code.wireshark.org/review/17083
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 agoQUIC: Enhance dissection of STREAM
Alexis La Goutte [Thu, 18 Aug 2016 06:09:53 +0000 (08:09 +0200)]
QUIC: Enhance dissection of STREAM

stream_id = 1 is reserved for QUIC handshake/crypto...
stream_id = 3 is reserved for H2 HEADERS (PUSH_PROMISE..) (and call H2 dissector for dissection)

Thanks for Lucas for pcap

Change-Id: I563c44af88c3e72476f8637d8b7c5ba4d8a4a995
Reviewed-on: https://code.wireshark.org/review/17134
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years ago1722 extensions: code clean up, warning removed
Andreas Leibold [Fri, 19 Aug 2016 08:29:51 +0000 (10:29 +0200)]
1722 extensions: code clean up, warning removed

code clean up
dissector bugfixing
1722 / 61883 subtype: packet inspection enhanced regarding warnings
1722 / 61883-6 subtype: more detailed packet dissection

Change-Id: I0d762f37402ca27ad33e0d22da50c184297bed57
Reviewed-on: https://code.wireshark.org/review/17110
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 agoAdd a preference to byte-swap the CAN ID field.
Guy Harris [Fri, 19 Aug 2016 23:18:43 +0000 (16:18 -0700)]
Add a preference to byte-swap the CAN ID field.

This can be useful when dealing with 1) captures from versions of
libpcap without the bug fix to use DLT_CAN_SOCKETCAN_HOSTENDIAN when
appropriate and 2) DLT_CAN_SOCKETCAN_HOSTENDIAN captures if processed by
a machine with a different byte order from the capturing machine with
software that doesn't properly put the field into host byte order when
reading and writing.

Change-Id: Ia206e5c51aecccf2508cca01cff65a4feb379ac8
Reviewed-on: https://code.wireshark.org/review/17187
Reviewed-by: Guy Harris <guy@alum.mit.edu>
3 years agoLCSAP: fix indent (use 2 spaces) and modelines
Alexis La Goutte [Fri, 19 Aug 2016 11:37:59 +0000 (13:37 +0200)]
LCSAP: fix indent (use 2 spaces) and modelines

Change-Id: I688c71a94703cecbf62b0e29f1e389551cedbeb9
Reviewed-on: https://code.wireshark.org/review/17171
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years agoNAS EPS: generate the consecutive TAC values when using the TAI list format 1
Pascal Quantin [Fri, 19 Aug 2016 16:02:58 +0000 (18:02 +0200)]
NAS EPS: generate the consecutive TAC values when using the TAI list format 1

Change-Id: I79442a95c52c0ac334ad27b83b78af78d0d23dcc
Reviewed-on: https://code.wireshark.org/review/17179
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 agoDo all data fetching in the appropriate byte order.
Guy Harris [Fri, 19 Aug 2016 20:19:06 +0000 (13:19 -0700)]
Do all data fetching in the appropriate byte order.

Change-Id: I481288b566c2b9888b3f068d2dbae1240fa2930e
Reviewed-on: https://code.wireshark.org/review/17181
Reviewed-by: Guy Harris <guy@alum.mit.edu>
3 years ago[Diameter] Add subdissection of AVP 1242 location estimate and AVP 2516
AndersBroman [Fri, 19 Aug 2016 13:10:06 +0000 (15:10 +0200)]
[Diameter] Add subdissection of AVP 1242 location estimate and AVP 2516
EUTRAN-Positioning-Data.

Change-Id: I8eebd94ab82889cff5ef3a209c485e8d2769a71d
Reviewed-on: https://code.wireshark.org/review/17177
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 agoNLM: fix dissection of NLM_FREE_ALL message
Pascal Quantin [Fri, 19 Aug 2016 16:00:36 +0000 (18:00 +0200)]
NLM: fix dissection of NLM_FREE_ALL message

The second parameter is the state, not the status as seen in C702 doc, page 159

Bug: 12764
Change-Id: I0a91a0e586c7663ace7c4c6b1044cafc1c0975ac
Reviewed-on: https://code.wireshark.org/review/17178
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
3 years agoAnswer a locale question in a comment.
Gerald Combs [Fri, 19 Aug 2016 20:59:49 +0000 (13:59 -0700)]
Answer a locale question in a comment.

Change-Id: If2c287ed8d2a3b518ceff891f1e6d995d7a7daad
Reviewed-on: https://code.wireshark.org/review/17182
Reviewed-by: Gerald Combs <gerald@wireshark.org>
3 years ago[Diameter] Add stray AVP "Pseudonym-Indicator" code="2519"
AndersBroman [Fri, 19 Aug 2016 13:06:51 +0000 (15:06 +0200)]
[Diameter] Add stray AVP "Pseudonym-Indicator" code="2519"

Change-Id: I050c27b7118fb98fea20fec697279dc68820763d
Reviewed-on: https://code.wireshark.org/review/17176
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years ago[LCS-AP] Add decoding of Civic-Address, add expert info if wrongly
AndersBroman [Fri, 19 Aug 2016 11:02:34 +0000 (13:02 +0200)]
[LCS-AP] Add decoding of Civic-Address, add expert info if wrongly
encoded.

Change-Id: I2631fe5ae7f8e73f8f4067c73197ae4cd386b633
Reviewed-on: https://code.wireshark.org/review/17169
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 agocodecs/speex: add check in speex_resampler_init_frac/set_rate_frac (CID 1355648).
Dario Lombardo [Mon, 8 Aug 2016 20:10:48 +0000 (22:10 +0200)]
codecs/speex: add check in speex_resampler_init_frac/set_rate_frac (CID 1355648).

Add checks to avoid den_rate and num_rate to be set to 0.

Change-Id: Ia4880521e7ab73d0fdc44377f4badadb09365471
Reviewed-on: https://code.wireshark.org/review/16963
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years agonetlink: fix flags dissection
Peter Wu [Wed, 17 Aug 2016 19:14:57 +0000 (21:14 +0200)]
netlink: fix flags dissection

Flags are not in network byte order, use given encoding instead.

Show both flags fields for GET and NEW requests since the netlink
dissector cannot yet determine whether a request is for GET, NEW or
something else. This has no effect for the sockdiag dissector but it
will influence the route and netfilter netlink subdissectors.

Change-Id: I472ff9e0498debbbceef657a14408c4e6a9df75b
Reviewed-on: https://code.wireshark.org/review/17118
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years agodissector ISAKMP: Added decryption using AES-GCM, AES-CCM and AES-CTR
Michał Skalski [Tue, 16 Aug 2016 01:21:09 +0000 (03:21 +0200)]
dissector ISAKMP: Added decryption using AES-GCM, AES-CCM and AES-CTR

Added support for decryption of IKEv2 packets encrypted with PAED or CTR
cipher mode.
Verification of integrity requires libgcrypt 1.6.0 or later. If it is
not the case, only decryption is performed
Can easily be extended to other ciphers supported by libgcrypt.

NOTE: There is long-term bug in handling UAT for IKEv2 - any change
resulting in change count of IKEv2 UAT entries causes crash when
matching key from UAT is found.
Crash does not occur when UAT is read from user prefs file.
I observed this bug also on stock 1.10.6 version from Ubuntu 14.04 LTS

I have no knowledge, how to fix it.

Change-Id: Ibdab979b5959eb561635cbcb446e17138baca87b
Reviewed-on: https://code.wireshark.org/review/17078
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 agoRTPS: Added locator information to the parameter tree.
Juanjo Martin [Thu, 18 Aug 2016 11:39:10 +0000 (13:39 +0200)]
RTPS: Added locator information to the parameter tree.

This makes the user avoid to click twice in order to see the info.

Change-Id: Ib983c78634b1309f12ab29d673abc1195088f55c
Reviewed-on: https://code.wireshark.org/review/17146
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 agobfd: Fix a comment on Control packet version 1
Francois-Xavier Le Bail [Fri, 19 Aug 2016 07:15:31 +0000 (09:15 +0200)]
bfd: Fix a comment on Control packet version 1

Bug:12761
Change-Id: I5877878f19be4907b9fc0c00f19601a3c7a67005
Signed-off-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-on: https://code.wireshark.org/review/17163
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years agomongo: set on subtree when Empty Document
Alexis La Goutte [Fri, 19 Aug 2016 09:10:50 +0000 (11:10 +0200)]
mongo: set on subtree when Empty Document

Change-Id: I2b6b7cf771ab7bc2f6dbc0aac5eddda2a9d2fb53
Reviewed-on: https://code.wireshark.org/review/17167
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[LCS-AP] id-E-UTRAN-Cell-Identifier is sued also as an extension value.
AndersBroman [Fri, 19 Aug 2016 10:34:53 +0000 (12:34 +0200)]
[LCS-AP] id-E-UTRAN-Cell-Identifier is sued also as an extension value.

Change-Id: I86c7ff51a16801c2995161c45cb3d8e6800f54c4
Reviewed-on: https://code.wireshark.org/review/17168
Reviewed-by: Anders Broman <a.broman58@gmail.com>
3 years ago[Diameter] Ad dissetion of Access-Restriction-Data bitfield.
AndersBroman [Fri, 19 Aug 2016 08:18:44 +0000 (10:18 +0200)]
[Diameter] Ad dissetion of Access-Restriction-Data bitfield.

Change-Id: I3e751f07c540b056b55fc98fb9c26d23718bd8fc
Reviewed-on: https://code.wireshark.org/review/17164
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
3 years agoNAS EPS: fix dissection of multiple partial tracking area identity list
Pascal Quantin [Thu, 18 Aug 2016 19:15:52 +0000 (21:15 +0200)]
NAS EPS: fix dissection of multiple partial tracking area identity list

As reported on https://ask.wireshark.org/questions/54955/nas-tracking-area-identity-list-decoding-not-proper

Change-Id: I8c4ed1982e1d72136558fb381d2d15b15c9e376c
Reviewed-on: https://code.wireshark.org/review/17151
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 agoAdjust to the split of the SocketCAN encapsulation.
Guy Harris [Fri, 19 Aug 2016 02:48:35 +0000 (19:48 -0700)]
Adjust to the split of the SocketCAN encapsulation.

Change-Id: Ibbe97f15854163163ad2bdf3b425c63d4cbfed50
Reviewed-on: https://code.wireshark.org/review/17158
Reviewed-by: Guy Harris <guy@alum.mit.edu>
3 years agoAdd tools for setup macos dev environnement using brew
Alexis La Goutte [Sat, 16 Jul 2016 06:30:06 +0000 (08:30 +0200)]
Add tools for setup macos dev environnement using brew

Will be reused for Travis osx

Change-Id: Ida905768efc4e48be9936b3113704dcb651d4ca0
Reviewed-on: https://code.wireshark.org/review/16495
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: Evan Huus <eapache@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
3 years agoHandle the new LINKTYPE_CAN_SOCKETCAN_HOSTENDIAN.
Guy Harris [Fri, 19 Aug 2016 01:39:43 +0000 (18:39 -0700)]
Handle the new LINKTYPE_CAN_SOCKETCAN_HOSTENDIAN.

Unfortunately, only one libpcap code path puts the CAN ID in the
SocketCAN header in network byte order; the others leave it in host byte
order.  Therefore, a new LINKTYPE_/DLT_ value was introduced, and
libpcap was changed to use that for the cases where the CAN ID is in
host byte order.  Support them both.

This means we need to, when reading pcap and pcapng files, fix up the
CAN ID if the host that wrote the file has a different byte order from
ours (as libpcap also now does).  This includes Linux "cooked" captures,
which can include CAN packets.

Change-Id: I75ff2d68d1fbdb42753ce85d18f04166f21736dd
Reviewed-on: https://code.wireshark.org/review/17155
Reviewed-by: Guy Harris <guy@alum.mit.edu>
3 years agofix endianess of rejoin source address
Chris Brandson [Thu, 18 Aug 2016 18:05:55 +0000 (11:05 -0700)]
fix endianess of rejoin source address

Change-Id: I71e6e2f569524642a24778ceef81c03fdc0f54c5
Reviewed-on: https://code.wireshark.org/review/17149
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 agoetypes: Add ETHERTYPE_LINK_CTL
Stig Bjørlykke [Thu, 18 Aug 2016 17:15:53 +0000 (19:15 +0200)]
etypes: Add ETHERTYPE_LINK_CTL

The definition was found in the Linux kernel source code.

Change-Id: I41d1435497042bc5905efc7e1af3941b9e8808e2
Ping-Bug: 12759
Reviewed-on: https://code.wireshark.org/review/17148
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
3 years agoSEL Protocol - Fix 'Fast Meter Config' sub-tree addition typo & 'if (tree)' usage
Chris Bontje [Thu, 18 Aug 2016 17:07:13 +0000 (11:07 -0600)]
SEL Protocol - Fix 'Fast Meter Config' sub-tree addition typo & 'if (tree)' usage

- The proto_tree_add_subtree call was previously using the length of the full tvb,
instead of len-2 like all other calls.  This typo did not previously cause an issue,
but in newer versions of Wireshark it causes an assert.

- When I created the selfm dissector 4-5 years ago, I used packet-synphasor.c
as a template and there was an 'if (tree)' wrapper around several initial GUI calls
including col_*** info column clear/set functions.  It looks like in recent years
this layout has been removed (for example, https://code.wireshark.org/review/#/c/6725/ ).
I'm not sure of the exact reasoning behind this, but in Wireshark 2.x (QT), there are
several conditions where in the SEL protocol dissector the info column will be
cleared and not repopulate - I can only assume because col_clear has been called
with no col_add's.  Removal of this 'if' condition does correct the issue with no immediate ill effects..

Change-Id: I4c619cb320cd2152e1d4d1b76c809b1498dfda61
Reviewed-on: https://code.wireshark.org/review/17147
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 agoQUIC: Add detection of server port
Alexis La Goutte [Mon, 15 Aug 2016 17:26:50 +0000 (19:26 +0200)]
QUIC: Add detection of server port

Some debug tools don't use the standard 443

Change-Id: I5826de69afe343e4c112ecb78ffa1e26bd35b242
Reviewed-on: https://code.wireshark.org/review/17069
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 agoTCP: fix no previous prototype for 'exp_pdu_tcp_dissector_data_size/exp_pdu_tcp_disse...
Alexis La Goutte [Thu, 18 Aug 2016 11:16:12 +0000 (13:16 +0200)]
TCP: fix no previous prototype for 'exp_pdu_tcp_dissector_data_size/exp_pdu_tcp_dissector_data_populate_data' [-Wmissing-prototypes]

Change-Id: I259f457868f4b8cde7e188d88d3d55f97070ee3b
Reviewed-on: https://code.wireshark.org/review/17145
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>
3 years agologcat (text): fix no previous prototype for 'logcat_text_init/logcat_text_cleanup...
Alexis La Goutte [Thu, 18 Aug 2016 11:17:21 +0000 (13:17 +0200)]
logcat (text): fix no previous prototype for 'logcat_text_init/logcat_text_cleanup' [-Wmissing-prototypes]

Change-Id: I1c8462064e7c07ee7f626fb26ad6bb744a7fc5b3
Reviewed-on: https://code.wireshark.org/review/17144
Reviewed-by: Michael Mann <mmann78@netscape.net>
3 years agoERF: fix no previous prototype for 'erf_ts_to_nstime/dissect_relative_time/dissect_pt...
Alexis La Goutte [Thu, 18 Aug 2016 11:23:11 +0000 (13:23 +0200)]
ERF: fix no previous prototype for 'erf_ts_to_nstime/dissect_relative_time/dissect_ptp_timeinterval' [-Wmissing-prototypes]

Change-Id: I21ee4f8850f63de3a7fa91ed9e8a426c82a9d62e
Reviewed-on: https://code.wireshark.org/review/17143
Reviewed-by: Michael Mann <mmann78@netscape.net>