summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
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>
2017-06-22MQ: put declaration before codePascal Quantin1-1/+2
Change-Id: I2b0d1a4795e3278a1702d51d4fd532a37a4eba19 Reviewed-on: https://code.wireshark.org/review/22332 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-06-21Lua: Add "tonumber" method to NSTimeSilvio Gissi3-7/+22
Absolute and Relative time fields could not be converted to seconds without converting to string and parsing to number. Fixed conversion in generated code that was subject to precision loss Usage: f=Field.new("frame.delta_time") delta=f().value:tonumber() Change-Id: I6ef91c6238a6c2ed9adf6cae03f8913f0a09332e Reviewed-on: https://code.wireshark.org/review/22316 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-06-21Qt: fix sorting of custom columns with multiple fieldsPeter Wu2-14/+37
Fields like "dns.time || http.time || smb.time" were sorted by column number before. Recognize when all fields are numeric values and then try to sort by number and otherwise fallback to a value comparison. In theory sorting should now also be a bit faster for custom columns because the columnn type is looked up once. Change-Id: Id40d7cce8080d05823d74459fc493ec6ebf80956 Reported-by: Laura Chappell Reviewed-on: https://code.wireshark.org/review/22317 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-21wsutil: Check return from ws_writeStig Bjørlykke1-2/+3
Change-Id: I73f65222dc23ebcb484f2598a12f43b284654420 Reviewed-on: https://code.wireshark.org/review/22321 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-06-21wsutil: Ignore return from ws_writeStig Bjørlykke1-2/+2
Change-Id: Idad4dd84538e3ccb7b258775704db8b6bd6c301e Reviewed-on: https://code.wireshark.org/review/22319 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-06-21ftp-data: track setup frame, method and command from ftpMartin Mathieson1-34/+140
Change-Id: Iaa06b2e43a69f9a399ff81dd7a1e389e078608e4 Reviewed-on: https://code.wireshark.org/review/22292 Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-06-21[sipstat] Update the Response Codes table.Anders1-2/+21
Change-Id: Iae6e49963ea94ba8a174342e25d2ca5494001e28 Reviewed-on: https://code.wireshark.org/review/22310 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-21Qt: display newlines in capture file commentsPeter Wu1-2/+2
Due to the use of HTML, whitespace (including newline) are shown as single horizontal space. Add a special case for newlines. Bug: 13819 Change-Id: Iefa2af7d2948ed18a3b7f8f4ee8cb90100bf3460 Reviewed-on: https://code.wireshark.org/review/22306 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-21[filesystem.c] Add a cast to aviod a warning with VisualStudio 2017.Anders1-1/+1
Change-Id: I95186bd54ae487e112fcb533c62bb8f9b210dc24 Reviewed-on: https://code.wireshark.org/review/22309 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-06-21wsutil: Free files in reset_default_profileStig Bjørlykke1-0/+1
This plugs a memory leak. Change-Id: Ic989a89353d10de6f8f07df6a734d2b912facb7e Reviewed-on: https://code.wireshark.org/review/22305 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-21Qt: Write a list of profile files at startupStig Bjørlykke3-0/+40
This file will contain all personal config files which will be fetched from a profile. Change-Id: I430ca84ccefc17f0e21c8efb93a92602ab8d5661 Reviewed-on: https://code.wireshark.org/review/22303 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-21http: fix handling of HTTP responses followed by proxy responsesPeter Wu1-1/+1
Reused TCP connections with multiple HTTP requests/responses (in particular: HTTP request/response and HTTP proxy request/response) exhibit the following problem: the first response sets "startframe" such that the proxy response accidentally assumes that the proxy response starts in that first response. Fix this by only setting startframe if there is actually a transport upgrade. Tested with original capture and the Websocket dissection still works while Christian's capture has no longer the reported problem. Change-Id: I8a7878b9a2a98878a9e5be4f680d4f109fd8ab55 Fixes: 94ae27661e80 ("WebSocket dissector improvements") Reported-by: Christian Landström Reviewed-on: https://code.wireshark.org/review/22294 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-21ISIS LSP: fix wrong bitmask for SPVIDAlexis La Goutte1-1/+1
Issue reported by Bo-Han Liao Bug: 13821 Change-Id: I74641bef723e747bfe5fa87e946b7f4f74b94bf6 Reviewed-on: https://code.wireshark.org/review/22299 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-21GSM SIM: define a dissector for both request and responseMartin Kaiser2-7/+17
Define a dissector that can handle both requests and responses. Look at pino->p2p_dir to detect if we have a request or repsonse. (At the moment, there's a dissector for request+response in one packet and two other dissectors for request and response messages.) Use the new mechanism for USB CCID. Change-Id: I7eb9861802b4244f92770602179f39642eb28641 Reviewed-on: https://code.wireshark.org/review/22289 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>
2017-06-21tcp: Change the wording to include (s)Roland Knall1-1/+1
More than one packet could be meant by that Change-Id: Ie751a282c927608414673c2cd48b11dc5e6d5ea6 Reviewed-on: https://code.wireshark.org/review/22283 Reviewed-by: Roland Knall <rknall@gmail.com> Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-21cmake: allow building from a UNC source directoryMartin Kaiser2-4/+2
Make two minor adjustments to allow building on Windows when the source directory is specified in UNC notation (\\server\volume\directory) instead of mapping such a directory to a drive letter. Cmake's add_custom_command() calls "cd <work_dir>" if a working directory is define as part of the rule. However, cd \\server\volume\directory is not allowed. Modify the two occassions where the working directory is derived from CMAKE_SOURCE_DIR. For copying some install files, we can get away with using the absolute path for each source file to be copied. The perl script that creates the tap listing for lua does not depend on a working directory at all. We can simply remove the WORKING_DIRECTORY parameter. Change-Id: Iac8e0addc44650692c1263fdca11f68315f50c63 Reviewed-on: https://code.wireshark.org/review/22236 Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-06-21USB CCID: unify the code to call subdissectorsMartin Kaiser1-49/+37
Prepare the USB CCID code for replacing the "next protocol" preference with Decode As. USB CCID has a length field for the payload data. Use this field to create the next_tvb. There's no need for different payload lengths depending on the next protocol. Use call_data_dissector() instead of referencing data_handle. Set pinfo->p2p_dir regardless of the next protocol. Change-Id: I042ecc9bd75245ee1d4d8a94532c9fd1de83e859 Reviewed-on: https://code.wireshark.org/review/22288 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: Peter Wu <peter@lekensteyn.nl>
2017-06-20Fix filter for "Next Packet in Conversation"Peter Wu5-76/+32
The "Previous/Next Packet in Conversation" actions accidentally overwrites more specific filters (like TCP port matching) by less specific ones (like IP addresses). This resulted in strange behavior where packets from different TCP streams were selected. Change-Id: Ifa93064e1db3777fa3c12e2220bbb0b36b9478fe Reported-by: Christian Landström Reviewed-on: https://code.wireshark.org/review/22274 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-06-20IP: ensure that fragment contains payload before adding it for reassemblyPascal Quantin1-0/+1
Solves a UBSan runtime error null pointer passed as argument 1, which is declared to never be null. It can be reproduced with the pcap from bug 13603 Change-Id: I0d6fdddcccc892b3141855d59be372887afcaca5 Reviewed-on: https://code.wireshark.org/review/22272 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-20packet-xml: Add 3GPP, ETSI, GSMA and OMA media typesVasil Velichkov1-0/+59
Not all media types are IANA registered https://www.iana.org/assignments/media-types/media-types.xhtml http://www.gsma.com/newsroom/wp-content/uploads/IR.95-v2.0-3.docx http://www.openmobilealliance.org/release/XDM/V2_2_1-20170124-A/OMA-ERELD-XDM-V2_2_1-20170124-A.pdf Change-Id: I7e2e1ef5ddcff91f04655d84836e10b9bf20d765 Reviewed-on: https://code.wireshark.org/review/22273 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-20Fix Toggle indicator for searchRoland Knall1-3/+0
Removing the toggle indicator. Search behaves now the same as it does for e.g. in SublimeText Change-Id: I4523001b536caa116bcb989f0850aa769c6220f8 Reviewed-on: https://code.wireshark.org/review/22280 Reviewed-by: Roland Knall <rknall@gmail.com>
generated by cgit v1.2.1 (git 2.18.0) at 2024-06-26 18:57:22 +0000