July 2022 - gerrit-log - lists.osmocom.org

Change in osmo-cbc[master]: Add initial SBc-AP support to osmo-cbc

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28602 ) Change subject: Add initial SBc-AP support to osmo-cbc ...................................................................... Patch Set 10: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28602 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: Ib278bc1d1a74459814016fef7a8fe21cc29d46c9 Gerrit-Change-Number: 28602 Gerrit-PatchSet: 10 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 18 Jul 2022 09:53:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years

1
0
0 0

Change in osmo-cbc[master]: Add initial SBc-AP support to osmo-cbc

by pespin

Attention is currently required from: pespin, fixeria. pespin has removed a vote from this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28602 ) Change subject: Add initial SBc-AP support to osmo-cbc ...................................................................... Removed Verified-1 by Jenkins Builder (1000002) -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28602 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: Ib278bc1d1a74459814016fef7a8fe21cc29d46c9 Gerrit-Change-Number: 28602 Gerrit-PatchSet: 10 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: deleteVote

3 years

1
0
0 0

Change in osmo-cbc[master]: sbcap: Update asn1c skeleton files

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28639 ) Change subject: sbcap: Update asn1c skeleton files ...................................................................... sbcap: Update asn1c skeleton files Update skeleton files using newest asn1c with APER support [1], commit 24247e2813a7510ebabe6a9b6b6b29fffa0eb27b. This contains some APER decoding and encoding fixes for length determinants. See [2] for more information. [1] https://github.com/mouse07410/asn1c/tree/vlm_master/ [2] https://github.com/mouse07410/asn1c/issues/94 Change-Id: I581fc53b124a443e150508811df4cca4593038c4 --- M src/sbcap/gen/ANY_aper.c M src/sbcap/gen/INTEGER_aper.c M src/sbcap/gen/OCTET_STRING_aper.c M src/sbcap/gen/OPEN_TYPE_aper.c M src/sbcap/gen/aper_opentype.c M src/sbcap/gen/aper_support.c M src/sbcap/gen/constr_SEQUENCE_OF_aper.c M src/sbcap/gen/constr_SET_OF_aper.c M src/sbcap/skel/aper_support.h 9 files changed, 90 insertions(+), 130 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/39/28639/1 diff --git a/src/sbcap/gen/ANY_aper.c b/src/sbcap/gen/ANY_aper.c index 917e5ef..91d7277 100644 --- a/src/sbcap/gen/ANY_aper.c +++ b/src/sbcap/gen/ANY_aper.c @@ -132,7 +132,7 @@ int ret; /* Get the PER length */ - raw_len = aper_get_length(pd, -1, 0, &repeat); + raw_len = aper_get_length(pd, -1, -1, 0, &repeat); if(raw_len < 0) RETURN(RC_WMORE); if(raw_len == 0 && st->buf) break; @@ -173,7 +173,7 @@ size = st->size; do { int need_eom = 0; - ssize_t may_save = aper_put_length(po, -1, size, &need_eom); + ssize_t may_save = aper_put_length(po, -1, -1, size, &need_eom); if(may_save < 0) ASN__ENCODE_FAILED; ret = per_put_many_bits(po, buf, may_save * 8); @@ -182,7 +182,7 @@ buf += may_save; size -= may_save; assert(!(may_save & 0x07) || !size); - if(need_eom && aper_put_length(po, -1, 0, 0)) + if(need_eom && aper_put_length(po, -1, -1, 0, NULL)) ASN__ENCODE_FAILED; /* End of Message length */ } while(size); diff --git a/src/sbcap/gen/INTEGER_aper.c b/src/sbcap/gen/INTEGER_aper.c index 2ff9db0..bd19de1 100644 --- a/src/sbcap/gen/INTEGER_aper.c +++ b/src/sbcap/gen/INTEGER_aper.c @@ -129,7 +129,7 @@ int ret; /* Get the PER length */ - len = aper_get_length(pd, -1, -1, &repeat); + len = aper_get_length(pd, -1, -1, -1, &repeat); if(len < 0) ASN__DECODE_STARVED; p = REALLOC(st->buf, st->size + len + 1); @@ -291,13 +291,14 @@ for(buf = st->buf, end = st->buf + st->size; buf < end;) { int need_eom = 0; - ssize_t mayEncode = aper_put_length(po, -1, end - buf, &need_eom); + ssize_t mayEncode = aper_put_length(po, -1, -1, end - buf, &need_eom); if(mayEncode < 0) ASN__ENCODE_FAILED; if(per_put_many_bits(po, buf, 8 * mayEncode)) ASN__ENCODE_FAILED; buf += mayEncode; - if(need_eom && (aper_put_length(po, -1, 0, 0) < 0)) ASN__ENCODE_FAILED; + if(need_eom && (aper_put_length(po, -1, -1, 0, NULL) < 0)) + ASN__ENCODE_FAILED; } ASN__ENCODED_OK(er); diff --git a/src/sbcap/gen/OCTET_STRING_aper.c b/src/sbcap/gen/OCTET_STRING_aper.c index eb2ea39..fb760c4 100644 --- a/src/sbcap/gen/OCTET_STRING_aper.c +++ b/src/sbcap/gen/OCTET_STRING_aper.c @@ -173,9 +173,10 @@ /* Get the PER length */ if (csiz->upper_bound - csiz->lower_bound == 0) /* Indefinite length case */ - raw_len = aper_get_length(pd, -1, csiz->effective_bits, &repeat); + raw_len = aper_get_length(pd, -1, -1, csiz->effective_bits, &repeat); else - raw_len = aper_get_length(pd, csiz->upper_bound - csiz->lower_bound + 1, csiz->effective_bits, &repeat); + raw_len = aper_get_length(pd, csiz->lower_bound, csiz->upper_bound, + csiz->effective_bits, &repeat); if(raw_len < 0) RETURN(RC_WMORE); raw_len += csiz->lower_bound; @@ -342,9 +343,8 @@ st->size, sizeinunits - csiz->lower_bound, csiz->effective_bits); if (csiz->effective_bits > 0) { - ret = aper_put_length(po, - csiz->upper_bound - csiz->lower_bound + 1, - sizeinunits - csiz->lower_bound, 0); + ret = aper_put_length(po, csiz->lower_bound, csiz->upper_bound, + sizeinunits - csiz->lower_bound, NULL); if(ret < 0) ASN__ENCODE_FAILED; } if (csiz->effective_bits > 0 || (st->size > 2) @@ -372,7 +372,7 @@ ASN_DEBUG("Encoding %lu bytes", st->size); if(sizeinunits == 0) { - if(aper_put_length(po, -1, 0, 0) < 0) + if(aper_put_length(po, -1, -1, 0, NULL) < 0) ASN__ENCODE_FAILED; ASN__ENCODED_OK(er); } @@ -380,7 +380,7 @@ buf = st->buf; while(sizeinunits) { int need_eom = 0; - ssize_t maySave = aper_put_length(po, -1, sizeinunits, &need_eom); + ssize_t maySave = aper_put_length(po, -1, -1, sizeinunits, &need_eom); if(maySave < 0) ASN__ENCODE_FAILED; @@ -404,7 +404,7 @@ buf += maySave >> 3; sizeinunits -= maySave; assert(!(maySave & 0x07) || !sizeinunits); - if(need_eom && (aper_put_length(po, -1, 0, 0) < 0)) + if(need_eom && (aper_put_length(po, -1, -1, 0, NULL) < 0)) ASN__ENCODE_FAILED; /* End of Message length */ } diff --git a/src/sbcap/gen/OPEN_TYPE_aper.c b/src/sbcap/gen/OPEN_TYPE_aper.c index a1a8e19..3e2ab18 100644 --- a/src/sbcap/gen/OPEN_TYPE_aper.c +++ b/src/sbcap/gen/OPEN_TYPE_aper.c @@ -146,7 +146,7 @@ rv.code = RC_FAIL; do { - bytes = aper_get_length(pd, -1, -1, &repeat); + bytes = aper_get_length(pd, -1, -1, -1, &repeat); if (bytes > 10 * ASN_DUMMY_BYTES) { return rv; @@ -171,4 +171,3 @@ return rv; #undef ASN_DUMMY_BYTES } - diff --git a/src/sbcap/gen/aper_opentype.c b/src/sbcap/gen/aper_opentype.c index 1b22395..97cc410 100644 --- a/src/sbcap/gen/aper_opentype.c +++ b/src/sbcap/gen/aper_opentype.c @@ -25,7 +25,7 @@ ASN_DEBUG("Getting open type %s...", td->name); do { - chunk_bytes = aper_get_length(pd, -1, -1, &repeat); + chunk_bytes = aper_get_length(pd, -1, -1, -1, &repeat); if(chunk_bytes < 0) { FREEMEM(buf); ASN__DECODE_STARVED; @@ -101,12 +101,12 @@ for(bptr = buf, toGo = size; toGo;) { int need_eom = 0; - ssize_t maySave = aper_put_length(po, -1, toGo, &need_eom); + ssize_t maySave = aper_put_length(po, -1, -1, toGo, &need_eom); if(maySave < 0) break; if(per_put_many_bits(po, bptr, maySave * 8)) break; bptr = (char *)bptr + maySave; toGo -= maySave; - if(need_eom && (aper_put_length(po, -1, 0, 0) < 0)) { + if(need_eom && (aper_put_length(po, -1, -1, 0, NULL) < 0)) { FREEMEM(buf); return -1; } diff --git a/src/sbcap/gen/aper_support.c b/src/sbcap/gen/aper_support.c index d6fa6b0..9ca8614 100644 --- a/src/sbcap/gen/aper_support.c +++ b/src/sbcap/gen/aper_support.c @@ -17,13 +17,17 @@ } ssize_t -aper_get_length(asn_per_data_t *pd, int range, int ebits, int *repeat) { +aper_get_length(asn_per_data_t *pd, ssize_t lb, ssize_t ub, + int ebits, int *repeat) { + int constrained = (lb >= 0) && (ub >= 0); ssize_t value; *repeat = 0; - if (range <= 65536 && range >= 0) + if (constrained && ub < 65536) { + int range = ub - lb + 1; return aper_get_nsnnwn(pd, range); + } if (aper_get_align(pd) < 0) return -1; @@ -32,14 +36,14 @@ value = per_get_few_bits(pd, 8); if(value < 0) return -1; - if((value & 128) == 0) /* #10.9.3.6 */ + if((value & 128) == 0) /* #11.9.3.6 */ return (value & 0x7F); - if((value & 64) == 0) { /* #10.9.3.7 */ + if((value & 64) == 0) { /* #11.9.3.7 */ value = ((value & 63) << 8) | per_get_few_bits(pd, 8); if(value < 0) return -1; return value; } - value &= 63; /* this is "m" from X.691, #10.9.3.8 */ + value &= 63; /* this is "m" from X.691, #11.9.3.8 */ if(value < 1 || value > 4) return -1; *repeat = 1; @@ -59,13 +63,12 @@ return length; } else { int repeat; - length = aper_get_length(pd, -1, -1, &repeat); + length = aper_get_length(pd, -1, -1, -1, &repeat); if(length >= 0 && !repeat) return length; return -1; /* Error, or do not support >16K extensions */ } } -#if !defined(USE_OLDER_APER_NSNNWN) ssize_t aper_get_nsnnwn(asn_per_data_t *pd, int range) { ssize_t value; @@ -95,53 +98,28 @@ //return -1; int length; - /* handle indefinite range */ - length = per_get_few_bits(pd, 1); - if (length == 0) - return per_get_few_bits(pd, 6); + /* handle indefinite range */ + length = per_get_few_bits(pd, 1); + if (length == 0) + return per_get_few_bits(pd, 6); - if (aper_get_align(pd) < 0) - return -1; + if (aper_get_align(pd) < 0) + return -1; - length = per_get_few_bits(pd, 8); - /* the length is not likely to be that big */ - if (length > 4) - return -1; - value = 0; - if (per_get_many_bits(pd, (uint8_t *)&value, 0, length * 8) < 0) - return -1; - return value; + length = per_get_few_bits(pd, 8); + /* the length is not likely to be that big */ + if (length > 4) + return -1; + value = 0; + if (per_get_many_bits(pd, (uint8_t *)&value, 0, length * 8) < 0) + return -1; + return value; } if (aper_get_align(pd) < 0) return -1; value = per_get_few_bits(pd, 8 * bytes); return value; } -#else /* old APER codec */ -ssize_t -aper_get_nsnnwn(asn_per_data_t *pd, int dummy_range) { - ssize_t value; - - ASN_DEBUG("Get the normally small non-negative whole number APER"); - - value = per_get_few_bits(pd, 7); - if(value & 64) { /* implicit (value < 0) */ - value &= 63; - value <<= 2; - value |= per_get_few_bits(pd, 2); - if(value & 128) /* implicit (value < 0) */ - return -1; - if(value == 0) - return 0; - if(value >= 3) - return -1; - value = per_get_few_bits(pd, 8 * value); - return value; - } - - return value; -} -#endif /* don't use old APER */ int aper_put_align(asn_per_outp_t *po) { @@ -154,38 +132,42 @@ } ssize_t -aper_put_length(asn_per_outp_t *po, int range, size_t length, int *need_eom) { - int dummy = 0; - if(!need_eom) need_eom = &dummy; +aper_put_length(asn_per_outp_t *po, ssize_t lb, ssize_t ub, size_t n, int *need_eom) { + int constrained = (lb >= 0) && (ub >= 0); + int dummy = 0; + if(!need_eom) need_eom = &dummy; - *need_eom = 0; + *need_eom = 0; - ASN_DEBUG("APER put length %zu with range %d", length, range); - /* 10.9 X.691 Note 2 */ - if (range <= 65536 && range >= 0) - return aper_put_nsnnwn(po, range, length) ? -1 : (ssize_t)length; + ASN_DEBUG("APER put length %zu with range (%zd..%zd)", n, lb, ub); + + /* 11.9 X.691 Note 2 */ + if (constrained && ub < 65536) { + int range = ub - lb + 1; + return aper_put_nsnnwn(po, range, n) ? -1 : (ssize_t)n; + } if (aper_put_align(po) < 0) return -1; - if(length <= 127) /* #10.9.3.6 */{ - return per_put_few_bits(po, length, 8) - ? -1 : (ssize_t)length; + if(n <= 127) { /* #11.9.3.6 */ + return per_put_few_bits(po, n, 8) + ? -1 : (ssize_t)n; } - else if(length < 16384) /* #10.9.3.7 */ - return per_put_few_bits(po, length|0x8000, 16) - ? -1 : (ssize_t)length; + else if(n < 16384) /* #11.9.3.7 */ + return per_put_few_bits(po, n|0x8000, 16) + ? -1 : (ssize_t)n; - *need_eom = 0 == (length & 16383); - length >>= 14; - if(length > 4) { - *need_eom = 0; - length = 4; - } + *need_eom = 0 == (n & 16383); + n >>= 14; + if(n > 4) { + *need_eom = 0; + n = 4; + } - return per_put_few_bits(po, 0xC0 | length, 8) - ? -1 : (ssize_t)(length << 14); + return per_put_few_bits(po, 0xC0 | n, 8) + ? -1 : (ssize_t)(n << 14); } @@ -193,11 +175,11 @@ aper_put_nslength(asn_per_outp_t *po, size_t length) { if(length <= 64) { - /* #10.9.3.4 */ + /* #11.9.3.4 */ if(length == 0) return -1; return per_put_few_bits(po, length-1, 7) ? -1 : 0; } else { - if(aper_put_length(po, -1, length, 0) != (ssize_t)length) { + if(aper_put_length(po, -1, -1, length, NULL) != (ssize_t)length) { /* This might happen in case of >16K extensions */ return -1; } @@ -206,12 +188,11 @@ return 0; } -#if !defined(USE_OLDER_APER_NSNNWN) int aper_put_nsnnwn(asn_per_outp_t *po, int range, int number) { int bytes; - ASN_DEBUG("aper put nsnnwn %d with range %d", number, range); + ASN_DEBUG("aper put nsnnwn %d with range %d", number, range); /* 10.5.7.1 X.691 */ if(range < 0) { int i; @@ -254,30 +235,5 @@ /* if(per_put_few_bits(po, bytes, 8)) return -1; */ - return per_put_few_bits(po, number, 8 * bytes); + return per_put_few_bits(po, number, 8 * bytes); } -#else /* preserve old code base in case */ -int -aper_put_nsnnwn(asn_per_outp_t *po, int dummy_range, int n) { - int bytes; - - ASN_DEBUG("aper_put_nsnnwn"); - - if(n <= 63) { - if(n < 0) return -1; - return per_put_few_bits(po, n, 7); - } - if(n < 256) - bytes = 1; - else if(n < 65536) - bytes = 2; - else if(n < 256 * 65536) - bytes = 3; - else - return -1; /* This is not a "normally small" value */ - if(per_put_few_bits(po, bytes, 8)) - return -1; - - return per_put_few_bits(po, n, 8 * bytes); -} -#endif /* which aper_put_nsnnwn() */ diff --git a/src/sbcap/gen/constr_SEQUENCE_OF_aper.c b/src/sbcap/gen/constr_SEQUENCE_OF_aper.c index c64b697..038657a 100644 --- a/src/sbcap/gen/constr_SEQUENCE_OF_aper.c +++ b/src/sbcap/gen/constr_SEQUENCE_OF_aper.c @@ -54,7 +54,7 @@ */ if (ct->lower_bound == ct->upper_bound && ct->upper_bound < 65536) { /* No length determinant */ - } else if (aper_put_length(po, ct->upper_bound - ct->lower_bound + 1, list->count - ct->lower_bound, 0) < 0) + } else if (aper_put_length(po, ct->lower_bound, ct->upper_bound, list->count - ct->lower_bound, 0) < 0) ASN__ENCODE_FAILED; } @@ -65,7 +65,7 @@ if(ct && ct->effective_bits >= 0) { mayEncode = list->count; } else { - mayEncode = aper_put_length(po, -1, list->count - seq, &need_eom); + mayEncode = aper_put_length(po, -1, -1, list->count - seq, &need_eom); if(mayEncode < 0) ASN__ENCODE_FAILED; } @@ -79,7 +79,7 @@ ASN__ENCODE_FAILED; } - if(need_eom && (aper_put_length(po, -1, 0, 0) < 0)) + if(need_eom && (aper_put_length(po, -1, -1, 0, NULL) < 0)) ASN__ENCODE_FAILED; /* End of Message length */ } diff --git a/src/sbcap/gen/constr_SET_OF_aper.c b/src/sbcap/gen/constr_SET_OF_aper.c index 7a62616..72d52a6 100644 --- a/src/sbcap/gen/constr_SET_OF_aper.c +++ b/src/sbcap/gen/constr_SET_OF_aper.c @@ -52,7 +52,7 @@ ct->effective_bits)) ASN__ENCODE_FAILED;*/ - if (aper_put_length(po, ct->upper_bound - ct->lower_bound + 1, list->count - ct->lower_bound, 0) < 0) { + if (aper_put_length(po, ct->lower_bound, ct->upper_bound, list->count - ct->lower_bound, 0) < 0) { ASN__ENCODE_FAILED; } } @@ -70,7 +70,7 @@ may_encode = list->count; } else { may_encode = - aper_put_length(po, -1, list->count - seq, &need_eom); + aper_put_length(po, -1, -1, list->count - seq, &need_eom); if(may_encode < 0) ASN__ENCODE_FAILED; } @@ -81,7 +81,7 @@ break; } } - if(need_eom && aper_put_length(po, -1, 0, 0)) + if(need_eom && (aper_put_length(po, -1, -1, 0, NULL) < 0)) ASN__ENCODE_FAILED; /* End of Message length */ } @@ -141,8 +141,11 @@ do { int i; if(nelems < 0) { - nelems = aper_get_length(pd, ct ? ct->upper_bound - ct->lower_bound + 1 : -1, - ct ? ct->effective_bits : -1, &repeat); + if (ct) + nelems = aper_get_length(pd, ct->lower_bound, ct->upper_bound, + ct->effective_bits, &repeat); + else + nelems = aper_get_length(pd, -1, -1, -1, &repeat); ASN_DEBUG("Got to decode %d elements (eff %d)", (int)nelems, (int)(ct ? ct->effective_bits : -1)); if(nelems < 0) ASN__DECODE_STARVED; diff --git a/src/sbcap/skel/aper_support.h b/src/sbcap/skel/aper_support.h index 16e8afe..a372445 100644 --- a/src/sbcap/skel/aper_support.h +++ b/src/sbcap/skel/aper_support.h @@ -16,7 +16,7 @@ * X.691 (08/2015) #11.9 "General rules for encoding a length determinant" * Get the length "n" from the Aligned PER stream. */ -ssize_t aper_get_length(asn_per_data_t *pd, int range, +ssize_t aper_get_length(asn_per_data_t *pd, ssize_t lb, ssize_t ub, int effective_bound_bits, int *repeat); /* @@ -31,13 +31,14 @@ /* * X.691 (08/2015) #11.9 "General rules for encoding a length determinant" - * Put the length "whole_length" to the Aligned PER stream. - * If (opt_need_eom) is given, it will be set to 1 if final 0-length is needed. - * In that case, invoke uper_put_length(po, 0, 0) after encoding the last block. + * Put the length "n" to the Aligned PER stream. + * If (opt_need_eom) is given, it will be set to 1 if final 0-n is needed. + * In that case, invoke aper_put_length(po, -1, -1, 0, NULL) after encoding the + * last block. * This function returns the number of units which may be flushed * in the next units saving iteration. */ -ssize_t aper_put_length(asn_per_outp_t *po, int range, size_t length, +ssize_t aper_put_length(asn_per_outp_t *po, ssize_t lb, ssize_t ub, size_t n, int *opt_need_eom); /* Align the current bit position to octet bundary */ -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28639 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I581fc53b124a443e150508811df4cca4593038c4 Gerrit-Change-Number: 28639 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

3 years

1
0
0 0

Change in osmo-cbc[master]: Add initial SBc-AP support to osmo-cbc

by osmith

Attention is currently required from: pespin, fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28602 ) Change subject: Add initial SBc-AP support to osmo-cbc ...................................................................... Patch Set 9: Code-Review+1 (12 comments) File debian/control: https://gerrit.osmocom.org/c/osmo-cbc/+/28602/comment/08493be6_7a64df3c PS8, Line 18: libsctp-dev, > contrib/osmo-cbc.spec.in also needs to be adjusted, this should do it: […] Done File include/osmocom/cbc/sbcap_server.h: https://gerrit.osmocom.org/c/osmo-cbc/+/28602/comment/dd18fcc7_e54af511 PS8, Line 3: //#include <osmocom/gsm/sbcap.h> > commented out include? Done File src/cbc_main.c: https://gerrit.osmocom.org/c/osmo-cbc/+/28602/comment/5e15267e_4fb68225 PS8, Line 284: binidng > binding Done File src/sbcap_msg.c: https://gerrit.osmocom.org/c/osmo-cbc/+/28602/comment/60c20516_1b4386f6 PS8, Line 3: /* (C) 2019 by Harald Welte <laforge(a)gnumonks.org> > (copyright 2022, also in other files?) Done https://gerrit.osmocom.org/c/osmo-cbc/+/28602/comment/459d6306_6938fa49 PS8, Line 40: #if 0 > Because it shows how to encode a list of items when we add support for it in the future. […] Ack File src/sbcap_server.c: https://gerrit.osmocom.org/c/osmo-cbc/+/28602/comment/373c3b5f_31d40ff2 PS8, Line 62: 1500 > should be a valid talloc context instead. […] Done https://gerrit.osmocom.org/c/osmo-cbc/+/28602/comment/11af34db_bfaa3bff PS8, Line 184: /* FIXME */ > It's just kept to be on par with CBSP code, so that it can be fixed/figured out together later. Ack File src/sbcap_server_fsm.c: https://gerrit.osmocom.org/c/osmo-cbc/+/28602/comment/e56c66d7_31cd4213 PS8, Line 71: //SBcAP_SBC_AP_PDU_t *pdu; > not needed? Done https://gerrit.osmocom.org/c/osmo-cbc/+/28602/comment/71120dab_32f0bf5d PS8, Line 78: //pdu = data; > Not needed yet, but it's still worth leaving it commented out so that readers know which pointer is […] Ack https://gerrit.osmocom.org/c/osmo-cbc/+/28602/comment/34be949e_65f1d32b PS8, Line 148: /* static const long asn_VAL_1_SBcAP_id_Message_Identifier = 5; */ > I left it on purpose, to understand what's this 5. […] Ack https://gerrit.osmocom.org/c/osmo-cbc/+/28602/comment/71abee85_6766cddb PS8, Line 228: xpected > expected Done File src/smscb_peer_fsm.c: https://gerrit.osmocom.org/c/osmo-cbc/+/28602/comment/0d8366f2_d309ab4d PS8, Line 311: //SBcAP_SBC_AP_PDU_t *pdu = NULL; > Same, it's useful to keep for further future development. Ack -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28602 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: Ib278bc1d1a74459814016fef7a8fe21cc29d46c9 Gerrit-Change-Number: 28602 Gerrit-PatchSet: 9 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 18 Jul 2022 09:41:53 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

3 years

1
0
0 0

Build failure of network:osmocom:nightly/osmo-cbc in Raspbian_11/armv7l

by OBS Notification

Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/o… Package network:osmocom:nightly/osmo-cbc failed to build in Raspbian_11/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-cbc Last lines of build log: [ 656s] first_extension = 2, elements = 2 [ 656s] About to encode ProtocolIE-Container [ 656s] Encoding Write-Replace-Warning-Request->protocolIEs [ 656s] Encoding ProtocolIE-Container as SEQUENCE OF size (8) using ALIGNED PER [ 656s] /usr/src/packages/BUILD/tests/testsuite.dir/at-groups/1/test-source: line 14: 12695 Segmentation fault $abs_top_builddir/tests/sbcap/sbcap_test [ 656s] --- expout 2022-07-18 09:38:19.830000000 +0000 [ 656s] +++ /usr/src/packages/BUILD/tests/testsuite.dir/at-groups/1/stdout 2022-07-18 09:38:19.830000000 +0000 [ 656s] @@ -1,6 +0,0 @@ [ 656s] -==== test_asn1c_enc ==== [ 656s] -Encoded message: 00 00 00 76 00 00 08 00 05 00 02 ab 01 00 0b 00 02 ab cd 00 0a 00 02 00 1e 00 07 00 02 00 59 00 12 40 02 81 01 00 11 40 32 30 40 12 23 45 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 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 03 40 01 02 00 10 40 16 00 13 30 40 12 23 45 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 [ 656s] -==== test_asn1c_dec ==== [ 656s] -Decoding message: 20 00 00 14 00 00 03 00 05 00 02 00 2b 00 0b 00 02 41 70 00 01 00 01 00 [ 656s] -Decoded message successfully [ 656s] -Done [ 656s] ./testsuite.at:7: exit code was 139, expected 0 [ 656s] 1. testsuite.at:4: 1. sbcap (testsuite.at:4): FAILED (testsuite.at:7) [ 656s] make[1]: *** [debian/rules:63: override_dh_auto_test] Error 1 [ 656s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 656s] make: *** [debian/rules:45: build] Error 2 [ 656s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 656s] ### VM INTERACTION START ### [ 657s] Failed to write wtmp record, ignoring: Read-only file system [ 657s] Failed to write utmp record: Read-only file system [ 657s] Powering off. [ 657s] [ 632.973050] reboot: Power down [ 657s] ### VM INTERACTION END ### [ 657s] [ 657s] armbuild21 failed "build osmo-cbc_0.3.0.13.ca43.202207180859.dsc" at Mon Jul 18 09:38:21 UTC 2022. [ 657s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)

3 years

1
0
0 0

Change in osmo-cbc[master]: Add initial SBc-AP support to osmo-cbc

by pespin

Attention is currently required from: osmith, fixeria. Hello osmith, Jenkins Builder, laforge, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-cbc/+/28602 to look at the new patch set (#9). Change subject: Add initial SBc-AP support to osmo-cbc ...................................................................... Add initial SBc-AP support to osmo-cbc This patch makes use of the newly introduced sbcap library, and introduces new code (and extends existing one) to handle all the aspects of MME peers talking SBc-AP and its underlaying SCTP connection. This commit doesn't aim to implement all the SBc-AP features, but to implement a minimal subset of features already available for CBSP in osmo-cbc, in order to have similar support level for both 2G and 4G networks. Related: OS#4945 Change-Id: Ib278bc1d1a74459814016fef7a8fe21cc29d46c9 --- M configure.ac M contrib/osmo-cbc.spec.in M debian/control M doc/examples/osmo-cbc/osmo-cbc.cfg M include/osmocom/cbc/Makefile.am M include/osmocom/cbc/cbc_data.h M include/osmocom/cbc/internal.h A include/osmocom/cbc/sbcap_msg.h A include/osmocom/cbc/sbcap_server.h M src/Makefile.am M src/cbc_data.c M src/cbc_main.c M src/cbc_vty.c M src/message_handling.c A src/sbcap_msg.c A src/sbcap_server.c A src/sbcap_server_fsm.c M src/smscb_message_fsm.c M src/smscb_peer_fsm.c 19 files changed, 1,318 insertions(+), 53 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/02/28602/9 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28602 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: Ib278bc1d1a74459814016fef7a8fe21cc29d46c9 Gerrit-Change-Number: 28602 Gerrit-PatchSet: 9 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

3 years

1
0
0 0

Change in osmo-cbc[master]: Add initial SBc-AP support to osmo-cbc

by pespin

Attention is currently required from: osmith, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28602 ) Change subject: Add initial SBc-AP support to osmo-cbc ...................................................................... Patch Set 8: (5 comments) File src/sbcap_msg.c: https://gerrit.osmocom.org/c/osmo-cbc/+/28602/comment/cc78977e_1ac88c92 PS8, Line 40: #if 0 > There are multiple "if 0" style commented out code blocks below. […] Because it shows how to encode a list of items when we add support for it in the future. This took me a while to figure out so it's worth keeping here. File src/sbcap_server.c: https://gerrit.osmocom.org/c/osmo-cbc/+/28602/comment/cfdc5a74_2c558631 PS8, Line 184: /* FIXME */ > unresolved fixme, should it return here? It's just kept to be on par with CBSP code, so that it can be fixed/figured out together later. File src/sbcap_server_fsm.c: https://gerrit.osmocom.org/c/osmo-cbc/+/28602/comment/834daff1_4bea79b4 PS8, Line 78: //pdu = data; > not needed? Not needed yet, but it's still worth leaving it commented out so that readers know which pointer is being passed. https://gerrit.osmocom.org/c/osmo-cbc/+/28602/comment/8e04db8c_a1d129c4 PS8, Line 148: /* static const long asn_VAL_1_SBcAP_id_Message_Identifier = 5; */ > remove? I left it on purpose, to understand what's this 5. ASN1C is not properly exporting those values, that's why I'm leaving the comments here and other parts, so that we can fix it later. File src/smscb_peer_fsm.c: https://gerrit.osmocom.org/c/osmo-cbc/+/28602/comment/57eb4439_0748b1d7 PS8, Line 311: //SBcAP_SBC_AP_PDU_t *pdu = NULL; > remove? also "//pdu = data" twice below, also in smscb_p_fsm_wait_delete_ack Same, it's useful to keep for further future development. -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28602 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: Ib278bc1d1a74459814016fef7a8fe21cc29d46c9 Gerrit-Change-Number: 28602 Gerrit-PatchSet: 8 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 18 Jul 2022 09:35:26 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: comment

3 years

1
0
0 0

Build failure of network:osmocom:nightly/osmo-cbc in Raspbian_10/armv7l

by OBS Notification

Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/o… Package network:osmocom:nightly/osmo-cbc failed to build in Raspbian_10/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-cbc Last lines of build log: [ 497s] [PER out 1 0/0 (t=1,o=2) 0&80=0] [ 497s] [PER out 0/0 => 00 buf+0] [ 497s] first_extension = 2, elements = 2 [ 497s] About to encode ProtocolIE-Container [ 497s] Encoding Write-Replace-Warning-Request->protocolIEs [ 497s] Encoding ProtocolIE-Container as SEQUENCE OF size (8) using ALIGNED PER [ 497s] /usr/src/packages/BUILD/tests/testsuite.dir/at-groups/1/test-source: line 14: 12513 Segmentation fault $abs_top_builddir/tests/sbcap/sbcap_test [ 497s] --- expout 2022-07-18 09:33:02.380000000 +0000 [ 497s] +++ /usr/src/packages/BUILD/tests/testsuite.dir/at-groups/1/stdout 2022-07-18 09:33:02.380000000 +0000 [ 497s] @@ -1,6 +0,0 @@ [ 497s] -==== test_asn1c_enc ==== [ 497s] -Encoded message: 00 00 00 76 00 00 08 00 05 00 02 ab 01 00 0b 00 02 ab cd 00 0a 00 02 00 1e 00 07 00 02 00 59 00 12 40 02 81 01 00 11 40 32 30 40 12 23 45 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 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 03 40 01 02 00 10 40 16 00 13 30 40 12 23 45 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 [ 497s] -==== test_asn1c_dec ==== [ 497s] -Decoding message: 20 00 00 14 00 00 03 00 05 00 02 00 2b 00 0b 00 02 41 70 00 01 00 01 00 [ 497s] -Decoded message successfully [ 497s] -Done [ 497s] ./testsuite.at:7: exit code was 139, expected 0 [ 497s] 1. testsuite.at:4: 1. sbcap (testsuite.at:4): FAILED (testsuite.at:7) [ 497s] make[1]: *** [debian/rules:63: override_dh_auto_test] Error 1 [ 497s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 497s] make: *** [debian/rules:45: build] Error 2 [ 497s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 497s] ### VM INTERACTION START ### [ 498s] [ 474.886885] sysrq: SysRq : Power Off [ 498s] [ 474.888813] reboot: Power down [ 498s] ### VM INTERACTION END ### [ 498s] [ 498s] armbuild01 failed "build osmo-cbc_0.3.0.13.ca43.202207180859.dsc" at Mon Jul 18 09:33:04 UTC 2022. [ 498s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)

3 years

1
0
0 0

Build failure of network:osmocom:nightly/osmo-cbc in openSUSE_Leap_15.1_ARM/armv7l

by OBS Notification

Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/o… Package network:osmocom:nightly/osmo-cbc failed to build in openSUSE_Leap_15.1_ARM/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-cbc Last lines of build log: [ 328s] /usr/include/osmocom/sbcap/SBcAP_TriggeringMessage.h [ 328s] /usr/include/osmocom/sbcap/SBcAP_TypeOfError.h [ 328s] /usr/include/osmocom/sbcap/SBcAP_Unknown-5GS-Tracking-Area-List.h [ 328s] /usr/include/osmocom/sbcap/SBcAP_Unknown-Tracking-Area-List.h [ 328s] /usr/include/osmocom/sbcap/SBcAP_UnsuccessfulOutcome.h [ 328s] /usr/include/osmocom/sbcap/SBcAP_Warning-Area-Coordinates.h [ 328s] /usr/include/osmocom/sbcap/SBcAP_Warning-Area-List-5GS.h [ 328s] /usr/include/osmocom/sbcap/SBcAP_Warning-Area-List.h [ 328s] /usr/include/osmocom/sbcap/SBcAP_Warning-Message-Content.h [ 328s] /usr/include/osmocom/sbcap/SBcAP_Warning-Security-Information.h [ 328s] /usr/include/osmocom/sbcap/SBcAP_Warning-Type.h [ 328s] /usr/include/osmocom/sbcap/SBcAP_Write-Replace-Warning-Indication.h [ 328s] /usr/include/osmocom/sbcap/SBcAP_Write-Replace-Warning-Request.h [ 328s] /usr/include/osmocom/sbcap/SBcAP_Write-Replace-Warning-Response.h [ 328s] /usr/include/osmocom/sbcap/sbcap_common.h [ 328s] /usr/include/osmocom/sbcap/sbcap_internal.h [ 328s] /usr/lib/debug/usr/lib/libosmo-sbcap.so.0.0.0-0.3.0.13.ca43.202207180859-lp151.1.1.arm.debug [ 328s] /usr/lib/libosmo-sbcap.a [ 328s] /usr/lib/libosmo-sbcap.la [ 328s] /usr/lib/libosmo-sbcap.so [ 328s] /usr/lib/libosmo-sbcap.so.0 [ 328s] /usr/lib/libosmo-sbcap.so.0.0.0 [ 328s] ### VM INTERACTION START ### [ 328s] [ 313.212875] sysrq: SysRq : Power Off [ 328s] [ 313.215172] reboot: Power down [ 328s] ### VM INTERACTION END ### [ 328s] [ 328s] obs-arm-6 failed "build osmo-cbc.spec" at Mon Jul 18 09:24:01 UTC 2022. [ 328s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)

3 years

1
0
0 0

Change in osmo-ttcn3-hacks[master]: Support for SBc-AP protocol as used on the MME-CBC interface

by pespin

Attention is currently required from: pespin. Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28603 to look at the new patch set (#6). Change subject: Support for SBc-AP protocol as used on the MME-CBC interface ...................................................................... Support for SBc-AP protocol as used on the MME-CBC interface This requires a recent libfftranscode (>=0.5) with SBC-AP support. The asn files are obtained from 3GPP TS 29.168. Related: osmo-cbc.git Ib278bc1d1a74459814016fef7a8fe21cc29d46c9 Related: docker-playground.git 5f3c78105836d1f2c229655df3f537a73ab6e12a Change-Id: Ia6743e0a3e7974a5f2dd3ecf74ec331f646f6bc2 Related: OS#4945 --- M cbc/CBC_Tests.ttcn M cbc/gen_links.sh M cbc/regen_makefile.sh A library/sbcap/SBC_AP_Adapter.ttcn A library/sbcap/SBC_AP_CodecPort.ttcn A library/sbcap/SBC_AP_CodecPort_CtrlFunct.ttcn A library/sbcap/SBC_AP_CodecPort_CtrlFunctDef.cc A library/sbcap/SBC_AP_CommonDataTypes.asn A library/sbcap/SBC_AP_Constants.asn A library/sbcap/SBC_AP_Containers.asn A library/sbcap/SBC_AP_EncDec.cc A library/sbcap/SBC_AP_IEs.asn A library/sbcap/SBC_AP_PDU_Contents.asn A library/sbcap/SBC_AP_PDU_Descriptions.asn A library/sbcap/SBC_AP_Templates.ttcn A library/sbcap/SBC_AP_Types.ttcn A library/sbcap/regen_makefile.sh 17 files changed, 2,204 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/03/28603/6 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28603 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia6743e0a3e7974a5f2dd3ecf74ec331f646f6bc2 Gerrit-Change-Number: 28603 Gerrit-PatchSet: 6 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

3 years

1
0
0 0

2025

2024

2023

2022

gerrit-log July 2022