osmocom-net-gprs

osmocom-net-gprs@lists.osmocom.org

6 participants
480 discussions

Proposal for new structure definition for compression algorithm

by Sangamesh Sajjan

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

9 years, 2 months

[PATCH] Change the interface in osmo-pcu for 11 bit RACH

by Bhargava Abhyankar

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

9 years, 2 months

[PATCH] Add structure definition for compression algorithm

by sangamesh sajjan

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

9 years, 2 months

[PATCH] Uplink PAN header changes for FANR feature

by sangamesh sajjan

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

9 years, 2 months

[PATCH] Uplink PAN handling for FANR feature

by sangamesh sajjan

Changes includes uplink PAN handling for Downlink tbf and bitmap handling to update Tentative ack or nacked --- src/decoding.cpp | 40 +++++++++++++++++++++ src/tbf.cpp | 2 ++ src/tbf.h | 1 + src/tbf_ul.cpp | 92 +++++++++++++++++++++++++++++++++++++++++++++-- tests/edge/EdgeTest.cpp | 68 +++++++++++++++++++++++++++++++++++ 5 files changed, 201 insertions(+), 2 deletions(-) diff --git a/src/decoding.cpp b/src/decoding.cpp index 649f68d..d3d0d89 100644 --- a/src/decoding.cpp +++ b/src/decoding.cpp @@ -423,6 +423,19 @@ int Decoding::decode_ul_data_fanr_type1(struct gprs_rlc_ul_header_generic *rlc, rlc->block_info[1].data_len = data_len; rlc->data_offs_bytes[0] = 7; rlc->data_offs_bytes[1] = 7 + data_len + 1; + if ( rlc->pani == 1) { + const struct egprs_ssn_based_pan_header *egprs1_fanr; + egprs1_fanr = static_cast<struct egprs_ssn_based_pan_header*> + ((void *)&data[rlc->block_info[1].data_len + rlc->data_offs_bytes[1]]); + rlc->pan_info.bow = egprs1_fanr->bow; + + rlc->pan_info.short_ssn_a = egprs1_fanr->short_ssn_a; + rlc->pan_info.short_ssn_rb = egprs1_fanr->short_ssn_rb; + + rlc->pan_info.rb_a = egprs1_fanr->rb_a; + rlc->pan_info.rb_b = egprs1_fanr->rb_b; + rlc->pan_info.tfi = (egprs1_fanr->tfi_a << 0) | (egprs1_fanr->tfi_b << 4); + } return 0; } @@ -502,6 +515,19 @@ int Decoding::decode_ul_data_fanr_type2(struct gprs_rlc_ul_header_generic *rlc, rlc->block_info[0].data_len = data_len; rlc->data_offs_bytes[0] = 6; + if ( rlc->pani == 1) { + const struct egprs_ssn_based_pan_header *egprs2_fanr; + egprs2_fanr = static_cast<struct egprs_ssn_based_pan_header*> + ((void *)&data[rlc->block_info[0].data_len + rlc->data_offs_bytes[0]]); + rlc->pan_info.bow = egprs2_fanr->bow; + + rlc->pan_info.short_ssn_a = egprs2_fanr->short_ssn_a; + rlc->pan_info.short_ssn_rb = egprs2_fanr->short_ssn_rb; + + rlc->pan_info.rb_a = egprs2_fanr->rb_a; + rlc->pan_info.rb_b = egprs2_fanr->rb_b; + rlc->pan_info.tfi = (egprs2_fanr->tfi_a << 0) | (egprs2_fanr->tfi_b << 4); + } if(*cs == GprsCodingScheme::MCS6){ if(rlc->cps == 2 || rlc->cps == 3 ){ rlc->block_info[0].data_len -= pad_bytes; @@ -588,6 +614,20 @@ int Decoding::decode_ul_data_fanr_type3(struct gprs_rlc_ul_header_generic *rlc, rlc->block_info[0].data_len = data_len; rlc->data_offs_bytes[0] = 5; + if ( rlc->pani == 1) { + const struct egprs_ssn_based_pan_header *egprs3_fanr; + egprs3_fanr = static_cast<struct egprs_ssn_based_pan_header*> + ((void *)&data[rlc->block_info[0].data_len + rlc->data_offs_bytes[0]]); + + rlc->pan_info.bow = egprs3_fanr->bow; + + rlc->pan_info.short_ssn_a = egprs3_fanr->short_ssn_a; + rlc->pan_info.short_ssn_rb = egprs3_fanr->short_ssn_rb; + + rlc->pan_info.rb_a = egprs3_fanr->rb_a; + rlc->pan_info.rb_b = egprs3_fanr->rb_b; + rlc->pan_info.tfi = (egprs3_fanr->tfi_a << 0) | (egprs3_fanr->tfi_b << 4); + } if(rlc->block_info[0].spb == 2){ if(*cs == GprsCodingScheme::MCS3){ if(rlc->cps == 6 || rlc->cps == 7 || rlc->cps == 8){ diff --git a/src/tbf.cpp b/src/tbf.cpp index 05f5c82..559e565 100644 --- a/src/tbf.cpp +++ b/src/tbf.cpp @@ -53,6 +53,8 @@ uint16_t windowsizebyTS[9] = { 1024 // 8 TS }; +uint16_t log2ws[9] = {6,7,8,8,9,9,9,9,10}; + gprs_rlcmac_tbf::Meas::Meas() : rssi_sum(0), rssi_num(0) diff --git a/src/tbf.h b/src/tbf.h index a6878d7..ba0dce1 100644 --- a/src/tbf.h +++ b/src/tbf.h @@ -504,6 +504,7 @@ struct gprs_rlcmac_ul_tbf : public gprs_rlcmac_tbf { uint8_t m_usf[8]; /* list USFs per PDCH (timeslot) */ uint8_t m_contention_resolution_done; /* set after done */ uint8_t m_final_ack_sent; /* set if we sent final ack */ + int uplink_pan_handling(const gprs_rlc_ul_header_generic *rlc); protected: void maybe_schedule_uplink_acknack(const gprs_rlc_ul_header_generic *rlc); diff --git a/src/tbf_ul.cpp b/src/tbf_ul.cpp index e89ac14..e56dccf 100644 --- a/src/tbf_ul.cpp +++ b/src/tbf_ul.cpp @@ -41,7 +41,8 @@ extern "C" { #define SEND_ACK_AFTER_FRAMES 20 extern void *tall_pcu_ctx; - +extern uint16_t log2ws[]; +extern uint16_t windowsizebyTS[]; /* * Store received block data in LLC message(s) and forward to SGSN @@ -392,9 +393,96 @@ int gprs_rlcmac_ul_tbf::rcv_data_block_acknowledged( /* If TLLI is included or if we received half of the window, we send * an ack/nack */ maybe_schedule_uplink_acknack(rlc); - + /*Uplink PAN info handling for downlink data, Need to update Ack/Nack + based on recieved bitmap */ + if (rlc->pani == 1) { + uplink_pan_handling(rlc); + } else { + LOGP(DRLCMACUL, LOGL_ERROR, "No PAN info present \n"); + } return 0; +} +int gprs_rlcmac_ul_tbf::uplink_pan_handling( + const gprs_rlc_ul_header_generic *rlc) +{ + bool bit; + uint16_t bsn; + int i = 0, j; + int8_t rb_length, bits_left, shortSSNsize, mask, rb_mask; + int ssn = 0, ssn_base_va, ssn_base_vs; + + gprs_rlcmac_dl_tbf *tbf; + tbf = gprs_rlcmac_ul_tbf::ms()->dl_tbf(); + if (!tbf) { + LOGP(DRLCMACUL, LOGL_ERROR, "DL DATA unknown TFI=%d\n", + rlc->pan_info.tfi); + return 0; + } + if (tbf->tfi() != rlc->pan_info.tfi) { + LOGP(DRLCMACUL, LOGL_ERROR, "Received TFI %d and DL TBF Tfi %d are not\n" + "matching \n", tbf->tfi(), rlc->pan_info.tfi); + return 0; + } + for (j = 0; j < 9; j++) { + if (tbf->m_window.ws() == windowsizebyTS[j]) { + break; + } + } + shortSSNsize = log2ws[j] + 1; + mask = (1 << (shortSSNsize -7)) -1 ; + //Short SSN + int16_t short_ssn = ((rlc->pan_info.short_ssn_a) | + ((rlc->pan_info.short_ssn_rb << 8) & mask )); + //RB + rb_mask = (1 << (4 - (shortSSNsize -7))) -1 ; + + int16_t rb = ((rlc->pan_info.rb_b << (8 - (shortSSNsize -7))) | + (rlc->pan_info.rb_a << (4 - (shortSSNsize -7))) | + ((rlc->pan_info.short_ssn_rb >> (shortSSNsize -7)) & rb_mask )); + + //Get SSN from short SSN + ssn_base_va = (tbf->m_window.v_a() & (((1 << (11-shortSSNsize))-1) << shortSSNsize)) ; + ssn_base_vs = (tbf->m_window.v_s() & (((1 << (11-shortSSNsize))-1) << shortSSNsize)) ; + + if ( ssn_base_va == ssn_base_vs ) { + ssn = MOD2048((ssn_base_va|short_ssn)); + } + else { + /*Algorithm to be modified for the case V(A) is less than 2048 and V(S) is greater than + 2048 and RB comes in between these two */ + //TODO different cases to be handled + return 0; + } + /* if Beginning of window is set 1, Mark Acked between SSN-2 ( V(Q)-1) to V(A)*/ + if (rlc->pan_info.bow) { + for (int i = tbf->m_window.v_a(); i <= (ssn -2); i++ ) { + uint16_t bsn = tbf->m_window.mod_sns(i); + tbf->m_window.m_v_b.mark_tentative_acked(bsn); + } + } + + rb_length = 8 + (4 - (shortSSNsize -7)); + + //Mark TENTATIVE_ACK + rb = rb << (16 - rb_length); + bits_left = rb_length; + + while (bits_left != 0) { + bsn = tbf->m_window.mod_sns(ssn + i); + if (tbf->m_window.mod_sns(tbf->m_window.v_s() - bsn) >= tbf->m_window.distance()) + break; + bit = !!(rb & 0x8000); + if (bit) { + tbf->m_window.m_v_b.mark_tentative_acked(bsn); + } else { + tbf->m_window.m_v_b.mark_nacked(bsn); + } + rb = rb << 1; + bits_left--; + i++; + } + return 1; } void gprs_rlcmac_ul_tbf::maybe_schedule_uplink_acknack( diff --git a/tests/edge/EdgeTest.cpp b/tests/edge/EdgeTest.cpp index 7177832..924728f 100644 --- a/tests/edge/EdgeTest.cpp +++ b/tests/edge/EdgeTest.cpp @@ -1641,7 +1641,74 @@ static gprs_rlcmac_ul_tbf *establish_ul_tbf_two_phase_cv0(BTS *the_bts, return ul_tbf; } +void fanr_handling(gprs_rlcmac_ul_tbf *ul_tbf, BTS *the_bts, uint32_t *fn, uint8_t ts_no, + GprsMs *ms , uint32_t tlli, uint16_t qta) +{ + uint8_t data_msg[200] = {0}; + int tfi = 0; + struct gprs_rlcmac_pdch *pdch; + uint32_t rach_fn = *fn - 51; + uint32_t sba_fn = *fn + 52; + uint8_t trx_no = 0; + + tfi = ul_tbf->tfi(); + struct pcu_l1_meas meas; + meas.set_rssi(31); + + ul_tbf->enable_fanr(); + /* send fake data */ + data_msg[0] = 0x00 | 0xf << 2; + data_msg[1] = uint8_t(0 | (tfi << 1)); + data_msg[2] = uint8_t(0);/* BSN:7, E:1 */ + data_msg[3] =uint8_t(1 << 6); /* BSN:7, E:1 */ + data_msg[4] = 0x2b; /* E: 1 */ + data_msg[5] = 0x2b; /* E: 1 */ + data_msg[6] = 0x2b; /* E: 1 */ + data_msg[7] = 0x2b; /* E: 1 */ + data_msg[8] = 0x2b; /* E: 1 */ + data_msg[9] = 0x2b; /* E: 1 */ + data_msg[10] = 0x2b; /* E: 1 */ + data_msg[11] = 0x2b; /* E: 1 */ + data_msg[12] = 0x2b; /* E: 1 */ + data_msg[13] = 0x2b; /* E: 1 */ + data_msg[14] = 0x2b; /* E: 1 */ + data_msg[15] = 0x2b; /* E: 1 */ + data_msg[16] = 0x2b; /* E: 1 */ + data_msg[17] = 0x2b; /* E: 1 */ + data_msg[18] = 0x2b; /* E: 1 */ + data_msg[19] = 0x2b; /* E: 1 */ + data_msg[20] = 0x2b; /* E: 1 */ + data_msg[21] = 0x2b; /* E: 1 */ + data_msg[22] = 0x2b; /* E: 1 */ + data_msg[23] = 0x2b; /* E: 1 */ + data_msg[24] = 0x2b; /* E: 1 */ + data_msg[25] = 0x2b; /* E: 1 */ + data_msg[26] = 0x2b; + data_msg[27] = 0x02; /* Fanr SSN & BOW */ + data_msg[28] = 0xff; /* RB & SSN */ + data_msg[29] = 0x0f; /* TFI & RB */ + data_msg[30] = 0x00; /* TFI */ + data_msg[31] = 0x00; + + pdch = &the_bts->bts_data()->trx[trx_no].pdch[ts_no]; + pdch->rcv_block(&data_msg[0], 31, *fn, &meas); + + ms = the_bts->ms_by_tlli(tlli); + OSMO_ASSERT(ms != NULL); + OSMO_ASSERT(ms->ta() == qta/4); + OSMO_ASSERT(ms->ul_tbf() == ul_tbf); + + + /* send fake data */ + data_msg[0] = 0x00 | 0xf << 2; + data_msg[1] = uint8_t(0 | (tfi << 1)); + data_msg[2] = uint8_t(0);/* BSN:7, E:1 */ + data_msg[3] =uint8_t(1 << 6); /* BSN:7, E:1 */ + data_msg[4] = uint8_t(1); /* E: 1 */ + pdch = &the_bts->bts_data()->trx[trx_no].pdch[ts_no]; + pdch->rcv_block(&data_msg[0], 37, *fn, &meas); +} void test_tbf_two_phase() { BTS the_bts; @@ -1669,6 +1736,7 @@ void test_tbf_two_phase() /* Send Packet Downlink Assignment to MS */ request_dl_rlc_block(ul_tbf, &fn); + fanr_handling (ul_tbf, &the_bts, &fn, ts_no, ms, tlli, qta); printf("=== end %s ===\n", __func__); } -- 1.7.9.5

9 years, 3 months

[PATCH] Fix issue in encoding CSN_RECURSIVE_ARRAY

by Saurabh Sharan

The remaining_bits_len is correctly decremented while encoding CSN_RECURSIVE_ARRAY for fixing the bug. Details of the bug is in https://projects.osmocom.org/issues/1641 During introduction of basic EGPRS feature new hex dump message PUASS, from a different working network log was used in Unit test. It exposed the issue of incorrect handling of recursive array encoding in osmo-pcu. --- src/csn1.cpp | 1 + tests/rlcmac/RLCMACTest.cpp | 1 + tests/rlcmac/RLCMACTest.ok | 8 ++++++++ 3 files changed, 10 insertions(+) diff --git a/src/csn1.cpp b/src/csn1.cpp index 82bf17f..d51fe83 100644 --- a/src/csn1.cpp +++ b/src/csn1.cpp @@ -2504,6 +2504,7 @@ gint16 csnStreamEncoder(csnStream_t* ar, const CSN_DESCR* pDescr, bitvec *vector bitvec_write_field(vector, writeIndex, !Tag, 1); LOGPC(DCSN1, LOGL_NOTICE, "%s = %u | ", pDescr->sz , (unsigned)(!Tag)); bit_offset++; + remaining_bits_len--; pDescr++; break; diff --git a/tests/rlcmac/RLCMACTest.cpp b/tests/rlcmac/RLCMACTest.cpp index 26d35ec..466b89e 100644 --- a/tests/rlcmac/RLCMACTest.cpp +++ b/tests/rlcmac/RLCMACTest.cpp @@ -93,6 +93,7 @@ void testRlcMacDownlink() "47240c00400000000000000079eb2ac9402b2b2b2b2b2b", // Packet Uplink Ack Nack "47283c367513ba333004242b2b2b2b2b2b2b2b2b2b2b2b", // Packet Uplink Assignment "400820001a3904df0680efb3300b2b2b2b2b2b2b2b2b2b", // Packet Downlink Assignment (EGPRS) + "40284f0000001009810c826f4406809dcecb2b2b2b2b2b", // Packet Uplink Assignment (EGPRS) "4024030f2f0000000087b0042b2b2b2b2b2b2b2b2b2b2b" // Packet Uplink Ack Nack (EGPRS) "4913e00850884013a8048b2b2b2b2b2b2b2b2b2b2b2b2b" "412430007fffffffffffffffefd19c7ba12b2b2b2b2b2b" diff --git a/tests/rlcmac/RLCMACTest.ok b/tests/rlcmac/RLCMACTest.ok index 4deced7..896982d 100644 --- a/tests/rlcmac/RLCMACTest.ok +++ b/tests/rlcmac/RLCMACTest.ok @@ -39,6 +39,14 @@ vector1 = 4082001a394df680efb330b2b2b2b2b2b2b2b2b2b vector1 = 4082001a394df680efb330b2b2b2b2b2b2b2b2b2b vector2 = 4082001a394df680efb330b2b2b2b2b2b2b2b2b2b vector1 == vector2 : TRUE +vector1 = 40284f00010981c826f446809dcecb2b2b2b2b2b +=========Start DECODE=========== ++++++++++Finish DECODE++++++++++ +=========Start ENCODE============= ++++++++++Finish ENCODE+++++++++++ +vector1 = 40284f00010981c826f446809dcecb2b2b2b2b2b +vector2 = 40284f00010981c826f446809dcecb2b2b2b2b2b +vector1 == vector2 : TRUE vector1 = 40243f2f000087b042b2b2b2b2b2b2b2b2b2b2b =========Start DECODE=========== +++++++++Finish DECODE++++++++++ -- 1.7.9.5

9 years, 3 months

[PATCH] FANR UL and DL flow changes and UT fixes

by Aravind Sirsikar

FANR enabled TBF allocation for both UL and DL based on ms capability This is 5th patch among series of patches for FANR feature The TbfTest.err and EdgeTest.err updation is not part of this patch The Ms capability decoding is not part of this patch --- src/bts.cpp | 132 +++++++++----- src/bts.h | 2 +- src/decoding.cpp | 441 +++++++++++++++++++++++++++++++-------------- src/decoding.h | 24 +++ src/gprs_bssgp_pcu.cpp | 12 +- src/tbf.cpp | 24 ++- src/tbf.h | 12 +- src/tbf_dl.cpp | 10 +- src/tbf_ul.cpp | 2 +- tests/alloc/AllocTest.cpp | 28 +-- tests/edge/EdgeTest.cpp | 235 ++++++++++++++++++++++-- tests/tbf/TbfTest.cpp | 16 +- 12 files changed, 707 insertions(+), 231 deletions(-) diff --git a/src/bts.cpp b/src/bts.cpp index ddce6dc..7897d25 100644 --- a/src/bts.cpp +++ b/src/bts.cpp @@ -552,7 +552,7 @@ int BTS::rcv_rach(uint8_t ra, uint32_t Fn, int16_t qta) // Create new TBF #warning "Copy and pate with other routines.." /* set class to 0, since we don't know the multislot class yet */ - tbf = tbf_alloc_ul_tbf(&m_bts, NULL, -1, 0, 0, 1); + tbf = tbf_alloc_ul_tbf(&m_bts, NULL, -1, 0, 0, 1, false); if (!tbf) { LOGP(DRLCMAC, LOGL_NOTICE, "No PDCH resource\n"); /* FIXME: send reject */ @@ -641,7 +641,7 @@ void BTS::snd_dl_ass(gprs_rlcmac_tbf *tbf, uint8_t poll, const char *imsi) } -GprsMs *BTS::ms_alloc(uint8_t ms_class, uint8_t egprs_ms_class) +GprsMs *BTS::ms_alloc(uint8_t ms_class, uint8_t egprs_ms_class, bool is_fanr_capable) { GprsMs *ms; ms = ms_store().create_ms(); @@ -649,6 +649,7 @@ GprsMs *BTS::ms_alloc(uint8_t ms_class, uint8_t egprs_ms_class) ms->set_timeout(m_bts.ms_idle_sec); ms->set_ms_class(ms_class); ms->set_egprs_ms_class(egprs_ms_class); + ms->set_fanr_capable(is_fanr_capable); return ms; } @@ -1037,7 +1038,7 @@ void gprs_rlcmac_pdch::rcv_control_egprs_dl_ack_nack(EGPRS_PD_AckNack_t *ack_nac /* This call will register the new TBF with the MS on success */ tbf_alloc_ul(bts_data(), tbf->trx->trx_no, tbf->ms_class(), tbf->ms()->egprs_ms_class(), - tbf->tlli(), tbf->ta(), tbf->ms()); + tbf->tlli(), tbf->ta(), tbf->ms(), tbf->ms()->is_fanr_capable()); /* schedule uplink assignment */ tbf->ul_ass_state = GPRS_RLCMAC_UL_ASS_SEND_ASS; @@ -1097,7 +1098,7 @@ void gprs_rlcmac_pdch::rcv_control_dl_ack_nack(Packet_Downlink_Ack_Nack_t *ack_n /* This call will register the new TBF with the MS on success */ tbf_alloc_ul(bts_data(), tbf->trx->trx_no, tbf->ms_class(), tbf->ms()->egprs_ms_class(), - tbf->tlli(), tbf->ta(), tbf->ms()); + tbf->tlli(), tbf->ta(), tbf->ms(), tbf->ms()->is_fanr_capable()); /* schedule uplink assignment */ tbf->ul_ass_state = GPRS_RLCMAC_UL_ASS_SEND_ASS; @@ -1119,6 +1120,7 @@ void gprs_rlcmac_pdch::rcv_resource_request(Packet_Resource_Request_t *request, uint32_t tlli = request->ID.u.TLLI; uint8_t ms_class = 0; uint8_t egprs_ms_class = 0; + bool is_egprs_ms_fanr_capable = 0; uint8_t ta = 0; struct pcu_l1_meas meas; @@ -1174,6 +1176,10 @@ void gprs_rlcmac_pdch::rcv_resource_request(Packet_Resource_Request_t *request, egprs_ms_class = Decoding::get_egprs_ms_class_by_capability( &request->MS_Radio_Access_capability); + + is_egprs_ms_fanr_capable = + Decoding::is_ms_fanr_capable( + &request->MS_Radio_Access_capability); } if (!ms_class) LOGP(DRLCMAC, LOGL_NOTICE, "MS does not give us a class.\n"); @@ -1182,7 +1188,7 @@ void gprs_rlcmac_pdch::rcv_resource_request(Packet_Resource_Request_t *request, "MS supports EGPRS multislot class %d.\n", egprs_ms_class); ul_tbf = tbf_alloc_ul(bts_data(), trx_no(), ms_class, - egprs_ms_class, tlli, ta, ms); + egprs_ms_class, tlli, ta, ms, is_egprs_ms_fanr_capable); if (!ul_tbf) return; @@ -1193,8 +1199,10 @@ void gprs_rlcmac_pdch::rcv_resource_request(Packet_Resource_Request_t *request, ul_tbf->ul_ass_state = GPRS_RLCMAC_UL_ASS_SEND_ASS; /* get capabilities */ - if (ul_tbf->ms()) + if (ul_tbf->ms()) { ul_tbf->ms()->set_egprs_ms_class(egprs_ms_class); + ul_tbf->ms()->set_fanr_capable(is_egprs_ms_fanr_capable); + } /* get measurements */ if (ul_tbf->ms()) { @@ -1326,48 +1334,84 @@ int gprs_rlcmac_pdch::rcv_data_data_block(uint8_t *data, uint32_t fn, { int rc; struct gprs_rlc_ul_header_generic rlc_dec; - struct gprs_rlcmac_ul_tbf *tbf; - unsigned len = cs.maxBytesUL(); + struct gprs_rlcmac_ul_tbf *tbf = NULL; + + /* These are always data blocks, since EGPRS still uses CS-1 for + * control blocks (see 44.060, section 10.3, 1st par.) + */ + if (cs.isEgprs()) { + if (!bts()->bts_data()->egprs_enabled) { + LOGP(DRLCMACUL, LOGL_ERROR, + "Got %s RLC block but EGPRS is not enabled\n", + cs.name()); + return -EINVAL; + } - /* These are always data blocks, since EGPRS still uses CS-1 for - * control blocks (see 44.060, section 10.3, 1st par.) - */ - if (cs.isEgprs()) { - if (!bts()->bts_data()->egprs_enabled) { - LOGP(DRLCMACUL, LOGL_ERROR, - "Got %s RLC block but EGPRS is not enabled\n", - cs.name()); - return -EINVAL; - } + uint8_t tfi = ((data[1] & 0x7) << 2) | ((data[0] & 0xc0) >> 6); - } + /* find TBF inst from given TFI */ + tbf = ul_tbf_by_tfi(tfi); + if (!tbf) { + LOGP(DRLCMACUL, LOGL_NOTICE, "UL DATA unknown TFI=%d\n", + tfi); + return 0; + } - LOGP(DRLCMACUL, LOGL_DEBUG, " UL data: %s\n", osmo_hexdump(data, len)); + rc = Decoding::rlc_parse_ul_data_header_egprs(&rlc_dec, data, cs, tbf); + if (rc == -ENOTSUP ) { + LOGP(DRLCMACUL, LOGL_ERROR, + "Got %s RLC block but header parsing has failed\n", + cs.name()); + bts()->decode_error(); + return rc; + } - rc = Decoding::rlc_parse_ul_data_header(&rlc_dec, data, cs); - if (rc == -ENOTSUP ) { - LOGP(DRLCMACUL, LOGL_ERROR, - "Got %s RLC block but header parsing has failed\n", - cs.name()); - bts()->decode_error(); - return rc; - } + if (1 == rlc_dec.pani) { + if (false == tbf->is_fanr_enabled()) + LOGP(DRLCMACUL, LOGL_ERROR, "Received PAN field " + "but FANR is not activated for TBF\n"); + } - LOGP(DRLCMACUL, LOGL_INFO, - "Got %s RLC block: " - "R=%d, SI=%d, TFI=%d, CPS=%d, RSB=%d\n", - cs.name(), - rlc_dec.r, rlc_dec.si, rlc_dec.tfi, rlc_dec.cps, rlc_dec.rsb - ); - /* find TBF inst from given TFI */ - tbf = ul_tbf_by_tfi(rlc_dec.tfi); - if (!tbf) { - LOGP(DRLCMACUL, LOGL_NOTICE, "UL DATA unknown TFI=%d\n", - rlc_dec.tfi); - return 0; - } + struct gprs_rlcmac_bts* bts_info = bts_data(); + if (false == bts_info->fanr_enabled) { + if (1 == rlc_dec.pani) + LOGP(DRLCMACUL, LOGL_ERROR, "PANI shall not be true since bts" + " not configured for fanr\n"); + } + LOGP(DRLCMACUL, LOGL_INFO, + "Got %s RLC block: " + "R=%d, SI=%d, TFI=%d, CPS=%d, RSB=%d\n", + cs.name(), + rlc_dec.r, rlc_dec.si, rlc_dec.tfi, rlc_dec.cps, rlc_dec.rsb + ); + + if (tbf->is_fanr_enabled()) + LOGP(DRLCMACUL, LOGL_INFO,"Pani value=%d \n",rlc_dec.pani); + }else{ + rc = Decoding::rlc_parse_ul_data_header(&rlc_dec, data, cs); + if (rc == -ENOTSUP ) { + LOGP(DRLCMACUL, LOGL_ERROR, + "Got %s RLC block but header parsing has failed\n", + cs.name()); + bts()->decode_error(); + return rc; + } + /* find TBF inst from given TFI */ + tbf = ul_tbf_by_tfi(rlc_dec.tfi); + if (!tbf) { + LOGP(DRLCMACUL, LOGL_NOTICE, "UL DATA unknown TFI=%d\n", + rlc_dec.tfi); + return 0; + } + LOGP(DRLCMACUL, LOGL_INFO, + "Got %s RLC block: " + "R=%d, SI=%d, TFI=%d, CPS=%d, RSB=%d\n", + cs.name(), + rlc_dec.r, rlc_dec.si, rlc_dec.tfi, rlc_dec.cps, rlc_dec.rsb + ); + } - return tbf->rcv_data_block_acknowledged(&rlc_dec, data, len, meas); + return tbf->rcv_data_block_acknowledged(&rlc_dec, data, meas); } /* received RLC/MAC block from L1 */ @@ -1383,8 +1427,10 @@ int gprs_rlcmac_pdch::rcv_block(uint8_t *data, uint8_t len, uint32_t fn, } LOGP(DRLCMACUL, LOGL_DEBUG, "Got RLC block, coding scheme: %s, " - "length: %d (%d))\n", cs.name(), len, cs.maxBytesUL()); + "length: %d \n", cs.name(), len); + LOGP(DRLCMACUL, LOGL_DEBUG, "UL data: %s\n", osmo_hexdump(data, len)); + if (cs.isGprs()) return rcv_block_gprs(data, fn, meas, cs); diff --git a/src/bts.h b/src/bts.h index 7e3ea80..33a5f7c 100644 --- a/src/bts.h +++ b/src/bts.h @@ -303,7 +303,7 @@ public: GprsMsStorage &ms_store(); GprsMs *ms_by_tlli(uint32_t tlli, uint32_t old_tlli = 0); GprsMs *ms_by_imsi(const char *imsi); - GprsMs *ms_alloc(uint8_t ms_class, uint8_t egprs_ms_class = 0); + GprsMs *ms_alloc(uint8_t ms_class, uint8_t egprs_ms_class = 0, bool is_fanr_capable = false); /* * Statistics diff --git a/src/decoding.cpp b/src/decoding.cpp index 2a57bed..649f68d 100644 --- a/src/decoding.cpp +++ b/src/decoding.cpp @@ -20,7 +20,7 @@ #include <decoding.h> #include <rlc.h> #include <gprs_debug.h> - +#include "bts.h" #include <arpa/inet.h> #include <errno.h> @@ -347,6 +347,12 @@ uint8_t Decoding::get_egprs_ms_class_by_capability(MS_Radio_Access_capability_t return 0; } +bool Decoding::is_ms_fanr_capable(MS_Radio_Access_capability_t *cap) +{ + /*TODO*/ + return false; +} + void Decoding::extract_egprs_urbb(uint16_t urbb_length, const uint8_t *urbb, char *show_rbb) { for (int i = 0; i < urbb_length; i++) { @@ -376,18 +382,311 @@ void Decoding::extract_rbb(const uint8_t *rbb, char *show_rbb) show_rbb[64] = '\0'; } -int Decoding::rlc_parse_ul_data_header(struct gprs_rlc_ul_header_generic *rlc, - const uint8_t *data, GprsCodingScheme cs) +int Decoding::decode_ul_data_fanr_type1(struct gprs_rlc_ul_header_generic *rlc, + const uint8_t *data, GprsCodingScheme* cs) { - const struct rlc_ul_header *gprs; unsigned int data_len = 0; + data_len = cs->maxDataBlockBytes(); + + const struct gprs_rlc_ul_header_egprs_fanr_type1 *egprs1; + egprs1 = static_cast<struct gprs_rlc_ul_header_egprs_fanr_type1*> + ((void *)data); + rlc->r = egprs1->r; + rlc->si = egprs1->si; + rlc->tfi = (egprs1->tfi_a << 0) | (egprs1->tfi_b << 2); + rlc->cps = egprs1->cps; + rlc->rsb = egprs1->rsb; + rlc->cv = egprs1->cv; + rlc->pani = egprs1->pani; + + rlc->num_data_blocks = 2; + rlc->block_info[0].cv = egprs1->cv; + rlc->block_info[0].pi = egprs1->pi; + rlc->block_info[0].bsn = + (egprs1->bsn1_a << 0) | (egprs1->bsn1_b << 5); + + rlc->block_info[0].spb = 0; + + rlc->block_info[1].cv = egprs1->cv; + rlc->block_info[1].pi = egprs1->pi; + + rlc->block_info[1].bsn = rlc->block_info[0].bsn + ((egprs1->bsn2_a << 0) | (egprs1->bsn2_b << 2)); + rlc->block_info[1].bsn = (rlc->block_info[1].bsn + 2048) % 2047; + + rlc->block_info[0].e = (data[6] & 0x01); + rlc->block_info[0].ti = (data[6] & 0x02) >> 1; + rlc->block_info[1].e = (data[6 + data_len + 1] & 0x01); + rlc->block_info[1].ti = (data[6 + data_len + 1] & 0x02) >> 1; + rlc->block_info[1].spb = 0; + + rlc->block_info[0].data_len = data_len; + rlc->block_info[1].data_len = data_len; + rlc->data_offs_bytes[0] = 7; + rlc->data_offs_bytes[1] = 7 + data_len + 1; + return 0; +} + +int Decoding::decode_ul_data_type1(struct gprs_rlc_ul_header_generic *rlc, + const uint8_t *data, GprsCodingScheme* cs) +{ + unsigned int data_len = 0; + data_len = cs->maxDataBlockBytes(); + + const struct gprs_rlc_ul_header_egprs_1 *egprs1; + egprs1 = static_cast<struct gprs_rlc_ul_header_egprs_1 *> + ((void *)data); + rlc->r = egprs1->r; + rlc->si = egprs1->si; + rlc->tfi = (egprs1->tfi_a << 0) | (egprs1->tfi_b << 2); + rlc->cps = egprs1->cps; + rlc->rsb = egprs1->rsb; + rlc->cv = egprs1->cv; + rlc->pani = 0; + + rlc->num_data_blocks = 2; + rlc->block_info[0].cv = egprs1->cv; + rlc->block_info[0].pi = egprs1->pi; + rlc->block_info[0].bsn = + (egprs1->bsn1_a << 0) | (egprs1->bsn1_b << 5); + /* data base initialisation not from received block */ + rlc->block_info[0].spb = 0; + + rlc->block_info[1].cv = egprs1->cv; + rlc->block_info[1].pi = egprs1->pi; + + rlc->block_info[1].bsn = rlc->block_info[0].bsn + ((egprs1->bsn2_a << 0) | (egprs1->bsn2_b << 2)); + rlc->block_info[1].bsn = (rlc->block_info[1].bsn + 2048) % 2047; + + rlc->block_info[0].e = (data[6] & 0x01); + rlc->block_info[0].ti = (data[6] & 0x02) >> 1; + rlc->block_info[1].e = (data[6 + data_len + 1] & 0x01); + rlc->block_info[1].ti = (data[6 + data_len + 1] & 0x02) >> 1; + rlc->block_info[1].spb = 0; + + rlc->block_info[0].data_len = data_len; + rlc->block_info[1].data_len = data_len; + rlc->data_offs_bytes[0] = 7; + rlc->data_offs_bytes[1] = 7 + data_len + 1; + return 0; +} + +int Decoding::decode_ul_data_fanr_type2(struct gprs_rlc_ul_header_generic *rlc, + const uint8_t *data, GprsCodingScheme* cs) +{ + uint8_t pad_bytes = 6; + unsigned int data_len = 0; + data_len = cs->maxDataBlockBytes(); + const struct gprs_rlc_ul_header_egprs_fanr_type2 *egprs2; + egprs2 = static_cast<struct gprs_rlc_ul_header_egprs_fanr_type2*> + ((void *)data); + rlc->r = egprs2->r; + rlc->si = egprs2->si; + rlc->tfi = (egprs2->tfi_a << 0) | (egprs2->tfi_b << 2); + rlc->cps = (egprs2->cps_a << 0) | (egprs2->cps_b << 2); + rlc->rsb = egprs2->rsb; + rlc->cv = egprs2->cv; + rlc->pani = egprs2->pani; + + rlc->num_data_blocks = 1; + rlc->block_info[0].cv = egprs2->cv; + rlc->block_info[0].pi = egprs2->pi; + rlc->block_info[0].bsn = + (egprs2->bsn1_a << 0) | (egprs2->bsn1_b << 5); + + /* data base initialisation not from received block */ + rlc->block_info[0].spb = 0; + + rlc->block_info[0].e = (data[5] & 0x01); + rlc->block_info[0].ti = (data[5] & 0x02) >> 1; + + rlc->block_info[0].data_len = data_len; + rlc->data_offs_bytes[0] = 6; + + if(*cs == GprsCodingScheme::MCS6){ + if(rlc->cps == 2 || rlc->cps == 3 ){ + rlc->block_info[0].data_len -= pad_bytes; + rlc->data_offs_bytes[0] += pad_bytes; + rlc->block_info[0].e = (data[5 + pad_bytes] & 0x01); + rlc->block_info[0].ti = (data[5 + pad_bytes] & 0x02) >> 1; + } + } + return 0; +} + +int Decoding::decode_ul_data_type2(struct gprs_rlc_ul_header_generic *rlc, + const uint8_t *data, GprsCodingScheme* cs) +{ + uint8_t pad_bytes = 6; + unsigned int data_len = 0; + data_len = cs->maxDataBlockBytes(); + + const struct gprs_rlc_ul_header_egprs_2 *egprs2; + egprs2 = static_cast<struct gprs_rlc_ul_header_egprs_2 *> + ((void *)data); + rlc->r = egprs2->r; + rlc->si = egprs2->si; + rlc->tfi = (egprs2->tfi_a << 0) | (egprs2->tfi_b << 2); + rlc->cps = (egprs2->cps_a << 0) | (egprs2->cps_b << 2); + rlc->rsb = egprs2->rsb; + rlc->cv = egprs2->cv; + rlc->pani = 0; + + rlc->num_data_blocks = 1; + rlc->block_info[0].cv = egprs2->cv; + rlc->block_info[0].pi = egprs2->pi; + rlc->block_info[0].bsn = + (egprs2->bsn1_a << 0) | (egprs2->bsn1_b << 5); + + /* data base initialisation not from received block */ + rlc->block_info[0].spb = 0; + + rlc->block_info[0].e = (data[5] & 0x01); + rlc->block_info[0].ti = (data[5] & 0x02) >> 1; + + rlc->block_info[0].data_len = data_len; + rlc->data_offs_bytes[0] = 6; + + if(*cs == GprsCodingScheme::MCS6){ + if(rlc->cps == 2 || rlc->cps == 3 ){ + rlc->block_info[0].data_len -= pad_bytes; + rlc->data_offs_bytes[0] += pad_bytes; + rlc->block_info[0].e = (data[5 + pad_bytes] & 0x01); + rlc->block_info[0].ti = (data[5 + pad_bytes] & 0x02) >> 1; + } + } + return 0; +} + +int Decoding::decode_ul_data_fanr_type3(struct gprs_rlc_ul_header_generic *rlc, + const uint8_t *data, GprsCodingScheme* cs) +{ + uint8_t pad_bytes = 6; + unsigned int data_len = 0; + data_len = cs->maxDataBlockBytes(); + + const struct gprs_rlc_ul_header_egprs_fanr_type3 *egprs3; + egprs3 = static_cast<struct gprs_rlc_ul_header_egprs_fanr_type3*> + ((void *)data); + rlc->r = egprs3->r; + rlc->si = egprs3->si; + rlc->tfi = (egprs3->tfi_a << 0) | (egprs3->tfi_b << 2); + rlc->cps = (egprs3->cps_a << 0) | (egprs3->cps_b << 2); + rlc->rsb = egprs3->rsb; + rlc->cv = egprs3->cv; + rlc->pani = egprs3->pani; + + 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); + + rlc->block_info[0].e = (data[4] & 0x01); + rlc->block_info[0].ti = (data[4] & 0x02) >> 1; + + rlc->block_info[0].data_len = data_len; + rlc->data_offs_bytes[0] = 5; + + if(rlc->block_info[0].spb == 2){ + if(*cs == GprsCodingScheme::MCS3){ + if(rlc->cps == 6 || rlc->cps == 7 || rlc->cps == 8){ + rlc->block_info[0].data_len -= pad_bytes; + rlc->data_offs_bytes[0] += pad_bytes; + rlc->block_info[0].e = (data[4 + pad_bytes] & 0x01); + rlc->block_info[0].ti = (data[4 + pad_bytes] & 0x02) >> 1; + } + } + } + return 0; +} + +int Decoding::decode_ul_data_type3(struct gprs_rlc_ul_header_generic *rlc, + const uint8_t *data, GprsCodingScheme* cs) +{ uint8_t pad_bytes = 6; + unsigned int data_len = 0; + data_len = cs->maxDataBlockBytes(); + + const struct gprs_rlc_ul_header_egprs_3 *egprs3; + egprs3 = static_cast<struct gprs_rlc_ul_header_egprs_3 *> + ((void *)data); + rlc->r = egprs3->r; + rlc->si = egprs3->si; + rlc->tfi = (egprs3->tfi_a << 0) | (egprs3->tfi_b << 2); + rlc->cps = (egprs3->cps_a << 0) | (egprs3->cps_b << 2); + rlc->rsb = egprs3->rsb; + rlc->cv = egprs3->cv; + rlc->pani = 0; + + 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); + + rlc->block_info[0].e = (data[4] & 0x01); + rlc->block_info[0].ti = (data[4] & 0x02) >> 1; + + rlc->block_info[0].data_len = data_len; + rlc->data_offs_bytes[0] = 5; + + if(rlc->block_info[0].spb == 2){ + if(*cs == GprsCodingScheme::MCS3){ + if(rlc->cps == 6 || rlc->cps == 7 || rlc->cps == 8){ + rlc->block_info[0].data_len -= pad_bytes; + rlc->data_offs_bytes[0] += pad_bytes; + rlc->block_info[0].e = (data[4 + pad_bytes] & 0x01); + rlc->block_info[0].ti = (data[4 + pad_bytes] & 0x02) >> 1; + } + } + } + return 0; +} + +int Decoding::rlc_parse_ul_data_header_egprs(struct gprs_rlc_ul_header_generic *rlc, + const uint8_t *data, GprsCodingScheme cs, struct gprs_rlcmac_ul_tbf *tbf) +{ rlc->cs = cs; + if (tbf->is_fanr_enabled()) { + if (GprsCodingScheme::HEADER_EGPRS_DATA_TYPE_3 == cs.headerTypeData()) { + decode_ul_data_fanr_type3(rlc,data,&cs); + }else if (GprsCodingScheme::HEADER_EGPRS_DATA_TYPE_2 == cs.headerTypeData()) { + decode_ul_data_fanr_type2(rlc,data,&cs); + }else if (GprsCodingScheme::HEADER_EGPRS_DATA_TYPE_1 == cs.headerTypeData()) { + decode_ul_data_fanr_type1(rlc,data,&cs); + }else{ + LOGP(DRLCMACUL, LOGL_ERROR, "Not a Valid TYPE (%d) for fanr Egprs Type\n", + cs.headerTypeData()); + return -ENOTSUP; + } + }else{ + if (GprsCodingScheme::HEADER_EGPRS_DATA_TYPE_3 == cs.headerTypeData()) { + decode_ul_data_type3(rlc,data,&cs); + }else if (GprsCodingScheme::HEADER_EGPRS_DATA_TYPE_2 == cs.headerTypeData()) { + decode_ul_data_type2(rlc,data,&cs); + }else if (GprsCodingScheme::HEADER_EGPRS_DATA_TYPE_1 == cs.headerTypeData()) { + decode_ul_data_type1(rlc,data,&cs); + }else { + LOGP(DRLCMACUL, LOGL_ERROR, "Not a Valid TYPE (%d) for Normal Egprs Type\n", + cs.headerTypeData()); + return -ENOTSUP; + } + } + return 0; +} + +int Decoding::rlc_parse_ul_data_header(struct gprs_rlc_ul_header_generic *rlc, + const uint8_t *data, GprsCodingScheme cs) +{ + const struct rlc_ul_header *gprs; + rlc->cs = cs; + unsigned int data_len = 0; data_len = cs.maxDataBlockBytes(); - switch(cs.headerTypeData()) { - case GprsCodingScheme::HEADER_GPRS_DATA: + if(GprsCodingScheme::HEADER_GPRS_DATA == cs.headerTypeData()){ gprs = static_cast<struct rlc_ul_header *> ((void *)data); rlc->r = gprs->r; @@ -395,7 +694,7 @@ int Decoding::rlc_parse_ul_data_header(struct gprs_rlc_ul_header_generic *rlc, rlc->tfi = gprs->tfi; rlc->cps = 0; rlc->rsb = 0; - rlc->pani= 0; + rlc->pani = 0; rlc->num_data_blocks = 1; rlc->block_info[0].cv = gprs->cv; @@ -404,133 +703,13 @@ int Decoding::rlc_parse_ul_data_header(struct gprs_rlc_ul_header_generic *rlc, rlc->block_info[0].e = gprs->e; rlc->block_info[0].ti = gprs->ti; rlc->block_info[0].spb = 0; - rlc->data_offs_bytes[0] = 3; + rlc->data_offs_bytes[0] = 3; rlc->block_info[0].data_len = data_len; - - break; - case GprsCodingScheme::HEADER_EGPRS_DATA_TYPE_3: - const struct gprs_rlc_ul_header_egprs_3 *egprs3; - egprs3 = static_cast<struct gprs_rlc_ul_header_egprs_3 *> - ((void *)data); - rlc->r = egprs3->r; - rlc->si = egprs3->si; - rlc->tfi = (egprs3->tfi_a << 0) | (egprs3->tfi_b << 2); - rlc->cps = (egprs3->cps_a << 0) | (egprs3->cps_b << 2); - rlc->rsb = egprs3->rsb; - rlc->cv = egprs3->cv; - /* pani 0 for fanr inactive */ - rlc->pani = 0; - - 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); - - rlc->block_info[0].e = (data[4] & 0x01); - rlc->block_info[0].ti = (data[4] & 0x02) >> 1; - - rlc->block_info[0].data_len = data_len; - rlc->data_offs_bytes[0] = 5; - - if(rlc->block_info[0].spb == 2){ - if(cs == GprsCodingScheme::MCS3){ - if(rlc->cps == 6 || rlc->cps == 7 || rlc->cps == 8){ - rlc->block_info[0].data_len -= pad_bytes; - rlc->data_offs_bytes[0] += pad_bytes; - rlc->block_info[0].e = (data[4 + pad_bytes] & 0x01); - rlc->block_info[0].ti = (data[4 + pad_bytes] & 0x02) >> 1; - } - } - } - break; - - case GprsCodingScheme::HEADER_EGPRS_DATA_TYPE_2: - const struct gprs_rlc_ul_header_egprs_2 *egprs2; - egprs2 = static_cast<struct gprs_rlc_ul_header_egprs_2 *> - ((void *)data); - rlc->r = egprs2->r; - rlc->si = egprs2->si; - rlc->tfi = (egprs2->tfi_a << 0) | (egprs2->tfi_b << 2); - rlc->cps = (egprs2->cps_a << 0) | (egprs2->cps_b << 2); - rlc->rsb = egprs2->rsb; - rlc->cv = egprs2->cv; - /* pani 0 for fanr inactive */ - rlc->pani = 0; - - rlc->num_data_blocks = 1; - rlc->block_info[0].cv = egprs2->cv; - rlc->block_info[0].pi = egprs2->pi; - rlc->block_info[0].bsn = - (egprs2->bsn1_a << 0) | (egprs2->bsn1_b << 5); - - /* data base initialisation not from received block */ - rlc->block_info[0].spb = 0; - - rlc->block_info[0].e = (data[5] & 0x01); - rlc->block_info[0].ti = (data[5] & 0x02) >> 1; - - rlc->block_info[0].data_len = data_len; - rlc->data_offs_bytes[0] = 6; - - if(cs == GprsCodingScheme::MCS6){ - if(rlc->cps == 2 || rlc->cps == 3 ){ - rlc->block_info[0].data_len -= pad_bytes; - rlc->data_offs_bytes[0] += pad_bytes; - rlc->block_info[0].e = (data[5 + pad_bytes] & 0x01); - rlc->block_info[0].ti = (data[5 + pad_bytes] & 0x02) >> 1; - } - } - break; - - case GprsCodingScheme::HEADER_EGPRS_DATA_TYPE_1: - const struct gprs_rlc_ul_header_egprs_1 *egprs1; - egprs1 = static_cast<struct gprs_rlc_ul_header_egprs_1 *> - ((void *)data); - rlc->r = egprs1->r; - rlc->si = egprs1->si; - rlc->tfi = (egprs1->tfi_a << 0) | (egprs1->tfi_b << 2); - rlc->cps = egprs1->cps; - rlc->rsb = egprs1->rsb; - rlc->cv = egprs1->cv; - /* pani 0 for fanr inactive */ - rlc->pani = 0; - - rlc->num_data_blocks = 2; - rlc->block_info[0].cv = egprs1->cv; - rlc->block_info[0].pi = egprs1->pi; - rlc->block_info[0].bsn = - (egprs1->bsn1_a << 0) | (egprs1->bsn1_b << 5); - /* data base initialisation not from received block */ - rlc->block_info[0].spb = 0; - - rlc->block_info[1].cv = egprs1->cv; - rlc->block_info[1].pi = egprs1->pi; - - rlc->block_info[1].bsn = rlc->block_info[0].bsn + ((egprs1->bsn2_a << 0) | (egprs1->bsn2_b << 2)); - rlc->block_info[1].bsn = (rlc->block_info[1].bsn + 2048) % 2047; - - rlc->block_info[0].e = (data[6] & 0x01); - rlc->block_info[0].ti = (data[6] & 0x02) >> 1; - rlc->block_info[1].e = (data[6 + data_len + 1] & 0x01); - rlc->block_info[1].ti = (data[6 + data_len + 1] & 0x02) >> 1; - rlc->block_info[1].spb = 0; - - rlc->block_info[0].data_len = data_len; - rlc->block_info[1].data_len = data_len; - rlc->data_offs_bytes[0] = 7; - rlc->data_offs_bytes[1] = 7 + data_len + 1; - - break; - default: - LOGP(DRLCMACDL, LOGL_ERROR, - "Decoding of uplink %s data blocks not yet supported.\n", - cs.name()); + }else{ + LOGP(DRLCMACUL, LOGL_ERROR, "Not a Valid TYPE (%d)\n",cs.headerTypeData()); return -ENOTSUP; - }; - + } return 0; } diff --git a/src/decoding.h b/src/decoding.h index ba0257f..25a9cf9 100644 --- a/src/decoding.h +++ b/src/decoding.h @@ -21,6 +21,7 @@ #include <gsm_rlcmac.h> #include "gprs_coding_scheme.h" +#include "tbf.h" #include "rlc.h" #include <stdint.h> @@ -43,9 +44,32 @@ public: static void extract_rbb(const uint8_t *rbb, char *extracted_rbb); static void extract_egprs_urbb(uint16_t urbb_length, const uint8_t *urbb, char *show_rbb); static uint8_t get_egprs_ms_class_by_capability(MS_Radio_Access_capability_t *cap); + static bool is_ms_fanr_capable(MS_Radio_Access_capability_t *cap); static int rlc_parse_ul_data_header(struct gprs_rlc_ul_header_generic *rlc, const uint8_t *data, GprsCodingScheme cs); + + static int rlc_parse_ul_data_header_egprs(struct gprs_rlc_ul_header_generic *rlc, + const uint8_t *data, GprsCodingScheme cs, struct gprs_rlcmac_ul_tbf *tbf); + + static int decode_ul_data_type3(struct gprs_rlc_ul_header_generic *rlc, + const uint8_t *data, GprsCodingScheme* cs); + + static int decode_ul_data_fanr_type3(struct gprs_rlc_ul_header_generic *rlc, + const uint8_t *data, GprsCodingScheme* cs); + + static int decode_ul_data_type2(struct gprs_rlc_ul_header_generic *rlc, + const uint8_t *data, GprsCodingScheme* cs); + + static int decode_ul_data_fanr_type2(struct gprs_rlc_ul_header_generic *rlc, + const uint8_t *data, GprsCodingScheme* cs); + + static int decode_ul_data_type1(struct gprs_rlc_ul_header_generic *rlc, + const uint8_t *data, GprsCodingScheme* cs); + + static int decode_ul_data_fanr_type1(struct gprs_rlc_ul_header_generic *rlc, + const uint8_t *data, GprsCodingScheme* cs); + static unsigned int rlc_copy_to_aligned_buffer( const struct gprs_rlc_ul_header_generic *rlc, unsigned int data_block_idx, diff --git a/src/gprs_bssgp_pcu.cpp b/src/gprs_bssgp_pcu.cpp index 22ab8a8..cf6f41f 100644 --- a/src/gprs_bssgp_pcu.cpp +++ b/src/gprs_bssgp_pcu.cpp @@ -154,6 +154,13 @@ static int parse_egprs_ra_cap_ms_class(struct tlv_parsed *tp) bitvec_free(block); return egprs_ms_class; } + +static bool parse_egprs_ra_cap_ms_fanr_capable(struct tlv_parsed *tp) +{ + /*TODO*/ + return false; +} + static int gprs_bssgp_pcu_rx_dl_ud(struct msgb *msg, struct tlv_parsed *tp) { struct bssgp_ud_hdr *budh; @@ -192,6 +199,9 @@ static int gprs_bssgp_pcu_rx_dl_ud(struct msgb *msg, struct tlv_parsed *tp) /* parse egprs ms radio access capability */ uint8_t egprs_ms_class = parse_egprs_ra_cap_ms_class(tp); + /* parse egprs ms radio access capability to get fanr capability */ + bool is_fanr_capable = parse_egprs_ra_cap_ms_fanr_capable(tp); + /* get lifetime */ uint16_t delay_csec = 0xffff; if (TLVP_PRESENT(tp, BSSGP_IE_PDU_LIFETIME)) @@ -221,7 +231,7 @@ static int gprs_bssgp_pcu_rx_dl_ud(struct msgb *msg, struct tlv_parsed *tp) LOGP(DBSSGP, LOGL_INFO, "LLC [SGSN -> PCU] = TLLI: 0x%08x IMSI: %s len: %d\n", tlli, imsi, len); return gprs_rlcmac_dl_tbf::handle(the_pcu.bts, tlli, tlli_old, imsi, - ms_class, egprs_ms_class, delay_csec, data, len); + ms_class, egprs_ms_class, delay_csec, data, len, is_fanr_capable); } int gprs_bssgp_pcu_rx_paging_ps(struct msgb *msg, struct tlv_parsed *tp) diff --git a/src/tbf.cpp b/src/tbf.cpp index 93dd8c2..05f5c82 100644 --- a/src/tbf.cpp +++ b/src/tbf.cpp @@ -285,14 +285,14 @@ void gprs_rlcmac_tbf::update_ms(uint32_t tlli, enum gprs_rlcmac_tbf_direction di gprs_rlcmac_ul_tbf *tbf_alloc_ul(struct gprs_rlcmac_bts *bts, int8_t use_trx, uint8_t ms_class, uint8_t egprs_ms_class, - uint32_t tlli, uint8_t ta, GprsMs *ms) + uint32_t tlli, uint8_t ta, GprsMs *ms, bool is_ms_fanr_capable) { struct gprs_rlcmac_ul_tbf *tbf; #warning "Copy and paste with tbf_new_dl_assignment" /* create new TBF, use same TRX as DL TBF */ /* use multislot class of downlink TBF */ - tbf = tbf_alloc_ul_tbf(bts, ms, use_trx, ms_class, egprs_ms_class, 0); + tbf = tbf_alloc_ul_tbf(bts, ms, use_trx, ms_class, egprs_ms_class, 0, is_ms_fanr_capable); if (!tbf) { LOGP(DRLCMAC, LOGL_NOTICE, "No PDCH resource\n"); /* FIXME: send reject */ @@ -611,7 +611,8 @@ static int ul_tbf_dtor(struct gprs_rlcmac_ul_tbf *tbf) struct gprs_rlcmac_ul_tbf *tbf_alloc_ul_tbf(struct gprs_rlcmac_bts *bts, GprsMs *ms, int8_t use_trx, - uint8_t ms_class, uint8_t egprs_ms_class, uint8_t single_slot) + uint8_t ms_class, uint8_t egprs_ms_class, uint8_t single_slot, + bool is_ms_fanr_capable) { struct gprs_rlcmac_ul_tbf *tbf; int rc; @@ -629,7 +630,7 @@ struct gprs_rlcmac_ul_tbf *tbf_alloc_ul_tbf(struct gprs_rlcmac_bts *bts, new (tbf) gprs_rlcmac_ul_tbf(bts->bts); if (!ms) - ms = bts->bts->ms_alloc(ms_class, egprs_ms_class); + ms = bts->bts->ms_alloc(ms_class, egprs_ms_class, is_ms_fanr_capable); if (egprs_ms_class > 0 && bts->egprs_enabled) { /* TODO: only for 8PSK, otherwise the GPRS MS class has to be used */ @@ -637,6 +638,9 @@ struct gprs_rlcmac_ul_tbf *tbf_alloc_ul_tbf(struct gprs_rlcmac_bts *bts, tbf->m_window.set_sns(RLC_EGPRS_SNS); tbf->m_window.set_ws(RLC_EGPRS_MIN_WS); } + if((true == is_ms_fanr_capable) && bts->egprs_enabled ){ + tbf->enable_fanr(); + } rc = setup_tbf(tbf, ms, use_trx, ms_class, egprs_ms_class, single_slot); /* if no resource */ @@ -679,7 +683,7 @@ static int dl_tbf_dtor(struct gprs_rlcmac_dl_tbf *tbf) struct gprs_rlcmac_dl_tbf *tbf_alloc_dl_tbf(struct gprs_rlcmac_bts *bts, GprsMs *ms, int8_t use_trx, - uint8_t ms_class, uint8_t egprs_ms_class, uint8_t single_slot) + uint8_t ms_class, uint8_t egprs_ms_class, uint8_t single_slot, bool is_fanr_capable) { struct gprs_rlcmac_dl_tbf *tbf; int rc = -1; @@ -703,11 +707,15 @@ struct gprs_rlcmac_dl_tbf *tbf_alloc_dl_tbf(struct gprs_rlcmac_bts *bts, tbf->m_window.set_ws(RLC_EGPRS_MIN_WS); } + if((true == is_fanr_capable) && (bts->fanr_enabled)){ + tbf->enable_fanr(); + } + if (!ms) { - ms = bts->bts->ms_alloc(ms_class, egprs_ms_class); + ms = bts->bts->ms_alloc(ms_class, egprs_ms_class, is_fanr_capable); } - rc = setup_tbf(tbf, ms, use_trx, ms_class, egprs_ms_class, single_slot); + rc = setup_tbf(tbf, ms, use_trx, ms_class, egprs_ms_class, single_slot); /* if no resource */ if (rc < 0) { talloc_free(tbf); @@ -1038,7 +1046,7 @@ int gprs_rlcmac_tbf::establish_dl_tbf_on_pacch() bts->tbf_reused(); new_tbf = tbf_alloc_dl_tbf(bts->bts_data(), ms(), this->trx->trx_no, ms_class(), - ms() ? ms()->egprs_ms_class() : 0, 0); + ms() ? ms()->egprs_ms_class() : 0, 0, 0); if (!new_tbf) { LOGP(DRLCMAC, LOGL_NOTICE, "No PDCH resource\n"); return -1; diff --git a/src/tbf.h b/src/tbf.h index 6e482c7..a6878d7 100644 --- a/src/tbf.h +++ b/src/tbf.h @@ -271,14 +271,16 @@ private: struct gprs_rlcmac_ul_tbf *tbf_alloc_ul(struct gprs_rlcmac_bts *bts, int8_t use_trx, uint8_t ms_class, uint8_t egprs_ms_class, - uint32_t tlli, uint8_t ta, GprsMs *ms); + uint32_t tlli, uint8_t ta, GprsMs *ms, bool is_ms_fanr_capable); struct gprs_rlcmac_ul_tbf *tbf_alloc_ul_tbf(struct gprs_rlcmac_bts *bts, GprsMs *ms, int8_t use_trx, - uint8_t ms_class, uint8_t egprs_ms_class, uint8_t single_slot); + uint8_t ms_class, uint8_t egprs_ms_class, uint8_t single_slot, + bool is_ms_fanr_capable); + struct gprs_rlcmac_dl_tbf *tbf_alloc_dl_tbf(struct gprs_rlcmac_bts *bts, GprsMs *ms, int8_t use_trx, - uint8_t ms_class, uint8_t egprs_ms_class, uint8_t single_slot); + uint8_t ms_class, uint8_t egprs_ms_class, uint8_t single_slot, bool is_fanr_capable); void tbf_free(struct gprs_rlcmac_tbf *tbf); @@ -365,7 +367,7 @@ struct gprs_rlcmac_dl_tbf : public gprs_rlcmac_tbf { const uint32_t tlli, const uint32_t tlli_old, const char *imsi, const uint8_t ms_class, const uint8_t egprs_ms_class, const uint16_t delay_csec, - const uint8_t *data, const uint16_t len); + const uint8_t *data, const uint16_t len, bool is_fanr_capable); int append_data(const uint8_t ms_class, const uint16_t pdu_delay_csec, const uint8_t *data, const uint16_t len); @@ -479,7 +481,7 @@ struct gprs_rlcmac_ul_tbf : public gprs_rlcmac_tbf { /* blocks were acked */ int rcv_data_block_acknowledged( const struct gprs_rlc_ul_header_generic *rlc, - uint8_t *data, uint8_t len, struct pcu_l1_meas *meas); + uint8_t *data,struct pcu_l1_meas *meas); /* In case of re segmentation process the spb values and decides weather original block is rebuilt */ diff --git a/src/tbf_dl.cpp b/src/tbf_dl.cpp index a2f6324..a909d9d 100644 --- a/src/tbf_dl.cpp +++ b/src/tbf_dl.cpp @@ -137,7 +137,8 @@ static int tbf_new_dl_assignment(struct gprs_rlcmac_bts *bts, const uint32_t tlli, const uint32_t tlli_old, const uint8_t ms_class, const uint8_t egprs_ms_class, - struct gprs_rlcmac_dl_tbf **tbf) + struct gprs_rlcmac_dl_tbf **tbf, + bool is_fanr_capable) { uint8_t ss; int8_t use_trx; @@ -171,7 +172,7 @@ static int tbf_new_dl_assignment(struct gprs_rlcmac_bts *bts, #warning "Copy and paste with alloc_ul_tbf" /* set number of downlink slots according to multislot class */ - dl_tbf = tbf_alloc_dl_tbf(bts, ms, use_trx, ms_class, egprs_ms_class, ss); + dl_tbf = tbf_alloc_dl_tbf(bts, ms, use_trx, ms_class, egprs_ms_class, ss, is_fanr_capable); if (!dl_tbf) { LOGP(DRLCMAC, LOGL_NOTICE, "No PDCH resource\n"); @@ -200,7 +201,8 @@ static int tbf_new_dl_assignment(struct gprs_rlcmac_bts *bts, int gprs_rlcmac_dl_tbf::handle(struct gprs_rlcmac_bts *bts, const uint32_t tlli, const uint32_t tlli_old, const char *imsi, const uint8_t ms_class, const uint8_t egprs_ms_class, - const uint16_t delay_csec, const uint8_t *data, const uint16_t len) + const uint16_t delay_csec, const uint8_t *data, const uint16_t len, + bool is_fanr_capable) { struct gprs_rlcmac_dl_tbf *dl_tbf = NULL; int rc; @@ -246,7 +248,7 @@ int gprs_rlcmac_dl_tbf::handle(struct gprs_rlcmac_bts *bts, if (!dl_tbf) { rc = tbf_new_dl_assignment(bts, imsi, tlli, tlli_old, - ms_class, egprs_ms_class, &dl_tbf); + ms_class, egprs_ms_class, &dl_tbf, is_fanr_capable); if (rc < 0) return rc; } diff --git a/src/tbf_ul.cpp b/src/tbf_ul.cpp index 9de1b6b..e89ac14 100644 --- a/src/tbf_ul.cpp +++ b/src/tbf_ul.cpp @@ -209,7 +209,7 @@ egprs_rlc_ul_reseg_bsn_state gprs_rlcmac_ul_tbf::assemble_rlc_block_frm_segmente int gprs_rlcmac_ul_tbf::rcv_data_block_acknowledged( const struct gprs_rlc_ul_header_generic *rlc, - uint8_t *data, uint8_t len, struct pcu_l1_meas *meas) + uint8_t *data, struct pcu_l1_meas *meas) { int8_t rssi = meas->have_rssi ? meas->rssi : 0; diff --git a/tests/alloc/AllocTest.cpp b/tests/alloc/AllocTest.cpp index d338b78..e7b1e45 100644 --- a/tests/alloc/AllocTest.cpp +++ b/tests/alloc/AllocTest.cpp @@ -43,10 +43,10 @@ static gprs_rlcmac_tbf *tbf_alloc(struct gprs_rlcmac_bts *bts, { if (dir == GPRS_RLCMAC_UL_TBF) return tbf_alloc_ul_tbf(bts, ms, use_trx, - ms_class, egprs_ms_class, single_slot); + ms_class, egprs_ms_class, single_slot, false); else return tbf_alloc_dl_tbf(bts, ms, use_trx, - ms_class, egprs_ms_class, single_slot); + ms_class, egprs_ms_class, single_slot, false); } static void check_tfi_usage(BTS *the_bts) @@ -202,7 +202,7 @@ static void test_alloc_b(int ms_class) trx->pdch[6].enable(); trx->pdch[7].enable(); - ul_tbf = tbf_alloc_ul_tbf(bts, NULL, -1, ms_class, 0, 1); + ul_tbf = tbf_alloc_ul_tbf(bts, NULL, -1, ms_class, 0, 1, false); OSMO_ASSERT(ul_tbf); OSMO_ASSERT(ul_tbf->ms()); OSMO_ASSERT(ul_tbf->ms()->current_trx()); @@ -210,7 +210,7 @@ static void test_alloc_b(int ms_class) dump_assignment(ul_tbf, "UL"); /* assume final ack has not been sent */ - dl_tbf = tbf_alloc_dl_tbf(bts, ul_tbf->ms(), trx_no, ms_class, 0, 0); + dl_tbf = tbf_alloc_dl_tbf(bts, ul_tbf->ms(), trx_no, ms_class, 0, 0, false); OSMO_ASSERT(dl_tbf); dump_assignment(dl_tbf, "DL"); @@ -244,7 +244,7 @@ static void test_alloc_b(int ms_class) trx->pdch[6].enable(); trx->pdch[7].enable(); - dl_tbf = tbf_alloc_dl_tbf(bts, NULL, -1, ms_class, 0, 1); + dl_tbf = tbf_alloc_dl_tbf(bts, NULL, -1, ms_class, 0, 1, false); dl_tbf->update_ms(0x23, GPRS_RLCMAC_DL_TBF); OSMO_ASSERT(dl_tbf); OSMO_ASSERT(dl_tbf->ms()); @@ -252,7 +252,7 @@ static void test_alloc_b(int ms_class) trx_no = dl_tbf->ms()->current_trx()->trx_no; dump_assignment(dl_tbf, "DL"); - ul_tbf = tbf_alloc_ul_tbf(bts, dl_tbf->ms(), trx_no, ms_class, 0, 0); + ul_tbf = tbf_alloc_ul_tbf(bts, dl_tbf->ms(), trx_no, ms_class, 0, 0, false); ul_tbf->update_ms(0x23, GPRS_RLCMAC_UL_TBF); ul_tbf->m_contention_resolution_done = 1; OSMO_ASSERT(ul_tbf); @@ -294,7 +294,7 @@ static void test_alloc_b(int ms_class) tfi = the_bts.tfi_find_free(GPRS_RLCMAC_UL_TBF, &trx_no, -1); OSMO_ASSERT(tfi >= 0); - ul_tbf = tbf_alloc_ul_tbf(bts, NULL, .1, ms_class, 0, 0); + ul_tbf = tbf_alloc_ul_tbf(bts, NULL, .1, ms_class, 0, 0, false); OSMO_ASSERT(ul_tbf); OSMO_ASSERT(ul_tbf->ms()); OSMO_ASSERT(ul_tbf->ms()->current_trx()); @@ -302,7 +302,7 @@ static void test_alloc_b(int ms_class) dump_assignment(ul_tbf, "UL"); /* assume final ack has not been sent */ - dl_tbf = tbf_alloc_dl_tbf(bts, ul_tbf->ms(), trx_no, ms_class, 0, 0); + dl_tbf = tbf_alloc_dl_tbf(bts, ul_tbf->ms(), trx_no, ms_class, 0, 0, false); OSMO_ASSERT(dl_tbf); dump_assignment(dl_tbf, "DL"); @@ -357,14 +357,14 @@ static void test_alloc_b(bool ts0, bool ts1, bool ts2, bool ts3, bool ts4, bool ENABLE_PDCH(6, ts6, trx); ENABLE_PDCH(7, ts7, trx); - ul_tbf = tbf_alloc_ul_tbf(bts, NULL, -1, ms_class, 0, 1); + ul_tbf = tbf_alloc_ul_tbf(bts, NULL, -1, ms_class, 0, 1, false); OSMO_ASSERT(ul_tbf->ms()); OSMO_ASSERT(ul_tbf->ms()->current_trx()); trx_no = ul_tbf->ms()->current_trx()->trx_no; OSMO_ASSERT(ul_tbf); /* assume final ack has not been sent */ - dl_tbf = tbf_alloc_dl_tbf(bts, ul_tbf->ms(), trx_no, ms_class, 0, 0); + dl_tbf = tbf_alloc_dl_tbf(bts, ul_tbf->ms(), trx_no, ms_class, 0, 0, false); OSMO_ASSERT(dl_tbf); /* verify that both are on the same ts */ @@ -401,14 +401,14 @@ static void test_alloc_b(bool ts0, bool ts1, bool ts2, bool ts3, bool ts4, bool ENABLE_PDCH(6, ts6, trx); ENABLE_PDCH(7, ts7, trx); - dl_tbf = tbf_alloc_dl_tbf(bts, NULL, -1, ms_class, 0, 1); + dl_tbf = tbf_alloc_dl_tbf(bts, NULL, -1, ms_class, 0, 1, false); OSMO_ASSERT(dl_tbf); OSMO_ASSERT(dl_tbf->ms()); OSMO_ASSERT(dl_tbf->ms()->current_trx()); trx_no = dl_tbf->ms()->current_trx()->trx_no; dl_tbf->update_ms(0x23, GPRS_RLCMAC_DL_TBF); - ul_tbf = tbf_alloc_ul_tbf(bts, dl_tbf->ms(), trx_no, ms_class, 0, 0); + ul_tbf = tbf_alloc_ul_tbf(bts, dl_tbf->ms(), trx_no, ms_class, 0, 0, false); OSMO_ASSERT(ul_tbf); ul_tbf->update_ms(0x23, GPRS_RLCMAC_UL_TBF); ul_tbf->m_contention_resolution_done = 1; @@ -497,7 +497,7 @@ static GprsMs *alloc_tbfs(BTS *the_bts, GprsMs *ms, unsigned ms_class, case TEST_MODE_UL_AND_DL: if (ms && ms->ul_tbf()) tbf_free(ms->ul_tbf()); - tbf = tbf_alloc_ul_tbf(bts, ms, trx_no, ms_class, 0, 0); + tbf = tbf_alloc_ul_tbf(bts, ms, trx_no, ms_class, 0, 0, false); if (tbf == NULL) return NULL; break; @@ -506,7 +506,7 @@ static GprsMs *alloc_tbfs(BTS *the_bts, GprsMs *ms, unsigned ms_class, case TEST_MODE_DL_AND_UL: if (ms && ms->dl_tbf()) tbf_free(ms->dl_tbf()); - tbf = tbf_alloc_dl_tbf(bts, ms, trx_no, ms_class, 0, 0); + tbf = tbf_alloc_dl_tbf(bts, ms, trx_no, ms_class, 0, 0, false); if (tbf == NULL) return NULL; } diff --git a/tests/edge/EdgeTest.cpp b/tests/edge/EdgeTest.cpp index 2abcd8f..7177832 100644 --- a/tests/edge/EdgeTest.cpp +++ b/tests/edge/EdgeTest.cpp @@ -251,12 +251,12 @@ static void test_rlc_decoder() */ gprs_rlcmac_tbf *dl_tbf = tbf_alloc_dl_tbf(the_bts.bts_data(), NULL, - 0, 0, 4, 0); + 0, 0, 4, 0, false); OSMO_ASSERT(dl_tbf != NULL); gprs_rlcmac_tbf *ul_tbf = tbf_alloc_ul_tbf(the_bts.bts_data(), dl_tbf->ms(), - 0, 0, 4, 0); + 0, 0, 4, 0, false); /* bts.cpp:1156 Got RLC block, coding scheme: CS-4, length : 54 (53)) bts.cpp:1200 UL data: 3c 02 02 33 0a ed 5d fe d8 00 8f 18 33 2c 16 45 03 c0 68 75 00 00 16 45 00 03 c5 62 29 40 00 45 06 4e b6 c0 a8 00 02 c0 a8 00 01 86 74 1f 91 17 ac 35 ee 33 5e @@ -1055,7 +1055,7 @@ void send_dl_data(BTS *the_bts, uint32_t tlli, const char *imsi, ms = the_bts->ms_store().get_ms(tlli, 0, imsi); gprs_rlcmac_dl_tbf::handle(the_bts->bts_data(), tlli, 0, imsi, 0, 0, - 1000, data, data_size); + 1000, data, data_size, false); ms = the_bts->ms_by_imsi(imsi); OSMO_ASSERT(ms != NULL); @@ -1079,7 +1079,7 @@ static gprs_rlcmac_dl_tbf *create_dl_tbf(BTS *the_bts, uint8_t ms_class, tfi = the_bts->tfi_find_free(GPRS_RLCMAC_DL_TBF, &trx_no, -1); OSMO_ASSERT(tfi >= 0); - dl_tbf = tbf_alloc_dl_tbf(bts, NULL, trx_no, ms_class, ms_class, 1); + dl_tbf = tbf_alloc_dl_tbf(bts, NULL, trx_no, ms_class, ms_class, 1, false); check_tbf(dl_tbf); /* "Establish" the DL TBF */ @@ -1093,7 +1093,7 @@ static gprs_rlcmac_dl_tbf *create_dl_tbf(BTS *the_bts, uint8_t ms_class, return dl_tbf; } -static void setup_bts(BTS *the_bts, uint8_t ts_no, uint8_t cs = 1) +static void setup_bts(BTS *the_bts, uint8_t ts_no, uint8_t cs = 1, bool fanr_enable = false) { gprs_rlcmac_bts *bts; gprs_rlcmac_trx *trx; @@ -1103,6 +1103,7 @@ static void setup_bts(BTS *the_bts, uint8_t ts_no, uint8_t cs = 1) bts->alloc_algorithm = alloc_algorithm_a; bts->initial_cs_dl = cs; bts->initial_cs_ul = cs; + bts->fanr_enabled = fanr_enable; trx = &bts->trx[0]; trx->pdch[ts_no].enable(); @@ -1260,11 +1261,11 @@ static gprs_rlcmac_ul_tbf *establish_ul_tbf_two_phase(BTS *the_bts, ulreq.u.Packet_Resource_Request.MS_Radio_Access_capability. MS_RA_capability_value[0].u.Content.Multislot_capability. GPRS_multislot_class = ms_class; - + ulreq.u.Packet_Resource_Request.MS_Radio_Access_capability. MS_RA_capability_value[0].u.Content.Multislot_capability. Exist_EGPRS_multislot_class = 1; - + ulreq.u.Packet_Resource_Request.MS_Radio_Access_capability. MS_RA_capability_value[0].u.Content.Multislot_capability. EGPRS_multislot_class = ms_class; @@ -1285,22 +1286,228 @@ static gprs_rlcmac_ul_tbf *establish_ul_tbf_two_phase(BTS *the_bts, check_tbf(ul_tbf); - uint8_t data_msg[27] = {0}; + uint8_t data_msg[200] = {0}; /* send fake data */ - data_msg[0] = 0x00 | 0xf << 2; + data_msg[0] = 0x00 | 0xf << 2; data_msg[1] = uint8_t(0 | (tfi << 1)); data_msg[2] = uint8_t(0);/* BSN:7, E:1 */ data_msg[3] =uint8_t(0); /* BSN:7, E:1 */ data_msg[4] = uint8_t(1); /* E: 1 */ pdch = &the_bts->bts_data()->trx[trx_no].pdch[ts_no]; - pdch->rcv_block(&data_msg[0], sizeof(data_msg), *fn, &meas); - + pdch->rcv_block(&data_msg[0], 27, *fn, &meas); + + ms = the_bts->ms_by_tlli(tlli); + OSMO_ASSERT(ms != NULL); + OSMO_ASSERT(ms->ta() == qta/4); + OSMO_ASSERT(ms->ul_tbf() == ul_tbf); + + ul_tbf->enable_fanr(); + /* send fake data */ + data_msg[0] = 0x00 | 0xf << 2; + data_msg[1] = uint8_t(0 | (tfi << 1)); + data_msg[2] = uint8_t(0);/* BSN:7, E:1 */ + data_msg[3] =uint8_t(1 << 6); /* BSN:7, E:1 */ + data_msg[4] = uint8_t(1); /* E: 1 */ + + pdch = &the_bts->bts_data()->trx[trx_no].pdch[ts_no]; + pdch->rcv_block(&data_msg[0], 31, *fn, &meas); + + ms = the_bts->ms_by_tlli(tlli); + OSMO_ASSERT(ms != NULL); + OSMO_ASSERT(ms->ta() == qta/4); + OSMO_ASSERT(ms->ul_tbf() == ul_tbf); + + /* send fake data */ + data_msg[0] = 0x00 | 0xf << 2; + data_msg[1] = uint8_t(0 | (tfi << 1)); + data_msg[2] = uint8_t(0);/* BSN:7, E:1 */ + data_msg[3] =uint8_t(0 << 6); /* BSN:7, E:1 */ + data_msg[4] = uint8_t(1); /* E: 1 */ + + pdch = &the_bts->bts_data()->trx[trx_no].pdch[ts_no]; + pdch->rcv_block(&data_msg[0], 31, *fn, &meas); + + ms = the_bts->ms_by_tlli(tlli); + OSMO_ASSERT(ms != NULL); + OSMO_ASSERT(ms->ta() == qta/4); + OSMO_ASSERT(ms->ul_tbf() == ul_tbf); + + /* send fake data */ + data_msg[0] = 0x00 | 0xf << 2; + data_msg[1] = uint8_t(0 | (tfi << 1)); + data_msg[2] = uint8_t(0);/* BSN:7, E:1 */ + data_msg[3] =uint8_t(1 << 6); /* BSN:7, E:1 */ + data_msg[4] = uint8_t(1); /* E: 1 */ + + pdch = &the_bts->bts_data()->trx[trx_no].pdch[ts_no]; + pdch->rcv_block(&data_msg[0], 37, *fn, &meas); + ms = the_bts->ms_by_tlli(tlli); OSMO_ASSERT(ms != NULL); OSMO_ASSERT(ms->ta() == qta/4); OSMO_ASSERT(ms->ul_tbf() == ul_tbf); + /* send fake data */ + data_msg[0] = 0x00 | 0xf << 2; + data_msg[1] = uint8_t(0 | (tfi << 1)); + data_msg[2] = uint8_t(0);/* BSN:7, E:1 */ + data_msg[3] =uint8_t(0 << 6); /* BSN:7, E:1 */ + data_msg[4] = uint8_t(1); /* E: 1 */ + + pdch = &the_bts->bts_data()->trx[trx_no].pdch[ts_no]; + pdch->rcv_block(&data_msg[0], 37, *fn, &meas); + + ms = the_bts->ms_by_tlli(tlli); + OSMO_ASSERT(ms != NULL); + OSMO_ASSERT(ms->ta() == qta/4); + OSMO_ASSERT(ms->ul_tbf() == ul_tbf); + /* send fake data */ + data_msg[0] = 0x00 | 0xf << 2; + data_msg[1] = uint8_t(0 | (tfi << 1)); + data_msg[2] = uint8_t(0);/* BSN:7, E:1 */ + data_msg[3] =uint8_t(1 << 6); /* BSN:7, E:1 */ + data_msg[4] = uint8_t(1); /* E: 1 */ + + pdch = &the_bts->bts_data()->trx[trx_no].pdch[ts_no]; + pdch->rcv_block(&data_msg[0], 46, *fn, &meas); + + ms = the_bts->ms_by_tlli(tlli); + OSMO_ASSERT(ms != NULL); + OSMO_ASSERT(ms->ta() == qta/4); + OSMO_ASSERT(ms->ul_tbf() == ul_tbf); + /* send fake data */ + data_msg[0] = 0x00 | 0xf << 2; + data_msg[1] = uint8_t(0 | (tfi << 1)); + data_msg[2] = uint8_t(0);/* BSN:7, E:1 */ + data_msg[3] =uint8_t(0 << 6); /* BSN:7, E:1 */ + data_msg[4] = uint8_t(1); /* E: 1 */ + pdch = &the_bts->bts_data()->trx[trx_no].pdch[ts_no]; + pdch->rcv_block(&data_msg[0], 46, *fn, &meas); + + ms = the_bts->ms_by_tlli(tlli); + OSMO_ASSERT(ms != NULL); + OSMO_ASSERT(ms->ta() == qta/4); + OSMO_ASSERT(ms->ul_tbf() == ul_tbf); + + /* send fake data */ + data_msg[0] = 0x00 | 0xf << 2; + data_msg[1] = uint8_t(0 | (tfi << 1)); + data_msg[2] = uint8_t(0);/* BSN:7, E:1 */ + data_msg[3] =uint8_t(1 << 3); /* BSN:7, E:1 */ + data_msg[4] = uint8_t(1); /* E: 1 */ + + pdch = &the_bts->bts_data()->trx[trx_no].pdch[ts_no]; + pdch->rcv_block(&data_msg[0], 66, *fn, &meas); + + ms = the_bts->ms_by_tlli(tlli); + OSMO_ASSERT(ms != NULL); + OSMO_ASSERT(ms->ta() == qta/4); + OSMO_ASSERT(ms->ul_tbf() == ul_tbf); + + /* send fake data */ + data_msg[0] = 0x00 | 0xf << 2; + data_msg[1] = uint8_t(0 | (tfi << 1)); + data_msg[2] = uint8_t(0);/* BSN:7, E:1 */ + data_msg[3] =uint8_t(0 << 3); /* BSN:7, E:1 */ + data_msg[4] = uint8_t(1); /* E: 1 */ + + pdch = &the_bts->bts_data()->trx[trx_no].pdch[ts_no]; + pdch->rcv_block(&data_msg[0], 66, *fn, &meas); + + ms = the_bts->ms_by_tlli(tlli); + OSMO_ASSERT(ms != NULL); + OSMO_ASSERT(ms->ta() == qta/4); + OSMO_ASSERT(ms->ul_tbf() == ul_tbf); + + /* send fake data */ + data_msg[0] = 0x00 | 0xf << 2; + data_msg[1] = uint8_t(0 | (tfi << 1)); + data_msg[2] = uint8_t(0);/* BSN:7, E:1 */ + data_msg[3] =uint8_t(1 << 3); /* BSN:7, E:1 */ + data_msg[4] = uint8_t(1); /* E: 1 */ + + pdch = &the_bts->bts_data()->trx[trx_no].pdch[ts_no]; + pdch->rcv_block(&data_msg[0], 84, *fn, &meas); + + ms = the_bts->ms_by_tlli(tlli); + OSMO_ASSERT(ms != NULL); + OSMO_ASSERT(ms->ta() == qta/4); + OSMO_ASSERT(ms->ul_tbf() == ul_tbf); + /* send fake data */ + data_msg[0] = 0x00 | 0xf << 2; + data_msg[1] = uint8_t(0 | (tfi << 1)); + data_msg[2] = uint8_t(0);/* BSN:7, E:1 */ + data_msg[3] =uint8_t(0 << 3); /* BSN:7, E:1 */ + data_msg[4] = uint8_t(1); /* E: 1 */ + + pdch = &the_bts->bts_data()->trx[trx_no].pdch[ts_no]; + pdch->rcv_block(&data_msg[0], 84, *fn, &meas); + + ms = the_bts->ms_by_tlli(tlli); + OSMO_ASSERT(ms != NULL); + OSMO_ASSERT(ms->ta() == qta/4); + OSMO_ASSERT(ms->ul_tbf() == ul_tbf); + + /* send fake data */ + data_msg[0] = 0x00 | 0xf << 2; + data_msg[1] = uint8_t(0 | (tfi << 1)); + data_msg[2] = uint8_t(0);/* BSN:7, E:1 */ + data_msg[4] =uint8_t(1 << 7); /* BSN:7, E:1 */ + data_msg[5] = uint8_t(1); /* E: 1 */ + + pdch = &the_bts->bts_data()->trx[trx_no].pdch[ts_no]; + pdch->rcv_block(&data_msg[0],124, *fn, &meas); + + ms = the_bts->ms_by_tlli(tlli); + OSMO_ASSERT(ms != NULL); + OSMO_ASSERT(ms->ta() == qta/4); + OSMO_ASSERT(ms->ul_tbf() == ul_tbf); + + /* send fake data */ + data_msg[0] = 0x00 | 0xf << 2; + data_msg[1] = uint8_t(0 | (tfi << 1)); + data_msg[2] = uint8_t(0);/* BSN:7, E:1 */ + data_msg[4] =uint8_t(0 << 7); /* BSN:7, E:1 */ + data_msg[5] = uint8_t(1); /* E: 1 */ + + pdch = &the_bts->bts_data()->trx[trx_no].pdch[ts_no]; + pdch->rcv_block(&data_msg[0],124, *fn, &meas); + + ms = the_bts->ms_by_tlli(tlli); + OSMO_ASSERT(ms != NULL); + OSMO_ASSERT(ms->ta() == qta/4); + OSMO_ASSERT(ms->ul_tbf() == ul_tbf); + + /* send fake data */ + data_msg[0] = 0x00 | 0xf << 2; + data_msg[1] = uint8_t(0 | (tfi << 1)); + data_msg[2] = uint8_t(0);/* BSN:7, E:1 */ + data_msg[4] =uint8_t(1 << 7); /* BSN:7, E:1 */ + data_msg[5] = uint8_t(1); /* E: 1 */ + + pdch = &the_bts->bts_data()->trx[trx_no].pdch[ts_no]; + pdch->rcv_block(&data_msg[0],148, *fn, &meas); + + ms = the_bts->ms_by_tlli(tlli); + OSMO_ASSERT(ms != NULL); + OSMO_ASSERT(ms->ta() == qta/4); + OSMO_ASSERT(ms->ul_tbf() == ul_tbf); + + /* send fake data */ + data_msg[0] = 0x00 | 0xf << 2; + data_msg[1] = uint8_t(0 | (tfi << 1)); + data_msg[2] = uint8_t(0);/* BSN:7, E:1 */ + data_msg[4] =uint8_t(0 << 7); /* BSN:7, E:1 */ + data_msg[5] = uint8_t(1); /* E: 1 */ + + pdch = &the_bts->bts_data()->trx[trx_no].pdch[ts_no]; + pdch->rcv_block(&data_msg[0],148, *fn, &meas); + + ms = the_bts->ms_by_tlli(tlli); + OSMO_ASSERT(ms != NULL); + OSMO_ASSERT(ms->ta() == qta/4); + OSMO_ASSERT(ms->ul_tbf() == ul_tbf); return ul_tbf; } @@ -1449,7 +1656,7 @@ void test_tbf_two_phase() printf("=== start %s ===\n", __func__); - setup_bts(&the_bts, ts_no, 9); + setup_bts(&the_bts, ts_no, 9, true); ul_tbf = establish_ul_tbf_two_phase(&the_bts, ts_no, tlli, &fn, qta, ms_class); @@ -2507,14 +2714,12 @@ void test_spb_handling() uint32_t tlli = 0xf1223344; const char *imsi = "0011223344"; uint8_t ms_class = 1; - gprs_rlcmac_ul_tbf *ul_tbf; - GprsMs *ms; printf("=== start %s ===\n", __func__); setup_bts(&the_bts, ts_no, 7); - ul_tbf = spb_handler(&the_bts, ts_no, tlli, &fn, qta, ms_class); + spb_handler(&the_bts, ts_no, tlli, &fn, qta, ms_class); } diff --git a/tests/tbf/TbfTest.cpp b/tests/tbf/TbfTest.cpp index 8bf735a..26e09e6 100644 --- a/tests/tbf/TbfTest.cpp +++ b/tests/tbf/TbfTest.cpp @@ -90,14 +90,14 @@ static void test_tbf_tlli_update() */ gprs_rlcmac_tbf *dl_tbf = tbf_alloc_dl_tbf(the_bts.bts_data(), NULL, - 0, 0, 0, 0); + 0, 0, 0, 0, false); OSMO_ASSERT(dl_tbf != NULL); dl_tbf->update_ms(0x2342, GPRS_RLCMAC_DL_TBF); dl_tbf->set_ta(4); gprs_rlcmac_tbf *ul_tbf = tbf_alloc_ul_tbf(the_bts.bts_data(), dl_tbf->ms(), - 0, 0, 0, 0); + 0, 0, 0, 0, false); OSMO_ASSERT(ul_tbf != NULL); ul_tbf->update_ms(0x2342, GPRS_RLCMAC_UL_TBF); @@ -175,7 +175,7 @@ static gprs_rlcmac_dl_tbf *create_dl_tbf(BTS *the_bts, uint8_t ms_class, tfi = the_bts->tfi_find_free(GPRS_RLCMAC_DL_TBF, &trx_no, -1); OSMO_ASSERT(tfi >= 0); - dl_tbf = tbf_alloc_dl_tbf(bts, NULL, trx_no, ms_class, 0, 1); + dl_tbf = tbf_alloc_dl_tbf(bts, NULL, trx_no, ms_class, 0, 1, false); check_tbf(dl_tbf); /* "Establish" the DL TBF */ @@ -452,7 +452,7 @@ static void test_tbf_exhaustion() snprintf(imsi, sizeof(imsi), "001001%09d", i); rc = gprs_rlcmac_dl_tbf::handle(bts, tlli, 0, imsi, ms_class, 0, - delay_csec, buf, sizeof(buf)); + delay_csec, buf, sizeof(buf), false); if (rc < 0) break; @@ -490,7 +490,7 @@ static void test_tbf_dl_llc_loss() /* Handle LLC frame 1 */ memset(buf, 1, sizeof(buf)); rc = gprs_rlcmac_dl_tbf::handle(bts, tlli, 0, imsi, ms_class, 0, - delay_csec, buf, sizeof(buf)); + delay_csec, buf, sizeof(buf), false); OSMO_ASSERT(rc >= 0); ms = the_bts.ms_store().get_ms(0, 0, imsi); @@ -500,7 +500,7 @@ static void test_tbf_dl_llc_loss() /* Handle LLC frame 2 */ memset(buf, 2, sizeof(buf)); rc = gprs_rlcmac_dl_tbf::handle(bts, tlli, 0, imsi, ms_class, 0, - delay_csec, buf, sizeof(buf)); + delay_csec, buf, sizeof(buf), false); OSMO_ASSERT(rc >= 0); /* TBF establishment fails (timeout) */ @@ -509,7 +509,7 @@ static void test_tbf_dl_llc_loss() /* Handle LLC frame 3 */ memset(buf, 3, sizeof(buf)); rc = gprs_rlcmac_dl_tbf::handle(bts, tlli, 0, imsi, ms_class, 0, - delay_csec, buf, sizeof(buf)); + delay_csec, buf, sizeof(buf), false); OSMO_ASSERT(rc >= 0); OSMO_ASSERT(ms->dl_tbf() != NULL); @@ -695,7 +695,7 @@ static void send_dl_data(BTS *the_bts, uint32_t tlli, const char *imsi, ms = the_bts->ms_store().get_ms(tlli, 0, imsi); gprs_rlcmac_dl_tbf::handle(the_bts->bts_data(), tlli, 0, imsi, 0, 0, - 1000, data, data_size); + 1000, data, data_size, false); ms = the_bts->ms_by_imsi(imsi); OSMO_ASSERT(ms != NULL); -- 1.7.9.5

9 years, 3 months

[PATCH] Support of 11 bit RACH

by Bhargava Abhyankar

This patch is first of series of patches to support 11 bit RACH. This includes interface structure changes between osmo-pcu and osmo-bts to support 11 bit RACH.Processing of 11 bit RACH for GPRS is added in bts.cpp. Unit test for the same shall be sent as separate patch. EGPRS PACKET CHANNEL REQUEST is not part of this patch.Note also that this feature requires changes in osmo-bts and versioning needs to be addressed further. --- src/bts.cpp | 36 +++++++++++++++++++++++++++--------- src/bts.h | 9 ++++++++- src/pcu_l1_if.cpp | 2 +- src/pcuif_proto.h | 3 ++- 4 files changed, 38 insertions(+), 12 deletions(-) diff --git a/src/bts.cpp b/src/bts.cpp index 715fb51..a999c48 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; @@ -475,14 +475,32 @@ int BTS::rcv_rach(uint8_t ra, uint32_t Fn, int16_t qta) LOGP(DRLCMAC, LOGL_DEBUG, "MS requests UL TBF on RACH, so we provide " "one:\n"); - if ((ra & 0xf8) == 0x70) { - LOGP(DRLCMAC, LOGL_DEBUG, "MS requests single block " - "allocation\n"); - sb = 1; - } else if (m_bts.force_two_phase) { - LOGP(DRLCMAC, LOGL_DEBUG, "MS requests single phase access, " - "but we force two phase access\n"); - sb = 1; + + if (rach_type == GPRS_8_BIT_RACH ) { + if ((ra & 0xf8) == 0x70) { + LOGP(DRLCMAC, LOGL_DEBUG, "MS requests single block " + "allocation\n"); + sb = 1; + } else if (m_bts.force_two_phase) { + LOGP(DRLCMAC, LOGL_DEBUG, "MS requests single phase access, " + "but we force two phase access\n"); + sb = 1; + } + + } else if(rach_type == GPRS_11_BIT_RACH ) { + if((ra & RACH_CAUSE_SINGLE_BLOCK) == 0x0600) { + LOGP(DRLCMAC, LOGL_DEBUG, "11 bit RACH received.MS requests single block " + "allocation\n"); + sb = 1; + + } else if (m_bts.force_two_phase) { + LOGP(DRLCMAC, LOGL_DEBUG, "11 bit RACHreceived.MS requests single phase access, " + "but we force two phase access\n"); + sb = 1; + } + } else if (rach_type == EGPRS_11_BIT_RACH) { + /*TODO*/ + } if (qta < 0) qta = 0; diff --git a/src/bts.h b/src/bts.h index c975304..870e6f3 100644 --- a/src/bts.h +++ b/src/bts.h @@ -41,6 +41,7 @@ extern "C" { #define LLC_CODEL_DISABLE 0 #define LLC_CODEL_USE_DEFAULT (-1) +#define RACH_CAUSE_SINGLE_BLOCK ((~((~0) << 6)) << 5) /* Establish cause */ struct BTS; struct GprsMs; @@ -251,6 +252,12 @@ public: TIMER_T3190_MSEC = 5000, }; + enum { + GPRS_8_BIT_RACH = 0, + GPRS_11_BIT_RACH = 1, + EGPRS_11_BIT_RACH = 2, + }; + BTS(); ~BTS(); @@ -275,7 +282,7 @@ 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..d937d20 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..0844183 100644 --- a/src/pcuif_proto.h +++ b/src/pcuif_proto.h @@ -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

9 years, 3 months

[PATCH] UT Expected error files TbfTest.err, EdgeTest.err for FANR

by Aravind Sirsikar

Modifies TbfTest.err, EdgeTest.err for FANR feature --- tests/edge/EdgeTest.err | 601 +++++++++++++++++++++++++++++------------------ tests/tbf/TbfTest.err | 90 ++++--- 2 files changed, 430 insertions(+), 261 deletions(-)

9 years, 3 months

[PATCH] Introduce EGPRS header type1 and type2 in UL

by Aravind Sirsikar

Defines new structures for UL EGPRS header type1 and type2 for supporting MCS5-MCS9 --- src/rlc.h | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/src/rlc.h b/src/rlc.h index 54f28df..3f10f8c 100644 --- a/src/rlc.h +++ b/src/rlc.h @@ -288,6 +288,44 @@ struct rlc_li_field_egprs { li:7; } __attribute__ ((packed)); +/* TS 44.060 10.3a.4.1.1 */ +struct gprs_rlc_ul_header_egprs_1 { + uint8_t r:1, + si:1, + cv:4, + tfi_a:2; + uint8_t tfi_b:3, + bsn1_a:5; + uint8_t bsn1_b:6, + bsn2_a:2; + uint8_t bsn2_b; + uint8_t cps:5, + rsb:1, + pi:1, + spare_a:1; + uint8_t spare_b:6, + dummy:2; +} __attribute__ ((packed)); + +/* TS 44.060 10.3a.4.2.1 */ +struct gprs_rlc_ul_header_egprs_2 { + uint8_t r:1, + si:1, + cv:4, + tfi_a:2; + uint8_t tfi_b:3, + bsn1_a:5; + uint8_t bsn1_b:6, + cps_a:2; + uint8_t cps_b:1, + rsb:1, + pi:1, + spare_a:5; + uint8_t spare_b:5, + dummy:3; +} __attribute__ ((packed)); + +/* TS 44.060 10.3a.4.3.1 */ struct gprs_rlc_ul_header_egprs_3 { uint8_t r:1, si:1, -- 1.7.9.5

9 years, 3 months

← Newer
1
...
34
35
36
37
38
39
40
...
48
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

osmocom-net-gprs