Darien Spencer [Tue, 6 Jun 2017 03:05:29 +0000 (20:05 -0700)]
FP - Code clean up and comments updates
* Removed some commented code
* Removed unused #if 0'd code
* Update some comments
* Fixed an indentation issue
Change-Id: I807bb279a1df00bf49bdb5d6ce63ba1a55032d78
Reviewed-on: https://code.wireshark.org/review/21970
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>
Stig Bjørlykke [Mon, 5 Jun 2017 16:54:56 +0000 (18:54 +0200)]
Qt: Build wireless_timeline.cpp with -Wshorten-64-to-32
[...]/wireshark/ui/qt/wireless_timeline.cpp:190:50: error: implicit
conversion loses integer precision: 'unsigned long' to 'guint' (aka 'unsigned int')
[-Werror,-Wshorten-64-to-32]
guint half_window = (end_tsf - start_tsf)/2;
~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~^~
Change-Id: I675408f8a6c0809588ce89b2b98e05d7bfb10ed9
Reviewed-on: https://code.wireshark.org/review/21969
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Ahmad Fatoum [Sun, 4 Jun 2017 10:32:13 +0000 (12:32 +0200)]
wsutil: Add XTEA block cipher
XTEA is a 64-bit block Feistel cipher with a 128-bit key and a suggested
64 rounds. It's used by the MMORPG Tibia for encrypting game server traffic.
Usual XTEA treats the blocks as big-endian. Tibia treats them as little
endian, therefore both versions are provided.
Change-Id: I9ad0c8e066f848b20772ce4e1d3df19deff307b8
Reviewed-on: https://code.wireshark.org/review/21942
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Gerald Combs [Mon, 5 Jun 2017 15:03:52 +0000 (15:03 +0000)]
Revert "More 2.4 initialization."
This reverts commit
c60a6580c935c68d8bb82a84f0359b46b1bf06a5.
Wrong branch.
Change-Id: I846b26d09bf1ab99d3f42baf35f1a63f1dd806d2
Reviewed-on: https://code.wireshark.org/review/21967
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Gerald Combs [Mon, 5 Jun 2017 15:02:22 +0000 (08:02 -0700)]
More 2.4 initialization.
Change-Id: Iac4c02068eb462854b66c1561f4dfa2601bb18bf
Reviewed-on: https://code.wireshark.org/review/21966
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Martin Kaiser [Mon, 5 Jun 2017 13:40:29 +0000 (15:40 +0200)]
asterix: add a link to the specifications
It was pointed out during the discussions in
https://code.wireshark.org/review/#/c/19568/
that the specifications are publicly available.
Change-Id: Idc21a606c9b9aedb16f7632b24322c901e7db524
Reviewed-on: https://code.wireshark.org/review/21963
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Ivan Nardi [Mon, 5 Jun 2017 11:24:03 +0000 (13:24 +0200)]
[Bssmap] Fix and improve dissection
See TS 48.008:
* in "Perform Location Request" msg, "Cell Identifier" ie is optional, not mandatory (3.2.1.71)
* in "Uplink Releae Command" msg, "Cause" ie is mandatory (3.2.1.62)
* fixed and improved "Service Handover" ie dissection (3.2.2.75)
Change-Id: I2194bf56ef21a2cccbd4f2ed7ff22565af04cddd
Reviewed-on: https://code.wireshark.org/review/21957
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>
Simon Barber [Thu, 6 Apr 2017 21:45:33 +0000 (17:45 -0400)]
Add a timeline view for packets, with the timing data used to generate the display
taken from the timing analysis done in the wlan_radio dissector. QT only.
The timeline background is light gray, white for packets displayed in the packetlist,
and blue for the currently selected packet. Packets are coloured according to the
colouring rules foreground colour. The timeline can be zoomed with controls on the
toolbar.
At higher zoom levels the duration (NAV) field is plotted as a horizontal line to the
right of a packet.
The height of a packet in the timeline is proportional to the RSSI.
The bottom half of the packet is only shown if it matches the display filter.
Todo:
Auto detect TSF timing reference point (start/end of packet)
Add a scrollbar
Add a ruler showing time
Improve handling of focus.
Do not display NAV for packets with bad FCS.
Show related packets graphically
Different Y axis modes
- bandwidth/channel use display
- different transmitters per line
- background color from coloring rules
Live capture support
Change-Id: Ic31fffb0d6854966361ade7abb5c0be50db9a247
Reviewed-on: https://code.wireshark.org/review/20043
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Guy Harris [Mon, 5 Jun 2017 01:58:40 +0000 (18:58 -0700)]
Allow bigger snapshot lengths for D-Bus captures.
Use WTAP_MAX_PACKET_SIZE_STANDARD, set to 256KB, for everything except
for D-Bus captures. Use WTAP_MAX_PACKET_SIZE_DBUS, set to 128MB, for
them, because that's the largest possible D-Bus message size. See
https://bugs.freedesktop.org/show_bug.cgi?id=100220
for an example of the problems caused by limiting the snapshot length to
256KB for D-Bus.
Have a snapshot length of 0 in a capture_file structure mean "there is
no snapshot length for the file"; we don't need the has_snap field in
that case, a value of 0 mean "no, we don't have a snapshot length".
In dumpcap, start out with a pipe buffer size of 2KB, and grow it as
necessary. When checking for a too-big packet from a pipe, check
against the appropriate maximum - 128MB for DLT_DBUS, 256KB for
everything else.
Change-Id: Ib2ce7a0cf37b971fbc0318024fd011e18add8b20
Reviewed-on: https://code.wireshark.org/review/21952
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Michael Mann [Wed, 7 Dec 2016 00:38:54 +0000 (19:38 -0500)]
[TDS] Convert to using tcp_dissect_pdus.
Bring some modernity to this dissector and use tcp_dissect_pdus. Also an excuse to
remove the conversation_set_dissector in the heuristic dissector which was generating
some false positives because the heuristic isn't that strong.
Bug: 12882
Change-Id: Ibb04fd4fbc819acd1dc96d6259b047c897ec2de6
Reviewed-on: https://code.wireshark.org/review/19125
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Michael Mann [Sun, 4 Jun 2017 21:35:15 +0000 (17:35 -0400)]
Remove "length only" check for dissectors that use tcp_dissect_pdus.
If a TCP segment is small enough, dissectors that have a only a length
check determining if it's their packet or not before calling tcp_dissect_pdus
will throw out packets that are probably destined for them.
Change-Id: I78034307b56aa537943191a6887166577936a6a3
Reviewed-on: https://code.wireshark.org/review/21950
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Michael Mann [Sun, 4 Jun 2017 22:43:01 +0000 (18:43 -0400)]
Add DCE/RPC over TCP dissector to "force" DCE/RPC when heuristics fail
Add a simple dissection function for DCE/RPC that just calls tcp_dissect_pdus
and doesn't do any heuristics checks. This can be used to handle cases
where TCP PDU is too small for DCE/RPC heuristics checks and user
knows the data is DCE/RPC and can set it through Decode As.
Bug: 6392
Change-Id: I9e4960282ea64d20499f7d5a330f48f30a092b30
Reviewed-on: https://code.wireshark.org/review/21951
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Guy Harris [Sun, 4 Jun 2017 19:15:34 +0000 (12:15 -0700)]
Allocate the pipe capture data buffer upfront.
We were allocating it every time we called cap_pipe_dispatch() (or,
prior to I0256daae8478f1100fdde96a16a404465ec200b3, in
capture_loop_dispatch()) and freeing it before the routine in question
returned.
However, we were treating that buffer as if it persisted from call to
call, which worked *only* if freeing and re-allocating the buffer meant
that we'd get back the same buffer with its previous contents intact.
That is *not* guaranteed to work.
Instead, allocate the buffer when we open the capture pipe, and free it
when we close the capture pipe.
Change-Id: Ic785b1f47b71b55aba426db3b1e868186c265263
Reviewed-on: https://code.wireshark.org/review/21948
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Pascal Quantin [Sun, 4 Jun 2017 14:42:48 +0000 (16:42 +0200)]
GSM A DTAP: fix detection of missing first mandatory element
Bug: 13760
Change-Id: I1c062420f96104a46e5d1478eb054f086f942b54
Reviewed-on: https://code.wireshark.org/review/21946
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>
Ivan Nardi [Sun, 4 Jun 2017 10:46:50 +0000 (12:46 +0200)]
[SGsAP] Fix Release-Request msg
"SGs Cause" is an optional ie, not a mandatory one. See TS 29.118 8.23.1
Change-Id: I74ad90d159e667fa41f8c099520ce5f662a4d85e
Reviewed-on: https://code.wireshark.org/review/21939
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>
Martin Kaiser [Sat, 3 Jun 2017 13:15:39 +0000 (15:15 +0200)]
profinet dcp: simplify dissect_PNDCP_Suboption_Manuf()
There's not much point in having a switch-case block with only a default
statement ;-)
Change-Id: Iaacd87bb2995783b98e5395b3654a1c8f32c473a
Reviewed-on: https://code.wireshark.org/review/21938
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Martin Kaiser [Sat, 3 Jun 2017 11:54:22 +0000 (13:54 +0200)]
profinet dcp: don't THROW() an exception from a dissector
In this case, we can simply replace the exception with an expert info
and exit the loop.
Change-Id: I232e554af299140d7123b5e21d78372a35a7923b
Reviewed-on: https://code.wireshark.org/review/21936
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Martin Kaiser [Sat, 3 Jun 2017 11:58:29 +0000 (13:58 +0200)]
profinet: remove unnecessary if(tree) checks
Change-Id: I0c4346386846c03a67b83bebfce6da6323379180
Reviewed-on: https://code.wireshark.org/review/21937
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Gerald Combs [Sun, 4 Jun 2017 08:09:28 +0000 (08:09 +0000)]
[Automatic update for 2017-06-04]
Update manuf, services enterprise-numbers, translations, and other items.
Change-Id: I95d3c8d0ce5c4215730d461f00812d48fd697892
Reviewed-on: https://code.wireshark.org/review/21932
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Guy Harris [Sun, 4 Jun 2017 04:57:39 +0000 (21:57 -0700)]
Allocate a buffer in cap_pipe_dispatch(), not in capture_loop_dispatch().
The buffer is only used when reading from a pipe; no need to allocate it
when capturing from a pcap_t.
Doing it in cap_pipe_dispatch() makes it clearer when the buffer exists
and when it doesn't.
Change-Id: I0256daae8478f1100fdde96a16a404465ec200b3
Reviewed-on: https://code.wireshark.org/review/21930
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Michael Mann [Sun, 4 Jun 2017 00:07:12 +0000 (20:07 -0400)]
Bugfix GTK Decode As
Current layer number needs to be unconditionally saved after
v2.3.0rc0-3740-ge1f84f985e,
which increased the number of dissectors that use current layer number to
determine Decode As value.
Change-Id: Ib82370af94ea00613a337890369e228cffa1ed81
Reviewed-on: https://code.wireshark.org/review/21928
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Pascal Quantin [Sat, 3 Jun 2017 21:13:17 +0000 (23:13 +0200)]
capture-pcap-util.c: fix a typo
Change-Id: I674d02be665afc331e266725c0a0cbc0a33d9403
Reviewed-on: https://code.wireshark.org/review/21926
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Erik de Jong [Sat, 3 Jun 2017 15:22:48 +0000 (17:22 +0200)]
LoRaTap DLT and dissector
Add support for handling LoRaTap (https://github.com/eriknl/LoRaTap) DLT in
wiretap and add dissector for LoRaTap headers.
Exposes Syncword for subdissectors to dissect frame payload.
Change-Id: Ie4ba2189964376938f45eb3da93f2c3376042e85
Reviewed-on: https://code.wireshark.org/review/21915
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Pascal Quantin [Sat, 3 Jun 2017 18:15:59 +0000 (20:15 +0200)]
Clean Release Notes
Change-Id: I5e13c057265c3435bf8104351306a26f264209bd
Reviewed-on: https://code.wireshark.org/review/21923
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Guy Harris [Sat, 3 Jun 2017 19:58:36 +0000 (12:58 -0700)]
Don't keep the pcap/pcapng link-layer header type as interface data.
Either 1) it can be determined from the libwiretap encapsulation type,
in which case it's redundant information or 2) there *is* no pcap/pcapng
link-layer header type for that encapsulation type, in which case you
need to check for the attempt to determine it failing and handle that
failure appropriately.
Change-Id: Ie9557b513365c1fc8c6df74b9c8239e29aad46bc
Reviewed-on: https://code.wireshark.org/review/21924
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Guy Harris [Sat, 3 Jun 2017 17:57:14 +0000 (10:57 -0700)]
Get rid of #if 0'd out include.
Change-Id: I0d996b03303572538d250ed8f27b04a0e93cf261
Reviewed-on: https://code.wireshark.org/review/21921
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Guy Harris [Sat, 3 Jun 2017 17:32:44 +0000 (10:32 -0700)]
Fix typo.
Change-Id: If4ac286fed29635ec085f9671c77abf6ed22766d
Reviewed-on: https://code.wireshark.org/review/21919
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Guy Harris [Sat, 3 Jun 2017 17:14:39 +0000 (10:14 -0700)]
If has_snaplen isn't set, don't set the snapshot length with pcap_create()/pcap_activate().
Just let libpcap pick the snapshot length; that way, for link-layer
types that need a really large snapshot length, such as D-Bus (which
requires 128MB for the largest messages), it can pick that, but can
otherwise pick something that doesn't require as much memory, e.g.
256KB.
For pcap_open_live() and pcap_open(), which don't have a way of saying
"give me what's appropriate", pick 256KB.
Change-Id: Idef5694f7dfa85eaf3a61d6ca7a17d263c417431
Reviewed-on: https://code.wireshark.org/review/21917
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Pascal Quantin [Sat, 3 Jun 2017 15:45:17 +0000 (17:45 +0200)]
Update libwireshark0.symbols file
Change-Id: I86d37b08a6b325e3b9dd0289b8b8f45641e011fa
Reviewed-on: https://code.wireshark.org/review/21916
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Ivan Nardi [Sat, 3 Jun 2017 14:22:48 +0000 (16:22 +0200)]
packet-gsm_a_rr: add missing ie in Paging Response message
"Additional update parameters" info element is not dissect in Paging Response message. See TS 44.018 9.1.25
Change-Id: Ia3aec7809be9b5e8318bb7e04326bc85f77d34bd
Reviewed-on: https://code.wireshark.org/review/21914
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Martin Mathieson [Wed, 31 May 2017 19:42:06 +0000 (20:42 +0100)]
Use data-text-lines dissector for text based ftp data
Change-Id: I98c5dad4dba4a8e5eaa450bef977ca7c0b979734
Reviewed-on: https://code.wireshark.org/review/21867
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Alexis La Goutte [Mon, 15 May 2017 19:30:30 +0000 (19:30 +0000)]
.mailmap: update (of May)
Change-Id: I40cf8db41036a6ba1d6a67fb0a4f3e194ad1107b
Reviewed-on: https://code.wireshark.org/review/21671
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Roland Knall <rknall@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
João Valverde [Sat, 3 Jun 2017 04:35:17 +0000 (05:35 +0100)]
RADIUS: Fix gda9363e202
EVS value was incorrectly typed from the non-extended type space.
Now it should display as unknown.
Ping-Bug: 13745
Change-Id: I67cfa29d3edcd56e49c1f4eded117a26594f0a14
Reviewed-on: https://code.wireshark.org/review/21911
Reviewed-by: Michael Mann <mmann78@netscape.net>
Guy Harris [Sat, 3 Jun 2017 02:38:11 +0000 (19:38 -0700)]
Pass the file type, not the frame type, to cfile_dump_open_failure_message().
Change-Id: I3c5e73d4e13106891001dfccd1568148a06329b4
Reviewed-on: https://code.wireshark.org/review/21909
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Alexis La Goutte [Fri, 2 Jun 2017 19:49:39 +0000 (21:49 +0200)]
netflow: use BASE_UNIT_STRING (units_seconds, units_microseconds)
and fix also some typo
Change-Id: I7892e715af56ebd1abb3fb36110200e2e992e9b1
Reviewed-on: https://code.wireshark.org/review/21901
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>
Lorenzo Vannucci [Tue, 30 May 2017 11:31:51 +0000 (07:31 -0400)]
netflow: ntop information elements update, added all missing
items exported by nProbe.
Change-Id: I476c970d1abb7e1776da01bbdbf74e255387c917
Reviewed-on: https://code.wireshark.org/review/21825
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>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Gerald Combs [Fri, 2 Jun 2017 22:39:32 +0000 (15:39 -0700)]
2.3.0 → 2.5.0.
Change-Id: I83ecbff82b23702f40ce1bae45be23e3336ff2c4
Reviewed-on: https://code.wireshark.org/review/21905
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Peter Wu [Fri, 2 Jun 2017 20:05:10 +0000 (22:05 +0200)]
Add ChaCha20-Poly1305 decryption support for TLS 1.2 and 1.3
Implements all seven AEAD_CHACHA20_POLY1305 cipher suites from RFC 7905
(for TLS 1.2) and the final missing one for TLS 1.3 (draft -20).
New test captures (created using OpenSSL_1_1_0
-pre6-2528-g042597b0a)
also serve as tests for TLS 1.3 decryption support.
Change-Id: Ice6d639c9c7b7bc23a6ff5fb4832d02694abd8c4
Ping-Bug: 12779
Reviewed-on: https://code.wireshark.org/review/21902
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Robert Sauter [Fri, 2 Jun 2017 06:04:50 +0000 (08:04 +0200)]
IEEE 802.15.4: add missing increments for Header IEs
Add missing offset increment for Header IEs with length (missing from
https://code.wireshark.org/review/21472).
Add missing increment so that the overall header tree spans all elements.
Change-Id: I91515a0b6b5fca8bcc95ea9e2cbc791bddf0500d
Reviewed-on: https://code.wireshark.org/review/21890
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: Pascal Quantin <pascal.quantin@gmail.com>
Michael Mann [Fri, 2 Jun 2017 14:18:50 +0000 (10:18 -0400)]
Rename packet-netgear.c -> packet-netgear-ensemble.c
This may not be the only Netgear protocol, so make a distinction.
Change-Id: I68f460f44ac9345863468cfb407cec205a392d54
Reviewed-on: https://code.wireshark.org/review/21900
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Charlie Lenahan <clenahan@sonicbison.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Pau Espin Pedrol [Fri, 12 May 2017 09:40:04 +0000 (11:40 +0200)]
gsm_osmux: Use proper sizes for struct osmux_hdr fields
Change-Id: I93de7ffdbd3c43494bc6a5dd1f44f6f45d6b54f8
Reviewed-on: https://code.wireshark.org/review/21617
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Ahmad Fatoum [Fri, 2 Jun 2017 09:34:55 +0000 (11:34 +0200)]
packet-epl.c: Make dissector oss-fuzz friendly
oss-fuzz invokes the dissector without IP layer, so we can't assume
the IP address to be available when dissecting POWERLINK/UDP packets.
Same goes for the "Exported PDU" functionality.
Bug: 13756
Change-Id: I038f0445ada3f764dcc72f7bce1d02cfa49791fb
Reviewed-on: https://code.wireshark.org/review/21894
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>
Nicolas Bertin [Fri, 2 Jun 2017 13:43:09 +0000 (15:43 +0200)]
uaudp: added "SuperFast Connect" parameter to connect message (removes "Unknown" display)
Change-Id: Ia686028e4a4472b18d362c010f802f351cd1b0ac
Reviewed-on: https://code.wireshark.org/review/21899
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Pascal Quantin [Mon, 29 May 2017 19:49:26 +0000 (21:49 +0200)]
TCAP: fix SRT analysis
When reviewing the code, the following issues were identified:
- otid/dtid on 3 bytes were not stored
- when receiving the first continue from dest, the TC_END hash entry was
created with the source tid / address instead of destination ones
- when receiving the first continue from src, the logic could prevent
the creation of the hash entry
Bug: 13739
Change-Id: If4ee70f0fa69f5ff74fdf75f3a741102baa0121a
Reviewed-on: https://code.wireshark.org/review/21780
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Peter Wu [Fri, 2 Jun 2017 08:52:56 +0000 (10:52 +0200)]
ssl-utils: fix regression in decryption and Follow SSL Stream
Store SslPacketInfo under the same key as used by p_get_proto_data and
pass this data to the Follow SSL tap.
Change-Id: If9b97d0e0e2a82562abe6cb9e61986744680066d
Fixes: v2.3.0rc0-3740-ge1f84f985e ("Fix Decode As for protocols that may use tunneling.")
Reviewed-on: https://code.wireshark.org/review/21893
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Stig Bjørlykke [Fri, 2 Jun 2017 11:14:05 +0000 (13:14 +0200)]
Qt: Add version check for setTextInteractionFlags
This property was introduced in Qt 5.1.
Change-Id: I3446886d65fbeaf011a69071b605b044e5205b60
Reviewed-on: https://code.wireshark.org/review/21895
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>
Ahmad Fatoum [Fri, 2 Jun 2017 04:29:02 +0000 (06:29 +0200)]
packet-epl.c: Prefix EPL UAT files with epl_
Unlike preferences, UATs are stored in their own files, so prefexing file
name with the protocol abbreviation makes sense to keep matters organized.
Change-Id: Ic7918f509e38da38cdb86ad70917923547f9c112
Reviewed-on: https://code.wireshark.org/review/21888
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
Guy Harris [Fri, 2 Jun 2017 08:29:42 +0000 (01:29 -0700)]
Add SUBOBJECT_INITIALIZER and use it.
Just as we have OD_ENTRY_INITIALIZER, add SUBOBJECT_INITIALIZER, and use
it rather than memset().
Whether removing initializer warnings is a Good Thing is subject to
debate; remove a comment that implies it's been deemed a Good Thing.
Change-Id: Ife658d8bb1d4868789ca3b929aff6e4fccecb430
Reviewed-on: https://code.wireshark.org/review/21892
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Ahmad Fatoum [Fri, 2 Jun 2017 05:44:22 +0000 (07:44 +0200)]
packet-epl.c: Change CANopen Unicode_String to little endian
CANopen DS301 defines "Unicode_String" as "ARRAY [ length ] OF UNSIGNED16"
and states "For numerical data types the encoding is little endian style".
Change-Id: I146449d7eaafe58b337b505682b14cd672f8ad76
Reviewed-on: https://code.wireshark.org/review/21891
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
Ahmad Fatoum [Fri, 2 Jun 2017 04:12:31 +0000 (06:12 +0200)]
packet-epl.c: Fixup missing initializer warnings
macOS Buildbot doesn't like {0} (probably because GNU C already provides {}
exactly for the purpose of initializing all members to zero/NULL/0.0.. etc)
Affected local type definitions now have a static intializer macro that uses
the correct amount of zeroes and braces (similar to PTHREAD_MUTEX_INITIALIZER)
Global type definitions have a memset to zero (Which isn't strictly correct,
but as the platforms we support all have all-bits-zero-nulls and IEEE 754
floats, it should be good enough. A separate change will attempt to disable
-Wmissing-field-initializers -Wmissing-braces globally and hopefully make
these workarounds unnecessary.
Change-Id: I30b0f679bbb8adb2dd7269c9f3bc19732e48212b
Reviewed-on: https://code.wireshark.org/review/21887
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Piotr Tulpan [Mon, 29 May 2017 19:58:14 +0000 (21:58 +0200)]
packet-rsl.c: add Encapsulating paging messages into a packet EP2192796 - proprietor Huawei
Adding dissection RSL message that corresponds to patent EP2192796 owned by Huawei.
Change-Id: I9fe32370d9b1330f78ac96c1203b6fde3f7784cd
Reviewed-on: https://code.wireshark.org/review/21788
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>
Michael Mann [Fri, 2 Jun 2017 00:42:23 +0000 (20:42 -0400)]
packet-ipp.c: Improve enum tag filtering
Change-Id: I41249c832b96c8942b78b17983a493faf802f355
Reviewed-on: https://code.wireshark.org/review/21886
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>
Irene Ruengeler [Mon, 8 May 2017 07:04:16 +0000 (09:04 +0200)]
Fix Decode As for protocols that may use tunneling.
Dissectors that rely on pinfo structure information may have the
data overwritten if the data is tunneled. Address it by using
proto data that is based on pinfo->curr_layer_num.
Bug: 13746
Change-Id: I1c29f26a3c49f368876f0e96908705bc9c099ce1
Reviewed-on: https://code.wireshark.org/review/21559
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>
Pau Espin Pedrol [Wed, 10 May 2017 18:24:56 +0000 (20:24 +0200)]
gsm_osmux: Add support to follow Osmux streams and show its statistics
Change-Id: I5262b3b1ac5a6f5bc6ac932eedbb889847131d9c
Reviewed-on: https://code.wireshark.org/review/21601
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Alexis La Goutte [Mon, 21 Nov 2016 13:01:36 +0000 (14:01 +0100)]
fb-zero: Add support of Zero Protocol
Facebook uses a derivative of QUIC protocol (on top of TCP) for Android device
The dissector was reverse engineered based off of QUIC dissector functionality
Pcap avaliable https://github.com/ntop/nDPI/issues/300
Some information (not spec) can be found here:
https://code.facebook.com/posts/
608854979307125/building-zero-protocol-for-fast-secure-mobile-connections/
Change-Id: I4026bb992aa17a0c679379646b388a694f24a07f
Reviewed-on: https://code.wireshark.org/review/18937
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Björn Ruytenberg [Thu, 1 Jun 2017 17:14:33 +0000 (19:14 +0200)]
thread: Fix division by zero
Perform sanity check on channel count. Channel count must be greater than zero
to build energy measurements list from Energy List TLV [1]. Zero channel count
results in a division by zero in dissect_thread_mc. Do not process Energy List
TLV if zero.
[1]: OpenThread implementation -
https://github.com/openthread/openthread/blob/
b89a9dfbc117a9c80e795700b67/include/openthread/commissioner.h#L158
Energy List TLV contains energy measurements. If no channels are present, no
energy measurements can exist.
Bug: 13747
Change-Id: I53a19dfbeae9ef0421c8c144ef3be4da28413ad3
Link: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1979
Reviewed-on: https://code.wireshark.org/review/21878
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Ahmad Fatoum [Thu, 1 Jun 2017 09:11:18 +0000 (11:11 +0200)]
packet-epl.c: Enhance dissection by ObjectMappings and device profiles
Cyclic PDOs are setup either by ObjectMappings in the asynchronous SDOs,
or by serialized ObjectMappings in device profile files.
We now keep track of ObjectMappings transmitted via SDOs or read from
XDC files and use those to correctly partition the PDO's payloads.
Additionally types and descriptions for Object Directory entries extracted
from the EDS and XDD profiles are used to select the correct Wireshark type
and a string representation for those partitoned PDOs. Other places where
indices and subindices are also enriched by this information.
EDS support leverages GKeyFile and is available unconditionally, XDD/XDC
parsing support depends on the availabilty of libxml2. A patch for
inclusion of the latter as optional dependency was submitted
as Change-Id: I13c0a2f408fb5c21bad7ab3d7971e0fa8ed7d783
Electronic Data Sheet (EDS) is the CANopen standard for device profiles,
POWERLINK being based on CANopen, is occasionly used with EDS profiles.
XML Device Description (XDD) is the Ethernet POWERLINK standard for
device profiles. XDC have the same structure but contain actualValues
fields which can contain default ObjectMappings.
XML Device Descriptions can be 25k+ lines with much duplication,
so wmem_iarray_t is leveraged for saving space as well as faster lookups.
A side-effect of now organizing the capture in conversations is that
POWERLINK over UDP packets are now assigned proper destination and source
node IDs, which are displayed in the column view. The Referenced bug where
packets where erronously flagged as duplicates because the address wasn't
considered is also fixed as a result.
Bug: 13604
Bug: 13749
Change-Id: Ic33ff0be8f2eae7c24fe5877ad9258d1e550c227
Reviewed-on: https://code.wireshark.org/review/21112
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Darien Spencer [Wed, 31 May 2017 18:14:45 +0000 (11:14 -0700)]
FP - Moved RLC info retrieval for E-DCH channels
Dissection method was receiving the RLC INFO struct as a paramter instead
of using p_get_proto_data like other channels' dissection methods.
Change-Id: Iaf44f71552526dcdf29b8a583b1d79012e2b24e3
Reviewed-on: https://code.wireshark.org/review/21874
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>
Pascal Quantin [Thu, 1 Jun 2017 14:58:29 +0000 (16:58 +0200)]
IEEE 802.15.4: add a missing offset increment in dissect_ieee802154_payload_mlme_sub_ie()
Bug: 13751
Change-Id: I33d9d51ba36ddb2caeee25612b613bc799c76339
Reviewed-on: https://code.wireshark.org/review/21875
Reviewed-by: Rémy Léone <remy.leone@gmail.com>
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>
Max Dmitrichenko [Wed, 19 Apr 2017 21:31:32 +0000 (17:31 -0400)]
dfilter: fvt_cache use g_hash_table_new_full() API to prevent some memory leaks
Change-Id: I650c1eb1e98c7d2d2c9ec85bb6ec9b75667142a2
Reviewed-on: https://code.wireshark.org/review/21230
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
AndersBroman [Thu, 1 Jun 2017 11:29:52 +0000 (13:29 +0200)]
[GTPv2] Add "name" to IEs with Generic names in some cases.
Bug: 13531
Change-Id: I81edc081a508ab1e56b279ec1183066c4334dc10
Reviewed-on: https://code.wireshark.org/review/21872
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>
Stig Bjørlykke [Thu, 1 Jun 2017 08:57:05 +0000 (10:57 +0200)]
prefs: Avoid empty elements in string lists.
When parsing a comma-separated string list from file we should not
add an empty element if this list is empty. Otherwise we would
get an empty string in when writing the file back.
Change-Id: Iea5a33d20991f8c5daed6811beb8ec97b8b1dbe3
Reviewed-on: https://code.wireshark.org/review/21870
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>
Ahmad Fatoum [Sat, 15 Apr 2017 13:59:52 +0000 (15:59 +0200)]
Add interval array data structure, with growable intervals
A sorted array keyed by intervals
You keep inserting items, then sort the array.
sorting also compacts items that compare equal into one and adjusts
the interval accordingly. find uses binary search to find the item
This is particularly useful, if you got many similar items,
e.g. ObjectMapping subindices in the XDD. XDDs can be upward of
25k lines long with much duplication (253 subindices having the same
content).
Interval Trees wouldn't work, because they didn't allow expanding
existing intervals. Using an array instead of a tree, additionally offers
a possible performance advantage, but it's not that critical here,
as finding should only happen in the async frames
There's room for optimization in the creation process of the array,
but it doesn't matter much, as they aren't created frequently.
Finding speed is what matters for the use case of parsing EDS
and XDD files
Change-Id: Iaaddc90059f0e49b456774a111d8d42452b90cf9
Reviewed-on: https://code.wireshark.org/review/21111
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Stig Bjørlykke [Thu, 1 Jun 2017 09:14:23 +0000 (11:14 +0200)]
Add a new feature to the release notes.
Change-Id: I99dafc515ac70f7ed037c30936aceddd695d3525
Reviewed-on: https://code.wireshark.org/review/21871
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Stig Bjørlykke [Thu, 1 Jun 2017 07:20:38 +0000 (09:20 +0200)]
Qt: Enable unhiding all interfaces.
When having hidden interfaces it was not possible to unhide all
in the "Manage Interfaces" dialog because prefs.capture_devices_hide
was not updated when not having any hidden interfaces.
This bug was introduced in g6eee29bf.
Change-Id: If94c2e592eea60e6f1ef1ce2107ff9b2b27c3176
Reviewed-on: https://code.wireshark.org/review/21869
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
Gerald Combs [Tue, 30 May 2017 18:57:06 +0000 (11:57 -0700)]
Qt+prefs: Add a dark theme check and default colors.
Add prefs_set_gui_theme_is_dark and call it in the WiresharkApplication
constructor. Add a set of dark syntax color defaults.
We could alternatively add a preference for the syntax foreground color,
but that would imply adding a preference for the background color as
well.
Bug: 11131
Bug: 13738
Change-Id: Iefe135ed04e63372ed434c5b9759647c9f4046e3
Reviewed-on: https://code.wireshark.org/review/21827
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>
Stig Bjørlykke [Wed, 31 May 2017 13:45:59 +0000 (15:45 +0200)]
cmake: Add -Wshorten-64-to-32 for C++ when using Qt >= 5.9
The warnings has been fixed in Qt 5.9.
Change-Id: I7cc71612e601517b7d7117c3cf2711ec983593a6
Reviewed-on: https://code.wireshark.org/review/21861
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Stig Bjørlykke [Wed, 31 May 2017 19:34:55 +0000 (21:34 +0200)]
Qt: Disable -Wframe-larger-than= for ui_main_window.h
The generated Ui_MainWindow::setupUi() can grow larger than our configured
limit, so turn off -Wframe-larger-than= for ui_main_window.h.
Change-Id: I550ff30ebe566b711c63f7a9d0276e5b06244407
Reviewed-on: https://code.wireshark.org/review/21866
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>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Peter Wu [Fri, 26 May 2017 13:55:08 +0000 (15:55 +0200)]
debian: remove imagemagick and demote xdg-utils deps
imagemagick was needed since
v1.11.1-rc1-140-g02a8e72b43, but
unnecessary since
v2.1.0rc0-491-g18a54fcaa4, remove it.
xdg-utils is needed for xdg-open (opening websites) at runtime in GTK+,
but not for Qt nor during the build, remove it or mark it as optional.
Change-Id: I6fc4d5fb61ea8b5cf79526d92ef8c108bc9d11a3
Reviewed-on: https://code.wireshark.org/review/21765
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Ahmad Fatoum [Tue, 30 May 2017 20:25:23 +0000 (22:25 +0200)]
packet-epl.c: Fix bounds error on malformed packet
dissect_epl_payload is called with len retrieved from the packet payload,
so we've to ensure there are indeed at least len bytes remaining in the tvbuff.
Counting the remaining bytes has to start from the _current_ offset, not from
the start of the buffer.
Change-Id: I6f4a94e8503cde6c5eaadc43f560c15ef8c1c375
Reviewed-on: https://code.wireshark.org/review/21829
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: Roland Knall <rknall@gmail.com>
Stig Bjørlykke [Wed, 31 May 2017 18:52:34 +0000 (20:52 +0200)]
Qt: Capitalize "Select SACKs" in tcptrace graph.
Change-Id: I2d0b433fec482431f6ccfe6f8fe6576193fc7773
Reviewed-on: https://code.wireshark.org/review/21863
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Stig Bjørlykke [Wed, 31 May 2017 13:44:34 +0000 (15:44 +0200)]
Qt: Add cast to QByteArray.resize()
Change-Id: I651cf6e625b8c757820a1e879f3fbde99746ba88
Reviewed-on: https://code.wireshark.org/review/21860
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Alexis La Goutte [Wed, 31 May 2017 05:37:24 +0000 (07:37 +0200)]
80211 (prism): fix conflict for hf field
Remove hf_ieee80211_prism_did_sig_rate.
Change-Id: Id75deae2c074ecbb771e33c4a6f3855cb2ba9d9f
Reviewed-on: https://code.wireshark.org/review/21848
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Guy Harris [Wed, 31 May 2017 17:02:21 +0000 (10:02 -0700)]
Sort the RADIUS dictionaries and account for a rename of one of them.
Change-Id: Ieea5349a38366a68cd313e70c8f1d28828982d7b
Reviewed-on: https://code.wireshark.org/review/21862
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Alexis La Goutte [Wed, 31 May 2017 05:35:56 +0000 (07:35 +0200)]
acn: fix conflict for hf field
Turn hf_magic_reply_invalid_type in an expert info.
Change-Id: I6eeb5590e3d620ebb5afe46eae36cba6784033a4
Reviewed-on: https://code.wireshark.org/review/21847
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Alexis La Goutte [Wed, 2 Nov 2016 07:10:06 +0000 (08:10 +0100)]
debian: add lintian-overrides for libwireshark0
Remove last lintian issue
Change-Id: I672b347a8b0fc495b6e010ef987c0ff238eb8d1e
Reviewed-on: https://code.wireshark.org/review/18622
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>
Pascal Quantin [Wed, 31 May 2017 12:00:27 +0000 (14:00 +0200)]
UMTS FP: backout part of g899fd42
The delay for p_add_proto_data() calls was not required and introduced several
bugs (when the function returns before private info is attached).
Change-Id: Id3a668e6776308b2ea758940e4260bfcbddc236a
Reviewed-on: https://code.wireshark.org/review/21859
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>
Alexis La Goutte [Wed, 31 May 2017 05:56:09 +0000 (07:56 +0200)]
lemon: avoid redundant redeclaration of ‘memory_error’ [-Wredundant-decls]
Change-Id: I1fbc11dc433363b659ddba9a77e52ffd4e3968d7
Reviewed-on: https://code.wireshark.org/review/21850
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>
Alexis La Goutte [Wed, 31 May 2017 05:53:19 +0000 (07:53 +0200)]
opcua: fix no previous prototype for ‘parseNodeClassMask/parseResultMask’ [-Wmissing-prototypes]
Change-Id: If57183bcea978b766fc53f691a35c4ddf98ca2dd
Reviewed-on: https://code.wireshark.org/review/21849
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>
Graham Bloice [Wed, 31 May 2017 11:13:56 +0000 (12:13 +0100)]
Fix nsis intaller
The radius erx disctionary has been renamed to unisphere.
Change-Id: I3d8a4b9d8f6a5340f3a92274816e66bdaa55ffd3
Reviewed-on: https://code.wireshark.org/review/21858
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Guy Harris [Wed, 31 May 2017 09:38:38 +0000 (02:38 -0700)]
Sort the dictionary.* files.
Change-Id: Iad4457cc17f3e6a5b092d8050a0d1cc541efb2a3
Reviewed-on: https://code.wireshark.org/review/21856
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Guy Harris [Wed, 31 May 2017 09:32:55 +0000 (02:32 -0700)]
Rename dictionary.erx to dictionary.unisphere and pick up the FreeRADIUS version.
This picks up
commit
a5ad82aecc194f5f55153c351a62af9bb1c222a0
Author: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Sat Dec 7 23:24:20 2013 +0000
Fully sync ERX/Unisphere with Juniper's dictionaries
as well as picking up the copyright notice.
Change-Id: Ia6a694ccd94ad05caf25bea4dec9b467a4f99157
Reviewed-on: https://code.wireshark.org/review/21855
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Guy Harris [Wed, 31 May 2017 08:22:16 +0000 (01:22 -0700)]
Update a comment.
We now support dotted number values in the oid field.
Note that the attribute flags internal, array, concat, and virtual
aren't documented in the FreeRADIUS dictionary man page.
Change-Id: Iaf27845f75a93f2d006708224757ea48d8023cb1
Reviewed-on: https://code.wireshark.org/review/21853
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Guy Harris [Wed, 31 May 2017 08:18:22 +0000 (01:18 -0700)]
Give more information in a comment.
Change-Id: I43efd124bc49bc3d1261bd690ce38c5debb94e45
Reviewed-on: https://code.wireshark.org/review/21852
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Guy Harris [Wed, 31 May 2017 07:51:48 +0000 (00:51 -0700)]
Update to the FreeRADIUS version.
Picks up the copyright notice, cleans up white space, puts the type and
the properties of attributes in separate fields.
Change-Id: I1a813a784498ed3217c7fc9bfcd9c1162ceffebb
Reviewed-on: https://code.wireshark.org/review/21851
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Guy Harris [Wed, 31 May 2017 03:34:21 +0000 (20:34 -0700)]
Update to the FreeRADIUS version.
Picks up the copyright notice and a commented-out attribute.
Change-Id: I0325164eb3875557f7ce9a81cf697a99a0f5de93
Reviewed-on: https://code.wireshark.org/review/21846
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Guy Harris [Wed, 31 May 2017 03:32:24 +0000 (20:32 -0700)]
Update to the FreeRADIUS version.
Picks up the copyright notice and a value.
Change-Id: I99957b97cf905b9d13024f70b76e875756e71609
Reviewed-on: https://code.wireshark.org/review/21845
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Guy Harris [Wed, 31 May 2017 03:30:02 +0000 (20:30 -0700)]
Update to the FreeRADIUS version.
Picks up a copyright notice, a comment, and some attributes.
Change-Id: I299a4f1225eb6be23410c396a4f5a00affd64523
Reviewed-on: https://code.wireshark.org/review/21844
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Guy Harris [Wed, 31 May 2017 03:26:15 +0000 (20:26 -0700)]
Update to the FreeRADIUS version.
Picks up the copyright notice and an additional attribute.
Change-Id: Ieebed5ceae7a10bf393245d9fcf82310df6c42d9
Reviewed-on: https://code.wireshark.org/review/21843
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Guy Harris [Wed, 31 May 2017 03:24:31 +0000 (20:24 -0700)]
Update to the FreeRADIUS version.
Picks up the copyright notice, a comment, and an attribute.
Change-Id: I9b0c536646860f0d4e6e7f59967db22d592fc1c4
Reviewed-on: https://code.wireshark.org/review/21842
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Guy Harris [Wed, 31 May 2017 03:22:12 +0000 (20:22 -0700)]
Update to the FreeRADIUS version.
Picks up the copyright notice, a comment, and an additional attribute.
Change-Id: Ie65dcb039c725a63d1a9b6976814c182e10c74cb
Reviewed-on: https://code.wireshark.org/review/21841
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Guy Harris [Wed, 31 May 2017 03:20:05 +0000 (20:20 -0700)]
Merge with the FreeRADIUS version.
Pick up copyright notice and some additional attributes, along with
BEGIN-VENDOR and END-VENDOR.
Change-Id: Ifa0112a0bfc56f5977bffd6a32b12d1c1a089529
Reviewed-on: https://code.wireshark.org/review/21840
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Guy Harris [Wed, 31 May 2017 03:10:20 +0000 (20:10 -0700)]
Update to the FreeRADIUS version.
Picks up the copyright notice and some more attributes.
Change-Id: I594d8f72913fce3836db1935a3689d60a5a3f2ba
Reviewed-on: https://code.wireshark.org/review/21839
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Guy Harris [Wed, 31 May 2017 03:08:55 +0000 (20:08 -0700)]
Update to the FreeRADIUS version.
Picks up the copyright notice and some additional attributes.
Change-Id: I4a942512f62d91d98dcbf4ccba65ff97b6a729c9
Reviewed-on: https://code.wireshark.org/review/21838
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Guy Harris [Wed, 31 May 2017 03:05:54 +0000 (20:05 -0700)]
Update to the FreeRADIUS version.
Picks up the copyright notice and adds some attributes and values.
Change-Id: If24d00ceb23002aea2c24c16a7b38fd77df9401a
Reviewed-on: https://code.wireshark.org/review/21837
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Guy Harris [Wed, 31 May 2017 03:03:37 +0000 (20:03 -0700)]
Update to the FreeRADIUS version.
Picks up the copyright notice and new attributes and values, and renames
a few values to remove "-HW".
Change-Id: Iccf3938f54fab8b234ee49b509fdcc8a3cfba670
Reviewed-on: https://code.wireshark.org/review/21836
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Guy Harris [Wed, 31 May 2017 02:40:53 +0000 (19:40 -0700)]
Update to the FreeRADIUS version.
It moves an attribute.
Change-Id: I9f3c88f174b9520b16d3f2c68abe278ef695d403
Reviewed-on: https://code.wireshark.org/review/21835
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Guy Harris [Wed, 31 May 2017 02:38:06 +0000 (19:38 -0700)]
Update to the FreeRADIUS version.
Change-Id: I8af7ec1ec6ee2c44cddd4ed91a95039bcce3bd5e
Reviewed-on: https://code.wireshark.org/review/21834
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Guy Harris [Wed, 31 May 2017 02:36:01 +0000 (19:36 -0700)]
Update to the FreeRADIUS version.
Give a URL for the Extreme Networks documentation listing these
attributes, replacing our earlier citation; the newer version says
attribute 213 is Extreme-VM-Name, as is the case in the FreeRADIUS
version, not Extreme-CLI-Profile, as was the case in our version.
Change-Id: Iddd69c2ef4d3a5d55f16c20f3899eebdea217a2a
Reviewed-on: https://code.wireshark.org/review/21833
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Guy Harris [Wed, 31 May 2017 02:24:21 +0000 (19:24 -0700)]
Update to the FreeRADIUS version.
This file is mainly for supporting older names for certain attributes
and values; all the attributes and values here should be defined by
other files, so we really shouldn't be including this file.
Change-Id: I2e5391f0ed14d42e97434b77794e8ba643850608
Reviewed-on: https://code.wireshark.org/review/21832
Reviewed-by: Guy Harris <guy@alum.mit.edu>
git.samba.org / metze / wireshark / wip.git / log