Commit Graph

62035 Commits

Author SHA1 Message Date
Mikael Kanstrup 9f27e5d7d1 dumpcap: Add support for 802.11ac monitor modes
Add dumpcap support for configuring 80MHz, 80+80MHz, 160MHz monitor
modes via nl80211.

Change-Id: I2ae8955670c2a9b5051e2223d45ce522459f2c5f
Reviewed-on: https://code.wireshark.org/review/13964
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-01 15:23:44 +00:00
Alexis La Goutte 7a1f75ed2f ieee802154: fix Uninitialized argument value found by Clang Analyzer
Change-Id: I71282d6ef15802700f6e58308f1d8e89fe9bd24c
Reviewed-on: https://code.wireshark.org/review/14262
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-01 14:17:15 +00:00
Michael Mann 64a5cd9ce0 Prevent use-after-free issues with pcapng.c/wtap_opttypes.c
Bug: 12173
Change-Id: Ifff28491073d50e088b26847830a3bc8835f4282
Reviewed-on: https://code.wireshark.org/review/14180
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-01 14:00:53 +00:00
Alexis La Goutte e326e85a88 debian-setup: need libtool-bin for building.
Change-Id: I761babced3eb49b8a8cea4996b7ccd6f748a6200
Reviewed-on: https://code.wireshark.org/review/13829
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
2016-03-01 13:52:32 +00:00
Uli Heilmeier 77994838a4 L2TP: Added AVPs from RFC 5515
Basic dissection of AVPs from RFC 5515.

Ping-Bug: 12208
Change-Id: Ie16073378a66a81f8378eab7a83988ef9e8a5c88
Reviewed-on: https://code.wireshark.org/review/14246
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>
2016-03-01 08:07:05 +00:00
Jaap Keuter 2858871aac FC: Forget about MDS when dealing with ETHERTYPE_BRDWALK (CID 280012)
Since the MDS trailer is smaller anyway, no need to copy that code.

Change-Id: Ie3931cda3ef2386526cd81daee535d106e522875
Reviewed-on: https://code.wireshark.org/review/14253
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-03-01 05:46:45 +00:00
Guy Harris c3b84afa1e Update the current XZ version.
5.0.4 is no longer available; the current version is 5.0.8.

Change-Id: I982a4809ae87362837561297967a8eb63485676c
Ping-Bug: 12214
Reviewed-on: https://code.wireshark.org/review/14257
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-01 04:20:33 +00:00
Michael Mann 68dede24d1 IrDA: Register a link-layer IrLAP address type".
Was using AT_NONE as "unknown address type" instead of "no address".

Ping-Bug: 12205
Change-Id: Ic1d7022f8eaa3dfab9bb7b607eed264cc527c87c
Reviewed-on: https://code.wireshark.org/review/14242
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-01 03:13:49 +00:00
Guy Harris c73cf3cd00 Don't show a progress bar when previewing for the Qt print dialog.
We don't do much work to do that - we don't print anything before the
first selected page, and once we're finished generating that page, we
terminate the printing process - so it shouldn't need a progress bar.
(If it needs a progress bar, We Have A Problem, as that slows down the
drawing of the dialog box.)

This should prevent the problem seen in bug 12040.

Bug: 12040
Change-Id: I129191e06fff3e1eb59a9631c7395b9e7f650809
Reviewed-on: https://code.wireshark.org/review/14255
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-01 02:53:44 +00:00
Guy Harris c0b29fcddd Add a #define for the wildcard pattern that matches all files.
It's *.* on Windows, but just * on UN*X; add a header that provides the
definition, and use it instead of hardwiring *.*.

Call the entry "All Files", that being the conventional name, rather
than "Any File", whilst we're at it.

Change-Id: I7c29324fc5b41e93c150e1ec67f1529f171dc6a3
Reviewed-on: https://code.wireshark.org/review/14243
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-03-01 02:00:25 +00:00
Chris Brandson be3af7c964 802.15.4 Minimal support for MLME Payload IE with Enhanced Beacon Filter IE
Minimal support has been added for the MLME Payload IE and the Enhanced Beacon
Filter Sub-IE. Dissection of Payload IEs and Sub-IEs is supported making it
easy to add dissection for specific applications once this is known.

Change-Id: I3a4f237e17413ec3e7bbfd32ded0625fc97da11b
Reviewed-on: https://code.wireshark.org/review/13999
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>
2016-02-29 22:33:40 +00:00
João Valverde d679d1137d make-version: Don't emit one common warning to stderr
git rev-parse @{upstream} will (obviously) fail if there is no
upstream set for the current branch. This is fairly common and
not problematic. Don't emit an error message to stderr when it
fails.

Change-Id: I4989fb19b25fefff83335061151e360c78652e88
Reviewed-on: https://code.wireshark.org/review/14151
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
2016-02-29 22:07:37 +00:00
João Valverde bf56f28e7f fuzz-test: Add missing new line
Change-Id: I68f85cdbef24289cabb5e46905356c3cc1c39ad8
Reviewed-on: https://code.wireshark.org/review/14252
Reviewed-by: João Valverde <j@v6e.pt>
2016-02-29 22:06:00 +00:00
Christoph Burger-Scheidlin 53252df920 Support dissecting the TLV data format specified for Lwm2m
Lightweight M2M is a protocol on top of CoAP that is used for
device management. The specification contains a custom payload
format - a simple type, length, value binary encoding.

This patch adds support for dissecting this payload format.
While not yet officially registered, the main open source
implementation of the lwm2m protocol - eclipse's leshan - uses this
content type 1542 for its messages.

Bug: 12110
Change-Id: Ib022d1f485c706f1d69ceec7200790448d080965
Reviewed-on: https://code.wireshark.org/review/13835
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>
2016-02-29 21:07:09 +00:00
Aurelien Aptel 8ff3d1bd75 PIDL: regen pidl-generated dissectors
mapi&nspi dissectors skipped on purpose since they the output is
malformed. This was already the case before the samba sync.

Change-Id: Ib3b78459e3506c755aaa219433ac6b5865482f01
Signed-off-by: Aurelien Aptel <aaptel@suse.com>
Reviewed-on: https://code.wireshark.org/review/13968
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-02-29 21:01:49 +00:00
Aurelien Aptel 62a0ebf1e0 PIDL: sync pidl with samba repo
Copy pidl from samba repo after all wireshark changes were applied.

Change-Id: I0d3fb780c3f79b3b873304bab0655d98564dfc71
Signed-off-by: Aurelien Aptel <aaptel@suse.com>
Reviewed-on: https://code.wireshark.org/review/13967
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-02-29 21:01:13 +00:00
Jeff Morriss 82057fbedf Update mailmap with another of my email addresses.
Change-Id: I9de850dff753988ab3322f0e5885df83625e5a48
Reviewed-on: https://code.wireshark.org/review/14240
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-02-29 19:02:36 +00:00
Michael Mann 3771a790b7 Fix randpktdump build in Windows.
Change-Id: If749635d771443542285a74f05f37156123b2991
Reviewed-on: https://code.wireshark.org/review/14238
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-02-29 13:15:07 +00:00
Roland Knall a4e2263ac4 extcap: Move extcap handling to base
Also add the extcap-version parameter to enable parsing of
version and helppage separately

Change-Id: I35ba5aa992940ffbb0cd9ebea8b7c3a1e8629d74
Reviewed-on: https://code.wireshark.org/review/14094
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Roland Knall <rknall@gmail.com>
2016-02-29 12:32:03 +00:00
Guy Harris 0e5a73fa4e Only say we have a new resolved MAC address if it's actually *new*.
If we aren't changing the resolved name, it's not new.

This prevents us from perpetually "resolving" the address.  If we have
ARP packets that cause us to map a MAC address to a host name, based on
the ARP packet saying the MAC address corresponds to a given resolved IP
address, then each time we dissect the packet, the address will be
"resolved" - and each time we have new resolved addresses as a result of
that, we'll redissect the displayed packets so that they show the
resolved address, and we'll forever be redissecting.

Change-Id: I445e92f407d52a4ed5986721ffcc472f86e99431
Reviewed-on: https://code.wireshark.org/review/14236
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-02-29 11:20:14 +00:00
alpartis d5f2db6a7f DISv7: parse PDU Status field
Section 6.2.67 in IEEE 1278.1-2012 defines PDU Status bit field in
the PDU Header.  The bit meaning varies with the PDU type.  This
change provides full parsing and presentation for all fields and
PDU types.

Bug: 12043
Change-Id: I8f4ef6606ff59a1ef0ed97630c4832b2b6a4dff7
Reviewed-on: https://code.wireshark.org/review/14232
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: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-02-29 05:49:48 +00:00
Guy Harris 5f5e9da18b Use *, not *.*, as the wildcard pattern on UN*X.
On Windows, the pattern that matches all files is *.*; *, by itself,
doesn't work, as I remember.  UN*Xes take the pattern a bit more
literally, so if it has a dot in it, it has to match a dot.

Bug: 12203
Change-Id: I11518c29c4ffd73485bad6e49b6dd9cc16bbd0b0
Reviewed-on: https://code.wireshark.org/review/14233
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-02-29 02:50:07 +00:00
Jeff Morriss 289ca20fe1 Update documentation of hf fields.
- Specify the valid characters in hf abbreviations as suggested in
  https://ask.wireshark.org/questions/50444/braces-inside-abbreviated-name-fieldabbrev-of-header_field_info
- Update the valid characters for protocol abbreviations too.
- Remove a couple old (ancient?) hf substitutions (things to replace in the
  dissector template).  I don't think PARENT_SUBFIELD or ID_VALUE have been
  used in quite a while.
- We no longer automatically add the protocol's abbreviation to the field's
  abbreviation (it's now the dissector-writer's job).
- Abbreviations can no longer be empty strings (since
  a146f5a2e2).
- When talking about hf fields reference the substitution names (to make it
  easier to find additional documentation).

Change-Id: Ic80dc6a230dc727ba544e68c4a0cc746768e5081
Reviewed-on: https://code.wireshark.org/review/14107
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-02-28 23:50:53 +00:00
Martin Kaiser 0165e679d6 u3v: use interface class and subclass in heuristic checks
don't access the class-specific conversation structure before we know
that the packet is a U3V packet

the USB dissector should fill interfaceClass and interfaceSubclass with
correct values - if it doesn't that's another bug to be fixed

Bug:12194
Change-Id: Ic9e73e7cb05c8887fee794e4735936caad1b7f49
Reviewed-on: https://code.wireshark.org/review/14224
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-02-28 20:49:14 +00:00
karyrogers df7c21bed2 TCP: Added bytes sent since last PSH flag
Added tcp.analysis.push_bytes_sent to see how many bytes sent since the last PSH flag. Can be useful when analyzing application behavior and performance and bytes_in_flight gets altered by ACKs

Change-Id: I8c6348de43cdb1545169d3a04773885d2411eb00
Reviewed-on: https://code.wireshark.org/review/9822
Reviewed-by: Jasper Bongertz <jasper@packet-foo.com>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-02-28 20:43:51 +00:00
Stig Bjørlykke 109dd91eb5 Qt: Added geometry_state_dialog to Wireshark.pro
Change-Id: I8844469a1cef7e37d4ec0f7ad2aff10bac521af2
Reviewed-on: https://code.wireshark.org/review/14230
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-02-28 20:39:58 +00:00
Stig Bjørlykke 3c6dab95b4 Qt: Improve Show Packet Bytes
- Add ShowAsASCIIandControl to keep ShowAsASCII only ASCII printable.
- Enable show selected when ShowAsRAW.
- Use QString::fromLatin1() when ShowAs8859_1.
- Don't replace null with symbol for null when ShowAsUTF8.

Change-Id: I25750247160e33d342fde12e6a998e3198270acf
Reviewed-on: https://code.wireshark.org/review/14220
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-02-28 19:00:12 +00:00
Martin Kaiser ddcafa06df wslua: don't crash if disable_lua = true in init.lua
in wslua_init(), our lua instance L is set to NULL if
disable_lua is true in init.lua
make sure that we leave wslua_init() in this case

if we don't, we crash in lua_pop(L,1); with L==NULL

Program received signal SIGSEGV, Segmentation fault.
0x00007fffefb41a73 in lua_settop () from /usr/lib/x86_64-linux-gnu/liblua5.1.so.0
(gdb) bt
 #0  0x00007fffefb41a73 in lua_settop () from /usr/lib/x86_64-linux-gnu/liblua5.1.so.0
 #1  0x00007ffff4fb50e4 in wslua_init (cb=cb@entry=0x516f40 <splash_update(register_action_e, char const*, void*)>,
    client_data=client_data@entry=0x0) at init_wslua.c:900
 [...]

Bug:12196
Change-Id: Ic338c4edcb897c0eaa9b6755bbb6c9991ec6ed02
Reviewed-on: https://code.wireshark.org/review/14228
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-02-28 18:27:08 +00:00
Stig Bjørlykke 1a716800e3 Qt: Add dialog geometry restore
Add GeometryStateDialog class to handle load and save dialog geometry.
The QDialog class name will be used as window name.  For shared
classes the UAT name or the statistics title or abbr will be used.

Change-Id: I5a019598307fb3861518f41e733de834788184d8
Reviewed-on: https://code.wireshark.org/review/14139
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-02-28 18:25:50 +00:00
Thomas Dreibholz f0425e83a1 Add .png files for Debian packaging.
Bug: 12160
Change-Id: I00771df346893c1112599f8affb9a47f9d793a87
Reviewed-on: https://code.wireshark.org/review/14199
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-02-28 16:43:10 +00:00
Gerald Combs 995b791f43 [Automatic update for 2016-02-28]
Update manuf, services enterprise-numbers, translations, and other items.

Change-Id: I01e2b802cce29c9390a85b2d12fe4fefef2357c2
Reviewed-on: https://code.wireshark.org/review/14225
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-02-28 16:06:00 +00:00
Martin Kaiser 157b7e9b48 usb: fix a typo
... and the copy of it that I just made :-(

bInterfaceProtocol should be bInterfaceSubClass

Change-Id: Ic25f28cad7305986cb79ddea5110b1e739e57101
Reviewed-on: https://code.wireshark.org/review/14223
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-02-28 14:32:17 +00:00
Martin Kaiser ecd4373418 usb: resolve some subclasse codes of interface class misc
Change-Id: I597fa87248caf77b3622065bc4dbdaa66cee809a
Reviewed-on: https://code.wireshark.org/review/14222
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-02-28 13:45:18 +00:00
Martin Kaiser c18527619e u3v: clean up the heuristic check
check for the minimum lenght before dereferencing data
add a NULL check for usb_conv_info

Change-Id: I91014d5929f57cc9eed2bfc7adef9f89541ece45
Reviewed-on: https://code.wireshark.org/review/14221
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-02-28 13:19:30 +00:00
Alexis La Goutte ea6d1457b2 U3V: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
Change-Id: Ie86aba59e95ed739b07fcb9f596fa206bf9793f5
Reviewed-on: https://code.wireshark.org/review/14217
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-02-28 12:15:40 +00:00
Rustam S ae0f62f5dc Typo in packet-gsm_a_dtap.c
Bug: 12186
Change-Id: Ib73ee78ba732f5ed88f596a72146a75efa47cebd
Reviewed-on: https://code.wireshark.org/review/14198
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-02-28 09:08:40 +00:00
Michael Mann 072f0856cb packet-amqp.c: Fix multiple fields with incompatible types
Change-Id: I68b7fa0b5d7fae86289807d7ef01a2141dcb8ff6
Reviewed-on: https://code.wireshark.org/review/14059
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: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-02-28 08:48:50 +00:00
Alexis La Goutte 95fb7259d8 gryphon: fix 'gryphon.reserved' exists multiple times with NOT compatible types: FT_BYTES and FT_UINT32
Change-Id: Ia2ef8c4211ca717d6e99f596cd7f2de92d5aa7ca
Reviewed-on: https://code.wireshark.org/review/14202
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-02-28 02:09:26 +00:00
Alexis La Goutte fe4d1a8b0f LLDP: Add 802.3 TLV Energy Efficient Ethernet (Subtype 5)
Bug:12165
Change-Id: I341d4387227a41af826a2867b48a53eff7e1e62a
Reviewed-on: https://code.wireshark.org/review/14200
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-02-28 01:05:11 +00:00
Alexis La Goutte 72fb00f9c2 SPRT: fix 'sprt.payload' exists multiple times with NOT compatible types: FT_NONE and FT_UINT32
Change-Id: Ie6c6f71e413463f93924c1a47b908a1c97d94407
Reviewed-on: https://code.wireshark.org/review/14209
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-02-27 20:15:09 +00:00
Alexis La Goutte 4ef2e2f389 Zbee (nwk): fix 'zbee_nwk.multicast' exists multiple times with NOT compatible types: FT_UINT8 and FT_BOOLEAN
Change-Id: I5947b0543e0b6270cbef69184360c19e2d25c8e0
Reviewed-on: https://code.wireshark.org/review/14205
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-02-27 18:47:06 +00:00
Alexis La Goutte 9ef7b92193 irda: fix 'irlmp.xid.name' exists multiple times with NOT compatible types: FT_BYTES and FT_STRING
Change-Id: I93215bd126dab1e7b6207f8510c7ce9b116637a3
Reviewed-on: https://code.wireshark.org/review/14203
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-02-27 18:45:10 +00:00
Alexis La Goutte bebe51e2c5 ZEP: fix 'zep.seqno' exists multiple times with NOT compatible types: FT_STRING and FT_UINT8
Change-Id: I8d39436efaa5b561a95b08b5849b200a51e3c981
Reviewed-on: https://code.wireshark.org/review/14204
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-02-27 18:42:22 +00:00
Alexis La Goutte 2eadb734bf Zbee (zcl se): fix 'zbee_zcl_se.ke.cert.type' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT
Change-Id: I493491f4e93556ccff95abe69cc2ecce1f9f28b2
Reviewed-on: https://code.wireshark.org/review/14207
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>
2016-02-27 18:41:06 +00:00
Michael Mann 599b54963f BOOTP: Add preference to determine endianness of UUID.
Spec doesn't appear to explicitly state endian format.

Bug: 11544
Change-Id: I601d94523199bc3f9ce4f573d9976e328d9c816a
Reviewed-on: https://code.wireshark.org/review/14201
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-02-27 17:58:19 +00:00
Alexis La Goutte 2b5fe74c5d Zbee (Security): fix 'zbee.sec.key' exists multiple times with NOT compatible types: FT_BYTES and FT_UINT8
Change-Id: If6f61c973baf02abda640553febab91b8f4f5fe6
Reviewed-on: https://code.wireshark.org/review/14206
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-02-27 17:53:41 +00:00
Pavel Odintsov dbe1d13ea4 sFlow v5: Add original packet header length to protocol tree.
Change-Id: I05af7d55fac139b462895d3a219c94ea2e8359c4
Reviewed-on: https://code.wireshark.org/review/13982
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>
2016-02-27 17:16:23 +00:00
Bertrand Bonnefoy-Claudet d4dd4fd848 Fix names of SSLv2 RC2 cipher suites
The previous naming for suite 0x040080 was wrong according to [1] and [2].  It
is an export suite but its name did not reflect that.

This also removes the extra "CBC_" in both RC2 cipher suites as it seems more
consistent with other names, the specification and OpenSSL.

[1] https://github.com/openssl/openssl/blob/OpenSSL_1_0_2-stable/ssl/ssl2.h#L95
[2] http://www-archive.mozilla.org/projects/security/pki/nss/ssl/draft02.html

Change-Id: I4a62463fdd7b0733a9652f8ab601848b26977c28
Reviewed-on: https://code.wireshark.org/review/14197
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-02-27 13:45:56 +00:00
João Valverde 11b058e35f GTK: make dist fixups
Change-Id: I6e83335cd3c6c77a77f5d77c2e1edc36afd0fbed
Reviewed-on: https://code.wireshark.org/review/14153
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>
2016-02-27 12:21:34 +00:00
João Valverde b3d8785ab5 Lua configure.ac improvements
Use PKG_WIRESHARK_CHECK_SYSTEM_MODULES for consistency with other
system dependencies.

Give slightly more informative configure messages other than multiple
'checking for LUA'.

Check for headers using pkg-config to avoid undefined symbols in
config.h.

Change-Id: I8d3df9ccf6f718d7d055da4f713af60d46d89e33
Reviewed-on: https://code.wireshark.org/review/14173
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>
2016-02-27 12:21:20 +00:00