OpenBSC May 2016

openbsc@lists.osmocom.org

25 participants
166 discussions

[PATCH] libosmocore[master]: Add functions to detect HR/FR SID frames
by Max 01 Jun '16

01 Jun '16

Review at https://gerrit.osmocom.org/160 Add functions to detect HR/FR SID frames Add functions which check if given FR or HR frame (packed in RTP) contains SID (SIlence Descriptor) and corresponding tests. Related: OS#22 Change-Id: I4051e3c0d4fb9ee93d7e9e0ef4abaf9f18e227ca --- M include/osmocom/codec/codec.h M src/codec/gsm610.c M src/codec/gsm620.c M tests/codec/codec_test.c M tests/codec/codec_test.ok 5 files changed, 314 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/60/160/1 diff --git a/include/osmocom/codec/codec.h b/include/osmocom/codec/codec.h index b7bcc78..23c5e20 100644 --- a/include/osmocom/codec/codec.h +++ b/include/osmocom/codec/codec.h @@ -1,6 +1,7 @@ #pragma once #include <stdint.h> +#include <stdbool.h> #include <osmocom/core/utils.h> @@ -41,6 +42,8 @@ AMR_GOOD = 1 }; +bool osmo_check_sid_fr(uint8_t *rtp_payload, size_t payload_len); +bool osmo_check_sid_hr(uint8_t *rtp_payload, size_t payload_len); int osmo_amr_rtp_enc(uint8_t *payload, uint8_t cmr, enum osmo_amr_type ft, enum osmo_amr_quality bfi); int osmo_amr_rtp_dec(const uint8_t *payload, int payload_len, uint8_t *cmr, diff --git a/src/codec/gsm610.c b/src/codec/gsm610.c index 35f6011..8699253 100644 --- a/src/codec/gsm610.c +++ b/src/codec/gsm610.c @@ -22,6 +22,9 @@ */ #include <stdint.h> +#include <stdbool.h> + +#include <osmocom/core/bitvec.h> /* GSM FR - subjective importance bit ordering */ /* This array encodes GSM 05.03 Table 2. @@ -292,3 +295,215 @@ 11, /* LARc1:0 */ 29, /* LARc5:0 */ }; + +/*! \brief Check whether RTP frame contains FR SID code word according to + * TS 101 318 §5.1.2 + * \param[in] rtp_payload Buffer with RTP payload + * \param[in] payload_len Length of payload + * \returns true if code word is found, false otherwise + */ +bool osmo_check_sid_fr(uint8_t *rtp_payload, size_t payload_len) +{ + struct bitvec bv; + + /* signature does not match Full Rate SID */ + if ((rtp_payload[0] >> 4) != 0xD) + return false; + + bv.data = rtp_payload; + bv.data_len = payload_len; + + /* code word is all 0 at given bits, numbered from 1 */ + if (bitvec_get_bit_pos(&bv, 59) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 60) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 62) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 63) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 65) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 66) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 68) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 69) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 71) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 72) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 74) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 75) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 77) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 78) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 80) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 81) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 83) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 84) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 86) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 87) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 89) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 90) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 92) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 93) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 95) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 96) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 115) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 116) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 118) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 119) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 121) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 122) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 124) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 125) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 127) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 128) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 130) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 131) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 133) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 134) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 136) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 137) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 139) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 140) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 142) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 143) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 145) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 146) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 148) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 149) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 151) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 152) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 171) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 172) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 174) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 175) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 177) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 178) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 180) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 181) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 183) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 184) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 186) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 187) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 189) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 190) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 192) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 193) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 195) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 196) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 198) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 199) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 201) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 202) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 204) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 205) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 207) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 208) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 227) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 228) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 230) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 231) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 233) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 234) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 236) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 237) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 239) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 242) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 245) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 248) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 251) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 254) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 257) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 260) != ZERO) + return false; + if (bitvec_get_bit_pos(&bv, 263) != ZERO) + return false; + + return true; +} diff --git a/src/codec/gsm620.c b/src/codec/gsm620.c index f4ac9ad..873913d 100644 --- a/src/codec/gsm620.c +++ b/src/codec/gsm620.c @@ -22,6 +22,9 @@ */ #include <stdint.h> +#include <stdbool.h> + +#include <osmocom/core/bitvec.h> /* GSM HR unvoiced (mode=0) frames - subjective importance bit ordering */ /* This array encode mapping between GSM 05.03 Table 3a (bits @@ -260,3 +263,62 @@ 82, /* Code 3:6 */ 81, /* Code 3:7 */ }; + +/*! \brief Check whether RTP frame contains HR SID code word according to + * TS 101 318 §5.2.2 + * \param[in] rtp_payload Buffer with RTP payload + * \param[in] payload_len Length of payload + * \returns true if code word is found, false otherwise + */ +bool osmo_check_sid_hr(uint8_t *rtp_payload, size_t payload_len) +{ + struct bitvec bv; + bv.data = rtp_payload; + bv.data_len = payload_len; + + /* code word is all 1 at given bits, numbered from 1, MODE is always 3 */ + bv.cur_bit = 33; + if (bitvec_get_uint(&bv, 1) != 0x1) + return false; + + if (bitvec_get_uint(&bv, 2) != 0x3) + return false; + + if (bitvec_get_uint(&bv, 8) != 0xFF) + return false; + + if (bitvec_get_uint(&bv, 9) != 0x1FF) + return false; + + if (bitvec_get_uint(&bv, 5) != 0x1F) + return false; + + if (bitvec_get_uint(&bv, 4) != 0xF) + return false; + + if (bitvec_get_uint(&bv, 9) != 0x1FF) + return false; + + if (bitvec_get_uint(&bv, 5) != 0x1F) + return false; + + if (bitvec_get_uint(&bv, 4) != 0xF) + return false; + + if (bitvec_get_uint(&bv, 9) != 0x1FF) + return false; + + if (bitvec_get_uint(&bv, 5) != 0x1F) + return false; + + if (bitvec_get_uint(&bv, 4) != 0xF) + return false; + + if (bitvec_get_uint(&bv, 9) != 0x1FF) + return false; + + if (bitvec_get_uint(&bv, 5) != 0x1F) + return false; + + return true; +} diff --git a/tests/codec/codec_test.c b/tests/codec/codec_test.c index 4905dd3..1b278cb 100644 --- a/tests/codec/codec_test.c +++ b/tests/codec/codec_test.c @@ -20,6 +20,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <stdbool.h> #include <osmocom/core/utils.h> #include <osmocom/codec/codec.h> @@ -68,6 +69,26 @@ cmpr(_cmr, cmr), cmpr(_ft, ft), cmpr(_bfi, bfi), cmi, sti); } +uint8_t fr[] = {0xd8, 0xa9, 0xb5, 0x1d, 0xda, 0xa8, 0x82, 0xcc, 0xec, 0x52, + 0x29, 0x05, 0xa8, 0xc3, 0xe3, 0x0e, 0xb0, 0x89, 0x7a, 0xee, + 0x42, 0xca, 0xc4, 0x97, 0x22, 0xe6, 0x9e, 0xa8, 0xb8, 0xec, + 0x52, 0x26, 0xbd}; +uint8_t sid_fr[] = {0xd7, 0x27, 0x93, 0xe5, 0xe3, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; + +uint8_t hr[] = {0x06, 0x46, 0x76, 0xb1, 0x8e, 0x48, 0x9a, 0x2f, 0x5e, 0x4c, + 0x22, 0x2b, 0x62, 0x25}; +uint8_t sid_hr[] = {0x03, 0x8e, 0xb6, 0xcb, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff}; + +static void test_sid_xr(uint8_t *t, size_t len, bool hr) +{ + printf("%s SID ? %s:: %d\n", hr ? "HR" : "FR", osmo_hexdump(t, len), + hr ? osmo_check_sid_hr(t, len) : osmo_check_sid_fr(t, len)); +} + int main(int argc, char **argv) { printf("AMR RTP payload decoder test:\n"); @@ -79,6 +100,13 @@ test_amr_rt(AMR_12_2, AMR_12_2, AMR_GOOD); test_amr_rt(AMR_7_40, AMR_7_40, AMR_BAD); test_amr_rt(AMR_7_40, AMR_7_40, AMR_GOOD); + printf("FR RTP payload SID test:\n"); + test_sid_xr(sid_fr, 33, false); + test_sid_xr(fr, 33, false); + + printf("HR RTP payload SID test:\n"); + test_sid_xr(sid_hr, 14, true); + test_sid_xr(hr, 14, true); return 0; } diff --git a/tests/codec/codec_test.ok b/tests/codec/codec_test.ok index 0f76fef..2af7cc7 100644 --- a/tests/codec/codec_test.ok +++ b/tests/codec/codec_test.ok @@ -7,3 +7,9 @@ [33/33] AMR 12,2 kbit/s (GSM-EFR), CMR: OK, FT: OK, BFI: OK, CMI: -1, STI: -1 [21/21] AMR 7,40 kbit/s (TDMA-EFR), CMR: OK, FT: OK, BFI: OK, CMI: -1, STI: -1 [21/21] AMR 7,40 kbit/s (TDMA-EFR), CMR: OK, FT: OK, BFI: OK, CMI: -1, STI: -1 +FR RTP payload SID test: +FR SID ? d7 27 93 e5 e3 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 :: 1 +FR SID ? d8 a9 b5 1d da a8 82 cc ec 52 29 05 a8 c3 e3 0e b0 89 7a ee 42 ca c4 97 22 e6 9e a8 b8 ec 52 26 bd :: 0 +HR RTP payload SID test: +HR SID ? 03 8e b6 cb ff ff ff ff ff ff ff ff ff ff :: 1 +HR SID ? 06 46 76 b1 8e 48 9a 2f 5e 4c 22 2b 62 25 :: 0 -- To view, visit https://gerrit.osmocom.org/160 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4051e3c0d4fb9ee93d7e9e0ef4abaf9f18e227ca Gerrit-PatchSet: 1 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Max <msuraev(a)sysmocom.de>

2 4

[PATCH] osmo-pcu[master]: encoding/rlc_copy_from_aligned_buffer: export written payloa...
by lynxis lazus 01 Jun '16

01 Jun '16

Review at https://gerrit.osmocom.org/142 encoding/rlc_copy_from_aligned_buffer: export written payload bytes via an argument Require to count statistics for rlc_dl_payload_bytes. Change-Id: I0e622acb1f13f7489946baf049de4ba1cde6a1fc --- M src/encoding.cpp M src/encoding.h M src/tbf_dl.cpp M tests/edge/EdgeTest.cpp 4 files changed, 49 insertions(+), 31 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/42/142/1 diff --git a/src/encoding.cpp b/src/encoding.cpp index 9dba4f6..2102a1e 100644 --- a/src/encoding.cpp +++ b/src/encoding.cpp @@ -899,13 +899,13 @@ * \param num_chunks count the chunks (llc pdu data) within rlc/mac * \param data_block buffer holds rlc/mac data * \param is_final if this is the last rlc/mac within a TBF + * \param count_payload if not NULL save the written size of payload in bytes into it * \return the state of the rlc/mac like if there is more space for another chunk */ static Encoding::AppendResult rlc_data_to_dl_append_gprs( struct gprs_rlc_data_block_info *rdbi, gprs_llc *llc, int *offset, int *num_chunks, - uint8_t *data_block, - bool is_final) + uint8_t *data_block, bool is_final, int *count_payload) { int chunk; int space; @@ -930,6 +930,8 @@ *e_pointer |= 0x01; /* fill only space */ llc->consume(data, space); + if (count_payload) + *count_payload = space; /* return data block as message */ *offset = rdbi->data_len; (*num_chunks)++; @@ -947,6 +949,8 @@ *e_pointer |= 0x01; /* fill space */ llc->consume(data, space); + if (count_payload) + *count_payload = space; *offset = rdbi->data_len; (*num_chunks)++; rdbi->cv = 0; @@ -974,6 +978,8 @@ // no need to set e_pointer nor increase delimiter /* fill only space, which is 1 octet less than chunk */ llc->consume(data, space); + if (count_payload) + *count_payload = space; /* return data block as message */ *offset = rdbi->data_len; (*num_chunks)++; @@ -999,6 +1005,8 @@ (*num_chunks)++; /* copy (rest of) LLC frame to space and reset later */ llc->consume(data, chunk); + if (count_payload) + *count_payload = chunk; data += chunk; space -= chunk; (*offset) += chunk; @@ -1030,13 +1038,14 @@ * \param num_chunks count the chunks (llc pdu data) within rlc/mac * \param data_block buffer holds rlc/mac data * \param is_final if this is the last rlc/mac within a TBF + * \param count_payload if not NULL save the written size of payload in bytes into it * \return the state of the rlc/mac like if there is more space for another chunk */ static Encoding::AppendResult rlc_data_to_dl_append_egprs( struct gprs_rlc_data_block_info *rdbi, gprs_llc *llc, int *offset, int *num_chunks, uint8_t *data_block, - bool is_final) + bool is_final, int *count_payload) { int chunk; int space; @@ -1060,6 +1069,8 @@ chunk, space); /* fill only space */ llc->consume(data, space); + if (count_payload) + *count_payload = space; /* return data block as message */ *offset = rdbi->data_len; (*num_chunks)++; @@ -1074,6 +1085,8 @@ "header, and we are done\n", chunk, space); /* fill space */ llc->consume(data, space); + if (count_payload) + *count_payload = space; *offset = rdbi->data_len; (*num_chunks)++; rdbi->cv = 0; @@ -1088,6 +1101,8 @@ chunk, space); /* fill space */ llc->consume(data, space); + if (count_payload) + *count_payload = space; *offset = rdbi->data_len; (*num_chunks)++; return Encoding::AR_NEED_MORE_BLOCKS; @@ -1118,6 +1133,8 @@ (*num_chunks)++; /* copy (rest of) LLC frame to space and reset later */ llc->consume(data, chunk); + if (count_payload) + *count_payload = chunk; data += chunk; space -= chunk; (*offset) += chunk; @@ -1183,21 +1200,23 @@ * \param num_chunks count the chunks (llc pdu data) within rlc/mac * \param data_block buffer holds rlc/mac data * \param is_final if this is the last rlc/mac within a TBF + * \param count_payload if not NULL save the written size of payload in bytes into it * \return the state of the rlc/mac like if there is more space for another chunk */ Encoding::AppendResult Encoding::rlc_data_to_dl_append( struct gprs_rlc_data_block_info *rdbi, GprsCodingScheme cs, gprs_llc *llc, int *offset, int *num_chunks, - uint8_t *data_block, - bool is_final) + uint8_t *data_block, bool is_final, int *count_payload) { if (cs.isGprs()) return rlc_data_to_dl_append_gprs(rdbi, - llc, offset, num_chunks, data_block, is_final); + llc, offset, num_chunks, data_block, is_final, + count_payload); if (cs.isEgprs()) return rlc_data_to_dl_append_egprs(rdbi, - llc, offset, num_chunks, data_block, is_final); + llc, offset, num_chunks, data_block, is_final, + count_payload); LOGP(DRLCMACDL, LOGL_ERROR, "%s data block encoding not implemented\n", cs.name()); diff --git a/src/encoding.h b/src/encoding.h index 94e9a02..710de78 100644 --- a/src/encoding.h +++ b/src/encoding.h @@ -91,6 +91,5 @@ static AppendResult rlc_data_to_dl_append( struct gprs_rlc_data_block_info *rdbi, GprsCodingScheme cs, gprs_llc *llc, int *offset, int *num_chunks, - uint8_t *data, - bool is_final); + uint8_t *data, bool is_final, int *count_payload); }; diff --git a/src/tbf_dl.cpp b/src/tbf_dl.cpp index da6628a..00adbc9 100644 --- a/src/tbf_dl.cpp +++ b/src/tbf_dl.cpp @@ -538,7 +538,7 @@ is_final = llc_queue()->size() == 0 && !keep_open(fn); ar = Encoding::rlc_data_to_dl_append(rdbi, cs, - &m_llc, &write_offset, &num_chunks, data, is_final); + &m_llc, &write_offset, &num_chunks, data, is_final, NULL); if (ar == Encoding::AR_NEED_MORE_BLOCKS) break; diff --git a/tests/edge/EdgeTest.cpp b/tests/edge/EdgeTest.cpp index 96ea0c1..fef4abb 100644 --- a/tests/edge/EdgeTest.cpp +++ b/tests/edge/EdgeTest.cpp @@ -524,7 +524,7 @@ llc.put_frame(llc_data, 11); ar = Encoding::rlc_data_to_dl_append(&rdbi, cs, - &llc, &write_offset, &num_chunks, data, false); + &llc, &write_offset, &num_chunks, data, false, NULL); OSMO_ASSERT(ar == Encoding::AR_COMPLETED_SPACE_LEFT); OSMO_ASSERT(rdbi.e == 0); @@ -535,7 +535,7 @@ llc.put_frame(llc_data, 26); ar = Encoding::rlc_data_to_dl_append(&rdbi, cs, - &llc, &write_offset, &num_chunks, data, false); + &llc, &write_offset, &num_chunks, data, false, NULL); OSMO_ASSERT(ar == Encoding::AR_COMPLETED_SPACE_LEFT); OSMO_ASSERT(rdbi.e == 0); @@ -546,7 +546,7 @@ llc.put_frame(llc_data, 99); ar = Encoding::rlc_data_to_dl_append(&rdbi, cs, - &llc, &write_offset, &num_chunks, data, false); + &llc, &write_offset, &num_chunks, data, false, NULL); OSMO_ASSERT(ar == Encoding::AR_NEED_MORE_BLOCKS); OSMO_ASSERT(rdbi.e == 0); @@ -571,7 +571,7 @@ llc.put_frame(llc_data, 20); ar = Encoding::rlc_data_to_dl_append(&rdbi, cs, - &llc, &write_offset, &num_chunks, data, false); + &llc, &write_offset, &num_chunks, data, false, NULL); OSMO_ASSERT(ar == Encoding::AR_NEED_MORE_BLOCKS); OSMO_ASSERT(rdbi.e == 0); @@ -590,7 +590,7 @@ OSMO_ASSERT(llc.chunk_size() == 1); ar = Encoding::rlc_data_to_dl_append(&rdbi, cs, - &llc, &write_offset, &num_chunks, data, false); + &llc, &write_offset, &num_chunks, data, false, NULL); OSMO_ASSERT(ar == Encoding::AR_COMPLETED_SPACE_LEFT); OSMO_ASSERT(rdbi.e == 0); @@ -601,7 +601,7 @@ llc.put_frame(llc_data, 99); ar = Encoding::rlc_data_to_dl_append(&rdbi, cs, - &llc, &write_offset, &num_chunks, data, false); + &llc, &write_offset, &num_chunks, data, false, NULL); OSMO_ASSERT(ar == Encoding::AR_NEED_MORE_BLOCKS); OSMO_ASSERT(rdbi.e == 0); @@ -624,7 +624,7 @@ llc.put_frame(llc_data, 7); ar = Encoding::rlc_data_to_dl_append(&rdbi, cs, - &llc, &write_offset, &num_chunks, data, false); + &llc, &write_offset, &num_chunks, data, false, NULL); OSMO_ASSERT(ar == Encoding::AR_COMPLETED_SPACE_LEFT); OSMO_ASSERT(rdbi.e == 0); @@ -635,7 +635,7 @@ llc.put_frame(llc_data, 11); ar = Encoding::rlc_data_to_dl_append(&rdbi, cs, - &llc, &write_offset, &num_chunks, data, false); + &llc, &write_offset, &num_chunks, data, false, NULL); OSMO_ASSERT(ar == Encoding::AR_COMPLETED_BLOCK_FILLED); OSMO_ASSERT(rdbi.e == 0); @@ -659,7 +659,7 @@ llc.put_frame(llc_data, 99); ar = Encoding::rlc_data_to_dl_append(&rdbi, cs, - &llc, &write_offset, &num_chunks, data, false); + &llc, &write_offset, &num_chunks, data, false, NULL); OSMO_ASSERT(ar == Encoding::AR_NEED_MORE_BLOCKS); OSMO_ASSERT(rdbi.e == 1); @@ -705,7 +705,7 @@ llc.put_frame(llc_data, 30); ar = Encoding::rlc_data_to_dl_append(&rdbi, cs, - &llc, &write_offset, &num_chunks, data, false); + &llc, &write_offset, &num_chunks, data, false, NULL); OSMO_ASSERT(ar == Encoding::AR_NEED_MORE_BLOCKS); OSMO_ASSERT(rdbi.e == 1); @@ -723,7 +723,7 @@ OSMO_ASSERT(llc.chunk_size() == 10); ar = Encoding::rlc_data_to_dl_append(&rdbi, cs, - &llc, &write_offset, &num_chunks, data, false); + &llc, &write_offset, &num_chunks, data, false, NULL); OSMO_ASSERT(ar == Encoding::AR_COMPLETED_SPACE_LEFT); OSMO_ASSERT(rdbi.e == 0); @@ -734,7 +734,7 @@ llc.put_frame(llc_data, 99); ar = Encoding::rlc_data_to_dl_append(&rdbi, cs, - &llc, &write_offset, &num_chunks, data, false); + &llc, &write_offset, &num_chunks, data, false, NULL); OSMO_ASSERT(ar == Encoding::AR_NEED_MORE_BLOCKS); OSMO_ASSERT(rdbi.e == 0); @@ -757,7 +757,7 @@ llc.put_frame(llc_data, 11); ar = Encoding::rlc_data_to_dl_append(&rdbi, cs, - &llc, &write_offset, &num_chunks, data, false); + &llc, &write_offset, &num_chunks, data, false, NULL); OSMO_ASSERT(ar == Encoding::AR_COMPLETED_SPACE_LEFT); OSMO_ASSERT(rdbi.e == 0); @@ -768,7 +768,7 @@ llc.put_frame(llc_data, 26); ar = Encoding::rlc_data_to_dl_append(&rdbi, cs, - &llc, &write_offset, &num_chunks, data, false); + &llc, &write_offset, &num_chunks, data, false, NULL); OSMO_ASSERT(ar == Encoding::AR_COMPLETED_SPACE_LEFT); OSMO_ASSERT(rdbi.e == 0); @@ -779,7 +779,7 @@ llc.put_frame(llc_data, 99); ar = Encoding::rlc_data_to_dl_append(&rdbi, cs, - &llc, &write_offset, &num_chunks, data, false); + &llc, &write_offset, &num_chunks, data, false, NULL); OSMO_ASSERT(ar == Encoding::AR_NEED_MORE_BLOCKS); OSMO_ASSERT(rdbi.e == 0); @@ -809,7 +809,7 @@ llc.put_frame(llc_data, 15); ar = Encoding::rlc_data_to_dl_append(&rdbi, cs, - &llc, &write_offset, &num_chunks, data, false); + &llc, &write_offset, &num_chunks, data, false, NULL); OSMO_ASSERT(ar == Encoding::AR_COMPLETED_SPACE_LEFT); OSMO_ASSERT(rdbi.e == 0); @@ -820,7 +820,7 @@ llc.put_frame(llc_data, 12); ar = Encoding::rlc_data_to_dl_append(&rdbi, cs, - &llc, &write_offset, &num_chunks, data, false); + &llc, &write_offset, &num_chunks, data, false, NULL); OSMO_ASSERT(ar == Encoding::AR_NEED_MORE_BLOCKS); OSMO_ASSERT(rdbi.e == 0); @@ -840,7 +840,7 @@ OSMO_ASSERT(llc.chunk_size() == 0); ar = Encoding::rlc_data_to_dl_append(&rdbi, cs, - &llc, &write_offset, &num_chunks, data, false); + &llc, &write_offset, &num_chunks, data, false, NULL); OSMO_ASSERT(ar == Encoding::AR_COMPLETED_SPACE_LEFT); OSMO_ASSERT(rdbi.e == 0); @@ -851,7 +851,7 @@ llc.put_frame(llc_data, 7); ar = Encoding::rlc_data_to_dl_append(&rdbi, cs, - &llc, &write_offset, &num_chunks, data, false); + &llc, &write_offset, &num_chunks, data, false, NULL); OSMO_ASSERT(ar == Encoding::AR_COMPLETED_SPACE_LEFT); OSMO_ASSERT(rdbi.e == 0); @@ -863,7 +863,7 @@ llc.put_frame(llc_data, 18); ar = Encoding::rlc_data_to_dl_append(&rdbi, cs, - &llc, &write_offset, &num_chunks, data, false); + &llc, &write_offset, &num_chunks, data, false, NULL); OSMO_ASSERT(ar == Encoding::AR_COMPLETED_BLOCK_FILLED); OSMO_ASSERT(rdbi.e == 0); @@ -886,7 +886,7 @@ llc.put_frame(llc_data, 6); ar = Encoding::rlc_data_to_dl_append(&rdbi, cs, - &llc, &write_offset, &num_chunks, data, false); + &llc, &write_offset, &num_chunks, data, false, NULL); OSMO_ASSERT(ar == Encoding::AR_COMPLETED_SPACE_LEFT); OSMO_ASSERT(rdbi.e == 0); -- To view, visit https://gerrit.osmocom.org/142 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0e622acb1f13f7489946baf049de4ba1cde6a1fc Gerrit-PatchSet: 1 Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu>

2 3

[PATCH] openbsc[master]: add .gitreview
by lynxis lazus 01 Jun '16

01 Jun '16

Review at https://gerrit.osmocom.org/161 add .gitreview A .gitreview file is required to use git review. More information about git review https://www.mediawiki.org/wiki/Gerrit/git-review Change-Id: Ie7cdf16232181d4b8093e61f2d8a3faed9010d4f --- A .gitreview 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/61/161/1 diff --git a/.gitreview b/.gitreview new file mode 100644 index 0000000..ee67509 --- /dev/null +++ b/.gitreview @@ -0,0 +1,3 @@ +[gerrit] +host=gerrit.osmocom.org +project=openbsc -- To view, visit https://gerrit.osmocom.org/161 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie7cdf16232181d4b8093e61f2d8a3faed9010d4f Gerrit-PatchSet: 1 Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu>

2 2

[PATCH] openbsc[master]: gprs: use new uint8_t * for kv in gprs_cipher_run()
by lynxis lazus 01 Jun '16

01 Jun '16

Review at https://gerrit.osmocom.org/162 gprs: use new uint8_t * for kv in gprs_cipher_run() libosmocore changed in bf990bb8 Update internal GPRS cipher API from uint_64 to uint8_t*. Fix a warning. Change-Id: Ib5bfe1fb05c693347b11ff4faadd3fc2205ebd76 --- M openbsc/src/gprs/gprs_llc.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/62/162/1 diff --git a/openbsc/src/gprs/gprs_llc.c b/openbsc/src/gprs/gprs_llc.c index 4cf5163..883f0cc 100644 --- a/openbsc/src/gprs/gprs_llc.c +++ b/openbsc/src/gprs/gprs_llc.c @@ -410,7 +410,7 @@ uint8_t cipher_out[GSM0464_CIPH_MAX_BLOCK]; uint32_t iv; int rc, i; - uint64_t kc = *(uint64_t *)&lle->llme->kc; + uint8_t *kc = lle->llme->kc; /* Compute the 'Input' Paraemeter */ iv = gprs_cipher_gen_input_ui(iov_ui, sapi, nu, oc); @@ -611,7 +611,7 @@ uint16_t crypt_len = llhp.data_len + 3; uint8_t cipher_out[GSM0464_CIPH_MAX_BLOCK]; uint32_t iv; - uint64_t kc = *(uint64_t *)&lle->llme->kc; + uint8_t *kc = lle->llme->kc; int rc, i; if (lle->llme->algo == GPRS_ALGO_GEA0) { -- To view, visit https://gerrit.osmocom.org/162 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib5bfe1fb05c693347b11ff4faadd3fc2205ebd76 Gerrit-PatchSet: 1 Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu>

2 2

[PATCH] libosmo-abis[master]: Extend osmo_rtp_send_frame API
by Max 31 May '16

31 May '16

Review at https://gerrit.osmocom.org/82 Extend osmo_rtp_send_frame API Add boolean parameter to osmo_rtp_send_frame() to explicitly set marker bit in RTP header. Previously it was always unset which resulted in degradation of speech quality for codecs with explicit talkspurt events (was tested with AMR's ONSET). Related: OS#1562 Change-Id: I23e6dccfad5643e662391a0a2abebbb45597ffd9 --- M TODO-RELEASE M include/osmocom/trau/osmo_ortp.h M src/trau/osmo_ortp.c 3 files changed, 8 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/82/82/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index 43b1e8e..2ba3b29 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -1 +1,2 @@ #library what description / commit summary line +libosmo-abis API change signature of osmo_rtp_send_frame diff --git a/include/osmocom/trau/osmo_ortp.h b/include/osmocom/trau/osmo_ortp.h index 9512759..58d2860 100644 --- a/include/osmocom/trau/osmo_ortp.h +++ b/include/osmocom/trau/osmo_ortp.h @@ -2,6 +2,7 @@ #define _OSMO_ORTP_H #include <stdint.h> +#include <stdbool.h> #include <osmocom/core/linuxlist.h> #include <osmocom/core/select.h> @@ -66,7 +67,8 @@ int osmo_rtp_socket_set_pt(struct osmo_rtp_socket *rs, int payload_type); int osmo_rtp_socket_free(struct osmo_rtp_socket *rs); int osmo_rtp_send_frame(struct osmo_rtp_socket *rs, const uint8_t *payload, - unsigned int payload_len, unsigned int duration); + unsigned int payload_len, unsigned int duration, + bool marker); int osmo_rtp_socket_poll(struct osmo_rtp_socket *rs); int osmo_rtp_get_bound_ip_port(struct osmo_rtp_socket *rs, diff --git a/src/trau/osmo_ortp.c b/src/trau/osmo_ortp.c index 3313798..cb167d7 100644 --- a/src/trau/osmo_ortp.c +++ b/src/trau/osmo_ortp.c @@ -23,6 +23,7 @@ */ #include <stdint.h> +#include <stdbool.h> #include <inttypes.h> #include <netdb.h> @@ -415,7 +416,8 @@ * \returns 0 on success, <0 in case of error. */ int osmo_rtp_send_frame(struct osmo_rtp_socket *rs, const uint8_t *payload, - unsigned int payload_len, unsigned int duration) + unsigned int payload_len, unsigned int duration, + bool marker) { mblk_t *mblk; int rc; @@ -428,6 +430,7 @@ if (!mblk) return -ENOMEM; + rtp_set_markbit(mblk, marker); rc = rtp_session_sendm_with_ts(rs->sess, mblk, rs->tx_timestamp); rs->tx_timestamp += duration; -- To view, visit https://gerrit.osmocom.org/82 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I23e6dccfad5643e662391a0a2abebbb45597ffd9 Gerrit-PatchSet: 1 Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Owner: Max <msuraev(a)sysmocom.de>

2 2

[PATCH] osmo-bts[master]: Use libosmocore function for uplink measurements
by Max 31 May '16

31 May '16

Review at https://gerrit.osmocom.org/108 Use libosmocore function for uplink measurements Related: OS#1563 Change-Id: Ide47e8e69e0d2d5859c5249b22f4bad22c18aa57 --- M include/osmo-bts/measurement.h M src/common/measurement.c M src/common/rsl.c 3 files changed, 9 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/08/108/1 diff --git a/include/osmo-bts/measurement.h b/include/osmo-bts/measurement.h index 493b6ff..2037ff6 100644 --- a/include/osmo-bts/measurement.h +++ b/include/osmo-bts/measurement.h @@ -5,7 +5,4 @@ int trx_meas_check_compute(struct gsm_bts_trx *trx, uint32_t fn); -/* build the 3 byte RSL uplinke measurement IE content */ -int lchan_build_rsl_ul_meas(struct gsm_lchan *, uint8_t *buf); - #endif diff --git a/src/common/measurement.c b/src/common/measurement.c index 41a0170..b0906d4 100644 --- a/src/common/measurement.c +++ b/src/common/measurement.c @@ -200,17 +200,6 @@ return 1; } -/* build the 3 byte RSL uplinke measurement IE content */ -int lchan_build_rsl_ul_meas(struct gsm_lchan *lchan, uint8_t *buf) -{ - struct gsm_meas_rep_unidir *mru = &lchan->meas.ul_res; - buf[0] = (mru->full.rx_lev & 0x3f); /* FIXME: DTXu support */ - buf[1] = (mru->sub.rx_lev & 0x3f); - buf[2] = ((mru->full.rx_qual & 7) << 3) | (mru->sub.rx_qual & 7); - - return 3; -} - /* Copied from OpenBSC and enlarged to _GSM_PCHAN_MAX */ static const uint8_t subslots_per_pchan[_GSM_PCHAN_MAX] = { [GSM_PCHAN_NONE] = 0, diff --git a/src/common/rsl.c b/src/common/rsl.c index ecf570c..e13d48c 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -23,6 +23,7 @@ #include <stdio.h> #include <errno.h> #include <netdb.h> +#include <stdbool.h> #include <sys/types.h> #include <arpa/inet.h> @@ -31,6 +32,7 @@ #include <osmocom/gsm/rsl.h> #include <osmocom/gsm/lapdm.h> #include <osmocom/gsm/protocol/gsm_12_21.h> +#include <osmocom/gsm/protocol/gsm_08_58.h> #include <osmocom/gsm/protocol/ipaccess.h> #include <osmocom/trau/osmo_ortp.h> @@ -1692,7 +1694,8 @@ } /* 8.4.8 MEASUREMENT RESult */ -static int rsl_tx_meas_res(struct gsm_lchan *lchan, uint8_t *l3, int l3_len) +static int rsl_tx_meas_res(struct gsm_lchan *lchan, uint8_t *l3, int l3_len, + bool dtxd_used) { struct msgb *msg; uint8_t meas_res[16]; @@ -1710,7 +1713,8 @@ return -ENOMEM; msgb_tv_put(msg, RSL_IE_MEAS_RES_NR, lchan->meas.res_nr++); - int ie_len = lchan_build_rsl_ul_meas(lchan, meas_res); + size_t ie_len = gsm0858_rsl_ul_meas_enc(&lchan->meas.ul_res, dtxd_used, + meas_res); if (ie_len >= 3) { msgb_tlv_put(msg, RSL_IE_UPLINK_MEAS, ie_len, meas_res); lchan->meas.flags &= ~LC_UL_M_F_RES_VALID; @@ -1751,8 +1755,9 @@ LOGP(DRSL, LOGL_INFO, "%s Handing RLL msg %s from LAPDm to MEAS REP\n", gsm_lchan_name(lchan), rsl_msg_name(rh->msg_type)); - - rc = rsl_tx_meas_res(lchan, msgb_l3(msg), msgb_l3len(msg)); + /* FIXME: add dtx downlink support */ + rc = rsl_tx_meas_res(lchan, msgb_l3(msg), msgb_l3len(msg), + false); msgb_free(msg); return rc; } else { -- To view, visit https://gerrit.osmocom.org/108 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ide47e8e69e0d2d5859c5249b22f4bad22c18aa57 Gerrit-PatchSet: 1 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Max <msuraev(a)sysmocom.de>

2 2

[PATCH] osmo-pcu[master]: tbf_dl: comment why we sent a dummy LLC packets to delay the...
by lynxis lazus 31 May '16

31 May '16

Review at https://gerrit.osmocom.org/143 tbf_dl: comment why we sent a dummy LLC packets to delay the release of the TBF Change-Id: I1862674437dffef4de3ffa7b183ecf690020b0ec --- M src/tbf_dl.cpp 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/43/143/1 diff --git a/src/tbf_dl.cpp b/src/tbf_dl.cpp index 00adbc9..66f747b 100644 --- a/src/tbf_dl.cpp +++ b/src/tbf_dl.cpp @@ -515,6 +515,8 @@ bool is_final; if (m_llc.frame_length() == 0) { + /* nothing to sent - delay the release of the TBF */ + int space = block_data_len - write_offset; /* A header will need to by added, so we just need * space-1 octets */ -- To view, visit https://gerrit.osmocom.org/143 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1862674437dffef4de3ffa7b183ecf690020b0ec Gerrit-PatchSet: 1 Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu>

2 1

[PATCH] osmo-pcu[master]: encoding: add doxygen for rlc_data_to_dl_append*
by lynxis lazus 31 May '16

31 May '16

Review at https://gerrit.osmocom.org/141 encoding: add doxygen for rlc_data_to_dl_append* Change-Id: I6ead0f1d14a91c657448227e17438b49a54e6c4a --- M src/encoding.cpp 1 file changed, 31 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/41/141/1 diff --git a/src/encoding.cpp b/src/encoding.cpp index 6c50abe..9dba4f6 100644 --- a/src/encoding.cpp +++ b/src/encoding.cpp @@ -891,6 +891,16 @@ return rdbi->data_len; } +/*! + * \brief (GPRS) put llc pdu into an rlc/mac block. fragment the llc pdu if needed + * \param rdbi rlc/mac block info + * \param llc llc pdu + * \param offset given offset within the rlc/mac block + * \param num_chunks count the chunks (llc pdu data) within rlc/mac + * \param data_block buffer holds rlc/mac data + * \param is_final if this is the last rlc/mac within a TBF + * \return the state of the rlc/mac like if there is more space for another chunk + */ static Encoding::AppendResult rlc_data_to_dl_append_gprs( struct gprs_rlc_data_block_info *rdbi, gprs_llc *llc, int *offset, int *num_chunks, @@ -1012,6 +1022,16 @@ return Encoding::AR_COMPLETED_BLOCK_FILLED; } +/*! + * \brief (EGPRS) put llc pdu into an rlc/mac block. fragment the llc pdu if needed + * \param rdbi rlc/mac block info + * \param llc llc pdu + * \param offset given offset within the rlc/mac block + * \param num_chunks count the chunks (llc pdu data) within rlc/mac + * \param data_block buffer holds rlc/mac data + * \param is_final if this is the last rlc/mac within a TBF + * \return the state of the rlc/mac like if there is more space for another chunk + */ static Encoding::AppendResult rlc_data_to_dl_append_egprs( struct gprs_rlc_data_block_info *rdbi, gprs_llc *llc, int *offset, int *num_chunks, @@ -1154,6 +1174,17 @@ return Encoding::AR_COMPLETED_BLOCK_FILLED; } +/*! + * \brief Encoding::rlc_data_to_dl_append + * \param rdbi rlc/mac block info + * \param cs the coding scheme to use + * \param llc llc pdu + * \param offset given offset within the rlc/mac block + * \param num_chunks count the chunks (llc pdu data) within rlc/mac + * \param data_block buffer holds rlc/mac data + * \param is_final if this is the last rlc/mac within a TBF + * \return the state of the rlc/mac like if there is more space for another chunk + */ Encoding::AppendResult Encoding::rlc_data_to_dl_append( struct gprs_rlc_data_block_info *rdbi, GprsCodingScheme cs, gprs_llc *llc, int *offset, int *num_chunks, -- To view, visit https://gerrit.osmocom.org/141 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6ead0f1d14a91c657448227e17438b49a54e6c4a Gerrit-PatchSet: 1 Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu>

2 2

[PATCH] libosmocore[master]: Patched structs for big-endian architectures
by Ruben Undheim 31 May '16

31 May '16

Review at https://gerrit.osmocom.org/124 Patched structs for big-endian architectures Change-Id: I29eafe481e112d18c624b1c83add0d53c354dbe4 --- M include/osmocom/gsm/protocol/gsm_04_08.h 1 file changed, 160 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/24/124/1 diff --git a/include/osmocom/gsm/protocol/gsm_04_08.h b/include/osmocom/gsm/protocol/gsm_04_08.h index 4800b48..0c2fcf2 100644 --- a/include/osmocom/gsm/protocol/gsm_04_08.h +++ b/include/osmocom/gsm/protocol/gsm_04_08.h @@ -4,6 +4,8 @@ #include <stdbool.h> #include <osmocom/core/utils.h> +#include <osmocom/core/endian.h> + /* GSM TS 04.08 definitions */ struct gsm_lchan; @@ -42,6 +44,7 @@ } __attribute__ ((packed)); /* Chapter 10.5.2.1b.3 */ +#if OSMO_IS_LITTLE_ENDIAN == 1 struct gsm48_range_1024 { uint8_t w1_hi:2, f0:1, @@ -75,8 +78,44 @@ uint8_t w16:6, w15_lo:2; } __attribute__ ((packed)); +#else +struct gsm48_range_1024 { + uint8_t form_id:5, + f0:1, + w1_hi:2; + uint8_t w1_lo; + uint8_t w2_hi; + uint8_t w2_lo:1, + w3_hi:7; + uint8_t w3_lo:2, + w4_hi:6; + uint8_t w4_lo:2, + w5_hi:6; + uint8_t w5_lo:2, + w6_hi:6; + uint8_t w6_lo:2, + w7_hi:6; + uint8_t w7_lo:2, + w8_hi:6; + uint8_t w8_lo:1, + w9:7; + uint8_t w10:7, + w11_hi:1; + uint8_t w11_lo:6, + w12_hi:2; + uint8_t w12_lo:5, + w13_hi:3; + uint8_t w13_lo:4, + w14_hi:4; + uint8_t w14_lo:3, + w15_hi:5; + uint8_t w15_lo:2, + w16:6; +} __attribute__ ((packed)); +#endif /* Chapter 10.5.2.1b.4 */ +#if OSMO_IS_LITTLE_ENDIAN == 1 struct gsm48_range_512 { uint8_t orig_arfcn_hi:1, form_id:7; @@ -110,8 +149,44 @@ uint8_t w17:5, w16_lo:3; } __attribute__ ((packed)); +#else +struct gsm48_range_512 { + uint8_t form_id:7, + orig_arfcn_hi:1; + uint8_t orig_arfcn_mid; + uint8_t orig_arfcn_lo:1, + w1_hi:7; + uint8_t w1_lo:2, + w2_hi:6; + uint8_t w2_lo:2, + w3_hi:6; + uint8_t w3_lo:2, + w4_hi:6; + uint8_t w4_lo:1, + w5:7; + uint8_t w6:7, + w7_hi:1; + uint8_t w7_lo:6, + w8_hi:2; + uint8_t w8_lo:4, + w9_hi:4; + uint8_t w9_lo:2, + w10:6; + uint8_t w11:6, + w12_hi:2; + uint8_t w12_lo:4, + w13_hi:4; + uint8_t w13_lo:2, + w14:6; + uint8_t w15:6, + w16_hi:2; + uint8_t w16_lo:3, + w17:5; +} __attribute__ ((packed)); +#endif /* Chapter 10.5.2.1b.5 */ +#if OSMO_IS_LITTLE_ENDIAN == 1 struct gsm48_range_256 { uint8_t orig_arfcn_hi:1, form_id:7; @@ -151,8 +226,50 @@ w21:4, w20_lo:3; } __attribute__ ((packed)); +#else +struct gsm48_range_256 { + uint8_t form_id:7, + orig_arfcn_hi:1; + uint8_t orig_arfcn_mid; + uint8_t orig_arfcn_lo:1, + w1_hi:7; + uint8_t w1_lo:1, + w2:7; + uint8_t w3:7, + w4_hi:1; + uint8_t w4_lo:5, + w5_hi:3; + uint8_t w5_lo:3, + w6_hi:5; + uint8_t w6_lo:1, + w7:6, + w8_hi:1; + uint8_t w8_lo:4, + w9_hi:4; + uint8_t w9_lo:1, + w10:5, + w11_hi:2; + uint8_t w11_lo:3, + w12:5; + uint8_t w13:5, + w14_hi:3; + uint8_t w14_lo:2, + w15:5, + w16_hi:1; + uint8_t w16_lo:3, + w17:4, + w18_hi:1; + uint8_t w18_lo:3, + w19:4, + w20_hi:1; + uint8_t w20_lo:3, + w21:4, + spare:1; +} __attribute__ ((packed)); +#endif /* Chapter 10.5.2.1b.6 */ +#if OSMO_IS_LITTLE_ENDIAN == 1 struct gsm48_range_128 { uint8_t orig_arfcn_hi:1, form_id:7; @@ -194,6 +311,49 @@ w27:3, w26_lo:1; } __attribute__ ((packed)); +#else +struct gsm48_range_128 { + uint8_t form_id:7, + orig_arfcn_hi:1; + uint8_t orig_arfcn_mid; + uint8_t orig_arfcn_lo:1, + w1:7; + uint8_t w2:6, + w3_hi:2; + uint8_t w3_lo:4, + w4_hi:4; + uint8_t w4_lo:1, + w5:5, + w6_hi:2; + uint8_t w6_lo:3, + w7:5; + uint8_t w8:4, + w9:4; + uint8_t w10:4, + w11:4; + uint8_t w12:4, + w13:4; + uint8_t w14:4, + w15:4; + uint8_t w16:3, + w17:3, + w18_hi:2; + uint8_t w18_lo:1, + w19:3, + w20:3, + w21_hi:1; + uint8_t w21_lo:2, + w22:3, + w23:3; + uint8_t w24:3, + w25:3, + w26_hi:2; + uint8_t w26_lo:1, + w27:3, + w28:3, + spare:1; +} __attribute__ ((packed)); +#endif /* Chapter 10.5.2.1b.7 */ struct gsm48_var_bit { -- To view, visit https://gerrit.osmocom.org/124 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I29eafe481e112d18c624b1c83add0d53c354dbe4 Gerrit-PatchSet: 1 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Ruben Undheim <ruben.undheim(a)gmail.com>

3 3

[PATCH] osmo-pcu[master]: decoding: improve and add comments
by lynxis lazus 31 May '16

31 May '16

Review at https://gerrit.osmocom.org/139 decoding: improve and add comments Change-Id: I45c9fc55243224909ca2fdece8cbfa686b0f444d --- M src/decoding.cpp M src/decoding.h 2 files changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/39/139/1 diff --git a/src/decoding.cpp b/src/decoding.cpp index 0c81b2a..5f64ac0 100644 --- a/src/decoding.cpp +++ b/src/decoding.cpp @@ -32,7 +32,7 @@ #include <string.h> #define LENGTH_TO_END 255 -/* +/*! * \returns num extensions fields (num frames == offset) on success, * -errno otherwise. */ @@ -197,6 +197,7 @@ e = rdbi->e; if (e) { if (chunks_size > 0) { + /* Block without LI means it only contains data of one LLC PDU */ chunks[num_chunks].offset = offs; chunks[num_chunks].length = LENGTH_TO_END; chunks[num_chunks].is_complete = is_last_block; diff --git a/src/decoding.h b/src/decoding.h index 1043d67..50c9e7d 100644 --- a/src/decoding.h +++ b/src/decoding.h @@ -28,10 +28,11 @@ class Decoding { public: + /* represents (parts) LLC PDUs within one RLC Data block */ struct RlcData { uint8_t offset; uint8_t length; - bool is_complete; + bool is_complete; /* if this PDU ends in this block */ }; static int rlc_data_from_ul_data( -- To view, visit https://gerrit.osmocom.org/139 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I45c9fc55243224909ca2fdece8cbfa686b0f444d Gerrit-PatchSet: 1 Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu>

2 2

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

OpenBSC May 2016