aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors
AgeCommit message (Collapse)AuthorFilesLines
2018-09-15Aeron: Update disector on the latest aeron protocol specificationchaoyongzhou1-17/+293
1, update frame fields and offset 2, shift heartbeat frame from data frame which is a special data frame 3, support rtt frame supported by aeron in java 4, revise data/pad frame length alignment to 32 bytes but not 8 bytes 5, remove frame length alignment from setup,nak,err,and rtt frame 6, fix rtt frame length Bug: 15111 Change-Id: Ic627a9773850fa6bceacd313ddeba521487815e2 Reviewed-on: https://code.wireshark.org/review/29407 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2018-09-14QUIC: recognize CRYPTO frame (draft -13)Peter Wu1-0/+33
Avoids malformed packet warnings. Actual TLS handshake/alert protocol support will be done later. Change-Id: I87e783ab12a10afad7c0372a0b3a900a5e37f6e1 Ping-Bug: 13881 Reviewed-on: https://code.wireshark.org/review/29642 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-09-14evs: Start dissecting a bit of speech data.AndersBroman1-94/+254
Change-Id: I30ad1c083c2e3ed920245f0421b280b5b9b16336 Reviewed-on: https://code.wireshark.org/review/29656 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-09-14QUIC: split per-packet state to fix packet coalescingPeter Wu1-35/+54
Packet coalescing requires separate state for every QUIC packet. Split the state as each UDP datagram can contain multiple QUIC packets. Most datagrams will have only one packet, so to avoid multiple allocations, just embed the first packet into the datagram info and use a linked list for simplicity. Change-Id: Ib921e68a7312c6eccb5601b8951ff64cc9ea49cd Ping-Bug: 13881 Reviewed-on: https://code.wireshark.org/review/29647 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-09-13Start renaming SSL to TLS.Gerald Combs31-377/+378
Rename the "ssl" protocol to "tls" and add an "ssl" alias. Prefer "TLS" over "SSL" in user interface text and in the documentation. Fix the test_tls_master_secret test while we're here. Bug: 14922 Change-Id: Iab6ba2c7c4c0f8f6dd0f6d5d90fac5e9486612f8 Reviewed-on: https://code.wireshark.org/review/29649 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-09-13QUIC: fix Initial dissection (draft -13)Peter Wu1-13/+50
Recognize the Token field in the Initial Packet. Accept Initial Packet from server and adjust connection tracking logic to take this into account. Tested with ngtcp2-13.pcap, now the Initial packets can be decrypted (even if the containing frames are not correctly handled). Change-Id: I5937fb85172a2f93d1b4a4ed7667474ec04f95fc Ping-Bug: 13881 Reviewed-on: https://code.wireshark.org/review/29641 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-09-13QUIC: use HKDF-Expand-Label (draft -13)Peter Wu1-21/+68
Prepare for draft -13 support. A comment references draft -14 since the draft -13 text is wrong (it lacks the context argument). Change-Id: I3f2c59d2640693959372ebe0de3b58f67b5588b9 Ping-Bug: 13881 Reviewed-on: https://code.wireshark.org/review/29640 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-09-13QUIC: implement draft -12 decryption (PNE and PP)Peter Wu1-43/+228
Packet number encryption (draft -12 + PR 1389) is implemented. The payload protection has been updated to use the decrypted PKN as well. Caveats: since the packet number is initially unavailable, the previous approach on detecting legitimate key updates no longer works. This change breaks Key Update support which needs to be revisited later. Due to how PKN lengths and decrypted results are stored (one per datagram), packet coalesing is also not fully supported. Bug: 13881 Change-Id: I13c63578cec7f7f74a404b1a7a8fc85026a14252 Reviewed-on: https://code.wireshark.org/review/29637 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-09-13DHCP: Fixup whitespace.Gerald Combs1-4/+4
Change-Id: Iaf56751dff81ff9f5c59e1e99ca93aafb38a934d Reviewed-on: https://code.wireshark.org/review/29650 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-09-13ieee80211: parse the 9th byte of the Extended Capability as a byteEmmanuel Grumbach1-3/+3
Some of the bits were parsed as a bit of a WORD, and others as a bit of BYTE leading to a bug in the display. Bug: 15133 Change-Id: Ie6877c4a4a79fcc802afec49436370cf22a6bfae Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Reviewed-on: https://code.wireshark.org/review/29633 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-09-13evs: Put CMR "rate" in Info column.AndersBroman1-5/+17
Change-Id: I99447ac80751dea53849bd0575804dc7e74a27c5 Reviewed-on: https://code.wireshark.org/review/29638 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-09-13gtp: move column append outside IF bracketsJoakim Karlsson1-2/+2
Column appended never happen on IPv4/IPv6 since latest refactor Change-Id: Icc85cfa8136386a440b226959f9df4a980a2658e Reviewed-on: https://code.wireshark.org/review/29644 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-09-13MTP2 bitstream dissector - dissect MTP2 packets from RTP streamLajos Olah1-3/+878
Change-Id: I704c68caa8cd8aa60c6417e6ee038db5f6507686 Reviewed-on: https://code.wireshark.org/review/29506 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-09-13ospf: fix conlictAlexis La Goutte1-1/+1
'ospf.mpls.pri' exists multiple times with NOT compatible types: FT_FLOAT and FT_UINT8 Change-Id: Iea0b662d0a9ff4a7ea7363ef4ef049d11d5a5dca Reviewed-on: https://code.wireshark.org/review/29608 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-09-12AT: Add CSUPI commandDarien Spencer1-0/+8
Change-Id: I501bd0e00a20b39e4c53bdd7e5e2b9b3c5234469 Reviewed-on: https://code.wireshark.org/review/29635 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-09-12QUIC: create QUIC-specific cipher contextPeter Wu1-42/+48
This makes it easier to track the packet number cipher. Change-Id: I220935e91c324e0a641306c590f55af4992ee2e1 Ping-Bug: 13881 Reviewed-on: https://code.wireshark.org/review/29636 Petri-Dish: Anders Broman <a.broman58@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-09-12AT: Fix rejection valuesDarien Spencer1-2/+2
Dissect functions for CNUM/VTS were returning TRUE for all wrong role/type combinations instead of FALSE ( = Rejecting the parameter ) Change-Id: I1aae5b76db83cef6b59f5244c05a67b2110f8969 Reviewed-on: https://code.wireshark.org/review/29634 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-09-12nas_5gs: can't decode 5GS NAS PDU when there are multiple NSSAIs.Rody Liu1-2/+1
Use dummy length in proto_tree_add_subtree_format(), proto_item_set_len() will set the correct length later. Bug: 15120 Change-Id: I7a56f3d1541b75eb53bc03750b6402a8b78a8251 Reviewed-on: https://code.wireshark.org/review/29465 Petri-Dish: Anders Broman <a.broman58@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-09-12nas5gs: Align with version 15.0.0AndersBroman1-12/+8
Change-Id: I068bef5cb9536e2af0c2be473841f4325b461cce Reviewed-on: https://code.wireshark.org/review/29632 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-09-12gsm_a_gm: Fix dissection of 10.5.6.3 Protocol configuration options.AndersBroman1-3/+11
Session-AMBR dissected as QoS rules PDU session address lifetime dissected as Session-AMBR. Change-Id: Iee9e630644638718f37ddbc185e23add32ee61ea Reviewed-on: https://code.wireshark.org/review/29630 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-09-12MBIM: changes after Microsoft fixed documentationJano Svitok1-29/+51
- update doc link to MBIM_CID_PCO - add numeric values and dissector skeleton for MBIM_CID_BASE_STATIONS_INFO and MBIM_CID_LOCATION_INFO_STATUS - MBIM_CID_MS_NETWORK_BLACKLIST: Set command has the same data as response - MBIM_CID_MS_NETWORK_BLACKLIST: Query command has no data, but is legal Change-Id: I8158029ae1e9ae2bc6fb389e889eb0bb71aa3d5d Reviewed-on: https://code.wireshark.org/review/29624 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-09-12QUIC: implement packet coalescing (draft >= 11)Peter Wu1-13/+57
Messages with long headers have a payload length while short header messages extend to the end of a datagram. Create a new tvb for every message since the decryption routines assume that the header starts from the beginning of the tvb. quic_get_message_tvb tries to avoid throwing exceptions in most cases if the (payload) length is too large such that dissection can proceed until the payload is encountered. (One edge case is when the varint cannot even be read, but then indeed the message is severely malformed.) Change-Id: Id42f55dfd73905b709b218002b9ca660f6f703f1 Ping-Bug: 13881 Reviewed-on: https://code.wireshark.org/review/29607 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-09-11QUIC: ensure handshake keys availability before PKNPeter Wu1-20/+15
Prepare for PKN decryption (draft -12) during the initial handshake. Ping-Bug: 13881 Change-Id: I675086f732e39679bcb94e2e20da3d4bd40d0f2e Reviewed-on: https://code.wireshark.org/review/29606 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-09-11Go back to using a #pragma directly.Guy Harris2-12/+26
See if *that* prevents us from failing with a warning; -Wno-error=unused-function doesn't seem to do the trick. Change-Id: If2dec4ca70451670d0181c6cd0c7bc714e856c95 Reviewed-on: https://code.wireshark.org/review/29613 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-09-11ieee80211: Fix Dead Store (Dead assignement/Dead increment) Warning found by ↵Alexis La Goutte1-1/+1
Clang Change-Id: I27c82383987aa4da3bf86c5abc0d467252be5c80 Reviewed-on: https://code.wireshark.org/review/29599 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-09-11ieee80211: Fix some issues with the D3.0 support.Richard Sharpe1-7/+10
The ieee80211ax D3.0 support got merged accidentally with some issues. This fixes the remainder of those issues. Change-Id: I2a3a427e04cb1dca076fd761458de92d4d5e0df2 Reviewed-on: https://code.wireshark.org/review/29602 Petri-Dish: Richard Sharpe <realrichardsharpe@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-09-11QUIC: Remove draft-10 supportAlexis La Goutte1-143/+40
Bug: 13881 Change-Id: I11270c6be4304a5d37216cb2e09ae0d4149091b0 Reviewed-on: https://code.wireshark.org/review/29603 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-09-11nas5gs: 9.10.4.7 PDU address. IPv6 type is a 8 byte link local address.AndersBroman1-6/+11
Change-Id: Ic83fd7fe2480946201732b38f42596f346ba48f5 Reviewed-on: https://code.wireshark.org/review/29601 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-09-11Use DIAG_OFF to suppress -Wunused-function.Guy Harris2-14/+10
Change-Id: I1846e4ef1be977553510ff1473d4c1a7e12cce18 Reviewed-on: https://code.wireshark.org/review/29594 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-09-11Squelch more narrowing warnings.Guy Harris1-8/+8
Change-Id: I1bd9f8c048af29abc26eb85f814dd4ec8663501c Reviewed-on: https://code.wireshark.org/review/29593 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-09-11"#if 0" out an unused variable.Guy Harris1-0/+2
Change-Id: I78cd22e7d7b43e072c71f21ba13aa56ce83afa15 Reviewed-on: https://code.wireshark.org/review/29592 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-09-11sizeof isn't useful when calculating the size of data in the packet.Guy Harris1-8/+8
Srsly, you're dealing with *one-byte*, *two_byte*, and *four-byte* values, might as well say "1", "2", and "4" - either sizeof(guint8) is guaranteed to be 1, sizeof(guint16) is guaranteed to be 2, and sizeof(guint32) is guaranteed to be 4, in which case you might as well just use 1, 2, and 4, or they're *not* guaranteed to be 1, 2, and 44, in which case you *have* to use 1, 2, and 4, because a value other than 1, 2, or 4 is invalid. Change-Id: I49b354cd619f6fe8d625af0322f4861ad8f9b1f1 Reviewed-on: https://code.wireshark.org/review/29591 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-09-11WIP:ieee80211.c: Add support for D3.0 of 802.11axRichard Sharpe1-333/+1312
This changeset merges in the changes that have been tested in a resent test event at the WFA. It will not dissect older D2.x packet captures. Change-Id: Id38a27a61a6a2a083575448e5c59a8e190827e6d Reviewed-on: https://code.wireshark.org/review/29512 Petri-Dish: Richard Sharpe <realrichardsharpe@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-09-11[packet-dnp.c] - Better solution for handling malformed messages containing ↵Chris Bontje1-29/+56
"empty objects" with misreported counts. - this change re-enables dissection of large lists of sequential objects lacking prefixes. - corrected some object/variation text in the comments Change-Id: Ia410f53198e9918509208739c94dbb4df4ecfc25 Reviewed-on: https://code.wireshark.org/review/29582 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-09-11Squelch a narrowing warning.Guy Harris1-1/+1
Change-Id: Ibe75903250dd9cccd2b4a80d1215f5ea6fd0cce2 Reviewed-on: https://code.wireshark.org/review/29590 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-09-11Squelch a narrowing warning.Guy Harris1-1/+1
Change-Id: I5ff9095208956b9e40e5820986e0253ec2a76116 Reviewed-on: https://code.wireshark.org/review/29589 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-09-11Avoid collision between parameter names and function names.Guy Harris2-4/+4
Change-Id: I206d05c47c9f9089a201783ae2d0856c97a5e502 Reviewed-on: https://code.wireshark.org/review/29588 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-09-11MGCP: Ignore case for command headerUli Heilmeier1-9/+9
Bug: 15008 Change-Id: Ibfd9bd8d9d93ddac8c5441be9f5e27c3e095c11b Reviewed-on: https://code.wireshark.org/review/29502 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-09-11docsis: Fix Dead Store (Dead assignement/Dead increment) Warning found by ClangAlexis La Goutte1-0/+2
Change-Id: I2d7e2d2c83dddc666c7ef85727af986b65b12a13 Reviewed-on: https://code.wireshark.org/review/29567 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Andrii Vladyka <a.vladyka@ukr.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-09-11Don't fill in a variable if you don't use the value.Guy Harris1-2/+1
Change-Id: I50c9cf5daa22c9d53e6ca642e6651948a04e8e64 Reviewed-on: https://code.wireshark.org/review/29587 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-09-11sizeof isn't useful when calculating the size of data in the packet.Guy Harris1-2/+2
Srsly, you're dealing with *four-byte* value, might as well say "4" - either sizeof(guint32) is guaranteed to be 4, in which case you might as well just use 4, or it's *not* guaranteed to be 4, in which case you *have* to use 4, because a value other than 4 is invalid. Change-Id: I6deb106f326e9402744a2e728468b3ce4c220b02 Reviewed-on: https://code.wireshark.org/review/29586 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-09-11sizeof isn't useful when adding to an offset into the packet.Guy Harris1-1/+1
Srsly, you're fetching a *two-byte* value, might as well say "2" - either sizeof(guint16) is guaranteed to be 2, in which case you might as well just use 2, or it's *not* guaranteed to be 2, in which case you *have* to use 2, because a value other than 2 is invalid. Change-Id: I9da8dc66d3a77e98cb0a0a5501655594c509eb87 Reviewed-on: https://code.wireshark.org/review/29585 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-09-10f5ethtrailer: Add some casts to squelch narrowing warning.João Valverde1-3/+3
Change-Id: If8cef41c69f397af2e36bb35ffa596fa656e8401 Reviewed-on: https://code.wireshark.org/review/29583 Reviewed-by: João Valverde <j@v6e.pt>
2018-09-10rtp-ed137: squelch checkAPI warning about shadowed variableGraham Bloice1-3/+3
Change-Id: If9ae00895f12eeeda7590be62e1057397cc88c51 Reviewed-on: https://code.wireshark.org/review/29581 Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2018-09-10MBIM: Dissect UUID_MS_UICC_LOW_LEVEL/MBIM_CID_MS_UICC_ATRJano Svitok1-0/+55
Change-Id: Ie2d4f2d7a4f38e9f56d8c35cdbddfef20a61ef23 Reviewed-on: https://code.wireshark.org/review/29577 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-09-10MBIM: MBIM_CID_MS_PROVISIONED_CONTEXT_V2 Query is legalJano Svitok1-2/+2
InformationBuffer must be empty Change-Id: I78367fc540122af099c3d9ab020b210ba112d997 Reviewed-on: https://code.wireshark.org/review/29576 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-09-10evs: fix headerAlexis La Goutte1-3/+3
Change-Id: Iae4fc9289a6480430588c2de522f79b10b8cf6b1 Reviewed-on: https://code.wireshark.org/review/29558 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-09-10evs: add modelines infoAlexis La Goutte1-0/+14
Change-Id: I48f2c730b1eebb26fee53dcf22d20e3a9b9f536b Reviewed-on: https://code.wireshark.org/review/29557 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-09-10evs: remove unused var and set unused param.Dario Lombardo1-7/+1
Change-Id: Ia9815af5e4cdecf4a2a25ed226acacfdd9dd38c0 Reviewed-on: https://code.wireshark.org/review/29554 Petri-Dish: Dario Lombardo <lomato@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-09-10EVS: Add a dissector for RTP payload type EVS.AndersBroman2-0/+670
Change-Id: I00dee6f16684ec8116d1ef8cf278e889ffebaabf Reviewed-on: https://code.wireshark.org/review/29550 Petri-Dish: Anders Broman <a.broman58@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>