Commit Graph

65761 Commits

Author SHA1 Message Date
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
Noel Power 0dcbfab426 Make column size sanity check more sensible.
The existing sanity check on column_size makes incorrect assumptions
about the size of the CTableColumn structure (which is an internal
dissector structure that contains optional data). The sanity check
test *always* fails. This change uses the minimum size of CTableColumn
structure instead which should prevent excessive allocation during fuzz
testing.

Bug: 13299
Change-Id: Id9fcbc15a4df4c74bb7576c6fdca1000890947fd
Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-on: https://code.wireshark.org/review/19566
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-07 07:05:15 +00:00
Jeff Morriss ae5dbe1b63 Add support for RROCE(v2) over IPv4 (without UDP).
This isn't standard but has been seen in the wild, see:
https://ask.wireshark.org/questions/58521/cannot-decode-rocev2-traffic

With this change users can Decode-As an IP Protocol as RROCE (by selecting
Infiniband (IB) as the protocol).

Change-Id: Iec865478d056f687f2f66124d6e936f67707d2c4
Reviewed-on: https://code.wireshark.org/review/19572
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-01-07 06:57:55 +00:00
Parav Pandit ea7440481e packet-nvme: Dissect read/write cmd and SGL
1. Added support to dissect read and write commands.
2. Added support to dissect SGL fields addr, len, key.
3. Changed long reserved fields to decimal presentation.
4. Fixed typo for cqe reserved field.

Change-Id: I63c674c68143c9c61610bada0410b49a134361d4
Tested-by: paravpandit@yahoo.com
Reviewed-on: https://code.wireshark.org/review/19565
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-07 00:58:08 +00:00
Peter Wu 4dc983d648 packet: fix memleak of "short_name" for heuristics dissectors
Change-Id: I3b954e3623473899b6039f0ff572eb56defe14cc
Fixes: v2.3.0rc0-1841-ga8b68205a4 ("packet: duplicate short_name to fix UAF in wslua")
Reviewed-on: https://code.wireshark.org/review/19571
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-07 00:46:29 +00:00
Michael Mann 6a6d7ea34f Convert range API to always use wmem memory.
This is mostly to address memory leaks in range preferences (the biggest
user of range functionality) on shutdown.
Now range preferences must use epan scoped memory when referencing
internal preference structures to keep consistency.

Change-Id: Idc644f59b5b42fa1d46891542b53ff13ea754157
Reviewed-on: https://code.wireshark.org/review/19387
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-07 00:44:10 +00:00
Alexis La Goutte 29a7fce272 802.11(ad): Enhance dissection of Beacon Interval Control (BIC)
You can now use bitmap on 64bits (or 48bits)

and also add a reserved field

Ping-Bug: 13244

Change-Id: I2ec9412f6cfebd3a8ca5c082af5e8481e2646eaf
Reviewed-on: https://code.wireshark.org/review/19561
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-06 14:12:13 +00:00
Michael Mann 79fc411936 Convert some easily identifiable pinos.
grepping for "Decode As" comments reveals exactly was pinos were
created for - distinguishing multiple dissection functions in a
single dissection table.

Change-Id: Iaa9294045e9d0633563e7d763cb585c0e6dc598f
Reviewed-on: https://code.wireshark.org/review/19490
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-06 12:48:47 +00:00
John A. Thacker f0b1099f81 VLAN: Support IEEE 802.1Q-2005 and -2011 changes
Supports the recommended meanings of the priority field as
changed by 802.1Q-2005, and the change from the CFI to DEI
in 802.1Q-2011. A preference is added to use the older
(non-compatible) spec version. Note that 802.1Q-2011 is
consistent with 802.1ad and ah, which got rolled up in 802.1Q,
but ends up removing support for bridging Token Ring and FDDI
over Ethernet.

Bug: 13294
Change-Id: Ieeadb0f6dda2758750f9e6649f1390609d78c50e
Reviewed-on: https://code.wireshark.org/review/19548
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-06 12:43:38 +00:00
Alexis La Goutte cea1063af1 802.11(ad): add reserved fields for Beam Forming
Change-Id: I486c883b27059eb55e9fe11fcc372fc31c1e56ca
Ping-Bug: 13244
Reviewed-on: https://code.wireshark.org/review/19560
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-06 03:38:17 +00:00
Alexis La Goutte 3871df544a 802.11(ad): align length of Beam Forming
use UINT16

Change-Id: I7f7c4e847ed6ccb6ced446d493aa27f76cc8db61
Reviewed-on: https://code.wireshark.org/review/19559
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-06 03:37:39 +00:00
Alexis La Goutte b4176fdaa5 802.11(ad): fix typo
Wrong field name for Dynamic Allocation

Issue reported by Hany ASSASA

Bug: 13244
Change-Id: Idec2cb48c5b3d22d75880325d2aec0083d89ca95
Reviewed-on: https://code.wireshark.org/review/19558
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-06 03:36:04 +00:00
Jeff Morriss a8d4051e69 Update the preference help text to indicate the correct default RROCE port.
I97b82fb53fd63d9107ee5d4c64b94840e743fc72 changed the default but not the
help text.

Change-Id: I05375c44c01703e36686d0a16a094cb8d6b3dcd2
Reviewed-on: https://code.wireshark.org/review/19557
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-05 22:26:08 +00:00
Pascal Quantin ee5ade8fc5 NAS EPS: NAS message container in Control Plane Service Request can be ciphered
Change-Id: I026fc63e09c54807604c5d5a112c36dd41759c00
Reviewed-on: https://code.wireshark.org/review/19556
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-05 12:30:50 +00:00
AndersBroman 3979bbe340 Add g_log entries to measure startup time, protected by #ifdef
Change-Id: Ic32f89dc824a6da838643445a30335a8c73af1ee
Reviewed-on: https://code.wireshark.org/review/19540
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-05 10:57:49 +00:00
Gerald Combs 0782a7a15b More make-version.pl fixups.
Don't add extra \n's. Change ".*([\r\n]+)$" matches to ".*?([\r\n]+)$"
so that we don't greedily match the wrong line ending.

Change-Id: I916ee49207eaac17e1e4c4f677558f7be13a099a
Reviewed-on: https://code.wireshark.org/review/19541
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-05 10:01:31 +00:00
Guy Harris 29aa8893ea Do RA_DISSECTORS in the Qt UI.
It looks as if a fair bit of work is done under RA_DISSECTORS before we
register any individual items, so add it to the splash screen update
with the Qt UI - it's used in the GTK+ UI.

Update a comment to explicitly indicate what action transactions are
being counted (other than the individual-item ones, where we have to
call routines that give us a count of items).

Change-Id: I3ec5e5fbfdcf523d693bcf1b0f0ffbe0d05d61ae
Reviewed-on: https://code.wireshark.org/review/19553
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-01-05 04:04:19 +00:00
Guy Harris 31c903724e Fix comment.
Change-Id: I5c18130dc22220ddd85109235383fcf61e543d89
Reviewed-on: https://code.wireshark.org/review/19552
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-01-05 02:52:09 +00:00
Guy Harris 229f573846 Remove RA_CONFIGURATION.
It's not used at all in the Qt UI, and the point at which it's used in
the GTK+ UI doesn't involve reading configuration files - between it and
RA_INTERFACES, some mostly quick command-line argument processing is
done.

Change-Id: Ib4de97c8b6dba658a6e9d8f596b551f7c45739d2
Reviewed-on: https://code.wireshark.org/review/19551
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-01-05 02:46:00 +00:00
Alexis La Goutte 3f176f94e7 QUIC: fix typo on ACK num revived field description
Found in https://ask.wireshark.org/questions/58396/some-question-about-quic-decode-result

Change-Id: Ic7fc2c2318186eabb5047f816987d2553a6fd449
Reviewed-on: https://code.wireshark.org/review/19547
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-01-04 23:28:43 +00:00
Guy Harris c1f7cbfcef Clean up indentation.
Change-Id: Ie5a2cc5650840a40fe3a84c04598e1f35dc47f4a
Reviewed-on: https://code.wireshark.org/review/19550
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-01-04 22:14:53 +00:00
Guy Harris 26430ff647 Include extcap binaries in the count of things to point out during startup.
The GTK+ version, at least, crashes if there are more "doing XXX..."
items put up than the calculated count, so, now that we're putting up
items for extcap binaries, we need to count the extcap binaries.

Clean up some stuff we found doing this (indentation, a _U_ on something
that's used).

Change-Id: I1f88042b64ce4b9ae352de37689677c694e3770b
Reviewed-on: https://code.wireshark.org/review/19549
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-01-04 22:10:48 +00:00
Gerald Combs f7124f64a8 Escape opening curly braces in gen-bugnote.
Curly braces are used for attribute replacement in AsciiDoc.

Change-Id: I1461ee26543dd20a9f799084a01710faef78f2d0
Reviewed-on: https://code.wireshark.org/review/19517
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-01-04 17:52:04 +00:00
AndersBroman 9e7e30e674 Add a startup message for Initializing extcap.
Change-Id: I06262e98bb4a55ee1eacd7a36b938b45eaffaf76
Reviewed-on: https://code.wireshark.org/review/19535
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-04 12:46:46 +00:00
Guy Harris 79d1ac994f Revert "Another change required for that."
This reverts commit 3cfa4f7602.

Nope, *not* needed, and not wanted, either.

Change-Id: I71ac174a9b9b19980d0a6f44088d0a66f71ef99b
Reviewed-on: https://code.wireshark.org/review/19538
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-01-04 11:11:24 +00:00
Guy Harris 3cfa4f7602 Another change required for that.
Bug: 13270
Change-Id: I86e779c8f7b89ca928556d8b1acc1015b96f9100
Reviewed-on: https://code.wireshark.org/review/19537
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-01-04 11:08:51 +00:00
Guy Harris 2cc215c7d0 Running Wireshark through a symlink doesn't work.
We can't just symbolically link to the executables, as that means that
the executable won't be in Contents/MacOS, which means that all
@executable_path-relative references will go to the wrong place if we
run the executables using the symlink, which means that the executables
could fail (they *do* fail to find the Cocoa Qt plugin, for example).

So, instead, we go back to the old version of the utility launcher, and
put that in Contents/Resources/bin as well as, if the user requests the
CLI utilities, /usr/local/bin.  Maybe PackageMaker will find that
acceptable and include them in the installer package.

Bug: 13270
Change-Id: I4016b58c9ce0df05d78525d35e53431750c2b4d9
Reviewed-on: https://code.wireshark.org/review/19536
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-01-04 11:06:19 +00:00
Guy Harris 0aba97a938 Oops, source and target are the other way around.
Bug: 13270
Change-Id: Ibeddb435acca298c90f2d6b9c0228e8a9a747b38
Reviewed-on: https://code.wireshark.org/review/19534
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-01-04 09:30:43 +00:00
Guy Harris 880580c252 Create the Content/Resources/bin directory if necessary.
Bug: 13270
Change-Id: Idc4223a24d6d2037d13a85331ce63e5a24168d3a
Reviewed-on: https://code.wireshark.org/review/19533
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-01-04 08:10:12 +00:00
Kevin Hogan 3fae1366d1 Qt: add SACK graphs to tcptrace graph
Primarily, this adds visual indication of SACK blocks to tcptrace.
In addition:
 - cleaned up focus behavior for graph selector and spinboxes
 - added time-delay update to streamNumber spinBox
    (similar to behavior of maWindow spinBox)
 - changed ACK selection to select only SACKed responses
    (rather than all ACKs - SACKs seemed more useful to look at)

Change-Id: I47d9e98d54f14e4955008ecea791b77f805c8ba9
Reviewed-on: https://code.wireshark.org/review/19388
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>
2017-01-04 05:24:30 +00:00
Juanjo Martin 15ad25ecb5 RTPS: Added dissection for Parametrized user data
Before we were showing an expert warning saying that it was not
supported. Now we show the parametrized data dissected in the form

sequence of (id, length, value)

Added also filters so it is possible to filter on the ids (useful
in RTPS)

Bug: 13278
Change-Id: I8569830305bc303febe6f3460221e7a52867a34d
Reviewed-on: https://code.wireshark.org/review/19458
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-04 05:23:43 +00:00
Pascal Quantin 6609801357 RRC: upgrade dissector to v13.5.0
Change-Id: I95323ed8aabff7a20442c848fa0dc39854297584
Reviewed-on: https://code.wireshark.org/review/19527
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>
2017-01-04 05:12:54 +00:00
Guy Harris 7b17883df5 Remove trailing whitespace.
Change-Id: Ifdea8516ccce7a72c88470913ce36b9226dfcb54
Reviewed-on: https://code.wireshark.org/review/19532
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-01-04 04:44:29 +00:00
Guy Harris 2cc2c2f883 Put symlinks to the executables in Contents/Resources/bin.
PackageMaker appears not to put them into the installer package, so
construct them in the Wireshark post-install script.

Bug: 13270
Change-Id: Idfa10d4d123d2c0e2f7b3ad65888e075fbfd27a7
Reviewed-on: https://code.wireshark.org/review/19531
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-01-04 04:42:50 +00:00
Guy Harris a2d6fb94fc No reason not to use etype_vals for an Ethertype field.
Maybe there was an issue on Windows back in the old days, when 1) we
didn't have a shared libwireshark library from which to import functions
and data variables and thus you couldn't get variables such as
etype_vals in a plugin and 2) the Infiniband dissector was a plugin, but
neither of those are the case any more.

Change-Id: Id8b82886317bd36a32ad1e1591673623696d4808
Reviewed-on: https://code.wireshark.org/review/19530
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-01-04 02:10:24 +00:00
Martin Mathieson ab286246dc Ensure that tcp.reassembled_in is added to the tree for first segment.
Bug: 3264
Change-Id: I9fa8cfaf1e21a8a984941ee40e2e404ae21e55c9
Reviewed-on: https://code.wireshark.org/review/19528
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-04 00:47:49 +00:00
Dario Lombardo 564051df5e infiniband: remove offset variable.
Change-Id: Ie86c2aece05ebbc35eb15a54d8c3f2c455ff53cf
Reviewed-on: https://code.wireshark.org/review/19516
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
2017-01-03 15:02:41 +00:00
Dario Lombardo 8c86f3b0a3 infiniband: fix error for clobbered variable.
Given by gcc-4.9.2 on arm:

epan/dissectors/packet-infiniband.c:2708:9: error: variable ‘offset’ might be clobbered by ‘longjmp’ or ‘vfork’ [-Werror=clobbered]
     int offset = 0;
         ^
cc1: all warnings being treated as errors

Change-Id: I12066031093c1fa638792ff8be8f3f5457e3feda
Reviewed-on: https://code.wireshark.org/review/19515
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>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-03 13:31:07 +00:00
Mirko Parthey 13851f331c ISAKMP: add Reserved fields
Add Reserved fields as defined by:
* RFC 7296 for IKEv2
* RFC 2408 for IKEv1
* draft-ietf-ipsec-isakmp-mode-cfg-05 for the IKEv1 Attributes Payload

Change-Id: I0c25de6e543aa5461650fb4cd2c103a6a3a8c392
Reviewed-on: https://code.wireshark.org/review/19480
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>
2017-01-03 12:38:38 +00:00
Michael Mann ab075d3563 Use g_slist_find_custom instead of g_slist_nth when just looking for item in list.
Change-Id: Ida3c5d5826f0ca01a25052a67f1460ff4686008f
Reviewed-on: https://code.wireshark.org/review/19513
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-02 23:16:34 +00:00
Gerald Combs c950ebdd0f make-version.pl: Fixup library version updates.
When updating {epan,wiretap}/{Makefile.am,CMakeLists.txt} make sure we
use an absolute path to each file and that we preserve the file's line
ending style.

Change-Id: Iee62a3ef8e89ca1ddae2569df62025805ee9a238
Reviewed-on: https://code.wireshark.org/review/19508
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>
2017-01-02 21:43:03 +00:00
Mirko Parthey 6f9c4c807e ISAKMP: Fix size of ID in IKEv1 Attributes Payload
Fix the size of the Identifier field in the IKEv1 Attributes Payload.
Reference: draft-ietf-ipsec-isakmp-mode-cfg-05, section 3.2

Change-Id: I30bfde9caa6750b342f7dfbad39e63341614a45b
Reviewed-on: https://code.wireshark.org/review/19502
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>
2017-01-02 20:23:46 +00:00
Mirko Parthey 6af7425cee ISAKMP: fix dissection of IKEv2 ID Payload
Fix dissection of the IKEv2 Identification Payload.
Unlike IKEv1, it does not have Protocol and Port fields.

References:
* RFC 2407, section 4.6.2
* RFC 7296, section 3.5

Change-Id: I968e378abd49363785dd7308a4f27908c1c05a8a
Reviewed-on: https://code.wireshark.org/review/19497
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2017-01-02 13:17:08 +00:00
Martin Mathieson b358b870b3 Snort: without explicit disable, expand preference to switch off
Change-Id: I5fd3b0cc6f19c4c873aaaae8c9e257a8b53a8419
Reviewed-on: https://code.wireshark.org/review/19489
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2017-01-01 21:00:05 +00:00