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 11: (2 comments) File include/osmocom/cbc/cbc_data.h: https://gerrit.osmocom.org/c/osmo-cbc/+/28602/comment/a085c0a7_d75cf225 PS10, Line 23: CBC_PEER_PROTO_SBcAP > cosmetic: missing comma It's really arguable whether it makes sense to add a comma at the end of the last one. File include/osmocom/cbc/internal.h: https://gerrit.osmocom.org/c/osmo-cbc/+/28602/comment/06ed00a9_2d1bc50c PS10, Line 30: enum sbcap_server_event { > So we have the same set of events as in enum cbsp_server_event. […] No, because it's not (or will not) be exactly the same set, nor exactly the same meaning. -- 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: 11 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 14:12:23 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

3 years

1
0
0 0

Change in osmo-cbc[master]: doc: Document SBc-AP support and config

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28640 ) Change subject: doc: Document SBc-AP support and config ...................................................................... Patch Set 5: Code-Review+1 (2 comments) File doc/manuals/chapters/configuration.adoc: https://gerrit.osmocom.org/c/osmo-cbc/+/28640/comment/dc00bef2_7dec9da5 PS3, Line 117: Port > I'm keeping existing formatting from the CBSP chapter. Ack https://gerrit.osmocom.org/c/osmo-cbc/+/28640/comment/7531b654_1f74a02e PS3, Line 119: configure > configured Done -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28640 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: Ic14ec2766fce251a6fe52a77d7bc0bbcd8d3afbf Gerrit-Change-Number: 28640 Gerrit-PatchSet: 5 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 18 Jul 2022 13:58:07 +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

Change in osmo-cbc[master]: debian: add subpackages libosmo-sbcap0/-dev

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28642 ) Change subject: debian: add subpackages libosmo-sbcap0/-dev ...................................................................... debian: add subpackages libosmo-sbcap0/-dev Related: OS#4945 Change-Id: Ic0e80000b377f80c3914e607e94e998e9862ceac --- M debian/control A debian/libosmo-sbcap-dev.install A debian/libosmo-sbcap0.install 3 files changed, 19 insertions(+), 0 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/debian/control b/debian/control index f971922..7dbaa10 100644 --- a/debian/control +++ b/debian/control @@ -48,3 +48,18 @@ Description: ${misc:Package} PDF documentation Various manuals: user manual, VTY reference manual and/or protocol/interface manuals. + +Package: libosmo-sbcap0 +Section: libs +Architecture: any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} +Depends: ${misc:Depends}, ${shlibs:Depends} +Description: libosmo-sbcap: Osmocom's library to encode/decode SBc-AP messages + +Package: libosmo-sbcap-dev +Section: libdevel +Architecture: any +Multi-Arch: same +Depends: libosmo-sbcap0 (= ${binary:Version}), ${misc:Depends} +Description: libosmo-sbcap: Osmocom's library to encode/decode SBc-AP messages diff --git a/debian/libosmo-sbcap-dev.install b/debian/libosmo-sbcap-dev.install new file mode 100644 index 0000000..a33f2c3 --- /dev/null +++ b/debian/libosmo-sbcap-dev.install @@ -0,0 +1,3 @@ +usr/include/osmocom/sbcap +usr/lib/*/libosmo-sbcap.so +usr/lib/*/libosmo-sbcap.a diff --git a/debian/libosmo-sbcap0.install b/debian/libosmo-sbcap0.install new file mode 100644 index 0000000..0619cfb --- /dev/null +++ b/debian/libosmo-sbcap0.install @@ -0,0 +1 @@ +usr/lib/*/libosmo-sbcap.so.* -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28642 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: Ic0e80000b377f80c3914e607e94e998e9862ceac Gerrit-Change-Number: 28642 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years

1
0
0 0

Change in osmo-cbc[master]: libosmo-sbcap.pc.in: new file

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28643 ) Change subject: libosmo-sbcap.pc.in: new file ...................................................................... libosmo-sbcap.pc.in: new file Related: OS#4945 Change-Id: I9a7cf40e68cc246cab81f8c93485b83f75dcf778 --- M .gitignore M Makefile.am M configure.ac M contrib/osmo-cbc.spec.in M debian/libosmo-sbcap-dev.install A libosmo-sbcap.pc.in 6 files changed, 19 insertions(+), 0 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/.gitignore b/.gitignore index 893b3d2..1872058 100644 --- a/.gitignore +++ b/.gitignore @@ -61,3 +61,4 @@ doc/manuals/vty/cbc_vty_reference.xml contrib/osmo-cbc.spec +libosmo-sbcap.pc diff --git a/Makefile.am b/Makefile.am index 77b1180..f291c8a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,6 +3,11 @@ AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include SUBDIRS = include src doc contrib tests +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = \ + libosmo-sbcap.pc \ + $(NULL) + EXTRA_DIST = .version \ README.md \ git-version-gen \ diff --git a/configure.ac b/configure.ac index c104f2c..2c910e7 100644 --- a/configure.ac +++ b/configure.ac @@ -191,4 +191,5 @@ doc/examples/Makefile doc/manuals/Makefile contrib/systemd/Makefile + libosmo-sbcap.pc Makefile) diff --git a/contrib/osmo-cbc.spec.in b/contrib/osmo-cbc.spec.in index 28081eb..4feada7 100644 --- a/contrib/osmo-cbc.spec.in +++ b/contrib/osmo-cbc.spec.in @@ -119,6 +119,7 @@ %files -n libosmo-sbcap-devel %{_libdir}/libosmo-sbcap.so +%{_libdir}/pkgconfig/libosmo-sbcap.pc %dir %{_includedir}/osmocom %dir %{_includedir}/osmocom/sbcap %{_includedir}/osmocom/sbcap/*.h diff --git a/debian/libosmo-sbcap-dev.install b/debian/libosmo-sbcap-dev.install index a33f2c3..904bdbb 100644 --- a/debian/libosmo-sbcap-dev.install +++ b/debian/libosmo-sbcap-dev.install @@ -1,3 +1,4 @@ usr/include/osmocom/sbcap usr/lib/*/libosmo-sbcap.so usr/lib/*/libosmo-sbcap.a +usr/lib/*/pkgconfig/libosmo-sbcap.pc diff --git a/libosmo-sbcap.pc.in b/libosmo-sbcap.pc.in new file mode 100644 index 0000000..e5ac893 --- /dev/null +++ b/libosmo-sbcap.pc.in @@ -0,0 +1,10 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: Osmocom SBc-AP encoding/decoding library +Description: C Utility Library +Version: @VERSION@ +Libs: -L${libdir} -losmo-sbcap +Cflags: -I${includedir}/ -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28643 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I9a7cf40e68cc246cab81f8c93485b83f75dcf778 Gerrit-Change-Number: 28643 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years

1
0
0 0

Change in osmo-cbc[master]: contrib/osmo-cbc.spec: add libosmo-sbcap0/-dev

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28641 ) Change subject: contrib/osmo-cbc.spec: add libosmo-sbcap0/-dev ...................................................................... contrib/osmo-cbc.spec: add libosmo-sbcap0/-dev Fix for: error: Installed (but unpackaged) file(s) found: ... Related: OS#4945 Change-Id: I789b32c9a9e1fd3f11db8593da3c3ac9a20aeb3d --- M contrib/osmo-cbc.spec.in 1 file changed, 28 insertions(+), 0 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/contrib/osmo-cbc.spec.in b/contrib/osmo-cbc.spec.in index 814f298..28081eb 100644 --- a/contrib/osmo-cbc.spec.in +++ b/contrib/osmo-cbc.spec.in @@ -49,6 +49,24 @@ %description utils CLI utility to interface with the osmo-cbc REST interface (ECBE). +%package -n libosmo-sbcap0 +Summary: Osmocom's library to encode/decode SBc-AP messages +Group: System/Libraries + +%description -n libosmo-sbcap0 +Osmocom's library to encode/decode SBc-AP messages. + +%package -n libosmo-sbcap-devel +Summary: Development files for libosmo-sbcap +Group: Development/Libraries/C and C++ +Requires: libosmo-sbcap0 = %{version} + +%description -n libosmo-sbcap-devel +Osmocom's library to encode/decode SBc-AP messages. + +This subpackage contains libraries and header files for developing +applications that want to make use of libosmo-sbcap. + %prep %setup -q @@ -63,6 +81,7 @@ %install %make_install install -m 755 contrib/cbc-apitool.py %{buildroot}/usr/bin/cbc-apitool.py +find %{buildroot} $ -name '*.la' -o -name '*.a' $ -delete -print %if 0%{?suse_version} %preun @@ -95,4 +114,13 @@ %files utils %{_bindir}/cbc-apitool.py +%files -n libosmo-sbcap0 +%{_libdir}/libosmo-sbcap.so.0* + +%files -n libosmo-sbcap-devel +%{_libdir}/libosmo-sbcap.so +%dir %{_includedir}/osmocom +%dir %{_includedir}/osmocom/sbcap +%{_includedir}/osmocom/sbcap/*.h + %changelog -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28641 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I789b32c9a9e1fd3f11db8593da3c3ac9a20aeb3d Gerrit-Change-Number: 28641 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years

1
0
0 0

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

by fixeria

Attention is currently required from: pespin. fixeria 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 11: (2 comments) File src/cbc_data.c: https://gerrit.osmocom.org/c/osmo-cbc/+/28602/comment/d6ace0fb_fdc4e716 PS10, Line 104: > ws, 'unsigned int i' could be added here (scoped variable) Done File src/smscb_peer_fsm.c: https://gerrit.osmocom.org/c/osmo-cbc/+/28602/comment/6b37295e_cc2d60cf PS10, Line 483: > cosmetic: there should be no space here Done -- 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: 11 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-Comment-Date: Mon, 18 Jul 2022 13:54:31 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> 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. 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 (#11). 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,317 insertions(+), 53 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/02/28602/11 -- 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: 11 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-MessageType: newpatchset

3 years

1
0
0 0

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

by pespin

pespin has submitted this change. ( 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(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve fixeria: Looks good to me, approved 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-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-MessageType: merged

3 years

1
0
0 0

Change in osmo-cbc[master]: doc: Document SBc-AP support and config

by fixeria

Attention is currently required from: osmith, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28640 ) Change subject: doc: Document SBc-AP support and config ...................................................................... Patch Set 4: Code-Review+1 (2 comments) File doc/manuals/chapters/configuration.adoc: https://gerrit.osmocom.org/c/osmo-cbc/+/28640/comment/6c2251a0_d1d3a59e PS3, Line 77: BSC > did you mean MME here? Done https://gerrit.osmocom.org/c/osmo-cbc/+/28640/comment/e2624ec6_ea5d4f6d PS3, Line 138: configured > unrelated fix Done -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28640 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: Ic14ec2766fce251a6fe52a77d7bc0bbcd8d3afbf Gerrit-Change-Number: 28640 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 18 Jul 2022 13:49:01 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

3 years

1
0
0 0

Change in osmo-cbc[master]: doc: user manual: fix typo

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28644 ) Change subject: doc: user manual: fix typo ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28644 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I20e595581f7d6145a01e9c0a6b0eb2af7637bfd9 Gerrit-Change-Number: 28644 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 18 Jul 2022 13:48:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years

1
0
0 0

2025

2024

2023

2022

gerrit-log July 2022