aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-gsm_rlcmac.h
AgeCommit message (Collapse)AuthorFilesLines
2021-12-22Corrects repeated words throughout the code.Moshe Kaplan1-1/+1
Repeated words were found with: egrep "(\b[a-zA-Z]+) +\1\b" . -Ir and then manually reviewed. Non-displayed strings (e.g., in comments) were also corrected, to ease future review.
2020-07-18rlcmac: Decode properly Pkt Ul ACK/NACK R99 AdditionsPau Espin Pedrol1-7/+11
First, remove the unnecessary M_UNION there, and handle Fixed Allocation Parameters are per older version of spec TS 44.060 with usual presence bit + struct. The coding of the struct is left unimplemented as an exercise for someone needing it in the future (since it's not supposed to be used by current specs anyway). Once this is cleared up, the rest of the message (Release 99 Additions) are parsed fine. Tested with a pcap trace containing a Pkt Ul ACK/NACK with R99 additions and TBF_EST inside it. CSN.1 Reference: 3GPP TS 44.060 Table 11.2.28.1 Change-Id: Ie22e99abdbc2bb3988e7a1930d459ba810a348ac Reviewed-on: https://code.wireshark.org/review/37776 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Vadim Yanitskiy <vyanitskiy@sysmocom.de> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2020-03-25rlcmac: Introduce MS Radio Access Capabilities 2 to fix related spare bitsPau Espin Pedrol1-3/+3
There's two variants for the Ms Radio Access Capabilities. * The usual encoding with spare bits (usually to fill up to octet boundary) as defined in TS 24.008 Table 10.5.146 And there's too: * MS Radio Access Capabilities 2 IE from TS44.060 section 12.30, which is the same but removing all spare bits, and which is used in messages like Packet Resource Request and Additional MS RAC messages. The later is used basically for messages having extra IEs after the MS Radio Access capabilities IE, since they are encoded immediatelly afterwards. So this patch does: * Adds the expected spare bits (M_PADDING) to MS_Radio_Access_capability_t * Creates a new MS_Radio_Access_capability2_t without padding * Updates code to use the new "2" version where needed. The new MS_Radio_Access_capability_t with padding is disabled since it's not used in wirehsark because it's using an ad-hoc decoder for that TS 24.008 IE: see packet-gsm_a_gm.c de_gmm_ms_radio_acc_cap() Port from osmo-pcu.git e50ce6e45c4509805807d599cadf1a1b23d37f63 Related: https://osmocom.org/issues/4463 Change-Id: Ie2844bd94437c8d7a50787cc7c8c4d81a4fc48ba Reviewed-on: https://code.wireshark.org/review/36574 Petri-Dish: Pascal Quantin <pascal@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2020-03-25rlcmac: Fix bug receiving RA capPau Espin Pedrol1-13/+5
It seems the assumptions regarding maximum number of RA capabilitites in one message were wrong. Doing some rough calculations, each RA capabilitiy value (without extensions) can take around 20ish bits, which means for a message containing up to 52 bytes that quite a lot of different values could be theoretically fed in. Let's be safe and increase the array size to be able to handle all different access technologies listed in See TS 24.008 table 10.5.146 following restrictions: * "The MS Radio Access capability is a type 4 information element, with a maximum length of 52 octets." * "Among the three Access Type Technologies GSM 900-P, GSM 900-E and GSM 900-R only one shall be present." * "the mobile station should provide the relevant radio access capability for either GSM 1800 band OR GSM 1900 band, not both". Port from osmo-pcu.git 7faa5da209d0ef48fe593603c217615f09fb61fb. Related: https://osmocom.org/issues/4463 Change-Id: Ief5189f88ba0e4970847567c9a15b1ada8b9df4b Reviewed-on: https://code.wireshark.org/review/36573 Reviewed-by: Harald Welte <laforge@gnumonks.org> Petri-Dish: Pascal Quantin <pascal@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal@wireshark.org>
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>
2018-02-12dissectors: use SPDX identifiers.Dario Lombardo1-13/+1
Change-Id: I92c94448e6641716d03158a5f332c8b53709423a Reviewed-on: https://code.wireshark.org/review/25756 Petri-Dish: Dario Lombardo <lomato@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-05-08[GSM RLCMAC] Update : PACKET RESOURCE REQUEST to Release 14.0.0AndersBroman1-0/+145
Change-Id: I41e6ebf862f0bd9523778053d40f18ae7385a5bd Reviewed-on: https://code.wireshark.org/review/21560 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-02-16[GSM RLCMAC] Added parsing of EC-EGPRS DL and UL data messages.AndersBroman1-0/+15
Change-Id: Ia7c74a834d2384642cac7f9a2899313b9bac7c26 Reviewed-on: https://code.wireshark.org/review/20141 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-13GSM RLC/MAC: add dissection of EC-GSM-IoT control messagesAnton Thomasson1-29/+370
Change-Id: Ib7096039aa9761fda96ed8552899833597ba70a6 Reviewed-on: https://code.wireshark.org/review/15812 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-06-11GSM RLC/MAC: improve dissection of Packet Resource Request messageVincent Helfre1-2/+36
Change-Id: I8513ef550e81a97e1a8ac1c1f365355118d5ebae Reviewed-on: https://code.wireshark.org/review/15827 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>
2016-06-02GSM RLC/MAC: add dissection of 2G->3G/4G PS handoverPascal Quantin1-2/+5
Change-Id: Ia24055d7d871b9fbf69a9225a2a273fced950a3c Reviewed-on: https://code.wireshark.org/review/15700 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>
2016-06-01GSM RLC/MAC: add dissection of NAS containerVincent Helfre1-4/+9
While we are at it, let's display other containers in hexadecimal instead of decimal Change-Id: I6ac6dd2a64271cbc2958860550da9024445bfe19 Reviewed-on: https://code.wireshark.org/review/15675 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-14Always put editor-modelines at the end of the file ...Bill Meier1-3/+3
... to ensure that there are no potential issues with respect to editors limiting the number of lines scanned at the end of the file when checking for editor modelines. Change-Id: Ic85cbb108bb5159d6ec4116fea11f5eebb4e44a4 Reviewed-on: https://code.wireshark.org/review/4688 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-09-29Add editor modelines and adjust indentation as needed.Bill Meier1-0/+13
Change-Id: Id57d264299f2026d703c5b08bace4b24b32f184c Reviewed-on: https://code.wireshark.org/review/4371 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-03-04Remove all $Id$ from top of fileAlexis La Goutte1-2/+0
(Using sed : sed -i '/^ \* \$Id\$/,+1 d') Fix manually some typo (in export_object_dicom.c and crc16-plain.c) Change-Id: I4c1ae68d1c4afeace8cb195b53c715cf9e1227a8 Reviewed-on: https://code.wireshark.org/review/497 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-01-13f_k() is used outside packet-gsm_a_rr.c, so it can't be static.Guy Harris1-2/+0
In a source file that defines external functions, the header file that declares the functions must be included, in order to make sure the declarations match the function signature. Make it so - which means creating the header file in the first place. That means f_k() doesn't need to, and shouldn't be, declared in packet-gsm_rlcmac.h. Include packet-gsm_a_rr.h in packet-gsm_rlcmac.c. svn path=/trunk/; revision=54724
2013-08-10Fix (-W)documentation error found by ClangAlexis La Goutte1-2/+2
./packet-gsm_rlcmac.h:1086:1: error: not a Doxygen trailing comment [-Werror,-Wdocumentation] /*< MS Radio Access capability IE > ^~~ /**< ./packet-gsm_rlcmac.h:1089:26: error: not a Doxygen trailing comment [-Werror,-Wdocumentation] typedef guint8 A5_bits_t;/*<A5 bits> ::= < A5/1 : bit> <A5/2 : bit> <A5/... ^~~~~ /**< packet-gsm_rlcmac.c:169:1: error: not a Doxygen trailing comment [-Werror,-Wdocumentation] /*< Global TFI IE >*/ ^~~ /**< packet-gsm_rlcmac.c:171:1: error: not a Doxygen trailing comment [-Werror,-Wdocumentation] /*< Starting Frame Number Description IE >*/ ^~~ /**< packet-gsm_rlcmac.c:174:1: error: not a Doxygen trailing comment [-Werror,-Wdocumentation] /*< Ack/Nack Description IE >*/ ^~~ /**< packet-gsm_rlcmac.c:178:1: error: not a Doxygen trailing comment [-Werror,-Wdocumentation] /*< Packet Timing Advance IE >*/ ^~~ /**< packet-gsm_rlcmac.c:183:1: error: not a Doxygen trailing comment [-Werror,-Wdocumentation] /*< Power Control Parameters IE >*/ ^~~ /**< packet-gsm_rlcmac.c:191:1: error: not a Doxygen trailing comment [-Werror,-Wdocumentation] /*< Global Power Control Parameters IE >*/ ^~~ /**< packet-gsm_rlcmac.c:195:1: error: not a Doxygen trailing comment [-Werror,-Wdocumentation] /*< Global Packet Timing Advance IE >*/ ^~~ /**< packet-gsm_rlcmac.c:197:1: error: not a Doxygen trailing comment [-Werror,-Wdocumentation] /*< Channel Quality Report struct >*/ ^~~ /**< packet-gsm_rlcmac.c:210:1: error: not a Doxygen trailing comment [-Werror,-Wdocumentation] /*< EGPRS Ack/Nack Description >*/ ^~~ /**< packet-gsm_rlcmac.c:216:1: error: not a Doxygen trailing comment [-Werror,-Wdocumentation] /*<P1 Rest Octets>*/ ^~~~~ /**< packet-gsm_rlcmac.c:218:1: error: not a Doxygen trailing comment [-Werror,-Wdocumentation] /*<P2 Rest Octets>*/ ^~~~~ /**< packet-gsm_rlcmac.c:264:1: error: not a Doxygen trailing comment [-Werror,-Wdocumentation] /*< SI 13 Rest Octets >*/ ^~~ /**< packet-gsm_rlcmac.c:288:1: error: not a Doxygen trailing comment [-Werror,-Wdocumentation] /*< Packet TBF Release message content >*/ ^~~ /**< packet-gsm_rlcmac.c:293:1: error: not a Doxygen trailing comment [-Werror,-Wdocumentation] /*< Packet Control Acknowledgement message content >*/ ^~~ /**< packet-gsm_rlcmac.c:299:1: error: not a Doxygen trailing comment [-Werror,-Wdocumentation] /*< Packet Downlink Dummy Control Block message content >*/ ^~~ /**< packet-gsm_rlcmac.c:301:1: error: not a Doxygen trailing comment [-Werror,-Wdocumentation] /*< Packet Uplink Dummy Control Block message content >*/ ^~~ /**< packet-gsm_rlcmac.c:305:1: error: not a Doxygen trailing comment [-Werror,-Wdocumentation] /*< MS Radio Access capability IE >*/ ^~~ /**< svn path=/trunk/; revision=51267
2012-11-30From Mike Morrin:Anders Broman1-8/+8
The gsm rlcmac dissector truncates the 12 bit BSNs to 8 bits when storing them. Fix this and the handling of BSN2 is refactored to clarify the difference between BSN2 (the stored value) and BSN2_offset (the value transferred at the air interface). svn path=/trunk/; revision=46301
2012-09-29From Mike Morrin via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7615 :Pascal Quantin1-1/+1
Fix minor bug in dissection of "e" bit and add value strings for remaining data block header fields svn path=/trunk/; revision=45206
2012-09-14From Mike Morrin:Anders Broman1-5/+5
Fix pedantic compiler warnings in csn.1 dissectors. There is some tricky casting going on in csn.1 structures. To eliminate all the warnings, the function pointers needed to be moved out of the object pointer unions. Fortunately macros (mostly) hide these changes from the protocol dissector tables. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7686 svn path=/trunk/; revision=44899
2012-09-11Enhance dissection of PSI1Pascal Quantin1-14/+21
svn path=/trunk/; revision=44870
2012-09-07From Mike Morrin:Anders Broman1-19/+21
Interface based on header type rather than MCS. passes in the header type for EGPRS packets. This makes sense because in a real protocol stack, the header type is encoded in the burst stealing bits, allowing the header can be decoded, giving the CPS IE, which then allows the data blocks to be decoded, so wireshark now follows the same practice. I found that there was a (previously overlooked) alignment error in decoding the last octet of some headers due to the last "octet" having less than 8 bits, and both the protocol stacks I have here assume that the left-hand bits are missing (as per the figures in 44.060). I corrected this by making a small extension to the NULL encoding in packet-csn.[ch] to allow a NULL field to consume more than 0 bits. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7615 svn path=/trunk/; revision=44805
2012-09-02From Mike Morrin:Anders Broman1-8/+168
Enhancemnt to GSM RLCMAC dissection adding dissection of data block headers https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7615 svn path=/trunk/; revision=44741
2012-08-08Remove Uplink messages from the RlcMacDownlink_t structure (as they are part ↵Pascal Quantin1-37/+16
of the RlcMacUplink_t structure that is also used to call csnStreamDissector function) svn path=/trunk/; revision=44319
2012-08-07Make sure we have a corresponding 'u' member to RlcMacDownlink_t forGerald Combs1-17/+28
every call to csnStreamDissector. This should fix bug 7561. Based on attachment 8888 from Martin Kaiser. svn path=/trunk/; revision=44307
2012-06-28Update Free Software Foundation address.Jakub Zawadzki1-1/+1
(COPYING will be updated in next commit) svn path=/trunk/; revision=43536
2012-02-23From Lei Chen:Anders Broman1-0/+3
a patch to support decode FDD_CELL_INFORMATION of "UTRAN FDD Description" in packet-gsm_rlcmac.c https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6856 svn path=/trunk/; revision=41149
2012-01-21From Mike Morrin:Anders Broman1-3/+12
a patch which improves several aspects of GSM RLS/MAC dissection. Generic improvements to the csn.1 dissector include: • Added a flag to the type descriptor structure so that any type can (potentially) flagged as xxx_OR_NULL. This was specifically needed for UINT_OR_NULL for the ms capabilities struct. • Corrected the octet calculation in app of the proto_tree_add_text() and proto_item_set_len() calls. • Changed the CSN_SERIALIZE so that the length of the length field can be specified. • For CSN_NEXT_EXIST removed the requirement that the next type be CSN_END, to allow truncation of multiple IEs. • For CSN_LEFT_ALIGNED_VAR_BITMAP corrected the handling of bit_offset. • Added a new type CSN_PADDING_BITS to make inspection of padding bits more convenient. • Improved the CSN_RECURSIVE_TARRAY_1 to show the array index. Improvements to the gsm_rlcmac dissector include: • Comment out a couple of unused hf variables. • Rework the definition of EGPRS Ack/Nack Description so that the length IE (and absence thereof) is handled correctly. This is the original issue for which the bug was raised. • Added Padding Bits definitions to all PDUs • Change the Multislot_capability_t and Content_t definitions to allow truncation at any IE • Added proto_tree_add_protocol_format() calls so that the protocol can be added to a display filter • Append Protocol to the PROTOCOL column and PDU type to the INFO column. From me get rid of C++ style comments. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6375 svn path=/trunk/; revision=40627
2011-12-06#if 0 unused stuff ...Bill Meier1-93/+115
svn path=/trunk/; revision=40102
2011-09-07From Lei Chen:Anders Broman1-30/+145
upgrade PCCF/PMR/PEMR in packet-gsm_rlcmac.c https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6313 svn path=/trunk/; revision=38909
2011-09-01From Lei Chen:Anders Broman1-4/+341
Upgrade 'Packet Cell Change Order', 'Packet Cell Change Notification' and 'Packet Measurement Order' to R10. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6300 svn path=/trunk/; revision=38838
2011-07-29From Lei Chen:Anders Broman1-69/+176
support PSI5 and PSI13 in packet-gsm_rlcmac.c https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6177 svn path=/trunk/; revision=38248
2011-07-28From Lei Chen:Anders Broman1-32/+106
support 'Packet System Information Type 3' in packet-gsm_rlcmac.c https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6170 svn path=/trunk/; revision=38231
2011-07-26From Lei Chen:Anders Broman1-6/+6
This patch tries to support 'Packet System Information Type 2' in gsm rlcmac dissector. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6167 svn path=/trunk/; revision=38206
2011-07-20From Lei Chen:Anders Broman1-0/+42
patch to support "Additional MS Radio Access Capability" and "Packet Pause" in packet-gsm_rlcmac.c https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6133 svn path=/trunk/; revision=38136
2011-07-06From Ludovic Haessler:Anders Broman1-0/+1
Wrong decoding of RLC/MAC EGPRS Packet Downlink Ack/Nack (3GPP TS 44.060) https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6098 svn path=/trunk/; revision=37919
2011-05-16Remove extra ;Anders Broman1-1/+1
svn path=/trunk/; revision=37177
2011-03-23From Vincent Helfre:Anders Broman1-688/+689
- added documentation in packet-csn1.h - fixed a bug in packet-csn1.c - fixed a BSIC description in packet-gsm_a_rr.c - removed the "_v" suffix in packet-gsm_rlcmac element description svn path=/trunk/; revision=36284
2011-02-28Remove unneeded #includes; Add #includes to packet-gsm_rlcmac.cBill Meier1-5/+0
svn path=/trunk/; revision=36099
2011-02-28Define global vars as static; Whitespace cleanup.Bill Meier1-112/+112
svn path=/trunk/; revision=36098
2011-02-28svn path=/trunk/; revision=36087Anders Broman1-0/+4386
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-25 23:05:55 +0000