Commit Graph

64742 Commits

Author SHA1 Message Date
Dario Lombardo eaf6258102 dpnss: use ws_strtou function.
Change-Id: If0313f96aaca8d17c55e76dc27a643cbbbdfdcd0
Reviewed-on: https://code.wireshark.org/review/18113
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-08 01:56:08 +00:00
Dario Lombardo 6a306f26b1 wlccp: fix typo.
Change-Id: I893fdc3025119c69142c617bfcea65654c45ad8b
Reviewed-on: https://code.wireshark.org/review/18112
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-08 01:48:13 +00:00
Dario Lombardo 95e927ec93 iso8583: use ws_strtoi function.
Change-Id: Icbf98fe1754984cde137dffd98ae6e24ca34081d
Reviewed-on: https://code.wireshark.org/review/18114
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-08 01:45:46 +00:00
Dario Lombardo b15079bf1d idl2wrs: use ws_strtou function.
Change-Id: I696688088ae926e32ff6c4518c020537d8fe7597
Reviewed-on: https://code.wireshark.org/review/18115
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-08 01:41:48 +00:00
Jaap Keuter dd589f5c16 Qt: valign text in RTP Stream Analysis window.
The text on the left hand side of the RTP Stream Analtsis window is
a (HTML) table of table headers followed by table data. For some reason
the table data is center aligned in the cells of the table. This does not
line up with the text in the table header cells.

See http://imgur.com/a/QIQFd

Also the HTML document is not compliant. Closing tags are missing, for
td and html itself.

Change-Id: I1cd58e8702db12433c863757141a6b68c1e2550c
Reviewed-on: https://code.wireshark.org/review/18074
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-10-07 22:50:34 +00:00
AndersBroman 41fe95fd3e [MEGACO] Add long name for gm/rsb
Change-Id: I72efa2210f03477d7e04b2177b751b29cf827eb0
Reviewed-on: https://code.wireshark.org/review/18116
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: Pascal Quantin <pascal.quantin@gmail.com>
2016-10-07 19:37:59 +00:00
Gerald Combs 22d8142ce7 Disable ASAN when building lemon.
If ASAN is enabled, use "-fno-sanitize=all" when building lemon. This
keeps us from having to set ASAN_OPTIONS=detect_leaks=0 in the
environment in order to build Wireshark.

Change-Id: I36f6d1a4f913ecabaf188f4c2b59216c8430d81a
Reviewed-on: https://code.wireshark.org/review/18098
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-10-07 17:54:35 +00:00
Alexis La Goutte 827ae0c722 TLS: Fix typo after g989dcef3
Change-Id: I23cf7e7847aea4f48f035d567ba7d22060acb0e7
Reviewed-on: https://code.wireshark.org/review/18106
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-10-07 17:31:46 +00:00
Alexis La Goutte 830e7ffd58 TLS: Display extension type with decimal (like IANA)
Change-Id: I33820de49a43fceaacc2172068dde83eb0be5fdc
Reviewed-on: https://code.wireshark.org/review/18107
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: Jaap Keuter <jaap.keuter@xs4all.nl>
2016-10-07 17:07:28 +00:00
Roland Knall d58da8ec90 Interface View/Model: Correct column ordering
This orders the columns correctly in the sequence the developer
has intended when adding them with setColumns. Also it allows for
disabling and inverting the filtering by type, as well as query
additional roles instead of only Qt::DisplayRole from the tree model.

Change-Id: I90469e8e3f3caa50debb3c839590d42719a6fb10
Reviewed-on: https://code.wireshark.org/review/18096
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-10-07 14:31:30 +00:00
Dario Lombardo a239472f30 rtsp: use ws_strto[u|i] functions.
Change-Id: Id3fa0b4d3a99004ab74be329e13e95c47e11ab72
Reviewed-on: https://code.wireshark.org/review/18091
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-07 11:51:05 +00:00
Dario Lombardo dd5a1f6c66 soupbintcp: use ws_strto[u|i] functions.
Change-Id: I2bf33798843c8768f4d980a065bd2d13e9d32ed8
Reviewed-on: https://code.wireshark.org/review/18097
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-07 11:48:13 +00:00
Dario Lombardo bdcbc3e55f tpncp: use ws_strtou function.
Change-Id: Ic8e5c5abffe456ed7a48abf1de87d63665667759
Reviewed-on: https://code.wireshark.org/review/18105
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-07 11:46:08 +00:00
Alexis La Goutte 196c2b1284 TLS(1.3): Add Hello Retry Request (6) extension
Add also special case on hello key_share extension

Ping-Bug: 12779
Change-Id: Ib8e2dd060f322c2404a8afa9b8cb70de7c2c65b7
Reviewed-on: https://code.wireshark.org/review/18093
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-07 11:43:50 +00:00
Alexis La Goutte 5b3dcb671f .mailmap: fix typo
Change-Id: I8ee371ab99397c00293372102c73805108845738
Reviewed-on: https://code.wireshark.org/review/17979
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>
2016-10-07 11:42:30 +00:00
Jeff Morriss 66433787d0 M2PA: use G_STRINGIFY to show the user the default preference value.
The preferences subsystem knows/stores the default values for all preferences;
maybe we should use that to show the default values for all preferences.

Change-Id: I562ce9f129c8dfd8378aeb425f70f21b4cf59230
Reviewed-on: https://code.wireshark.org/review/18094
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>
2016-10-07 07:45:14 +00:00
D. Ulis 9e23ed3109 ENIP: Add Connection ID to tree
1. Add Connection ID to tree
2. Remove unused defines
3. Fix Typo

Change-Id: I25b76057d5c482c73f22e45cc38d5dceb68feca6
Reviewed-on: https://code.wireshark.org/review/18099
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>
2016-10-07 07:42:58 +00:00
Alexis La Goutte 6529b36c54 TLS(1.3): Add cookie (44) hello extension
Ping-Bug: 12779
Change-Id: I94d492d126050fdff6f98608f9d68d55c19e0a50
Reviewed-on: https://code.wireshark.org/review/18092
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>
2016-10-07 07:40:51 +00:00
D. Ulis 40d23eb23a CIP: More minor bug fixes
1. CIP Safety: Exception Detail Alarm and Exception Detail Warning both were not parsing their 3 parts because the offset was not increased. Fixed the offsets and combined the functions because they have the same format.
2. CIP: Forward Open Safety Response had wrong offsets so it was parsing incorrectly. This incorrectly showed as Malformed.
3. CIP Safety: Pass in tvb to proto_tree_add_subtree() instead of NULL. This was causing a Dissector bug (seems only on trunk, not 2.2). This was already done for packet-cip.c under https://code.wireshark.org/review/#/c/16748/
4. Some minor typos

Change-Id: I63e8d200cd3408c16ca0a1edbc483c3bb8298d3b
Reviewed-on: https://code.wireshark.org/review/18100
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>
2016-10-07 07:38:57 +00:00
Jim Young 8b6de4c81e Add a little more info about vagrant and our Vagrantfile.
Change-Id: I2f24f869e6b7b819e50e3ea5ade5dbae5272ced2
Reviewed-on: https://code.wireshark.org/review/18102
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-07 07:37:24 +00:00
shuai xiao 18883a7154 packet-ieee80211.c - fix bug in vht_compressed_beamforming_report
Change-Id: I667c00a8093896984dbf75fa20bec86304706886
Reviewed-on: https://code.wireshark.org/review/18101
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-07 01:47:12 +00:00
Alexis La Goutte 5c55c42eaf jsmn(.h): fix warning: '@param' command used in a comment that is not attached to a function declaration [-Wdocumentation]
Change-Id: Ia03fc0d1d0d4af430055f2ae3c66416922b62fd1
Reviewed-on: https://code.wireshark.org/review/18009
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
2016-10-06 14:20:16 +00:00
Andreas Urke 5a12a5e3e8 packet-ieee802154: Correct DISSECT_IEEE802154_OPTION_ZBOSS from 0x03 to 0x04
Bug: 12984
Change-Id: Ie7d74a99807cfc77b0c444d79e21b64e1612ac90
Reviewed-on: https://code.wireshark.org/review/18088
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-06 03:47:40 +00:00
Pascal Quantin 93b7eead00 EIGRP: fix checksum computation
Bug: 12982
Change-Id: Iaf816247d49b2f869dc19f64cb0a24247fb38169
Reviewed-on: https://code.wireshark.org/review/18087
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>
2016-10-05 23:46:40 +00:00
Gerald Combs 2b5020aca5 randpkt-test: Fix our optstring
"-a" doesn't have an argument.

Change-Id: Ia178985925da6e8bf9e1f0e9626521fb93656632
Reviewed-on: https://code.wireshark.org/review/18086
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-10-05 18:35:44 +00:00
Dario Lombardo 90e30be14d bootp: use ws_strtoi function.
Change-Id: Id6e4f65d9f011c259931824235bbfb04362c0c71
Reviewed-on: https://code.wireshark.org/review/17813
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-05 15:38:13 +00:00
Joakim Karlsson 6416ae6051 gtp: improve traffic flow template
Both 29.060 and 29.274 reference to 24.008 for TFT filter.
Remove redundant part and switch to common TFT encoder.

Second reason: decode_gtp_tft didn't encoder all correct,
missed direction and filter index.

Change-Id: I9691dcb5a9d151f181a3531145ac339fcc7ba245
Reviewed-on: https://code.wireshark.org/review/18082
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>
2016-10-05 13:22:47 +00:00
Uli Heilmeier 55148a2ea4 CMakeLists: Add man files
Current Wireshark.app bundle on OS X doesn't include man pages.

Change-Id: I4123105ae805c3f127dbfd74768b88d4da546c56
Ping-Bug: 12746
Reviewed-on: https://code.wireshark.org/review/17902
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-05 12:28:32 +00:00
Uli Heilmeier bf424e6f84 macOS: extend MANPATH for Wireshark.app
Modify postinstall.sh script to add file /etc/manpaths.d/Wireshark
during installation.
Content of the file is the current path of the Wireshark manpages.

Bug: 12746
Change-Id: I1dc0dc9a2acf56c39c78c709294f1a6804c6ec5c
Reviewed-on: https://code.wireshark.org/review/17916
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-05 11:29:50 +00:00
Mirko Parthey bff2f93c7d isakmp: Add dissection of Responder Lifetime notification
Derive the dissection functions from
dissect_ike_attribute() and dissect_ipsec_attribute():
* Add dedicated header fields.
* Remove attribute types not applicable in Responder Lifetime context.

Clean up the field name "isakmp.ipsec.attr.type".

Bug: 12963
Change-Id: I486380836d915255812098be2190bcc77ec13c00
Reviewed-on: https://code.wireshark.org/review/17970
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>
2016-10-05 04:17:05 +00:00
PHO cb959510d2 tvbuff_zlib: Check if the given offset and compressed length are indeed valid before trying to allocate memory
g_malloc() may abort(3) the program when the comprlen is insanely large so use tvb_memdup() instead.

Change-Id: I23fbdc2362900030c41da1c297ab0c787de7c5ca
Reviewed-on: https://code.wireshark.org/review/18043
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>
2016-10-05 03:28:31 +00:00
Alexis La Goutte 257abd9121 spnego: fix indent (use 2 spaces) and modelines
Change-Id: I077c21eb213435e7ed0e9ac0b9a8f95aa9dd6f3d
Reviewed-on: https://code.wireshark.org/review/18075
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-04 23:13:59 +00:00
Dario Lombardo d6635e8dc8 msrp: use ws_strtou function.
Change-Id: I54bef4b44bcf4ad851c6f0817b1e2c645d0e409a
Reviewed-on: https://code.wireshark.org/review/18068
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-04 22:19:23 +00:00
Alexis La Goutte 23f11b7552 Openflow (v4/v5): Add check if all length is decoded
Change-Id: I7846dd04c45d0398ded8345b6a2794d6f851cb64
Ping-Bug: 12979
Reviewed-on: https://code.wireshark.org/review/18065
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>
2016-10-04 21:55:26 +00:00
Alexis La Goutte dda1ee05b3 LLDP: fix indent (use tab)
Change-Id: Ic9923d93d74a40da2a4009f8b27d8a5ae9803833
Reviewed-on: https://code.wireshark.org/review/18064
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-04 21:50:00 +00:00
Michael Mann 76cf240a0b SMPP: Make smpp.message a FT_BYTES field.
As an FT_NONE field, you can't filter/use the message it contains.

Bug: 12960
Change-Id: Icaa9a260195711f1bd90f5ed14797c0d0c46de9c
Reviewed-on: https://code.wireshark.org/review/18063
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-04 16:53:16 +00:00
Dario Lombardo ca2ac99063 h248_annex_c: use ws_strtoi function.
Change-Id: I0f9a1866a58ec61a8cd424ca69c1170791b5fe72
Reviewed-on: https://code.wireshark.org/review/17939
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-04 16:31:15 +00:00
Gerald Combs 6499a02395 Color filters: Initialize a variable.
Make sure temp_dfilter is initialized so that we don't end up freeing
invalid memory.

Change-Id: Id31969573690574846422b67c950188fd6ee4ef3
Reviewed-on: https://code.wireshark.org/review/18066
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-10-04 16:11:14 +00:00
Dario Lombardo c8143e2077 Qt: add condition to compile without extcap.
Change-Id: Ieabccb5dfc7884bebf9f2b68caaa16a82609bd30
Reviewed-on: https://code.wireshark.org/review/18060
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
2016-10-04 09:59:11 +00:00
Dario Lombardo d8fdf5454a sshdump: add remote capture command.
This new option adds the chance to use a custom capture command.
It must produce a PCAP stream that will be read by Wireshark,
written to STDOUT.

Change-Id: I34a72465eb369194f24ecf0594df143b8ad6555f
Reviewed-on: https://code.wireshark.org/review/18037
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: Dario Lombardo <lomato@gmail.com>
2016-10-04 09:58:25 +00:00
Dario Lombardo 99367fc513 sshdump: use tcpdump as default capture binary.
This removes the option to specify a custom capture binary due to
incompatibilities between different binaries options. A following
change will add the chance to use a custom capture command that
will cover all the cases that the default doesn't.

Bug: 12952
Change-Id: Idbde3e27f34c28f4ce622c3a860994e25ce5f92f
Reviewed-on: https://code.wireshark.org/review/18040
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: Dario Lombardo <lomato@gmail.com>
2016-10-04 09:57:51 +00:00
Pascal Quantin bdd21938ba LTE RRC: upgrade dissector to v13.3.0
Change-Id: Ic2c8e9c6d3df0bffdd6a195c29aa586df29cb20a
Reviewed-on: https://code.wireshark.org/review/18059
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>
2016-10-04 07:09:47 +00:00
PHO 8d08b3ed82 help/Makefile.am: Use the python command chosen by the configure script
Change-Id: I7b6e2b0c7802e214b4483990d0e7e70c58b3f96b
Reviewed-on: https://code.wireshark.org/review/18042
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>
2016-10-04 01:40:24 +00:00
Roland Knall fc234708a7 Interface View/Model: Fix pcap-less build
Change-Id: I88bc6c939b7ce6986299e4ebf99358437b758bd2
Reviewed-on: https://code.wireshark.org/review/18045
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-10-04 01:26:31 +00:00
Peter Wu a59e64c906 uat: fix PT_TXTMOD_HEXBYTES/PT_TXTMOD_ENUM comments
The PT_TXTMOD_HEXBYTES comment was misleading, edit it to reflect the
actual implementation in GTK+/Qt.

Change-Id: I1506ad9189296dcc09cc20eafb0d65eaf291d79f
Reviewed-on: https://code.wireshark.org/review/18058
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-10-04 01:11:14 +00:00
Jaap Keuter 1fdbdf7fca Qt: Have logo in the center of the about dialog
Change-Id: I5dca338e7e3eda3f4b0fa827fe6f7177337f5393
Reviewed-on: https://code.wireshark.org/review/18011
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-04 00:10:36 +00:00
Gerald Combs 8ea52e2f49 Man pages: Update -D flag text.
Refer to "Windows" instead of "Windows 2000". Add an "ip link show"
breadcrumb.

Change-Id: Ie1faa1d30b0ac63de35b0385cbb1306f08828e61
Reviewed-on: https://code.wireshark.org/review/18056
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-10-04 00:09:48 +00:00
Stig Bjørlykke a68dd39a01 p1: Handle implicit Content
The retured-content is defined as IMPLICIT Content (octet string),
so ensure we handle this correctly.

Bug: 12976
Change-Id: I4bcce67cea97142bf3312e1a5c2aeb169c7a69d2
Reviewed-on: https://code.wireshark.org/review/18054
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-10-03 21:30:41 +00:00
Stig Bjørlykke 650c0f93be p1: Check for valid tvb before tvb_reported_length
Move the modification of the content item (which adds the length)
inside the check for a valid tvb to avoid calling tvb_reported_length()
with a NULL parameter.

Bug: 12976
Change-Id: I54368584b7c00f7a2937eaec772533ae73d98f80
Reviewed-on: https://code.wireshark.org/review/18050
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-10-03 19:42:08 +00:00
Gerald Combs 1320ea4d57 Be more forgiving about invalid Coloring Rules.
In ColoringRulesDialog:

Only check a rule's display filter if that rule is enabled. This keeps
us from disabling the OK button when we shouldn't.

Adjust the "Your coloring rules file contains unknown rules" dialog text
and buttons for accuracy.

In color_filters.c:

Don't try to compile disabled filters in color_filters_apply. Don't warn
about disabled and invalid filters in read_filters_file.

Bug: 12814
Change-Id: I7143bf8e7a6162d296f1e93769344b69763195c8
Reviewed-on: https://code.wireshark.org/review/17823
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: Michael Mann <mmann78@netscape.net>
2016-10-03 17:47:39 +00:00