summaryrefslogtreecommitdiff
path: root/epan
AgeCommit message (Collapse)AuthorFilesLines
2017-07-01ZigBee: Add attribute and command names from Price used with GBCSKenneth Soerensen2-0/+399
The Great Britain Companion Specification specifies how energy meters will communicate in the UK. This patch adds names for attributes and commands from the Smart Energy Price cluster that are used within that specification. Change-Id: Ibbbf2ac52f61887004f03bbb1aa7f4d57b63268e Reviewed-on: https://code.wireshark.org/review/22473 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-07-01ospf: workaround Opaque Information with bad TLVPeter Wu1-5/+13
The linked pcap seems to contain a TLV (type=255 (Unknown)) followed by four bytes (00 00 00 14, interpreted as TLV (type=0, length=20)). That is bogus, so stop dissecting if no more data is available. While at it, implement alignment at four octets. Bug: 13823 Change-Id: Iacf863c0c6605db40e87f63a950d61c1db6debaa Reviewed-on: https://code.wireshark.org/review/22488 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-30ospf: update LSA Option TypesPeter Wu1-9/+18
Add missing entries from IANA registry, remove dummy OSPF_LSA_UNKNOWN which does not exist and has become unused in the code. Change-Id: I55e28e67da744e358e0629906ef5ebd3c4c82b5d Reviewed-on: https://code.wireshark.org/review/22487 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-30ZigBee: Add remaining command names from Metering clusterKenneth Soerensen1-2/+22
Change-Id: If0dc66fa24f154561d45c373325218d71610e41c Reviewed-on: https://code.wireshark.org/review/22475 Petri-Dish: Anders Broman <a.broman58@gmail.com> Reviewed-by: Martin Boye Petersen <martinboyepetersen@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-30ZigBee: Add attribute and command names from Calendar clusterKenneth Soerensen2-1/+280
Change-Id: I2e543a39a21d3fc71c0da80ce1cd9ca9e50a3bfc Reviewed-on: https://code.wireshark.org/review/22472 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Martin Boye Petersen <martinboyepetersen@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-30ZigBee: Add remaining command names from Prepayment clusterKenneth Soerensen1-1/+9
Change-Id: I4dab9878f290564700e58ac191924f6574d67bce Reviewed-on: https://code.wireshark.org/review/22474 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Martin Boye Petersen <martinboyepetersen@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-30btle: Improve reassembly when missing packetsStig Bjørlykke1-18/+32
Create a unique reassembly id to improve reassembly when having missing btle packets. Change-Id: I0d8e4c6b4fea9ba5eb98a88b0573b541cfee59af Reviewed-on: https://code.wireshark.org/review/22477 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-30btle: Support reassembly in both directionsStig Bjørlykke1-6/+40
Create one connection_info_tree for each direction to support reassembly in both directions simultaneously. Change-Id: If83e8705412062b07f3fa47a73f42db8c7895e78 Reviewed-on: https://code.wireshark.org/review/22476 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-29NAS EPS: upgrade dissector to v13.10.0Pascal Quantin2-1/+44
Change-Id: I038ee9270a3118f3b2642c445cb2ab4b705fe57d Reviewed-on: https://code.wireshark.org/review/22463 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-29Added General Notification Message opcode to CFMGabor Vaszkun1-0/+105
Change-Id: Ieeb3f9ae6b9b261bb68917005d15822197e37b4e Reviewed-on: https://code.wireshark.org/review/22462 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-29sccp: build the "association tree" earlierIvan Nardi1-25/+48
Remove a double lookup in RLSD message dissection, too Ping-Bug:13861 Change-Id: Ie971c0779baad76fb22f8a59d045e38c072e8f06 Reviewed-on: https://code.wireshark.org/review/22448 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-29sccp: build associations on IT messages, tooIvan Nardi1-0/+2
Useful when you have long sessions, without the start (i.e. CC/CR) and the end (i.e. RLSD/RLC). Similar to 10d2e652289c0179763928dd43998783752e49d3 Change-Id: Ifb97bd9fe88ee59f3816fce1111132b247bf46c8 Reviewed-on: https://code.wireshark.org/review/22446 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-29Support AECP vendor unique command and response messages.Daniel McLean1-3/+27
Added support for registering custom dissectors for AECP vendor unique command and response message dissection. Fixed a minor typo Change-Id: I7ae363f126d4db513be0529fc6dd7fd189d4f3d8 Reviewed-on: https://code.wireshark.org/review/22438 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-06-29btle: Reorder elements in Packet Header and Data HeaderStig Bjørlykke1-10/+10
This shows the elements in a little-endian fashion and aligns with other element trees using bitmask. Change-Id: I8e16eaee9944c2b56bc9fe18f31a983047aca121 Reviewed-on: https://code.wireshark.org/review/22453 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-29btl2cap: Cleanup indent and spacingStig Bjørlykke1-69/+87
Fix indent and spacing in if-statements to improve readability. Change-Id: I3bd295d5d397e6e4b211c2d6fed25ab93e14142c Reviewed-on: https://code.wireshark.org/review/22452 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-29S1AP: upgrade dissector to v13.6.0Pascal Quantin9-19/+24
Change-Id: Ic75bd30ae77053241bebeb47e9b3e10529a8d0f7 Reviewed-on: https://code.wireshark.org/review/22451 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-29X2AP: upgrade dissector to v13.7.0Pascal Quantin9-9/+30
Change-Id: I1580bf4da1a31a6e0f77080e0835eb0dd5b3936c Reviewed-on: https://code.wireshark.org/review/22450 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-29LTE RRC: upgrade dissector to v13.6.0Pascal Quantin11-607/+1247
Change-Id: I0a4288b5044849fa0abe4b58c3c5795e16cee25a Reviewed-on: https://code.wireshark.org/review/22454 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-28e212: report an expert info on malformed imsiIvan Nardi1-1/+26
Change-Id: I344b061f6fbbfc41f7578005709b9b8033379609 Reviewed-on: https://code.wireshark.org/review/22447 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-06-28 FP: Combining heuristic dissectorsDarien Spencer3-145/+240
Combining all seperate heuristic dissector into one 'fp over udp' dissector. Also refactored the 'unknown format' dissector (formarly heur_dissect_fp) so it could work 'chained' to the others. Change-Id: I396c362a400f51171ee091317b6735dfd8bd19df Reviewed-on: https://code.wireshark.org/review/22368 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>
2017-06-28x11: Make a tmp variable volatileStig Bjørlykke1-1/+1
This fixes a warning: [...]/epan/dissectors/packet-x11.c:5019:26: error: variable ‘tmp’ might be clobbered by ‘longjmp’ or ‘vfork’ [-Werror=clobbered] gint64 tmp = (gint64)plen * 4; Change-Id: I9462d3a71081e53a5567716e660a8306c4e028bf Reviewed-on: https://code.wireshark.org/review/22443 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-28Qt: Drag/Drop Filter buttons to orderRoland Knall2-0/+20
Allow the ordering of the filter buttons via drag/drop in the toolbar Change-Id: Id8793d6514bae36066a7a23d6890985665e753bd Reviewed-on: https://code.wireshark.org/review/22422 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-28IEEE 802.15.4: Whitespace and small comment cleanupsRobert Sauter1-268/+271
No code changes. Change-Id: I282334594be476596f30e8396fe66a995e3e0292 Reviewed-on: https://code.wireshark.org/review/22439 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-27IEEE 802.15.4: Support for CSL Header IERobert Sauter1-1/+35
Change-Id: Ibda1f0757401566170459570e1138ac3dc3e5101 Reviewed-on: https://code.wireshark.org/review/22421 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2017-06-27dcerpc: improve greatly the speed of processing of DCERPC packetsMatthieu Patou1-42/+140
Instead of using one big linked list, we use a stack of list once all the pointers of one level have been handled the list is removed from the stack and we go to the level before. Because of this the lists are much smaller and far less CPU is spent iterating on the objects or inserting objects in the list Bug: 10544 Change-Id: I432aaf5b4b781411c92da92abe9c5503034b65dc Reviewed-on: https://code.wireshark.org/review/4598 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-27IEEE 802.15.4: Overhaul Header IE dissectionRobert Sauter2-228/+273
Isolate dissection of individual IEs to capture out-of-bound errors and to continue with next IE on error. Create subtree for each IE containing the TLV header. Reduce information in overall Header IEs item. Differentiate unknown and unsupported IE. Show more information. Add warning if IE dissection consumes less content than the indicated length. Simplify Time Correction IE dissection and make more consistent. Naming changes for consistency with standard. Change-Id: I80f15edb646a15c0ed43d6571200a5d89cdeb7b5 Reviewed-on: https://code.wireshark.org/review/22381 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-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 Valverde26-250795/+219
"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-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 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 Mann3-3/+11
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 Mann4-79/+128
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-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 Combs3-90/+513
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 Kaiser2-0/+43
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-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-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 Combs1-2/+2
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 Meyer2-41/+78
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>