aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2016-10-11HL7 protocol supportFrancesco Fondelli5-0/+1146
Bug: 12906 Change-Id: I0dafdd74b21b27189d0a532c679e449c536f76f0 Signed-off-by: Francesco Fondelli <francesco.fondelli@gmail.com> Reviewed-on: https://code.wireshark.org/review/17725 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-10Disable wslua GRegex unit testJoão Valverde1-1/+2
It's broken for recent GLib versions and there is no time frame for a fix. Ping-Bug: 12997 Change-Id: Ia687af9b0df8fc37121179ba20761c878bf57057 Reviewed-on: https://code.wireshark.org/review/18140 Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-10-10LPPa: upgrade dissector to v13.1.0Pascal Quantin9-62/+587
Change-Id: I8afddebf9b75b992a1cd9cb75f8cf7bb5223c6f9 Reviewed-on: https://code.wireshark.org/review/18141 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-10fuzz-test: Fix an exit status check.Gerald Combs1-3/+3
Make sure we check the exit status of the Valgrind process, not the most recently executed command. Change-Id: I3b6bd427383e4271b9ed38a10da6db506a511dc1 Reviewed-on: https://code.wireshark.org/review/18138 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-10-10CIP: Attribute updatesD. Ulis1-38/+95
1. Combine various Attribute ID filters into a single one "cip.attribute", so that it's easier to find a certain attribute in any part of the packet. This makes sense because Attributes refer to the same property, but various types of messages can have that field in different locations. This applies to Get/Set Attribute Single, Get/Set Attribute List, Get Attributes All. 2. Connection Manager: Dissect more attributes 3. Port: Display the Port Type name 4. Get/Set Attribute Single: Show unparsed data as raw bytes. Previously, if there were extra bytes they were not displayed. 5. Get/Set Attribute List: Show remaining data for unknown attributes under the main Attribute List tree, instead of under the unknown Attribute ID tree. 6. Display Attribute ID as DEC, since the specification tables are in decimal. 7. Update Class list 8. Minor: Remove some unused variables, typos Change-Id: I1a65da5f827484a3cd0e49ec944572ea5a166db1 Reviewed-on: https://code.wireshark.org/review/18118 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-10fix: use ws_strtoi function.Dario Lombardo1-12/+29
Change-Id: I537a7b349ea31e02cf538a782301c94053bb82dc Reviewed-on: https://code.wireshark.org/review/18125 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-10Profinet I/O: Sanity check number of I/O objectsMichael Mann1-5/+22
Can prevent really long loops from fuzz testing. Bug: 12851 Change-Id: I85e00af2c4753ce4c5bcb650a7df188d7f679c9a Reviewed-on: https://code.wireshark.org/review/18136 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-10HARTIP: Fix infinite loopMichael Mann1-0/+2
Bug: 12967 Change-Id: Ic7a52d4ee5dea896044c1c97b7b48f13e21f2762 Reviewed-on: https://code.wireshark.org/review/18135 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-09M3AP: upgrade dissector to v13.2.0Pascal Quantin9-79/+227
Change-Id: Iaedd4d3205e44a391a12be71eea0ccdc237fe790 Reviewed-on: https://code.wireshark.org/review/18133 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-09[Automatic update for 2016-10-09]Gerald Combs12-282/+600
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I84adcfee2652783d1b3b7d7e3ff9b209f8b23d96 Reviewed-on: https://code.wireshark.org/review/18130 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-10-09xcsl: use ws_strou function.Dario Lombardo1-1/+4
Change-Id: I1c054253b77b266a162d09e8da107e5ebb9eceb8 Reviewed-on: https://code.wireshark.org/review/18111 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-09E212: use ws_strtou function.Dario Lombardo1-5/+10
Change-Id: Ifaeaf7ceb7addba95237852529ae1aa3e8a8b46b Reviewed-on: https://code.wireshark.org/review/18124 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-09TLS(1.3): Add new cipher from TLS 1.3Alexis La Goutte1-0/+6
Change-Id: I8f39ea55763e925e15896efc9c519297c1288ccf Reviewed-on: https://code.wireshark.org/review/18110 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-09Note the registry for the bgp_l2vpn_encaps values.Guy Harris1-0/+7
Change-Id: Id8ccf81c08d84124e1d7361ce6e87080fa6b440d Reviewed-on: https://code.wireshark.org/review/18128 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-10-09Note the registry for fec_vc_types_vals values and update it.Guy Harris1-1/+9
Change-Id: I0514417895ccc86f51bf239d56005245fd875809 Reviewed-on: https://code.wireshark.org/review/18127 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-10-08Revert "CMakeLists: Add man files"Uli Heilmeier2-3/+2
This reverts commit 55148a2ea470d19290d236428f3c8e725775c96a. Change-Id: If93b97933cae4d8ffd1e4cc9a635def031ab0cc6 Reviewed-on: https://code.wireshark.org/review/18123 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-10-08column-utils: add space to improve readability.Dario Lombardo2-3/+3
In tshark the UTF8 arrow overlaps the ports. When pcap file has more than 999 packets the output is no more aligned. Bug: 12502 Change-Id: I07f90bbc0d2f065458bc07b7fde8f6a651951b60 Reviewed-on: https://code.wireshark.org/review/18109 Petri-Dish: Dario Lombardo <lomato@gmail.com> Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2016-10-08add tvb_find_guint16() utilityFrancesco Fondelli3-0/+46
Change-Id: I75c0165948325c2e50918706d8a821411761727b Signed-off-by: Francesco Fondelli <francesco.fondelli@gmail.com> Reviewed-on: https://code.wireshark.org/review/17734 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-08Combine Decode As and port preferences for tcp.port dissector table.Michael Mann309-3048/+2196
This patch introduces new APIs to allow dissectors to have a preference for a (TCP) port, but the underlying data is actually part of Decode As functionality. For now the APIs are intentionally separate from the regular APIs that register a dissector within a dissector table. It may be possible to eventually combine the two so that all dissectors that register with a dissector table have an opportunity to "automatically" have a preference to adjust the "table value" through the preferences dialog. The tcp.port dissector table was used as the guinea pig. This will eventually be expanded to other dissector tables as well (most notably UDP ports). Some dissectors that "shared" a TCP/UDP port preference were also converted. It also removed the need for some preference callback functions (mostly when the callback function was the proto_reg_handoff function) so there is cleanup around that. Dissectors that has a port preference whose default was 0 were switched to using the dissector_add_for_decode_as_with_preference API rather than dissector_add_uint_with_preference Also added comments for TCP ports used that aren't IANA registered. Change-Id: I99604f95d426ad345f4b494598d94178b886eb67 Reviewed-on: https://code.wireshark.org/review/17724 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-08s7comm: use ws_stroi function.Dario Lombardo1-18/+63
Change-Id: I0d27c2aa7d896c4c6048dff963910ad7f88b07ee Reviewed-on: https://code.wireshark.org/review/18085 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-08dpnss: use ws_strtou function.Dario Lombardo1-2/+4
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-08wlccp: fix typo.Dario Lombardo1-1/+1
Change-Id: I893fdc3025119c69142c617bfcea65654c45ad8b Reviewed-on: https://code.wireshark.org/review/18112 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-08iso8583: use ws_strtoi function.Dario Lombardo1-7/+4
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-08idl2wrs: use ws_strtou function.Dario Lombardo1-4/+4
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-07Qt: valign text in RTP Stream Analysis window.Jaap Keuter1-24/+24
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[MEGACO] Add long name for gm/rsbAndersBroman1-0/+10
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-07Disable ASAN when building lemon.Gerald Combs4-4/+25
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-07TLS: Fix typo after g989dcef3Alexis La Goutte1-1/+1
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-07TLS: Display extension type with decimal (like IANA)Alexis La Goutte1-1/+1
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-07Interface View/Model: Correct column orderingRoland Knall5-17/+63
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-07rtsp: use ws_strto[u|i] functions.Dario Lombardo1-17/+30
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-07soupbintcp: use ws_strto[u|i] functions.Dario Lombardo1-10/+38
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-07tpncp: use ws_strtou function.Dario Lombardo1-5/+11
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-07TLS(1.3): Add Hello Retry Request (6) extensionAlexis La Goutte4-1/+52
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.mailmap: fix typoAlexis La Goutte2-4/+7
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-07M2PA: use G_STRINGIFY to show the user the default preference value.Jeff Morriss1-1/+1
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-07ENIP: Add Connection ID to treeD. Ulis1-15/+18
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-07TLS(1.3): Add cookie (44) hello extensionAlexis La Goutte2-1/+36
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-07CIP: More minor bug fixesD. Ulis2-144/+56
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-07Add a little more info about vagrant and our Vagrantfile.Jim Young1-16/+61
Change-Id: I2f24f869e6b7b819e50e3ea5ade5dbae5272ced2 Reviewed-on: https://code.wireshark.org/review/18102 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-07packet-ieee80211.c - fix bug in vht_compressed_beamforming_reportshuai xiao1-1/+1
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-06jsmn(.h): fix warning: '@param' command used in a comment that is not ↵Alexis La Goutte1-3/+3
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-06packet-ieee802154: Correct DISSECT_IEEE802154_OPTION_ZBOSS from 0x03 to 0x04Andreas Urke1-1/+1
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-05EIGRP: fix checksum computationPascal Quantin1-1/+1
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-05randpkt-test: Fix our optstringGerald Combs1-1/+1
"-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-05bootp: use ws_strtoi function.Dario Lombardo1-2/+21
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-05gtp: improve traffic flow templateJoakim Karlsson1-190/+18
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-05CMakeLists: Add man filesUli Heilmeier2-2/+3
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-05macOS: extend MANPATH for Wireshark.appUli Heilmeier1-0/+7
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-05isakmp: Add dissection of Responder Lifetime notificationMirko Parthey1-2/+188
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>