aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-mac-nr.c
AgeCommit message (Collapse)AuthorFilesLines
2021-04-30MAC-NR: workaround a gcc 9.3.0 for AMR64 false positive.Thomas Dreibholz1-1/+1
2021-01-03PDCP-NR: Set 'cipheringDisabled' from RRCMartin Mathieson1-1/+1
2020-09-24MAC-NR:for drb the lcid range is 4-32,lcid=3 corresponding srb3Xu1-2/+1
2020-06-20MAC-NR: get rid of an unnecessary level of indirection.Guy Harris1-11/+11
Don't take the address of an hf_ field and then, in the called routine, dereference the pointer; just pass the hf_ field value. In the cases where we're passing a member of an array of pointers, dereference the pointer at the call site. Change-Id: I022ce46c196621088e093f9a43d57b4653c957f7 Reviewed-on: https://code.wireshark.org/review/37526 Petri-Dish: Guy Harris <gharris@sonic.net> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <gharris@sonic.net>
2020-06-19Fix the type of arrays of pointers to hf_ values for bitfield routines.Guy Harris1-21/+21
The static arrays are supposed to be arrays of const pointers to int, not arrays of non-const pointers to const int. Fixing that means some bugs (scribbling on what's *supposed* to be a const array) will be caught (see packet-ieee80211-radiotap.c for examples, the first of which inspired this change and the second of which was discovered while testing compiles with this change), and removes the need for some annoying casts. Also make some of those arrays static while we're at it. Update documentation and dissector-generator tools. Change-Id: I789da5fc60aadc15797cefecfd9a9fbe9a130ccc Reviewed-on: https://code.wireshark.org/review/37517 Petri-Dish: Guy Harris <gharris@sonic.net> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-08-17MAC-NR: replace the SFN/SF timestamp by SFN/SlotPascal Quantin1-9/+41
A subframe number is not as useful as in LTE due to the different sub-carrier spacing in NR; use the slot number instead. While we are at it, uniformize a bit the label and info display. Change-Id: I432546ab38b07e7f256493ece25595a10613841d Reviewed-on: https://code.wireshark.org/review/34314 Petri-Dish: Pascal Quantin <pascal@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-08-01MAC-NR: SRS Act-Deact CE dissection improvements.Martin Mathieson1-7/+46
For SSB, mask off lower bit that isn't part of the resource ID. Also, show more in the Info column. Change-Id: I3741e7979c0a4c5878ba1f054f86a9457166be03 Reviewed-on: https://code.wireshark.org/review/34157 Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2019-08-01MAC-NR: Call RLC dissector for SRB LCIDs using defaults.Martin Mathieson1-2/+18
Change-Id: Id1c27d7af822f8201145eaf7ba5d0b731f8e0ced Reviewed-on: https://code.wireshark.org/review/34150 Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2019-07-26HTTPS (almost) everywhere.Guy Harris1-1/+1
Change all wireshark.org URLs to use https. Fix some broken links while we're at it. Change-Id: I161bf8eeca43b8027605acea666032da86f5ea1c Reviewed-on: https://code.wireshark.org/review/34089 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-07-01MAC NR: upgrade dissector to v15.6.0Pascal Quantin1-16/+16
Change-Id: Ib0451d4031e84d8ec13d3694a634d962ca8206fe Reviewed-on: https://code.wireshark.org/review/33810 Petri-Dish: Pascal Quantin <pascal@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-05-09MAC-NR: Fix a couple of issues with configuring RLC bearers from RRC.Martin Mathieson1-1/+2
Need to make sure to read UM/AM direction before reading SN-length. Also fix a backward test while looking up stored SNLength. Change-Id: I4dbb701efe80c78fee5e1af9e405b2cf883f7401 Reviewed-on: https://code.wireshark.org/review/33129 Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> Reviewed-by: Pascal Quantin <pascal@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2019-04-29NR: Configure LCID -> RLC Bearer config from RRCMartin Mathieson1-42/+216
Change-Id: Ida6af4ccd2157f967b9d2340e6f12319e4dbe688 Reviewed-on: https://code.wireshark.org/review/32998 Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2019-04-04epan: Convert our PROTO_ITEM_ macros to inline functions.Gerald Combs1-13/+13
Convert our various PROTO_ITEM_ macros to inline functions and document them. Change-Id: I070b15d4f70d2189217a177ee8ba2740be36327c Reviewed-on: https://code.wireshark.org/review/32706 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-01-29MAC NR: add dissection of NR PHR and PCMAX,f,c fieldsPascal Quantin1-22/+74
Change-Id: I86734442de4fcc4781fbee4517d6dccd87f8da30 Reviewed-on: https://code.wireshark.org/review/31806 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-10-23MAC NR: put conditions on HarqId and PUCCH report type displayPascal Quantin1-8/+12
Both are only applicable for unicast transmissions, and the latter is only meaningful for UL-SCH Change-Id: If8a512b02964ec1be63a3901bd8c84082325659e Reviewed-on: https://code.wireshark.org/review/30342 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2018-10-23MAC NR: fix (for real) mac-nr.harqid field definitionPascal Quantin1-3/+3
Change-Id: I6f0218a215701750070920cf40e85209b07e1972 Reviewed-on: https://code.wireshark.org/review/30340 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-10-22MAC NR: fix mac-nr.harqid field definitionPascal Quantin1-1/+1
Change-Id: Ibfab6275439d78874070fcbd87c267956b628b56 Reviewed-on: https://code.wireshark.org/review/30339 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-10-22MAC-NR: Add harq-id to the struct and contextMartin Mathieson1-0/+16
Change-Id: Id5c68dc2a4a334a27590d1ee417f9f30c81a3d7e Reviewed-on: https://code.wireshark.org/review/30335 Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2018-10-20Separate signed and unsigned decimal UAT fields.Guy Harris1-2/+2
Most of them are unsigned; do the appropriate fetching, checking, and writing-to-UAT-file for them. Have separate macros and routines for the one signed one, which is the drbid in the LTE MAC dissector. Use the Wireshark string-to-number routines; they do the appropriate bounds checking, and make sure unsigned numbers don't start with a -. Change-Id: I4f137aa31d631c5b5622b2c320574b8ab3333f31 Reviewed-on: https://code.wireshark.org/review/30288 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-10-15MAC NR: align Multiple Entry PHR MAC CE decoding with v15.3.0Pascal Quantin1-38/+11
Change-Id: I4ca2284c3b0418116e810a7c66d693a3647e4191 Reviewed-on: https://code.wireshark.org/review/30217 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com> Tested-by: Petri Dish Buildbot
2018-10-12MAC NR: fix dissection of Long Truncated BSR CEPascal Quantin1-20/+61
As specified in 3GPP 38.321, in case of Long Truncated BSR CE, the UE reports the BSR value for the LCG(s) with the logical channels having data available for transmission following a decreasing order of the highest priority logical channel (with or without data available for transmission) in each of these LCG(s), and in case of equal priority, in increasing order of LCGID. SO we cannot make any assumption on the LCG being reported without keeping track of the logical channel priorities currently active. Change-Id: I148a13446e9dc035bb1bcd79cb15d8570bcefa57 Reviewed-on: https://code.wireshark.org/review/30151 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com> Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
2018-10-10MAC NR: call NR RRC dissector for broadcast and common channelsPascal Quantin1-15/+77
Change-Id: I70b7356e15023400189a4ab57a41473da7363374 Reviewed-on: https://code.wireshark.org/review/30121 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com> Tested-by: Petri Dish Buildbot
2018-10-10MAC NR: upgrade dissector to v15.3.0Pascal Quantin1-32/+17
Change-Id: I017c04d44ed156ced140bb96e153a8738f143f62 Reviewed-on: https://code.wireshark.org/review/30117 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2018-10-03MAC-NR: Update to current RAR PDU formatMartin Mathieson1-10/+10
Change-Id: I802a74148386e972153b3cb9e2a25adb117811d6 Reviewed-on: https://code.wireshark.org/review/30003 Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2018-09-27MAC-NR: Fix up some small issues while viewing SDUs, some of which are ↵Martin Mathieson1-2/+19
dissected as RLC PDUs Change-Id: I6df7ab99197fccb9a014df272c2791a2df1a3dc9 Reviewed-on: https://code.wireshark.org/review/29891 Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2018-08-28NR MAC: Use static config of DRB channel settings across all UEs.Martin Mathieson1-1/+304
This is similar to what LTE did before RRC was doing detailed bearer configuration. Change-Id: Ieee735ad1269f9ce962137c97c2c18431b6a1d48 Reviewed-on: https://code.wireshark.org/review/29315 Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2018-08-09MAC-NR: Fix length tracking of SRS ACT/DEACT CEMartin Mathieson1-1/+1
Change-Id: I21384e5223ed11f6139a370fafd9026a0c444dd1 Reviewed-on: https://code.wireshark.org/review/28996 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2018-06-20MAC NR: upgrade dissector to v15.2.0Pascal Quantin1-41/+650
Change-Id: Id7e7bf6b06f029d162666928a39362e685a8b747 Reviewed-on: https://code.wireshark.org/review/28350 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-06-15MAC NR: fix dissection of single byte padding CEPascal Quantin1-11/+18
Change-Id: Icff0ffb4600bd778946ca879995edf710cc38e48 Reviewed-on: https://code.wireshark.org/review/28284 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-05-13mac-nr: check that control elements happen in the appropriate placeMartin Mathieson1-4/+31
Change-Id: I61ac442bfb7a4d81d544eec876d878eacc242239 Reviewed-on: https://code.wireshark.org/review/27501 Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2018-05-06mac-nr: Break down the RAR UL GrantMartin Mathieson1-3/+76
Change-Id: I30df646ba49e1c73e2ba90c43578071841ff317a Reviewed-on: https://code.wireshark.org/review/27336 Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2018-05-03mac-nr: 15.1.0 changes to RAR PDUMartin Mathieson1-6/+19
Change-Id: I0442831b13ecf276d4235230a6a9aa0788e91d3f Reviewed-on: https://code.wireshark.org/review/27282 Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2018-04-13MAC NR: add an expert info for unknown UDP framing tagsPascal Quantin1-1/+14
Change-Id: I03013e02856508179d1d75ece5d5c215b947eeb4 Reviewed-on: https://code.wireshark.org/review/26913 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-04-04MAC-NR: upgrade dissector to v15.1.0Pascal Quantin1-309/+1080
Change-Id: Ie9a11cd9049d19f95f4f48f3380847329536d762 Reviewed-on: https://code.wireshark.org/review/26737 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-03-22mac-nr: Minor changesMartin Mathieson1-2/+28
Minor display issues, and show in context tree 2 recently-introduced fields. Change-Id: I14ecde0059d17abd17767d4d0c34ba093fa1987f Reviewed-on: https://code.wireshark.org/review/26596 Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2018-03-22mac-nr: fix some wrongly named field namesMartin Mathieson1-42/+42
Fix some wrongly named fields names related to multiple entry PHRs. Change-Id: I87b8b53ddfb86255d4840a73cdf4e570b7f9b9f0 Reviewed-on: https://code.wireshark.org/review/26590 Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2018-03-22nr-mac: Add Multiple Entry PHR CE to nr-macMartin Mathieson1-6/+301
This will likely change in the future as we: - add support for 32-bits of flags for when there are higher SCellIndex - possibly add different filters for each type of ph measurement - possibly add separate filters for the pcmax_c fields Change-Id: Icb9b242910a41b1b9e448ae2cd1dbd54a418fd36 Reviewed-on: https://code.wireshark.org/review/26507 Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2018-03-19MAC-NR: unify BSR filtersPascal Quantin1-173/+399
Use a single filter for short/long (truncated) BS values to ease filtering. Rename other filters to the new mac-nr.bsr.* format. Fill the missing entries in 8 bits buffer size levels array. Change-Id: If150f9a951efb40e554c5ea18639cfd4539a1319 Reviewed-on: https://code.wireshark.org/review/26539 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2018-03-17MAC-NR: add BCCH BCH decodingPascal Quantin1-5/+100
Change-Id: I7a3b99ce99c8589286a6e99728e809a9c9475977 Reviewed-on: https://code.wireshark.org/review/26519 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-03-17MAC-NR: minor display adjustmentsPascal Quantin1-9/+9
Change-Id: Ib599eb5ca979cb1214576e6932eb8b1bf3bdc560 Reviewed-on: https://code.wireshark.org/review/26518 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2018-03-165G/NR MAC dissector. Incomplete and only partly tested.Martin Mathieson1-0/+1748
Change-Id: I749d3b967f65c7c21e995b721a3fbcf62c523d15 Reviewed-on: https://code.wireshark.org/review/26381 Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>