cbc-apitool: Fix port stored in var as a string

Passing "-p 12345" on the cmd line, fixes: """ File "/osmo-cbc/contrib/./cbc-apitool.py", line 20, in build_url return "http://%s:%u%s%s" % (server_host, server_port, BASE_PATH, suffix) TypeError: %u format: a real number is required, not str """ Change-Id: Ief688bb8c2a6cfa410608a6896ce3cb5df4eb48e
Split cbsp/sbcap server socket creation from struct allocation
2025-11-03 21:53:37 +00:00 · 2022-07-22 17:58:33 +02:00 · 2022-07-22 16:13:15 +02:00 · 2022-07-22 15:45:09 +02:00 · 2022-07-22 14:16:10 +02:00 · 2022-07-22 14:16:10 +02:00
439 changed files with 54171 additions and 800 deletions
--- a/.checkpatch.conf
+++ b/.checkpatch.conf
@@ -0,0 +1,2 @@
+--exclude ^src/sbcap/(skel|gen)/.*\.(c|h)$
+--exclude ^src/sbcap/.*\.asn$
--- a/.gitignore
+++ b/.gitignore
@@ -20,6 +20,7 @@ depcomp
 install-sh
 missing
 stamp-h1
+configure~

 # libtool
 ltmain.sh
@@ -58,3 +59,6 @@ doc/manuals/osmobsc-usermanual.xml
 doc/manuals/common
 doc/manuals/build
 doc/manuals/vty/cbc_vty_reference.xml
+
+contrib/osmo-cbc.spec
+libosmo-sbcap.pc
--- a/.gitreview
+++ b/.gitreview
@@ -0,0 +1,4 @@
+[gerrit]
+host=gerrit.osmocom.org
+project=osmo-cbc
+
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,9 +1,20 @@
 AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6

 AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include
-SUBDIRS = src doc contrib tests
+SUBDIRS = include src doc contrib tests

-EXTRA_DIST = .version git-version-gen
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = \
+	libosmo-sbcap.pc \
+	$(NULL)
+
+EXTRA_DIST = .version \
+	README.md \
+	git-version-gen \
+	contrib/osmo-cbc.spec.in \
+	cbc.schema.json \
+	smscb.schema.json \
+	$(NULL)

 AM_DISTCHECK_CONFIGURE_FLAGS = \
 	--with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
--- a/README.md
+++ b/README.md
@@ -0,0 +1,69 @@
+osmo-cbc - Osmocom Cell Broadcast Centre
+========================================
+
+This repository contains a C-language implementation of a minimal
+3GPP Cell Broadcast Centre (CBC). It is part of the
+[Osmocom](https://osmocom.org/) Open Source Mobile Communications
+project.
+
+A Cell Broadcast Centre is the central network element of a cellular network
+for distribution of Cell Broadcast and Emergency messages.
+
+This code implements
+ * the CBSP protocol on the CBC-BSC interface
+ * a custom HTTP/REST based interface for external users to create/delete CBS messages
+
+We plan to add support for the following features in the future:
+ * the SABP protocol on the CBC-RNC (or CBC-HNBGW) interface for UMTS support
+ * the SBcAP protocol on the CBC-MME interface for LTE support
+
+Homepage
+--------
+
+The official homepage of the project is
+https://osmocom.org/projects/osmo-cbc/wiki
+
+GIT Repository
+--------------
+
+You can clone from the official osmo-cbc.git repository using
+
+	git clone https://gitea.osmocom.org/cellular-infrastructure/osmo-cbc
+
+There is a web interface at <https://gitea.osmocom.org/cellular-infrastructure/osmo-cbc>
+
+Documentation
+-------------
+
+User Manuals and VTY reference manuals are [optionally] built in PDF form
+as part of the build process.
+
+Pre-rendered PDF version of the current "master" can be found at
+[User Manual](https://ftp.osmocom.org/docs/latest/osmocbc-usermanual.pdf)
+as well as the [VTY Reference Manual for osmo-cbc](https://ftp.osmocom.org/docs/latest/osmocbc-vty-reference.pdf)
+
+Mailing List
+------------
+
+Discussions related to osmo-cbc are happening on the
+openbsc@lists.osmocom.org mailing list, please see
+https://lists.osmocom.org/mailman/listinfo/openbsc for subscription
+options and the list archive.
+
+Please observe the [Osmocom Mailing List
+Rules](https://osmocom.org/projects/cellular-infrastructure/wiki/Mailing_List_Rules)
+when posting.
+
+Contributing
+------------
+
+Our coding standards are described at
+https://osmocom.org/projects/cellular-infrastructure/wiki/Coding_standards
+
+We us a gerrit based patch submission/review process for managing
+contributions.  Please see
+https://osmocom.org/projects/cellular-infrastructure/wiki/Gerrit for
+more details
+
+The current patch queue for osmo-cbc can be seen at
+https://gerrit.osmocom.org/#/q/project:osmo-cbc+status:open
--- a/cbc.schema.json
+++ b/cbc.schema.json
@@ -42,7 +42,7 @@
 				"num_of_bcast": { "$ref": "#/definitions/number_of_broadcasts" },
 				"scope": { "$ref": "#/definitions/scope" },
 				"warning_period_sec": { "$ref": "#/definitions/warning_period_sec" },
-				"smscb": { "$ref": "smscb.schema.json#definitions/smscb_message" }
+				"smscb_message": { "$ref": "smscb.schema.json#definitions/smscb_message" }
 			},
 			"required": [ "scope", "smscb" }
 		}
--- a/configure.ac
+++ b/configure.ac
@@ -6,9 +6,11 @@ AC_INIT([osmo-cbc],
 dnl *This* is the root dir, even if an install-sh exists in ../ or ../../
 AC_CONFIG_AUX_DIR([.])

-AM_INIT_AUTOMAKE([dist-bzip2])
+AM_INIT_AUTOMAKE([dist-bzip2 subdir-objects])
 AC_CONFIG_TESTDIR(tests)

+CFLAGS="$CFLAGS -std=gnu11"
+
 dnl kernel style compile messages
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])

@@ -29,14 +31,35 @@ if test "x$PKG_CONFIG_INSTALLED" = "xno"; then
 fi
 PKG_PROG_PKG_CONFIG([0.20])

-PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.0.0)
-PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.0.0)
-PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.0.0)
-PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.4.0)
+PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.7.0)
+PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.7.0)
+PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.7.0)
+PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 1.2.0)
 PKG_CHECK_MODULES(ULFIUS, libulfius)
 PKG_CHECK_MODULES(JANSSON, jansson)
 PKG_CHECK_MODULES(ORCANIA, liborcania)

+# Define asn1c skeleton files directory (See "asn1c -S <dir>").
+# Used during "make -C src/ regen" to copy header files from there
+ASN1C_SKELETON_PATH="/usr/share/asn1c"
+ASN1C_BIN_PATH="/usr/bin/asn1c"
+ASN_MODULE_CFLAGS="-DASN_DISABLE_BER_SUPPORT -DASN_DISABLE_XER_SUPPORT -DASN_DISABLE_JER_SUPPORT -DASN_DISABLE_OER_SUPPORT -DASN_DISABLE_UPER_SUPPORT"
+AC_SUBST([ASN1C_SKELETON_PATH])
+AC_SUBST([ASN1C_BIN_PATH])
+AC_SUBST([ASN_MODULE_CFLAGS])
+
+AC_CHECK_HEADERS(netinet/sctp.h,,AC_MSG_ERROR(netinet/sctp.h not found))
+old_LIBS=$LIBS
+AC_SEARCH_LIBS([sctp_recvmsg], [sctp], [
+	AC_DEFINE(HAVE_LIBSCTP, 1, [Define 1 to enable SCTP support])
+	AC_SUBST(HAVE_LIBSCTP, [1])
+	if test -n "$ac_lib"; then
+		AC_SUBST(LIBSCTP_LIBS, [-l$ac_lib])
+	fi
+	], [
+	AC_MSG_ERROR([sctp_recvmsg not found in searched libs])])
+LIBS=$old_LIBS
+
 AC_ARG_ENABLE(sanitize,
 	[AS_HELP_STRING(
 		[--enable-sanitize],
@@ -155,7 +178,7 @@ if test "x$enable_ext_tests" = "xyes" ; then
 	AM_PATH_PYTHON
 	AC_CHECK_PROG(OSMOTESTEXT_CHECK,osmo_verify_transcript_vty.py,yes)
 	 if test "x$OSMOTESTEXT_CHECK" != "xyes" ; then
-		AC_MSG_ERROR([Please install git://osmocom.org/python/osmo-python-tests to run the VTY/CTRL tests.])
+		AC_MSG_ERROR([Please install https://gitea.osmocom.org/cellular-infrastructure/osmo-python-tests to run the VTY/CTRL tests.])
 	fi
 fi
 AC_MSG_CHECKING([whether to enable VTY/CTRL tests])
@@ -167,10 +190,18 @@ AC_MSG_RESULT([CPPFLAGS="$CPPFLAGS"])

 AC_OUTPUT(
    src/Makefile
+    src/sbcap/Makefile
+    include/Makefile
+    include/osmocom/Makefile
+    include/osmocom/cbc/Makefile
+    include/osmocom/sbcap/Makefile
    contrib/Makefile
+    contrib/osmo-cbc.spec
    tests/Makefile
+    tests/sbcap/Makefile
    doc/Makefile
    doc/examples/Makefile
    doc/manuals/Makefile
    contrib/systemd/Makefile
+    libosmo-sbcap.pc
    Makefile)
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -1 +1,4 @@
 SUBDIRS = systemd
+
+EXTRA_DIST = cbc-apitool.py \
+	     $(NULL)
--- a/contrib/cbc-apitool.py
+++ b/contrib/cbc-apitool.py
@@ -0,0 +1,157 @@
+#!/usr/bin/env python3
+#
+# (C) 2020-2021 by Harald Welte <laforge@osmocom.org>
+#
+# SPDX-License-Identifier: MIT
+#
+# This is a simplistic program to show how the REST API of osmo-cbc can be used to
+# create and delete Cell Broadcast Messages
+#
+# A lot of the parameters are currently hard-coded, see the 'js' variable definitions
+# below.
+
+import sys
+import argparse
+import requests
+
+
+def build_url(suffix):
+    BASE_PATH= "/api/ecbe/v1"
+    return "http://%s:%u%s%s" % (server_host, server_port, BASE_PATH, suffix)
+
+
+def rest_post(suffix, js = None):
+    url = build_url(suffix)
+    if verbose:
+        print("POST %s (%s)" % (url, str(js)))
+    resp = requests.post(url, json=js)
+    if verbose:
+        print("-> %s" % (resp))
+    if not resp.ok:
+        print("POST failed")
+    return resp
+
+def rest_delete(suffix, js = None):
+    url = build_url(suffix)
+    if verbose:
+        print("DELETE %s (%s)" % (url, str(js)))
+    resp = requests.delete(url, json=js)
+    if verbose:
+        print("-> %s" % (resp))
+    if not resp.ok:
+        print("DELETE failed " + str(resp))
+    return resp
+
+
+def do_create_cbs(args):
+    js = {
+        'cbe_name': "cbc_apitool",
+        'category': "normal",
+        'repetition_period': args.repetition_period,
+        'num_of_bcast': args.num_of_bcast,
+        'scope': {
+            'scope_plmn': { }
+        },
+        'smscb_message': {
+            'message_id': args.msg_id,
+            'serial_nr': {
+                'serial_nr_decoded': {
+                    'geo_scope': "plmn_wide",
+                    'msg_code': args.msg_code,
+                    'update_nr': args.update_nr
+                }
+            },
+            'payload': {
+                'payload_decoded': {
+                    'character_set': "gsm",
+                    #'language': 'en',
+                    'data_utf8': args.payload_data_utf8,
+                    #'data_utf8': "Mahlzeit1 Mahlzeit2 Mahlzeit3 Mahlzeit4 Mahlzeit5 Mahlzeit6 Mahlzeit7 Mahlzeit8"
+                    #'data_utf8': "Mahlzeit1 Mahlzeit2 Mahlzeit3 Mahlzeit4 Mahlzeit5 Mahlzeit6 Mahlzeit7 Mahlzeit8 Mahlzeit9 Mahlzeit10 Mahlzeti11 Mahlzeit12 Mahlzeit13 Mahlzeit14 Mahlzeit15 Mahlzeit16 Mahlzeit17 Mahlzeit18 Mahlzeit19 Mahlzeit20 Mahlzeit21 Mahlzeit22 Mahlzeit23 Mahlzeit24 Mahlzeit25 Mahlzeit26 Mahlzeit27 Mahlzeit28"
+                }
+            }
+        }
+    }
+    rest_post("/message", js);
+
+def do_create_etws(args):
+    js = {
+        'cbe_name': "cbc_apitool",
+        'category': "normal",
+        'repetition_period': args.repetition_period,
+        'num_of_bcast': args.num_of_bcast,
+        'scope': {
+            'scope_plmn': { }
+        },
+        'smscb_message': {
+            'message_id': args.msg_id,
+            'serial_nr': {
+                'serial_nr_decoded': {
+                    'geo_scope': "plmn_wide",
+                    'msg_code': args.msg_code,
+                    'update_nr': args.update_nr
+                }
+            },
+            'payload': {
+                'payload_etws': {
+                    'warning_type': {
+                        'warning_type_decoded': 'earthquake'
+                    },
+                    'emergency_user_alert': True,
+                    'popup_on_display': True
+                }
+            }
+        }
+    }
+    rest_post("/message", js);
+
+
+def do_delete(args):
+    rest_delete("/message/%u" % (args.msg_id))
+
+def main(argv):
+    global server_port, server_host, verbose
+
+    parser = argparse.ArgumentParser()
+    parser.add_argument("-H", "--host", help="Host to connect to", default="localhost")
+    parser.add_argument("-p", "--port", help="TCP port to connect to", type=int, default=12345)
+    parser.add_argument("-v", "--verbose", help="increase output verbosity", action='count', default=0)
+
+    subparsers = parser.add_subparsers()
+
+    parser_c_cbs = subparsers.add_parser('create-cbs', help='Create a new CBS message')
+    parser_c_cbs.add_argument("--msg-id", type=int, help='Message Identifier', required=True)
+    parser_c_cbs.add_argument("--msg-code", type=int, help='Message Code', default=768)
+    parser_c_cbs.add_argument("--update-nr", type=int, help='Update Number', default=0)
+    parser_c_cbs.add_argument("--repetition-period", type=int, help='Repetition Period', default=5)
+    parser_c_cbs.add_argument("--num-of-bcast", type=int, help='Number of Broadcasts', default=999)
+    parser_c_cbs.add_argument("--payload-data-utf8", type=str, help='Payload Data in UTF8', required=True)
+    parser_c_cbs.set_defaults(func=do_create_cbs)
+
+    parser_c_etws = subparsers.add_parser('create-etws', help='Create a new ETWS message')
+    parser_c_etws.add_argument("--msg-id", type=int, help='Message Identifier', required=True)
+    parser_c_etws.add_argument("--msg-code", type=int, help='Message Code', default=768)
+    parser_c_etws.add_argument("--update-nr", type=int, help='Update Number', default=0)
+    parser_c_etws.add_argument("--repetition-period", type=int, help='Repetition Period', default=5)
+    parser_c_etws.add_argument("--num-of-bcast", type=int, help='Number of Broadcasts', default=999)
+    parser_c_etws.set_defaults(func=do_create_etws)
+
+    parser_delete = subparsers.add_parser('delete', help='Delete a message')
+    parser_delete.add_argument("--msg-id", type=int, help='Message Identifier', required=True)
+    parser_delete.set_defaults(func=do_delete)
+
+    argv = sys.argv
+    if len(sys.argv) == 1:
+        args = parser.parse_args(['-h'])
+    else:
+        args = parser.parse_args()
+
+    server_host = args.host
+    server_port = args.port
+    verbose = args.verbose
+
+    args.func(args)
+
+
+if __name__ == "__main__":
+    main(sys.argv)
--- a/contrib/jenkins.sh
+++ b/contrib/jenkins.sh
@@ -36,7 +36,6 @@ osmo-build-dep.sh libosmo-netif "" --disable-doxygen
 # Additional configure options and depends
 CONFIG=""
 if [ "$WITH_MANUALS" = "1" ]; then
-	osmo-build-dep.sh osmo-gsm-manuals
 	CONFIG="--enable-manuals"
 fi

--- a/contrib/osmo-cbc.spec.in
+++ b/contrib/osmo-cbc.spec.in
@@ -0,0 +1,128 @@
+#
+# spec file for package osmo-cbc
+#
+# Copyright (c) 2021, Harald Welte <laforge@gnumonks.org>
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+## Disable LTO for now since it breaks compilation of the tests
+## https://osmocom.org/issues/4113
+%define _lto_cflags %{nil}
+
+Name:           osmo-cbc
+Version:        @VERSION@
+Release:        0
+Summary:        OsmoCBC: Osmocom's Cell Broadcast Centre for 3GPP mobile networks
+License:        AGPL-3.0-or-later
+Group:          Hardware/Mobile
+URL:            https://osmocom.org/projects/osmo-cbc
+Source:         %{name}-%{version}.tar.xz
+BuildRequires:  automake >= 1.9
+BuildRequires:  libtool >= 2
+BuildRequires:  pkgconfig >= 0.20
+%if 0%{?suse_version}
+BuildRequires:  systemd-rpm-macros
+%endif
+BuildRequires:  pkgconfig(libsctp)
+BuildRequires:  pkgconfig(libosmocore) >= 1.7.0
+BuildRequires:  pkgconfig(libosmogsm) >= 1.7.0
+BuildRequires:  pkgconfig(libosmovty) >= 1.7.0
+BuildRequires:  pkgconfig(libosmo-netif) >= 1.2.0
+BuildRequires:  pkgconfig(talloc)
+BuildRequires:  pkgconfig(libulfius)
+%{?systemd_requires}
+
+%description
+OsmoCBC: Osmocom's Cell Broadcast Centre for 3GPP mobile networks.
+
+%package utils
+Summary:	CLI utility to interface osmo-cbc REST interface
+License:	MIT
+Group:		Productivity/Telephony/Utilities
+
+%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
+
+%build
+echo "%{version}" >.tarball-version
+autoreconf -fi
+%configure \
+  --docdir=%{_docdir}/%{name} \
+  --with-systemdsystemunitdir=%{_unitdir}
+make %{?_smp_mflags}
+
+%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
+%service_del_preun %{name}.service
+
+%postun
+%service_del_postun %{name}.service
+
+%pre
+%service_add_pre %{name}.service
+
+%post
+%service_add_post %{name}.service
+%endif
+
+%check
+make %{?_smp_mflags} check || (find . -name testsuite.log -exec cat {} +)
+
+%files
+%license COPYING
+%doc README.md
+%{_bindir}/osmo-cbc
+%dir %{_docdir}/%{name}/examples
+%dir %{_docdir}/%{name}/examples/osmo-cbc
+%{_docdir}/%{name}/examples/osmo-cbc/osmo-cbc*.cfg
+%dir %{_sysconfdir}/osmocom
+%config(noreplace) %{_sysconfdir}/osmocom/osmo-cbc.cfg
+%{_unitdir}/%{name}.service
+
+%files utils
+%{_bindir}/cbc-apitool.py
+
+%files -n libosmo-sbcap0
+%{_libdir}/libosmo-sbcap.so.0*
+
+%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
+
+%changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,83 @@
-osmo-cbc (0.1) UNRELEASED; urgency=medium
+osmo-cbc (0.3.0) unstable; urgency=medium

+  [ Vadim Yanitskiy ]
+  * doc/examples: make osmo-cbc.cfg file more informative
+  * VTY: cosmetic: use VTY_IPV46_CMD in the command string
+  * VTY: fix incomplete 'remote-ip' command description
+
+  [ Harald Welte ]
+  * CBSP: Set Channel Indication IE in KILL for CBS
+  * CBSP: Append/store results in KILL COMPLETE + KILL FAIL
+  * cbc: Don't crash if peer->remote_host is NULL
+  * update git URLs (git -> https; gitea)
+
+  [ Pau Espin Pedrol ]
+  * vty. Fix several typos and missing param descriptions
+  * src/Makefile: Reformat files one per line
+  * cbsp_server.h: Move function to the proper section
+  * Rework cbsp_cbc_create() params
+  * cbsp_server: Reorder logged message
+  * .gitignore: add configure~
+
+ -- Pau Espin Pedrol <pespin@sysmocom.de>  Wed, 29 Jun 2022 12:00:03 +0200
+
+osmo-cbc (0.2.3) unstable; urgency=medium
+
+  [ Harald Welte ]
+  * varaible for atoi() result shouild be signed integer
+
+ -- Pau Espin Pedrol <pespin@sysmocom.de>  Tue, 16 Nov 2021 18:05:21 +0100
+
+osmo-cbc (0.2.2) unstable; urgency=medium
+
+  * rest_api.c: Add missing \n in log line after error message
+  * bring JSON schema in sync with reality
+  * fix encoding of CBSP cell identifiers
+  * Update dependencies to current libosmocore & co
+
+ -- Harald Welte <laforge@osmocom.org>  Tue, 23 Feb 2021 20:40:44 +0100
+
+osmo-cbc (0.2.1) unstable; urgency=medium
+
+  [ Harald Welte ]
+  * VTY: don't save dynamically-allocated "unknown" peers
+  * cbc-apitool: compatibility with python < 3.7
+
+  [ Oliver Smith ]
+  * configure.ac: set -std=gnu11
+
+ -- Harald Welte <laforge@osmocom.org>  Tue, 16 Feb 2021 22:39:23 +0100
+
+osmo-cbc (0.2.0) unstable; urgency=medium
+
+  [ Harald Welte ]
  * Initial release.
+  * add link to upstream bug related to custom malloc/free
+  * Add simplistic cbc-apitool.py as example on how to use the REST API
+  * Add RPM spec file
+  * Add README.md file
+  * debian/osmo-cbc.install: Fix typo (extra apostrophe at EOL)
+  * charset: Fix padding of USSD messages in 7bit GSM alphabet
+  * spec file: Add missing libulfius dependency
+  * cbc-apitool.py: Generalize, make parameters configurable
+  * osmo-cbc.spec: Don't depend on libosmo-mgcp-client
+  * osmo-cbc.spec: No AUTHORS file; correct name of README.md
+  * manual: Chapters on configuration + vty introspection
+  * vty: Allow IPv6 address for peer remote-ip
+  * Make CBSP local bind IP+port VTY-configurable
+  * Make ECBE (REST interface) local bind IP + port VTY-configurable
+  * terminate if CBSP or ECBE ports cannot be bound
+  * cbc-apitool: Fix parsing if no argument is goven
+  * Makefile.am: cosmetic changes
+  * Makefile.am: add *.json to EXTRA_DIST
+  * manual: Document ECBE; include JSON schema; cross-references
+  * manual: Add dotty graph on position of CBC in network
+  * manual: Document cbc-apitool.py
+  * debian: Package cbc-apitool.py as a sub-package
+  * contrib/osmo-cbc.spec: Add sub-package osmo-cbc-utils
+  * osmo-cbc.spec: License is AGPLv3-or-later + MIT

- -- Harald Welte <lafore@gnumonks.org>  Wed, 06 Jan 2021 12:13:12 +0100
+  [ Oliver Smith ]
+  * contrib/jenkins: don't build osmo-gsm-manuals
+
+ -- Harald Welte <laforge@osmocom.org>  Sun, 24 Jan 2021 16:15:49 +0100
--- a/debian/control
+++ b/debian/control
@@ -11,14 +11,15 @@ Build-Depends: debhelper (>=9),
               pkg-config,
               python3-minimal,
               libtalloc-dev,
-               libosmocore-dev,
-               libosmo-netif-dev,
+               libosmocore-dev (>= 1.7.0),
+               libosmo-netif-dev (>= 1.2.0),
               libulfius-dev,
               libjansson-dev,
+               libsctp-dev,
               osmo-gsm-manuals-dev
 Standards-Version: 3.9.8
-Vcs-Git: git://git.osmocom.org/osmo-cbc.git
-Vcs-Browser: https://git.osmocom.org/osmo-cbc/
+Vcs-Git: https://gitea.osmocom.org/cellular-infrastructure/osmo-cbc
+Vcs-Browser: https://gitea.osmocom.org/cellular-infrastructure/osmo-cbc
 Homepage: https://projects.osmocom.org/projects/osmo-cbc

 Package: osmo-cbc
@@ -27,6 +28,12 @@ Multi-Arch: foreign
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: OsmoCBC: Osmocom's Cell Broadcast Center

+Package: osmo-cbc-utils
+Architecture: any
+Multi-Arch: foreign
+Depends: ${misc:Depends}, ${shlibs:Depends}, python3
+Description: Utilities for OsmoCBC: Osmocom's Cell Broadcast Center
+
 Package: osmo-cbc-dbg
 Section: debug
 Architecture: any
@@ -42,3 +49,18 @@ Depends: ${misc:Depends}
 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
--- a/debian/libosmo-sbcap-dev.install
+++ b/debian/libosmo-sbcap-dev.install
@@ -0,0 +1,4 @@
+usr/include/osmocom/sbcap
+usr/lib/*/libosmo-sbcap.so
+usr/lib/*/libosmo-sbcap.a
+usr/lib/*/pkgconfig/libosmo-sbcap.pc
--- a/debian/libosmo-sbcap0.install
+++ b/debian/libosmo-sbcap0.install
@@ -0,0 +1 @@
+usr/lib/*/libosmo-sbcap.so.*
--- a/debian/osmo-cbc-utils.install
+++ b/debian/osmo-cbc-utils.install
@@ -0,0 +1 @@
+usr/bin/cbc-apitool.py
--- a/debian/osmo-cbc.install
+++ b/debian/osmo-cbc.install
@@ -1,4 +1,4 @@
 /etc/osmocom/osmo-cbc.cfg
 lib/systemd/system/osmo-cbc.service
 usr/bin/osmo-cbc
-usr/share/doc/osmo-cbc/examples/osmo-cbc/*.cfg usr/share/doc/osmo-bsc/examples`
+usr/share/doc/osmo-cbc/examples/osmo-cbc/*.cfg usr/share/doc/osmo-bsc/examples
--- a/debian/rules
+++ b/debian/rules
@@ -50,8 +50,9 @@ override_dh_auto_configure:
 	dh_auto_configure -- $(CONFIGURE_FLAGS)
 #
 # Do not install libtool archive, python .pyc .pyo
-#override_dh_install:
-#	dh_install --list-missing -X.la -X.pyc -X.pyo
+override_dh_install:
+	install -m 755 contrib/cbc-apitool.py debian/tmp/usr/bin/cbc-apitool.py
+	dh_install

 # See https://www.debian.org/doc/manuals/developers-reference/best-pkging-practices.html#bpp-dbg
 override_dh_strip:
--- a/doc/examples/osmo-cbc/osmo-cbc.cfg
+++ b/doc/examples/osmo-cbc/osmo-cbc.cfg
@@ -1,3 +1,24 @@
-
 log stderr
- logging level cbsp debug
+ logging level main notice
+ logging level rest notice
+ logging level cbsp notice
+ logging level sbcap notice
+cbc
+ unknown-peers reject
+ ecbe
+  local-ip 127.0.0.1
+  local-port 12345
+ cbsp
+  local-ip 127.0.0.1
+  local-port 48049
+ sbcap
+  local-ip 127.0.0.1
+  local-ip ::1
+  local-port 29168
+ peer cbsp example-bsc
+  remote-ip 127.0.0.2
+  remote-port 48049
+ peer sbcap example-mme
+  remote-ip 127.0.0.2
+  remote-ip ::2
+  remote-port 29168
--- a/doc/manuals/Makefile.am
+++ b/doc/manuals/Makefile.am
@@ -3,6 +3,7 @@ EXTRA_DIST = osmocbc-usermanual.adoc \
    osmocbc-vty-reference.xml \
    regen_doc.sh \
    chapters \
+    images \
    vty

 if BUILD_MANUALS
--- a/doc/manuals/chapters/cbc-apitool.adoc
+++ b/doc/manuals/chapters/cbc-apitool.adoc
@@ -0,0 +1,79 @@
+[[apitool]]
+== `cbc-apitool.py`
+
+`cbc-apitool.py` is a very simple/basic python3 script that can be used
+to demonstrate the use of the ECBE REST interface (<<ecbe>>) from the
+command line.
+
+It uses the python3 standard librariy `requests` in order to issue ECBE
+API request over HTTP towards osmo-cbc.
+
+`cbc-apitool.py` has a couple of sub-commands, each of which offer
+
+=== Common options
+
+*-h, --help*::
+        Print a short help message about the supported common options.
+*-H, --host HOST*::
+        Remote host name/IP to which to connect (typically your ECBE
+        bind address of osmo-cbc). Default: 127.0.0.1.
+*-p, --port PORT*::
+        Remote TCP port number to which to connect (typically your ECBE
+        bind address of osmo-cbc). Default: 12345
+*-v, --verbose*::
+        Print some more verbose information like the HTTP requests
+        and responses during execution.
+
+
+=== `create-cbs`: Creating a new CBS message
+
+You can create a new CBS message using `cbc-apitool create-cbs`.
+
+==== `create-cbs` Options
+
+*-h, --help*::
+        Print a short help message about the supported create-cbs options.
+*--msg-id MSG_ID*::
+        Specify the message ID of the to-be-created CBS
+        message. Range: 0..65535
+*--msg-code MSG_CODE*::
+        Specify the message code (part of the serial number). Range:
+        0..1023. Default: 768
+*--update-nr UPDATE_NR*::
+        Specify the update number (part of the serial number). Range:
+        0..15.  Default: 0
+*--repetition-period REPETITION_PERIOD*::
+        How frequently this message shall be repeated (in number of CBCH
+        slots).  Default: 5
+*--num-of-bcast NUM_OF_BCAST*::
+        Number of times this message shall be broadcast (Default: 999).
+*--payload-data-utf8 PAYLOAD_DATA_UTF8*::
+        Payload data (typically text message) in UTF8 encoding.  Will be
+        transcoded to 7bit GSM alphabet internally.
+
+
+==== `create-etws` Options
+
+*-h, --help*::
+        Print a short help message about the supported create-cbs options.
+*--msg-id MSG_ID*::
+        Specify the message ID of the to-be-created CBS
+        message. Range: 0..65535
+*--msg-code MSG_CODE*::
+        Specify the message code (part of the serial number). Range:
+        0..1023. Default: 768
+*--update-nr UPDATE_NR*::
+        Specify the update number (part of the serial number). Range:
+        0..15.  Default: 0
+*--repetition-period REPETITION_PERIOD*::
+        How frequently this message shall be repeated (in number of CBCH
+        slots).  Default: 5
+*--num-of-bcast NUM_OF_BCAST*::
+        Number of times this message shall be broadcast (Default: 999).
+
+
+==== `delete` Options
+
+*--msg-id MSG_ID*::
+        Specify the message ID of the to-be-created CBS
+        message. Range: 0..65535
--- a/doc/manuals/chapters/configuration.adoc
+++ b/doc/manuals/chapters/configuration.adoc
@@ -0,0 +1,148 @@
+[[configuration]]
+== Configuration
+
+=== CBSP Peer Configuration
+
+CBSP is the BSC-CBC interface within the 3GPP architecture.  It serves
+to communicate CSB and ETWS messages from the CBC to the BSC, who then
+subsequently distributes it among the (matching) cells within the BSC
+coverage area.
+
+[[config-cbsp]]
+==== Configuring the CBSP connections
+
+According to 3GPP TS 48.049, a BSC typically operates as a TCP server,
+and the CBC connects as TCP client.  This would require the CBC to have
+out-of-band knowledge of all the BSCs in the network (and their IP
+addresses).
+
+In order to comply with the specifications, OsmoCBC supports this mode
+of operation as CBSP TCP client.  However, to make network operation and
+configuration more simple, it also can operate in TCP server mode,
+accepting incoming connections from the BSCs.  This way the BSCs need to
+know the CBC IP address, but not vice-versa.
+
+The CBC related configuration of OsmoBSC can be found in the `cbc` configuration
+node of the VTY interface.
+
+The default port number for the CBSP server is 48049, according to the CBSP
+specification.
+
+.Example: Configure TCP server mode and allow arbitrary BSCs to connect
+----
+cbc
+ unknown-peers accept
+----
+
+
+.Example: Configure TCP client mode and define each BSC
+----
+cbc
+ peer my-bsc-1
+  protocol cbsp
+  remote-port 46133
+  remote-ip 1.2.3.4
+ peer my-bsc-2
+  remote-port 46134
+  remote-ip 1.2.3.5
+----
+
+For more details on the available configuration commands, please check the OsmoCBC VTY Reference.
+
+==== Configuring the IP/Port for CBSP to bind to
+
+It can be configured to which IP and TCP port the CBSP protocol binds to.
+
+The default is to bind to the 3GPP standard port number 48049 for CBSP at the
+loopback IP address 127.0.0.1.
+
+.Example: Configure CBSP to bind to 127.0.0.1:48049
+----
+cbc
+ cbsp
+  local-ip 127.0.0.1
+  local-port 48049
+----
+
+
+=== SBc-AP Peer Configuration
+
+SBc-AP is the MME-CBC interface within the 3GPP architecture.  It serves
+to communicate CSB and ETWS messages from the CBC to the MME, who then
+subsequently distributes it among the (matching) cells (eNodeBs) within the MME.
+
+[[config-sbcap]]
+==== Configuring the SBc-AP connections
+
+An MME typically operates as an SCTP server, and the CBC connects as SCTP
+client.  This would require the CBC to have out-of-band knowledge of all the
+MMEs in the network (and their IP addresses).
+
+In order to comply with the specifications, OsmoCBC supports this mode
+of operation as SBc-AP SCTP client.  However, to make network operation and
+configuration more simple, it also can operate in SCTP server mode,
+accepting incoming connections from the MMEs.  This way the MMEs need to
+know the CBC IP address, but not vice-versa.
+
+The default port number for the SBc-AP server is 29168, according to the SBc-AP
+specification. It uses SCTP payload protocol identifier 24.
+
+In order to make use of SCTP muti-homing capabilitites, simply configure several
+IP addresses when configuring SBc-AP.
+
+.Example: Configure SCTP server mode and allow arbitrary MMEs to connect
+----
+cbc
+ unknown-peers accept
+----
+
+
+.Example: Configure SCTP client mode and define each BSC
+----
+cbc
+ peer my-mme-1
+  protocol sbcap
+  remote-port 334455
+  remote-ip 1.2.3.4
+  remote-ip 1.2.3.5
+ peer my-mme-2
+  protocol sbcap
+  remote-port 334456
+  remote-ip 1.2.3.10
+----
+
+For more details on the available configuration commands, please check the OsmoCBC VTY Reference.
+
+==== Configuring the IP/Port for SBc-AP to bind to
+
+It can be configured to which IP and SCTP port the SBc-AP protocol binds to.
+
+The default is to bind to the 3GPP standard port number 29168 for SBc-AP at the
+loopback IP address 127.0.0.1 and ::1.
+
+.Example: Configure SBc-AP to bind to (127.0.0.1,::1):48049
+----
+cbc
+ sbcap
+  local-ip 127.0.0.1
+  local-ip ::1
+  local-port 48049
+----
+
+[[config-ecbe]]
+=== ECBE (REST Interface) Configuration
+
+==== Configuring the IP/Port for ECBE to bind to
+
+It can be configure to which IP and TCP port the ECBE REST Interface binds to.
+
+The default is to bind to is the non-standard port number 12349 at the
+loopback IP address 127.0.0.1.
+
+.Example: Configure ECBE REST interface to bind to 127.0.0.1:8080
+----
+cbc
+ ecbe
+  local-ip 127.0.0.1
+  local-port 8080
+----
--- a/doc/manuals/chapters/ecbe-rest-interface.adoc
+++ b/doc/manuals/chapters/ecbe-rest-interface.adoc
@@ -0,0 +1,49 @@
+[[ecbe]]
+== ECBE REST interface
+
+The ECBE (External Cell Broadcast Entity) REST interface is specified in
+the JSON schema files `cbc.schema.json` and `smscb.schema.json`, which
+are part of the OsmoCBC distribution.
+
+The REST interface binds to the IP and TCP port as configured and
+can be reached at `http://IP:PORT/api/ecbe/v1`
+
+NOTE:: It is your responsibility to properly secure access to the REST
+interface endpoint to ensure only legitimate users can access it.  This
+may be achieved via packet filtering and a reverse HTTP proxy.
+
+=== API endpoints
+
+==== `POST /api/ecbe/v1/message`
+
+This command is used to create a new SMSCB or ETWS message inside the CBC.
+The `cbc_messsage` type as specified in the JSON schema (<<ecbe-json>>).
+
+==== `DELETE /api/ecbe/v1/message/:message_id`
+
+This command is used to delete an existing SMSCB or ETWS message from the CBC.
+
+The `:message_id` parameter is the decimal integer representation of the
+cbc_message.smscb.message_id that was specified when creating the
+message via the POST command stated above.
+
+[[ecbe-json]]
+=== JSON Schema
+
+==== `cbc.schema.json`
+
+This is the main JSOM schema for osmo-cbc.  In many places, it
+references `smscb.schema.json` described further below.
+
+----
+include::{srcdir}/../../cbc.schema.json[]
+----
+
+==== `smscb.schema.json`
+
+This JSON schema describes a lot of the basic data types relevant for
+SMSCB. It is used heavily by `cbc.schema.json` described above.
+
+----
+include::{srcdir}/../../smscb.schema.json[]
+----
--- a/doc/manuals/chapters/introspection.adoc
+++ b/doc/manuals/chapters/introspection.adoc
@@ -0,0 +1,91 @@
+== Introspection using the VTY
+
+OsmoCBC offers a VTY interface on TCP port 4264. Like all Osmocom VTY interfaces,
+it is normally bound only to the loopback address 127.0.0.1.  You can change this
+via the configuration.
+
+The actual IP/Port is printed to the log at startup time:
+
+----
+20210124110559489 DLGLOBAL NOTICE Available via telnet 127.0.0.1 4264 (telnet_interface.c:104)
+----
+
+=== Peer State
+
+Using the `show peers` command, you can check on the state of all configured and/or connected
+peers:
+
+.Example: Showing a list of all peers
+----
+OsmoCBC> show peers
+|Name                | IP             | Port | Proto | State               |
+|--------------------|----------------|------|-------|---------------------|
+|ttcn3               | 127.0.0.1      | 9999 | CBSP  | <disconnected>      |
+|local-bsc           | 127.0.0.1      | 46133| CBSP  | IDLE                |
+----
+
+=== CBS Messages
+
+Using `show messages cbs`, a list of all current CBS messages can be obtained.
+
+.Example: Showing a list of all CBS messages
+----
+OsmoCBC> show messages cbs
+|MsgId|SerNo|      CBE Name      |  Category   |Period|E|DCS|
+|-----|-----|--------------------|-------------|------|-|---|
+| 04D2| 7000|cbc_apitool         |Normal       |  5   |N| 0f|
+----
+
+Using `show message 1234`, details about a specific CBS message can be obtained:
+
+.Example: Showing details about a single CBS message
+----
+OsmoCBC> show message id 1234
+Message ID 04D2, Serial Number 7000, State: ACTIVE
+ Created by CBE 'cbc_apitool' at Sun Jan 24 11:10:31 2021
+ Repetition Period: 5 ( 9.41s), Number of broadcasts: 999
+ Warning Period: 4294967295s
+ DCS: 0x0f, Number of pages: 1, User Data Bytes: 7
+ Page 0: cd309aad2fa7e98d46a3d168341a8d46a3d168341a8d46a3d168341a8d46a3d168341a8d46a3d168341a8d46a3d168341a8d46a3d168341a8d46a3d168341a8d46a3d168341a8d46a3d168341a8d46a3d168
+ Peer: 'ttcn3', State: ACTIVE
+  Cells Installed:
+  Cells Failed:
+  Number of Broadcasts Completed:
+ Peer: 'local-bsc', State: ACTIVE
+  Cells Installed:
+   CGI 901-70-1-1234
+  Cells Failed:
+  Number of Broadcasts Completed:
+----
+
+
+=== ETWS Messages
+
+Using `show messages etws` a list of all current ETWS messages can be obtained.
+
+.Example: Showing a list of all ETWS messages
+----
+OsmoCBC> show messages etws 
+|MsgId|SerNo|      CBE Name      |  Category   |Period|E|Warning Type|
+|-----|-----|--------------------|-------------|------|-|------------|
+| 03E8| 7000|cbc_apitool         |Normal       |  5   |N|        0000|
+----
+
+.Example: Showing details of one single ETWS message
+----
+OsmoCBC> show message id 1000
+Message ID 03E8, Serial Number 7000, State: ACTIVE
+ Created by CBE 'cbc_apitool' at Sun Jan 24 11:14:42 2021
+ Repetition Period: 5 ( 9.41s), Number of broadcasts: 999
+ ETWS Warning Type Value: 0x00, User Alert: On, Popup: On
+ Security: 0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+ Peer: 'ttcn3', State: ACTIVE
+  Cells Installed:
+  Cells Failed:
+  Number of Broadcasts Completed:
+ Peer: 'local-bsc', State: ACTIVE
+  Cells Installed:
+   CGI 901-70-1-1234
+  Cells Failed:
+  Number of Broadcasts Completed:
+----
--- a/doc/manuals/chapters/overview.adoc
+++ b/doc/manuals/chapters/overview.adoc
@@ -10,6 +10,12 @@ It acts as a gateway between external applications / users, such as government
 authorities for civil protection, and the various components within the 3GPP
 network to actually deliver those broadcast and/or emergency messages.

+.Role of the CBC inside the 3GPP network architecture (3GPP TS 23.041 §3)
+[graphviz]
+----
+include::../images/cbc-in-network.dot[]
+----
+
 [[about]]
 === About OsmoCBC

@@ -17,6 +23,7 @@ OsmoCBC is the Osmocom implementation of a Cellular Broadcast Centre (CBC). It
 implements:

 - the BSC-CBC interface using the CBSP protocol
+- The MME-CBC interface using the SBc-AP protocol
 - a HTTP/JSON/RESTful interface for external applications
 - a telnet-based command line interface for configuration and introspection called VTY

@@ -24,12 +31,10 @@ OsmoCBC provides mainly the following functionality:

 - establishing communication with the various Radio Access Network elements such as BSCs within the network
 - receiving requests to start or remove CBS and ETWS messages from external applications
- distributing the CBS and/or ETWS messages
-has connection with the various RANs of the 3GPP cellular network
+- distributing the CBS and/or ETWS messages to the various RANs of the 3GPP cellular network

-Future versions of OsmoCBC are expected to contain the RNC-CBC interface
-with the SABP protocol, as well as the MME-CBC interface using the SBcAP
-protocol.  Should you be interested in contributing to this effort,
+Future versions of OsmoCBC are expected to contain the RNC-CBC interface with
+the SABP protocol.  Should you be interested in contributing to this effort,
 please contact the author of this document.

 === CBSP implementation
@@ -49,29 +54,30 @@ that all BSCs need to know the IP address of the CBC.  In this situation,
 the CBC doesn't need to know each and every BSC in the network.  It
 simply only accepts incoming CBSP connections.

+For more information, see <<config-cbsp>> on how CBSP is configured.

-=== REST interface
+=== SBc-AP implementation

-The REST interface is specified in the JSON schema files
-`cbc.schema.json` and `smscb.schema.json`, which are part of the OsmoCBC
-distribution.
+SBc-AP (SBc Application Part) is the  interface between the Mobility Management
+Entity (MME) and the Cell Broadcast Centre (CBC) in 4G networks. It is also the
+interface between the Public Warning System – Inter Working Function (PWS-IWF)
+and the CBC in 5G networks. It is specified in 3GPP TS 29.168.

-The REST interface currently binds to TCP port 12345 (on INADRR_ANY) and
-can be reached at http://localhost:1234/api/ecbe/v1"
+Similarly to what's done with CBSP, OsmoCBC also supports operating SBc-AP as an
+SCTP client or an SCTP server. In the first case, OsmoCBC must be passed a list
+of MMEs to connect to, while in the second one it will only accept incoming SCTP
+connections.

-NOTE:: It is your responsibility to properly secure access to the REST
-interface endpoint to ensure only legitimate users can access it.  This
-may be achieved via packet filtering and a reverse HTTP proxy.
+For more information, see <<config-sbcap>> on how SBc-AP is configured.

-==== POST /api/ecbe/v1/message
+=== ECBE REST interface

-This command is used to create a new SMSCB or ETWS message inside the CBC.
-The `cbc_messsage` type as specified in the JSON schema.
+3GPP does not specify the external interface by which competent
+authorities can submit SMSCB and/or ETWS messages to a CBC.

-==== DELETE /api/ecbe/v1/message/:message_id
+Hence, a non-standard, Osmocom specific  HTTP/REST/JSON based interface
+is offered for external entities to create and delete SMSCB and ETWS
+messages within the CBC.  This interface is called ECBE.

-This command is used to delete an existing SMSCB or ETWS message from the CBC.
-
-The `:message_id` parameter is the decimal integer representation of the
-cbc_message.smscb.message_id that was specified when creating the
-message via the POST command stated above.
+For more information, see <<ecbe>> on the ECBE API definition and <<config-ecbe>>
+on how it is configured.
--- a/doc/manuals/images/cbc-in-network.dot
+++ b/doc/manuals/images/cbc-in-network.dot
@@ -0,0 +1,21 @@
+digraph G {
+  rankdir = RL;
+  CBC [color=red];
+  CBE -> CBC [label="REST/JSON"];
+  CBC -> BSC [label="CBSP"];
+  CBC -> RNC [label="SABP"];
+  CBC -> MME [label="SBc-AP"];
+  CBC -> PWSIWF [label="SBc-AP"];
+
+  PWSIWF -> AMF [label="N50"];
+
+  BSC -> BTS [label="A-bis RSL"];
+  RNC -> NodeB [label="Iub"];
+  MME -> eNodeB [label="S1-AP"];
+  AMF -> gNodeB [label="N2"];
+
+  BTS -> UE [label="CBCH"];
+  NodeB -> UE [label="BMC/CTCH"];
+  eNodeB -> UE [label="SIB10/11/12"];
+  gNodeB -> UE [label="Uu"];
+}
--- a/doc/manuals/osmocbc-usermanual.adoc
+++ b/doc/manuals/osmocbc-usermanual.adoc
@@ -12,6 +12,14 @@ include::{srcdir}/chapters/overview.adoc[]

 include::{srcdir}/chapters/running.adoc[]

+include::{srcdir}/chapters/configuration.adoc[]
+
+include::{srcdir}/chapters/introspection.adoc[]
+
+include::{srcdir}/chapters/ecbe-rest-interface.adoc[]
+
+include::{srcdir}/chapters/cbc-apitool.adoc[]
+
 include::./common/chapters/counters-overview.adoc[]

 include::{srcdir}/chapters/counters.adoc[]
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = osmocom
--- a/include/osmocom/Makefile.am
+++ b/include/osmocom/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = cbc sbcap
--- a/include/osmocom/cbc/Makefile.am
+++ b/include/osmocom/cbc/Makefile.am
@@ -0,0 +1,15 @@
+noinst_HEADERS = \
+	cbc_data.h \
+	cbc_peer.h \
+	cbc_message.h \
+	cbc_vty.h \
+	cbsp_link.h \
+	cbsp_link_fsm.h \
+	charset.h \
+	debug.h \
+	sbcap_msg.h \
+	sbcap_link.h \
+	sbcap_link_fsm.h \
+	rest_it_op.h \
+	smscb_message_fsm.h \
+	$(NULL)
--- a/include/osmocom/cbc/cbc_data.h
+++ b/include/osmocom/cbc/cbc_data.h
@@ -0,0 +1,87 @@
+#pragma once
+#include <stdint.h>
+#include <stdbool.h>
+#include <osmocom/core/linuxlist.h>
+#include <osmocom/core/it_q.h>
+#include <osmocom/gsm/protocol/gsm_48_049.h>
+#include <osmocom/gsm/gsm23003.h>
+
+#define CBC_MAX_LOC_ADDRS 8
+
+enum cbc_cell_id_type {
+	CBC_CELL_ID_NONE,
+	CBC_CELL_ID_BSS,
+	CBC_CELL_ID_CGI,
+	CBC_CELL_ID_LAC_CI,
+	CBC_CELL_ID_LAI,
+	CBC_CELL_ID_LAC,
+	CBC_CELL_ID_CI,
+};
+
+struct cbc_cell_id {
+	struct llist_head list;
+	enum cbc_cell_id_type id_discr;
+	union {
+		struct osmo_cell_global_id cgi;
+		struct osmo_lac_and_ci_id lac_and_ci;
+		struct osmo_location_area_id lai;
+		uint16_t lac;
+		uint16_t ci;
+	} u;
+	/* only in failure list */
+	struct {
+		int cause;
+	} fail;
+	/* only in num_compl list */
+	struct {
+		uint32_t num_compl;
+		uint32_t num_bcast_info;
+	} num_compl;
+};
+
+/*********************************************************************************
+ * CBC itself
+ *********************************************************************************/
+struct cbc_cbsp_mgr;
+struct cbc_sbcap_mgr;
+
+struct cbc {
+	struct {
+		bool permit_unknown_peers;
+		struct {
+			char *local_host;
+			int local_port;
+		} cbsp;
+		struct {
+			char *local_host[CBC_MAX_LOC_ADDRS];
+			unsigned int num_local_host;
+			int local_port;
+		} sbcap;
+		struct {
+			char *local_host;
+			int local_port;
+		} ecbe;
+	} config;
+
+	struct {
+		struct cbc_cbsp_mgr *mgr;
+	} cbsp;
+	struct {
+		struct cbc_sbcap_mgr *mgr;
+	} sbcap;
+
+	struct llist_head messages;	/* cbc_message.list */
+	struct llist_head expired_messages;	/* cbc_message.list */
+	struct llist_head peers;	/* cbc_peer.list */
+	struct {
+		struct osmo_it_q *rest2main;
+	} it_q;
+};
+
+extern struct cbc *g_cbc;
+struct cbc *cbc_alloc(void *ctx);
+int cbc_start(struct cbc *cbc);
+
+/* rest_api.c */
+int rest_api_init(void *ctx, const char *bind_addr, uint16_t port);
+void rest_api_fin(void);
--- a/include/osmocom/cbc/cbc_message.h
+++ b/include/osmocom/cbc/cbc_message.h
@@ -7,66 +7,6 @@
 #include <osmocom/gsm/protocol/gsm_48_049.h>
 #include <osmocom/gsm/gsm23003.h>

-struct osmo_cbsp_cbc_client;
-struct osmo_sabp_cbc_client;
-struct rest_it_op;
-
-/*********************************************************************************
- * CBC Peer
- *********************************************************************************/
-
-enum cbc_peer_protocol {
-	CBC_PEER_PROTO_CBSP,
-	CBC_PEER_PROTO_SABP,
-};
-
-struct cbc_peer {
-	struct llist_head list;		/* linked to cbc.peers */
-	const char *name;
-
-	char *remote_host;	/* remote IP address in string format */
-	int remote_port;		/* remote port number or -1 for random */
-
-	enum cbc_peer_protocol proto;
-	union {
-		struct osmo_cbsp_cbc_client *cbsp;
-		struct osmo_sabp_cbc_client *sabp;
-	} client;
-};
-
-extern const struct value_string cbc_peer_proto_name[];
-
-enum cbc_cell_id_type {
-	CBC_CELL_ID_NONE,
-	CBC_CELL_ID_BSS,
-	CBC_CELL_ID_CGI,
-	CBC_CELL_ID_LAC_CI,
-	CBC_CELL_ID_LAI,
-	CBC_CELL_ID_LAC,
-	CBC_CELL_ID_CI,
-};
-
-struct cbc_cell_id {
-	struct llist_head list;
-	enum cbc_cell_id_type id_discr;
-	union {
-		struct osmo_cell_global_id cgi;
-		struct osmo_lac_and_ci_id lac_and_ci;
-		struct osmo_location_area_id lai;
-		uint16_t lac;
-		uint16_t ci;
-	} u;
-	/* only in failure list */
-	struct {
-		int cause;
-	} fail;
-	/* only in num_compl list */
-	struct {
-		uint32_t num_compl;
-		uint32_t num_bcast_info;
-	} num_compl;
-};
-

 /*********************************************************************************
 * CBC Message
@@ -158,34 +98,13 @@ struct cbc_message {
 	} time;
 };

-/*********************************************************************************
- * CBC itself
- *********************************************************************************/
-
-struct cbc {
-	struct {
-		bool permit_unknown_peers;
-	} config;
-
-	struct llist_head messages;	/* cbc_message.list */
-	struct llist_head expired_messages;	/* cbc_message.list */
-	struct llist_head peers;	/* cbc_peer.list */
-	struct {
-		struct osmo_it_q *rest2main;
-	} it_q;
-};
-
-extern struct cbc *g_cbc;
-
-
+struct cbc_message *cbc_message_alloc(void *ctx, const struct cbc_message *cbcmsg);
+int cbc_message_new(const struct cbc_message *cbcmsg, struct rest_it_op *op);
+void cbc_message_delete(struct cbc_message *cbcmsg, struct rest_it_op *op);
+struct cbc_message *cbc_message_by_id(uint16_t message_id);
+int peer_new_cbc_message(struct cbc_peer *peer, struct cbc_message *cbcmsg);

 int cbc_message_del_peer(struct cbc_message *cbcmsg, struct cbc_peer *peer);
 int cbc_message_add_peer(struct cbc_message *cbcmsg, struct cbc_peer *peer);
 struct cbc_message_peer *smscb_peer_fsm_alloc(struct cbc_peer *peer, struct cbc_message *cbcmsg);
 struct cbc_message_peer *cbc_message_peer_get(struct cbc_message *cbcmsg, struct cbc_peer *peer);
-struct cbc_peer *cbc_peer_by_name(const char *name);
-struct cbc_peer *cbc_peer_by_addr_proto(const char *remote_host, uint16_t remote_port,
-					enum cbc_peer_protocol proto);
-struct cbc_peer *cbc_peer_create(const char *name, enum cbc_peer_protocol proto);
-void cbc_peer_remove(struct cbc_peer *peer);
-
--- a/include/osmocom/cbc/cbc_peer.h
+++ b/include/osmocom/cbc/cbc_peer.h
@@ -0,0 +1,46 @@
+#pragma once
+#include <stdint.h>
+#include <stdbool.h>
+#include <osmocom/core/linuxlist.h>
+
+struct cbc_cbsp_link;
+struct cbc_sabp_link;
+struct cbc_sbcap_link;
+
+#define CBC_MAX_REM_ADDRS 8
+
+/*********************************************************************************
+ * CBC Peer
+ *********************************************************************************/
+
+enum cbc_peer_protocol {
+	CBC_PEER_PROTO_CBSP,
+	CBC_PEER_PROTO_SABP,
+	CBC_PEER_PROTO_SBcAP
+};
+
+struct cbc_peer {
+	struct llist_head list;		/* linked to cbc.peers */
+	const char *name;
+
+	char *remote_host[CBC_MAX_REM_ADDRS];	/* remote IP address in string format */
+	unsigned int num_remote_host;	/* number of addresses present in remote_host */
+	int remote_port;		/* remote port number or -1 for random */
+	bool unknown_dynamic_peer;	/* dynamic/unknown peer; not saved in VTY */
+
+	enum cbc_peer_protocol proto;
+	union {
+		struct cbc_cbsp_link *cbsp;
+		struct cbc_sabp_link *sabp;
+		struct cbc_sbcap_link *sbcap;
+	} link;
+};
+
+extern const struct value_string cbc_peer_proto_name[];
+
+struct cbc_peer *cbc_peer_create(const char *name, enum cbc_peer_protocol proto);
+void cbc_peer_remove(struct cbc_peer *peer);
+
+struct cbc_peer *cbc_peer_by_name(const char *name);
+struct cbc_peer *cbc_peer_by_addr_proto(const char *remote_host, uint16_t remote_port,
+					enum cbc_peer_protocol proto);
--- a/include/osmocom/cbc/cbc_vty.h
+++ b/include/osmocom/cbc/cbc_vty.h
@@ -0,0 +1,10 @@
+#pragma once
+
+enum cbc_vty_node {
+	CBC_NODE = _LAST_OSMOVTY_NODE + 1,
+	PEER_NODE,
+	CBSP_NODE,
+	SBcAP_NODE,
+	ECBE_NODE,
+};
+void cbc_vty_init(void);
--- a/include/osmocom/cbc/cbsp_link.h
+++ b/include/osmocom/cbc/cbsp_link.h
@@ -0,0 +1,49 @@
+#pragma once
+#include <osmocom/core/linuxlist.h>
+#include <osmocom/gsm/cbsp.h>
+#include <osmocom/netif/stream.h>
+
+#include <osmocom/cbc/cbc_data.h>
+
+#define LOGPCC(link, level, fmt, args...) \
+	LOGP(DCBSP, level, "%s: " fmt, cbc_cbsp_link_name(link), ## args)
+
+struct cbc_cbsp_link;
+struct osmo_fsm_inst;
+struct cbc_peer;
+
+/* Holder of all CBSP conn related information: */
+struct cbc_cbsp_mgr {
+	/* libosmo-netif stream server */
+	struct osmo_stream_srv_link *srv_link;
+
+	/* BSCs / links connected to this CBC */
+	struct llist_head links;
+
+	/* receive call-back; called for every received message */
+	int (*rx_cb)(struct cbc_cbsp_link *link, struct osmo_cbsp_decoded *dec);
+};
+
+struct cbc_cbsp_mgr *cbc_cbsp_mgr_alloc(void *ctx);
+int cbc_cbsp_mgr_open_srv(struct cbc_cbsp_mgr *mgr);
+
+/* a CBSP link with a single (remote) peer connected to us */
+struct cbc_cbsp_link {
+	/* entry in osmo_cbsp_cbc.links */
+	struct llist_head list;
+	/* stream server connection for this link */
+	struct osmo_stream_srv *conn;
+	/* partially received CBSP message (rx completion pending) */
+	struct msgb *rx_msg;
+
+	struct osmo_fsm_inst *fi;
+
+	struct cbc_peer *peer;
+};
+
+struct cbc_cbsp_link *cbc_cbsp_link_alloc(struct cbc_cbsp_mgr *cbc, struct cbc_peer *peer);
+void cbc_cbsp_link_free(struct cbc_cbsp_link *link);
+const char *cbc_cbsp_link_name(const struct cbc_cbsp_link *link);
+void cbc_cbsp_link_tx(struct cbc_cbsp_link *link, struct osmo_cbsp_decoded *cbsp);
+void cbc_cbsp_link_close(struct cbc_cbsp_link *link);
+int cbc_cbsp_link_rx_cb(struct cbc_cbsp_link *link, struct osmo_cbsp_decoded *dec);
--- a/include/osmocom/cbc/cbsp_link_fsm.h
+++ b/include/osmocom/cbc/cbsp_link_fsm.h
@@ -0,0 +1,15 @@
+#pragma once
+
+#include <stdint.h>
+#include <osmocom/core/fsm.h>
+
+extern struct osmo_fsm cbsp_link_fsm;
+
+enum cbsp_link_event {
+	CBSP_LINK_E_RX_RST_COMPL,	/* reset complete received */
+	CBSP_LINK_E_RX_RST_FAIL,		/* reset failure received */
+	CBSP_LINK_E_RX_KA_COMPL,		/* keep-alive complete received */
+	CBSP_LINK_E_RX_RESTART,		/* restart received */
+	CBSP_LINK_E_CMD_RESET,		/* RESET command from CBC */
+	CBSP_LINK_E_CMD_CLOSE,		/* CLOSE command from CBC */
+};
--- a/include/osmocom/cbc/charset.h
+++ b/include/osmocom/cbc/charset.h
--- a/include/osmocom/cbc/debug.h
+++ b/include/osmocom/cbc/debug.h
@@ -0,0 +1,8 @@
+#pragma once
+
+enum {
+	DMAIN,
+	DCBSP,
+	DSBcAP,
+	DREST,
+};
--- a/include/osmocom/cbc/rest_it_op.h
+++ b/include/osmocom/cbc/rest_it_op.h
@@ -7,7 +7,7 @@
 #include <osmocom/core/linuxlist.h>
 #include <osmocom/core/it_q.h>

-#include "cbc_data.h"
+#include <osmocom/cbc/cbc_message.h>

 enum rest_it_operation {
 	REST_IT_OP_NONE,
@@ -50,3 +50,4 @@ struct rest_it_op {
 int rest_it_op_send_and_wait(struct rest_it_op *op);
 void rest_it_op_set_http_result(struct rest_it_op *op, uint32_t code, const char *body);
 void rest_it_op_complete(struct rest_it_op *op);
+void rest2main_read_cb(struct osmo_it_q *q, struct llist_head *item);
--- a/include/osmocom/cbc/sbcap_link.h
+++ b/include/osmocom/cbc/sbcap_link.h
@@ -0,0 +1,47 @@
+#pragma once
+#include <osmocom/core/linuxlist.h>
+#include <osmocom/netif/stream.h>
+
+#include <osmocom/sbcap/sbcap_common.h>
+
+#include "cbc_data.h"
+
+#define SBcAP_SCTP_PORT 29168
+typedef struct SBcAP_SBC_AP_PDU SBcAP_SBC_AP_PDU_t;
+#define LOGPSBCAPC(link, level, fmt, args...) \
+	LOGP(DSBcAP, level, "%s: " fmt, cbc_sbcap_link_name(link), ## args)
+
+struct cbc_sbcap_link;
+struct osmo_fsm_inst;
+struct cbc_peer;
+
+/* Holder of all SBc-AP conn related information: */
+struct cbc_sbcap_mgr {
+	/* libosmo-netif stream server */
+	struct osmo_stream_srv_link *srv_link;
+
+	/* MMEs / links connected to this CBC */
+	struct llist_head links;
+
+	/* receive call-back; called for every received message */
+	int (*rx_cb)(struct cbc_sbcap_link *link, SBcAP_SBC_AP_PDU_t *pdu);
+};
+struct cbc_sbcap_mgr *cbc_sbcap_mgr_alloc(void *ctx);
+int cbc_sbcap_mgr_open_srv(struct cbc_sbcap_mgr *mgr);
+
+/* an SBc-AP link with a single (remote) peer connected to us */
+struct cbc_sbcap_link {
+	/* entry in osmo_sbcap_cbc.links */
+	struct llist_head list;
+	/* stream server connection for this link */
+	struct osmo_stream_srv *conn;
+	struct osmo_fsm_inst *fi;
+	struct cbc_peer *peer;
+};
+
+struct cbc_sbcap_link *cbc_sbcap_link_alloc(struct cbc_sbcap_mgr *cbc, struct cbc_peer *peer);
+void cbc_sbcap_link_free(struct cbc_sbcap_link *link);
+const char *cbc_sbcap_link_name(const struct cbc_sbcap_link *link);
+void cbc_sbcap_link_tx(struct cbc_sbcap_link *link, SBcAP_SBC_AP_PDU_t *pdu);
+void cbc_sbcap_link_close(struct cbc_sbcap_link *link);
+int cbc_sbcap_link_rx_cb(struct cbc_sbcap_link *link, SBcAP_SBC_AP_PDU_t *pdu);
--- a/include/osmocom/cbc/sbcap_link_fsm.h
+++ b/include/osmocom/cbc/sbcap_link_fsm.h
@@ -0,0 +1,15 @@
+#pragma once
+
+#include <stdint.h>
+#include <osmocom/core/fsm.h>
+
+extern struct osmo_fsm sbcap_link_fsm;
+
+enum sbcap_link_event {
+	SBcAP_LINK_E_RX_RST_COMPL,	/* reset complete received */
+	SBcAP_LINK_E_RX_RST_FAIL,		/* reset failure received */
+	SBcAP_LINK_E_RX_KA_COMPL,		/* keep-alive complete received */
+	SBcAP_LINK_E_RX_RESTART,		/* restart received */
+	SBcAP_LINK_E_CMD_RESET,		/* RESET command from CBC */
+	SBcAP_LINK_E_CMD_CLOSE,		/* CLOSE command from CBC */
+};
--- a/include/osmocom/cbc/sbcap_msg.h
+++ b/include/osmocom/cbc/sbcap_msg.h
@@ -0,0 +1,11 @@
+#pragma once
+#include <osmocom/core/linuxlist.h>
+#include <osmocom/netif/stream.h>
+
+#include "cbc_data.h"
+
+struct cbc_message;
+typedef struct SBcAP_SBC_AP_PDU SBcAP_SBC_AP_PDU_t;
+
+SBcAP_SBC_AP_PDU_t *cbcmsg_to_sbcap(void *ctx, const struct cbc_message *cbcmsg);
+SBcAP_SBC_AP_PDU_t *sbcap_gen_stop_warning_req(void *ctx, const struct cbc_message *cbcmsg);
--- a/include/osmocom/cbc/smscb_message_fsm.h
+++ b/include/osmocom/cbc/smscb_message_fsm.h
@@ -1,48 +1,8 @@
 #pragma once

 #include <stdint.h>
-
-#include <osmocom/core/logging.h>
 #include <osmocom/core/fsm.h>

-#include "cbc_data.h"
-
-enum {
-	DCBSP,
-	DREST,
-};
-
-extern struct osmo_fsm cbsp_server_fsm;
-
-enum cbsp_server_event {
-	CBSP_SRV_E_RX_RST_COMPL,	/* reset complete received */
-	CBSP_SRV_E_RX_RST_FAIL,		/* reset failure received */
-	CBSP_SRV_E_RX_KA_COMPL,		/* keep-alive complete received */
-	CBSP_SRV_E_RX_RESTART,		/* restart received */
-	CBSP_SRV_E_CMD_RESET,		/* RESET command from CBC */
-	CBSP_SRV_E_CMD_CLOSE,		/* CLOSE command from CBC */
-};
-
-
-/* rest_api.c */
-int rest_api_init(void *ctx, uint16_t port);
-void rest_api_fin(void);
-
-/* cbc_vty.c */
-void cbc_vty_init(void);
-
-/* message_handling.c */
-struct cbc_message *cbc_message_alloc(void *ctx, const struct cbc_message *cbcmsg);
-int cbc_message_new(const struct cbc_message *cbcmsg, struct rest_it_op *op);
-void cbc_message_delete(struct cbc_message *cbcmsg, struct rest_it_op *op);
-struct cbc_message *cbc_message_by_id(uint16_t message_id);
-int peer_new_cbc_message(struct cbc_peer *peer, struct cbc_message *cbcmsg);
-
-/* rest_it_op.c */
-void rest2main_read_cb(struct osmo_it_q *q, struct llist_head *item);
-
-
-/* smscb_*fsm.c */
 enum smscb_fsm_event {
 	SMSCB_E_CHILD_DIED,
 	/* create a message (from REST) */
@@ -65,6 +25,12 @@ enum smscb_fsm_event {
 	/* CBSP peer confirms status query */
 	SMSCB_E_CBSP_STATUS_ACK,
 	SMSCB_E_CBSP_STATUS_NACK,
+	/* SBc-AP peer confirms write */
+	SMSCB_E_SBCAP_WRITE_ACK,
+	SMSCB_E_SBCAP_WRITE_NACK,
+	/* SBc-AP peer confirms delete */
+	SMSCB_E_SBCAP_DELETE_ACK,
+	SMSCB_E_SBCAP_DELETE_NACK,
 };

 enum smscb_fsm_state {
--- a/include/osmocom/sbcap/Makefile.am
+++ b/include/osmocom/sbcap/Makefile.am
@@ -0,0 +1,120 @@
+sbcap_HEADERS = \
+	sbcap_common.h \
+	sbcap_internal.h \
+	SBcAP_Broadcast-Cancelled-Area-List-5GS.h \
+	SBcAP_Broadcast-Cancelled-Area-List.h \
+	SBcAP_Broadcast-Empty-Area-List-5GS.h \
+	SBcAP_Broadcast-Empty-Area-List.h \
+	SBcAP_Broadcast-Scheduled-Area-List-5GS.h \
+	SBcAP_Broadcast-Scheduled-Area-List.h \
+	SBcAP_CancelledCellinEAI.h \
+	SBcAP_CancelledCellinEAI-Item.h \
+	SBcAP_CancelledCellinTAI-5GS.h \
+	SBcAP_CancelledCellinTAI.h \
+	SBcAP_CancelledCellinTAI-Item.h \
+	SBcAP_Cause.h \
+	SBcAP_CellId-Broadcast-List-5GS.h \
+	SBcAP_CellId-Broadcast-List.h \
+	SBcAP_CellId-Broadcast-List-Item.h \
+	SBcAP_CellID-Cancelled-Item.h \
+	SBcAP_CellID-Cancelled-List-5GS.h \
+	SBcAP_CellID-Cancelled-List.h \
+	SBcAP_CellIdentity.h \
+	SBcAP_Concurrent-Warning-Message-Indicator.h \
+	SBcAP_Criticality-Diagnostics.h \
+	SBcAP_CriticalityDiagnostics-IE-List.h \
+	SBcAP_Criticality.h \
+	SBcAP_Data-Coding-Scheme.h \
+	SBcAP_ECGIList.h \
+	SBcAP_EmergencyAreaID-Broadcast-List.h \
+	SBcAP_EmergencyAreaID-Broadcast-List-Item.h \
+	SBcAP_EmergencyAreaID-Cancelled-Item.h \
+	SBcAP_EmergencyAreaID-Cancelled-List.h \
+	SBcAP_Emergency-Area-ID.h \
+	SBcAP_Emergency-Area-ID-List.h \
+	SBcAP_ENB-ID.h \
+	SBcAP_Error-Indication.h \
+	SBcAP_EUTRAN-CGI.h \
+	SBcAP_Extended-Repetition-Period.h \
+	SBcAP_EXTERNAL.h \
+	SBcAP_Failed-Cell-List.h \
+	SBcAP_Failed-Cell-List-NR.h \
+	SBcAP_Global-ENB-ID.h \
+	SBcAP_Global-GNB-ID.h \
+	SBcAP_Global-NgENB-ID.h \
+	SBcAP_Global-RAN-Node-ID.h \
+	SBcAP_GNB-ID.h \
+	SBcAP_InitiatingMessage.h \
+	SBcAP_List-of-5GS-Cells-for-Failure.h \
+	SBcAP_List-of-5GS-TAI-for-Restart.h \
+	SBcAP_List-of-5GS-TAIs.h \
+	SBcAP_List-of-EAIs-Restart.h \
+	SBcAP_List-of-TAIs.h \
+	SBcAP_List-of-TAIs-Restart.h \
+	SBcAP_Message-Identifier.h \
+	SBcAP_NgENB-ID.h \
+	SBcAP_NRCellIdentity.h \
+	SBcAP_NR-CGI.h \
+	SBcAP_NR-CGIList.h \
+	SBcAP_NumberOfBroadcasts.h \
+	SBcAP_Number-of-Broadcasts-Requested.h \
+	SBcAP_Omc-Id.h \
+	SBcAP_PLMNidentity.h \
+	SBcAP_Presence.h \
+	SBcAP_ProcedureCode.h \
+	SBcAP_ProtocolExtensionContainer.h \
+	SBcAP_ProtocolExtensionField.h \
+	SBcAP_ProtocolExtensionID.h \
+	SBcAP_ProtocolIE-Container.h \
+	SBcAP_ProtocolIE-ContainerList.h \
+	SBcAP_ProtocolIE-Field.h \
+	SBcAP_ProtocolIE-ID.h \
+	SBcAP_PWS-Failure-Indication.h \
+	SBcAP_PWS-Restart-Indication.h \
+	SBcAP_RAT-Selector-5GS.h \
+	SBcAP_Repetition-Period.h \
+	SBcAP_Restarted-Cell-List.h \
+	SBcAP_Restarted-Cell-List-NR.h \
+	SBcAP_SBC-AP-PDU.h \
+	SBcAP_ScheduledCellinEAI.h \
+	SBcAP_ScheduledCellinEAI-Item.h \
+	SBcAP_ScheduledCellinTAI-5GS.h \
+	SBcAP_ScheduledCellinTAI.h \
+	SBcAP_ScheduledCellinTAI-Item.h \
+	SBcAP_Send-Stop-Warning-Indication.h \
+	SBcAP_Send-Write-Replace-Warning-Indication.h \
+	SBcAP_Serial-Number.h \
+	SBcAP_Stop-All-Indicator.h \
+	SBcAP_Stop-Warning-Indication.h \
+	SBcAP_Stop-Warning-Request.h \
+	SBcAP_Stop-Warning-Response.h \
+	SBcAP_SuccessfulOutcome.h \
+	SBcAP_TAC-5GS.h \
+	SBcAP_TAC.h \
+	SBcAP_TAI-5GS.h \
+	SBcAP_TAI-Broadcast-List-5GS.h \
+	SBcAP_TAI-Broadcast-List.h \
+	SBcAP_TAI-Broadcast-List-Item.h \
+	SBcAP_TAI-Cancelled-List-5GS.h \
+	SBcAP_TAI-Cancelled-List.h \
+	SBcAP_TAI-Cancelled-List-Item.h \
+	SBcAP_TAI.h \
+	SBcAP_TAI-List-for-Warning.h \
+	SBcAP_TBCD-STRING.h \
+	SBcAP_TriggeringMessage.h \
+	SBcAP_TypeOfError.h \
+	SBcAP_Unknown-5GS-Tracking-Area-List.h \
+	SBcAP_Unknown-Tracking-Area-List.h \
+	SBcAP_UnsuccessfulOutcome.h \
+	SBcAP_Warning-Area-Coordinates.h \
+	SBcAP_Warning-Area-List-5GS.h \
+	SBcAP_Warning-Area-List.h \
+	SBcAP_Warning-Message-Content.h \
+	SBcAP_Warning-Security-Information.h \
+	SBcAP_Warning-Type.h \
+	SBcAP_Write-Replace-Warning-Indication.h \
+	SBcAP_Write-Replace-Warning-Request.h \
+	SBcAP_Write-Replace-Warning-Response.h \
+	$(NULL)
+
+sbcapdir = $(includedir)/osmocom/sbcap
--- a/include/osmocom/sbcap/SBcAP_Broadcast-Cancelled-Area-List-5GS.h
+++ b/include/osmocom/sbcap/SBcAP_Broadcast-Cancelled-Area-List-5GS.h
@@ -0,0 +1,57 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "SBC-AP-IEs"
+ * 	found in "../../src/sbcap/asn1/SBC_AP_IEs.asn"
+ * 	`asn1c -S /home/pespin/dev/sysmocom/build/new/out/share/asn1c -fcompound-names -gen-APER -no-gen-BER -no-gen-XER -no-gen-JER -no-gen-OER -no-gen-UPER -no-gen-example`
+ */
+
+#ifndef	_SBcAP_Broadcast_Cancelled_Area_List_5GS_H_
+#define	_SBcAP_Broadcast_Cancelled_Area_List_5GS_H_
+
+
+#include <asn_application.h>
+
+/* Including external dependencies */
+#include <constr_SEQUENCE.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Forward declarations */
+struct SBcAP_CellID_Cancelled_List_5GS;
+struct SBcAP_TAI_Cancelled_List_5GS;
+struct SBcAP_EmergencyAreaID_Cancelled_List;
+struct SBcAP_ProtocolExtensionContainer;
+
+/* SBcAP_Broadcast-Cancelled-Area-List-5GS */
+typedef struct SBcAP_Broadcast_Cancelled_Area_List_5GS {
+	struct SBcAP_CellID_Cancelled_List_5GS	*cellID_Cancelled_List_5GS;	/* OPTIONAL */
+	struct SBcAP_TAI_Cancelled_List_5GS	*tAI_Cancelled_List_5GS;	/* OPTIONAL */
+	struct SBcAP_EmergencyAreaID_Cancelled_List	*emergencyAreaID_Cancelled_List;	/* OPTIONAL */
+	struct SBcAP_ProtocolExtensionContainer	*iE_Extensions;	/* OPTIONAL */
+	/*
+	 * This type is extensible,
+	 * possible extensions are below.
+	 */
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} SBcAP_Broadcast_Cancelled_Area_List_5GS_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_SBcAP_Broadcast_Cancelled_Area_List_5GS;
+extern asn_SEQUENCE_specifics_t asn_SPC_SBcAP_Broadcast_Cancelled_Area_List_5GS_specs_1;
+extern asn_TYPE_member_t asn_MBR_SBcAP_Broadcast_Cancelled_Area_List_5GS_1[4];
+
+#ifdef __cplusplus
+}
+#endif
+
+/* Referred external types */
+#include <osmocom/sbcap/SBcAP_CellID-Cancelled-List-5GS.h>
+#include <osmocom/sbcap/SBcAP_TAI-Cancelled-List-5GS.h>
+#include <osmocom/sbcap/SBcAP_EmergencyAreaID-Cancelled-List.h>
+
+#endif	/* _SBcAP_Broadcast_Cancelled_Area_List_5GS_H_ */
+#include <asn_internal.h>
--- a/include/osmocom/sbcap/SBcAP_Broadcast-Cancelled-Area-List.h
+++ b/include/osmocom/sbcap/SBcAP_Broadcast-Cancelled-Area-List.h
@@ -0,0 +1,58 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "SBC-AP-IEs"
+ * 	found in "../../src/sbcap/asn1/SBC_AP_IEs.asn"
+ * 	`asn1c -S /home/pespin/dev/sysmocom/build/new/out/share/asn1c -fcompound-names -gen-APER -no-gen-BER -no-gen-XER -no-gen-JER -no-gen-OER -no-gen-UPER -no-gen-example`
+ */
+
+#ifndef	_SBcAP_Broadcast_Cancelled_Area_List_H_
+#define	_SBcAP_Broadcast_Cancelled_Area_List_H_
+
+
+#include <asn_application.h>
+
+/* Including external dependencies */
+#include <constr_SEQUENCE.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Forward declarations */
+struct SBcAP_CellID_Cancelled_List;
+struct SBcAP_TAI_Cancelled_List;
+struct SBcAP_EmergencyAreaID_Cancelled_List;
+struct SBcAP_ProtocolExtensionContainer;
+
+/* SBcAP_Broadcast-Cancelled-Area-List */
+typedef struct SBcAP_Broadcast_Cancelled_Area_List {
+	struct SBcAP_CellID_Cancelled_List	*cellID_Cancelled_List;	/* OPTIONAL */
+	struct SBcAP_TAI_Cancelled_List	*tAI_Cancelled_List;	/* OPTIONAL */
+	struct SBcAP_EmergencyAreaID_Cancelled_List	*emergencyAreaID_Cancelled_List;	/* OPTIONAL */
+	struct SBcAP_ProtocolExtensionContainer	*iE_Extensions;	/* OPTIONAL */
+	/*
+	 * This type is extensible,
+	 * possible extensions are below.
+	 */
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} SBcAP_Broadcast_Cancelled_Area_List_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_SBcAP_Broadcast_Cancelled_Area_List;
+extern asn_SEQUENCE_specifics_t asn_SPC_SBcAP_Broadcast_Cancelled_Area_List_specs_1;
+extern asn_TYPE_member_t asn_MBR_SBcAP_Broadcast_Cancelled_Area_List_1[4];
+
+#ifdef __cplusplus
+}
+#endif
+
+/* Referred external types */
+#include <osmocom/sbcap/SBcAP_CellID-Cancelled-List.h>
+#include <osmocom/sbcap/SBcAP_TAI-Cancelled-List.h>
+#include <osmocom/sbcap/SBcAP_EmergencyAreaID-Cancelled-List.h>
+#include <osmocom/sbcap/SBcAP_ProtocolExtensionContainer.h>
+
+#endif	/* _SBcAP_Broadcast_Cancelled_Area_List_H_ */
+#include <asn_internal.h>
--- a/include/osmocom/sbcap/SBcAP_Broadcast-Empty-Area-List-5GS.h
+++ b/include/osmocom/sbcap/SBcAP_Broadcast-Empty-Area-List-5GS.h
@@ -0,0 +1,47 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "SBC-AP-IEs"
+ * 	found in "../../src/sbcap/asn1/SBC_AP_IEs.asn"
+ * 	`asn1c -S /home/pespin/dev/sysmocom/build/new/out/share/asn1c -fcompound-names -gen-APER -no-gen-BER -no-gen-XER -no-gen-JER -no-gen-OER -no-gen-UPER -no-gen-example`
+ */
+
+#ifndef	_SBcAP_Broadcast_Empty_Area_List_5GS_H_
+#define	_SBcAP_Broadcast_Empty_Area_List_5GS_H_
+
+
+#include <asn_application.h>
+
+/* Including external dependencies */
+#include <asn_SEQUENCE_OF.h>
+#include <constr_SEQUENCE_OF.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Forward declarations */
+struct SBcAP_Global_RAN_Node_ID;
+
+/* SBcAP_Broadcast-Empty-Area-List-5GS */
+typedef struct SBcAP_Broadcast_Empty_Area_List_5GS {
+	A_SEQUENCE_OF(struct SBcAP_Global_RAN_Node_ID) list;
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} SBcAP_Broadcast_Empty_Area_List_5GS_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_SBcAP_Broadcast_Empty_Area_List_5GS;
+extern asn_SET_OF_specifics_t asn_SPC_SBcAP_Broadcast_Empty_Area_List_5GS_specs_1;
+extern asn_TYPE_member_t asn_MBR_SBcAP_Broadcast_Empty_Area_List_5GS_1[1];
+extern asn_per_constraints_t asn_PER_type_SBcAP_Broadcast_Empty_Area_List_5GS_constr_1;
+
+#ifdef __cplusplus
+}
+#endif
+
+/* Referred external types */
+#include <osmocom/sbcap/SBcAP_Global-RAN-Node-ID.h>
+
+#endif	/* _SBcAP_Broadcast_Empty_Area_List_5GS_H_ */
+#include <asn_internal.h>
--- a/include/osmocom/sbcap/SBcAP_Broadcast-Empty-Area-List.h
+++ b/include/osmocom/sbcap/SBcAP_Broadcast-Empty-Area-List.h
@@ -0,0 +1,47 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "SBC-AP-IEs"
+ * 	found in "../../src/sbcap/asn1/SBC_AP_IEs.asn"
+ * 	`asn1c -S /home/pespin/dev/sysmocom/build/new/out/share/asn1c -fcompound-names -gen-APER -no-gen-BER -no-gen-XER -no-gen-JER -no-gen-OER -no-gen-UPER -no-gen-example`
+ */
+
+#ifndef	_SBcAP_Broadcast_Empty_Area_List_H_
+#define	_SBcAP_Broadcast_Empty_Area_List_H_
+
+
+#include <asn_application.h>
+
+/* Including external dependencies */
+#include <asn_SEQUENCE_OF.h>
+#include <constr_SEQUENCE_OF.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Forward declarations */
+struct SBcAP_Global_ENB_ID;
+
+/* SBcAP_Broadcast-Empty-Area-List */
+typedef struct SBcAP_Broadcast_Empty_Area_List {
+	A_SEQUENCE_OF(struct SBcAP_Global_ENB_ID) list;
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} SBcAP_Broadcast_Empty_Area_List_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_SBcAP_Broadcast_Empty_Area_List;
+extern asn_SET_OF_specifics_t asn_SPC_SBcAP_Broadcast_Empty_Area_List_specs_1;
+extern asn_TYPE_member_t asn_MBR_SBcAP_Broadcast_Empty_Area_List_1[1];
+extern asn_per_constraints_t asn_PER_type_SBcAP_Broadcast_Empty_Area_List_constr_1;
+
+#ifdef __cplusplus
+}
+#endif
+
+/* Referred external types */
+#include <osmocom/sbcap/SBcAP_Global-ENB-ID.h>
+
+#endif	/* _SBcAP_Broadcast_Empty_Area_List_H_ */
+#include <asn_internal.h>
--- a/include/osmocom/sbcap/SBcAP_Broadcast-Scheduled-Area-List-5GS.h
+++ b/include/osmocom/sbcap/SBcAP_Broadcast-Scheduled-Area-List-5GS.h
@@ -0,0 +1,57 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "SBC-AP-IEs"
+ * 	found in "../../src/sbcap/asn1/SBC_AP_IEs.asn"
+ * 	`asn1c -S /home/pespin/dev/sysmocom/build/new/out/share/asn1c -fcompound-names -gen-APER -no-gen-BER -no-gen-XER -no-gen-JER -no-gen-OER -no-gen-UPER -no-gen-example`
+ */
+
+#ifndef	_SBcAP_Broadcast_Scheduled_Area_List_5GS_H_
+#define	_SBcAP_Broadcast_Scheduled_Area_List_5GS_H_
+
+
+#include <asn_application.h>
+
+/* Including external dependencies */
+#include <constr_SEQUENCE.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Forward declarations */
+struct SBcAP_CellId_Broadcast_List_5GS;
+struct SBcAP_TAI_Broadcast_List_5GS;
+struct SBcAP_EmergencyAreaID_Broadcast_List;
+struct SBcAP_ProtocolExtensionContainer;
+
+/* SBcAP_Broadcast-Scheduled-Area-List-5GS */
+typedef struct SBcAP_Broadcast_Scheduled_Area_List_5GS {
+	struct SBcAP_CellId_Broadcast_List_5GS	*cellId_Broadcast_List_5GS;	/* OPTIONAL */
+	struct SBcAP_TAI_Broadcast_List_5GS	*tAI_Broadcast_List_5GS;	/* OPTIONAL */
+	struct SBcAP_EmergencyAreaID_Broadcast_List	*emergencyAreaID_Broadcast_List;	/* OPTIONAL */
+	struct SBcAP_ProtocolExtensionContainer	*iE_Extensions;	/* OPTIONAL */
+	/*
+	 * This type is extensible,
+	 * possible extensions are below.
+	 */
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} SBcAP_Broadcast_Scheduled_Area_List_5GS_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_SBcAP_Broadcast_Scheduled_Area_List_5GS;
+extern asn_SEQUENCE_specifics_t asn_SPC_SBcAP_Broadcast_Scheduled_Area_List_5GS_specs_1;
+extern asn_TYPE_member_t asn_MBR_SBcAP_Broadcast_Scheduled_Area_List_5GS_1[4];
+
+#ifdef __cplusplus
+}
+#endif
+
+/* Referred external types */
+#include <osmocom/sbcap/SBcAP_CellId-Broadcast-List-5GS.h>
+#include <osmocom/sbcap/SBcAP_TAI-Broadcast-List-5GS.h>
+#include <osmocom/sbcap/SBcAP_EmergencyAreaID-Broadcast-List.h>
+
+#endif	/* _SBcAP_Broadcast_Scheduled_Area_List_5GS_H_ */
+#include <asn_internal.h>
--- a/include/osmocom/sbcap/SBcAP_Broadcast-Scheduled-Area-List.h
+++ b/include/osmocom/sbcap/SBcAP_Broadcast-Scheduled-Area-List.h
@@ -0,0 +1,58 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "SBC-AP-IEs"
+ * 	found in "../../src/sbcap/asn1/SBC_AP_IEs.asn"
+ * 	`asn1c -S /home/pespin/dev/sysmocom/build/new/out/share/asn1c -fcompound-names -gen-APER -no-gen-BER -no-gen-XER -no-gen-JER -no-gen-OER -no-gen-UPER -no-gen-example`
+ */
+
+#ifndef	_SBcAP_Broadcast_Scheduled_Area_List_H_
+#define	_SBcAP_Broadcast_Scheduled_Area_List_H_
+
+
+#include <asn_application.h>
+
+/* Including external dependencies */
+#include <constr_SEQUENCE.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Forward declarations */
+struct SBcAP_CellId_Broadcast_List;
+struct SBcAP_TAI_Broadcast_List;
+struct SBcAP_EmergencyAreaID_Broadcast_List;
+struct SBcAP_ProtocolExtensionContainer;
+
+/* SBcAP_Broadcast-Scheduled-Area-List */
+typedef struct SBcAP_Broadcast_Scheduled_Area_List {
+	struct SBcAP_CellId_Broadcast_List	*cellId_Broadcast_List;	/* OPTIONAL */
+	struct SBcAP_TAI_Broadcast_List	*tAI_Broadcast_List;	/* OPTIONAL */
+	struct SBcAP_EmergencyAreaID_Broadcast_List	*emergencyAreaID_Broadcast_List;	/* OPTIONAL */
+	struct SBcAP_ProtocolExtensionContainer	*iE_Extensions;	/* OPTIONAL */
+	/*
+	 * This type is extensible,
+	 * possible extensions are below.
+	 */
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} SBcAP_Broadcast_Scheduled_Area_List_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_SBcAP_Broadcast_Scheduled_Area_List;
+extern asn_SEQUENCE_specifics_t asn_SPC_SBcAP_Broadcast_Scheduled_Area_List_specs_1;
+extern asn_TYPE_member_t asn_MBR_SBcAP_Broadcast_Scheduled_Area_List_1[4];
+
+#ifdef __cplusplus
+}
+#endif
+
+/* Referred external types */
+#include <osmocom/sbcap/SBcAP_CellId-Broadcast-List.h>
+#include <osmocom/sbcap/SBcAP_TAI-Broadcast-List.h>
+#include <osmocom/sbcap/SBcAP_EmergencyAreaID-Broadcast-List.h>
+#include <osmocom/sbcap/SBcAP_ProtocolExtensionContainer.h>
+
+#endif	/* _SBcAP_Broadcast_Scheduled_Area_List_H_ */
+#include <asn_internal.h>
--- a/include/osmocom/sbcap/SBcAP_CancelledCellinEAI-Item.h
+++ b/include/osmocom/sbcap/SBcAP_CancelledCellinEAI-Item.h
@@ -0,0 +1,53 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "SBC-AP-IEs"
+ * 	found in "../../src/sbcap/asn1/SBC_AP_IEs.asn"
+ * 	`asn1c -S /home/pespin/dev/sysmocom/build/new/out/share/asn1c -fcompound-names -gen-APER -no-gen-BER -no-gen-XER -no-gen-JER -no-gen-OER -no-gen-UPER -no-gen-example`
+ */
+
+#ifndef	_SBcAP_CancelledCellinEAI_Item_H_
+#define	_SBcAP_CancelledCellinEAI_Item_H_
+
+
+#include <asn_application.h>
+
+/* Including external dependencies */
+#include <osmocom/sbcap/SBcAP_EUTRAN-CGI.h>
+#include <osmocom/sbcap/SBcAP_NumberOfBroadcasts.h>
+#include <constr_SEQUENCE.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Forward declarations */
+struct SBcAP_ProtocolExtensionContainer;
+
+/* SBcAP_CancelledCellinEAI-Item */
+typedef struct SBcAP_CancelledCellinEAI_Item {
+	SBcAP_EUTRAN_CGI_t	 eCGI;
+	SBcAP_NumberOfBroadcasts_t	 numberOfBroadcasts;
+	struct SBcAP_ProtocolExtensionContainer	*iE_Extensions;	/* OPTIONAL */
+	/*
+	 * This type is extensible,
+	 * possible extensions are below.
+	 */
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} SBcAP_CancelledCellinEAI_Item_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_SBcAP_CancelledCellinEAI_Item;
+extern asn_SEQUENCE_specifics_t asn_SPC_SBcAP_CancelledCellinEAI_Item_specs_1;
+extern asn_TYPE_member_t asn_MBR_SBcAP_CancelledCellinEAI_Item_1[3];
+
+#ifdef __cplusplus
+}
+#endif
+
+/* Referred external types */
+#include <osmocom/sbcap/SBcAP_ProtocolExtensionContainer.h>
+
+#endif	/* _SBcAP_CancelledCellinEAI_Item_H_ */
+#include <asn_internal.h>
--- a/include/osmocom/sbcap/SBcAP_CancelledCellinEAI.h
+++ b/include/osmocom/sbcap/SBcAP_CancelledCellinEAI.h
@@ -0,0 +1,47 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "SBC-AP-IEs"
+ * 	found in "../../src/sbcap/asn1/SBC_AP_IEs.asn"
+ * 	`asn1c -S /home/pespin/dev/sysmocom/build/new/out/share/asn1c -fcompound-names -gen-APER -no-gen-BER -no-gen-XER -no-gen-JER -no-gen-OER -no-gen-UPER -no-gen-example`
+ */
+
+#ifndef	_SBcAP_CancelledCellinEAI_H_
+#define	_SBcAP_CancelledCellinEAI_H_
+
+
+#include <asn_application.h>
+
+/* Including external dependencies */
+#include <asn_SEQUENCE_OF.h>
+#include <constr_SEQUENCE_OF.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Forward declarations */
+struct SBcAP_CancelledCellinEAI_Item;
+
+/* SBcAP_CancelledCellinEAI */
+typedef struct SBcAP_CancelledCellinEAI {
+	A_SEQUENCE_OF(struct SBcAP_CancelledCellinEAI_Item) list;
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} SBcAP_CancelledCellinEAI_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_SBcAP_CancelledCellinEAI;
+extern asn_SET_OF_specifics_t asn_SPC_SBcAP_CancelledCellinEAI_specs_1;
+extern asn_TYPE_member_t asn_MBR_SBcAP_CancelledCellinEAI_1[1];
+extern asn_per_constraints_t asn_PER_type_SBcAP_CancelledCellinEAI_constr_1;
+
+#ifdef __cplusplus
+}
+#endif
+
+/* Referred external types */
+#include <osmocom/sbcap/SBcAP_CancelledCellinEAI-Item.h>
+
+#endif	/* _SBcAP_CancelledCellinEAI_H_ */
+#include <asn_internal.h>
--- a/include/osmocom/sbcap/SBcAP_CancelledCellinTAI-5GS.h
+++ b/include/osmocom/sbcap/SBcAP_CancelledCellinTAI-5GS.h
@@ -0,0 +1,64 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "SBC-AP-IEs"
+ * 	found in "../../src/sbcap/asn1/SBC_AP_IEs.asn"
+ * 	`asn1c -S /home/pespin/dev/sysmocom/build/new/out/share/asn1c -fcompound-names -gen-APER -no-gen-BER -no-gen-XER -no-gen-JER -no-gen-OER -no-gen-UPER -no-gen-example`
+ */
+
+#ifndef	_SBcAP_CancelledCellinTAI_5GS_H_
+#define	_SBcAP_CancelledCellinTAI_5GS_H_
+
+
+#include <asn_application.h>
+
+/* Including external dependencies */
+#include <asn_SEQUENCE_OF.h>
+#include <osmocom/sbcap/SBcAP_NR-CGI.h>
+#include <osmocom/sbcap/SBcAP_NumberOfBroadcasts.h>
+#include <constr_SEQUENCE.h>
+#include <constr_SEQUENCE_OF.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Forward declarations */
+struct SBcAP_ProtocolExtensionContainer;
+
+/* Forward definitions */
+typedef struct SBcAP_CancelledCellinTAI_5GS__Member {
+	SBcAP_NR_CGI_t	 nR_CGI;
+	SBcAP_NumberOfBroadcasts_t	 numberOfBroadcasts;
+	struct SBcAP_ProtocolExtensionContainer	*iE_Extensions;	/* OPTIONAL */
+	/*
+	 * This type is extensible,
+	 * possible extensions are below.
+	 */
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} CancelledCellinTAI_5GS__Member;
+
+/* SBcAP_CancelledCellinTAI-5GS */
+typedef struct SBcAP_CancelledCellinTAI_5GS {
+	A_SEQUENCE_OF(CancelledCellinTAI_5GS__Member) list;
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} SBcAP_CancelledCellinTAI_5GS_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_SBcAP_CancelledCellinTAI_5GS;
+extern asn_SET_OF_specifics_t asn_SPC_SBcAP_CancelledCellinTAI_5GS_specs_1;
+extern asn_TYPE_member_t asn_MBR_SBcAP_CancelledCellinTAI_5GS_1[1];
+extern asn_per_constraints_t asn_PER_type_SBcAP_CancelledCellinTAI_5GS_constr_1;
+
+#ifdef __cplusplus
+}
+#endif
+
+/* Referred external types */
+#include <osmocom/sbcap/SBcAP_ProtocolExtensionContainer.h>
+
+#endif	/* _SBcAP_CancelledCellinTAI_5GS_H_ */
+#include <asn_internal.h>
--- a/include/osmocom/sbcap/SBcAP_CancelledCellinTAI-Item.h
+++ b/include/osmocom/sbcap/SBcAP_CancelledCellinTAI-Item.h
@@ -0,0 +1,53 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "SBC-AP-IEs"
+ * 	found in "../../src/sbcap/asn1/SBC_AP_IEs.asn"
+ * 	`asn1c -S /home/pespin/dev/sysmocom/build/new/out/share/asn1c -fcompound-names -gen-APER -no-gen-BER -no-gen-XER -no-gen-JER -no-gen-OER -no-gen-UPER -no-gen-example`
+ */
+
+#ifndef	_SBcAP_CancelledCellinTAI_Item_H_
+#define	_SBcAP_CancelledCellinTAI_Item_H_
+
+
+#include <asn_application.h>
+
+/* Including external dependencies */
+#include <osmocom/sbcap/SBcAP_EUTRAN-CGI.h>
+#include <osmocom/sbcap/SBcAP_NumberOfBroadcasts.h>
+#include <constr_SEQUENCE.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Forward declarations */
+struct SBcAP_ProtocolExtensionContainer;
+
+/* SBcAP_CancelledCellinTAI-Item */
+typedef struct SBcAP_CancelledCellinTAI_Item {
+	SBcAP_EUTRAN_CGI_t	 eCGI;
+	SBcAP_NumberOfBroadcasts_t	 numberOfBroadcasts;
+	struct SBcAP_ProtocolExtensionContainer	*iE_Extensions;	/* OPTIONAL */
+	/*
+	 * This type is extensible,
+	 * possible extensions are below.
+	 */
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} SBcAP_CancelledCellinTAI_Item_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_SBcAP_CancelledCellinTAI_Item;
+extern asn_SEQUENCE_specifics_t asn_SPC_SBcAP_CancelledCellinTAI_Item_specs_1;
+extern asn_TYPE_member_t asn_MBR_SBcAP_CancelledCellinTAI_Item_1[3];
+
+#ifdef __cplusplus
+}
+#endif
+
+/* Referred external types */
+#include <osmocom/sbcap/SBcAP_ProtocolExtensionContainer.h>
+
+#endif	/* _SBcAP_CancelledCellinTAI_Item_H_ */
+#include <asn_internal.h>
--- a/include/osmocom/sbcap/SBcAP_CancelledCellinTAI.h
+++ b/include/osmocom/sbcap/SBcAP_CancelledCellinTAI.h
@@ -0,0 +1,47 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "SBC-AP-IEs"
+ * 	found in "../../src/sbcap/asn1/SBC_AP_IEs.asn"
+ * 	`asn1c -S /home/pespin/dev/sysmocom/build/new/out/share/asn1c -fcompound-names -gen-APER -no-gen-BER -no-gen-XER -no-gen-JER -no-gen-OER -no-gen-UPER -no-gen-example`
+ */
+
+#ifndef	_SBcAP_CancelledCellinTAI_H_
+#define	_SBcAP_CancelledCellinTAI_H_
+
+
+#include <asn_application.h>
+
+/* Including external dependencies */
+#include <asn_SEQUENCE_OF.h>
+#include <constr_SEQUENCE_OF.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Forward declarations */
+struct SBcAP_CancelledCellinTAI_Item;
+
+/* SBcAP_CancelledCellinTAI */
+typedef struct SBcAP_CancelledCellinTAI {
+	A_SEQUENCE_OF(struct SBcAP_CancelledCellinTAI_Item) list;
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} SBcAP_CancelledCellinTAI_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_SBcAP_CancelledCellinTAI;
+extern asn_SET_OF_specifics_t asn_SPC_SBcAP_CancelledCellinTAI_specs_1;
+extern asn_TYPE_member_t asn_MBR_SBcAP_CancelledCellinTAI_1[1];
+extern asn_per_constraints_t asn_PER_type_SBcAP_CancelledCellinTAI_constr_1;
+
+#ifdef __cplusplus
+}
+#endif
+
+/* Referred external types */
+#include <osmocom/sbcap/SBcAP_CancelledCellinTAI-Item.h>
+
+#endif	/* _SBcAP_CancelledCellinTAI_H_ */
+#include <asn_internal.h>
--- a/include/osmocom/sbcap/SBcAP_Cause.h
+++ b/include/osmocom/sbcap/SBcAP_Cause.h
@@ -0,0 +1,61 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "SBC-AP-IEs"
+ * 	found in "../../src/sbcap/asn1/SBC_AP_IEs.asn"
+ * 	`asn1c -S /home/pespin/dev/sysmocom/build/new/out/share/asn1c -fcompound-names -gen-APER -no-gen-BER -no-gen-XER -no-gen-JER -no-gen-OER -no-gen-UPER -no-gen-example`
+ */
+
+#ifndef	_SBcAP_Cause_H_
+#define	_SBcAP_Cause_H_
+
+
+#include <asn_application.h>
+
+/* Including external dependencies */
+#include <NativeInteger.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Dependencies */
+typedef enum SBcAP_Cause {
+	SBcAP_Cause_message_accepted	= 0,
+	SBcAP_Cause_parameter_not_recognised	= 1,
+	SBcAP_Cause_parameter_value_invalid	= 2,
+	SBcAP_Cause_valid_message_not_identified	= 3,
+	SBcAP_Cause_tracking_area_not_valid	= 4,
+	SBcAP_Cause_unrecognised_message	= 5,
+	SBcAP_Cause_missing_mandatory_element	= 6,
+	SBcAP_Cause_mME_capacity_exceeded	= 7,
+	SBcAP_Cause_mME_memory_exceeded	= 8,
+	SBcAP_Cause_warning_broadcast_not_supported	= 9,
+	SBcAP_Cause_warning_broadcast_not_operational	= 10,
+	SBcAP_Cause_message_reference_already_used	= 11,
+	SBcAP_Cause_unspecifed_error	= 12,
+	SBcAP_Cause_transfer_syntax_error	= 13,
+	SBcAP_Cause_semantic_error	= 14,
+	SBcAP_Cause_message_not_compatible_with_receiver_state	= 15,
+	SBcAP_Cause_abstract_syntax_error_reject	= 16,
+	SBcAP_Cause_abstract_syntax_error_ignore_and_notify	= 17,
+	SBcAP_Cause_abstract_syntax_error_falsely_constructed_message	= 18
+} e_SBcAP_Cause;
+
+/* SBcAP_Cause */
+typedef long	 SBcAP_Cause_t;
+
+/* Implementation */
+extern asn_per_constraints_t asn_PER_type_SBcAP_Cause_constr_1;
+extern asn_TYPE_descriptor_t asn_DEF_SBcAP_Cause;
+asn_struct_free_f SBcAP_Cause_free;
+asn_struct_print_f SBcAP_Cause_print;
+asn_constr_check_f SBcAP_Cause_constraint;
+per_type_decoder_f SBcAP_Cause_decode_aper;
+per_type_encoder_f SBcAP_Cause_encode_aper;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _SBcAP_Cause_H_ */
+#include <asn_internal.h>
--- a/include/osmocom/sbcap/SBcAP_CellID-Cancelled-Item.h
+++ b/include/osmocom/sbcap/SBcAP_CellID-Cancelled-Item.h
@@ -0,0 +1,53 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "SBC-AP-IEs"
+ * 	found in "../../src/sbcap/asn1/SBC_AP_IEs.asn"
+ * 	`asn1c -S /home/pespin/dev/sysmocom/build/new/out/share/asn1c -fcompound-names -gen-APER -no-gen-BER -no-gen-XER -no-gen-JER -no-gen-OER -no-gen-UPER -no-gen-example`
+ */
+
+#ifndef	_SBcAP_CellID_Cancelled_Item_H_
+#define	_SBcAP_CellID_Cancelled_Item_H_
+
+
+#include <asn_application.h>
+
+/* Including external dependencies */
+#include <osmocom/sbcap/SBcAP_EUTRAN-CGI.h>
+#include <osmocom/sbcap/SBcAP_NumberOfBroadcasts.h>
+#include <constr_SEQUENCE.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Forward declarations */
+struct SBcAP_ProtocolExtensionContainer;
+
+/* SBcAP_CellID-Cancelled-Item */
+typedef struct SBcAP_CellID_Cancelled_Item {
+	SBcAP_EUTRAN_CGI_t	 eCGI;
+	SBcAP_NumberOfBroadcasts_t	 numberOfBroadcasts;
+	struct SBcAP_ProtocolExtensionContainer	*iE_Extensions;	/* OPTIONAL */
+	/*
+	 * This type is extensible,
+	 * possible extensions are below.
+	 */
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} SBcAP_CellID_Cancelled_Item_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_SBcAP_CellID_Cancelled_Item;
+extern asn_SEQUENCE_specifics_t asn_SPC_SBcAP_CellID_Cancelled_Item_specs_1;
+extern asn_TYPE_member_t asn_MBR_SBcAP_CellID_Cancelled_Item_1[3];
+
+#ifdef __cplusplus
+}
+#endif
+
+/* Referred external types */
+#include <osmocom/sbcap/SBcAP_ProtocolExtensionContainer.h>
+
+#endif	/* _SBcAP_CellID_Cancelled_Item_H_ */
+#include <asn_internal.h>
--- a/include/osmocom/sbcap/SBcAP_CellID-Cancelled-List-5GS.h
+++ b/include/osmocom/sbcap/SBcAP_CellID-Cancelled-List-5GS.h
@@ -0,0 +1,64 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "SBC-AP-IEs"
+ * 	found in "../../src/sbcap/asn1/SBC_AP_IEs.asn"
+ * 	`asn1c -S /home/pespin/dev/sysmocom/build/new/out/share/asn1c -fcompound-names -gen-APER -no-gen-BER -no-gen-XER -no-gen-JER -no-gen-OER -no-gen-UPER -no-gen-example`
+ */
+
+#ifndef	_SBcAP_CellID_Cancelled_List_5GS_H_
+#define	_SBcAP_CellID_Cancelled_List_5GS_H_
+
+
+#include <asn_application.h>
+
+/* Including external dependencies */
+#include <asn_SEQUENCE_OF.h>
+#include <osmocom/sbcap/SBcAP_NR-CGI.h>
+#include <osmocom/sbcap/SBcAP_NumberOfBroadcasts.h>
+#include <constr_SEQUENCE.h>
+#include <constr_SEQUENCE_OF.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Forward declarations */
+struct SBcAP_ProtocolExtensionContainer;
+
+/* Forward definitions */
+typedef struct SBcAP_CellID_Cancelled_List_5GS__Member {
+	SBcAP_NR_CGI_t	 nR_CGI;
+	SBcAP_NumberOfBroadcasts_t	 numberOfBroadcasts;
+	struct SBcAP_ProtocolExtensionContainer	*iE_Extensions;	/* OPTIONAL */
+	/*
+	 * This type is extensible,
+	 * possible extensions are below.
+	 */
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} CellID_Cancelled_List_5GS__Member;
+
+/* SBcAP_CellID-Cancelled-List-5GS */
+typedef struct SBcAP_CellID_Cancelled_List_5GS {
+	A_SEQUENCE_OF(CellID_Cancelled_List_5GS__Member) list;
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} SBcAP_CellID_Cancelled_List_5GS_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_SBcAP_CellID_Cancelled_List_5GS;
+extern asn_SET_OF_specifics_t asn_SPC_SBcAP_CellID_Cancelled_List_5GS_specs_1;
+extern asn_TYPE_member_t asn_MBR_SBcAP_CellID_Cancelled_List_5GS_1[1];
+extern asn_per_constraints_t asn_PER_type_SBcAP_CellID_Cancelled_List_5GS_constr_1;
+
+#ifdef __cplusplus
+}
+#endif
+
+/* Referred external types */
+#include <osmocom/sbcap/SBcAP_ProtocolExtensionContainer.h>
+
+#endif	/* _SBcAP_CellID_Cancelled_List_5GS_H_ */
+#include <asn_internal.h>
--- a/include/osmocom/sbcap/SBcAP_CellID-Cancelled-List.h
+++ b/include/osmocom/sbcap/SBcAP_CellID-Cancelled-List.h
@@ -0,0 +1,47 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "SBC-AP-IEs"
+ * 	found in "../../src/sbcap/asn1/SBC_AP_IEs.asn"
+ * 	`asn1c -S /home/pespin/dev/sysmocom/build/new/out/share/asn1c -fcompound-names -gen-APER -no-gen-BER -no-gen-XER -no-gen-JER -no-gen-OER -no-gen-UPER -no-gen-example`
+ */
+
+#ifndef	_SBcAP_CellID_Cancelled_List_H_
+#define	_SBcAP_CellID_Cancelled_List_H_
+
+
+#include <asn_application.h>
+
+/* Including external dependencies */
+#include <asn_SEQUENCE_OF.h>
+#include <constr_SEQUENCE_OF.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Forward declarations */
+struct SBcAP_CellID_Cancelled_Item;
+
+/* SBcAP_CellID-Cancelled-List */
+typedef struct SBcAP_CellID_Cancelled_List {
+	A_SEQUENCE_OF(struct SBcAP_CellID_Cancelled_Item) list;
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} SBcAP_CellID_Cancelled_List_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_SBcAP_CellID_Cancelled_List;
+extern asn_SET_OF_specifics_t asn_SPC_SBcAP_CellID_Cancelled_List_specs_1;
+extern asn_TYPE_member_t asn_MBR_SBcAP_CellID_Cancelled_List_1[1];
+extern asn_per_constraints_t asn_PER_type_SBcAP_CellID_Cancelled_List_constr_1;
+
+#ifdef __cplusplus
+}
+#endif
+
+/* Referred external types */
+#include <osmocom/sbcap/SBcAP_CellID-Cancelled-Item.h>
+
+#endif	/* _SBcAP_CellID_Cancelled_List_H_ */
+#include <asn_internal.h>
--- a/include/osmocom/sbcap/SBcAP_CellId-Broadcast-List-5GS.h
+++ b/include/osmocom/sbcap/SBcAP_CellId-Broadcast-List-5GS.h
@@ -0,0 +1,62 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "SBC-AP-IEs"
+ * 	found in "../../src/sbcap/asn1/SBC_AP_IEs.asn"
+ * 	`asn1c -S /home/pespin/dev/sysmocom/build/new/out/share/asn1c -fcompound-names -gen-APER -no-gen-BER -no-gen-XER -no-gen-JER -no-gen-OER -no-gen-UPER -no-gen-example`
+ */
+
+#ifndef	_SBcAP_CellId_Broadcast_List_5GS_H_
+#define	_SBcAP_CellId_Broadcast_List_5GS_H_
+
+
+#include <asn_application.h>
+
+/* Including external dependencies */
+#include <asn_SEQUENCE_OF.h>
+#include <osmocom/sbcap/SBcAP_NR-CGI.h>
+#include <constr_SEQUENCE.h>
+#include <constr_SEQUENCE_OF.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Forward declarations */
+struct SBcAP_ProtocolExtensionContainer;
+
+/* Forward definitions */
+typedef struct SBcAP_CellId_Broadcast_List_5GS__Member {
+	SBcAP_NR_CGI_t	 nR_CGI;
+	struct SBcAP_ProtocolExtensionContainer	*iE_Extensions;	/* OPTIONAL */
+	/*
+	 * This type is extensible,
+	 * possible extensions are below.
+	 */
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} CellId_Broadcast_List_5GS__Member;
+
+/* SBcAP_CellId-Broadcast-List-5GS */
+typedef struct SBcAP_CellId_Broadcast_List_5GS {
+	A_SEQUENCE_OF(CellId_Broadcast_List_5GS__Member) list;
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} SBcAP_CellId_Broadcast_List_5GS_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_SBcAP_CellId_Broadcast_List_5GS;
+extern asn_SET_OF_specifics_t asn_SPC_SBcAP_CellId_Broadcast_List_5GS_specs_1;
+extern asn_TYPE_member_t asn_MBR_SBcAP_CellId_Broadcast_List_5GS_1[1];
+extern asn_per_constraints_t asn_PER_type_SBcAP_CellId_Broadcast_List_5GS_constr_1;
+
+#ifdef __cplusplus
+}
+#endif
+
+/* Referred external types */
+#include <osmocom/sbcap/SBcAP_ProtocolExtensionContainer.h>
+
+#endif	/* _SBcAP_CellId_Broadcast_List_5GS_H_ */
+#include <asn_internal.h>
--- a/include/osmocom/sbcap/SBcAP_CellId-Broadcast-List-Item.h
+++ b/include/osmocom/sbcap/SBcAP_CellId-Broadcast-List-Item.h
@@ -0,0 +1,51 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "SBC-AP-IEs"
+ * 	found in "../../src/sbcap/asn1/SBC_AP_IEs.asn"
+ * 	`asn1c -S /home/pespin/dev/sysmocom/build/new/out/share/asn1c -fcompound-names -gen-APER -no-gen-BER -no-gen-XER -no-gen-JER -no-gen-OER -no-gen-UPER -no-gen-example`
+ */
+
+#ifndef	_SBcAP_CellId_Broadcast_List_Item_H_
+#define	_SBcAP_CellId_Broadcast_List_Item_H_
+
+
+#include <asn_application.h>
+
+/* Including external dependencies */
+#include <osmocom/sbcap/SBcAP_EUTRAN-CGI.h>
+#include <constr_SEQUENCE.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Forward declarations */
+struct SBcAP_ProtocolExtensionContainer;
+
+/* SBcAP_CellId-Broadcast-List-Item */
+typedef struct SBcAP_CellId_Broadcast_List_Item {
+	SBcAP_EUTRAN_CGI_t	 eCGI;
+	struct SBcAP_ProtocolExtensionContainer	*iE_Extensions;	/* OPTIONAL */
+	/*
+	 * This type is extensible,
+	 * possible extensions are below.
+	 */
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} SBcAP_CellId_Broadcast_List_Item_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_SBcAP_CellId_Broadcast_List_Item;
+extern asn_SEQUENCE_specifics_t asn_SPC_SBcAP_CellId_Broadcast_List_Item_specs_1;
+extern asn_TYPE_member_t asn_MBR_SBcAP_CellId_Broadcast_List_Item_1[2];
+
+#ifdef __cplusplus
+}
+#endif
+
+/* Referred external types */
+#include <osmocom/sbcap/SBcAP_ProtocolExtensionContainer.h>
+
+#endif	/* _SBcAP_CellId_Broadcast_List_Item_H_ */
+#include <asn_internal.h>
--- a/include/osmocom/sbcap/SBcAP_CellId-Broadcast-List.h
+++ b/include/osmocom/sbcap/SBcAP_CellId-Broadcast-List.h
@@ -0,0 +1,47 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "SBC-AP-IEs"
+ * 	found in "../../src/sbcap/asn1/SBC_AP_IEs.asn"
+ * 	`asn1c -S /home/pespin/dev/sysmocom/build/new/out/share/asn1c -fcompound-names -gen-APER -no-gen-BER -no-gen-XER -no-gen-JER -no-gen-OER -no-gen-UPER -no-gen-example`
+ */
+
+#ifndef	_SBcAP_CellId_Broadcast_List_H_
+#define	_SBcAP_CellId_Broadcast_List_H_
+
+
+#include <asn_application.h>
+
+/* Including external dependencies */
+#include <asn_SEQUENCE_OF.h>
+#include <constr_SEQUENCE_OF.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Forward declarations */
+struct SBcAP_CellId_Broadcast_List_Item;
+
+/* SBcAP_CellId-Broadcast-List */
+typedef struct SBcAP_CellId_Broadcast_List {
+	A_SEQUENCE_OF(struct SBcAP_CellId_Broadcast_List_Item) list;
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} SBcAP_CellId_Broadcast_List_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_SBcAP_CellId_Broadcast_List;
+extern asn_SET_OF_specifics_t asn_SPC_SBcAP_CellId_Broadcast_List_specs_1;
+extern asn_TYPE_member_t asn_MBR_SBcAP_CellId_Broadcast_List_1[1];
+extern asn_per_constraints_t asn_PER_type_SBcAP_CellId_Broadcast_List_constr_1;
+
+#ifdef __cplusplus
+}
+#endif
+
+/* Referred external types */
+#include <osmocom/sbcap/SBcAP_CellId-Broadcast-List-Item.h>
+
+#endif	/* _SBcAP_CellId_Broadcast_List_H_ */
+#include <asn_internal.h>
--- a/include/osmocom/sbcap/SBcAP_CellIdentity.h
+++ b/include/osmocom/sbcap/SBcAP_CellIdentity.h
@@ -0,0 +1,38 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "SBC-AP-IEs"
+ * 	found in "../../src/sbcap/asn1/SBC_AP_IEs.asn"
+ * 	`asn1c -S /home/pespin/dev/sysmocom/build/new/out/share/asn1c -fcompound-names -gen-APER -no-gen-BER -no-gen-XER -no-gen-JER -no-gen-OER -no-gen-UPER -no-gen-example`
+ */
+
+#ifndef	_SBcAP_CellIdentity_H_
+#define	_SBcAP_CellIdentity_H_
+
+
+#include <asn_application.h>
+
+/* Including external dependencies */
+#include <BIT_STRING.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* SBcAP_CellIdentity */
+typedef BIT_STRING_t	 SBcAP_CellIdentity_t;
+
+/* Implementation */
+extern asn_per_constraints_t asn_PER_type_SBcAP_CellIdentity_constr_1;
+extern asn_TYPE_descriptor_t asn_DEF_SBcAP_CellIdentity;
+asn_struct_free_f SBcAP_CellIdentity_free;
+asn_struct_print_f SBcAP_CellIdentity_print;
+asn_constr_check_f SBcAP_CellIdentity_constraint;
+per_type_decoder_f SBcAP_CellIdentity_decode_aper;
+per_type_encoder_f SBcAP_CellIdentity_encode_aper;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _SBcAP_CellIdentity_H_ */
+#include <asn_internal.h>
--- a/include/osmocom/sbcap/SBcAP_Concurrent-Warning-Message-Indicator.h
+++ b/include/osmocom/sbcap/SBcAP_Concurrent-Warning-Message-Indicator.h
@@ -0,0 +1,44 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "SBC-AP-IEs"
+ * 	found in "../../src/sbcap/asn1/SBC_AP_IEs.asn"
+ * 	`asn1c -S /home/pespin/dev/sysmocom/build/new/out/share/asn1c -fcompound-names -gen-APER -no-gen-BER -no-gen-XER -no-gen-JER -no-gen-OER -no-gen-UPER -no-gen-example`
+ */
+
+#ifndef	_SBcAP_Concurrent_Warning_Message_Indicator_H_
+#define	_SBcAP_Concurrent_Warning_Message_Indicator_H_
+
+
+#include <asn_application.h>
+
+/* Including external dependencies */
+#include <NativeEnumerated.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Dependencies */
+typedef enum SBcAP_Concurrent_Warning_Message_Indicator {
+	SBcAP_Concurrent_Warning_Message_Indicator_true	= 0
+} e_SBcAP_Concurrent_Warning_Message_Indicator;
+
+/* SBcAP_Concurrent-Warning-Message-Indicator */
+typedef long	 SBcAP_Concurrent_Warning_Message_Indicator_t;
+
+/* Implementation */
+extern asn_per_constraints_t asn_PER_type_SBcAP_Concurrent_Warning_Message_Indicator_constr_1;
+extern asn_TYPE_descriptor_t asn_DEF_SBcAP_Concurrent_Warning_Message_Indicator;
+extern const asn_INTEGER_specifics_t asn_SPC_Concurrent_Warning_Message_Indicator_specs_1;
+asn_struct_free_f Concurrent_Warning_Message_Indicator_free;
+asn_struct_print_f Concurrent_Warning_Message_Indicator_print;
+asn_constr_check_f Concurrent_Warning_Message_Indicator_constraint;
+per_type_decoder_f Concurrent_Warning_Message_Indicator_decode_aper;
+per_type_encoder_f Concurrent_Warning_Message_Indicator_encode_aper;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _SBcAP_Concurrent_Warning_Message_Indicator_H_ */
+#include <asn_internal.h>
--- a/include/osmocom/sbcap/SBcAP_Criticality-Diagnostics.h
+++ b/include/osmocom/sbcap/SBcAP_Criticality-Diagnostics.h
@@ -0,0 +1,58 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "SBC-AP-IEs"
+ * 	found in "../../src/sbcap/asn1/SBC_AP_IEs.asn"
+ * 	`asn1c -S /home/pespin/dev/sysmocom/build/new/out/share/asn1c -fcompound-names -gen-APER -no-gen-BER -no-gen-XER -no-gen-JER -no-gen-OER -no-gen-UPER -no-gen-example`
+ */
+
+#ifndef	_SBcAP_Criticality_Diagnostics_H_
+#define	_SBcAP_Criticality_Diagnostics_H_
+
+
+#include <asn_application.h>
+
+/* Including external dependencies */
+#include <osmocom/sbcap/SBcAP_ProcedureCode.h>
+#include <osmocom/sbcap/SBcAP_TriggeringMessage.h>
+#include <osmocom/sbcap/SBcAP_Criticality.h>
+#include <constr_SEQUENCE.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Forward declarations */
+struct SBcAP_CriticalityDiagnostics_IE_List;
+struct SBcAP_ProtocolExtensionContainer;
+
+/* SBcAP_Criticality-Diagnostics */
+typedef struct SBcAP_Criticality_Diagnostics {
+	SBcAP_ProcedureCode_t	*procedureCode;	/* OPTIONAL */
+	SBcAP_TriggeringMessage_t	*triggeringMessage;	/* OPTIONAL */
+	SBcAP_Criticality_t	*procedureCriticality;	/* OPTIONAL */
+	struct SBcAP_CriticalityDiagnostics_IE_List	*iE_CriticalityDiagnostics;	/* OPTIONAL */
+	struct SBcAP_ProtocolExtensionContainer	*iE_Extensions;	/* OPTIONAL */
+	/*
+	 * This type is extensible,
+	 * possible extensions are below.
+	 */
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} SBcAP_Criticality_Diagnostics_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_SBcAP_Criticality_Diagnostics;
+extern asn_SEQUENCE_specifics_t asn_SPC_SBcAP_Criticality_Diagnostics_specs_1;
+extern asn_TYPE_member_t asn_MBR_SBcAP_Criticality_Diagnostics_1[5];
+
+#ifdef __cplusplus
+}
+#endif
+
+/* Referred external types */
+#include <osmocom/sbcap/SBcAP_CriticalityDiagnostics-IE-List.h>
+#include <osmocom/sbcap/SBcAP_ProtocolExtensionContainer.h>
+
+#endif	/* _SBcAP_Criticality_Diagnostics_H_ */
+#include <asn_internal.h>
--- a/include/osmocom/sbcap/SBcAP_Criticality.h
+++ b/include/osmocom/sbcap/SBcAP_Criticality.h
@@ -0,0 +1,46 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "SBC-AP-CommonDataTypes"
+ * 	found in "../../src/sbcap/asn1/SBC_AP_CommonDataTypes.asn"
+ * 	`asn1c -S /home/pespin/dev/sysmocom/build/new/out/share/asn1c -fcompound-names -gen-APER -no-gen-BER -no-gen-XER -no-gen-JER -no-gen-OER -no-gen-UPER -no-gen-example`
+ */
+
+#ifndef	_SBcAP_Criticality_H_
+#define	_SBcAP_Criticality_H_
+
+
+#include <asn_application.h>
+
+/* Including external dependencies */
+#include <NativeEnumerated.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Dependencies */
+typedef enum SBcAP_Criticality {
+	SBcAP_Criticality_reject	= 0,
+	SBcAP_Criticality_ignore	= 1,
+	SBcAP_Criticality_notify	= 2
+} e_SBcAP_Criticality;
+
+/* SBcAP_Criticality */
+typedef long	 SBcAP_Criticality_t;
+
+/* Implementation */
+extern asn_per_constraints_t asn_PER_type_SBcAP_Criticality_constr_1;
+extern asn_TYPE_descriptor_t asn_DEF_SBcAP_Criticality;
+extern const asn_INTEGER_specifics_t asn_SPC_Criticality_specs_1;
+asn_struct_free_f Criticality_free;
+asn_struct_print_f Criticality_print;
+asn_constr_check_f Criticality_constraint;
+per_type_decoder_f Criticality_decode_aper;
+per_type_encoder_f Criticality_encode_aper;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _SBcAP_Criticality_H_ */
+#include <asn_internal.h>
--- a/include/osmocom/sbcap/SBcAP_CriticalityDiagnostics-IE-List.h
+++ b/include/osmocom/sbcap/SBcAP_CriticalityDiagnostics-IE-List.h
@@ -0,0 +1,66 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "SBC-AP-IEs"
+ * 	found in "../../src/sbcap/asn1/SBC_AP_IEs.asn"
+ * 	`asn1c -S /home/pespin/dev/sysmocom/build/new/out/share/asn1c -fcompound-names -gen-APER -no-gen-BER -no-gen-XER -no-gen-JER -no-gen-OER -no-gen-UPER -no-gen-example`
+ */
+
+#ifndef	_SBcAP_CriticalityDiagnostics_IE_List_H_
+#define	_SBcAP_CriticalityDiagnostics_IE_List_H_
+
+
+#include <asn_application.h>
+
+/* Including external dependencies */
+#include <asn_SEQUENCE_OF.h>
+#include <osmocom/sbcap/SBcAP_Criticality.h>
+#include <osmocom/sbcap/SBcAP_ProtocolIE-ID.h>
+#include <osmocom/sbcap/SBcAP_TypeOfError.h>
+#include <constr_SEQUENCE.h>
+#include <constr_SEQUENCE_OF.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Forward declarations */
+struct SBcAP_ProtocolExtensionContainer;
+
+/* Forward definitions */
+typedef struct SBcAP_CriticalityDiagnostics_IE_List__Member {
+	SBcAP_Criticality_t	 iECriticality;
+	SBcAP_ProtocolIE_ID_t	 iE_ID;
+	SBcAP_TypeOfError_t	 typeOfError;
+	struct SBcAP_ProtocolExtensionContainer	*iE_Extensions;	/* OPTIONAL */
+	/*
+	 * This type is extensible,
+	 * possible extensions are below.
+	 */
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} CriticalityDiagnostics_IE_List__Member;
+
+/* SBcAP_CriticalityDiagnostics-IE-List */
+typedef struct SBcAP_CriticalityDiagnostics_IE_List {
+	A_SEQUENCE_OF(CriticalityDiagnostics_IE_List__Member) list;
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} SBcAP_CriticalityDiagnostics_IE_List_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_SBcAP_CriticalityDiagnostics_IE_List;
+extern asn_SET_OF_specifics_t asn_SPC_SBcAP_CriticalityDiagnostics_IE_List_specs_1;
+extern asn_TYPE_member_t asn_MBR_SBcAP_CriticalityDiagnostics_IE_List_1[1];
+extern asn_per_constraints_t asn_PER_type_SBcAP_CriticalityDiagnostics_IE_List_constr_1;
+
+#ifdef __cplusplus
+}
+#endif
+
+/* Referred external types */
+#include <osmocom/sbcap/SBcAP_ProtocolExtensionContainer.h>
+
+#endif	/* _SBcAP_CriticalityDiagnostics_IE_List_H_ */
+#include <asn_internal.h>
--- a/include/osmocom/sbcap/SBcAP_Data-Coding-Scheme.h
+++ b/include/osmocom/sbcap/SBcAP_Data-Coding-Scheme.h
@@ -0,0 +1,38 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "SBC-AP-IEs"
+ * 	found in "../../src/sbcap/asn1/SBC_AP_IEs.asn"
+ * 	`asn1c -S /home/pespin/dev/sysmocom/build/new/out/share/asn1c -fcompound-names -gen-APER -no-gen-BER -no-gen-XER -no-gen-JER -no-gen-OER -no-gen-UPER -no-gen-example`
+ */
+
+#ifndef	_SBcAP_Data_Coding_Scheme_H_
+#define	_SBcAP_Data_Coding_Scheme_H_
+
+
+#include <asn_application.h>
+
+/* Including external dependencies */
+#include <BIT_STRING.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* SBcAP_Data-Coding-Scheme */
+typedef BIT_STRING_t	 SBcAP_Data_Coding_Scheme_t;
+
+/* Implementation */
+extern asn_per_constraints_t asn_PER_type_SBcAP_Data_Coding_Scheme_constr_1;
+extern asn_TYPE_descriptor_t asn_DEF_SBcAP_Data_Coding_Scheme;
+asn_struct_free_f SBcAP_Data_Coding_Scheme_free;
+asn_struct_print_f SBcAP_Data_Coding_Scheme_print;
+asn_constr_check_f SBcAP_Data_Coding_Scheme_constraint;
+per_type_decoder_f SBcAP_Data_Coding_Scheme_decode_aper;
+per_type_encoder_f SBcAP_Data_Coding_Scheme_encode_aper;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _SBcAP_Data_Coding_Scheme_H_ */
+#include <asn_internal.h>
--- a/include/osmocom/sbcap/SBcAP_ECGIList.h
+++ b/include/osmocom/sbcap/SBcAP_ECGIList.h
@@ -0,0 +1,47 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "SBC-AP-IEs"
+ * 	found in "../../src/sbcap/asn1/SBC_AP_IEs.asn"
+ * 	`asn1c -S /home/pespin/dev/sysmocom/build/new/out/share/asn1c -fcompound-names -gen-APER -no-gen-BER -no-gen-XER -no-gen-JER -no-gen-OER -no-gen-UPER -no-gen-example`
+ */
+
+#ifndef	_SBcAP_ECGIList_H_
+#define	_SBcAP_ECGIList_H_
+
+
+#include <asn_application.h>
+
+/* Including external dependencies */
+#include <asn_SEQUENCE_OF.h>
+#include <constr_SEQUENCE_OF.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Forward declarations */
+struct SBcAP_EUTRAN_CGI;
+
+/* SBcAP_ECGIList */
+typedef struct SBcAP_ECGIList {
+	A_SEQUENCE_OF(struct SBcAP_EUTRAN_CGI) list;
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} SBcAP_ECGIList_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_SBcAP_ECGIList;
+extern asn_SET_OF_specifics_t asn_SPC_SBcAP_ECGIList_specs_1;
+extern asn_TYPE_member_t asn_MBR_SBcAP_ECGIList_1[1];
+extern asn_per_constraints_t asn_PER_type_SBcAP_ECGIList_constr_1;
+
+#ifdef __cplusplus
+}
+#endif
+
+/* Referred external types */
+#include <osmocom/sbcap/SBcAP_EUTRAN-CGI.h>
+
+#endif	/* _SBcAP_ECGIList_H_ */
+#include <asn_internal.h>
--- a/include/osmocom/sbcap/SBcAP_ENB-ID.h
+++ b/include/osmocom/sbcap/SBcAP_ENB-ID.h
@@ -0,0 +1,61 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "SBC-AP-IEs"
+ * 	found in "../../src/sbcap/asn1/SBC_AP_IEs.asn"
+ * 	`asn1c -S /home/pespin/dev/sysmocom/build/new/out/share/asn1c -fcompound-names -gen-APER -no-gen-BER -no-gen-XER -no-gen-JER -no-gen-OER -no-gen-UPER -no-gen-example`
+ */
+
+#ifndef	_SBcAP_ENB_ID_H_
+#define	_SBcAP_ENB_ID_H_
+
+
+#include <asn_application.h>
+
+/* Including external dependencies */
+#include <BIT_STRING.h>
+#include <constr_CHOICE.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Dependencies */
+typedef enum SBcAP_ENB_ID_PR {
+	SBcAP_ENB_ID_PR_NOTHING,	/* No components present */
+	SBcAP_ENB_ID_PR_macroENB_ID,
+	SBcAP_ENB_ID_PR_homeENB_ID,
+	/* Extensions may appear below */
+	SBcAP_ENB_ID_PR_short_macroENB_ID,
+	SBcAP_ENB_ID_PR_long_macroENB_ID
+} SBcAP_ENB_ID_PR;
+
+/* SBcAP_ENB-ID */
+typedef struct SBcAP_ENB_ID {
+	SBcAP_ENB_ID_PR present;
+	union SBcAP_ENB_ID_u {
+		BIT_STRING_t	 macroENB_ID;
+		BIT_STRING_t	 homeENB_ID;
+		/*
+		 * This type is extensible,
+		 * possible extensions are below.
+		 */
+		BIT_STRING_t	 short_macroENB_ID;
+		BIT_STRING_t	 long_macroENB_ID;
+	} choice;
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} SBcAP_ENB_ID_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_SBcAP_ENB_ID;
+extern asn_CHOICE_specifics_t asn_SPC_SBcAP_ENB_ID_specs_1;
+extern asn_TYPE_member_t asn_MBR_SBcAP_ENB_ID_1[4];
+extern asn_per_constraints_t asn_PER_type_SBcAP_ENB_ID_constr_1;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _SBcAP_ENB_ID_H_ */
+#include <asn_internal.h>
--- a/include/osmocom/sbcap/SBcAP_EUTRAN-CGI.h
+++ b/include/osmocom/sbcap/SBcAP_EUTRAN-CGI.h
@@ -0,0 +1,52 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "SBC-AP-IEs"
+ * 	found in "../../src/sbcap/asn1/SBC_AP_IEs.asn"
+ * 	`asn1c -S /home/pespin/dev/sysmocom/build/new/out/share/asn1c -fcompound-names -gen-APER -no-gen-BER -no-gen-XER -no-gen-JER -no-gen-OER -no-gen-UPER -no-gen-example`
+ */
+
+#ifndef	_SBcAP_EUTRAN_CGI_H_
+#define	_SBcAP_EUTRAN_CGI_H_
+
+
+#include <asn_application.h>
+
+/* Including external dependencies */
+#include <osmocom/sbcap/SBcAP_PLMNidentity.h>
+#include <osmocom/sbcap/SBcAP_CellIdentity.h>
+#include <constr_SEQUENCE.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Forward declarations */
+struct SBcAP_ProtocolExtensionContainer;
+
+/* SBcAP_EUTRAN-CGI */
+typedef struct SBcAP_EUTRAN_CGI {
+	SBcAP_PLMNidentity_t	 pLMNidentity;
+	SBcAP_CellIdentity_t	 cell_ID;
+	struct SBcAP_ProtocolExtensionContainer	*iE_Extensions;	/* OPTIONAL */
+	/*
+	 * This type is extensible,
+	 * possible extensions are below.
+	 */
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} SBcAP_EUTRAN_CGI_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_SBcAP_EUTRAN_CGI;
+extern asn_SEQUENCE_specifics_t asn_SPC_SBcAP_EUTRAN_CGI_specs_1;
+extern asn_TYPE_member_t asn_MBR_SBcAP_EUTRAN_CGI_1[3];
+
+#ifdef __cplusplus
+}
+#endif
+
+/* Referred external types */
+
+#endif	/* _SBcAP_EUTRAN_CGI_H_ */
+#include <asn_internal.h>
--- a/include/osmocom/sbcap/SBcAP_EXTERNAL.h
+++ b/include/osmocom/sbcap/SBcAP_EXTERNAL.h
@@ -0,0 +1,65 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "ASN1C-UsefulInformationObjectClasses"
+ * 	found in "/home/pespin/dev/sysmocom/build/new/out/share/asn1c/standard-modules/ASN1C-UsefulInformationObjectClasses.asn1"
+ * 	`asn1c -S /home/pespin/dev/sysmocom/build/new/out/share/asn1c -fcompound-names -gen-APER -no-gen-BER -no-gen-XER -no-gen-JER -no-gen-OER -no-gen-UPER -no-gen-example`
+ */
+
+#ifndef	_SBcAP_EXTERNAL_H_
+#define	_SBcAP_EXTERNAL_H_
+
+
+#include <asn_application.h>
+
+/* Including external dependencies */
+#include <OBJECT_IDENTIFIER.h>
+#include <NativeInteger.h>
+#include <ObjectDescriptor.h>
+#include <ANY.h>
+#include <OCTET_STRING.h>
+#include <BIT_STRING.h>
+#include <constr_CHOICE.h>
+#include <constr_SEQUENCE.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Dependencies */
+typedef enum SBcAP_EXTERNAL__encoding_PR {
+	SBcAP_EXTERNAL__encoding_PR_NOTHING,	/* No components present */
+	SBcAP_EXTERNAL__encoding_PR_single_ASN1_type,
+	SBcAP_EXTERNAL__encoding_PR_octet_aligned,
+	SBcAP_EXTERNAL__encoding_PR_arbitrary
+} SBcAP_EXTERNAL__encoding_PR;
+
+/* SBcAP_EXTERNAL */
+typedef struct SBcAP_EXTERNAL {
+	OBJECT_IDENTIFIER_t	*direct_reference;	/* OPTIONAL */
+	long	*indirect_reference;	/* OPTIONAL */
+	ObjectDescriptor_t	*data_value_descriptor;	/* OPTIONAL */
+	struct SBcAP_EXTERNAL__encoding {
+		SBcAP_EXTERNAL__encoding_PR present;
+		union SBcAP_EXTERNAL__SBcAP_encoding_u {
+			ANY_t	 single_ASN1_type;
+			OCTET_STRING_t	 octet_aligned;
+			BIT_STRING_t	 arbitrary;
+		} choice;
+		
+		/* Context for parsing across buffer boundaries */
+		asn_struct_ctx_t _asn_ctx;
+	} encoding;
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} SBcAP_EXTERNAL_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_SBcAP_EXTERNAL;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _SBcAP_EXTERNAL_H_ */
+#include <asn_internal.h>
--- a/include/osmocom/sbcap/SBcAP_Emergency-Area-ID-List.h
+++ b/include/osmocom/sbcap/SBcAP_Emergency-Area-ID-List.h
@@ -0,0 +1,42 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "SBC-AP-IEs"
+ * 	found in "../../src/sbcap/asn1/SBC_AP_IEs.asn"
+ * 	`asn1c -S /home/pespin/dev/sysmocom/build/new/out/share/asn1c -fcompound-names -gen-APER -no-gen-BER -no-gen-XER -no-gen-JER -no-gen-OER -no-gen-UPER -no-gen-example`
+ */
+
+#ifndef	_SBcAP_Emergency_Area_ID_List_H_
+#define	_SBcAP_Emergency_Area_ID_List_H_
+
+
+#include <asn_application.h>
+
+/* Including external dependencies */
+#include <osmocom/sbcap/SBcAP_Emergency-Area-ID.h>
+#include <asn_SEQUENCE_OF.h>
+#include <constr_SEQUENCE_OF.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* SBcAP_Emergency-Area-ID-List */
+typedef struct SBcAP_Emergency_Area_ID_List {
+	A_SEQUENCE_OF(SBcAP_Emergency_Area_ID_t) list;
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} SBcAP_Emergency_Area_ID_List_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_SBcAP_Emergency_Area_ID_List;
+extern asn_SET_OF_specifics_t asn_SPC_SBcAP_Emergency_Area_ID_List_specs_1;
+extern asn_TYPE_member_t asn_MBR_SBcAP_Emergency_Area_ID_List_1[1];
+extern asn_per_constraints_t asn_PER_type_SBcAP_Emergency_Area_ID_List_constr_1;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _SBcAP_Emergency_Area_ID_List_H_ */
+#include <asn_internal.h>
--- a/include/osmocom/sbcap/SBcAP_Emergency-Area-ID.h
+++ b/include/osmocom/sbcap/SBcAP_Emergency-Area-ID.h
@@ -0,0 +1,38 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "SBC-AP-IEs"
+ * 	found in "../../src/sbcap/asn1/SBC_AP_IEs.asn"
+ * 	`asn1c -S /home/pespin/dev/sysmocom/build/new/out/share/asn1c -fcompound-names -gen-APER -no-gen-BER -no-gen-XER -no-gen-JER -no-gen-OER -no-gen-UPER -no-gen-example`
+ */
+
+#ifndef	_SBcAP_Emergency_Area_ID_H_
+#define	_SBcAP_Emergency_Area_ID_H_
+
+
+#include <asn_application.h>
+
+/* Including external dependencies */
+#include <OCTET_STRING.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* SBcAP_Emergency-Area-ID */
+typedef OCTET_STRING_t	 SBcAP_Emergency_Area_ID_t;
+
+/* Implementation */
+extern asn_per_constraints_t asn_PER_type_SBcAP_Emergency_Area_ID_constr_1;
+extern asn_TYPE_descriptor_t asn_DEF_SBcAP_Emergency_Area_ID;
+asn_struct_free_f SBcAP_Emergency_Area_ID_free;
+asn_struct_print_f SBcAP_Emergency_Area_ID_print;
+asn_constr_check_f SBcAP_Emergency_Area_ID_constraint;
+per_type_decoder_f SBcAP_Emergency_Area_ID_decode_aper;
+per_type_encoder_f SBcAP_Emergency_Area_ID_encode_aper;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _SBcAP_Emergency_Area_ID_H_ */
+#include <asn_internal.h>
--- a/include/osmocom/sbcap/SBcAP_EmergencyAreaID-Broadcast-List-Item.h
+++ b/include/osmocom/sbcap/SBcAP_EmergencyAreaID-Broadcast-List-Item.h
@@ -0,0 +1,53 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "SBC-AP-IEs"
+ * 	found in "../../src/sbcap/asn1/SBC_AP_IEs.asn"
+ * 	`asn1c -S /home/pespin/dev/sysmocom/build/new/out/share/asn1c -fcompound-names -gen-APER -no-gen-BER -no-gen-XER -no-gen-JER -no-gen-OER -no-gen-UPER -no-gen-example`
+ */
+
+#ifndef	_SBcAP_EmergencyAreaID_Broadcast_List_Item_H_
+#define	_SBcAP_EmergencyAreaID_Broadcast_List_Item_H_
+
+
+#include <asn_application.h>
+
+/* Including external dependencies */
+#include <osmocom/sbcap/SBcAP_Emergency-Area-ID.h>
+#include <osmocom/sbcap/SBcAP_ScheduledCellinEAI.h>
+#include <constr_SEQUENCE.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Forward declarations */
+struct SBcAP_ProtocolExtensionContainer;
+
+/* SBcAP_EmergencyAreaID-Broadcast-List-Item */
+typedef struct SBcAP_EmergencyAreaID_Broadcast_List_Item {
+	SBcAP_Emergency_Area_ID_t	 emergencyAreaID;
+	SBcAP_ScheduledCellinEAI_t	 scheduledCellinEAI;
+	struct SBcAP_ProtocolExtensionContainer	*iE_Extensions;	/* OPTIONAL */
+	/*
+	 * This type is extensible,
+	 * possible extensions are below.
+	 */
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} SBcAP_EmergencyAreaID_Broadcast_List_Item_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_SBcAP_EmergencyAreaID_Broadcast_List_Item;
+extern asn_SEQUENCE_specifics_t asn_SPC_SBcAP_EmergencyAreaID_Broadcast_List_Item_specs_1;
+extern asn_TYPE_member_t asn_MBR_SBcAP_EmergencyAreaID_Broadcast_List_Item_1[3];
+
+#ifdef __cplusplus
+}
+#endif
+
+/* Referred external types */
+#include <osmocom/sbcap/SBcAP_ProtocolExtensionContainer.h>
+
+#endif	/* _SBcAP_EmergencyAreaID_Broadcast_List_Item_H_ */
+#include <asn_internal.h>
--- a/include/osmocom/sbcap/SBcAP_EmergencyAreaID-Broadcast-List.h
+++ b/include/osmocom/sbcap/SBcAP_EmergencyAreaID-Broadcast-List.h
@@ -0,0 +1,47 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "SBC-AP-IEs"
+ * 	found in "../../src/sbcap/asn1/SBC_AP_IEs.asn"
+ * 	`asn1c -S /home/pespin/dev/sysmocom/build/new/out/share/asn1c -fcompound-names -gen-APER -no-gen-BER -no-gen-XER -no-gen-JER -no-gen-OER -no-gen-UPER -no-gen-example`
+ */
+
+#ifndef	_SBcAP_EmergencyAreaID_Broadcast_List_H_
+#define	_SBcAP_EmergencyAreaID_Broadcast_List_H_
+
+
+#include <asn_application.h>
+
+/* Including external dependencies */
+#include <asn_SEQUENCE_OF.h>
+#include <constr_SEQUENCE_OF.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Forward declarations */
+struct SBcAP_EmergencyAreaID_Broadcast_List_Item;
+
+/* SBcAP_EmergencyAreaID-Broadcast-List */
+typedef struct SBcAP_EmergencyAreaID_Broadcast_List {
+	A_SEQUENCE_OF(struct SBcAP_EmergencyAreaID_Broadcast_List_Item) list;
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} SBcAP_EmergencyAreaID_Broadcast_List_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_SBcAP_EmergencyAreaID_Broadcast_List;
+extern asn_SET_OF_specifics_t asn_SPC_SBcAP_EmergencyAreaID_Broadcast_List_specs_1;
+extern asn_TYPE_member_t asn_MBR_SBcAP_EmergencyAreaID_Broadcast_List_1[1];
+extern asn_per_constraints_t asn_PER_type_SBcAP_EmergencyAreaID_Broadcast_List_constr_1;
+
+#ifdef __cplusplus
+}
+#endif
+
+/* Referred external types */
+#include <osmocom/sbcap/SBcAP_EmergencyAreaID-Broadcast-List-Item.h>
+
+#endif	/* _SBcAP_EmergencyAreaID_Broadcast_List_H_ */
+#include <asn_internal.h>
--- a/include/osmocom/sbcap/SBcAP_EmergencyAreaID-Cancelled-Item.h
+++ b/include/osmocom/sbcap/SBcAP_EmergencyAreaID-Cancelled-Item.h
@@ -0,0 +1,53 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "SBC-AP-IEs"
+ * 	found in "../../src/sbcap/asn1/SBC_AP_IEs.asn"
+ * 	`asn1c -S /home/pespin/dev/sysmocom/build/new/out/share/asn1c -fcompound-names -gen-APER -no-gen-BER -no-gen-XER -no-gen-JER -no-gen-OER -no-gen-UPER -no-gen-example`
+ */
+
+#ifndef	_SBcAP_EmergencyAreaID_Cancelled_Item_H_
+#define	_SBcAP_EmergencyAreaID_Cancelled_Item_H_
+
+
+#include <asn_application.h>
+
+/* Including external dependencies */
+#include <osmocom/sbcap/SBcAP_Emergency-Area-ID.h>
+#include <osmocom/sbcap/SBcAP_CancelledCellinEAI.h>
+#include <constr_SEQUENCE.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Forward declarations */
+struct SBcAP_ProtocolExtensionContainer;
+
+/* SBcAP_EmergencyAreaID-Cancelled-Item */
+typedef struct SBcAP_EmergencyAreaID_Cancelled_Item {
+	SBcAP_Emergency_Area_ID_t	 emergencyAreaID;
+	SBcAP_CancelledCellinEAI_t	 cancelledCellinEAI;
+	struct SBcAP_ProtocolExtensionContainer	*iE_Extensions;	/* OPTIONAL */
+	/*
+	 * This type is extensible,
+	 * possible extensions are below.
+	 */
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} SBcAP_EmergencyAreaID_Cancelled_Item_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_SBcAP_EmergencyAreaID_Cancelled_Item;
+extern asn_SEQUENCE_specifics_t asn_SPC_SBcAP_EmergencyAreaID_Cancelled_Item_specs_1;
+extern asn_TYPE_member_t asn_MBR_SBcAP_EmergencyAreaID_Cancelled_Item_1[3];
+
+#ifdef __cplusplus
+}
+#endif
+
+/* Referred external types */
+#include <osmocom/sbcap/SBcAP_ProtocolExtensionContainer.h>
+
+#endif	/* _SBcAP_EmergencyAreaID_Cancelled_Item_H_ */
+#include <asn_internal.h>
--- a/include/osmocom/sbcap/SBcAP_EmergencyAreaID-Cancelled-List.h
+++ b/include/osmocom/sbcap/SBcAP_EmergencyAreaID-Cancelled-List.h
@@ -0,0 +1,47 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "SBC-AP-IEs"
+ * 	found in "../../src/sbcap/asn1/SBC_AP_IEs.asn"
+ * 	`asn1c -S /home/pespin/dev/sysmocom/build/new/out/share/asn1c -fcompound-names -gen-APER -no-gen-BER -no-gen-XER -no-gen-JER -no-gen-OER -no-gen-UPER -no-gen-example`
+ */
+
+#ifndef	_SBcAP_EmergencyAreaID_Cancelled_List_H_
+#define	_SBcAP_EmergencyAreaID_Cancelled_List_H_
+
+
+#include <asn_application.h>
+
+/* Including external dependencies */
+#include <asn_SEQUENCE_OF.h>
+#include <constr_SEQUENCE_OF.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Forward declarations */
+struct SBcAP_EmergencyAreaID_Cancelled_Item;
+
+/* SBcAP_EmergencyAreaID-Cancelled-List */
+typedef struct SBcAP_EmergencyAreaID_Cancelled_List {
+	A_SEQUENCE_OF(struct SBcAP_EmergencyAreaID_Cancelled_Item) list;
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} SBcAP_EmergencyAreaID_Cancelled_List_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_SBcAP_EmergencyAreaID_Cancelled_List;
+extern asn_SET_OF_specifics_t asn_SPC_SBcAP_EmergencyAreaID_Cancelled_List_specs_1;
+extern asn_TYPE_member_t asn_MBR_SBcAP_EmergencyAreaID_Cancelled_List_1[1];
+extern asn_per_constraints_t asn_PER_type_SBcAP_EmergencyAreaID_Cancelled_List_constr_1;
+
+#ifdef __cplusplus
+}
+#endif
+
+/* Referred external types */
+#include <osmocom/sbcap/SBcAP_EmergencyAreaID-Cancelled-Item.h>
+
+#endif	/* _SBcAP_EmergencyAreaID_Cancelled_List_H_ */
+#include <asn_internal.h>
--- a/include/osmocom/sbcap/SBcAP_Error-Indication.h
+++ b/include/osmocom/sbcap/SBcAP_Error-Indication.h
@@ -0,0 +1,42 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "SBC-AP-PDU-Contents"
+ * 	found in "../../src/sbcap/asn1/SBC_AP_PDU_Contents.asn"
+ * 	`asn1c -S /home/pespin/dev/sysmocom/build/new/out/share/asn1c -fcompound-names -gen-APER -no-gen-BER -no-gen-XER -no-gen-JER -no-gen-OER -no-gen-UPER -no-gen-example`
+ */
+
+#ifndef	_SBcAP_Error_Indication_H_
+#define	_SBcAP_Error_Indication_H_
+
+
+#include <asn_application.h>
+
+/* Including external dependencies */
+#include <osmocom/sbcap/SBcAP_ProtocolIE-Container.h>
+#include <constr_SEQUENCE.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* SBcAP_Error-Indication */
+typedef struct SBcAP_Error_Indication {
+	SBcAP_ProtocolIE_Container_86P8_t	 protocolIEs;
+	/*
+	 * This type is extensible,
+	 * possible extensions are below.
+	 */
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} SBcAP_Error_Indication_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_SBcAP_Error_Indication;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _SBcAP_Error_Indication_H_ */
+#include <asn_internal.h>
--- a/include/osmocom/sbcap/SBcAP_Extended-Repetition-Period.h
+++ b/include/osmocom/sbcap/SBcAP_Extended-Repetition-Period.h
@@ -0,0 +1,38 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "SBC-AP-IEs"
+ * 	found in "../../src/sbcap/asn1/SBC_AP_IEs.asn"
+ * 	`asn1c -S /home/pespin/dev/sysmocom/build/new/out/share/asn1c -fcompound-names -gen-APER -no-gen-BER -no-gen-XER -no-gen-JER -no-gen-OER -no-gen-UPER -no-gen-example`
+ */
+
+#ifndef	_SBcAP_Extended_Repetition_Period_H_
+#define	_SBcAP_Extended_Repetition_Period_H_
+
+
+#include <asn_application.h>
+
+/* Including external dependencies */
+#include <NativeInteger.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* SBcAP_Extended-Repetition-Period */
+typedef long	 SBcAP_Extended_Repetition_Period_t;
+
+/* Implementation */
+extern asn_per_constraints_t asn_PER_type_SBcAP_Extended_Repetition_Period_constr_1;
+extern asn_TYPE_descriptor_t asn_DEF_SBcAP_Extended_Repetition_Period;
+asn_struct_free_f SBcAP_Extended_Repetition_Period_free;
+asn_struct_print_f SBcAP_Extended_Repetition_Period_print;
+asn_constr_check_f SBcAP_Extended_Repetition_Period_constraint;
+per_type_decoder_f SBcAP_Extended_Repetition_Period_decode_aper;
+per_type_encoder_f SBcAP_Extended_Repetition_Period_encode_aper;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _SBcAP_Extended_Repetition_Period_H_ */
+#include <asn_internal.h>
--- a/include/osmocom/sbcap/SBcAP_Failed-Cell-List-NR.h
+++ b/include/osmocom/sbcap/SBcAP_Failed-Cell-List-NR.h
@@ -0,0 +1,47 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "SBC-AP-IEs"
+ * 	found in "../../src/sbcap/asn1/SBC_AP_IEs.asn"
+ * 	`asn1c -S /home/pespin/dev/sysmocom/build/new/out/share/asn1c -fcompound-names -gen-APER -no-gen-BER -no-gen-XER -no-gen-JER -no-gen-OER -no-gen-UPER -no-gen-example`
+ */
+
+#ifndef	_SBcAP_Failed_Cell_List_NR_H_
+#define	_SBcAP_Failed_Cell_List_NR_H_
+
+
+#include <asn_application.h>
+
+/* Including external dependencies */
+#include <asn_SEQUENCE_OF.h>
+#include <constr_SEQUENCE_OF.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Forward declarations */
+struct SBcAP_NR_CGI;
+
+/* SBcAP_Failed-Cell-List-NR */
+typedef struct SBcAP_Failed_Cell_List_NR {
+	A_SEQUENCE_OF(struct SBcAP_NR_CGI) list;
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} SBcAP_Failed_Cell_List_NR_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_SBcAP_Failed_Cell_List_NR;
+extern asn_SET_OF_specifics_t asn_SPC_SBcAP_Failed_Cell_List_NR_specs_1;
+extern asn_TYPE_member_t asn_MBR_SBcAP_Failed_Cell_List_NR_1[1];
+extern asn_per_constraints_t asn_PER_type_SBcAP_Failed_Cell_List_NR_constr_1;
+
+#ifdef __cplusplus
+}
+#endif
+
+/* Referred external types */
+#include <osmocom/sbcap/SBcAP_NR-CGI.h>
+
+#endif	/* _SBcAP_Failed_Cell_List_NR_H_ */
+#include <asn_internal.h>
--- a/include/osmocom/sbcap/SBcAP_Failed-Cell-List.h
+++ b/include/osmocom/sbcap/SBcAP_Failed-Cell-List.h
@@ -0,0 +1,47 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "SBC-AP-IEs"
+ * 	found in "../../src/sbcap/asn1/SBC_AP_IEs.asn"
+ * 	`asn1c -S /home/pespin/dev/sysmocom/build/new/out/share/asn1c -fcompound-names -gen-APER -no-gen-BER -no-gen-XER -no-gen-JER -no-gen-OER -no-gen-UPER -no-gen-example`
+ */
+
+#ifndef	_SBcAP_Failed_Cell_List_H_
+#define	_SBcAP_Failed_Cell_List_H_
+
+
+#include <asn_application.h>
+
+/* Including external dependencies */
+#include <asn_SEQUENCE_OF.h>
+#include <constr_SEQUENCE_OF.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Forward declarations */
+struct SBcAP_EUTRAN_CGI;
+
+/* SBcAP_Failed-Cell-List */
+typedef struct SBcAP_Failed_Cell_List {
+	A_SEQUENCE_OF(struct SBcAP_EUTRAN_CGI) list;
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} SBcAP_Failed_Cell_List_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_SBcAP_Failed_Cell_List;
+extern asn_SET_OF_specifics_t asn_SPC_SBcAP_Failed_Cell_List_specs_1;
+extern asn_TYPE_member_t asn_MBR_SBcAP_Failed_Cell_List_1[1];
+extern asn_per_constraints_t asn_PER_type_SBcAP_Failed_Cell_List_constr_1;
+
+#ifdef __cplusplus
+}
+#endif
+
+/* Referred external types */
+#include <osmocom/sbcap/SBcAP_EUTRAN-CGI.h>
+
+#endif	/* _SBcAP_Failed_Cell_List_H_ */
+#include <asn_internal.h>
--- a/include/osmocom/sbcap/SBcAP_GNB-ID.h
+++ b/include/osmocom/sbcap/SBcAP_GNB-ID.h
@@ -0,0 +1,56 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "SBC-AP-IEs"
+ * 	found in "../../src/sbcap/asn1/SBC_AP_IEs.asn"
+ * 	`asn1c -S /home/pespin/dev/sysmocom/build/new/out/share/asn1c -fcompound-names -gen-APER -no-gen-BER -no-gen-XER -no-gen-JER -no-gen-OER -no-gen-UPER -no-gen-example`
+ */
+
+#ifndef	_SBcAP_GNB_ID_H_
+#define	_SBcAP_GNB_ID_H_
+
+
+#include <asn_application.h>
+
+/* Including external dependencies */
+#include <BIT_STRING.h>
+#include <constr_CHOICE.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Dependencies */
+typedef enum SBcAP_GNB_ID_PR {
+	SBcAP_GNB_ID_PR_NOTHING,	/* No components present */
+	SBcAP_GNB_ID_PR_gNB_ID
+	/* Extensions may appear below */
+	
+} SBcAP_GNB_ID_PR;
+
+/* SBcAP_GNB-ID */
+typedef struct SBcAP_GNB_ID {
+	SBcAP_GNB_ID_PR present;
+	union SBcAP_GNB_ID_u {
+		BIT_STRING_t	 gNB_ID;
+		/*
+		 * This type is extensible,
+		 * possible extensions are below.
+		 */
+	} choice;
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} SBcAP_GNB_ID_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_SBcAP_GNB_ID;
+extern asn_CHOICE_specifics_t asn_SPC_SBcAP_GNB_ID_specs_1;
+extern asn_TYPE_member_t asn_MBR_SBcAP_GNB_ID_1[1];
+extern asn_per_constraints_t asn_PER_type_SBcAP_GNB_ID_constr_1;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _SBcAP_GNB_ID_H_ */
+#include <asn_internal.h>
--- a/include/osmocom/sbcap/SBcAP_Global-ENB-ID.h
+++ b/include/osmocom/sbcap/SBcAP_Global-ENB-ID.h
@@ -0,0 +1,53 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "SBC-AP-IEs"
+ * 	found in "../../src/sbcap/asn1/SBC_AP_IEs.asn"
+ * 	`asn1c -S /home/pespin/dev/sysmocom/build/new/out/share/asn1c -fcompound-names -gen-APER -no-gen-BER -no-gen-XER -no-gen-JER -no-gen-OER -no-gen-UPER -no-gen-example`
+ */
+
+#ifndef	_SBcAP_Global_ENB_ID_H_
+#define	_SBcAP_Global_ENB_ID_H_
+
+
+#include <asn_application.h>
+
+/* Including external dependencies */
+#include <osmocom/sbcap/SBcAP_PLMNidentity.h>
+#include <osmocom/sbcap/SBcAP_ENB-ID.h>
+#include <constr_SEQUENCE.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Forward declarations */
+struct SBcAP_ProtocolExtensionContainer;
+
+/* SBcAP_Global-ENB-ID */
+typedef struct SBcAP_Global_ENB_ID {
+	SBcAP_PLMNidentity_t	 pLMNidentity;
+	SBcAP_ENB_ID_t	 eNB_ID;
+	struct SBcAP_ProtocolExtensionContainer	*iE_Extensions;	/* OPTIONAL */
+	/*
+	 * This type is extensible,
+	 * possible extensions are below.
+	 */
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} SBcAP_Global_ENB_ID_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_SBcAP_Global_ENB_ID;
+extern asn_SEQUENCE_specifics_t asn_SPC_SBcAP_Global_ENB_ID_specs_1;
+extern asn_TYPE_member_t asn_MBR_SBcAP_Global_ENB_ID_1[3];
+
+#ifdef __cplusplus
+}
+#endif
+
+/* Referred external types */
+#include <osmocom/sbcap/SBcAP_ProtocolExtensionContainer.h>
+
+#endif	/* _SBcAP_Global_ENB_ID_H_ */
+#include <asn_internal.h>
--- a/include/osmocom/sbcap/SBcAP_Global-GNB-ID.h
+++ b/include/osmocom/sbcap/SBcAP_Global-GNB-ID.h
@@ -0,0 +1,52 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "SBC-AP-IEs"
+ * 	found in "../../src/sbcap/asn1/SBC_AP_IEs.asn"
+ * 	`asn1c -S /home/pespin/dev/sysmocom/build/new/out/share/asn1c -fcompound-names -gen-APER -no-gen-BER -no-gen-XER -no-gen-JER -no-gen-OER -no-gen-UPER -no-gen-example`
+ */
+
+#ifndef	_SBcAP_Global_GNB_ID_H_
+#define	_SBcAP_Global_GNB_ID_H_
+
+
+#include <asn_application.h>
+
+/* Including external dependencies */
+#include <osmocom/sbcap/SBcAP_PLMNidentity.h>
+#include <osmocom/sbcap/SBcAP_GNB-ID.h>
+#include <constr_SEQUENCE.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Forward declarations */
+struct SBcAP_ProtocolExtensionContainer;
+
+/* SBcAP_Global-GNB-ID */
+typedef struct SBcAP_Global_GNB_ID {
+	SBcAP_PLMNidentity_t	 pLMNidentity;
+	SBcAP_GNB_ID_t	 gNB_ID;
+	struct SBcAP_ProtocolExtensionContainer	*iE_Extensions;	/* OPTIONAL */
+	/*
+	 * This type is extensible,
+	 * possible extensions are below.
+	 */
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} SBcAP_Global_GNB_ID_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_SBcAP_Global_GNB_ID;
+extern asn_SEQUENCE_specifics_t asn_SPC_SBcAP_Global_GNB_ID_specs_1;
+extern asn_TYPE_member_t asn_MBR_SBcAP_Global_GNB_ID_1[3];
+
+#ifdef __cplusplus
+}
+#endif
+
+/* Referred external types */
+
+#endif	/* _SBcAP_Global_GNB_ID_H_ */
+#include <asn_internal.h>
--- a/include/osmocom/sbcap/SBcAP_Global-NgENB-ID.h
+++ b/include/osmocom/sbcap/SBcAP_Global-NgENB-ID.h
@@ -0,0 +1,52 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "SBC-AP-IEs"
+ * 	found in "../../src/sbcap/asn1/SBC_AP_IEs.asn"
+ * 	`asn1c -S /home/pespin/dev/sysmocom/build/new/out/share/asn1c -fcompound-names -gen-APER -no-gen-BER -no-gen-XER -no-gen-JER -no-gen-OER -no-gen-UPER -no-gen-example`
+ */
+
+#ifndef	_SBcAP_Global_NgENB_ID_H_
+#define	_SBcAP_Global_NgENB_ID_H_
+
+
+#include <asn_application.h>
+
+/* Including external dependencies */
+#include <osmocom/sbcap/SBcAP_PLMNidentity.h>
+#include <osmocom/sbcap/SBcAP_ENB-ID.h>
+#include <constr_SEQUENCE.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Forward declarations */
+struct SBcAP_ProtocolExtensionContainer;
+
+/* SBcAP_Global-NgENB-ID */
+typedef struct SBcAP_Global_NgENB_ID {
+	SBcAP_PLMNidentity_t	 pLMNidentity;
+	SBcAP_ENB_ID_t	 ngENB_ID;
+	struct SBcAP_ProtocolExtensionContainer	*iE_Extensions;	/* OPTIONAL */
+	/*
+	 * This type is extensible,
+	 * possible extensions are below.
+	 */
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} SBcAP_Global_NgENB_ID_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_SBcAP_Global_NgENB_ID;
+extern asn_SEQUENCE_specifics_t asn_SPC_SBcAP_Global_NgENB_ID_specs_1;
+extern asn_TYPE_member_t asn_MBR_SBcAP_Global_NgENB_ID_1[3];
+
+#ifdef __cplusplus
+}
+#endif
+
+/* Referred external types */
+
+#endif	/* _SBcAP_Global_NgENB_ID_H_ */
+#include <asn_internal.h>
--- a/include/osmocom/sbcap/SBcAP_Global-RAN-Node-ID.h
+++ b/include/osmocom/sbcap/SBcAP_Global-RAN-Node-ID.h
@@ -0,0 +1,59 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "SBC-AP-IEs"
+ * 	found in "../../src/sbcap/asn1/SBC_AP_IEs.asn"
+ * 	`asn1c -S /home/pespin/dev/sysmocom/build/new/out/share/asn1c -fcompound-names -gen-APER -no-gen-BER -no-gen-XER -no-gen-JER -no-gen-OER -no-gen-UPER -no-gen-example`
+ */
+
+#ifndef	_SBcAP_Global_RAN_Node_ID_H_
+#define	_SBcAP_Global_RAN_Node_ID_H_
+
+
+#include <asn_application.h>
+
+/* Including external dependencies */
+#include <osmocom/sbcap/SBcAP_Global-GNB-ID.h>
+#include <osmocom/sbcap/SBcAP_Global-NgENB-ID.h>
+#include <constr_CHOICE.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Dependencies */
+typedef enum SBcAP_Global_RAN_Node_ID_PR {
+	SBcAP_Global_RAN_Node_ID_PR_NOTHING,	/* No components present */
+	SBcAP_Global_RAN_Node_ID_PR_global_GNB_ID,
+	SBcAP_Global_RAN_Node_ID_PR_global_NgENB_ID
+	/* Extensions may appear below */
+	
+} SBcAP_Global_RAN_Node_ID_PR;
+
+/* SBcAP_Global-RAN-Node-ID */
+typedef struct SBcAP_Global_RAN_Node_ID {
+	SBcAP_Global_RAN_Node_ID_PR present;
+	union SBcAP_Global_RAN_Node_ID_u {
+		SBcAP_Global_GNB_ID_t	 global_GNB_ID;
+		SBcAP_Global_NgENB_ID_t	 global_NgENB_ID;
+		/*
+		 * This type is extensible,
+		 * possible extensions are below.
+		 */
+	} choice;
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} SBcAP_Global_RAN_Node_ID_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_SBcAP_Global_RAN_Node_ID;
+extern asn_CHOICE_specifics_t asn_SPC_SBcAP_Global_RAN_Node_ID_specs_1;
+extern asn_TYPE_member_t asn_MBR_SBcAP_Global_RAN_Node_ID_1[2];
+extern asn_per_constraints_t asn_PER_type_SBcAP_Global_RAN_Node_ID_constr_1;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _SBcAP_Global_RAN_Node_ID_H_ */
+#include <asn_internal.h>
--- a/include/osmocom/sbcap/SBcAP_InitiatingMessage.h
+++ b/include/osmocom/sbcap/SBcAP_InitiatingMessage.h
@@ -0,0 +1,82 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "SBC-AP-PDU-Descriptions"
+ * 	found in "../../src/sbcap/asn1/SBC_AP_PDU_Descriptions.asn"
+ * 	`asn1c -S /home/pespin/dev/sysmocom/build/new/out/share/asn1c -fcompound-names -gen-APER -no-gen-BER -no-gen-XER -no-gen-JER -no-gen-OER -no-gen-UPER -no-gen-example`
+ */
+
+#ifndef	_SBcAP_InitiatingMessage_H_
+#define	_SBcAP_InitiatingMessage_H_
+
+
+#include <asn_application.h>
+
+/* Including external dependencies */
+#include <osmocom/sbcap/SBcAP_ProcedureCode.h>
+#include <osmocom/sbcap/SBcAP_Criticality.h>
+#include <ANY.h>
+#include <asn_ioc.h>
+#include <osmocom/sbcap/SBcAP_Write-Replace-Warning-Request.h>
+#include <osmocom/sbcap/SBcAP_Write-Replace-Warning-Response.h>
+#include <osmocom/sbcap/SBcAP_Stop-Warning-Request.h>
+#include <osmocom/sbcap/SBcAP_Stop-Warning-Response.h>
+#include <osmocom/sbcap/SBcAP_Error-Indication.h>
+#include <osmocom/sbcap/SBcAP_Write-Replace-Warning-Indication.h>
+#include <osmocom/sbcap/SBcAP_Stop-Warning-Indication.h>
+#include <osmocom/sbcap/SBcAP_PWS-Restart-Indication.h>
+#include <osmocom/sbcap/SBcAP_PWS-Failure-Indication.h>
+#include <OPEN_TYPE.h>
+#include <constr_CHOICE.h>
+#include <constr_SEQUENCE.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Dependencies */
+typedef enum SBcAP_InitiatingMessage__value_PR {
+	SBcAP_InitiatingMessage__value_PR_NOTHING,	/* No components present */
+	SBcAP_InitiatingMessage__value_PR_Write_Replace_Warning_Request,
+	SBcAP_InitiatingMessage__value_PR_Stop_Warning_Request,
+	SBcAP_InitiatingMessage__value_PR_Error_Indication,
+	SBcAP_InitiatingMessage__value_PR_Write_Replace_Warning_Indication,
+	SBcAP_InitiatingMessage__value_PR_Stop_Warning_Indication,
+	SBcAP_InitiatingMessage__value_PR_PWS_Restart_Indication,
+	SBcAP_InitiatingMessage__value_PR_PWS_Failure_Indication
+} SBcAP_InitiatingMessage__value_PR;
+
+/* SBcAP_InitiatingMessage */
+typedef struct SBcAP_InitiatingMessage {
+	SBcAP_ProcedureCode_t	 procedureCode;
+	SBcAP_Criticality_t	 criticality;
+	struct SBcAP_InitiatingMessage__value {
+		SBcAP_InitiatingMessage__value_PR present;
+		union SBcAP_InitiatingMessage__SBcAP_value_u {
+			SBcAP_Write_Replace_Warning_Request_t	 Write_Replace_Warning_Request;
+			SBcAP_Stop_Warning_Request_t	 Stop_Warning_Request;
+			SBcAP_Error_Indication_t	 Error_Indication;
+			SBcAP_Write_Replace_Warning_Indication_t	 Write_Replace_Warning_Indication;
+			SBcAP_Stop_Warning_Indication_t	 Stop_Warning_Indication;
+			SBcAP_PWS_Restart_Indication_t	 PWS_Restart_Indication;
+			SBcAP_PWS_Failure_Indication_t	 PWS_Failure_Indication;
+		} choice;
+		
+		/* Context for parsing across buffer boundaries */
+		asn_struct_ctx_t _asn_ctx;
+	} value;
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} SBcAP_InitiatingMessage_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_SBcAP_InitiatingMessage;
+extern asn_SEQUENCE_specifics_t asn_SPC_SBcAP_InitiatingMessage_specs_1;
+extern asn_TYPE_member_t asn_MBR_SBcAP_InitiatingMessage_1[3];
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _SBcAP_InitiatingMessage_H_ */
+#include <asn_internal.h>
--- a/include/osmocom/sbcap/SBcAP_List-of-5GS-Cells-for-Failure.h
+++ b/include/osmocom/sbcap/SBcAP_List-of-5GS-Cells-for-Failure.h
@@ -0,0 +1,44 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "SBC-AP-IEs"
+ * 	found in "../../src/sbcap/asn1/SBC_AP_IEs.asn"
+ * 	`asn1c -S /home/pespin/dev/sysmocom/build/new/out/share/asn1c -fcompound-names -gen-APER -no-gen-BER -no-gen-XER -no-gen-JER -no-gen-OER -no-gen-UPER -no-gen-example`
+ */
+
+#ifndef	_SBcAP_List_of_5GS_Cells_for_Failure_H_
+#define	_SBcAP_List_of_5GS_Cells_for_Failure_H_
+
+
+#include <asn_application.h>
+
+/* Including external dependencies */
+#include <asn_SEQUENCE_OF.h>
+#include <constr_SEQUENCE_OF.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Forward declarations */
+struct SBcAP_NR_CGI;
+
+/* SBcAP_List-of-5GS-Cells-for-Failure */
+typedef struct SBcAP_List_of_5GS_Cells_for_Failure {
+	A_SEQUENCE_OF(struct SBcAP_NR_CGI) list;
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} SBcAP_List_of_5GS_Cells_for_Failure_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_SBcAP_List_of_5GS_Cells_for_Failure;
+
+#ifdef __cplusplus
+}
+#endif
+
+/* Referred external types */
+#include <osmocom/sbcap/SBcAP_NR-CGI.h>
+
+#endif	/* _SBcAP_List_of_5GS_Cells_for_Failure_H_ */
+#include <asn_internal.h>
--- a/include/osmocom/sbcap/SBcAP_List-of-5GS-TAI-for-Restart.h
+++ b/include/osmocom/sbcap/SBcAP_List-of-5GS-TAI-for-Restart.h
@@ -0,0 +1,47 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "SBC-AP-IEs"
+ * 	found in "../../src/sbcap/asn1/SBC_AP_IEs.asn"
+ * 	`asn1c -S /home/pespin/dev/sysmocom/build/new/out/share/asn1c -fcompound-names -gen-APER -no-gen-BER -no-gen-XER -no-gen-JER -no-gen-OER -no-gen-UPER -no-gen-example`
+ */
+
+#ifndef	_SBcAP_List_of_5GS_TAI_for_Restart_H_
+#define	_SBcAP_List_of_5GS_TAI_for_Restart_H_
+
+
+#include <asn_application.h>
+
+/* Including external dependencies */
+#include <asn_SEQUENCE_OF.h>
+#include <constr_SEQUENCE_OF.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Forward declarations */
+struct SBcAP_TAI_5GS;
+
+/* SBcAP_List-of-5GS-TAI-for-Restart */
+typedef struct SBcAP_List_of_5GS_TAI_for_Restart {
+	A_SEQUENCE_OF(struct SBcAP_TAI_5GS) list;
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} SBcAP_List_of_5GS_TAI_for_Restart_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_SBcAP_List_of_5GS_TAI_for_Restart;
+extern asn_SET_OF_specifics_t asn_SPC_SBcAP_List_of_5GS_TAI_for_Restart_specs_1;
+extern asn_TYPE_member_t asn_MBR_SBcAP_List_of_5GS_TAI_for_Restart_1[1];
+extern asn_per_constraints_t asn_PER_type_SBcAP_List_of_5GS_TAI_for_Restart_constr_1;
+
+#ifdef __cplusplus
+}
+#endif
+
+/* Referred external types */
+#include <osmocom/sbcap/SBcAP_TAI-5GS.h>
+
+#endif	/* _SBcAP_List_of_5GS_TAI_for_Restart_H_ */
+#include <asn_internal.h>
--- a/include/osmocom/sbcap/SBcAP_List-of-5GS-TAIs.h
+++ b/include/osmocom/sbcap/SBcAP_List-of-5GS-TAIs.h
@@ -0,0 +1,47 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "SBC-AP-IEs"
+ * 	found in "../../src/sbcap/asn1/SBC_AP_IEs.asn"
+ * 	`asn1c -S /home/pespin/dev/sysmocom/build/new/out/share/asn1c -fcompound-names -gen-APER -no-gen-BER -no-gen-XER -no-gen-JER -no-gen-OER -no-gen-UPER -no-gen-example`
+ */
+
+#ifndef	_SBcAP_List_of_5GS_TAIs_H_
+#define	_SBcAP_List_of_5GS_TAIs_H_
+
+
+#include <asn_application.h>
+
+/* Including external dependencies */
+#include <asn_SEQUENCE_OF.h>
+#include <constr_SEQUENCE_OF.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Forward declarations */
+struct SBcAP_TAI_5GS;
+
+/* SBcAP_List-of-5GS-TAIs */
+typedef struct SBcAP_List_of_5GS_TAIs {
+	A_SEQUENCE_OF(struct SBcAP_TAI_5GS) list;
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} SBcAP_List_of_5GS_TAIs_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_SBcAP_List_of_5GS_TAIs;
+extern asn_SET_OF_specifics_t asn_SPC_SBcAP_List_of_5GS_TAIs_specs_1;
+extern asn_TYPE_member_t asn_MBR_SBcAP_List_of_5GS_TAIs_1[1];
+extern asn_per_constraints_t asn_PER_type_SBcAP_List_of_5GS_TAIs_constr_1;
+
+#ifdef __cplusplus
+}
+#endif
+
+/* Referred external types */
+#include <osmocom/sbcap/SBcAP_TAI-5GS.h>
+
+#endif	/* _SBcAP_List_of_5GS_TAIs_H_ */
+#include <asn_internal.h>
--- a/include/osmocom/sbcap/SBcAP_List-of-EAIs-Restart.h
+++ b/include/osmocom/sbcap/SBcAP_List-of-EAIs-Restart.h
@@ -0,0 +1,42 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "SBC-AP-IEs"
+ * 	found in "../../src/sbcap/asn1/SBC_AP_IEs.asn"
+ * 	`asn1c -S /home/pespin/dev/sysmocom/build/new/out/share/asn1c -fcompound-names -gen-APER -no-gen-BER -no-gen-XER -no-gen-JER -no-gen-OER -no-gen-UPER -no-gen-example`
+ */
+
+#ifndef	_SBcAP_List_of_EAIs_Restart_H_
+#define	_SBcAP_List_of_EAIs_Restart_H_
+
+
+#include <asn_application.h>
+
+/* Including external dependencies */
+#include <osmocom/sbcap/SBcAP_Emergency-Area-ID.h>
+#include <asn_SEQUENCE_OF.h>
+#include <constr_SEQUENCE_OF.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* SBcAP_List-of-EAIs-Restart */
+typedef struct SBcAP_List_of_EAIs_Restart {
+	A_SEQUENCE_OF(SBcAP_Emergency_Area_ID_t) list;
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} SBcAP_List_of_EAIs_Restart_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_SBcAP_List_of_EAIs_Restart;
+extern asn_SET_OF_specifics_t asn_SPC_SBcAP_List_of_EAIs_Restart_specs_1;
+extern asn_TYPE_member_t asn_MBR_SBcAP_List_of_EAIs_Restart_1[1];
+extern asn_per_constraints_t asn_PER_type_SBcAP_List_of_EAIs_Restart_constr_1;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _SBcAP_List_of_EAIs_Restart_H_ */
+#include <asn_internal.h>
--- a/include/osmocom/sbcap/SBcAP_List-of-TAIs-Restart.h
+++ b/include/osmocom/sbcap/SBcAP_List-of-TAIs-Restart.h
@@ -0,0 +1,51 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "SBC-AP-IEs"
+ * 	found in "../../src/sbcap/asn1/SBC_AP_IEs.asn"
+ * 	`asn1c -S /home/pespin/dev/sysmocom/build/new/out/share/asn1c -fcompound-names -gen-APER -no-gen-BER -no-gen-XER -no-gen-JER -no-gen-OER -no-gen-UPER -no-gen-example`
+ */
+
+#ifndef	_SBcAP_List_of_TAIs_Restart_H_
+#define	_SBcAP_List_of_TAIs_Restart_H_
+
+
+#include <asn_application.h>
+
+/* Including external dependencies */
+#include <asn_SEQUENCE_OF.h>
+#include <osmocom/sbcap/SBcAP_TAI.h>
+#include <constr_SEQUENCE.h>
+#include <constr_SEQUENCE_OF.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Forward definitions */
+typedef struct SBcAP_List_of_TAIs_Restart__Member {
+	SBcAP_TAI_t	 tai;
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} List_of_TAIs_Restart__Member;
+
+/* SBcAP_List-of-TAIs-Restart */
+typedef struct SBcAP_List_of_TAIs_Restart {
+	A_SEQUENCE_OF(List_of_TAIs_Restart__Member) list;
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} SBcAP_List_of_TAIs_Restart_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_SBcAP_List_of_TAIs_Restart;
+extern asn_SET_OF_specifics_t asn_SPC_SBcAP_List_of_TAIs_Restart_specs_1;
+extern asn_TYPE_member_t asn_MBR_SBcAP_List_of_TAIs_Restart_1[1];
+extern asn_per_constraints_t asn_PER_type_SBcAP_List_of_TAIs_Restart_constr_1;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _SBcAP_List_of_TAIs_Restart_H_ */
+#include <asn_internal.h>
--- a/include/osmocom/sbcap/SBcAP_List-of-TAIs.h
+++ b/include/osmocom/sbcap/SBcAP_List-of-TAIs.h
@@ -0,0 +1,51 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "SBC-AP-IEs"
+ * 	found in "../../src/sbcap/asn1/SBC_AP_IEs.asn"
+ * 	`asn1c -S /home/pespin/dev/sysmocom/build/new/out/share/asn1c -fcompound-names -gen-APER -no-gen-BER -no-gen-XER -no-gen-JER -no-gen-OER -no-gen-UPER -no-gen-example`
+ */
+
+#ifndef	_SBcAP_List_of_TAIs_H_
+#define	_SBcAP_List_of_TAIs_H_
+
+
+#include <asn_application.h>
+
+/* Including external dependencies */
+#include <asn_SEQUENCE_OF.h>
+#include <osmocom/sbcap/SBcAP_TAI.h>
+#include <constr_SEQUENCE.h>
+#include <constr_SEQUENCE_OF.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Forward definitions */
+typedef struct SBcAP_List_of_TAIs__Member {
+	SBcAP_TAI_t	 tai;
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} List_of_TAIs__Member;
+
+/* SBcAP_List-of-TAIs */
+typedef struct SBcAP_List_of_TAIs {
+	A_SEQUENCE_OF(List_of_TAIs__Member) list;
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} SBcAP_List_of_TAIs_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_SBcAP_List_of_TAIs;
+extern asn_SET_OF_specifics_t asn_SPC_SBcAP_List_of_TAIs_specs_1;
+extern asn_TYPE_member_t asn_MBR_SBcAP_List_of_TAIs_1[1];
+extern asn_per_constraints_t asn_PER_type_SBcAP_List_of_TAIs_constr_1;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _SBcAP_List_of_TAIs_H_ */
+#include <asn_internal.h>
--- a/include/osmocom/sbcap/SBcAP_Message-Identifier.h
+++ b/include/osmocom/sbcap/SBcAP_Message-Identifier.h
@@ -0,0 +1,38 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "SBC-AP-IEs"
+ * 	found in "../../src/sbcap/asn1/SBC_AP_IEs.asn"
+ * 	`asn1c -S /home/pespin/dev/sysmocom/build/new/out/share/asn1c -fcompound-names -gen-APER -no-gen-BER -no-gen-XER -no-gen-JER -no-gen-OER -no-gen-UPER -no-gen-example`
+ */
+
+#ifndef	_SBcAP_Message_Identifier_H_
+#define	_SBcAP_Message_Identifier_H_
+
+
+#include <asn_application.h>
+
+/* Including external dependencies */
+#include <BIT_STRING.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* SBcAP_Message-Identifier */
+typedef BIT_STRING_t	 SBcAP_Message_Identifier_t;
+
+/* Implementation */
+extern asn_per_constraints_t asn_PER_type_SBcAP_Message_Identifier_constr_1;
+extern asn_TYPE_descriptor_t asn_DEF_SBcAP_Message_Identifier;
+asn_struct_free_f SBcAP_Message_Identifier_free;
+asn_struct_print_f SBcAP_Message_Identifier_print;
+asn_constr_check_f SBcAP_Message_Identifier_constraint;
+per_type_decoder_f SBcAP_Message_Identifier_decode_aper;
+per_type_encoder_f SBcAP_Message_Identifier_encode_aper;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _SBcAP_Message_Identifier_H_ */
+#include <asn_internal.h>
--- a/include/osmocom/sbcap/SBcAP_NR-CGI.h
+++ b/include/osmocom/sbcap/SBcAP_NR-CGI.h
@@ -0,0 +1,52 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "SBC-AP-IEs"
+ * 	found in "../../src/sbcap/asn1/SBC_AP_IEs.asn"
+ * 	`asn1c -S /home/pespin/dev/sysmocom/build/new/out/share/asn1c -fcompound-names -gen-APER -no-gen-BER -no-gen-XER -no-gen-JER -no-gen-OER -no-gen-UPER -no-gen-example`
+ */
+
+#ifndef	_SBcAP_NR_CGI_H_
+#define	_SBcAP_NR_CGI_H_
+
+
+#include <asn_application.h>
+
+/* Including external dependencies */
+#include <osmocom/sbcap/SBcAP_PLMNidentity.h>
+#include <osmocom/sbcap/SBcAP_NRCellIdentity.h>
+#include <constr_SEQUENCE.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Forward declarations */
+struct SBcAP_ProtocolExtensionContainer;
+
+/* SBcAP_NR-CGI */
+typedef struct SBcAP_NR_CGI {
+	SBcAP_PLMNidentity_t	 pLMNidentity;
+	SBcAP_NRCellIdentity_t	 nRCellIdentity;
+	struct SBcAP_ProtocolExtensionContainer	*iE_Extensions;	/* OPTIONAL */
+	/*
+	 * This type is extensible,
+	 * possible extensions are below.
+	 */
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} SBcAP_NR_CGI_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_SBcAP_NR_CGI;
+extern asn_SEQUENCE_specifics_t asn_SPC_SBcAP_NR_CGI_specs_1;
+extern asn_TYPE_member_t asn_MBR_SBcAP_NR_CGI_1[3];
+
+#ifdef __cplusplus
+}
+#endif
+
+/* Referred external types */
+
+#endif	/* _SBcAP_NR_CGI_H_ */
+#include <asn_internal.h>
--- a/include/osmocom/sbcap/SBcAP_NR-CGIList.h
+++ b/include/osmocom/sbcap/SBcAP_NR-CGIList.h
@@ -0,0 +1,47 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "SBC-AP-IEs"
+ * 	found in "../../src/sbcap/asn1/SBC_AP_IEs.asn"
+ * 	`asn1c -S /home/pespin/dev/sysmocom/build/new/out/share/asn1c -fcompound-names -gen-APER -no-gen-BER -no-gen-XER -no-gen-JER -no-gen-OER -no-gen-UPER -no-gen-example`
+ */
+
+#ifndef	_SBcAP_NR_CGIList_H_
+#define	_SBcAP_NR_CGIList_H_
+
+
+#include <asn_application.h>
+
+/* Including external dependencies */
+#include <asn_SEQUENCE_OF.h>
+#include <constr_SEQUENCE_OF.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Forward declarations */
+struct SBcAP_NR_CGI;
+
+/* SBcAP_NR-CGIList */
+typedef struct SBcAP_NR_CGIList {
+	A_SEQUENCE_OF(struct SBcAP_NR_CGI) list;
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} SBcAP_NR_CGIList_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_SBcAP_NR_CGIList;
+extern asn_SET_OF_specifics_t asn_SPC_SBcAP_NR_CGIList_specs_1;
+extern asn_TYPE_member_t asn_MBR_SBcAP_NR_CGIList_1[1];
+extern asn_per_constraints_t asn_PER_type_SBcAP_NR_CGIList_constr_1;
+
+#ifdef __cplusplus
+}
+#endif
+
+/* Referred external types */
+#include <osmocom/sbcap/SBcAP_NR-CGI.h>
+
+#endif	/* _SBcAP_NR_CGIList_H_ */
+#include <asn_internal.h>
--- a/include/osmocom/sbcap/SBcAP_NRCellIdentity.h
+++ b/include/osmocom/sbcap/SBcAP_NRCellIdentity.h
@@ -0,0 +1,38 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "SBC-AP-IEs"
+ * 	found in "../../src/sbcap/asn1/SBC_AP_IEs.asn"
+ * 	`asn1c -S /home/pespin/dev/sysmocom/build/new/out/share/asn1c -fcompound-names -gen-APER -no-gen-BER -no-gen-XER -no-gen-JER -no-gen-OER -no-gen-UPER -no-gen-example`
+ */
+
+#ifndef	_SBcAP_NRCellIdentity_H_
+#define	_SBcAP_NRCellIdentity_H_
+
+
+#include <asn_application.h>
+
+/* Including external dependencies */
+#include <BIT_STRING.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* SBcAP_NRCellIdentity */
+typedef BIT_STRING_t	 SBcAP_NRCellIdentity_t;
+
+/* Implementation */
+extern asn_per_constraints_t asn_PER_type_SBcAP_NRCellIdentity_constr_1;
+extern asn_TYPE_descriptor_t asn_DEF_SBcAP_NRCellIdentity;
+asn_struct_free_f SBcAP_NRCellIdentity_free;
+asn_struct_print_f SBcAP_NRCellIdentity_print;
+asn_constr_check_f SBcAP_NRCellIdentity_constraint;
+per_type_decoder_f SBcAP_NRCellIdentity_decode_aper;
+per_type_encoder_f SBcAP_NRCellIdentity_encode_aper;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _SBcAP_NRCellIdentity_H_ */
+#include <asn_internal.h>
--- a/include/osmocom/sbcap/SBcAP_NgENB-ID.h
+++ b/include/osmocom/sbcap/SBcAP_NgENB-ID.h
@@ -0,0 +1,57 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "SBC-AP-IEs"
+ * 	found in "../../src/sbcap/asn1/SBC_AP_IEs.asn"
+ * 	`asn1c -S /home/pespin/dev/sysmocom/build/new/out/share/asn1c -fcompound-names -gen-APER -no-gen-BER -no-gen-XER -no-gen-JER -no-gen-OER -no-gen-UPER -no-gen-example`
+ */
+
+#ifndef	_SBcAP_NgENB_ID_H_
+#define	_SBcAP_NgENB_ID_H_
+
+
+#include <asn_application.h>
+
+/* Including external dependencies */
+#include <BIT_STRING.h>
+#include <constr_CHOICE.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Dependencies */
+typedef enum SBcAP_NgENB_ID_PR {
+	SBcAP_NgENB_ID_PR_NOTHING,	/* No components present */
+	SBcAP_NgENB_ID_PR_macroNgENB_ID,
+	SBcAP_NgENB_ID_PR_shortMacroNgENB_ID,
+	SBcAP_NgENB_ID_PR_longMacroNgENB_ID
+	/* Extensions may appear below */
+	
+} SBcAP_NgENB_ID_PR;
+
+/* SBcAP_NgENB-ID */
+typedef struct SBcAP_NgENB_ID {
+	SBcAP_NgENB_ID_PR present;
+	union SBcAP_NgENB_ID_u {
+		BIT_STRING_t	 macroNgENB_ID;
+		BIT_STRING_t	 shortMacroNgENB_ID;
+		BIT_STRING_t	 longMacroNgENB_ID;
+		/*
+		 * This type is extensible,
+		 * possible extensions are below.
+		 */
+	} choice;
+	
+	/* Context for parsing across buffer boundaries */
+	asn_struct_ctx_t _asn_ctx;
+} SBcAP_NgENB_ID_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_SBcAP_NgENB_ID;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _SBcAP_NgENB_ID_H_ */
+#include <asn_internal.h>
--- a/include/osmocom/sbcap/SBcAP_Number-of-Broadcasts-Requested.h
+++ b/include/osmocom/sbcap/SBcAP_Number-of-Broadcasts-Requested.h
@@ -0,0 +1,38 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "SBC-AP-IEs"
+ * 	found in "../../src/sbcap/asn1/SBC_AP_IEs.asn"
+ * 	`asn1c -S /home/pespin/dev/sysmocom/build/new/out/share/asn1c -fcompound-names -gen-APER -no-gen-BER -no-gen-XER -no-gen-JER -no-gen-OER -no-gen-UPER -no-gen-example`
+ */
+
+#ifndef	_SBcAP_Number_of_Broadcasts_Requested_H_
+#define	_SBcAP_Number_of_Broadcasts_Requested_H_
+
+
+#include <asn_application.h>
+
+/* Including external dependencies */
+#include <NativeInteger.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* SBcAP_Number-of-Broadcasts-Requested */
+typedef long	 SBcAP_Number_of_Broadcasts_Requested_t;
+
+/* Implementation */
+extern asn_per_constraints_t asn_PER_type_SBcAP_Number_of_Broadcasts_Requested_constr_1;
+extern asn_TYPE_descriptor_t asn_DEF_SBcAP_Number_of_Broadcasts_Requested;
+asn_struct_free_f SBcAP_Number_of_Broadcasts_Requested_free;
+asn_struct_print_f SBcAP_Number_of_Broadcasts_Requested_print;
+asn_constr_check_f SBcAP_Number_of_Broadcasts_Requested_constraint;
+per_type_decoder_f SBcAP_Number_of_Broadcasts_Requested_decode_aper;
+per_type_encoder_f SBcAP_Number_of_Broadcasts_Requested_encode_aper;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _SBcAP_Number_of_Broadcasts_Requested_H_ */
+#include <asn_internal.h>
--- a/Show More
+++ b/Show More