Gerald Combs [Sun, 18 Dec 2016 16:13:10 +0000 (08:13 -0800)]
[Automatic update for 2016-12-18]
Update manuf, services enterprise-numbers, translations, and other items.
Change-Id: I3c720c31d7ddfbef001bda47eca49ab4804e8e74
Reviewed-on: https://code.wireshark.org/review/19332
Reviewed-by: Gerald Combs <gerald@wireshark.org>
AdrianSimionov [Sun, 18 Dec 2016 02:00:17 +0000 (13:00 +1100)]
[docsis->type2ucd] Fix issue with decoding
Burst 4 and Burst 5 values are now properly decoded.
Change-Id: I6232a19eb849a419825be69435069e4be721cbc1
Reviewed-on: https://code.wireshark.org/review/19327
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Jiri Novak [Fri, 16 Dec 2016 10:49:56 +0000 (11:49 +0100)]
SIP/SDP, RTP: Dissectors shows information about ED-137 related states of radio in info column/VoIP call flow
Based on EUROCAE ED-137B specification:
ED-137B, Part 1: RADIO, INTEROPERABILITY STANDARDS FOR VOIP ATM COMPONENTS
https://boutique.eurocae.net/eshop/catalog/index.php
Bug: 13252
Change-Id: Ifab1aaf47e3405fcd46309167237f11ce2d7e2ff
Reviewed-on: https://code.wireshark.org/review/19302
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, 17 Dec 2016 21:34:29 +0000 (22:34 +0100)]
S1AP: use unit strings
Change-Id: I53a639b210592b36fc3f5aaf45db3932a469b49f
Reviewed-on: https://code.wireshark.org/review/19321
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Jiri Novak [Wed, 14 Dec 2016 21:55:05 +0000 (22:55 +0100)]
RTP: RTP dissector is able to decode RTP over TCP (RFC 4571)
Bug: 13251
Change-Id: I56a01e779f7f0eadc8a078f88543269a91148f00
Reviewed-on: https://code.wireshark.org/review/19293
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, 17 Dec 2016 21:49:29 +0000 (22:49 +0100)]
X2AP: use unit strings
Change-Id: Icac054fda0b1e1b8d79c33fc967345a7497e812b
Reviewed-on: https://code.wireshark.org/review/19322
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Pascal Quantin [Sat, 17 Dec 2016 21:51:43 +0000 (22:51 +0100)]
M2AP: use unit strings
Change-Id: Id9aa6a48faaf749a439f0f61b5ad8d2920c56ac7
Reviewed-on: https://code.wireshark.org/review/19323
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Pascal Quantin [Sat, 17 Dec 2016 21:55:59 +0000 (22:55 +0100)]
M3AP: use unit strings
Change-Id: I433b6357914063ba7dbbe119771770e98e019091
Reviewed-on: https://code.wireshark.org/review/19324
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.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>
Pascal Quantin [Sat, 17 Dec 2016 20:40:49 +0000 (21:40 +0100)]
LTE RRC: use unit strings
Change-Id: Ib18301246f051f1362ba93621c533044a118189f
Reviewed-on: https://code.wireshark.org/review/19320
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>
Dmitry Lazurkin [Sat, 10 Dec 2016 13:45:10 +0000 (16:45 +0300)]
kafka: add expert info about unsupported api key and version
Change-Id: I622e6f06529377e089cbeeb83d926135f983d3f3
Reviewed-on: https://code.wireshark.org/review/19194
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>
Pascal Quantin [Sat, 17 Dec 2016 22:23:32 +0000 (23:23 +0100)]
NBIFOM: upgrade dissector to v13.3.0
Change-Id: I95166c355bccc74705812f495066b55eedccedb0
Reviewed-on: https://code.wireshark.org/review/19326
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Pascal Quantin [Sat, 17 Dec 2016 14:53:40 +0000 (15:53 +0100)]
LPP: use unit strings
Change-Id: Ic7767b9b47e200b0b0cae70e9781b417cf7d2a3b
Reviewed-on: https://code.wireshark.org/review/19315
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 [Sat, 17 Dec 2016 13:06:33 +0000 (14:06 +0100)]
ULP: follow-up of gda5cad4
Uniformize unit display
Change-Id: Ie89ad77be81232692ee7f4f220157d2d0cab21ea
Reviewed-on: https://code.wireshark.org/review/19314
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, 30 Dec 2015 20:31:10 +0000 (21:31 +0100)]
bootp: Update DHCP Message Type 53 Values
Add RFC6926 and RFC7724
Change-Id: I2e10c337f3fe3043e5c36f501eb3e29b16bfcecc
Reviewed-on: https://code.wireshark.org/review/19312
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 [Sat, 17 Dec 2016 09:34:16 +0000 (10:34 +0100)]
bootp: fix indent (use tabs)
Change-Id: I0c16bf29631e9376b9f3b701627bd5f8fb133397
Reviewed-on: https://code.wireshark.org/review/19311
Reviewed-by: Michael Mann <mmann78@netscape.net>
João Valverde [Sat, 17 Dec 2016 07:23:31 +0000 (07:23 +0000)]
IPsec: Revert g232cb9a2dd
Change-Id: I9e353215c17c9a868b1cbbcd18a5707e023d86bb
Reviewed-on: https://code.wireshark.org/review/19310
Reviewed-by: João Valverde <j@v6e.pt>
Pascal Quantin [Fri, 16 Dec 2016 22:33:49 +0000 (23:33 +0100)]
ULP: use unit strings
Change-Id: Id6cca5fa5b7547a43488e0bd83bb150ef008f48e
Reviewed-on: https://code.wireshark.org/review/19309
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>
João Valverde [Fri, 16 Dec 2016 20:35:13 +0000 (20:35 +0000)]
Improve some unit strings with unicode characters
Change-Id: Ic6812fd266832743962e020cfc8f0af2d4742fdf
Reviewed-on: https://code.wireshark.org/review/19308
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: João Valverde <j@v6e.pt>
João Valverde [Fri, 16 Dec 2016 19:57:54 +0000 (19:57 +0000)]
IPv6: Fix IPv6 fragment header offset unit display
Fragment offset unit is 8-octet, not bytes.
Reverts regression introduced in
232cb9a2dd87ea9cc9c88d4c32bfb7b452705130.
Change-Id: Id015209b45e15cd630f42ed2c3bbf342094b8ba6
Reviewed-on: https://code.wireshark.org/review/19307
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>
Guy Harris [Fri, 16 Dec 2016 19:13:02 +0000 (11:13 -0800)]
Sort opttype_vals by the option value.
Otherwise, we get complaints when generating the value_string_ext from
it.
Change-Id: I2b4fc4c57b1f0c47706fe73187192c155593da84
Reviewed-on: https://code.wireshark.org/review/19306
Reviewed-by: Guy Harris <guy@alum.mit.edu>
João Valverde [Fri, 16 Dec 2016 01:42:16 +0000 (01:42 +0000)]
6LoWPAN: Make UDP NHC port endianness code cleaner
Change-Id: I7abb29a8368a91d113038bc878aaf47ed58360bb
Reviewed-on: https://code.wireshark.org/review/19298
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>
João Valverde [Thu, 15 Dec 2016 23:48:25 +0000 (23:48 +0000)]
6LoWPAN: Display UDP NHC port encoding field as 2-bit
Reference: RFC 6282 Section 4.3.3
Change-Id: I8ff46452d80b1aba4545967bc05310c341f6e174
Reviewed-on: https://code.wireshark.org/review/19297
Reviewed-by: João Valverde <j@v6e.pt>
Michael Mann [Fri, 16 Dec 2016 14:35:01 +0000 (09:35 -0500)]
Rename packet-range.[ch] to packet_range.[ch]
The check*.pl scripts presume that files with the prefix "packet-"
are dissector files and therefore have different rules than other
files. Rather than trying to clarify that more with additional
directory information, just make any non-dissector file with
"packet-" filename prefix conform if it fails a "dissector specific"
check from the scripts.
Change-Id: I7cb52e1fad4ea62320492bb690904260f958aeb4
Reviewed-on: https://code.wireshark.org/review/19304
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Harald Welte [Fri, 2 Dec 2016 21:29:36 +0000 (22:29 +0100)]
Add GSMTAP logging sub-dissector
Applications can also use GSMTAP framing to convey log messages
which would traditionally be printed on stderr or on log files. This
allows the ordered/interspersed display of protocol messages with log
lines from the applications that send or received those messages.
The osmocom logging framework (part of libosmocore) implements this in
libosmocore.git Change-Id I9a7e72b8c9c6f6f2d76d1ea2332dcdee12394625
Change-Id: I0de723445e5b5ce0199a4081808111240a9ed047
Reviewed-on: https://code.wireshark.org/review/19183
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>
Yasuyuki Tanaka [Sun, 11 Dec 2016 14:35:30 +0000 (15:35 +0100)]
6LoWPAN: bugfix in extracting in-line UDP checksum of IPHC
Bug: 13233
Change-Id: Ie697d5a2d8a604bf3348f690d78ada4f9f0b1b89
Reviewed-on: https://code.wireshark.org/review/19208
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>
João Valverde [Fri, 25 Nov 2016 09:41:37 +0000 (09:41 +0000)]
autotools: Add tag glob pattern for distribution VCS version
Avoid leaking private tags and prefer vX.X.X over wireshark-X.X.X.
Ping-Bug: 12901
Change-Id: I7a4e2de283b87047e435a0b0abe72bc18819a985
Reviewed-on: https://code.wireshark.org/review/18951
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>
AndersBroman [Fri, 16 Dec 2016 14:13:31 +0000 (15:13 +0100)]
[S1AP] Handle the case where the TransparentContainer is empty.
Change-Id: I6b2333c32119149b32beacc660b48970e0ddbae6
Reviewed-on: https://code.wireshark.org/review/19303
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>
D. Ulis [Wed, 14 Dec 2016 15:40:44 +0000 (10:40 -0500)]
CIP: Always handle extra data
1. Generically handle/display all unparsed data. Any unparsed data can be found with cip.data
2. This now shows at least some unparsed data that was not previously displayed. Previously, extra data sent with Get Attribute List requests was not displayed. It was difficult to tell why devices were returning errors, without knowing there was extra data.
3. Make most functions return the number of bytes processed to support the above points.
Change-Id: I290c09d76e74c18facaef99c8903e7937fbdd710
Reviewed-on: https://code.wireshark.org/review/19263
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Eliot Lear [Thu, 15 Dec 2016 15:21:06 +0000 (10:21 -0500)]
[BOOTP/DHCPv6] Add new manufacturer usage description (MUD) DHCP option, which presents a URL.
Change-Id: I152a388db2f3b8c035c80bd06dfbb9a18f10c031
Reviewed-on: https://code.wireshark.org/review/19284
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Jiri Novak [Thu, 15 Dec 2016 22:15:51 +0000 (23:15 +0100)]
packet-rtp.c: Fix of variable names to test
Variables are removed
Change-Id: I54bb00a74255625c7ce487cfd31794fcdb9fa979
Reviewed-on: https://code.wireshark.org/review/19295
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Stig Bjørlykke [Fri, 16 Dec 2016 07:54:56 +0000 (08:54 +0100)]
Fix typo in unit_name_string units_decibels name.
Change-Id: Ib17ca3a613648667d0f99fa7412d074a205840a9
Reviewed-on: https://code.wireshark.org/review/19300
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>
Michael Mann [Thu, 15 Dec 2016 18:01:27 +0000 (13:01 -0500)]
Remove proto_item_append_text calls in favor of BASE_UNIT_STRING.
Many proto_item_append_text calls were just adding a unit string to a field.
There's a better way to do that now.
Change-Id: Id18d5ac1ea4d8ecdc4cbe7ebaec07fbd2eab6e78
Reviewed-on: https://code.wireshark.org/review/19289
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Michael Mann [Wed, 14 Dec 2016 22:34:56 +0000 (17:34 -0500)]
Adjust proto_tree_add_xxx_format_value calls to use unit string
proto_tree_add_uint_format_value had the most use of unit strings, this
patch handles all of the other proto_tree_add_xxx_format_value calls that
could be better served using BASE_UNIT_STRING with a "unit string" in hf_ field.
Added more "common" unit string values to unit_strings.[ch]
Change-Id: I0fb680be781e10037eb7bd40dd21a9ee20c1fb1c
Reviewed-on: https://code.wireshark.org/review/19288
Reviewed-by: Michael Mann <mmann78@netscape.net>
Guy Harris [Fri, 16 Dec 2016 01:48:59 +0000 (17:48 -0800)]
Add symlinks to Wireshark binaries in Resources/bin, and point there.
That way, $PATH points to .../Wireshark.app/Contents/Resources/bin, so
the man command will look in
.../Wireshark.app/Contents/Resources/share/man.
This also may obviate the need to install the wrapper scripts in
/usr/local/bin, although those scripts obviate the need to re-set PATH
after installing Wireshark.
Change-Id: I7202b5a0fe5d2b90c956dc0db2af073f6c08b00d
Reviewed-on: https://code.wireshark.org/review/19296
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Graham Bloice [Thu, 15 Dec 2016 19:54:01 +0000 (19:54 +0000)]
Fix release-notes.html generation
The ASCIIDOC_CONF_FILES setting for asciidoc was only generated
if any of the guides were being built.
Clean up a dup setting and some and blank lines in FindASCIIDOC
Change-Id: Ie8ab97db09e18cdb8d7e2a7bd4dcf8c288dd036f
Reviewed-on: https://code.wireshark.org/review/19291
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Gerald Combs [Thu, 15 Dec 2016 19:42:50 +0000 (11:42 -0800)]
Update tools/commit-msg.
Update tools/commit-msg to version 2.12.7 by running
curl -Lo tools/commit-msg https://code.wireshark.org/review/tools/hooks/commit-msg
Change-Id: Ie70a8e869968b5237c9e21c0624f1f8af696d83b
Reviewed-on: https://code.wireshark.org/review/19290
Reviewed-by: Gerald Combs <gerald@wireshark.org>
João Valverde [Thu, 15 Dec 2016 18:15:09 +0000 (18:15 +0000)]
UDP: Add missing space to string
Change-Id: I0b5a60d426b2d06441323d74aa973e1b700d4f03
Reviewed-on: https://code.wireshark.org/review/19286
Reviewed-by: João Valverde <j@v6e.pt>
Gerald Combs [Thu, 15 Dec 2016 17:32:53 +0000 (09:32 -0800)]
Update the release notes.
Change-Id: Id26548a1c262a91e4fe0a4c44dcb578b5b4e5c11
Reviewed-on: https://code.wireshark.org/review/19285
Reviewed-by: Gerald Combs <gerald@wireshark.org>
AndersBroman [Thu, 15 Dec 2016 13:49:31 +0000 (14:49 +0100)]
[GTPv2] Fix dissection of MM Context fpr EPS
Change-Id: I1ee7f4caa23834ac8bcbd56731c116a785b67d6b
Reviewed-on: https://code.wireshark.org/review/19283
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>
Dario Lombardo [Tue, 13 Dec 2016 11:40:47 +0000 (12:40 +0100)]
packet.c: add initializer.
As per glib manual, GSLists need to be NULL initialized.
Change-Id: If78904b900f6ddd7a0afaf3a1c480ec7626f2027
Reviewed-on: https://code.wireshark.org/review/19281
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Guy Harris [Thu, 15 Dec 2016 08:29:38 +0000 (00:29 -0800)]
Make some items that don't need to be size_t guint.
Those sizes are limited by the packet sizes we support, and we only
support a maximum packet size of 2^32.
This squelches some compiler warnings.
Remove some casts that this renders unnecessary.
Change-Id: Id9a7bcf8c2ce30bbed7be6c0e28deb9cf38002e0
Reviewed-on: https://code.wireshark.org/review/19279
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Nora Sandler [Fri, 9 Dec 2016 00:54:37 +0000 (16:54 -0800)]
Improved parsing of sniffed homeplug-av data
This patch modifies the homeplug-av dissector to better decode sniffer data according to the IEEE 1901-2010 standard.
The dissector now decodes MPDU variant fields correctly based on delimiter type, and decodes beacon MPDU payloads.
There are some variable-length fields it doesn't handle yet.
This patch should have no effect on how non-sniffer-data packets are decoded.
These changes are based on Andrew Margolis' pull request to faifa at https://github.com/ffainelli/faifa/pull/11
Change-Id: Ia60ac7affa99a68b38f04ab66373ac715c761328
Reviewed-on: https://code.wireshark.org/review/19156
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>
Alexis La Goutte [Tue, 13 Dec 2016 20:02:21 +0000 (21:02 +0100)]
802.11(ad): fix wrong dissection of Grant Frame
See 8.4a.2 from 802.11ad-2012(.pdf)
Issue reported by Hany ASSASA
Ping-Bug: 13244
Change-Id: I6e22de3009b722e61b30ce2dd93596c4f51bb2fe
Reviewed-on: https://code.wireshark.org/review/19243
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>
Роман Донченко [Wed, 14 Dec 2016 20:55:31 +0000 (23:55 +0300)]
pkixtsp: add support for dissecting CMS signature time-stamps
As per RFC 3161 Appendix A. The ASN.1 elements it defines are not
officially part of any module, so just stick them into PKIXTSP.
Change-Id: I728505cb305b924465b62eb442288edea7f916a7
Reviewed-on: https://code.wireshark.org/review/19272
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>
chinarulezzz [Wed, 14 Dec 2016 16:43:07 +0000 (18:43 +0200)]
packet-tns.c: Oracle 12c packet length fix.
In some messages (observed in Oracle 12c) packet length has 4 bytes
instead of 2.
Tested with oracle12-example.pcapng from SampleCaptures wiki.
Also small datatype fix.
Change-Id: I35490ade8cf0dee6392f4fa1b51d8dc7cff85400
Reviewed-on: https://code.wireshark.org/review/19264
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>
Jiri Novak [Wed, 14 Dec 2016 18:37:04 +0000 (19:37 +0100)]
VoIP Calls/Flow Sequence: Fix of showing nodes from previous call
When VoIP Calls/Flow Sequence generates list of nodes to show (nodes above flow), it do not clear the list from last call. As consequence of it, when second call is between hosts than first call, you see nodes which are not involved in call.
Change-Id: I80f9acb09e6aa71b3a32bb6eacaeb5b4bb13b332
Reviewed-on: https://code.wireshark.org/review/19267
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>
Jiri Novak [Tue, 13 Dec 2016 12:28:30 +0000 (13:28 +0100)]
Save RTP audio to file: RTP Stream Analysis dialog allows save audio for non G.711 codecs and mixed codecs
- spaghetti code for save was split into separate functions
- code saves G.711 only, all other codecs are saved as silence with correct duration
- code is ready to include other codecs
- code supports 8000 Hz sampling rate only, other rates are rejected with warning
- bidirectional stream (forward and reverse) creates stereo .au file
- output is based on timestamps in RTP streams
- save operation is slower than before because it is set of seek() - one per each codec sample
- code allows align of save audio:
- as it is - each stream is saved from its beginning, no aling
- to start of each other - later stream is prepended with silence
- align saved audio to beginning of capture file - each stream is prepended with silence
- save to raw works correctly now - only payload is saved
- old code was inserting G.711 silence time to time to raw data
Bug: 13242
Change-Id: I74d02a1cc1c75acf9ffe930d078c00a0555cbfb6
Reviewed-on: https://code.wireshark.org/review/19245
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>
Guy Harris [Wed, 14 Dec 2016 23:02:33 +0000 (15:02 -0800)]
Just use strncmp() to check the prefix of the file's first line.
Bug: 13246
Change-Id: I9df35596aa8dcb937f6a03cf60b5d0fbe9dce1ec
Reviewed-on: https://code.wireshark.org/review/19276
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Guy Harris [Wed, 14 Dec 2016 22:42:54 +0000 (14:42 -0800)]
Don't assume we've read a line long enough to contain a magic number.
Check the length of the line first.
Bug: 13246
Change-Id: I906bb652594898061afb4b2cd4edb916af354161
Reviewed-on: https://code.wireshark.org/review/19273
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Stig Bjørlykke [Wed, 14 Dec 2016 19:27:54 +0000 (20:27 +0100)]
nordic_ble: Add legacy version support
Added back legacy version (<= 0.9.7) support after restructuring
for dissector completeness.
Change-Id: I5355bf8faa1b9fd8ee9056254048fe5c314b6efb
Reviewed-on: https://code.wireshark.org/review/19271
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>
Michal Labedzki [Sun, 3 Nov 2013 17:57:17 +0000 (18:57 +0100)]
Bluetooth profile: configure columns and layout for Bluetooth
Change-Id: Iab8e33b5a7b62eea9c1365e0e5fec84f0ccd23fe
Reviewed-on: https://code.wireshark.org/review/17080
Petri-Dish: Michal Labedzki <michal.tomasz.labedzki@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Роман Донченко [Wed, 14 Dec 2016 18:35:00 +0000 (21:35 +0300)]
cms: remove trivial differences between the ASN.1 code and RFC 5652
This clears up the diff between the local copy of the CMS module and
upstream, making it easier to determine what modifications were made.
Change-Id: I466cb97e6505ea8075d01663e1ede95b85468898
Reviewed-on: https://code.wireshark.org/review/19269
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Dario Lombardo [Fri, 9 Dec 2016 10:44:11 +0000 (11:44 +0100)]
extcap: add info to extcap manpage (taken from README.extcap).
Ping-Bug: 13218
Change-Id: Ib43dc2ce8ae7991468b866aec3f03f6a5709f8b2
Reviewed-on: https://code.wireshark.org/review/19177
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Stig Bjørlykke [Wed, 14 Dec 2016 12:43:27 +0000 (13:43 +0100)]
extcap: Avoid double free of help.
Avoid double free of help when having multiple extcap interfaces.
Ping-Bug: 13218
Change-Id: I6a0d6afd645787f9814c02e84079b4e8763d05f1
Reviewed-on: https://code.wireshark.org/review/19261
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Stig Bjørlykke [Wed, 14 Dec 2016 09:17:42 +0000 (10:17 +0100)]
nordic_ble: Improved dissector code
- Added header fields in a new subtree.
- Restructured to use fewer functions and to use offset
counting instead of offset defines.
- Removed support for legacy version 0.9.7.
- Removed unused code.
Change-Id: I9eb6c8b3b450ddb95fb0f4bdd9f9717dafa687b0
Reviewed-on: https://code.wireshark.org/review/19260
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 [Tue, 13 Dec 2016 18:28:29 +0000 (19:28 +0100)]
Skip loading the Nordic BLE Sniffer dll on WIN32
The dissector for the Nordic BLE Sniffer was added as internal in
g7844a118, so ensure we don’t load this third party dll on WIN32.
Change-Id: I74c200d42793f3c1e764bc9f6c3a9a795d38a5a7
Reviewed-on: https://code.wireshark.org/review/19259
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>
Dario Lombardo [Thu, 8 Dec 2016 16:56:22 +0000 (17:56 +0100)]
extcap: set help for interfaces.
The help statement is in the first sentence, while interfaces are
in others. We need to keep state of it.
Ping-Bug: 13218
Change-Id: Iad1d403d5e8bc34e2489daaa3b14d469d5ee5b5b
Reviewed-on: https://code.wireshark.org/review/19148
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
Dario Lombardo [Mon, 5 Dec 2016 11:33:02 +0000 (12:33 +0100)]
README.extcap: impagination improvement.
Change-Id: I1cc0dc6496bea8e42c199dff116530ccec6fb591
Reviewed-on: https://code.wireshark.org/review/19089
Reviewed-by: Roland Knall <rknall@gmail.com>
Jiri Novak [Mon, 12 Dec 2016 20:13:34 +0000 (21:13 +0100)]
RTP Stream Analysis: save Audio allows any filename extension
Format of file selected by user is derived from save dialog format selection, not from filename as before.
Bug: 13240
Change-Id: Id6e159d97e4f26c25b3d2d98d43041d8617cc737
Reviewed-on: https://code.wireshark.org/review/19240
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>
Jiri Novak [Mon, 12 Dec 2016 19:57:40 +0000 (20:57 +0100)]
RTP Stream Analysis dialog: dialog shows when forward/reverse stream starts
Dialog shows time (relative to capture start) and packet number when forward and reverse stream starts. It shows difference in such values on bottom of dialog too.
Bug: 13239
Change-Id: If807b8a56723df17ed131b1aac053cf8f985bb7b
Reviewed-on: https://code.wireshark.org/review/19239
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>
Michael Mann [Wed, 14 Dec 2016 02:06:49 +0000 (21:06 -0500)]
Remove add_item_text
It's a manual attempt at what proto_tree_add_bitmask can do anyway.
Change-Id: If551e8afa346a33b8e15dc441aae75ba0752ab46
Reviewed-on: https://code.wireshark.org/review/19257
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 [Wed, 14 Dec 2016 00:40:45 +0000 (19:40 -0500)]
packet-lsc.c: Use proto_tree_add_item instead of manually fetching field values.
Change-Id: I60740615de02bc5047eaca618973064513ac7b56
Reviewed-on: https://code.wireshark.org/review/19256
Reviewed-by: Michael Mann <mmann78@netscape.net>
Michael Mann [Wed, 14 Dec 2016 00:28:32 +0000 (19:28 -0500)]
packet-kerberos4.c: Use encodings instead of boolean little vs big endian.
Also use proto_tree_add_item_ret_length for string handling.
Change-Id: Id1eae2e51460a3b7f4c3385b9b1fd7f12398a227
Reviewed-on: https://code.wireshark.org/review/19255
Reviewed-by: Michael Mann <mmann78@netscape.net>
Michael Mann [Wed, 14 Dec 2016 00:08:40 +0000 (19:08 -0500)]
packet-nbt.c: General cleanup
1. Remove functionality that was replaced by a proto_tree_add_bitmask
2. Remove use of nbdgm_header structure which is just a useless placeholder
3. Remove some if (tree) over single fields.
Change-Id: I0879043685686eb5b861cf77ec38bbf25ed6044e
Reviewed-on: https://code.wireshark.org/review/19254
Reviewed-by: Michael Mann <mmann78@netscape.net>
Michael Mann [Tue, 13 Dec 2016 23:11:02 +0000 (18:11 -0500)]
file-jpeg.c - Pacify pre-commit hooks by removing macro
IMG_JFIF was trying to be a macro for all display and expert info filters.
This messed with the pre-commit scripts ability to ensure protocol
filter name was being used as the prefix for display and expert info
filters. So replaced IMG_JFIF with the proper prefix - "image-jfif"
Change-Id: I1fe3dc8797529c9d17f75c511bc279824e7e69b0
Reviewed-on: https://code.wireshark.org/review/19253
Reviewed-by: Michael Mann <mmann78@netscape.net>
Dario Lombardo [Tue, 13 Dec 2016 11:27:04 +0000 (12:27 +0100)]
cmake: add semicolon to file list.
The file list contains semicolon-separated list of files to check.
When merging the lists we need to separate them properly.
Error:
No such file: "packet-ncp2222.cpacket-coseventcomm.c" at wireshark/tools/checkAPIs.pl line 2050.
Change-Id: I19702ab85408caf69ed922732fce74c3058be640
Reviewed-on: https://code.wireshark.org/review/19237
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>
Michael Mann [Tue, 13 Dec 2016 19:26:27 +0000 (14:26 -0500)]
Adjust proto_tree_add_uint_format_value calls to use unit string
Several calls to proto_tree_add_uint_format_value could be better served
using BASE_UNIT_STRING with a "unit string" in hf_ field. There also
a few cases where proto_tree_add_uint_format_value could just be
proto_tree_add_uint.
Added a few more "common" unit string values to unit_strings.[ch]
Change-Id: Iaedff82c515269c9c31ab9100dff19f5563c932d
Reviewed-on: https://code.wireshark.org/review/19242
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Michael Mann [Mon, 12 Dec 2016 18:22:05 +0000 (13:22 -0500)]
Adjust proto_tree_add_[float|double]_format_value calls to use unit string
Several calls to proto_tree_add_[float|double]_xxx could be better served
using BASE_UNIT_STRING with a "unit string" in hf_ field.
Added a few more "common" unit string values to unit_strings.[ch]
Change-Id: Id0da7b579403898d20c2667d6c4abcd59d5a48d4
Reviewed-on: https://code.wireshark.org/review/19241
Reviewed-by: Michael Mann <mmann78@netscape.net>
Gerald Combs [Mon, 12 Dec 2016 19:34:03 +0000 (11:34 -0800)]
Qt: Optionally restore our selected packet when thawing.
Stash the current row when we freeze the packet list. Make it possible
to restore it when thawing. Do so when the layout changes and when we
move a column.
Change-Id: I44cfb8bafcd4d49a46e1c89bf47aecf5ac139773
Reviewed-on: https://code.wireshark.org/review/19222
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Pascal Quantin [Tue, 13 Dec 2016 21:15:28 +0000 (22:15 +0100)]
win-setup.ps1: add missing zlib-1.2.8-ws folder
Change-Id: Ie32a231146365c11fe80e9e4f414ef7c464a8249
Reviewed-on: https://code.wireshark.org/review/19247
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Alexis La Goutte [Tue, 13 Dec 2016 10:39:16 +0000 (11:39 +0100)]
imf: fix no newline at end of file [-Wnewline-eof]
Change-Id: Ibddfbb049fdf8510ffc14fbadba7484300821888
Reviewed-on: https://code.wireshark.org/review/19236
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>
Jiri Novak [Mon, 12 Dec 2016 19:30:29 +0000 (20:30 +0100)]
rtp_analysis_dialog.cpp: RTP Stream Analysis dialog shows same SSRC for forward and reverse stream
Same SSRC is shown because of typo in variable name for reverse stream.
Bug: 13236
Change-Id: Idcba4d83c7b4358cd8ebf1ee5c5b5bde2fc2e48b
Reviewed-on: https://code.wireshark.org/review/19238
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Michael Mann [Mon, 12 Dec 2016 00:16:52 +0000 (19:16 -0500)]
Add support for adding unit names to hf_ fields.
This was inspired by the https://www.wireshark.org/lists/wireshark-dev/201505/msg00029.html thread.
Used TCP and NTP dissectors as the guinea pig with sample use.
Documentation updates includes some unrelated cleanup just because it was noticed.
Change-Id: I59b26e1ca3b95e3473e4757f1759d7ad82976965
Reviewed-on: https://code.wireshark.org/review/19211
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>
AndersBroman [Tue, 13 Dec 2016 08:52:31 +0000 (09:52 +0100)]
[RTP Analysis] calculate BW correctly whem IPv6 is used.
Change-Id: Ia53efa57042d199673a77c59491215c0e99c9e84
Reviewed-on: https://code.wireshark.org/review/19235
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Stig Bjørlykke [Sun, 11 Dec 2016 13:18:55 +0000 (14:18 +0100)]
bthci_acl: Set src/dst addresses before reassembly.
Set all addresses before we do reassembly because sub-dissectors may set
their own addresses, and we don't want to override them again.
This fixes "Follow TCP Stream" and shows the correct IP addresses in the
Source and Destination columns when transporting IP packets.
Allocate the addresses in pinfo pool to avoid possible stack buffer overflow.
Bug: 13230
Change-Id: I3b81ccb02b38331add4773d9bb3d5e0f6dcf025e
Reviewed-on: https://code.wireshark.org/review/19201
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Роман Донченко [Thu, 8 Dec 2016 21:19:25 +0000 (00:19 +0300)]
ssh: add dissection for Elliptic Curve Diffie-Hellman KEX
The protocol is actually nearly identical to ordinary Diffie-Hellman,
but the names are different, and the ephemeral keys are bytestrings
rather than integers.
Change-Id: I261b6426137dae12fe53686e74517080abd80bb3
Reviewed-on: https://code.wireshark.org/review/19210
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>
Arjen Zonneveld [Fri, 2 Dec 2016 12:20:18 +0000 (13:20 +0100)]
Add BGP dissector support for draft-ietf-idr-shutdown-01
Parse the communication bits of a BGP Cease NOTIFICATION:
Border Gateway Protocol - NOTIFICATION Message
Marker:
ffffffffffffffffffffffffffffffff
Length: 146
Type: NOTIFICATION Message (3)
Major error Code: Cease (6)
Minor error Code (Cease): Administratively Shutdown (2)
BGP Shutdown Communication Length: 124
Shutdown Communication: NTT will perform maintenance on this router. This is tracked in TICKET-1-
24824294. Contact noc@ntt.net for more information.
Draft at https://tools.ietf.org/html/draft-ietf-idr-shutdown-01, sample
file taken from from http://instituut.net/~job/shutdown.pcap
Change-Id: I2ab633883cc69e560ff79cb6239e02fcffd71e10
Reviewed-on: https://code.wireshark.org/review/19144
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>
Jakub Pawlowski [Tue, 13 Dec 2016 03:27:58 +0000 (19:27 -0800)]
Bluetooth: BTLE: Add new commands parsing
Add "LE Set Extended Advertising Parameters" and
"LE Set Extended Advertising Parameters" commands parsing.
Change-Id: Ibcc9f145694e54710da3a11ade237f7132674366
Reviewed-on: https://code.wireshark.org/review/19234
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Pascal Quantin [Mon, 12 Dec 2016 20:42:14 +0000 (21:42 +0100)]
Build TRANSUM plugin
Add plugin to autofoo and CMake build systems and fix errors found
Add plugin to Windows installer (optional component activated by default)
Change-Id: Id1b777bdee04e53076b3291f6fb68d5abad6985d
Reviewed-on: https://code.wireshark.org/review/19228
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>
David Barrera [Mon, 12 Dec 2016 10:06:42 +0000 (11:06 +0100)]
Change spaces to tab for recent wka entries
Commit
66549a9cacb29abdbb2c6fdaaf8235c4f34f6a13 added 3 new entries to
wka.tmpl, but used spaces instead of the default tab separator. This
inconsistency causes external tools that expect tabs in the manuf file
to behave unexpectedly.
The manuf file was re-generated after the fix to wka.tmpl.
Change-Id: I79bceac649e0fc29b3502fc2e074dcd513f29ff5
Reviewed-on: https://code.wireshark.org/review/19217
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Jakub Pawlowski [Tue, 13 Dec 2016 01:56:32 +0000 (17:56 -0800)]
Bluetooth: BTLE: Add BT5.0 command and event name parsing
Change-Id: I830551959965896451ddc08f3e843b61f22eed67
Reviewed-on: https://code.wireshark.org/review/19233
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Parav Pandit [Sat, 10 Dec 2016 08:00:09 +0000 (03:00 -0500)]
packet-infiniband: Update conversation src port for exact lookup
Dissectors above infiniband (such as RPC dissector)
performs exact lookup on saddr, daddr, sport, dport. They are unaware
that underlying transport is infiniband which doesn't have src_qp in
packets. Due to which srcport remains uninitialized and exact lookup
fails.
In order to get them work seemlessly, this fix updates the sport
to src_qp (similar to destport to dest_qp). With this upper level
dissectors can perform direct lookup similar to TCP. Those which need to
access private data of unidirectional CM messages, can still continue to
perform unidirectional lookup as before.
It also fixes the issue where req_qp and resp_qp were swapped during
bidirectional conversation creation. This was caught during testing with
packet-rpc.c by Chuck Lever.
Tested protocols:
1. nfs-rdma over Infiniband with trace of Bug 13213
2. ICMP packets over Infiniband
3. NVMe fabrics over RDMA
Tested with trace of Bug 13201 for Nvme.
Bug: 13202
Bug: 13213
Change-Id: Ica1b6aae3ccaa6642dc3b3edfa9a5a4c335cc5da
Tested-by: paravpandit@yahoo.com
Reviewed-on: https://code.wireshark.org/review/19190
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Chuck Lever <chuck.lever@oracle.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Gerald Combs [Thu, 8 Dec 2016 17:41:47 +0000 (09:41 -0800)]
Update to WinSparkle 0.5.3.
Update our WinSparkle package to 0.5.3. This fixes a file deletion bug.
Note that WinSparkle now supports application shutdown callbacks, which
should let us fix bugs 9687 and 12989.
Bug: 13217
Change-Id: I4b5f325c6dc251ce167f7bd344bbf3ca5ad3fe14
Reviewed-on: https://code.wireshark.org/review/19230
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Gerald Combs [Mon, 12 Dec 2016 22:03:25 +0000 (14:03 -0800)]
Remove some GtkCList comments and code.
Remove some comments and hopefully-no-longer-necessary code specific to
GtkCList.
Change-Id: Ib62387f87e662798afba282cf95cbd215d60075e
Reviewed-on: https://code.wireshark.org/review/19227
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Jiri Novak [Mon, 12 Dec 2016 12:26:53 +0000 (13:26 +0100)]
rtp_player_dialog.cpp: fix usage of unsupported method QComboBox::setCurrentText with Qt4.x
QComboBox::setCurrentText() method is available in Qt5.x.
Older versions code won't compile with it.
Bug: 13235
Change-Id: Ia2e2713fefe0f2be01a0b77ff1ac39c9162fd0d1
Reviewed-on: https://code.wireshark.org/review/19219
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Guy Harris [Mon, 12 Dec 2016 21:12:26 +0000 (13:12 -0800)]
Move the declaration of packet_list_select_last_row() to ui/gtk/packet_list.h.
It's GTK+-only, so it shouldn't be in ui/ui_util.h. Get rid of the
unused Qt packet list implementation of it.
Change-Id: Ia9f8fe2209939dff5244e6948c36f29509340f68
Reviewed-on: https://code.wireshark.org/review/19226
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Guy Harris [Mon, 12 Dec 2016 20:57:12 +0000 (12:57 -0800)]
Get rid of some GTK+-only routines in file.c.
Just directly call the packet_list_select_ routine from the GTK+ code.
Change-Id: I9146fb968c407d6186b146a86aa34678765f7352
Reviewed-on: https://code.wireshark.org/review/19225
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Gerald Combs [Mon, 12 Dec 2016 20:34:26 +0000 (12:34 -0800)]
Mark routines GTK+ only.
Mark packet_list_select_last_row and cf_goto_bottom_frame GTK+ only.
Change-Id: I158814c2fa8c5fa8021b7156dded0945535c978a
Reviewed-on: https://code.wireshark.org/review/19223
Reviewed-by: Gerald Combs <gerald@wireshark.org>
D. Ulis [Sun, 11 Dec 2016 23:52:26 +0000 (18:52 -0500)]
Do not set Qt Window focus when highlighting rows
Bug: 11890
Change-Id: I372f096c1ac0e483bf49cf95831e3df43621a642
Reviewed-on: https://code.wireshark.org/review/19209
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
AndersBroman [Mon, 12 Dec 2016 13:21:03 +0000 (14:21 +0100)]
[RTP] In case no conversation is found, check if we have a dissecor for
the dynamic payload type defined. If so set the dynamic
payload_type_string to that dissectors name.
This is for RTP analysis to work if there is no setup information in the
file.
Change-Id: I7ae7b957cfa9eb6013f7d32d50563e2034210af6
Reviewed-on: https://code.wireshark.org/review/19220
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>
Guy Harris [Mon, 12 Dec 2016 08:19:44 +0000 (00:19 -0800)]
Rename non-EBCDIC-specific routines.
Those routines can handle any single-byte character set whose characters
map to characters in the Basic Multilingual Plane; it could be used for
extended ASCII, but we have another routine for that, mapping only
characters with code points > 0x7f, so we just say "nonascii" rather
than "ebcdic".
Change-Id: I3d55b5d58e3e7ab08f3dfbfdb57a0301a30e71d4
Reviewed-on: https://code.wireshark.org/review/19214
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Guy Harris [Mon, 12 Dec 2016 08:06:35 +0000 (00:06 -0800)]
Update for library changes.
Change-Id: Ibe63e79a2865c53be0aafbf1b53103267a502b7a
Reviewed-on: https://code.wireshark.org/review/19213
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Guy Harris [Mon, 12 Dec 2016 05:49:14 +0000 (21:49 -0800)]
Fix handling of EBCDIC string fields.
Have a routine that takes a 256-element translation table and uses it to
map various flavors of EBCDIC to Unicode. Have separate translation
tables for "common" EBCDIC (everything that's the same in all EBCDIC
code pages that include the original EBCDIC characters) and EBCDIC code
page 037. Add ENC_EBCDIC_CP037 for code page 037.
Change-Id: Ia882b3c0abef9e30eb54cd47396e6fa0d6342044
Reviewed-on: https://code.wireshark.org/review/19212
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Роман Донченко [Sun, 11 Dec 2016 00:21:52 +0000 (03:21 +0300)]
ssh: correct inaccurate field names/abbrevs/id variable names
* kex_first_packet_follows -> first_kex_packet_follows
That's the name the spec (RFC 4253) uses.
* DH H signature -> H signature, DH host key -> host key
Neither the host key nor the H signature have much to do
with Diffie-Hellman. They're used in the same way in
every key exchange method that I know of, so their names
should be more generic.
* mpint_[ef] -> dh_[ef], mpint_[pg] -> dh_gex_[pg]
This is to make all key exchange method-specific fields follow
a consistent pattern with all names/abbrevs being prepended
by the method name.
Change-Id: Ic887fb92d8cbb6042e9b8e553cb5804db0ba4db8
Reviewed-on: https://code.wireshark.org/review/19199
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>
Alexis La Goutte [Sun, 11 Dec 2016 20:00:06 +0000 (21:00 +0100)]
smb/tftp: fix no previous prototype for ‘tftp/smb_eo_cleanup’ [-Wmissing-prototypes]
Change-Id: I22ce7c49eab9232d38ace51a39fee098786f981d
Reviewed-on: https://code.wireshark.org/review/19206
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>
Gerald Combs [Sun, 11 Dec 2016 16:12:37 +0000 (08:12 -0800)]
[Automatic update for 2016-12-11]
Update manuf, services enterprise-numbers, translations, and other items.
Change-Id: Ie1a890ea3d5cfab844bc486806303e0ea4417ec3
Reviewed-on: https://code.wireshark.org/review/19203
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Guy Harris [Sun, 11 Dec 2016 04:18:26 +0000 (20:18 -0800)]
Cleanup dissection of endpoint addresses.
All the pseudo-headers encode the endpoint as per a bEndpointAddress in
sections 9.6.6 "Endpoint" of the USB 2.0 spec and the USB 3.1 spec, with
a 4-bit endpoint number at the bottom and a 1-bit direction at the top
with 0 = OUT and 1 = IN.
Show the FreeBSD endpoint address the same way the other endpoint
addresses are shown; the FreeBSD one is shown as a 4-byte little-endian
value, but only the low-order (first) byte is used, so just show that
byte.
Call that field the "endpoint address", with the lower 4 bits being the
"endpoint number" and the uppermost bit the "endpoint direction".
Change-Id: Ic7358c7fb6b6df2502315b590eb5178cecb321d9
Reviewed-on: https://code.wireshark.org/review/19200
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Роман Донченко [Sat, 10 Dec 2016 23:40:27 +0000 (02:40 +0300)]
ssh: remove uninformative blurbs
For most of the fields, the blurb is just the name with "SSH" prepended,
which is not particularly useful. Replace a few of them with more
informative descriptions and remove the rest.
Change-Id: I15e95a42e897d09d3b6334022b32dd36f29e86a4
Reviewed-on: https://code.wireshark.org/review/19198
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Martin Mathieson [Fri, 9 Dec 2016 22:40:59 +0000 (14:40 -0800)]
Add a preference to control whether string and byte lengths appear in protocol tree
Change-Id: I6be13d9adb8871cbbf4604155e8e7175a74ddaa3
Reviewed-on: https://code.wireshark.org/review/19188
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Dmitry Lazurkin <dilaz03@gmail.com>
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
Harald Welte [Fri, 9 Dec 2016 18:21:13 +0000 (13:21 -0500)]
gsmtap: Introduce a new packet-gsmtap.h header file
Move the GSMTAP protocol related #defines to packet-gsmtap.h, as there
are other dissectors (like packet-gsm_sim.c and future dissectors) need
access to some of those #defines.
Change-Id: Ibb3517bd773be63b7e3cd30104a5351427e22ebf
Reviewed-on: https://code.wireshark.org/review/19185
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>