summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2017-06-26Fix make-dist targetJoão Valverde1-1/+0
Change-Id: Idc56d93ce3f8d9b5cc78b1380eec5b7c2bca6213 Reviewed-on: https://code.wireshark.org/review/22412 Reviewed-by: João Valverde <j@v6e.pt>
2017-06-26Parse enterprise-numbers at run timeJoão Valverde35-250900/+50297
"enterprise-numbers" is converted to tab-separated values and renamed "enterprises". Unused fields are stripped. PENs are stored in a hash table loaded at run-time. User "enterprises" file is loaded from the personal config dir. Misc make-sminmpec.pl improvements and fixes. Note: names of type "Entity (formerly ...)" have the formerly part commented out for a cleaner output. Change-Id: I60c533afbe3e399077fbf432088064471ad3e1e2 Reviewed-on: https://code.wireshark.org/review/22246 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: João Valverde <j@v6e.pt>
2017-06-26lz4 doesn't support "make distclean", so don't use it.Guy Harris1-1/+4
Change-Id: Ie63c58752d93be9e4027a55074b6a8fbf81986b3 Reviewed-on: https://code.wireshark.org/review/22411 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-06-26PDCP LTE: fix dissection of Polling bit for User plane Data PDU with 18 bits SNPascal Quantin1-4/+14
Change-Id: Id1167d2c6fa84fd5145d5f0313e39f53591a9add Reviewed-on: https://code.wireshark.org/review/22406 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-06-26Fix Filter Tooltip button and frameRoland Knall5-133/+162
Make the frame into a two-row frame to better accomodate the comments field, and reinstate the correct action for the buttons Change-Id: I171e4bc3c7f195b7179cd6b1c2ab4ab42ede9c04 Reviewed-on: https://code.wireshark.org/review/22405 Petri-Dish: Roland Knall <rknall@gmail.com> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2017-06-26androiddump: Add helper functions for data link type conversionsMikael Kanstrup1-21/+26
Change-Id: I406f5cd6d979442014fdda01deacbcec2052ec18 Reviewed-on: https://code.wireshark.org/review/22400 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2017-06-26androiddump: Introduce adb_connect_transport helper functionMikael Kanstrup1-359/+96
Same code pattern is used over and over when connecting to an adb server. Introduce a helper function that perform the function of connecting to specified adb server and transport. Change-Id: Id2f72f1eb976fa0d742a6db1ef6d592264990ba1 Reviewed-on: https://code.wireshark.org/review/22398 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2017-06-26[RFC]androiddump: Only filter CR/LFs on WindowsMikael Kanstrup1-0/+2
Comments in code claim: "The data we are getting from the tcpdump stdoutput stream as the stdout is the text stream it is convertinng the 0A=0D0A; So we need to remove these extra character." This is not true on non-Windows systems at least so avoid the filter when not built for Windows. NOTE: A problem with the filter is that it operates on all bytes received on the socket, including packet data(!). Capturing data with CR/LFs (for example an HTTP request) will fail. Ideally the filter should be replaced with some other mechanism but as I don't have a Windows system to verify that the comment claims are valid, this change will at least make androiddump work on non-Windows systems. Bug: 13510 Change-Id: Ic00f44fa7516c0db7fc015ed8685deb365a347db Reviewed-on: https://code.wireshark.org/review/22397 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2017-06-26Change display filter button tooltip formatting.Michael Mann2-2/+2
Go from <expression>,<comment> to <comment>\n<expression> Bug: 13814 Change-Id: I842e38798eba7ff87751733ce0b2befdc9c8c27f Reviewed-on: https://code.wireshark.org/review/22395 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>
2017-06-26cmake: fix SET_FEATURE_INFO deprecation warningPeter Wu1-10/+42
Fix deprecation warnings that occur with cmake 3.8, replacing it by some other function that is supported since at least cmake 2.8.8. This also updates URLs and splits the description in a package description and the purpose for the package (shown on the next line). Change-Id: Ic0f37898593f48b8f37f6a228dae49288f20538f Reviewed-on: https://code.wireshark.org/review/22393 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-06-26Fix Packet Lengths statistics countSilvio Gissi1-1/+6
Packet statistics were not showing the packets above 5120 due to the last entry being reformatted and not parsed correctly. Since the last entry is "reformatted" for better user string, also "reformat" the last entry as it goes through "range processing". Bug: 13844 Change-Id: Id49b41c08111dcad1590e034159b81ead8636c4e Reviewed-on: https://code.wireshark.org/review/22382 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>
2017-06-26Add support for comments for a display filter buttonMichael Mann7-8/+57
Add a field to the display filter button UAT to allow comments to be displayed as part of the tooltip to the diplay filter button Bug: 13814 Change-Id: I74459e4102856258d31d6429e2fd924a9f798cd5 Reviewed-on: https://code.wireshark.org/review/22390 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-26Convert filter expressions preference data to a UAT.Michael Mann19-783/+601
The filter expressions data was shoved into the preference file in a very loose, non-arrayed form. It's much easier to manage in code (and for users in a separate file) as a UAT. The GTK GUI was hacked to use the existing UAT dialog rather than rewrite the pref_filter_expressions.c to support a UAT. Should be okay since it's deprecated. Change-Id: I688cebb4b7b6594878c1398365e79a205f1902d9 Ping-Bug: 13814 Reviewed-on: https://code.wireshark.org/review/22354 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>
2017-06-25Sample deprecated filter -> Sample warning filterMichael Mann2-2/+2
"Warning" is a more appropriate name because filter may not be as deterministic as user desires Bug: 13834 Change-Id: Ie34e37db8866dc409f25df227a4d34e7c11d0058 Reviewed-on: https://code.wireshark.org/review/22392 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-25Fix Y.1711 endiannessSilvio Gissi1-3/+3
ITU Y.1711 at https://www.itu.int/rec/T-REC-Y.1711-200402-I/en states that OAM payloads are big endian (section 5.3) as reported on bug. Bug: 8292 Change-Id: Id30e340eee5f5a5c96020cdd1770fa48adb5d169 Reviewed-on: https://code.wireshark.org/review/22383 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2017-06-25[Automatic update for 2017-06-25]Gerald Combs13-1833/+2295
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I6febcb360b1b3e5e761086d422050e6ec95d5c45 Reviewed-on: https://code.wireshark.org/review/22384 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-06-25USB CCID: use register_decode_as_next_proto()Martin Kaiser1-19/+4
Change-Id: Ib583470ba612ef24da4d9360f7bbc0e33fb19bd9 Reviewed-on: https://code.wireshark.org/review/22377 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-24decode_as: replace DISSECTOR_ASSERT() with g_assert()Martin Kaiser1-4/+4
Don't use DISSECTOR_ASSERT() unless we're in wmem packet scope, see commit 341b06ce0795ae957627c9174b57e75c7827f028 Change-Id: I509f9197155fe6ea6f46c23c93eb188220b9dd8d Reviewed-on: https://code.wireshark.org/review/22379 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-24simplified Decode As entry if the next protocol requires manual selectionMartin Kaiser3-0/+44
There's a number of protocols whose payload contains yet another protocol but no criterion to figure out what this next protocol is. Define a new global function register_decode_as_next_proto() to register a Decode As entry for this scenario so the user can manually select the next protocol. A lot of the housekeeping that is normally required for Decode As is not applicable to such a scenario. Provide simple data structures and functions to cover this, make them internal to epan/decode_as.c and allow them to be shared by multiple of the new simplified Decode As entries. (For now, the mechanism is based on an FT_UINT32 dissectore table where all entries are linked to number 0. We should eventually come up with a better mechanism.) Change-Id: I3f81e331d7d04cfdfe9a58732d881652d77fabe2 Reviewed-on: https://code.wireshark.org/review/22376 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-24addr_types: replace DISSECTOR_ASSERT() with g_assert()Martin Kaiser1-11/+11
DISSECTOR_ASSERT() can be used only when we're in wmem packet scope. It cannot be used during startup when address types are registered. In those cases, we must use g_assert(). If we still use DISSECTOR_ASSERT() and an assert is hit, we'll see a wmem assertion ** ERROR:../epan/wmem/wmem_core.c:52:wmem_alloc: assertion failed: (allocator->in_scope) Aborted instead of the actual assert output. Change-Id: Ife12ca3455d56ba4faa2dd6034df8a091d8641ed Reviewed-on: https://code.wireshark.org/review/22378 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-23USB CCID: register obosolete preferenceMartin Kaiser1-0/+5
In 082e3e346f69f0c2134064e80dcc104c18111c55, we dropped the prtype preference in favour of Descode As. Register prtype as an obsolete preference to make sure that it's not removed from the preferences file. The way, the preferences file is still usable with older wireshark versions. Change-Id: I8feed6080b58dd5443898e2c5b12732b0b3a0a4f Reviewed-on: https://code.wireshark.org/review/22373 Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2017-06-23tcp: add tcp.payload fieldSake Blok1-0/+11
Make the tcp segment data available on all tcp packets, regardless of reassembly of higher layer protocols. Change-Id: I1a5024e427e07b85bfc3a4aad5d0a401beb1049d Reviewed-on: https://code.wireshark.org/review/22374 Reviewed-by: Sake Blok <sake@euronet.nl> Petri-Dish: Sake Blok <sake@euronet.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2017-06-23OSPF: fix Opaque LSA Type 11 is considered as unknownAlexis La Goutte1-0/+1
it is define in RFC5250 (and RFC 2370) Ping-Bug: 13823 Change-Id: I84f166d48b39e76ab811a6c2d1c7b1d516e7f0f3 Reviewed-on: https://code.wireshark.org/review/22328 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>
2017-06-23Snort content matching fixesMartin Mathieson2-8/+19
Cope with a space between colon and start of options value. When there are no constraining modifiers, let match for next content or pcre field start from beginning of payload again. Change-Id: Ie1267a0a38143cbe9f0444945f78708bbefaa270 Reviewed-on: https://code.wireshark.org/review/22365 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>
2017-06-23USB CCID: use Decode As to select the payload protocolMartin Kaiser5-57/+44
Remove the special case for vid 0x072F, pid 0x2200. We should be able to set Decode As for this (vid, pid) to USB CCID and then use the new Decode As mechanism to select the next protocol. Register GSM SIM, ISO7816, PN532 and ACR122 as possible payloads for USB CCID. Change-Id: I8237cc9123655d3b289b0564ffb83a32434bebfc Reviewed-on: https://code.wireshark.org/review/22290 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>
2017-06-23Add dftest to Windows installer.Michael Mann4-1/+26
Bug: 13825 Change-Id: Ibda27599739a26a388e1c66ae813ff5c2c8339be Reviewed-on: https://code.wireshark.org/review/22367 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>
2017-06-23nvme: add NVMe Data responses (via RDMA)Nitzan Carmi3-14/+172
The commit contains a general framework for parsing NVMe Fabrics data responses, which contain only "pure" data. These packets are received as a response for Data requests inside the SGLs in NVMe commands. Change-Id: I05f8130df6eef37795d258be680f673930ab6e34 Signed-off-by: Nitzan Carmi <nitzanc@mellanox.com> Reviewed-by: Parav Pandit <parav@mellanox.com> Tested-by: Nitzan Carmi <nitzanc@mellanox.com> Reviewed-on: https://code.wireshark.org/review/22207 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>
2017-06-22Properly find packet comments "field" for protocol hierarchy stats.Michael Mann1-1/+1
That way it can be properly filtered out. This was broken when pkt_comments was switched to a pino and wasn't available in the protocol filters list. Change-Id: Ie3f2b4f25eeb11be57111c98be87e33e0849174b Reviewed-on: https://code.wireshark.org/review/22363 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-22dns: Put request/response tracking last in the treeStig Bjørlykke1-24/+24
Change-Id: I56b99941db63ca87cd233112967592c948d2a390 Reviewed-on: https://code.wireshark.org/review/22361 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>
2017-06-22SSH: Add port 29418 (Gerrit)Gerald Combs1-3/+3
Convert the TCP port preference to a range and add Gerrit's default port. Change-Id: I13460315e9b312673648a37d5f90955134b3ddbc Reviewed-on: https://code.wireshark.org/review/22362 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>
2017-06-22HTTP2: Fix compilation without HAVE_NGHTTP2.Gerald Combs1-1/+1
Change-Id: I7319a9d244e541c18d3492c3ca5eac1dff8e1313 Reviewed-on: https://code.wireshark.org/review/22360 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-06-22Make "matches" case-insensitive.Gerald Combs4-14/+21
Make the "matches" operator case-insensitive by default. Case sensitivity can be switched back on using "(?-i)". It might be nice to make "contains" case-insensitive as well, but we'd need a caseless version of epan_memmem. Change-Id: I5e39a52c148477c30c808152bcace08348df815a Reviewed-on: https://code.wireshark.org/review/22330 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-06-22Add --no-duplicate-keys tshark option.Daan De Meyer5-44/+107
Adds the --no-duplicate-keys option to tshark. If -T json is specified, this option can be specified in order to transform the duplicate keys produced by -T json into single keys with as value a json array of all separate values. Specifying --no-duplicate-keys changes the function which groups node children that is passed to write_json_proto_tree. Instead of a function that puts each node in a separate group (proto_node_group_children_by_unique) a function is passed that groups children that have the same json key together (proto_node_group_children_by_json_key). This will lead to some groups having multiple values. Groups with multiple values are written to the output as a json array. This includes normal json keys but also keys with the "_raw" and "_tree" suffix. If --no-duplicate-keys is specified with an option other than "-T json" or "-T jsonraw" or without -T an error is shown and tshark will exit. "Export Packet Dissections -> As JSON" in the GUI is hardcoded to use the duplicated keys format. Fixes one regression in the output where a filtered json key (-j) with both a value and children would not have the "_tree" suffix added to the json key containing the children. Includes a little code cleanup (removes one instance of code duplication and simplifies a while loop). Fixes a memory leak (I thought this fix was already included in the previous refactor patch but something must have gone wrong when updating the patch so I'm including it again in this patch). Bug: 12958 Change-Id: I401f8fc877b5c590686567c3c44cdb832e9e7dfe Reviewed-on: https://code.wireshark.org/review/22166 Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-06-22sbc-ap: Dissect several IEsVasil Velichkov8-39/+324
Add dissection of the following IEs: - Serial-Number - Warning-Type - Data-Coding-Scheme - Warning-Message-Contents - Message-Identifier Reuse the code from S1AP wherever possible Change-Id: Icaf78b21532cf91fc2cd225d687a6a11813a20d8 Reviewed-on: https://code.wireshark.org/review/22352 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-06-22http2: reassemble entity bodies in data framesRyan Doyle5-3/+580
This commit reassembles data frames to build up the full entity body. It does this for both client/server request and responses. Additionally, it also decompresses bodies if they have the correct content-encoding header provided and are not partial bodies. Bug: 13543 Change-Id: I1661c9ddd09c1f6cf5a08b2b1921f95103aebb52 Reviewed-on: https://code.wireshark.org/review/20737 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>
2017-06-22E.212: update list to Operational Bulletin No. 1126 (15.VI.2017)Pascal Quantin1-6/+29
Change-Id: Ib91dc1fca0d39b53f5f55223405f473dfa816a84 Reviewed-on: https://code.wireshark.org/review/22350 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: Anders Broman <a.broman58@gmail.com>
2017-06-22Qt: Restore multi custom column width and alignStig Bjørlykke2-4/+2
Put custom column field settings in quotes in the recent file to support multi custom columns which contains space. Otherwise the space will be removed in prefs_get_string_list() and the field will not match when reading the recent file. Change-Id: Ic6e2b1e02d68970a4e11fbecbe55a7b10f8b10dd Reviewed-on: https://code.wireshark.org/review/22349 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>
2017-06-22packet-mbtcp - Fix retrieval of Holding/Input Register Format PreferenceChris Bontje1-1/+1
Change-Id: I7a6a409df5c977db1898aec6a47ae3dd8427a00c Reviewed-on: https://code.wireshark.org/review/22286 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-06-22wsutil: Back out profile_write_info_fileStig Bjørlykke3-60/+0
Change-Id: I89a9aaeeba1689cce04f239dafdc9003492aba16 Reviewed-on: https://code.wireshark.org/review/22346 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>
2017-06-22gsm_cbs: sabp: Display Unicode messagesVasil Velichkov3-9/+9
The broadcast message page content is always converted to UTF-8 in the dissect_cbs_data function using tvb_get_string_enc(...) Change-Id: I5fe3d421917b38ccb07438f01f3c4d4ea8cbd787 Reviewed-on: https://code.wireshark.org/review/22315 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: Anders Broman <a.broman58@gmail.com>
2017-06-22OSPF: Opaque ID is not longer be zeroAlexis La Goutte1-15/+0
With RFC7770 the Opaque ID for Router Information is not longer be zero Change-Id: I22f9917ac5b5b0261e36b1097765dab6ce216a46 Ping-Bug: 13823 Reviewed-on: https://code.wireshark.org/review/22329 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>
2017-06-22ssl: detect SSL 2.0 compatible Client HelloPeter Wu1-6/+73
During the esPcape challenge at SharkFest 2017 US, we had a SSL decryption challenge. Normally you have to use Decode As to recognize the custom port number, but the latest development branch has a feature that automatically recognizes TLS (heuristics dissector). SSL 2.0 Client Hello messages were however not recognized by this heuristics which totally broke TLS decryption. Add some very strong heuristics to detect these. "Mosterd na de maaltijd" :p Change-Id: I0ac6aa666393335bb191e395faa1d32d3588ded7 Reviewed-on: https://code.wireshark.org/review/22337 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-22IEC104: Added checking of correct ApduLen in context of ASDU typeJiří Engelthaler1-0/+19
Added displaying of raw data for unknown ASDU type Change-Id: I17e2ae048dbec61718610dd86d6878cdc0563ef0 Reviewed-on: https://code.wireshark.org/review/22341 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>
2017-06-22Add support for "bool" and "display filter" types for UATs.Michael Mann5-8/+115
Filter expressions needs support for a checkbox (bool) and string field that verifies display filters. Change-Id: Idfbffd6cdb5abaee8914126a05d890e834c17306 Reviewed-on: https://code.wireshark.org/review/22340 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-22Add notes about predefined strings not available to pluginsDirk Weise1-1/+7
The documention refers dissector authors to helpful predifined string structures that plugin authors unfortunately cannot use. Bug: 13828 Change-Id: I62cdfeb200c9b354aed44d40c80a0e8f9e8f910b Reviewed-on: https://code.wireshark.org/review/22339 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-22tcp: always display next seq numberPeter Wu1-7/+5
While you can add both the sequence number and next sequence number as columns, the latter would remain empty if it was the same. This disrupts the user reading flow who would have to look left and right, so just display the field unconditionally. Change-Id: I80efb972eaa9a16813a87ac0fdf6a045a3eb9d2f Suggested-by: Laura Chappell Reviewed-on: https://code.wireshark.org/review/22307 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>
2017-06-22macosx-setup.sh: Skip downloading GMP if downloaded beforeAhmad Fatoum1-1/+1
We were downloading gmp-*.lz, but checking for gmp-*.gz instead. Change-Id: I3c9a29400d389555db7b5f003919ce22aaacf3a1 Reviewed-on: https://code.wireshark.org/review/22338 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-06-22TCP: Make the header length display consistent with IPv4.Gerald Combs2-2/+5
Format tcp.hdr_len in the tree similar to ip.hdr_len. Add comments noting that they should be consistent. Change-Id: Ic64282d8386c8ed339811bc9c22b5962c707d292 Reviewed-on: https://code.wireshark.org/review/22314 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-06-22wsutil: Return error from profile_write_info_fileStig Bjørlykke3-7/+27
Change-Id: I1d91cef01ced6cceaa75d1618ffcb59eae5b8e6f Reviewed-on: https://code.wireshark.org/review/22325 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>
2017-06-22Add WTAP_ENCAP_3MB_ETHERNET for Xerox 3MB Ethernet.Guy Harris3-0/+5
It needed to be done: https://github.com/shirriff/pup-wireshark (And, yes, there really *is* a DLT_/LINKTYPE_ for it! The original DLT_ values were ARP hardware types, and 3MB Ethernet was assigned an ARP hardware type of 2.) Change-Id: I60d96c28e67854adcb28c7e3579ae5dd1f07df4b Reviewed-on: https://code.wireshark.org/review/22336 Reviewed-by: Guy Harris <guy@alum.mit.edu>
generated by cgit v1.2.1 (git 2.18.0) at 2024-05-03 21:59:02 +0000