osmocom-net-gprs

osmocom-net-gprs@lists.osmocom.org

2 participants
516 discussions

[PATCH 1/2] Refactor the Uplink RLC header parsing function
by Bhargava Abhyankar 30 Mar '16

30 Mar '16

Parsing the uplink data header for GPRS and EGPRS header type 3 is handled in separate functions. This patch will enhance modularity of the code. --- src/decoding.cpp | 140 ++++++++++++++++++++++++++++++------------------------- src/decoding.h | 9 +++- 2 files changed, 84 insertions(+), 65 deletions(-) diff --git a/src/decoding.cpp b/src/decoding.cpp index f2b548c..0c81b2a 100644 --- a/src/decoding.cpp +++ b/src/decoding.cpp @@ -344,74 +344,14 @@ void Decoding::extract_rbb(const struct bitvec *rbb, char *show_rbb) int Decoding::rlc_parse_ul_data_header(struct gprs_rlc_data_info *rlc, const uint8_t *data, GprsCodingScheme cs) { - const struct gprs_rlc_ul_header_egprs_3 *egprs3; - const struct rlc_ul_header *gprs; - unsigned int e_ti_header; unsigned int cur_bit = 0; - int punct, punct2, with_padding, cps; - unsigned int offs; - switch(cs.headerTypeData()) { - case GprsCodingScheme::HEADER_GPRS_DATA: - gprs = static_cast<struct rlc_ul_header *> - ((void *)data); - - gprs_rlc_data_info_init_ul(rlc, cs, false); - - rlc->r = gprs->r; - rlc->si = gprs->si; - rlc->tfi = gprs->tfi; - rlc->cps = 0; - rlc->rsb = 0; - - rlc->num_data_blocks = 1; - rlc->block_info[0].cv = gprs->cv; - rlc->block_info[0].pi = gprs->pi; - rlc->block_info[0].bsn = gprs->bsn; - rlc->block_info[0].e = gprs->e; - rlc->block_info[0].ti = gprs->ti; - rlc->block_info[0].spb = 0; - - cur_bit += rlc->data_offs_bits[0]; - - /* skip data area */ - cur_bit += cs.maxDataBlockBytes() * 8; + case GprsCodingScheme::HEADER_GPRS_DATA : + cur_bit = rlc_parse_ul_data_header_gprs(rlc, data, cs); break; - case GprsCodingScheme::HEADER_EGPRS_DATA_TYPE_3: - egprs3 = static_cast<struct gprs_rlc_ul_header_egprs_3 *> - ((void *)data); - - cps = (egprs3->cps_a << 0) | (egprs3->cps_b << 2); - gprs_rlc_mcs_cps_decode(cps, cs, &punct, &punct2, &with_padding); - gprs_rlc_data_info_init_ul(rlc, cs, with_padding); - - rlc->r = egprs3->r; - rlc->si = egprs3->si; - rlc->tfi = (egprs3->tfi_a << 0) | (egprs3->tfi_b << 2); - rlc->cps = cps; - rlc->rsb = egprs3->rsb; - - rlc->num_data_blocks = 1; - rlc->block_info[0].cv = egprs3->cv; - rlc->block_info[0].pi = egprs3->pi; - rlc->block_info[0].spb = egprs3->spb; - rlc->block_info[0].bsn = - (egprs3->bsn1_a << 0) | (egprs3->bsn1_b << 5); - - cur_bit += rlc->data_offs_bits[0] - 2; - - offs = rlc->data_offs_bits[0] / 8; - OSMO_ASSERT(rlc->data_offs_bits[0] % 8 == 1); - - e_ti_header = (data[offs-1] + (data[offs] << 8)) >> 7; - rlc->block_info[0].e = !!(e_ti_header & 0x01); - rlc->block_info[0].ti = !!(e_ti_header & 0x02); - cur_bit += 2; - - /* skip data area */ - cur_bit += cs.maxDataBlockBytes() * 8; + case GprsCodingScheme::HEADER_EGPRS_DATA_TYPE_3 : + cur_bit = rlc_parse_ul_data_header_egprs_type_3(rlc, data, cs); break; - case GprsCodingScheme::HEADER_EGPRS_DATA_TYPE_1: case GprsCodingScheme::HEADER_EGPRS_DATA_TYPE_2: /* TODO: Support both header types */ @@ -426,6 +366,78 @@ int Decoding::rlc_parse_ul_data_header(struct gprs_rlc_data_info *rlc, return cur_bit; } +int Decoding::rlc_parse_ul_data_header_egprs_type_3( + struct gprs_rlc_data_info *rlc, + const uint8_t *data, + const GprsCodingScheme &cs) +{ + int punct, punct2, with_padding, cps; + unsigned int e_ti_header, offs, cur_bit = 0; + const struct gprs_rlc_ul_header_egprs_3 *egprs3; + + egprs3 = static_cast < struct gprs_rlc_ul_header_egprs_3 * > + ((void *)data); + + cps = (egprs3->cps_a << 0) | (egprs3->cps_b << 2); + gprs_rlc_mcs_cps_decode(cps, cs, &punct, &punct2, &with_padding); + gprs_rlc_data_info_init_ul(rlc, cs, with_padding); + + rlc->r = egprs3->r; + rlc->si = egprs3->si; + rlc->tfi = (egprs3->tfi_a << 0) | (egprs3->tfi_b << 2); + rlc->cps = cps; + rlc->rsb = egprs3->rsb; + + rlc->num_data_blocks = 1; + rlc->block_info[0].cv = egprs3->cv; + rlc->block_info[0].pi = egprs3->pi; + rlc->block_info[0].spb = egprs3->spb; + rlc->block_info[0].bsn = + (egprs3->bsn1_a << 0) | (egprs3->bsn1_b << 5); + + cur_bit += rlc->data_offs_bits[0] - 2; + offs = rlc->data_offs_bits[0] / 8; + OSMO_ASSERT(rlc->data_offs_bits[0] % 8 == 1); + e_ti_header = (data[offs-1] + (data[offs] << 8)) >> 7; + rlc->block_info[0].e = !!(e_ti_header & 0x01); + rlc->block_info[0].ti = !!(e_ti_header & 0x02); + cur_bit += 2; + /* skip data area */ + cur_bit += cs.maxDataBlockBytes() * 8; + + return cur_bit; +} + +int Decoding::rlc_parse_ul_data_header_gprs(struct gprs_rlc_data_info *rlc, + const uint8_t *data, const GprsCodingScheme &cs) +{ + const struct rlc_ul_header *gprs; + unsigned int cur_bit = 0; + + gprs = static_cast < struct rlc_ul_header * > + ((void *)data); + + gprs_rlc_data_info_init_ul(rlc, cs, false); + + rlc->r = gprs->r; + rlc->si = gprs->si; + rlc->tfi = gprs->tfi; + rlc->cps = 0; + rlc->rsb = 0; + rlc->num_data_blocks = 1; + rlc->block_info[0].cv = gprs->cv; + rlc->block_info[0].pi = gprs->pi; + rlc->block_info[0].bsn = gprs->bsn; + rlc->block_info[0].e = gprs->e; + rlc->block_info[0].ti = gprs->ti; + rlc->block_info[0].spb = 0; + cur_bit += rlc->data_offs_bits[0]; + /* skip data area */ + cur_bit += cs.maxDataBlockBytes() * 8; + + return cur_bit; +} + /** * \brief Copy LSB bitstream RLC data block to byte aligned buffer. * diff --git a/src/decoding.h b/src/decoding.h index 58ecd18..1043d67 100644 --- a/src/decoding.h +++ b/src/decoding.h @@ -43,7 +43,14 @@ public: static void extract_rbb(const uint8_t *rbb, char *extracted_rbb); static void extract_rbb(const struct bitvec *rbb, char *show_rbb); - + static int rlc_parse_ul_data_header_egprs_type_3( + struct gprs_rlc_data_info *rlc, + const uint8_t *data, + const GprsCodingScheme &cs); + static int rlc_parse_ul_data_header_gprs( + struct gprs_rlc_data_info *rlc, + const uint8_t *data, + const GprsCodingScheme &cs); static int rlc_parse_ul_data_header(struct gprs_rlc_data_info *rlc, const uint8_t *data, GprsCodingScheme cs); static unsigned int rlc_copy_to_aligned_buffer( -- 2.5.0

4 8

[PATCH 1/3] Add data structure for CPS calculation in DL
by Aravind Sirsikar 30 Mar '16

30 Mar '16

Define new data structure with respect to TS 44.060 10.4.8a.3.1, 10.4.8a.2.1, 10.4.8a.1.1 for puncturing scheme values and initialize the variable introduced --- src/rlc.cpp | 3 +++ src/rlc.h | 24 ++++++++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/src/rlc.cpp b/src/rlc.cpp index 79d8f48..0e16ee8 100644 --- a/src/rlc.cpp +++ b/src/rlc.cpp @@ -33,6 +33,9 @@ uint8_t *gprs_rlc_data::prepare(size_t block_data_len) memset(block, 0x0, sizeof(block)); memset(block, 0x2b, block_data_len); + /* Initial value of puncturing scheme */ + next_ps = EGPRS_PS_1; + return block; } diff --git a/src/rlc.h b/src/rlc.h index 3f10f8c..19dccbe 100644 --- a/src/rlc.h +++ b/src/rlc.h @@ -56,6 +56,27 @@ enum gprs_rlc_dl_bsn_state { GPRS_RLC_DL_BSN_MAX, }; +/* + * Valid puncturing scheme values + * TS 44.060 10.4.8a.3.1, 10.4.8a.2.1, 10.4.8a.1.1 + */ +enum egprs_puncturing_values { + EGPRS_PS_1, + EGPRS_PS_2, + EGPRS_PS_3, + EGPRS_PS_INVALID, +}; + +/* + * EGPRS_MAX_PS_NUM_2 is valid for MCS 1,2,5,6. + * And EGPRS_MAX_PS_NUM_3 is valid for MCS 3,4,7,8,9 + * TS 44.060 10.4.8a.3.1, 10.4.8a.2.1, 10.4.8a.1.1 + */ +enum egprs_puncturing_types { + EGPRS_MAX_PS_NUM_2 = 2, + EGPRS_MAX_PS_NUM_3, + EGPRS_MAX_PS_NUM_INVALID, +}; static inline uint16_t mod_sns_half() { @@ -100,6 +121,9 @@ struct gprs_rlc_data { struct gprs_rlc_data_block_info block_info; GprsCodingScheme cs; + + /* puncturing scheme value to be used for next transmission*/ + enum egprs_puncturing_values next_ps; }; void gprs_rlc_data_info_init_dl(struct gprs_rlc_data_info *rlc, -- 1.7.9.5

2 4

Academic project based on OpenGGSN
by Manuel José Muñoz Calero 29 Mar '16

29 Mar '16

Hi guys, Please, let me introduce myself. My name is Manuel Munoz, Computer Scientist, looking for a topic for my project/undergrad thesis at Universidad de Leon, Spain. I am evaluating these days the possibility to do something interesting which could be used as my project and also to put my bit for the OpenGGSN project. Some more about me. I am 36, have been working for +10 years in IT (sysadmin, php developer, plsql developer, datacenters...). I can speak English and Spanish and hold a 3 years bachelor degree. Not long ago I worked for two years for providers of 2G/3G network monitoring systems, so I have some knowledge about those topics. Also quite fluent in C, wireshark, unix scripting... This weekend I have been doing a quick research and refreshing my mind about both security and mobile networks, and also took a look to OpenGGSN code. Long story short, what about me implementing IPSec for GTP-C in OpenGGSN? Do you think it could be useful? Feasible? 3GPP Protect GTP signalling messages by IPSec ( http://www.3gpp.org/ftp/tsg_sa/wg3_security/TSGS3_14_Oslo/Docs/PDF/S3-00042… ) 3GPP Use IPSec to secure GTP messages ( http://www.3gpp.org/ftp/tsg_sa/wg3_security/tsgs3_13_yokohama/docs/PDF/S3-0… ) Maybe some other security-oriented feature you want to be implemented? I would love to hear your thoughts! Thanks for your time, Manuel

4 7

Re: Time to rename projects.osmocom.org to osmocom.org
by Holger Freyther 27 Mar '16

27 Mar '16

> On 27 Mar 2016, at 16:30, Sylvain Munaut <246tnt(a)gmail.com> wrote: > >> this is now in place and the old domains are now using X509 certs of letsencrypt. > > Do you know if redmine supports going to HTTPS only (i.e. redir http > to https). I changed the "protocol" to HTTPS in the admin panel but > that had no effect afaict. I don't know. > I would prefer to be HTTPS only and also have the session cookie have > the "Secure" flag (so they're never sent over plain HTTP) I added: proxy_set_header X-Forwarded-Ssl on; to the nginx config in the hope that redmine makes use of that instead of the X-Forwarded-Proto. If it matters to you deeply we can make a general http -> https redirect. holger

1 1

Time to rename projects.osmocom.org to osmocom.org
by Holger Freyther 27 Mar '16

27 Mar '16

Hi, I think we all liked tnt's proposal to just call it osmocom.org. Are we ready to make the redmine available as osmocom.org (and redirect www.osmocom.org, projects.osmocom.org to it)? As first step of redirects I propose: http://bb.osmocom.org/ -> http://osmocom.org/projects/baseband http://openbsc.osmocom.org/ -> http://osmocom.org/projects/openbsc http://tetra.osmocom.org/ -> http://osmocom.org/projects/tetra http://simtrace.osmocom.org/ -> http://osmocom.org/projects/simtrace http://security.osmocom.org/ -> http://osmocom.org/projects/security http://gmr.osmocom.org/ -> http://osmocom.org/projects/gmr http://sdr.osmocom.org/ -> http://osmocom.org/projects/sdr any objections or corrections to that? kind regards holger

3 3

Queries regarding L1 interface to osmo-bts for 11 bit RACH
by Bhargava Abhyankar 23 Mar '16

23 Mar '16

Hello, We have planned to support 11 bit RACH in osmo-pcu and osmo-bts. In this regard, we have a query related to layer 1 to osmo-bts interface, as described below. 1. For 11 bit RACH, in PH-RA-IND sent from layer 1. * Whether 'u8Size' will be 2 in case of 11 bit RACH ? * What is the alignment of 11 bits inside 'u8Buffer ? 2. How osmo-bts can distinguish between types of 11 bit RACH based on received layer 1 message ? (spec 44.060 section 11.2.5a) * is burst type GsmL1_BurstType_Access_0 equivalent to GPRS_8_BIT_RACH/ GPRS_11_BIT_RACH * is burst type GsmL1_BurstType_Access_1 equivalent to EGPRS_8_PSK_11_BIT_RACH * is burst type GsmL1_BurstType_Access_2 equivalent to EGPRS_NO_8_PSK_11_BIT_RACH Regards Bhargava Abhyankar

3 4

Proposal for new structure definition for compression algorithm
by Sangamesh Sajjan 22 Mar '16

22 Mar '16

Hello, In current master code base 5 different arrays are used for compression as described below, * Two dimensional array is used to store terminating code words for 1's length code and 0's length code. * Two dimensional array is used to keep size of each codeword * Two dimensional array is used to store make up code words * Two dimensional array is used to keep size of each codeword of makeup code words * one array for each code word to return corresponding value for makeup code words We are proposing following modification for above, * Array of strings shall be used for 1's run length code word * Array of strings shall be used for 0's run length code word These two arrays will have code words of both terminating codes and make up codes together. In this approach two trees (i.e ones list and zero list) shall be introduced and entire code word traversing shall be done in respective tree in single traversal. With this approach we can avoid multiple array usage. The above changes will be sent in my next patch Regards, Sangamesh

2 3

[PATCH] Change the interface in osmo-pcu for 11 bit RACH
by Bhargava Abhyankar 22 Mar '16

22 Mar '16

Interface changes in osmo-pcu towards osmo-bts to receive 11 bit RACH. The interface version number is increased by 1. --- src/bts.cpp | 2 +- src/bts.h | 3 ++- src/pcu_l1_if.cpp | 2 +- src/pcuif_proto.h | 5 +++-- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/bts.cpp b/src/bts.cpp index 715fb51..9c0871d 100644 --- a/src/bts.cpp +++ b/src/bts.cpp @@ -459,7 +459,7 @@ int BTS::rcv_imm_ass_cnf(const uint8_t *data, uint32_t fn) return 0; } -int BTS::rcv_rach(uint8_t ra, uint32_t Fn, int16_t qta) +int BTS::rcv_rach(uint16_t ra, uint32_t Fn, int16_t qta, uint8_t rach_type) { struct gprs_rlcmac_ul_tbf *tbf = NULL; uint8_t trx_no, ts_no = 0; diff --git a/src/bts.h b/src/bts.h index c975304..2a1f930 100644 --- a/src/bts.h +++ b/src/bts.h @@ -275,7 +275,8 @@ public: int tfi_find_free(enum gprs_rlcmac_tbf_direction dir, uint8_t *_trx, int8_t use_trx); int rcv_imm_ass_cnf(const uint8_t *data, uint32_t fn); - int rcv_rach(uint8_t ra, uint32_t Fn, int16_t qta); + int rcv_rach(uint16_t ra, uint32_t Fn, int16_t qta, + uint8_t rach_type = 0); void trigger_dl_ass(gprs_rlcmac_dl_tbf *tbf, gprs_rlcmac_tbf *old_tbf); void snd_dl_ass(gprs_rlcmac_tbf *tbf, uint8_t poll, const char *imsi); diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp index 19dda5c..7d7c914 100644 --- a/src/pcu_l1_if.cpp +++ b/src/pcu_l1_if.cpp @@ -313,7 +313,7 @@ static int pcu_rx_rach_ind(struct gsm_pcu_if_rach_ind *rach_ind) case PCU_IF_SAPI_RACH: rc = BTS::main_bts()->rcv_rach( rach_ind->ra, rach_ind->fn, - rach_ind->qta); + rach_ind->qta, rach_ind->rach_type); break; default: LOGP(DL1IF, LOGL_ERROR, "Received PCU rach request with " diff --git a/src/pcuif_proto.h b/src/pcuif_proto.h index 9d740ac..877f507 100644 --- a/src/pcuif_proto.h +++ b/src/pcuif_proto.h @@ -1,7 +1,7 @@ #ifndef _PCUIF_PROTO_H #define _PCUIF_PROTO_H -#define PCU_IF_VERSION 0x05 +#define PCU_IF_VERSION 0x06 /* msg_type */ #define PCU_IF_MSG_DATA_REQ 0x00 /* send data to given channel */ @@ -64,10 +64,11 @@ struct gsm_pcu_if_rts_req { struct gsm_pcu_if_rach_ind { uint8_t sapi; - uint8_t ra; + uint16_t ra; int16_t qta; uint32_t fn; uint16_t arfcn; + uint8_t rach_type; } __attribute__ ((packed)); struct gsm_pcu_if_info_trx { -- 2.5.0

3 3

[PATCH] Add structure definition for compression algorithm
by sangamesh sajjan 21 Mar '16

21 Mar '16

Defines new structure for Tree node and Declaration of zero's run length code list and one's run length code list --- src/Makefile.am | 6 +- src/egprs_rlc_compression.cpp | 169 +++++++++++++++++++++++++++++++++++++++++ src/egprs_rlc_compression.h | 15 ++++ 3 files changed, 188 insertions(+), 2 deletions(-) create mode 100644 src/egprs_rlc_compression.cpp create mode 100644 src/egprs_rlc_compression.h diff --git a/src/Makefile.am b/src/Makefile.am index 6428bef..981d5b1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -57,7 +57,8 @@ libgprs_la_SOURCES = \ rlc.cpp \ osmobts_sock.cpp \ gprs_codel.c \ - gprs_coding_scheme.cpp + gprs_coding_scheme.cpp \ + egprs_rlc_compression.cpp bin_PROGRAMS = \ osmo-pcu @@ -96,7 +97,8 @@ noinst_HEADERS = \ pcu_utils.h \ cxx_linuxlist.h \ gprs_codel.h \ - gprs_coding_scheme.h + gprs_coding_scheme.h \ + egprs_rlc_compression.h osmo_pcu_SOURCES = pcu_main.cpp diff --git a/src/egprs_rlc_compression.cpp b/src/egprs_rlc_compression.cpp new file mode 100644 index 0000000..55ff595 --- /dev/null +++ b/src/egprs_rlc_compression.cpp @@ -0,0 +1,169 @@ +/* egprs_rlc_compression.h +* Routines for EGPRS RLC bitmap compression handling +*/ +#include <egprs_rlc_compression.h> +#include <errno.h> + +const char *one_run_len_code_list[MAX_CDWDTBL_LEN] = { + "00110101", + "000111", + "0111", + "1000", + "1011", + "1100", + "1110", + "1111", + "10011", + "10100", + "00111", + "01000", + "001000", + "000011", + "110100", + "110101", + "101010", + "101011", + "0100111", + "0001100", + "0001000", + "0010111", + "0000011", + "0000100", + "0101000", + "0101011", + "0010011", + "0100100", + "0011000", + "00000010", + "00000011", + "00011010", + "00011011", + "00010010", + "00010011", + "00010100", + "00010101", + "00010110", + "00010111", + "00101000", + "00101001", + "00101010", + "00101011", + "00101100", + "00101101", + "00000100", + "00000101", + "00001010", + "00001011", + "01010010", + "01010011", + "01010100", + "01010101", + "00100100", + "00100101", + "01011000", + "01011001", + "01011010", + "01011011", + "01001010", + "01001011", + "00110010", + "00110011", + "00110100", + "11011", + "10010", + "010111", + "0110111", + "00110110", + "00110111", + "01100100", + "01100101", + "01101000", + "01100111", + "011001100", + "011001101", + "011010010", + "011010011", + "011010100" +}; + +const char *zero_run_len_code_list[MAX_CDWDTBL_LEN] = { + "0000110111", + "10", + "11", + "010", + "011", + "0011", + "0010", + "00011", + "000101", + "000100", + "0000100", + "0000101", + "0000111", + "00000100", + "00000111", + "000011000", + "0000010111", + "0000011000", + "0000001000", + "00001100111", + "00001101000", + "00001101100", + "00000110111", + "00000101000", + "00000010111", + "00000011000", + "000011001010", + "000011001011", + "000011001100", + "000011001101", + "000001101000", + "000001101001", + "000001101010", + "000001101011", + "000011010010", + "000011010011", + "000011010100", + "000011010101", + "000011010110", + "000011010111", + "000001101100", + "000001101101", + "000011011010", + "000011011011", + "000001010100", + "000001010101", + "000001010110", + "000001010111", + "000001100100", + "000001100101", + "000001010010", + "000001010011", + "000000100100", + "000000110111", + "000000111000", + "000000100111", + "000000101000", + "000001011000", + "000001011001", + "000000101011", + "000000101100", + "000001011010", + "000001100110", + "000001100111", + "0000001111", + "000011001000", + "000011001001", + "000001011011", + "000000110011", + "000000110100", + "000000110101", + "0000001101100", + "0000001101101", + "0000001001010", + "0000001001011", + "0000001001100", + "0000001001101", + "0000001110010", + "0000001110011" +}; diff --git a/src/egprs_rlc_compression.h b/src/egprs_rlc_compression.h new file mode 100644 index 0000000..32368cb --- /dev/null +++ b/src/egprs_rlc_compression.h @@ -0,0 +1,15 @@ +/* egprs_rlc_compression.h +* Routines for EGPRS RLC bitmap compression handling +*/ +#include "tbf.h" +#include "bts.h" +#include "gprs_debug.h" +#include <errno.h> + +#define MAX_CDWDTBL_LEN 79 /* total number of codewords */ + +struct node { + struct node *left; + struct node *right; + uint16_t *run_length; +}; -- 1.7.9.5

2 1

[PATCH] Uplink PAN header changes for FANR feature
by sangamesh sajjan 21 Mar '16

21 Mar '16

Added structure definition for handling uplink PAN and added new RLC state for Tentative Ack --- src/bts.h | 1 + src/rlc.h | 36 +++++++++++++++++++++++++++++++++++- 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/src/bts.h b/src/bts.h index ccb8025..756cddf 100644 --- a/src/bts.h +++ b/src/bts.h @@ -48,6 +48,7 @@ struct GprsMs; #define BITS_TO_BYTES(X) (X ? (X/8):0)+1 #define MOD8(X) (((X)+8)&0x07) #define MOD64(X) ((X + 64) & 0x3F) +#define MOD2048(X) ((X + 2048) & 0x7FF) extern const uint8_t* one_run_len_code_list[MAX_CDWDTBL_LEN]; extern const uint8_t* zero_run_len_code_list[MAX_CDWDTBL_LEN]; diff --git a/src/rlc.h b/src/rlc.h index f7c5457..d29527d 100644 --- a/src/rlc.h +++ b/src/rlc.h @@ -52,6 +52,7 @@ enum gprs_rlc_dl_bsn_state { GPRS_RLC_DL_BSN_ACKED, GPRS_RLC_DL_BSN_UNACKED, GPRS_RLC_DL_BSN_RESEND, + GPRS_RLC_DL_BSN_TENTATIVE_ACK, GPRS_RLC_DL_BSN_MAX, }; @@ -85,6 +86,15 @@ struct gprs_rlc_ul_data_block_info { unsigned int spb; }; +struct egprs_ssn_based_pan_info { + unsigned int bow; + unsigned int short_ssn_a; + unsigned int short_ssn_rb; + unsigned int rb_a; + unsigned int rb_b; + unsigned int tfi; +}; + struct gprs_rlc_ul_header_generic{ GprsCodingScheme cs; unsigned int r; @@ -97,6 +107,7 @@ struct gprs_rlc_ul_header_generic{ unsigned int num_data_blocks; unsigned int data_offs_bytes[2]; struct gprs_rlc_ul_data_block_info block_info[2]; + struct egprs_ssn_based_pan_info pan_info; }; struct gprs_rlc_data { uint8_t *prepare(size_t block_data_length); @@ -161,7 +172,8 @@ struct gprs_rlc_v_b { bool is_resend(int bsn) const; bool is_invalid(int bsn) const; gprs_rlc_dl_bsn_state get_state(int bsn) const; - + bool is_tentative_acked(int bsn) const; + void mark_tentative_acked(int bsn); /* Mark a RLC frame for something */ void mark_unacked(int bsn); void mark_nacked(int bsn); @@ -431,6 +443,18 @@ struct gprs_rlc_ul_header_egprs_1 { uint8_t spare2:6, dummy:2; } __attribute__ ((packed)); + +/* TS 44.060 10.3a.5.1 */ +struct egprs_ssn_based_pan_header { + uint8_t bow:1, + short_ssn_a:7; + uint8_t short_ssn_rb:4, + rb_a:4; + uint8_t rb_b:4, + tfi_a:4; + uint8_t tfi_b:1; +} __attribute__ ((packed)); + } inline bool gprs_rlc_v_b::is_state(int bsn, const gprs_rlc_dl_bsn_state type) const @@ -468,6 +492,16 @@ inline bool gprs_rlc_v_b::is_invalid(int bsn) const return is_state(bsn, GPRS_RLC_DL_BSN_INVALID); } +inline bool gprs_rlc_v_b::is_tentative_acked(int bsn) const +{ + return is_state(bsn, GPRS_RLC_DL_BSN_TENTATIVE_ACK); +} + +inline void gprs_rlc_v_b::mark_tentative_acked(int bsn) +{ + return mark(bsn, GPRS_RLC_DL_BSN_TENTATIVE_ACK); +} + inline gprs_rlc_dl_bsn_state gprs_rlc_v_b::get_state(int bsn) const { return m_v_b[bsn & mod_sns_half()]; -- 1.7.9.5

2 1

← Newer
1
...
37
38
39
40
41
42
43
...
52
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

osmocom-net-gprs