Commit Graph

65804 Commits

Author SHA1 Message Date
Alexis La Goutte b8ae1b1492 xml(.h): fix indent (use spaces) and modelines
use same indent like packet-xml.c

Change-Id: I687b0306ba1d3559ce4a299a0e66c55e3f04fdfd
Reviewed-on: https://code.wireshark.org/review/19641
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2017-01-15 21:17:14 +00:00
Gerald Combs 024cf942c6 [Automatic update for 2017-01-15]
Update manuf, services enterprise-numbers, translations, and other items.

Change-Id: Ia487718c34913b5bb8297184fedb6c7ecaf604e6
Reviewed-on: https://code.wireshark.org/review/19637
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-01-15 16:12:14 +00:00
MustBeArt 990d2a9a4a DVB-S2-BB: Use proto_tree_add_bitmask()
Change-Id: I1a4b50873a183c0f6051dc0db3fecf5e62c92cbb
Reviewed-on: https://code.wireshark.org/review/19633
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-14 04:14:36 +00:00
Peter Wu 298085def8 Qt: fix memory leaks in UatDialog
Avoid leaking memory for the stringified UAT field values (tostr) and
for copies of rows.

Change-Id: I1bf20035fabe92da8216c820bc47ebce7dd73951
Reviewed-on: https://code.wireshark.org/review/19604
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-01-13 22:26:37 +00:00
Dario Lombardo dc647f115e geoip: free resources to avoid leak.
Change-Id: Ia4a938e8a6b3856959c375f4bfcdf565a21eabef
Reviewed-on: https://code.wireshark.org/review/19629
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Tested-by: Dario Lombardo <lomato@gmail.com>
2017-01-13 16:40:30 +00:00
MustBeArt 15deb60734 DVB-S2 BB: Handle GSE Padding in BB frames
GSE Padding is outside of any GSE Packet and continues to the end of the
Baseband Frame, per 4.2.1 of ETSI TS 102 606-1.

Added dvb-s2_gse.padding as an integer representing the length in bytes
of the padding field.

Change-Id: I9ed22c37a1969059a09ba44d9e3473cb9d0a1880
Reviewed-on: https://code.wireshark.org/review/19579
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>
2017-01-13 12:50:36 +00:00
Pascal Quantin c2ddc300f3 X2AP: replace non ASCII characters in ASN.1 source files
Change-Id: I114ba3fc68dccf9f791488920f602906d2d8c124
Reviewed-on: https://code.wireshark.org/review/19626
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-01-13 12:48:05 +00:00
Pascal Quantin b357353f35 LTE RRC: upgrade dissector to v13.4.0
Change-Id: I5f7de78f0be320781091e17ec8c471a3fd482b14
Reviewed-on: https://code.wireshark.org/review/19625
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>
2017-01-13 12:40:37 +00:00
Dario Lombardo 05fad31ea4 tools: add options documentation to valgrind-wireshark.sh
Change-Id: Id0bb85b9499f1e6f327b711d38deefe295e92c1a
Reviewed-on: https://code.wireshark.org/review/19624
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-01-13 10:43:48 +00:00
Pascal Quantin b34d93ad0e SSL: fix compilation without libgcrypt or gnutls
Change-Id: I785db404969f89a3f90eddbda5542ee6b676ddb8
Reviewed-on: https://code.wireshark.org/review/19623
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-01-13 08:13:59 +00:00
Guy Harris c303679d99 Decode TBCD strings in GSM MAP as per the GSM MAP spec.
Hex digits 0xa through 0xe are '*', '#', 'a', 'b', and 'c',
respectively.

Constify the dgt_set_t argument to tvb_bcd_dig_to_wmem_packet_str(),
while we're at it.

Bug: 13316
Change-Id: I7586f35d23fd262453779d99946e7ccad4b6ffab
Reviewed-on: https://code.wireshark.org/review/19620
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-01-13 07:16:30 +00:00
Parav Pandit a4bbd3cc77 packet-infiniband: Pass read request packets to ULP dissectors
This patch passes RDMA read request packets to ULP dissectors similar to
other RDMA packets so that ULP dissector can have opportunity to show as
upper layer protocol instead of IB or RRoCE.

Change-Id: I594d8eada858b7f77fc94be44e3639526789779e
Tested-by: paravpandit@yahoo.com
Reviewed-on: https://code.wireshark.org/review/19619
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-13 02:56:04 +00:00
Dario Lombardo aa76d58dd5 uat: fix build error without libgcrypt/gnutls
Change-Id: I00fea4d2e8c4d7fc8fc54627ced21796d40b854a
Reviewed-on: https://code.wireshark.org/review/19616
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-12 21:02:42 +00:00
Guy Harris 4f01e93161 Make sure ui/qt/variant_pointer.h gets distributed.
Change-Id: I3bbfaf392da346e937b5a1914c140d1114e3091e
Reviewed-on: https://code.wireshark.org/review/19618
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-01-12 20:11:01 +00:00
Martin Kaiser 259989ac1a camins: improve the heuristics
The current mechanism that reads the first 20 blocks looking for a headerd
oesn't work in all cases. I was given sample files that consist of
data blocks only and have no header.

Use a new approach to detect a .camins file by searching for pairs of
size high + size low blocks, either read or write. Go through the
entire file. If we have significantly more pairs than single, non-matching
blocks, this is a camins file.

Change-Id: Ic91e7db7149b105e26896d1a89cad4a2a73d0f13
Reviewed-on: https://code.wireshark.org/review/19603
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: Roland Knall <rknall@gmail.com>
2017-01-12 16:04:53 +00:00
Roland Knall 3df81a0550 Qt: Remove unneccessary Q_DECLARE_METATYPE
Remove unnecessary Q_DECLARE_METATYPE macros and replace calls
to QVariant conversions with VariantPointer where necessary

Change-Id: Ia4690590095f930bf94644197de7fa30b00ee7ec
Reviewed-on: https://code.wireshark.org/review/19611
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
2017-01-12 16:04:00 +00:00
Jan Spevak d6d5168881 Diameter: decode Emergency-Indication AVP (1538)
Change-Id: Ie40d61944fd47eb532b759cb122367c18840feff
Reviewed-on: https://code.wireshark.org/review/19615
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>
2017-01-12 15:43:49 +00:00
Peter Wu f8dc2346df Qt: fix memleak of PointList in interface statistics
The list of points (for interface traffic statistics) is part of the
interface tree model/view. Remove the pointer indirection to simplify
cleanup and avoid leaking a PointList.

Note that the SparkLineDelegate is used in two different places
(CaptureInterfacesDialog and InterfaceTreeModel).

Change-Id: I5fef7dadd44fdf58c07844fee269f509c712a36f
Reviewed-on: https://code.wireshark.org/review/19606
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
2017-01-12 13:41:09 +00:00
Michael Mann 4b3b3f5877 Extcap: Restore previously created preference from hash table, not preference pointer
Change-Id: Ie68a5c6c193f362e78d4f4b1f20edf7747e2313f
Reviewed-on: https://code.wireshark.org/review/19614
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
2017-01-12 13:33:49 +00:00
Dario Lombardo 805ddd1add uat: add a reset callback.
This function will free the resources allocated by the caller.

Change-Id: Ib486c14e4fd3c321662fb71f7fd06733ce9a64a4
Reviewed-on: https://code.wireshark.org/review/19375
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-12 12:39:15 +00:00
Pascal Quantin 01c8028add X2AP: upgrade dissector to v13.6.0
Change-Id: Ie312d354cadadba693ea5320c5bbc0957bde6514
Reviewed-on: https://code.wireshark.org/review/19613
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>
2017-01-12 05:46:31 +00:00
Pascal Quantin 9414f56152 S1AP: upgrade dissector to v13.5.0
Change-Id: Ic65ae88af37f0e82207c093827755f93934d9424
Reviewed-on: https://code.wireshark.org/review/19612
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>
2017-01-11 19:43:47 +00:00
Michael Mann d8be254a51 packet-btatt.c: Use protocol information from dissector handle instead of pinfo data for attributes.
Instead of using a dissector function placed in a dissector table, just use the
protocol information registered with the dissector table to create the desired
dissector tree.

Change-Id: Ic32b15e3c05d73df6e8f69890c47172e991bda6f
Reviewed-on: https://code.wireshark.org/review/19509
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-11 12:55:30 +00:00
Alexis La Goutte 2d6f87623b OpenFlow (v4/1.3): rename dissect_openflow_payload_v4 to dissect_openflow_message_v4
Like OpenFlow (v5/1.4) dissector
and include dissect_openflow_header_v4

Ping-Bug: 13221
Change-Id: I123fad871bcb1c9d54946500505525d55a81f8f3
Reviewed-on: https://code.wireshark.org/review/19602
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>
2017-01-11 07:16:14 +00:00
Jeff Morriss 39389a12e5 Run libtoolize before aclocal.
libtoolize installs files in m4/ which aclocal is going to include.

Prior to this change this sequence:
 1) ./autogen.sh
 2) ./configure
 3) make

Results in aclocal (and subsequently ./configure) being rerun in step 3
(because there are files in m4/ that are are newer than aclocal.m4).

Change-Id: I70589ab3cede6b7cd48e089c8be4d4c98dab3b6a
Reviewed-on: https://code.wireshark.org/review/19609
Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-01-11 05:44:09 +00:00
Martin Kaiser 97b3f75c0f iso14443: use proto_tree_add_checksum()
replace our own function for dissecting the CRC with
the generic proto_tree_add_checksum()

Change-Id: I569c877836a7b771b01a37b57b6c50fc0183e9a7
Reviewed-on: https://code.wireshark.org/review/19601
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>
2017-01-11 05:39:20 +00:00
Jaap Keuter ebd198979f Qt: check NULL before dereference (CID 1394324)
Move the NULL check before the assignment with the dereference.

Change-Id: Ifcd4fb89c059ad2f4b6606fc1e83dc67a7d7373d
Reviewed-on: https://code.wireshark.org/review/19605
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-11 02:24:36 +00:00
Peter Wu 37790e90f5 cmake: fix empty data (Global Configuration) directory
Color filters were somehow not loaded. It turns out that the
BUILD_TIME_DATAFILE_DIR macro (for filesystem.c) was empty because
DATAFILE_DIR was defined after adding the wsutil directory. Fix it by
defining the variable before wsutil (but after epan).

Change-Id: I0d002b79499c80a90d8fcc14b06ced26c30b0453
Fixes: v2.3.0rc0-1830-gd5fdbef7f4 ("cmake,wslua,wsutil: load files from run/ instead of source tree")
Reviewed-on: https://code.wireshark.org/review/19600
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-01-10 17:09:29 +00:00
Guy Harris 0ecfc7280c Use tvb_new_subset_remaining() rather than tvb_new_subset_length_caplen().
Any call of the form tvb_new_subset_length_caplen(tvb, offset, -1, -1)
should instead be tvb_new_subset_remaining(tvb, offset).

Change-Id: I4bc95b028103ea4fc82453ef3460c147d7ccabd6
Reviewed-on: https://code.wireshark.org/review/19598
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-01-10 06:40:45 +00:00
Guy Harris 7cd6906056 Rename tvb_new_subset() to tvb_new_subset_length_caplen().
This emphasizes that there is no such thing as *the* routine to
construct a subset tvbuff; you need to choose one of
tvb_new_subset_remaining() (if you want a new tvbuff that contains
everything past a certain point in an existing tvbuff),
tvb_new_subset_length() (if you want a subset that contains everything
past a certain point, for some number of bytes, in an existing tvbuff),
and tvb_new_subset_length_caplen() (for all other cases).

Many of the calls to tvb_new_subset_length_caplen() should really be
calling one of the other routines; that's the next step.  (This also
makes it easier to find the calls that need fixing.)

Change-Id: Ieb3d676d8cda535451c119487d7cd3b559221f2b
Reviewed-on: https://code.wireshark.org/review/19597
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-01-10 06:19:37 +00:00
Alexis La Goutte 2a3b2360e1 ieee80211: Add Extreme (Zebra) Vendor Specific TLV
Only decode subtype 1 : AP Name with unknown data (7 bytes)

Change-Id: I4fc0c6fff1a931075ab333a8527251f12acb2827
Reviewed-on: https://code.wireshark.org/review/19586
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>
2017-01-10 00:06:22 +00:00
Guy Harris 8604ed2ef8 Consistently use tvb_reported_length_remaining().
That's the amount of data left in the packet; perhaps not all of it was
*captured*, and using tvb_reported_length_remaining() will throw an
exception, but that's what *should* happen ("packet cut short"
notification and all).

Use tvb_new_subset_remaining() to get a tvbuff with everything after a
certain point in the packet.

Change-Id: I2512e58e23600f7e7bbce0126732b05997692a65
Reviewed-on: https://code.wireshark.org/review/19596
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-01-09 23:14:10 +00:00
Guy Harris 2b482cd0c3 Use tvb_new_subset_length(); no need to do its work ourselves.
Change-Id: I581e14af2981c723a81e9c0340de0229b832e51a
Reviewed-on: https://code.wireshark.org/review/19595
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-01-09 22:27:18 +00:00
Jaap Keuter 49b2a1cdb7 Restore FCoIB frame marker handling (CID 1397701)
It seems that somewhere in the last few years the changes for FCoIB
have caused it to loose its frame marker processing. This change puts
that back.
Also there is an ambiguity in EOF handling, which is solved.

Change-Id: Iefbb42726e4e5491a50d7ce96626c906fb5ea857
Reviewed-on: https://code.wireshark.org/review/19594
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>
2017-01-09 19:13:33 +00:00
Jaap Keuter d5abca0cf5 Fix TCP stream graph (throughput) reset axes logic (CID-1398438)
The code seems to be ment to latch the reset axes flag for graph update.

Change-Id: I7b47346c45aa7576c98a251eb3ebcd9188407000
Reviewed-on: https://code.wireshark.org/review/19581
Reviewed-by: Kevin Hogan <kwabena@google.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-01-09 05:28:13 +00:00
Alexis La Goutte 21c203e154 802.11(ad): Add reserved field of Grant ACK frame
Change-Id: I0bb982403fb7f36ad166234b16dbe8ad9b8b8eb8
Ping-Bug: 13244
Reviewed-on: https://code.wireshark.org/review/19592
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>
2017-01-09 05:26:01 +00:00
Alexis La Goutte f2f8f6ac82 802.11(ad): Remove comment about clang warning and set directly the value
Change-Id: Ie64608597c7d6a5b9a2fec9de8e8983233e0e10e
Reviewed-on: https://code.wireshark.org/review/19591
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-01-09 05:24:45 +00:00
Alexis La Goutte cbb5068b00 802.11(ad): Fix SSW Feedback dissection when Sector Sweep Direction = Responder
For the Sector Sweep Frame in which the Sector Sweep Direction = Responder, the format of the Sector Sweep Feedback Field should be the one in the standard (Figure 8-431d—SSW Feedback field format when not transmitted as part of an ISS) i.e. similar to the one in Sector Sweep Feedback Frame and Acknowledgement.

Issue reported by Hany ASSASA

bug: 13244
Change-Id: Ic8c6d83fc32d017fb73116a54759608498f99452
Reviewed-on: https://code.wireshark.org/review/19590
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-01-09 05:23:23 +00:00
Alexis La Goutte 9a1dfcca60 802.11(ad) fix typo : ambiguous assignment (CID 1398212)
Introducte in g62a54cb77

Ping-Bug: 13244
Bug: 13309
Change-Id: I2e3411cfd38685c08fd669fad1313663ba879936
Reviewed-on: https://code.wireshark.org/review/19589
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>
2017-01-09 05:20:13 +00:00
Peter Wu 86a5bf5abe TLS(1.3): update PSK extension for draft -18
Removed ke_modes and auth_modes fields, add
identity.obfuscated_ticket_age and binders fields. (Note that binders
field is not dissected further at this moment due to the lack of a pcap
for verification.)

Ping-Bug: 12779
Change-Id: I9af7d93feb2352a494be2d5bda66d124267cf464
Reviewed-on: https://code.wireshark.org/review/19462
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>
2017-01-09 05:18:26 +00:00
Graham Bloice 45d967c803 profinet: Skip comments in GSD file
Bug: 13303
Change-Id: I9ab17ec25917723be06b36ab4c11fe67e6792715
Reviewed-on: https://code.wireshark.org/review/19593
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-01-09 05:10:47 +00:00
Gerald Combs ffa239950a [Automatic update for 2017-01-08]
Update manuf, services enterprise-numbers, translations, and other items.

Change-Id: I91668647c50e78b29bbb28f2348dc8e52c3a66c5
Reviewed-on: https://code.wireshark.org/review/19585
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-01-08 16:14:21 +00:00
Michael Mann 3952052426 Restore some MPLS registered dissectors.
Per https://ask.wireshark.org/questions/58532/missing-dissector-pw_eth_cw
it appears some MPLS dissectors are still referenced by name and
not just for the dissector table created in
I1e0c3ae784b71c0145b1f1730a97feae8e9f488f.

Change-Id: I27be132f56c879be16f78f76ac0e9688673a47c1
Reviewed-on: https://code.wireshark.org/review/19582
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>
2017-01-08 08:15:41 +00:00
Dario Lombardo ebd3dc6907 Fix exit code for non-existent file.
The patched command line utilities have been aligned to tshark
behavior.

Change-Id: I0cb764b37792e882e182681124341893b3958c59
Reviewed-on: https://code.wireshark.org/review/19580
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>
2017-01-08 08:10:59 +00:00
Peter Wu 6e29d874f8 Qt: fix crash on undecodable RTP stream
When the sample rate is zero, a floating point exception (FPE) occurs in
QAudioDeviceInfo::nearestFormat. Detect the error condition instead and
show an error.

Change-Id: Ie2eaa57847938fe15607fa26d0f4e08e7ddd23d1
Fixes: v2.3.0rc0-1664-gd59653f8d5 ("Qt: Make the RTP player output device selectable.")
Reviewed-on: https://code.wireshark.org/review/19569
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-08 02:48:41 +00:00
Guy Harris 082ba063ef Comments on the first nibble stuff.
If you don't have control words - and several MPLS pseudo-wire RFCs say
"in these cases, a control word isn't necessary, and isn't useful, so
you might want to leave it out" - the first nibble values of 0, 1, 4,
and 6 could just be part of the packet header.

Explain some other stuff as well.

Change-Id: I2f1aae2ab8653bdd7f8b3b52ef450f6d43a1afcd
Reviewed-on: https://code.wireshark.org/review/19583
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-01-08 02:33:53 +00:00
Peter Wu 2009dcc98d extcap: fix memleak via data_file_url
Commit v2.1.0rc0-2181-ga4e2263ac4 introduced a helppage parameter, but
all callers were NULL. In a later change, callers would use the
data_file_url() function, but this needs to be freed, so do that.

Fixes: v2.3.0rc0-1825-ge5596b74bd ("extcap: set help page for all extcaps.")
Change-Id: I967c0f8c6b50d9e78ac227575de24a81f97d376a
Reviewed-on: https://code.wireshark.org/review/19570
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
2017-01-07 20:32:43 +00:00
Eliot Lear 03a8884989 Add MUD-URL manufacturer usage description certificate extension.
See draft-ietf-opsawg-mud for details.  File changes include addition
of new asn1 directory and associated files, as well as edits to various
other files to support the change.

Change-Id: Ib910980e1ddcafaa31aa07cf049562520b61a3aa
Reviewed-on: https://code.wireshark.org/review/19505
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-01-07 20:11:39 +00:00
Michael Mann 165c8b0422 Refactor range preference.
Refactored so that all handling of ranges in struct preference
can be internal to prefs.c

Change-Id: I68577909f9c07b23a16ab3443a523355d4645314
Reviewed-on: https://code.wireshark.org/review/19577
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-07 15:35:18 +00:00
MustBeArt fb9ac503c1 DVB-S2 BB: Fix BB header CRC checks
Fix problem with baseband header CRC check that caused almost all
baseband frames to show a spurious CRC error, introduced with
proto_tree_add_checksum.

Change-Id: I6b2f9680507eeb79e59b825f3ac9e4cee1033976
Reviewed-on: https://code.wireshark.org/review/19567
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2017-01-07 12:05:16 +00:00