Osmocom Open Build Service

Changes of Revision 7

libosmocore.spec Changed

@@ -14,13 +14,13 @@
 
 Name:           libosmocore
 Requires: osmocom-latest
-Version: 1.8.0
+Version: 1.9.0
 Release:        0
 Summary:        The Open Source Mobile Communications Core Library
 License:        GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later AND AGPL-3.0-or-later
 Group:          Productivity/Telephony/Utilities
 Url:            https://osmocom.org/projects/libosmocore/wiki/Libosmocore
-Source: libosmocore_1.8.0.tar.xz
+Source: libosmocore_1.9.0.tar.xz
 Source1: rpmlintrc
 BuildRequires:  automake >= 1.6
 BuildRequires:  libtool >= 2
@@ -34,6 +34,9 @@
 BuildRequires:  pkgconfig(talloc) >= 2.1.0
 BuildRequires:  pkgconfig(libmnl)
 BuildRequires:  pkgconfig(libsystemd)
+%if 0%{?centos_ver} != 7
+BuildRequires:  pkgconfig(liburing)
+%endif
 
 %description
 libosmocore is a package with various utility functions that were
@@ -60,13 +63,13 @@
 for testing GSM authentication, as well as "osmo-config-merge", a tool
 for merging Osmocom configuration files.
 
-%package -n libosmocodec0
+%package -n libosmocodec4
 Requires: osmocom-latest
 Summary:        GSM 06.10, 06.20, 06.60, 06.90 codec library
 License:        GPL-2.0-or-later
 Group:          System/Libraries
 
-%description -n libosmocodec0
+%description -n libosmocodec4
 The libosmocodec library contains an implementation of multiple
 GSM codecs:
 
@@ -80,7 +83,7 @@
 Summary:        Development files for the Osmocom GSM codec library
 License:        GPL-2.0-or-later
 Group:          Development/Libraries/C and C++
-Requires:       libosmocodec0 = %version
+Requires:       libosmocodec4 = %version
 
 %description -n libosmocodec-devel
 The libosmocodec library contains an implementation of multiple
@@ -119,14 +122,14 @@
 This subpackage contains libraries and header files for developing
 applications that want to make use of libosmocoding.
 
-%package -n libosmocore20
+%package -n libosmocore21
 Requires: osmocom-latest
 Summary:        Osmocom core library
 # crc16.c has GPL2-only clauses, the rest (*.c) is GPL-2.0+
 License:        GPL-2.0-only AND GPL-2.0-or-later
 Group:          System/Libraries
 
-%description -n libosmocore20
+%description -n libosmocore21
 libosmocore is a library with various utility functions shared
 between OpenBSC and OsmocomBB.
 
@@ -136,7 +139,7 @@
 # crc16.h has GPL2-only clauses, the rest (*.h) is GPL-2.0+
 License:        GPL-2.0-only AND GPL-2.0-or-later
 Group:          Development/Libraries/C and C++
-Requires:       libosmocore20 = %version
+Requires:       libosmocore21 = %version
 Requires:       libtalloc-devel
 Requires:       lksctp-tools-devel
 
@@ -203,13 +206,13 @@
 This subpackage contains libraries and header files for developing
 applications that want to make use of libosmogb.
 
-%package -n libosmogsm18
+%package -n libosmogsm20
 Requires: osmocom-latest
 Summary:        Osmocom GSM utility library
 License:        GPL-2.0-or-later AND AGPL-3.0-or-later
 Group:          System/Libraries
 
-%description -n libosmogsm18
+%description -n libosmogsm20
 libosmocore is a package with various utility functions that were
 originally developed as part of the OpenBSC project.
 
@@ -225,7 +228,7 @@
 License:        GPL-2.0-or-later AND AGPL-3.0-or-later
 Group:          Development/Libraries/C and C++
 Requires:       libosmocore-devel = %version
-Requires:       libosmogsm18 = %version
+Requires:       libosmogsm20 = %version
 Requires:       libosmoisdn-devel = %version
 Requires:       libosmoisdn0 = %version
 
@@ -297,13 +300,13 @@
 This subpackage contains libraries and header files for developing
 applications that want to make use of libosmosim.
 
-%package -n libosmovty9
+%package -n libosmovty13
 Requires: osmocom-latest
 Summary:        Osmocom VTY interface library
 License:        GPL-2.0-or-later
 Group:          System/Libraries
 
-%description -n libosmovty9
+%description -n libosmovty13
 libosmocore is a package with various utility functions that were
 originally developed as part of the OpenBSC project.
 
@@ -316,7 +319,7 @@
 License:        GPL-2.0-or-later
 Group:          Development/Libraries/C and C++
 Requires:       libosmocore-devel = %version
-Requires:       libosmovty9 = %version
+Requires:       libosmovty13 = %version
 
 %description -n libosmovty-devel
 The libosmovty library implements the interactive command-line on the
@@ -361,8 +364,18 @@
 %build
 echo "%version" >.tarball-version
 autoreconf -fiv
-%configure --enable-shared --disable-static --enable-systemd-logging \
+
+CONFIGURE_FLAGS="
+	--enable-shared \
+	--disable-static \
+	--enable-systemd-logging \
 	--includedir="%_includedir/%name"
+"
+%if 0%{?centos_ver} == 7
+	CONFIGURE_FLAGS="$CONFIGURE_FLAGS --disable-uring"
+%endif
+
+%configure $CONFIGURE_FLAGS
 make %{?_smp_mflags} V=1
 
 %install
@@ -373,24 +386,24 @@
 %check
 make %{?_smp_mflags} check || (find . -name testsuite.log -exec cat {} +)
 
-%post   -n libosmocodec0 -p /sbin/ldconfig
-%postun -n libosmocodec0 -p /sbin/ldconfig
+%post   -n libosmocodec4 -p /sbin/ldconfig
+%postun -n libosmocodec4 -p /sbin/ldconfig
 %post   -n libosmocoding0 -p /sbin/ldconfig
 %postun -n libosmocoding0 -p /sbin/ldconfig
-%post   -n libosmocore20 -p /sbin/ldconfig
-%postun -n libosmocore20 -p /sbin/ldconfig
+%post   -n libosmocore21 -p /sbin/ldconfig
+%postun -n libosmocore21 -p /sbin/ldconfig
 %post   -n libosmoctrl0 -p /sbin/ldconfig
 %postun -n libosmoctrl0 -p /sbin/ldconfig
 %post   -n libosmogb14 -p /sbin/ldconfig
 %postun -n libosmogb14 -p /sbin/ldconfig
-%post   -n libosmogsm18 -p /sbin/ldconfig
-%postun -n libosmogsm18 -p /sbin/ldconfig
+%post   -n libosmogsm20 -p /sbin/ldconfig
+%postun -n libosmogsm20 -p /sbin/ldconfig
 %post   -n libosmoisdn0 -p /sbin/ldconfig
 %postun -n libosmoisdn0 -p /sbin/ldconfig
 %post   -n libosmosim2 -p /sbin/ldconfig
 %postun -n libosmosim2 -p /sbin/ldconfig
-%post   -n libosmovty9 -p /sbin/ldconfig
-%postun -n libosmovty9 -p /sbin/ldconfig
+%post   -n libosmovty13 -p /sbin/ldconfig
+%postun -n libosmovty13 -p /sbin/ldconfig
 %post   -n libosmousb0 -p /sbin/ldconfig
 %postun -n libosmousb0 -p /sbin/ldconfig
 
@@ -398,9 +411,9 @@
 %defattr(-,root,root)
 %_bindir/osmo-*
 
-%files -n libosmocodec0
+%files -n libosmocodec4
 %defattr(-,root,root)
-%_libdir/libosmocodec.so.0*
+%_libdir/libosmocodec.so.4*
 
 %files -n libosmocodec-devel
 %defattr(-,root,root)
@@ -422,9 +435,9 @@
 %_libdir/libosmocoding.so
 %_libdir/pkgconfig/libosmocoding.pc
 
-%files -n libosmocore20
+%files -n libosmocore21
 %defattr(-,root,root)
-%_libdir/libosmocore.so.20*
+%_libdir/libosmocore.so.21*
 
 %files -n libosmocore-devel
 %defattr(-,root,root)
@@ -460,9 +473,9 @@
 %_libdir/libosmogb.so
 %_libdir/pkgconfig/libosmogb.pc
 
-%files -n libosmogsm18
+%files -n libosmogsm20
 %defattr(-,root,root)
-%_libdir/libosmogsm.so.18*
+%_libdir/libosmogsm.so.20*
 
 %files -n libosmogsm-devel
 %defattr(-,root,root)
@@ -497,9 +510,9 @@
 %_libdir/libosmosim.so
 %_libdir/pkgconfig/libosmosim.pc
 
-%files -n libosmovty9
+%files -n libosmovty13
 %defattr(-,root,root)
-%_libdir/libosmovty.so.9*
+%_libdir/libosmovty.so.13*
 
 %files -n libosmovty-devel
 %defattr(-,root,root)

libosmocore_1.8.0.tar.xz/contrib/struct_endianess.py Deleted

@@ -1,371 +0,0 @@
-#!/usr/bin/env python3
-
-'''Using mad regexes, automatically make sure that all structs with sub-byte
-integers have matching big-endian definitions. The idea is to save a lot of
-manual effort, and to automatically verify that there are no errors.
-This script most certainly has numerous holes and shortcomings, but actually,
-if you hit problems with it, rather adjust your coding style so that this
-script can deal with it...'''
-
-import re
-import sys
-import codecs
-import os.path
-
-re_struct_start = re.compile(r'^struct\s*a-zA-Z_a-zA-Z_0-9*\s*{\s*$')
-re_struct_end = re.compile(r'^}^;*;\s*$')
-
-re_substruct_start = re.compile(r'^\s+struct\s*{\s*$')
-re_substruct_end = re.compile(r'^\s+}\s*(^;*\s)a-zA-Z_a-zA-Z_0-9*\s*;\s*$')
-re_unnamed_substruct_end = re.compile(r'^\s+}\s*;\s*$')
-
-re_int_def = re.compile(r'(^\s*((const|unsigned|signed|char|int|long|int0-9+_t|uint0-9_t)\s+)+\s*)(^;*;)',
-                        re.DOTALL | re.MULTILINE)
-re_int_members = re.compile(r'(a-zA-Z_a-zA-Z_0-9*|a-zA-Z_a-zA-Z_0-9*\s*:\s*0-9+)\s*,;\s*', re.DOTALL | re.MULTILINE)
-
-re_little_endian_ifdef = re.compile(r'#\s*(if|elif)\s+OSMO_IS_LITTLE_ENDIAN\s*(==\s*1\s*|)');
-re_big_endian_ifdef = re.compile(r'#\s*(if|elif)\s+OSMO_IS_BIG_ENDIAN\s*');
-re_else = re.compile(r'#\s*else\s*');
-re_endif = re.compile(r'#\s*endif\s*');
-
-re_c_comment = re.compile(r'(/\*^*+\*/|//.?$)')
-
-def remove_c_comments(code_str):
-    return ''.join(re_c_comment.split(code_str)::2)
-
-def section_struct_body(struct_body_lines):
-    '''divide a top-level-struct body into sections of
-    'arbitrary string', 'body;\n', 'lines;\n', 'arbitrary string', ...
-    Aim: handle each sub-struct on its own, and if there already are ifdefs for
-    little and big endian, keep just the little endian bit and derive big
-    endian from it.
-    An arbitrary string is anything other than struct member definitions, like
-    a 'struct {', '} sub_name;', ...
-    "body lines" are lines that define struct members (possibly with comments).
-    Return: list of alternate arbitrary strings and variable definitions.
-    '''
-
-    # these globals are needed so that end_def() can change them from inside
-    # the function. Not very nice style, but easiest implementation.
-    global struct_body_parts
-    global arbitrary_part
-    global def_part
-
-    struct_body_parts = 
-    arbitrary_part = 
-    def_part = 
-
-    def end_def():
-        '''if there is any content, flush out recorded parts (def_part,
-        arbitrary_part) and start a new part. In short, cut a section
-        boundary.'''
-        global struct_body_parts
-        global arbitrary_part
-        global def_part
-
-        if def_part:
-            struct_body_parts.append(arbitrary_part)
-            arbitrary_part = 
-            struct_body_parts.append(def_part)
-            def_part = 
-
-    j = 0
-    while j < len(struct_body_lines):
-        line = struct_body_linesj
-
-        if (re_substruct_start.fullmatch(line)
-            or re_substruct_end.fullmatch(line)
-            or re_unnamed_substruct_end.fullmatch(line)):
-            end_def()
-            arbitrary_part.append(line)
-            j += 1
-            continue
-
-        if re_big_endian_ifdef.fullmatch(line):
-            end_def()
-            # discard big endian section
-            j += 1
-            while j < len(struct_body_lines):
-                line = struct_body_linesj
-                if re_endif.fullmatch(line):
-                    end_def()
-                    j += 1
-                    break;
-                if re_little_endian_ifdef.fullmatch(line):
-                    end_def()
-                    # keep that start of little endian section, not j++
-                    break;
-                if re_else.fullmatch(line):
-                    # there's an '#else' after big-endian. Shim a little-endian header in just for the loop.
-                    struct_body_linesj = '#if OSMO_IS_LITTLE_ENDIAN\n'
-                    break;
-                j += 1
-            continue
-
-        if re_little_endian_ifdef.fullmatch(line):
-            end_def()
-            j += 1
-            while j < len(struct_body_lines):
-                line = struct_body_linesj
-                if re_endif.fullmatch(line):
-                    end_def()
-                    j += 1
-                    break;
-                if re_big_endian_ifdef.fullmatch(line):
-                    end_def()
-                    # keep that start of big endian section, not j++
-                    break;
-                if re_else.fullmatch(line):
-                    # there's an '#else' after little-endian. Shim a big-endian header in just for the loop.
-                    struct_body_linesj = '#if OSMO_IS_BIG_ENDIAN\n'
-                    break;
-                def_part.append(line)
-                j += 1
-
-            continue
-
-        def_part.append(line)
-        j += 1
-
-    # flush the last section remaining that didn't see an explicit end
-    end_def()
-    # end_def() only flushes arbitrary_part if there was a def_part, so:
-    if arbitrary_part:
-        struct_body_parts.append(arbitrary_part)
-
-    return struct_body_parts
-
-def struct_body_to_big_endian(body_str):
-    '''Input: a multi-line string containing the body of a struct, i.e. without
-    sub-structs and without #if OSMO_IS_BIG_ENDIAN. like
-
-      '\tconst char *foo;\n\tuint8_t moo:3, goo:2;\n\tuint8_t loo:3;\n\tvoid *baz;\n'
-
-    Return None to indicate that there is no little/big endian split
-    required, or return a multi-line string of the big-endian version of this
-    same struct body, where sub-byte ints are reversed at byte boundaries, and
-    all others are copied 1:1. If there are no sub-byte integers, return None,
-    to indicate that there is no little/big endian split required.'''
-
-    # kick comments out of the code analysis. They will end up being stripped
-    # from big-endian only.
-    body_str = remove_c_comments(body_str)
-
-    def_strs = body_str.split(';')
-    def_strs = ('%s;' % def_str for def_str in def_strs if def_str.strip())
-
-    # classify defs as containing sub-byte members or not
-    # defs =  (true, 'uint8_t ', ('foo:3', 'bar:5')),
-    #          (false, 'int baz;'),...
-    defs = 
-    any_sub_byte_ints = False
-    for one_def in def_strs:
-
-        # does it have sub-string integers?
-        int_def = re_int_def.fullmatch(one_def)
-        if not int_def:
-            # not even a number, same for big and little endian
-            defs.append((False, one_def))
-            continue
-
-        int_type = int_def.group(1)
-        members_str = int_def.groups()-1
-        has_sub_byte_ints = False
-
-        members = 
-        for int_member in re_int_members.finditer(members_str):
-            member = int_member.group(1)
-            members.append(member)
-            if ':' in member:
-                has_sub_byte_ints = True
-
-        if not has_sub_byte_ints:
-            defs.append((False, one_def))
-        else:
-            defs.append((True, one_def, int_type, members))
-            any_sub_byte_ints = True
-
-    if not any_sub_byte_ints:
-        return None
-
-    # now the interesting part, go over the defs, and reverse the sub-byte ints
-    # at byte boundaries.
-
-    i = 0
-    got_bits = 0
-    byte_type = None
-    members_within_a_byte = 
-    big_endian_defs = 
-
-    big_defs = 
-    for classified_def in defs:
-        has_sub_byte_ints = classified_def0
-
-        # now the big endian part
-        if has_sub_byte_ints:
-            _, one_def, int_type, members = classified_def
-
-            if byte_type and byte_type.strip() != int_type.strip():
-                raise Exception('mismatching type continuation after incomplete byte: %r %r to %r'
-                                % (byte_type, members_within_a_byte, int_type))
-            byte_type = int_type
-
-            for member in members:
-                member_name, bits_str = member.split(':')
-                member_name = member_name.strip()
-                bits = int(bits_str)
-                member = '%s:%d' % (member_name, bits)
-                members_within_a_byte.append(member)
-                got_bits += bits
-
-                if got_bits == 8:
-                    # reverse these.
-                    big_endian_defs.append('%s%s;' % (byte_type, ', '.join(reversed(members_within_a_byte))))
-                    members_within_a_byte = 
-                    byte_type = None
-                    got_bits = 0
-
-                elif got_bits > 8:
-                    raise Exception('sub-byte int breaks clean byte bounds: %s -- %d + %d = %d bits'
-                                    % (member, got_bits - bits, bits, got_bits))
-
-        elif not has_sub_byte_ints:
-            if got_bits:
-                raise Exception('sub-byte members do not add up to clean byte bounds: %r' % members_within_a_byte)
-
-            big_endian_defs.append(classified_def1)
-
-    # strip empty lines
-    lines = l for l in (''.join(big_endian_defs).split('\n')) if l.strip()
-    # clean lines' whitespace errors we might have taken in with the type names
-    for i in range(len(lines)):
-        line = linesi
-        while len(line) and line-1 in ' \t':
-            line = line:-1
-        linesi = line
-    return '\n'.join(lines)
-
-def handle_struct_body(body_str):
-
-    big_endian_body_str = struct_body_to_big_endian(body_str)
-
-    if big_endian_body_str:
-        new_lines = '#if OSMO_IS_LITTLE_ENDIAN\n'
-        new_lines.append(body_str)
-        new_lines.append('#elif OSMO_IS_BIG_ENDIAN\n'
-                         '/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */\n')
-        new_lines.append(big_endian_body_str)
-        new_lines.append('\n#endif\n')
-        return ''.join(new_lines)
-    else:
-        return body_str
-
-def _check_file(f):
-    if not (f.endswith('.h') or f.endswith('.c') or f.endswith('.cpp')):
-        return
-
-    # section the file into
-    #  "no struct def", "struct {...};", "no struct def", ... 
-    sections = 
-    in_struct = False
-    buf = 
-    for line in codecs.open(f, "r", "utf-8").readlines():
-
-        if not in_struct and re_struct_start.fullmatch(line):
-            # flush whatever might still be in buf from before
-            sections.append(buf)
-            # start an in_struct section
-            buf = line
-            in_struct = True
-        elif in_struct and re_struct_end.fullmatch(line):
-            # add this end to the in_struct section and then start a non-struct section
-            buf.append(line)
-            sections.append(buf)
-            in_struct = False
-            buf = 
-        else:
-            buf.append(line)
-    # flush any leftovers in buf
-    if buf:
-        sections.append(buf)
-
-    # examine each struct, i.e. every second item in 'sections'
-    for i in range(len(sections)):
-        if not (i & 1):
-            continue
-
-        struct = sectionsi
-
-        # If the struct isn't packed, we need not bother.
-        # The practical use of this: in some structs we have booleans in the
-        # form of
-        #     integer flag:1;
-        # and these don't add up to bytes, and cause errors. So let's skip all
-        # non-packed structs, then all of those are out of the picture.
-        if not 'packed' in struct-1:
-            continue
-
-        try:
-
-            # assume the 'struct foo {' is on the first line, the closing brace
-            # '} __attribute...;' on the last, and the rest are individual
-            # definitions split by ';'.
-            struct_body_lines = struct1:-1
-            struct_body_parts = section_struct_body(struct_body_lines)
-
-            new_struct_body_parts = 
-            for j in range(len(struct_body_parts)):
-                part = ''.join(struct_body_partsj)
-                if not (j & 1):
-                    new_struct_body_parts.append(part)
-                else:
-                    new_struct_body_parts.append(handle_struct_body(part))
-
-            new_struct = struct0, ''.join(new_struct_body_parts), struct-1
-            sectionsi = new_struct
-        except Exception as e:
-            raise Exception('ERROR in struct %r' % struct0)
-
-    # phew. result.
-    result = ''.join((''.join(s) for s in sections))
-
-    # see if osmocom/core/endian.h is needed and included.
-    if (not f.endswith('endian.h')
-        and 'OSMO_IS_LITTLE_ENDIAN' in result
-        and '#include <osmocom/core/endian.h>' not in result):
-        # add the include after the last 'osmocom/core' include
-        last_include_start = result.rfind('#include <osmocom/core/')
-        if last_include_start < 0:
-            last_include_start = result.rfind('#include <osmocom/')
-        if last_include_start < 0:
-            last_include_start = result.rfind('#include')
-
-        if last_include_start < 0:
-            raise Exception('do not know where to include osmocom/core/endian.h in %r' % f)
-
-        insert_at = result.find('\n', last_include_start)
-
-        result = result:insert_at + '\n#include <osmocom/core/endian.h>' + resultinsert_at:
-
-    with codecs.open(f, "w", "utf-8") as fd:
-        fd.write(result)
-
-def check_file(f):
-        try:
-            _check_file(f)
-        except Exception as e:
-            raise Exception('ERROR IN FILE %r' % f)
-
-args = sys.argv1:
-if not args:
-    args = '.'
-
-for f in args:
-    if os.path.isdir(f):
-        for parent_path, subdirs, files in os.walk(f, None, None):
-            for ff in files:
-                check_file(os.path.join(parent_path, ff))
-    else:
-        check_file(f)
-
-# vim: tabstop=4 shiftwidth=4 expandtab

libosmocore_1.8.0.dsc -> libosmocore_1.9.0.dsc Changed

@@ -1,17 +1,17 @@
 Format: 3.0 (native)
 Source: libosmocore
-Binary: libosmocore, libosmocodec0, libosmocodec-doc, libosmocoding0, libosmocoding-doc, libosmocore20, libosmocore-doc, libosmogb14, libosmogb-doc, libosmogsm18, libosmogsm-doc, libosmoisdn0, libosmoisdn-doc, libosmovty9, libosmovty-doc, libosmoctrl0, libosmoctrl-doc, libosmosim2, libosmousb0, libosmocore-dev, libosmocore-utils, libosmocore-dbg
+Binary: libosmocore, libosmocodec4, libosmocodec-doc, libosmocoding0, libosmocoding-doc, libosmocore21, libosmocore-doc, libosmogb14, libosmogb-doc, libosmogsm20, libosmogsm-doc, libosmoisdn0, libosmoisdn-doc, libosmovty13, libosmovty-doc, libosmoctrl0, libosmoctrl-doc, libosmosim2, libosmosim-doc, libosmousb0, libosmousb-doc, libosmocore-dev, libosmocore-utils, libosmocore-dbg
 Architecture: any all
-Version: 1.8.0
+Version: 1.9.0
 Maintainer: Osmocom team <openbsc@lists.osmocom.org>
 Homepage: https://projects.osmocom.org/projects/libosmocore
 Standards-Version: 3.9.8
 Vcs-Browser: https://gitea.osmocom.org/osmocom/libosmocore
 Vcs-Git: https://gitea.osmocom.org/osmocom/libosmocore
-Build-Depends: debhelper (>= 9), autotools-dev, autoconf, automake, libtool, dh-autoreconf, libdpkg-perl, git, libgnutls28-dev, doxygen, libpcsclite-dev, pkg-config, libtalloc-dev (>= 2.1.0), libsctp-dev, libusb-1.0-0-dev, libmnl-dev, libsystemd-dev, python3:native
+Build-Depends: debhelper (>= 10), autotools-dev, autoconf, automake, libtool, dh-autoreconf, libdpkg-perl, git, libgnutls28-dev, doxygen, libpcsclite-dev, pkg-config, libtalloc-dev (>= 2.1.0), libsctp-dev, libusb-1.0-0-dev, libmnl-dev, libsystemd-dev, liburing-dev | base-files (<< 11) | ubuntu-keyring (<< 2021), python3:native
 Package-List:
  libosmocodec-doc deb doc optional arch=all
- libosmocodec0 deb libs optional arch=any
+ libosmocodec4 deb libs optional arch=any
  libosmocoding-doc deb doc optional arch=all
  libosmocoding0 deb libs optional arch=any
  libosmocore deb libs optional arch=any
@@ -19,22 +19,24 @@
  libosmocore-dev deb libdevel optional arch=any
  libosmocore-doc deb doc optional arch=all
  libosmocore-utils deb utils optional arch=any
- libosmocore20 deb libs optional arch=any
+ libosmocore21 deb libs optional arch=any
  libosmoctrl-doc deb doc optional arch=all
  libosmoctrl0 deb libs optional arch=any
  libosmogb-doc deb doc optional arch=all
  libosmogb14 deb libs optional arch=any
  libosmogsm-doc deb doc optional arch=all
- libosmogsm18 deb libs optional arch=any
+ libosmogsm20 deb libs optional arch=any
  libosmoisdn-doc deb doc optional arch=all
  libosmoisdn0 deb libs optional arch=any
+ libosmosim-doc deb doc optional arch=all
  libosmosim2 deb libs optional arch=any
+ libosmousb-doc deb doc optional arch=all
  libosmousb0 deb libs optional arch=any
  libosmovty-doc deb doc optional arch=all
- libosmovty9 deb libs optional arch=any
+ libosmovty13 deb libs optional arch=any
 Checksums-Sha1:
- 84a5885b1fb36c49b840bf6979578cd764327ae6 1017004 libosmocore_1.8.0.tar.xz
+ e38c1f5764f993b870f2e745dfbcf2ecae9c02ef 1072540 libosmocore_1.9.0.tar.xz
 Checksums-Sha256:
- d7c39f08cc052eef247fc88406ca3ca256b3c6a058686f8a46a9848f7d77dca9 1017004 libosmocore_1.8.0.tar.xz
+ 9a5be8a0134839aa587a76d7ce1ad4cc5bd3de2d226ff4a42f0bb432c1cc3805 1072540 libosmocore_1.9.0.tar.xz
 Files:
- 8887ed3ebfc0601dfe8726c3a2338486 1017004 libosmocore_1.8.0.tar.xz
+ 1866ce5e053cbee8118c8090a4fe172c 1072540 libosmocore_1.9.0.tar.xz

libosmocore_1.9.0.tar.xz/.checkpatch.conf Added

libosmocore_1.8.0.tar.xz/.tarball-version -> libosmocore_1.9.0.tar.xz/.tarball-version Changed

libosmocore_1.9.0.tar.xz/Doxyfile.sim.in Added

@@ -0,0 +1,1716 @@
+# Doxyfile 1.7.4
+
+# This file describes the settings to be used by the documentation system
+# doxygen (www.doxygen.org) for a project.
+#
+# All text after a hash (#) is considered a comment and will be ignored.
+# The format is:
+#       TAG = value value, ...
+# For lists items can also be appended using:
+#       TAG += value value, ...
+# Values that contain spaces should be placed between quotes (" ").
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+
+# This tag specifies the encoding used for all characters in the config file
+# that follow. The default is UTF-8 which is also the encoding used for all
+# text before the first occurrence of this tag. Doxygen uses libiconv (or the
+# iconv built into libc) for the transcoding. See
+# http://www.gnu.org/software/libiconv for the list of possible encodings.
+
+DOXYFILE_ENCODING      = UTF-8
+
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
+# by quotes) that should identify the project.
+
+PROJECT_NAME           = libosmosim
+
+# The PROJECT_NUMBER tag can be used to enter a project or revision number.
+# This could be handy for archiving the generated documentation or
+# if some version control system is used.
+
+PROJECT_NUMBER         = @VERSION@
+
+# Using the PROJECT_BRIEF tag one can provide an optional one line description
+# for a project that appears at the top of each page and should give viewer
+# a quick idea about the purpose of the project. Keep the description short.
+
+PROJECT_BRIEF          = "Osmocom SIM library"
+
+# With the PROJECT_LOGO tag one can specify an logo or icon that is
+# included in the documentation. The maximum height of the logo should not
+# exceed 55 pixels and the maximum width should not exceed 200 pixels.
+# Doxygen will copy the logo to the output directory.
+
+PROJECT_LOGO           =
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
+# base path where the generated documentation will be put.
+# If a relative path is entered, it will be relative to the location
+# where doxygen was started. If left blank the current directory will be used.
+
+OUTPUT_DIRECTORY       = doc/sim
+
+# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
+# 4096 sub-directories (in 2 levels) under the output directory of each output
+# format and will distribute the generated files over these directories.
+# Enabling this option can be useful when feeding doxygen a huge amount of
+# source files, where putting all generated files in the same directory would
+# otherwise cause performance problems for the file system.
+
+CREATE_SUBDIRS         = NO
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all constant output in the proper language.
+# The default language is English, other supported languages are:
+# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional,
+# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German,
+# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English
+# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian,
+# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak,
+# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese.
+
+OUTPUT_LANGUAGE        = English
+
+# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
+# include brief member descriptions after the members that are listed in
+# the file and class documentation (similar to JavaDoc).
+# Set to NO to disable this.
+
+BRIEF_MEMBER_DESC      = YES
+
+# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
+# the brief description of a member or function before the detailed description.
+# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
+# brief descriptions will be completely suppressed.
+
+REPEAT_BRIEF           = YES
+
+# This tag implements a quasi-intelligent brief description abbreviator
+# that is used to form the text in various listings. Each string
+# in this list, if found as the leading text of the brief description, will be
+# stripped from the text and the result after processing the whole list, is
+# used as the annotated text. Otherwise, the brief description is used as-is.
+# If left blank, the following values are used ("$name" is automatically
+# replaced with the name of the entity): "The $name class" "The $name widget"
+# "The $name file" "is" "provides" "specifies" "contains"
+# "represents" "a" "an" "the"
+
+ABBREVIATE_BRIEF       =
+
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
+# Doxygen will generate a detailed section even if there is only a brief
+# description.
+
+ALWAYS_DETAILED_SEC    = NO
+
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
+# inherited members of a class in the documentation of that class as if those
+# members were ordinary class members. Constructors, destructors and assignment
+# operators of the base classes will not be shown.
+
+INLINE_INHERITED_MEMB  = NO
+
+# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
+# path before files name in the file list and in the header files. If set
+# to NO the shortest path that makes the file name unique will be used.
+
+FULL_PATH_NAMES        = YES
+
+# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
+# can be used to strip a user-defined part of the path. Stripping is
+# only done if one of the specified strings matches the left-hand part of
+# the path. The tag can be used to show relative paths in the file list.
+# If left blank the directory from which doxygen is run is used as the
+# path to strip.
+
+STRIP_FROM_PATH        =
+
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
+# the path mentioned in the documentation of a class, which tells
+# the reader which header file to include in order to use a class.
+# If left blank only the name of the header file containing the class
+# definition is used. Otherwise one should specify the include paths that
+# are normally passed to the compiler using the -I flag.
+
+STRIP_FROM_INC_PATH    =
+
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
+# (but less readable) file names. This can be useful if your file system
+# doesn't support long names like on DOS, Mac, or CD-ROM.
+
+SHORT_NAMES            = NO
+
+# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
+# will interpret the first line (until the first dot) of a JavaDoc-style
+# comment as the brief description. If set to NO, the JavaDoc
+# comments will behave just like regular Qt-style comments
+# (thus requiring an explicit @brief command for a brief description.)
+
+JAVADOC_AUTOBRIEF      = YES
+
+# If the QT_AUTOBRIEF tag is set to YES then Doxygen will
+# interpret the first line (until the first dot) of a Qt-style
+# comment as the brief description. If set to NO, the comments
+# will behave just like regular Qt-style comments (thus requiring
+# an explicit command for a brief description.)
+
+QT_AUTOBRIEF           = YES
+
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
+# treat a multi-line C++ special comment block (i.e. a block of //! or ///
+# comments) as a brief description. This used to be the default behaviour.
+# The new default is to treat a multi-line C++ comment block as a detailed
+# description. Set this tag to YES if you prefer the old behaviour instead.
+
+MULTILINE_CPP_IS_BRIEF = NO
+
+# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
+# member inherits the documentation from any documented member that it
+# re-implements.
+
+INHERIT_DOCS           = YES
+
+# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce
+# a new page for each member. If set to NO, the documentation of a member will
+# be part of the file/class/namespace that contains it.
+
+SEPARATE_MEMBER_PAGES  = NO
+
+# The TAB_SIZE tag can be used to set the number of spaces in a tab.
+# Doxygen uses this value to replace tabs by spaces in code fragments.
+
+TAB_SIZE               = 8
+
+# This tag can be used to specify a number of aliases that acts
+# as commands in the documentation. An alias has the form "name=value".
+# For example adding "sideeffect=\par Side Effects:\n" will allow you to
+# put the command \sideeffect (or @sideeffect) in the documentation, which
+# will result in a user-defined paragraph with heading "Side Effects:".
+# You can put \n's in the value part of an alias to insert newlines.
+
+ALIASES                =
+
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C
+# sources only. Doxygen will then generate output that is more tailored for C.
+# For instance, some of the names that are used will be different. The list
+# of all members will be omitted, etc.
+
+OPTIMIZE_OUTPUT_FOR_C  = YES
+
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java
+# sources only. Doxygen will then generate output that is more tailored for
+# Java. For instance, namespaces will be presented as packages, qualified
+# scopes will look different, etc.
+
+OPTIMIZE_OUTPUT_JAVA   = NO
+
+# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
+# sources only. Doxygen will then generate output that is more tailored for
+# Fortran.
+
+OPTIMIZE_FOR_FORTRAN   = NO
+
+# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
+# sources. Doxygen will then generate output that is tailored for
+# VHDL.
+
+OPTIMIZE_OUTPUT_VHDL   = NO
+
+# Doxygen selects the parser to use depending on the extension of the files it
+# parses. With this tag you can assign which parser to use for a given extension.
+# Doxygen has a built-in mapping, but you can override or extend it using this
+# tag. The format is ext=language, where ext is a file extension, and language
+# is one of the parsers supported by doxygen: IDL, Java, Javascript, CSharp, C,
+# C++, D, PHP, Objective-C, Python, Fortran, VHDL, C, C++. For instance to make
+# doxygen treat .inc files as Fortran files (default is PHP), and .f files as C
+# (default is Fortran), use: inc=Fortran f=C. Note that for custom extensions
+# you also need to set FILE_PATTERNS otherwise the files are not read by doxygen.
+
+EXTENSION_MAPPING      =
+
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
+# to include (a tag file for) the STL sources as input, then you should
+# set this tag to YES in order to let doxygen match functions declarations and
+# definitions whose arguments contain STL classes (e.g. func(std::string); v.s.
+# func(std::string) {}). This also makes the inheritance and collaboration
+# diagrams that involve STL classes more complete and accurate.
+
+BUILTIN_STL_SUPPORT    = NO
+
+# If you use Microsoft's C++/CLI language, you should set this option to YES to
+# enable parsing support.
+
+CPP_CLI_SUPPORT        = NO
+
+# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only.
+# Doxygen will parse them like normal C++ but will assume all classes use public
+# instead of private inheritance when no explicit protection keyword is present.
+
+SIP_SUPPORT            = NO
+
+# For Microsoft's IDL there are propget and propput attributes to indicate getter
+# and setter methods for a property. Setting this option to YES (the default)
+# will make doxygen replace the get and set methods by a property in the
+# documentation. This will only work if the methods are indeed getting or
+# setting a simple type. If this is not the case, or you want to show the
+# methods anyway, you should set this option to NO.
+
+IDL_PROPERTY_SUPPORT   = YES
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
+# tag is set to YES, then doxygen will reuse the documentation of the first
+# member in the group (if any) for the other members of the group. By default
+# all members of a group must be documented explicitly.
+
+DISTRIBUTE_GROUP_DOC   = NO
+
+# Set the SUBGROUPING tag to YES (the default) to allow class member groups of
+# the same type (for instance a group of public functions) to be put as a
+# subgroup of that type (e.g. under the Public Functions section). Set it to
+# NO to prevent subgrouping. Alternatively, this can be done per class using
+# the \nosubgrouping command.
+
+SUBGROUPING            = YES
+
+# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and
+# unions are shown inside the group in which they are included (e.g. using
+# @ingroup) instead of on a separate page (for HTML and Man pages) or
+# section (for LaTeX and RTF).
+
+INLINE_GROUPED_CLASSES = NO
+
+# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum
+# is documented as struct, union, or enum with the name of the typedef. So
+# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
+# with name TypeT. When disabled the typedef will appear as a member of a file,
+# namespace, or class. And the struct will be named TypeS. This can typically
+# be useful for C code in case the coding convention dictates that all compound
+# types are typedef'ed and only the typedef is referenced, never the tag name.
+
+TYPEDEF_HIDES_STRUCT   = NO
+
+# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to
+# determine which symbols to keep in memory and which to flush to disk.
+# When the cache is full, less often used symbols will be written to disk.
+# For small to medium size projects (<1000 input files) the default value is
+# probably good enough. For larger projects a too small cache size can cause
+# doxygen to be busy swapping symbols to and from disk most of the time
+# causing a significant performance penalty.
+# If the system has enough physical memory increasing the cache will improve the
+# performance by keeping more symbols in memory. Note that the value works on
+# a logarithmic scale so increasing the size by one will roughly double the
+# memory usage. The cache size is given by this formula:
+# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0,
+# corresponding to a cache size of 2^16 = 65536 symbols
+
+SYMBOL_CACHE_SIZE      = 0
+
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+
+# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
+# documentation are documented, even if no documentation was available.
+# Private class members and static file members will be hidden unless
+# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
+
+EXTRACT_ALL            = YES
+
+# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
+# will be included in the documentation.
+
+EXTRACT_PRIVATE        = NO
+
+# If the EXTRACT_STATIC tag is set to YES all static members of a file
+# will be included in the documentation.
+
+EXTRACT_STATIC         = YES
+
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
+# defined locally in source files will be included in the documentation.
+# If set to NO only classes defined in header files are included.
+
+EXTRACT_LOCAL_CLASSES  = YES
+
+# This flag is only useful for Objective-C code. When set to YES local
+# methods, which are defined in the implementation section but not in
+# the interface are included in the documentation.
+# If set to NO (the default) only methods in the interface are included.
+
+EXTRACT_LOCAL_METHODS  = NO
+
+# If this flag is set to YES, the members of anonymous namespaces will be
+# extracted and appear in the documentation as a namespace called
+# 'anonymous_namespace{file}', where file will be replaced with the base
+# name of the file that contains the anonymous namespace. By default
+# anonymous namespaces are hidden.
+
+EXTRACT_ANON_NSPACES   = NO
+
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
+# undocumented members of documented classes, files or namespaces.
+# If set to NO (the default) these members will be included in the
+# various overviews, but no documentation section is generated.
+# This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_MEMBERS     = NO
+
+# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all
+# undocumented classes that are normally visible in the class hierarchy.
+# If set to NO (the default) these classes will be included in the various
+# overviews. This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_CLASSES     = NO
+
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all
+# friend (class|struct|union) declarations.
+# If set to NO (the default) these declarations will be included in the
+# documentation.
+
+HIDE_FRIEND_COMPOUNDS  = NO
+
+# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any
+# documentation blocks found inside the body of a function.
+# If set to NO (the default) these blocks will be appended to the
+# function's detailed documentation block.
+
+HIDE_IN_BODY_DOCS      = NO
+
+# The INTERNAL_DOCS tag determines if documentation
+# that is typed after a \internal command is included. If the tag is set
+# to NO (the default) then the documentation will be excluded.
+# Set it to YES to include the internal documentation.
+
+INTERNAL_DOCS          = NO
+
+# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate
+# file names in lower-case letters. If set to YES upper-case letters are also
+# allowed. This is useful if you have classes or files whose names only differ
+# in case and if your file system supports case sensitive file names. Windows
+# and Mac users are advised to set this option to NO.
+
+CASE_SENSE_NAMES       = YES
+
+# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen
+# will show members with their full class and namespace scopes in the
+# documentation. If set to YES the scope will be hidden.
+
+HIDE_SCOPE_NAMES       = NO
+
+# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen
+# will put a list of the files that are included by a file in the documentation
+# of that file.
+
+SHOW_INCLUDE_FILES     = YES
+
+# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen
+# will list include files with double quotes in the documentation
+# rather than with sharp brackets.
+
+FORCE_LOCAL_INCLUDES   = NO
+
+# If the INLINE_INFO tag is set to YES (the default) then a tag inline
+# is inserted in the documentation for inline members.
+
+INLINE_INFO            = YES
+
+# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen
+# will sort the (detailed) documentation of file and class members
+# alphabetically by member name. If set to NO the members will appear in
+# declaration order.
+
+SORT_MEMBER_DOCS       = YES
+
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the
+# brief documentation of file, namespace and class members alphabetically
+# by member name. If set to NO (the default) the members will appear in
+# declaration order.
+
+SORT_BRIEF_DOCS        = NO
+
+# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen
+# will sort the (brief and detailed) documentation of class members so that
+# constructors and destructors are listed first. If set to NO (the default)
+# the constructors will appear in the respective orders defined by
+# SORT_MEMBER_DOCS and SORT_BRIEF_DOCS.
+# This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO
+# and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO.
+
+SORT_MEMBERS_CTORS_1ST = NO
+
+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the
+# hierarchy of group names into alphabetical order. If set to NO (the default)
+# the group names will appear in their defined order.
+
+SORT_GROUP_NAMES       = NO
+
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be
+# sorted by fully-qualified names, including namespaces. If set to
+# NO (the default), the class list will be sorted only by class name,
+# not including the namespace part.
+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
+# Note: This option applies only to the class list, not to the
+# alphabetical list.
+
+SORT_BY_SCOPE_NAME     = NO
+
+# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to
+# do proper type resolution of all parameters of a function it will reject a
+# match between the prototype and the implementation of a member function even
+# if there is only one candidate or it is obvious which candidate to choose
+# by doing a simple string match. By disabling STRICT_PROTO_MATCHING doxygen
+# will still accept a match between prototype and implementation in such cases.
+
+STRICT_PROTO_MATCHING  = NO
+
+# The GENERATE_TODOLIST tag can be used to enable (YES) or
+# disable (NO) the todo list. This list is created by putting \todo
+# commands in the documentation.
+
+GENERATE_TODOLIST      = YES
+
+# The GENERATE_TESTLIST tag can be used to enable (YES) or
+# disable (NO) the test list. This list is created by putting \test
+# commands in the documentation.
+
+GENERATE_TESTLIST      = YES
+
+# The GENERATE_BUGLIST tag can be used to enable (YES) or
+# disable (NO) the bug list. This list is created by putting \bug
+# commands in the documentation.
+
+GENERATE_BUGLIST       = YES
+
+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or
+# disable (NO) the deprecated list. This list is created by putting
+# \deprecated commands in the documentation.
+
+GENERATE_DEPRECATEDLIST= YES
+
+# The ENABLED_SECTIONS tag can be used to enable conditional
+# documentation sections, marked by \if sectionname ... \endif.
+
+ENABLED_SECTIONS       =
+
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines
+# the initial value of a variable or macro consists of for it to appear in
+# the documentation. If the initializer consists of more lines than specified
+# here it will be hidden. Use a value of 0 to hide initializers completely.
+# The appearance of the initializer of individual variables and macros in the
+# documentation can be controlled using \showinitializer or \hideinitializer
+# command in the documentation regardless of this setting.
+
+MAX_INITIALIZER_LINES  = 30
+
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated
+# at the bottom of the documentation of classes and structs. If set to YES the
+# list will mention the files that were used to generate the documentation.
+
+SHOW_USED_FILES        = YES
+
+# If the sources in your project are distributed over multiple directories
+# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy
+# in the documentation. The default is NO.
+
+SHOW_DIRECTORIES       = NO
+
+# Set the SHOW_FILES tag to NO to disable the generation of the Files page.
+# This will remove the Files entry from the Quick Index and from the
+# Folder Tree View (if specified). The default is YES.
+
+SHOW_FILES             = YES
+
+# Set the SHOW_NAMESPACES tag to NO to disable the generation of the
+# Namespaces page.
+# This will remove the Namespaces entry from the Quick Index
+# and from the Folder Tree View (if specified). The default is YES.
+
+SHOW_NAMESPACES        = YES
+
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that
+# doxygen should invoke to get the current version for each file (typically from
+# the version control system). Doxygen will invoke the program by executing (via
+# popen()) the command <command> <input-file>, where <command> is the value of
+# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file
+# provided by doxygen. Whatever the program writes to standard output
+# is used as the file version. See the manual for examples.
+
+FILE_VERSION_FILTER    =
+
+# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
+# by doxygen. The layout file controls the global structure of the generated
+# output files in an output format independent way. The create the layout file
+# that represents doxygen's defaults, run doxygen with the -l option.
+# You can optionally specify a file name after the option, if omitted
+# DoxygenLayout.xml will be used as the name of the layout file.
+
+LAYOUT_FILE            =
+
+#---------------------------------------------------------------------------
+# configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+
+# The QUIET tag can be used to turn on/off the messages that are generated
+# by doxygen. Possible values are YES and NO. If left blank NO is used.
+
+QUIET                  = NO
+
+# The WARNINGS tag can be used to turn on/off the warning messages that are
+# generated by doxygen. Possible values are YES and NO. If left blank
+# NO is used.
+
+WARNINGS               = YES
+
+# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings
+# for undocumented members. If EXTRACT_ALL is set to YES then this flag will
+# automatically be disabled.
+
+WARN_IF_UNDOCUMENTED   = YES
+
+# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for
+# potential errors in the documentation, such as not documenting some
+# parameters in a documented function, or documenting parameters that
+# don't exist or using markup commands wrongly.
+
+WARN_IF_DOC_ERROR      = YES
+
+# The WARN_NO_PARAMDOC option can be enabled to get warnings for
+# functions that are documented, but have no documentation for their parameters
+# or return value. If set to NO (the default) doxygen will only warn about
+# wrong or incomplete parameter documentation, but not about the absence of
+# documentation.
+
+WARN_NO_PARAMDOC       = NO
+
+# The WARN_FORMAT tag determines the format of the warning messages that
+# doxygen can produce. The string should contain the $file, $line, and $text
+# tags, which will be replaced by the file and line number from which the
+# warning originated and the warning text. Optionally the format may contain
+# $version, which will be replaced by the version of the file (if it could
+# be obtained via FILE_VERSION_FILTER)
+
+WARN_FORMAT            = "$file:$line: $text"
+
+# The WARN_LOGFILE tag can be used to specify a file to which warning
+# and error messages should be written. If left blank the output is written
+# to stderr.
+
+WARN_LOGFILE           =
+
+#---------------------------------------------------------------------------
+# configuration options related to the input files
+#---------------------------------------------------------------------------
+
+# The INPUT tag can be used to specify the files and/or directories that contain
+# documented source files. You may enter file names like "myfile.cpp" or
+# directories like "/usr/src/myproject". Separate the files or directories
+# with spaces.
+
+INPUT                  = @srcdir@/include/osmocom/sim @srcdir@/src/sim
+
+# This tag can be used to specify the character encoding of the source files
+# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
+# also the default input encoding. Doxygen uses libiconv (or the iconv built
+# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for
+# the list of possible encodings.
+
+INPUT_ENCODING         = UTF-8
+
+# If the value of the INPUT tag contains directories, you can use the
+# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
+# and *.h) to filter out the source-files in the directories. If left
+# blank the following patterns are tested:
+# *.c *.cc *.cxx *.cpp *.c++ *.d *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh
+# *.hxx *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.dox *.py
+# *.f90 *.f *.for *.vhd *.vhdl
+
+FILE_PATTERNS          =
+
+# The RECURSIVE tag can be used to turn specify whether or not subdirectories
+# should be searched for input files as well. Possible values are YES and NO.
+# If left blank NO is used.
+
+RECURSIVE              = YES
+
+# The EXCLUDE tag can be used to specify files and/or directories that should
+# excluded from the INPUT source files. This way you can easily exclude a
+# subdirectory from a directory tree whose root is specified with the INPUT tag.
+
+EXCLUDE                =
+
+# The EXCLUDE_SYMLINKS tag can be used select whether or not files or
+# directories that are symbolic links (a Unix file system feature) are excluded
+# from the input.
+
+EXCLUDE_SYMLINKS       = NO
+
+# If the value of the INPUT tag contains directories, you can use the
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
+# certain files from those directories. Note that the wildcards are matched
+# against the file with absolute path, so to exclude all test directories
+# for example use the pattern */test/*
+
+EXCLUDE_PATTERNS       =
+
+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
+# (namespaces, classes, functions, etc.) that should be excluded from the
+# output. The symbol name can be a fully qualified name, a word, or if the
+# wildcard * is used, a substring. Examples: ANamespace, AClass,
+# AClass::ANamespace, ANamespace::*Test
+
+EXCLUDE_SYMBOLS        =
+
+# The EXAMPLE_PATH tag can be used to specify one or more files or
+# directories that contain example code fragments that are included (see
+# the \include command).
+
+EXAMPLE_PATH           =
+
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
+# and *.h) to filter out the source-files in the directories. If left
+# blank all files are included.
+
+EXAMPLE_PATTERNS       =
+
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
+# searched for input files to be used with the \include or \dontinclude
+# commands irrespective of the value of the RECURSIVE tag.
+# Possible values are YES and NO. If left blank NO is used.
+
+EXAMPLE_RECURSIVE      = NO
+
+# The IMAGE_PATH tag can be used to specify one or more files or
+# directories that contain image that are included in the documentation (see
+# the \image command).
+
+# IMAGE_PATH             = images/
+
+# The INPUT_FILTER tag can be used to specify a program that doxygen should
+# invoke to filter for each input file. Doxygen will invoke the filter program
+# by executing (via popen()) the command <filter> <input-file>, where <filter>
+# is the value of the INPUT_FILTER tag, and <input-file> is the name of an
+# input file. Doxygen will then use the output that the filter program writes
+# to standard output.
+# If FILTER_PATTERNS is specified, this tag will be
+# ignored.
+
+INPUT_FILTER           =
+
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
+# basis.
+# Doxygen will compare the file name with each pattern and apply the
+# filter if there is a match.
+# The filters are a list of the form:
+# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further
+# info on how filters are used. If FILTER_PATTERNS is empty or if
+# non of the patterns match the file name, INPUT_FILTER is applied.
+
+FILTER_PATTERNS        =
+
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
+# INPUT_FILTER) will be used to filter the input files when producing source
+# files to browse (i.e. when SOURCE_BROWSER is set to YES).
+
+FILTER_SOURCE_FILES    = NO
+
+# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
+# pattern. A pattern will override the setting for FILTER_PATTERN (if any)
+# and it is also possible to disable source filtering for a specific pattern
+# using *.ext= (so without naming a filter). This option only has effect when
+# FILTER_SOURCE_FILES is enabled.
+
+FILTER_SOURCE_PATTERNS =
+
+#---------------------------------------------------------------------------
+# configuration options related to source browsing
+#---------------------------------------------------------------------------
+
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will
+# be generated. Documented entities will be cross-referenced with these sources.
+# Note: To get rid of all source code in the generated output, make sure also
+# VERBATIM_HEADERS is set to NO.
+
+SOURCE_BROWSER         = NO
+
+# Setting the INLINE_SOURCES tag to YES will include the body
+# of functions and classes directly in the documentation.
+
+INLINE_SOURCES         = NO
+
+# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
+# doxygen to hide any special comment blocks from generated source code
+# fragments. Normal C and C++ comments will always remain visible.
+
+STRIP_CODE_COMMENTS    = YES
+
+# If the REFERENCED_BY_RELATION tag is set to YES
+# then for each documented function all documented
+# functions referencing it will be listed.
+
+REFERENCED_BY_RELATION = YES
+
+# If the REFERENCES_RELATION tag is set to YES
+# then for each documented function all documented entities
+# called/used by that function will be listed.
+
+REFERENCES_RELATION    = YES
+
+# If the REFERENCES_LINK_SOURCE tag is set to YES (the default)
+# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from
+# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will
+# link to the source code.
+# Otherwise they will link to the documentation.
+
+REFERENCES_LINK_SOURCE = YES
+
+# If the USE_HTAGS tag is set to YES then the references to source code
+# will point to the HTML generated by the htags(1) tool instead of doxygen
+# built-in source browser. The htags tool is part of GNU's global source
+# tagging system (see http://www.gnu.org/software/global/global.html). You
+# will need version 4.8.6 or higher.
+
+USE_HTAGS              = NO
+
+# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen
+# will generate a verbatim copy of the header file for each class for
+# which an include is specified. Set to NO to disable this.
+
+VERBATIM_HEADERS       = YES
+
+#---------------------------------------------------------------------------
+# configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index
+# of all compounds will be generated. Enable this if the project
+# contains a lot of classes, structs, unions or interfaces.
+
+ALPHABETICAL_INDEX     = NO
+
+# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then
+# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
+# in which this list will be split (can be a number in the range 1..20)
+
+COLS_IN_ALPHA_INDEX    = 5
+
+# In case all classes in a project start with a common prefix, all
+# classes will be put under the same header in the alphabetical index.
+# The IGNORE_PREFIX tag can be used to specify one or more prefixes that
+# should be ignored while generating the index headers.
+
+IGNORE_PREFIX          =
+
+#---------------------------------------------------------------------------
+# configuration options related to the HTML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_HTML tag is set to YES (the default) Doxygen will
+# generate HTML output.
+
+GENERATE_HTML          = YES
+
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `html' will be used as the default path.
+
+HTML_OUTPUT            = html
+
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for
+# each generated HTML page (for example: .htm,.php,.asp). If it is left blank
+# doxygen will generate files with .html extension.
+
+HTML_FILE_EXTENSION    = .html
+
+# The HTML_HEADER tag can be used to specify a personal HTML header for
+# each generated HTML page. If it is left blank doxygen will generate a
+# standard header. Note that when using a custom header you are responsible
+# for the proper inclusion of any scripts and style sheets that doxygen
+# needs, which is dependent on the configuration options used.
+# It is advised to generate a default header using "doxygen -w html
+# header.html footer.html stylesheet.css YourConfigFile" and then modify
+# that header. Note that the header is subject to change so you typically
+# have to redo this when upgrading to a newer version of doxygen or when changing the value of configuration settings such as GENERATE_TREEVIEW!
+
+HTML_HEADER            =
+
+# The HTML_FOOTER tag can be used to specify a personal HTML footer for
+# each generated HTML page. If it is left blank doxygen will generate a
+# standard footer.
+
+HTML_FOOTER            =
+
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
+# style sheet that is used by each HTML page. It can be used to
+# fine-tune the look of the HTML output. If the tag is left blank doxygen
+# will generate a default style sheet. Note that doxygen will try to copy
+# the style sheet file to the HTML output directory, so don't put your own
+# stylesheet in the HTML output directory as well, or it will be erased!
+
+HTML_STYLESHEET        =
+
+# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the HTML output directory. Note
+# that these files will be copied to the base HTML output directory. Use the
+# $relpath$ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
+# files. In the HTML_STYLESHEET file, use the file name only. Also note that
+# the files will be copied as-is; there are no commands or markers available.
+
+HTML_EXTRA_FILES       =
+
+# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output.
+# Doxygen will adjust the colors in the stylesheet and background images
+# according to this color. Hue is specified as an angle on a colorwheel,
+# see http://en.wikipedia.org/wiki/Hue for more information.
+# For instance the value 0 represents red, 60 is yellow, 120 is green,
+# 180 is cyan, 240 is blue, 300 purple, and 360 is red again.
+# The allowed range is 0 to 359.
+
+HTML_COLORSTYLE_HUE    = 220
+
+# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of
+# the colors in the HTML output. For a value of 0 the output will use
+# grayscales only. A value of 255 will produce the most vivid colors.
+
+HTML_COLORSTYLE_SAT    = 100
+
+# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to
+# the luminance component of the colors in the HTML output. Values below
+# 100 gradually make the output lighter, whereas values above 100 make
+# the output darker. The value divided by 100 is the actual gamma applied,
+# so 80 represents a gamma of 0.8, The value 220 represents a gamma of 2.2,
+# and 100 does not change the gamma.
+
+HTML_COLORSTYLE_GAMMA  = 80
+
+# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
+# page will contain the date and time when the page was generated. Setting
+# this to NO can help when comparing the output of multiple runs.
+
+HTML_TIMESTAMP         = NO
+
+# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
+# files or namespaces will be aligned in HTML using tables. If set to
+# NO a bullet list will be used.
+
+HTML_ALIGN_MEMBERS     = YES
+
+# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
+# documentation will contain sections that can be hidden and shown after the
+# page has loaded. For this to work a browser that supports
+# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox
+# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari).
+
+HTML_DYNAMIC_SECTIONS  = NO
+
+# If the GENERATE_DOCSET tag is set to YES, additional index files
+# will be generated that can be used as input for Apple's Xcode 3
+# integrated development environment, introduced with OSX 10.5 (Leopard).
+# To create a documentation set, doxygen will generate a Makefile in the
+# HTML output directory. Running make will produce the docset in that
+# directory and running "make install" will install the docset in
+# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find
+# it at startup.
+# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
+# for more information.
+
+GENERATE_DOCSET        = NO
+
+# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the
+# feed. A documentation feed provides an umbrella under which multiple
+# documentation sets from a single provider (such as a company or product suite)
+# can be grouped.
+
+DOCSET_FEEDNAME        = "Doxygen generated docs"
+
+# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that
+# should uniquely identify the documentation set bundle. This should be a
+# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen
+# will append .docset to the name.
+
+DOCSET_BUNDLE_ID       = org.doxygen.Project
+
+# When GENERATE_PUBLISHER_ID tag specifies a string that should uniquely identify
+# the documentation publisher. This should be a reverse domain-name style
+# string, e.g. com.mycompany.MyDocSet.documentation.
+
+DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
+
+# The GENERATE_PUBLISHER_NAME tag identifies the documentation publisher.
+
+DOCSET_PUBLISHER_NAME  = Publisher
+
+# If the GENERATE_HTMLHELP tag is set to YES, additional index files
+# will be generated that can be used as input for tools like the
+# Microsoft HTML help workshop to generate a compiled HTML help file (.chm)
+# of the generated HTML documentation.
+
+GENERATE_HTMLHELP      = NO
+
+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can
+# be used to specify the file name of the resulting .chm file. You
+# can add a path in front of the file if the result should not be
+# written to the html output directory.
+
+CHM_FILE               =
+
+# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can
+# be used to specify the location (absolute path including file name) of
+# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run
+# the HTML help compiler on the generated index.hhp.
+
+HHC_LOCATION           =
+
+# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag
+# controls if a separate .chi index file is generated (YES) or that
+# it should be included in the master .chm file (NO).
+
+GENERATE_CHI           = NO
+
+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING
+# is used to encode HtmlHelp index (hhk), content (hhc) and project file
+# content.
+
+CHM_INDEX_ENCODING     =
+
+# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag
+# controls whether a binary table of contents is generated (YES) or a
+# normal table of contents (NO) in the .chm file.
+
+BINARY_TOC             = NO
+
+# The TOC_EXPAND flag can be set to YES to add extra items for group members
+# to the contents of the HTML help documentation and to the tree view.
+
+TOC_EXPAND             = NO
+
+# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
+# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated
+# that can be used as input for Qt's qhelpgenerator to generate a
+# Qt Compressed Help (.qch) of the generated HTML documentation.
+
+GENERATE_QHP           = NO
+
+# If the QHG_LOCATION tag is specified, the QCH_FILE tag can
+# be used to specify the file name of the resulting .qch file.
+# The path specified is relative to the HTML output folder.
+
+QCH_FILE               =
+
+# The QHP_NAMESPACE tag specifies the namespace to use when generating
+# Qt Help Project output. For more information please see
+# http://doc.trolltech.com/qthelpproject.html#namespace
+
+QHP_NAMESPACE          = org.doxygen.Project
+
+# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating
+# Qt Help Project output. For more information please see
+# http://doc.trolltech.com/qthelpproject.html#virtual-folders
+
+QHP_VIRTUAL_FOLDER     = doc
+
+# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to
+# add. For more information please see
+# http://doc.trolltech.com/qthelpproject.html#custom-filters
+
+QHP_CUST_FILTER_NAME   =
+
+# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the
+# custom filter to add. For more information please see
+# <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters">
+# Qt Help Project / Custom Filters</a>.
+
+QHP_CUST_FILTER_ATTRS  =
+
+# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
+# project's
+# filter section matches.
+# <a href="http://doc.trolltech.com/qthelpproject.html#filter-attributes">
+# Qt Help Project / Filter Attributes</a>.
+
+QHP_SECT_FILTER_ATTRS  =
+
+# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can
+# be used to specify the location of Qt's qhelpgenerator.
+# If non-empty doxygen will try to run qhelpgenerator on the generated
+# .qhp file.
+
+QHG_LOCATION           =
+
+# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files
+#  will be generated, which together with the HTML files, form an Eclipse help
+# plugin. To install this plugin and make it available under the help contents
+# menu in Eclipse, the contents of the directory containing the HTML and XML
+# files needs to be copied into the plugins directory of eclipse. The name of
+# the directory within the plugins directory should be the same as
+# the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before
+# the help appears.
+
+GENERATE_ECLIPSEHELP   = NO
+
+# A unique identifier for the eclipse help plugin. When installing the plugin
+# the directory name containing the HTML and XML files should also have
+# this name.
+
+ECLIPSE_DOC_ID         = org.doxygen.Project
+
+# The DISABLE_INDEX tag can be used to turn on/off the condensed index at
+# top of each HTML page. The value NO (the default) enables the index and
+# the value YES disables it.
+
+DISABLE_INDEX          = NO
+
+# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values
+# (range 0,1..20) that doxygen will group on one line in the generated HTML
+# documentation. Note that a value of 0 will completely suppress the enum
+# values from appearing in the overview section.
+
+ENUM_VALUES_PER_LINE   = 1
+
+# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
+# structure should be generated to display hierarchical information.
+# If the tag value is set to YES, a side panel will be generated
+# containing a tree-like index structure (just like the one that
+# is generated for HTML Help). For this to work a browser that supports
+# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser).
+# Windows users are probably better off using the HTML help feature.
+
+GENERATE_TREEVIEW      = YES
+
+# By enabling USE_INLINE_TREES, doxygen will generate the Groups, Directories,
+# and Class Hierarchy pages using a tree view instead of an ordered list.
+
+USE_INLINE_TREES       = NO
+
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
+# used to set the initial width (in pixels) of the frame in which the tree
+# is shown.
+
+TREEVIEW_WIDTH         = 250
+
+# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open
+# links to external symbols imported via tag files in a separate window.
+
+EXT_LINKS_IN_WINDOW    = NO
+
+# Use this tag to change the font size of Latex formulas included
+# as images in the HTML documentation. The default is 10. Note that
+# when you change the font size after a successful doxygen run you need
+# to manually remove any form_*.png images from the HTML output directory
+# to force them to be regenerated.
+
+FORMULA_FONTSIZE       = 10
+
+# Use the FORMULA_TRANPARENT tag to determine whether or not the images
+# generated for formulas are transparent PNGs. Transparent PNGs are
+# not supported properly for IE 6.0, but are supported on all modern browsers.
+# Note that when changing this option you need to delete any form_*.png files
+# in the HTML output before the changes have effect.
+
+FORMULA_TRANSPARENT    = YES
+
+# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax
+# (see http://www.mathjax.org) which uses client side Javascript for the
+# rendering instead of using prerendered bitmaps. Use this if you do not
+# have LaTeX installed or if you want to formulas look prettier in the HTML
+# output. When enabled you also need to install MathJax separately and
+# configure the path to it using the MATHJAX_RELPATH option.
+
+USE_MATHJAX            = NO
+
+# When MathJax is enabled you need to specify the location relative to the
+# HTML output directory using the MATHJAX_RELPATH option. The destination
+# directory should contain the MathJax.js script. For instance, if the mathjax
+# directory is located at the same level as the HTML output directory, then
+# MATHJAX_RELPATH should be ../mathjax. The default value points to the
+# mathjax.org site, so you can quickly see the result without installing
+# MathJax, but it is strongly recommended to install a local copy of MathJax
+# before deployment.
+
+MATHJAX_RELPATH        = http://www.mathjax.org/mathjax
+
+# When the SEARCHENGINE tag is enabled doxygen will generate a search box
+# for the HTML output. The underlying search engine uses javascript
+# and DHTML and should work on any modern browser. Note that when using
+# HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets
+# (GENERATE_DOCSET) there is already a search function so this one should
+# typically be disabled. For large projects the javascript based search engine
+# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution.
+
+SEARCHENGINE           = YES
+
+# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
+# implemented using a PHP enabled web server instead of at the web client
+# using Javascript. Doxygen will generate the search PHP script and index
+# file to put on the web server. The advantage of the server
+# based approach is that it scales better to large projects and allows
+# full text search. The disadvantages are that it is more difficult to setup
+# and does not have live searching capabilities.
+
+SERVER_BASED_SEARCH    = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
+# generate Latex output.
+
+GENERATE_LATEX         = YES
+
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `latex' will be used as the default path.
+
+LATEX_OUTPUT           = latex
+
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
+# invoked. If left blank `latex' will be used as the default command name.
+# Note that when enabling USE_PDFLATEX this option is only used for
+# generating bitmaps for formulas in the HTML output, but not in the
+# Makefile that is written to the output directory.
+
+LATEX_CMD_NAME         = latex
+
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to
+# generate index for LaTeX. If left blank `makeindex' will be used as the
+# default command name.
+
+MAKEINDEX_CMD_NAME     = makeindex
+
+# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact
+# LaTeX documents. This may be useful for small projects and may help to
+# save some trees in general.
+
+COMPACT_LATEX          = NO
+
+# The PAPER_TYPE tag can be used to set the paper type that is used
+# by the printer. Possible values are: a4, letter, legal and
+# executive. If left blank a4wide will be used.
+
+PAPER_TYPE             = a4wide
+
+# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX
+# packages that should be included in the LaTeX output.
+
+EXTRA_PACKAGES         =
+
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for
+# the generated latex document. The header should contain everything until
+# the first chapter. If it is left blank doxygen will generate a
+# standard header. Notice: only use this tag if you know what you are doing!
+
+LATEX_HEADER           =
+
+# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for
+# the generated latex document. The footer should contain everything after
+# the last chapter. If it is left blank doxygen will generate a
+# standard footer. Notice: only use this tag if you know what you are doing!
+
+LATEX_FOOTER           =
+
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated
+# is prepared for conversion to pdf (using ps2pdf). The pdf file will
+# contain links (just like the HTML output) instead of page references
+# This makes the output suitable for online browsing using a pdf viewer.
+
+PDF_HYPERLINKS         = NO
+
+# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of
+# plain latex in the generated Makefile. Set this option to YES to get a
+# higher quality PDF documentation.
+
+USE_PDFLATEX           = NO
+
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode.
+# command to the generated LaTeX files. This will instruct LaTeX to keep
+# running if errors occur, instead of asking the user for help.
+# This option is also used when generating formulas in HTML.
+
+LATEX_BATCHMODE        = NO
+
+# If LATEX_HIDE_INDICES is set to YES then doxygen will not
+# include the index chapters (such as File Index, Compound Index, etc.)
+# in the output.
+
+LATEX_HIDE_INDICES     = NO
+
+# If LATEX_SOURCE_CODE is set to YES then doxygen will include
+# source code with syntax highlighting in the LaTeX output.
+# Note that which sources are shown also depends on other settings
+# such as SOURCE_BROWSER.
+
+LATEX_SOURCE_CODE      = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the RTF output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output
+# The RTF output is optimized for Word 97 and may not look very pretty with
+# other RTF readers or editors.
+
+GENERATE_RTF           = NO
+
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `rtf' will be used as the default path.
+
+RTF_OUTPUT             = rtf
+
+# If the COMPACT_RTF tag is set to YES Doxygen generates more compact
+# RTF documents. This may be useful for small projects and may help to
+# save some trees in general.
+
+COMPACT_RTF            = NO
+
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated
+# will contain hyperlink fields. The RTF file will
+# contain links (just like the HTML output) instead of page references.
+# This makes the output suitable for online browsing using WORD or other
+# programs which support those fields.
+# Note: wordpad (write) and others do not support links.
+
+RTF_HYPERLINKS         = NO
+
+# Load stylesheet definitions from file. Syntax is similar to doxygen's
+# config file, i.e. a series of assignments. You only have to provide
+# replacements, missing definitions are set to their default value.
+
+RTF_STYLESHEET_FILE    =
+
+# Set optional variables used in the generation of an rtf document.
+# Syntax is similar to doxygen's config file.
+
+RTF_EXTENSIONS_FILE    =
+
+#---------------------------------------------------------------------------
+# configuration options related to the man page output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_MAN tag is set to YES (the default) Doxygen will
+# generate man pages
+
+GENERATE_MAN           = NO
+
+# The MAN_OUTPUT tag is used to specify where the man pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `man' will be used as the default path.
+
+MAN_OUTPUT             = man
+
+# The MAN_EXTENSION tag determines the extension that is added to
+# the generated man pages (default is the subroutine's section .3)
+
+MAN_EXTENSION          = .3
+
+# If the MAN_LINKS tag is set to YES and Doxygen generates man output,
+# then it will generate one additional man file for each entity
+# documented in the real man page(s). These additional files
+# only source the real man page, but without them the man command
+# would be unable to find the correct page. The default is NO.
+
+MAN_LINKS              = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the XML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_XML tag is set to YES Doxygen will
+# generate an XML file that captures the structure of
+# the code including all documentation.
+
+GENERATE_XML           = NO
+
+# The XML_OUTPUT tag is used to specify where the XML pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `xml' will be used as the default path.
+
+XML_OUTPUT             = xml
+
+# The XML_SCHEMA tag can be used to specify an XML schema,
+# which can be used by a validating XML parser to check the
+# syntax of the XML files.
+
+XML_SCHEMA             =
+
+# The XML_DTD tag can be used to specify an XML DTD,
+# which can be used by a validating XML parser to check the
+# syntax of the XML files.
+
+XML_DTD                =
+
+# If the XML_PROGRAMLISTING tag is set to YES Doxygen will
+# dump the program listings (including syntax highlighting
+# and cross-referencing information) to the XML output. Note that
+# enabling this will significantly increase the size of the XML output.
+
+XML_PROGRAMLISTING     = YES
+
+#---------------------------------------------------------------------------
+# configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will
+# generate an AutoGen Definitions (see autogen.sf.net) file
+# that captures the structure of the code including all
+# documentation. Note that this feature is still experimental
+# and incomplete at the moment.
+
+GENERATE_AUTOGEN_DEF   = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_PERLMOD tag is set to YES Doxygen will
+# generate a Perl module file that captures the structure of
+# the code including all documentation. Note that this
+# feature is still experimental and incomplete at the
+# moment.
+
+GENERATE_PERLMOD       = NO
+
+# If the PERLMOD_LATEX tag is set to YES Doxygen will generate
+# the necessary Makefile rules, Perl scripts and LaTeX code to be able
+# to generate PDF and DVI output from the Perl module output.
+
+PERLMOD_LATEX          = NO
+
+# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be
+# nicely formatted so it can be parsed by a human reader.
+# This is useful
+# if you want to understand what is going on.
+# On the other hand, if this
+# tag is set to NO the size of the Perl module output will be much smaller
+# and Perl will parse it just the same.
+
+PERLMOD_PRETTY         = YES
+
+# The names of the make variables in the generated doxyrules.make file
+# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX.
+# This is useful so different doxyrules.make files included by the same
+# Makefile don't overwrite each other's variables.
+
+PERLMOD_MAKEVAR_PREFIX =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor
+#---------------------------------------------------------------------------
+
+# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will
+# evaluate all C-preprocessor directives found in the sources and include
+# files.
+
+ENABLE_PREPROCESSING   = YES
+
+# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro
+# names in the source code. If set to NO (the default) only conditional
+# compilation will be performed. Macro expansion can be done in a controlled
+# way by setting EXPAND_ONLY_PREDEF to YES.
+
+MACRO_EXPANSION        = NO
+
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES
+# then the macro expansion is limited to the macros specified with the
+# PREDEFINED and EXPAND_AS_DEFINED tags.
+
+EXPAND_ONLY_PREDEF     = NO
+
+# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
+# pointed to by INCLUDE_PATH will be searched when a #include is found.
+
+SEARCH_INCLUDES        = YES
+
+# The INCLUDE_PATH tag can be used to specify one or more directories that
+# contain include files that are not input files but should be processed by
+# the preprocessor.
+
+INCLUDE_PATH           =
+
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
+# patterns (like *.h and *.hpp) to filter out the header-files in the
+# directories. If left blank, the patterns specified with FILE_PATTERNS will
+# be used.
+
+INCLUDE_FILE_PATTERNS  =
+
+# The PREDEFINED tag can be used to specify one or more macro names that
+# are defined before the preprocessor is started (similar to the -D option of
+# gcc). The argument of the tag is a list of macros of the form: name
+# or name=definition (no spaces). If the definition and the = are
+# omitted =1 is assumed. To prevent a macro definition from being
+# undefined via #undef or recursively expanded use the := operator
+# instead of the = operator.
+
+PREDEFINED             =
+
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
+# this tag can be used to specify a list of macro names that should be expanded.
+# The macro definition that is found in the sources will be used.
+# Use the PREDEFINED tag if you want to use a different macro definition that
+# overrules the definition found in the source code.
+
+EXPAND_AS_DEFINED      =
+
+# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
+# doxygen's preprocessor will remove all references to function-like macros
+# that are alone on a line, have an all uppercase name, and do not end with a
+# semicolon, because these will confuse the parser if not removed.
+
+SKIP_FUNCTION_MACROS   = YES
+
+#---------------------------------------------------------------------------
+# Configuration::additions related to external references
+#---------------------------------------------------------------------------
+
+# The TAGFILES option can be used to specify one or more tagfiles.
+# Optionally an initial location of the external documentation
+# can be added for each tagfile. The format of a tag file without
+# this location is as follows:
+#
+# TAGFILES = file1 file2 ...
+# Adding location for the tag files is done as follows:
+#
+# TAGFILES = file1=loc1 "file2 = loc2" ...
+# where "loc1" and "loc2" can be relative or absolute paths or
+# URLs. If a location is present for each tag, the installdox tool
+# does not have to be run to correct the links.
+# Note that each tag file must have a unique name
+# (where the name does NOT include the path)
+# If a tag file is not located in the directory in which doxygen
+# is run, you must also specify the path to the tagfile here.
+
+TAGFILES = doc/libosmocore.tag=../../core/html doc/libosmovty.tag=../../vty/html doc/libosmocodec.tag=../../codec/html doc/libosmocoding.tag=../../coding/html doc/libosmoctrl.tag=../../ctrl/html doc/libosmogb.tag=../../gb/html
+
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create
+# a tag file that is based on the input files it reads.
+
+GENERATE_TAGFILE       = doc/libosmosim.tag
+
+# If the ALLEXTERNALS tag is set to YES all external classes will be listed
+# in the class index. If set to NO only the inherited external classes
+# will be listed.
+
+ALLEXTERNALS           = NO
+
+# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed
+# in the modules index. If set to NO, only the current project's groups will
+# be listed.
+
+EXTERNAL_GROUPS        = YES
+
+# The PERL_PATH should be the absolute path and name of the perl script
+# interpreter (i.e. the result of `which perl').
+
+PERL_PATH              = /usr/bin/perl
+
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool
+#---------------------------------------------------------------------------
+
+# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
+# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base
+# or super classes. Setting the tag to NO turns the diagrams off. Note that
+# this option also works with HAVE_DOT disabled, but it is recommended to
+# install and use dot, since it yields more powerful graphs.
+
+CLASS_DIAGRAMS         = YES
+
+# You can define message sequence charts within doxygen comments using the \msc
+# command. Doxygen will then run the mscgen tool (see
+# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the
+# documentation. The MSCGEN_PATH tag allows you to specify the directory where
+# the mscgen tool resides. If left empty the tool is assumed to be found in the
+# default search path.
+
+MSCGEN_PATH            =
+
+# If set to YES, the inheritance and collaboration graphs will hide
+# inheritance and usage relations if the target is undocumented
+# or is not a class.
+
+HIDE_UNDOC_RELATIONS   = YES
+
+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
+# available from the path. This tool is part of Graphviz, a graph visualization
+# toolkit from AT&T and Lucent Bell Labs. The other options in this section
+# have no effect if this option is set to NO (the default)
+
+HAVE_DOT               = NO
+
+# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is
+# allowed to run in parallel. When set to 0 (the default) doxygen will
+# base this on the number of processors available in the system. You can set it
+# explicitly to a value larger than 0 to get control over the balance
+# between CPU load and processing speed.
+
+DOT_NUM_THREADS        = 0
+
+# By default doxygen will write a font called Helvetica to the output
+# directory and reference it in all dot files that doxygen generates.
+# When you want a differently looking font you can specify the font name
+# using DOT_FONTNAME. You need to make sure dot is able to find the font,
+# which can be done by putting it in a standard location or by setting the
+# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory
+# containing the font.
+
+DOT_FONTNAME           = Helvetica
+
+# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs.
+# The default size is 10pt.
+
+DOT_FONTSIZE           = 10
+
+# By default doxygen will tell dot to use the output directory to look for the
+# FreeSans.ttf font (which doxygen will put there itself). If you specify a
+# different font using DOT_FONTNAME you can set the path where dot
+# can find it using this tag.
+
+DOT_FONTPATH           =
+
+# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
+# will generate a graph for each documented class showing the direct and
+# indirect inheritance relations. Setting this tag to YES will force the
+# the CLASS_DIAGRAMS tag to NO.
+
+CLASS_GRAPH            = YES
+
+# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen
+# will generate a graph for each documented class showing the direct and
+# indirect implementation dependencies (inheritance, containment, and
+# class references variables) of the class with other documented classes.
+
+COLLABORATION_GRAPH    = YES
+
+# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen
+# will generate a graph for groups, showing the direct groups dependencies
+
+GROUP_GRAPHS           = YES
+
+# If the UML_LOOK tag is set to YES doxygen will generate inheritance and
+# collaboration diagrams in a style similar to the OMG's Unified Modeling
+# Language.
+
+UML_LOOK               = NO
+
+# If set to YES, the inheritance and collaboration graphs will show the
+# relations between templates and their instances.
+
+TEMPLATE_RELATIONS     = NO
+
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT
+# tags are set to YES then doxygen will generate a graph for each documented
+# file showing the direct and indirect include dependencies of the file with
+# other documented files.
+
+INCLUDE_GRAPH          = YES
+
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and
+# HAVE_DOT tags are set to YES then doxygen will generate a graph for each
+# documented header file showing the documented files that directly or
+# indirectly include this file.
+
+INCLUDED_BY_GRAPH      = YES
+
+# If the CALL_GRAPH and HAVE_DOT options are set to YES then
+# doxygen will generate a call dependency graph for every global function
+# or class method. Note that enabling this option will significantly increase
+# the time of a run. So in most cases it will be better to enable call graphs
+# for selected functions only using the \callgraph command.
+
+CALL_GRAPH             = NO
+
+# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then
+# doxygen will generate a caller dependency graph for every global function
+# or class method. Note that enabling this option will significantly increase
+# the time of a run. So in most cases it will be better to enable caller
+# graphs for selected functions only using the \callergraph command.
+
+CALLER_GRAPH           = NO
+
+# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen
+# will generate a graphical hierarchy of all classes instead of a textual one.
+
+GRAPHICAL_HIERARCHY    = YES
+
+# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES
+# then doxygen will show the dependencies a directory has on other directories
+# in a graphical way. The dependency relations are determined by the #include
+# relations between the files in the directories.
+
+DIRECTORY_GRAPH        = YES
+
+# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
+# generated by dot. Possible values are svg, png, jpg, or gif.
+# If left blank png will be used.
+
+DOT_IMAGE_FORMAT       = png
+
+# The tag DOT_PATH can be used to specify the path where the dot tool can be
+# found. If left blank, it is assumed the dot tool can be found in the path.
+
+DOT_PATH               = /usr/bin/dot
+
+# The DOTFILE_DIRS tag can be used to specify one or more directories that
+# contain dot files that are included in the documentation (see the
+# \dotfile command).
+
+DOTFILE_DIRS           =
+
+# The MSCFILE_DIRS tag can be used to specify one or more directories that
+# contain msc files that are included in the documentation (see the
+# \mscfile command).
+
+MSCFILE_DIRS           =
+
+# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of
+# nodes that will be shown in the graph. If the number of nodes in a graph
+# becomes larger than this value, doxygen will truncate the graph, which is
+# visualized by representing a node as a red box. Note that doxygen if the
+# number of direct children of the root node in a graph is already larger than
+# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note
+# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
+
+DOT_GRAPH_MAX_NODES    = 50
+
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the
+# graphs generated by dot. A depth value of 3 means that only nodes reachable
+# from the root by following a path via at most 3 edges will be shown. Nodes
+# that lay further from the root node will be omitted. Note that setting this
+# option to 1 or 2 may greatly reduce the computation time needed for large
+# code bases. Also note that the size of a graph can be further restricted by
+# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
+
+MAX_DOT_GRAPH_DEPTH    = 0
+
+# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
+# background. This is disabled by default, because dot on Windows does not
+# seem to support this out of the box. Warning: Depending on the platform used,
+# enabling this option may lead to badly anti-aliased labels on the edges of
+# a graph (i.e. they become hard to read).
+
+DOT_TRANSPARENT        = NO
+
+# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output
+# files in one run (i.e. multiple -o and -T options on the command line). This
+# makes dot run faster, but since only newer versions of dot (>1.8.10)
+# support this, this feature is disabled by default.
+
+DOT_MULTI_TARGETS      = NO
+
+# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will
+# generate a legend page explaining the meaning of the various boxes and
+# arrows in the dot generated graphs.
+
+GENERATE_LEGEND        = YES
+
+# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will
+# remove the intermediate dot files that are used to generate
+# the various graphs.
+
+DOT_CLEANUP            = YES

libosmocore_1.9.0.tar.xz/Doxyfile.usb.in Added

@@ -0,0 +1,1716 @@
+# Doxyfile 1.7.4
+
+# This file describes the settings to be used by the documentation system
+# doxygen (www.doxygen.org) for a project.
+#
+# All text after a hash (#) is considered a comment and will be ignored.
+# The format is:
+#       TAG = value value, ...
+# For lists items can also be appended using:
+#       TAG += value value, ...
+# Values that contain spaces should be placed between quotes (" ").
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+
+# This tag specifies the encoding used for all characters in the config file
+# that follow. The default is UTF-8 which is also the encoding used for all
+# text before the first occurrence of this tag. Doxygen uses libiconv (or the
+# iconv built into libc) for the transcoding. See
+# http://www.gnu.org/software/libiconv for the list of possible encodings.
+
+DOXYFILE_ENCODING      = UTF-8
+
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
+# by quotes) that should identify the project.
+
+PROJECT_NAME           = libosmousb
+
+# The PROJECT_NUMBER tag can be used to enter a project or revision number.
+# This could be handy for archiving the generated documentation or
+# if some version control system is used.
+
+PROJECT_NUMBER         = @VERSION@
+
+# Using the PROJECT_BRIEF tag one can provide an optional one line description
+# for a project that appears at the top of each page and should give viewer
+# a quick idea about the purpose of the project. Keep the description short.
+
+PROJECT_BRIEF          = "Osmocom USB library"
+
+# With the PROJECT_LOGO tag one can specify an logo or icon that is
+# included in the documentation. The maximum height of the logo should not
+# exceed 55 pixels and the maximum width should not exceed 200 pixels.
+# Doxygen will copy the logo to the output directory.
+
+PROJECT_LOGO           =
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
+# base path where the generated documentation will be put.
+# If a relative path is entered, it will be relative to the location
+# where doxygen was started. If left blank the current directory will be used.
+
+OUTPUT_DIRECTORY       = doc/usb
+
+# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
+# 4096 sub-directories (in 2 levels) under the output directory of each output
+# format and will distribute the generated files over these directories.
+# Enabling this option can be useful when feeding doxygen a huge amount of
+# source files, where putting all generated files in the same directory would
+# otherwise cause performance problems for the file system.
+
+CREATE_SUBDIRS         = NO
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all constant output in the proper language.
+# The default language is English, other supported languages are:
+# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional,
+# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German,
+# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English
+# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian,
+# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak,
+# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese.
+
+OUTPUT_LANGUAGE        = English
+
+# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
+# include brief member descriptions after the members that are listed in
+# the file and class documentation (similar to JavaDoc).
+# Set to NO to disable this.
+
+BRIEF_MEMBER_DESC      = YES
+
+# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
+# the brief description of a member or function before the detailed description.
+# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
+# brief descriptions will be completely suppressed.
+
+REPEAT_BRIEF           = YES
+
+# This tag implements a quasi-intelligent brief description abbreviator
+# that is used to form the text in various listings. Each string
+# in this list, if found as the leading text of the brief description, will be
+# stripped from the text and the result after processing the whole list, is
+# used as the annotated text. Otherwise, the brief description is used as-is.
+# If left blank, the following values are used ("$name" is automatically
+# replaced with the name of the entity): "The $name class" "The $name widget"
+# "The $name file" "is" "provides" "specifies" "contains"
+# "represents" "a" "an" "the"
+
+ABBREVIATE_BRIEF       =
+
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
+# Doxygen will generate a detailed section even if there is only a brief
+# description.
+
+ALWAYS_DETAILED_SEC    = NO
+
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
+# inherited members of a class in the documentation of that class as if those
+# members were ordinary class members. Constructors, destructors and assignment
+# operators of the base classes will not be shown.
+
+INLINE_INHERITED_MEMB  = NO
+
+# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
+# path before files name in the file list and in the header files. If set
+# to NO the shortest path that makes the file name unique will be used.
+
+FULL_PATH_NAMES        = YES
+
+# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
+# can be used to strip a user-defined part of the path. Stripping is
+# only done if one of the specified strings matches the left-hand part of
+# the path. The tag can be used to show relative paths in the file list.
+# If left blank the directory from which doxygen is run is used as the
+# path to strip.
+
+STRIP_FROM_PATH        =
+
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
+# the path mentioned in the documentation of a class, which tells
+# the reader which header file to include in order to use a class.
+# If left blank only the name of the header file containing the class
+# definition is used. Otherwise one should specify the include paths that
+# are normally passed to the compiler using the -I flag.
+
+STRIP_FROM_INC_PATH    =
+
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
+# (but less readable) file names. This can be useful if your file system
+# doesn't support long names like on DOS, Mac, or CD-ROM.
+
+SHORT_NAMES            = NO
+
+# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
+# will interpret the first line (until the first dot) of a JavaDoc-style
+# comment as the brief description. If set to NO, the JavaDoc
+# comments will behave just like regular Qt-style comments
+# (thus requiring an explicit @brief command for a brief description.)
+
+JAVADOC_AUTOBRIEF      = YES
+
+# If the QT_AUTOBRIEF tag is set to YES then Doxygen will
+# interpret the first line (until the first dot) of a Qt-style
+# comment as the brief description. If set to NO, the comments
+# will behave just like regular Qt-style comments (thus requiring
+# an explicit command for a brief description.)
+
+QT_AUTOBRIEF           = YES
+
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
+# treat a multi-line C++ special comment block (i.e. a block of //! or ///
+# comments) as a brief description. This used to be the default behaviour.
+# The new default is to treat a multi-line C++ comment block as a detailed
+# description. Set this tag to YES if you prefer the old behaviour instead.
+
+MULTILINE_CPP_IS_BRIEF = NO
+
+# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
+# member inherits the documentation from any documented member that it
+# re-implements.
+
+INHERIT_DOCS           = YES
+
+# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce
+# a new page for each member. If set to NO, the documentation of a member will
+# be part of the file/class/namespace that contains it.
+
+SEPARATE_MEMBER_PAGES  = NO
+
+# The TAB_SIZE tag can be used to set the number of spaces in a tab.
+# Doxygen uses this value to replace tabs by spaces in code fragments.
+
+TAB_SIZE               = 8
+
+# This tag can be used to specify a number of aliases that acts
+# as commands in the documentation. An alias has the form "name=value".
+# For example adding "sideeffect=\par Side Effects:\n" will allow you to
+# put the command \sideeffect (or @sideeffect) in the documentation, which
+# will result in a user-defined paragraph with heading "Side Effects:".
+# You can put \n's in the value part of an alias to insert newlines.
+
+ALIASES                =
+
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C
+# sources only. Doxygen will then generate output that is more tailored for C.
+# For instance, some of the names that are used will be different. The list
+# of all members will be omitted, etc.
+
+OPTIMIZE_OUTPUT_FOR_C  = YES
+
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java
+# sources only. Doxygen will then generate output that is more tailored for
+# Java. For instance, namespaces will be presented as packages, qualified
+# scopes will look different, etc.
+
+OPTIMIZE_OUTPUT_JAVA   = NO
+
+# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
+# sources only. Doxygen will then generate output that is more tailored for
+# Fortran.
+
+OPTIMIZE_FOR_FORTRAN   = NO
+
+# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
+# sources. Doxygen will then generate output that is tailored for
+# VHDL.
+
+OPTIMIZE_OUTPUT_VHDL   = NO
+
+# Doxygen selects the parser to use depending on the extension of the files it
+# parses. With this tag you can assign which parser to use for a given extension.
+# Doxygen has a built-in mapping, but you can override or extend it using this
+# tag. The format is ext=language, where ext is a file extension, and language
+# is one of the parsers supported by doxygen: IDL, Java, Javascript, CSharp, C,
+# C++, D, PHP, Objective-C, Python, Fortran, VHDL, C, C++. For instance to make
+# doxygen treat .inc files as Fortran files (default is PHP), and .f files as C
+# (default is Fortran), use: inc=Fortran f=C. Note that for custom extensions
+# you also need to set FILE_PATTERNS otherwise the files are not read by doxygen.
+
+EXTENSION_MAPPING      =
+
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
+# to include (a tag file for) the STL sources as input, then you should
+# set this tag to YES in order to let doxygen match functions declarations and
+# definitions whose arguments contain STL classes (e.g. func(std::string); v.s.
+# func(std::string) {}). This also makes the inheritance and collaboration
+# diagrams that involve STL classes more complete and accurate.
+
+BUILTIN_STL_SUPPORT    = NO
+
+# If you use Microsoft's C++/CLI language, you should set this option to YES to
+# enable parsing support.
+
+CPP_CLI_SUPPORT        = NO
+
+# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only.
+# Doxygen will parse them like normal C++ but will assume all classes use public
+# instead of private inheritance when no explicit protection keyword is present.
+
+SIP_SUPPORT            = NO
+
+# For Microsoft's IDL there are propget and propput attributes to indicate getter
+# and setter methods for a property. Setting this option to YES (the default)
+# will make doxygen replace the get and set methods by a property in the
+# documentation. This will only work if the methods are indeed getting or
+# setting a simple type. If this is not the case, or you want to show the
+# methods anyway, you should set this option to NO.
+
+IDL_PROPERTY_SUPPORT   = YES
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
+# tag is set to YES, then doxygen will reuse the documentation of the first
+# member in the group (if any) for the other members of the group. By default
+# all members of a group must be documented explicitly.
+
+DISTRIBUTE_GROUP_DOC   = NO
+
+# Set the SUBGROUPING tag to YES (the default) to allow class member groups of
+# the same type (for instance a group of public functions) to be put as a
+# subgroup of that type (e.g. under the Public Functions section). Set it to
+# NO to prevent subgrouping. Alternatively, this can be done per class using
+# the \nosubgrouping command.
+
+SUBGROUPING            = YES
+
+# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and
+# unions are shown inside the group in which they are included (e.g. using
+# @ingroup) instead of on a separate page (for HTML and Man pages) or
+# section (for LaTeX and RTF).
+
+INLINE_GROUPED_CLASSES = NO
+
+# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum
+# is documented as struct, union, or enum with the name of the typedef. So
+# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
+# with name TypeT. When disabled the typedef will appear as a member of a file,
+# namespace, or class. And the struct will be named TypeS. This can typically
+# be useful for C code in case the coding convention dictates that all compound
+# types are typedef'ed and only the typedef is referenced, never the tag name.
+
+TYPEDEF_HIDES_STRUCT   = NO
+
+# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to
+# determine which symbols to keep in memory and which to flush to disk.
+# When the cache is full, less often used symbols will be written to disk.
+# For small to medium size projects (<1000 input files) the default value is
+# probably good enough. For larger projects a too small cache size can cause
+# doxygen to be busy swapping symbols to and from disk most of the time
+# causing a significant performance penalty.
+# If the system has enough physical memory increasing the cache will improve the
+# performance by keeping more symbols in memory. Note that the value works on
+# a logarithmic scale so increasing the size by one will roughly double the
+# memory usage. The cache size is given by this formula:
+# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0,
+# corresponding to a cache size of 2^16 = 65536 symbols
+
+SYMBOL_CACHE_SIZE      = 0
+
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+
+# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
+# documentation are documented, even if no documentation was available.
+# Private class members and static file members will be hidden unless
+# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
+
+EXTRACT_ALL            = YES
+
+# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
+# will be included in the documentation.
+
+EXTRACT_PRIVATE        = NO
+
+# If the EXTRACT_STATIC tag is set to YES all static members of a file
+# will be included in the documentation.
+
+EXTRACT_STATIC         = YES
+
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
+# defined locally in source files will be included in the documentation.
+# If set to NO only classes defined in header files are included.
+
+EXTRACT_LOCAL_CLASSES  = YES
+
+# This flag is only useful for Objective-C code. When set to YES local
+# methods, which are defined in the implementation section but not in
+# the interface are included in the documentation.
+# If set to NO (the default) only methods in the interface are included.
+
+EXTRACT_LOCAL_METHODS  = NO
+
+# If this flag is set to YES, the members of anonymous namespaces will be
+# extracted and appear in the documentation as a namespace called
+# 'anonymous_namespace{file}', where file will be replaced with the base
+# name of the file that contains the anonymous namespace. By default
+# anonymous namespaces are hidden.
+
+EXTRACT_ANON_NSPACES   = NO
+
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
+# undocumented members of documented classes, files or namespaces.
+# If set to NO (the default) these members will be included in the
+# various overviews, but no documentation section is generated.
+# This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_MEMBERS     = NO
+
+# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all
+# undocumented classes that are normally visible in the class hierarchy.
+# If set to NO (the default) these classes will be included in the various
+# overviews. This option has no effect if EXTRACT_ALL is enabled.
+
+HIDE_UNDOC_CLASSES     = NO
+
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all
+# friend (class|struct|union) declarations.
+# If set to NO (the default) these declarations will be included in the
+# documentation.
+
+HIDE_FRIEND_COMPOUNDS  = NO
+
+# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any
+# documentation blocks found inside the body of a function.
+# If set to NO (the default) these blocks will be appended to the
+# function's detailed documentation block.
+
+HIDE_IN_BODY_DOCS      = NO
+
+# The INTERNAL_DOCS tag determines if documentation
+# that is typed after a \internal command is included. If the tag is set
+# to NO (the default) then the documentation will be excluded.
+# Set it to YES to include the internal documentation.
+
+INTERNAL_DOCS          = NO
+
+# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate
+# file names in lower-case letters. If set to YES upper-case letters are also
+# allowed. This is useful if you have classes or files whose names only differ
+# in case and if your file system supports case sensitive file names. Windows
+# and Mac users are advised to set this option to NO.
+
+CASE_SENSE_NAMES       = YES
+
+# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen
+# will show members with their full class and namespace scopes in the
+# documentation. If set to YES the scope will be hidden.
+
+HIDE_SCOPE_NAMES       = NO
+
+# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen
+# will put a list of the files that are included by a file in the documentation
+# of that file.
+
+SHOW_INCLUDE_FILES     = YES
+
+# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen
+# will list include files with double quotes in the documentation
+# rather than with sharp brackets.
+
+FORCE_LOCAL_INCLUDES   = NO
+
+# If the INLINE_INFO tag is set to YES (the default) then a tag inline
+# is inserted in the documentation for inline members.
+
+INLINE_INFO            = YES
+
+# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen
+# will sort the (detailed) documentation of file and class members
+# alphabetically by member name. If set to NO the members will appear in
+# declaration order.
+
+SORT_MEMBER_DOCS       = YES
+
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the
+# brief documentation of file, namespace and class members alphabetically
+# by member name. If set to NO (the default) the members will appear in
+# declaration order.
+
+SORT_BRIEF_DOCS        = NO
+
+# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen
+# will sort the (brief and detailed) documentation of class members so that
+# constructors and destructors are listed first. If set to NO (the default)
+# the constructors will appear in the respective orders defined by
+# SORT_MEMBER_DOCS and SORT_BRIEF_DOCS.
+# This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO
+# and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO.
+
+SORT_MEMBERS_CTORS_1ST = NO
+
+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the
+# hierarchy of group names into alphabetical order. If set to NO (the default)
+# the group names will appear in their defined order.
+
+SORT_GROUP_NAMES       = NO
+
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be
+# sorted by fully-qualified names, including namespaces. If set to
+# NO (the default), the class list will be sorted only by class name,
+# not including the namespace part.
+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
+# Note: This option applies only to the class list, not to the
+# alphabetical list.
+
+SORT_BY_SCOPE_NAME     = NO
+
+# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to
+# do proper type resolution of all parameters of a function it will reject a
+# match between the prototype and the implementation of a member function even
+# if there is only one candidate or it is obvious which candidate to choose
+# by doing a simple string match. By disabling STRICT_PROTO_MATCHING doxygen
+# will still accept a match between prototype and implementation in such cases.
+
+STRICT_PROTO_MATCHING  = NO
+
+# The GENERATE_TODOLIST tag can be used to enable (YES) or
+# disable (NO) the todo list. This list is created by putting \todo
+# commands in the documentation.
+
+GENERATE_TODOLIST      = YES
+
+# The GENERATE_TESTLIST tag can be used to enable (YES) or
+# disable (NO) the test list. This list is created by putting \test
+# commands in the documentation.
+
+GENERATE_TESTLIST      = YES
+
+# The GENERATE_BUGLIST tag can be used to enable (YES) or
+# disable (NO) the bug list. This list is created by putting \bug
+# commands in the documentation.
+
+GENERATE_BUGLIST       = YES
+
+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or
+# disable (NO) the deprecated list. This list is created by putting
+# \deprecated commands in the documentation.
+
+GENERATE_DEPRECATEDLIST= YES
+
+# The ENABLED_SECTIONS tag can be used to enable conditional
+# documentation sections, marked by \if sectionname ... \endif.
+
+ENABLED_SECTIONS       =
+
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines
+# the initial value of a variable or macro consists of for it to appear in
+# the documentation. If the initializer consists of more lines than specified
+# here it will be hidden. Use a value of 0 to hide initializers completely.
+# The appearance of the initializer of individual variables and macros in the
+# documentation can be controlled using \showinitializer or \hideinitializer
+# command in the documentation regardless of this setting.
+
+MAX_INITIALIZER_LINES  = 30
+
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated
+# at the bottom of the documentation of classes and structs. If set to YES the
+# list will mention the files that were used to generate the documentation.
+
+SHOW_USED_FILES        = YES
+
+# If the sources in your project are distributed over multiple directories
+# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy
+# in the documentation. The default is NO.
+
+SHOW_DIRECTORIES       = NO
+
+# Set the SHOW_FILES tag to NO to disable the generation of the Files page.
+# This will remove the Files entry from the Quick Index and from the
+# Folder Tree View (if specified). The default is YES.
+
+SHOW_FILES             = YES
+
+# Set the SHOW_NAMESPACES tag to NO to disable the generation of the
+# Namespaces page.
+# This will remove the Namespaces entry from the Quick Index
+# and from the Folder Tree View (if specified). The default is YES.
+
+SHOW_NAMESPACES        = YES
+
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that
+# doxygen should invoke to get the current version for each file (typically from
+# the version control system). Doxygen will invoke the program by executing (via
+# popen()) the command <command> <input-file>, where <command> is the value of
+# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file
+# provided by doxygen. Whatever the program writes to standard output
+# is used as the file version. See the manual for examples.
+
+FILE_VERSION_FILTER    =
+
+# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
+# by doxygen. The layout file controls the global structure of the generated
+# output files in an output format independent way. The create the layout file
+# that represents doxygen's defaults, run doxygen with the -l option.
+# You can optionally specify a file name after the option, if omitted
+# DoxygenLayout.xml will be used as the name of the layout file.
+
+LAYOUT_FILE            =
+
+#---------------------------------------------------------------------------
+# configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+
+# The QUIET tag can be used to turn on/off the messages that are generated
+# by doxygen. Possible values are YES and NO. If left blank NO is used.
+
+QUIET                  = NO
+
+# The WARNINGS tag can be used to turn on/off the warning messages that are
+# generated by doxygen. Possible values are YES and NO. If left blank
+# NO is used.
+
+WARNINGS               = YES
+
+# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings
+# for undocumented members. If EXTRACT_ALL is set to YES then this flag will
+# automatically be disabled.
+
+WARN_IF_UNDOCUMENTED   = YES
+
+# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for
+# potential errors in the documentation, such as not documenting some
+# parameters in a documented function, or documenting parameters that
+# don't exist or using markup commands wrongly.
+
+WARN_IF_DOC_ERROR      = YES
+
+# The WARN_NO_PARAMDOC option can be enabled to get warnings for
+# functions that are documented, but have no documentation for their parameters
+# or return value. If set to NO (the default) doxygen will only warn about
+# wrong or incomplete parameter documentation, but not about the absence of
+# documentation.
+
+WARN_NO_PARAMDOC       = NO
+
+# The WARN_FORMAT tag determines the format of the warning messages that
+# doxygen can produce. The string should contain the $file, $line, and $text
+# tags, which will be replaced by the file and line number from which the
+# warning originated and the warning text. Optionally the format may contain
+# $version, which will be replaced by the version of the file (if it could
+# be obtained via FILE_VERSION_FILTER)
+
+WARN_FORMAT            = "$file:$line: $text"
+
+# The WARN_LOGFILE tag can be used to specify a file to which warning
+# and error messages should be written. If left blank the output is written
+# to stderr.
+
+WARN_LOGFILE           =
+
+#---------------------------------------------------------------------------
+# configuration options related to the input files
+#---------------------------------------------------------------------------
+
+# The INPUT tag can be used to specify the files and/or directories that contain
+# documented source files. You may enter file names like "myfile.cpp" or
+# directories like "/usr/src/myproject". Separate the files or directories
+# with spaces.
+
+INPUT                  = @srcdir@/include/osmocom/usb @srcdir@/src/usb
+
+# This tag can be used to specify the character encoding of the source files
+# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
+# also the default input encoding. Doxygen uses libiconv (or the iconv built
+# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for
+# the list of possible encodings.
+
+INPUT_ENCODING         = UTF-8
+
+# If the value of the INPUT tag contains directories, you can use the
+# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
+# and *.h) to filter out the source-files in the directories. If left
+# blank the following patterns are tested:
+# *.c *.cc *.cxx *.cpp *.c++ *.d *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh
+# *.hxx *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.dox *.py
+# *.f90 *.f *.for *.vhd *.vhdl
+
+FILE_PATTERNS          =
+
+# The RECURSIVE tag can be used to turn specify whether or not subdirectories
+# should be searched for input files as well. Possible values are YES and NO.
+# If left blank NO is used.
+
+RECURSIVE              = YES
+
+# The EXCLUDE tag can be used to specify files and/or directories that should
+# excluded from the INPUT source files. This way you can easily exclude a
+# subdirectory from a directory tree whose root is specified with the INPUT tag.
+
+EXCLUDE                =
+
+# The EXCLUDE_SYMLINKS tag can be used select whether or not files or
+# directories that are symbolic links (a Unix file system feature) are excluded
+# from the input.
+
+EXCLUDE_SYMLINKS       = NO
+
+# If the value of the INPUT tag contains directories, you can use the
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
+# certain files from those directories. Note that the wildcards are matched
+# against the file with absolute path, so to exclude all test directories
+# for example use the pattern */test/*
+
+EXCLUDE_PATTERNS       =
+
+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
+# (namespaces, classes, functions, etc.) that should be excluded from the
+# output. The symbol name can be a fully qualified name, a word, or if the
+# wildcard * is used, a substring. Examples: ANamespace, AClass,
+# AClass::ANamespace, ANamespace::*Test
+
+EXCLUDE_SYMBOLS        =
+
+# The EXAMPLE_PATH tag can be used to specify one or more files or
+# directories that contain example code fragments that are included (see
+# the \include command).
+
+EXAMPLE_PATH           =
+
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
+# and *.h) to filter out the source-files in the directories. If left
+# blank all files are included.
+
+EXAMPLE_PATTERNS       =
+
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
+# searched for input files to be used with the \include or \dontinclude
+# commands irrespective of the value of the RECURSIVE tag.
+# Possible values are YES and NO. If left blank NO is used.
+
+EXAMPLE_RECURSIVE      = NO
+
+# The IMAGE_PATH tag can be used to specify one or more files or
+# directories that contain image that are included in the documentation (see
+# the \image command).
+
+# IMAGE_PATH             = images/
+
+# The INPUT_FILTER tag can be used to specify a program that doxygen should
+# invoke to filter for each input file. Doxygen will invoke the filter program
+# by executing (via popen()) the command <filter> <input-file>, where <filter>
+# is the value of the INPUT_FILTER tag, and <input-file> is the name of an
+# input file. Doxygen will then use the output that the filter program writes
+# to standard output.
+# If FILTER_PATTERNS is specified, this tag will be
+# ignored.
+
+INPUT_FILTER           =
+
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
+# basis.
+# Doxygen will compare the file name with each pattern and apply the
+# filter if there is a match.
+# The filters are a list of the form:
+# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further
+# info on how filters are used. If FILTER_PATTERNS is empty or if
+# non of the patterns match the file name, INPUT_FILTER is applied.
+
+FILTER_PATTERNS        =
+
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
+# INPUT_FILTER) will be used to filter the input files when producing source
+# files to browse (i.e. when SOURCE_BROWSER is set to YES).
+
+FILTER_SOURCE_FILES    = NO
+
+# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
+# pattern. A pattern will override the setting for FILTER_PATTERN (if any)
+# and it is also possible to disable source filtering for a specific pattern
+# using *.ext= (so without naming a filter). This option only has effect when
+# FILTER_SOURCE_FILES is enabled.
+
+FILTER_SOURCE_PATTERNS =
+
+#---------------------------------------------------------------------------
+# configuration options related to source browsing
+#---------------------------------------------------------------------------
+
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will
+# be generated. Documented entities will be cross-referenced with these sources.
+# Note: To get rid of all source code in the generated output, make sure also
+# VERBATIM_HEADERS is set to NO.
+
+SOURCE_BROWSER         = NO
+
+# Setting the INLINE_SOURCES tag to YES will include the body
+# of functions and classes directly in the documentation.
+
+INLINE_SOURCES         = NO
+
+# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
+# doxygen to hide any special comment blocks from generated source code
+# fragments. Normal C and C++ comments will always remain visible.
+
+STRIP_CODE_COMMENTS    = YES
+
+# If the REFERENCED_BY_RELATION tag is set to YES
+# then for each documented function all documented
+# functions referencing it will be listed.
+
+REFERENCED_BY_RELATION = YES
+
+# If the REFERENCES_RELATION tag is set to YES
+# then for each documented function all documented entities
+# called/used by that function will be listed.
+
+REFERENCES_RELATION    = YES
+
+# If the REFERENCES_LINK_SOURCE tag is set to YES (the default)
+# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from
+# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will
+# link to the source code.
+# Otherwise they will link to the documentation.
+
+REFERENCES_LINK_SOURCE = YES
+
+# If the USE_HTAGS tag is set to YES then the references to source code
+# will point to the HTML generated by the htags(1) tool instead of doxygen
+# built-in source browser. The htags tool is part of GNU's global source
+# tagging system (see http://www.gnu.org/software/global/global.html). You
+# will need version 4.8.6 or higher.
+
+USE_HTAGS              = NO
+
+# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen
+# will generate a verbatim copy of the header file for each class for
+# which an include is specified. Set to NO to disable this.
+
+VERBATIM_HEADERS       = YES
+
+#---------------------------------------------------------------------------
+# configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index
+# of all compounds will be generated. Enable this if the project
+# contains a lot of classes, structs, unions or interfaces.
+
+ALPHABETICAL_INDEX     = NO
+
+# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then
+# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
+# in which this list will be split (can be a number in the range 1..20)
+
+COLS_IN_ALPHA_INDEX    = 5
+
+# In case all classes in a project start with a common prefix, all
+# classes will be put under the same header in the alphabetical index.
+# The IGNORE_PREFIX tag can be used to specify one or more prefixes that
+# should be ignored while generating the index headers.
+
+IGNORE_PREFIX          =
+
+#---------------------------------------------------------------------------
+# configuration options related to the HTML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_HTML tag is set to YES (the default) Doxygen will
+# generate HTML output.
+
+GENERATE_HTML          = YES
+
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `html' will be used as the default path.
+
+HTML_OUTPUT            = html
+
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for
+# each generated HTML page (for example: .htm,.php,.asp). If it is left blank
+# doxygen will generate files with .html extension.
+
+HTML_FILE_EXTENSION    = .html
+
+# The HTML_HEADER tag can be used to specify a personal HTML header for
+# each generated HTML page. If it is left blank doxygen will generate a
+# standard header. Note that when using a custom header you are responsible
+# for the proper inclusion of any scripts and style sheets that doxygen
+# needs, which is dependent on the configuration options used.
+# It is advised to generate a default header using "doxygen -w html
+# header.html footer.html stylesheet.css YourConfigFile" and then modify
+# that header. Note that the header is subject to change so you typically
+# have to redo this when upgrading to a newer version of doxygen or when changing the value of configuration settings such as GENERATE_TREEVIEW!
+
+HTML_HEADER            =
+
+# The HTML_FOOTER tag can be used to specify a personal HTML footer for
+# each generated HTML page. If it is left blank doxygen will generate a
+# standard footer.
+
+HTML_FOOTER            =
+
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
+# style sheet that is used by each HTML page. It can be used to
+# fine-tune the look of the HTML output. If the tag is left blank doxygen
+# will generate a default style sheet. Note that doxygen will try to copy
+# the style sheet file to the HTML output directory, so don't put your own
+# stylesheet in the HTML output directory as well, or it will be erased!
+
+HTML_STYLESHEET        =
+
+# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the HTML output directory. Note
+# that these files will be copied to the base HTML output directory. Use the
+# $relpath$ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
+# files. In the HTML_STYLESHEET file, use the file name only. Also note that
+# the files will be copied as-is; there are no commands or markers available.
+
+HTML_EXTRA_FILES       =
+
+# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output.
+# Doxygen will adjust the colors in the stylesheet and background images
+# according to this color. Hue is specified as an angle on a colorwheel,
+# see http://en.wikipedia.org/wiki/Hue for more information.
+# For instance the value 0 represents red, 60 is yellow, 120 is green,
+# 180 is cyan, 240 is blue, 300 purple, and 360 is red again.
+# The allowed range is 0 to 359.
+
+HTML_COLORSTYLE_HUE    = 220
+
+# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of
+# the colors in the HTML output. For a value of 0 the output will use
+# grayscales only. A value of 255 will produce the most vivid colors.
+
+HTML_COLORSTYLE_SAT    = 100
+
+# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to
+# the luminance component of the colors in the HTML output. Values below
+# 100 gradually make the output lighter, whereas values above 100 make
+# the output darker. The value divided by 100 is the actual gamma applied,
+# so 80 represents a gamma of 0.8, The value 220 represents a gamma of 2.2,
+# and 100 does not change the gamma.
+
+HTML_COLORSTYLE_GAMMA  = 80
+
+# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
+# page will contain the date and time when the page was generated. Setting
+# this to NO can help when comparing the output of multiple runs.
+
+HTML_TIMESTAMP         = NO
+
+# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
+# files or namespaces will be aligned in HTML using tables. If set to
+# NO a bullet list will be used.
+
+HTML_ALIGN_MEMBERS     = YES
+
+# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
+# documentation will contain sections that can be hidden and shown after the
+# page has loaded. For this to work a browser that supports
+# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox
+# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari).
+
+HTML_DYNAMIC_SECTIONS  = NO
+
+# If the GENERATE_DOCSET tag is set to YES, additional index files
+# will be generated that can be used as input for Apple's Xcode 3
+# integrated development environment, introduced with OSX 10.5 (Leopard).
+# To create a documentation set, doxygen will generate a Makefile in the
+# HTML output directory. Running make will produce the docset in that
+# directory and running "make install" will install the docset in
+# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find
+# it at startup.
+# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
+# for more information.
+
+GENERATE_DOCSET        = NO
+
+# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the
+# feed. A documentation feed provides an umbrella under which multiple
+# documentation sets from a single provider (such as a company or product suite)
+# can be grouped.
+
+DOCSET_FEEDNAME        = "Doxygen generated docs"
+
+# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that
+# should uniquely identify the documentation set bundle. This should be a
+# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen
+# will append .docset to the name.
+
+DOCSET_BUNDLE_ID       = org.doxygen.Project
+
+# When GENERATE_PUBLISHER_ID tag specifies a string that should uniquely identify
+# the documentation publisher. This should be a reverse domain-name style
+# string, e.g. com.mycompany.MyDocSet.documentation.
+
+DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
+
+# The GENERATE_PUBLISHER_NAME tag identifies the documentation publisher.
+
+DOCSET_PUBLISHER_NAME  = Publisher
+
+# If the GENERATE_HTMLHELP tag is set to YES, additional index files
+# will be generated that can be used as input for tools like the
+# Microsoft HTML help workshop to generate a compiled HTML help file (.chm)
+# of the generated HTML documentation.
+
+GENERATE_HTMLHELP      = NO
+
+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can
+# be used to specify the file name of the resulting .chm file. You
+# can add a path in front of the file if the result should not be
+# written to the html output directory.
+
+CHM_FILE               =
+
+# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can
+# be used to specify the location (absolute path including file name) of
+# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run
+# the HTML help compiler on the generated index.hhp.
+
+HHC_LOCATION           =
+
+# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag
+# controls if a separate .chi index file is generated (YES) or that
+# it should be included in the master .chm file (NO).
+
+GENERATE_CHI           = NO
+
+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING
+# is used to encode HtmlHelp index (hhk), content (hhc) and project file
+# content.
+
+CHM_INDEX_ENCODING     =
+
+# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag
+# controls whether a binary table of contents is generated (YES) or a
+# normal table of contents (NO) in the .chm file.
+
+BINARY_TOC             = NO
+
+# The TOC_EXPAND flag can be set to YES to add extra items for group members
+# to the contents of the HTML help documentation and to the tree view.
+
+TOC_EXPAND             = NO
+
+# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
+# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated
+# that can be used as input for Qt's qhelpgenerator to generate a
+# Qt Compressed Help (.qch) of the generated HTML documentation.
+
+GENERATE_QHP           = NO
+
+# If the QHG_LOCATION tag is specified, the QCH_FILE tag can
+# be used to specify the file name of the resulting .qch file.
+# The path specified is relative to the HTML output folder.
+
+QCH_FILE               =
+
+# The QHP_NAMESPACE tag specifies the namespace to use when generating
+# Qt Help Project output. For more information please see
+# http://doc.trolltech.com/qthelpproject.html#namespace
+
+QHP_NAMESPACE          = org.doxygen.Project
+
+# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating
+# Qt Help Project output. For more information please see
+# http://doc.trolltech.com/qthelpproject.html#virtual-folders
+
+QHP_VIRTUAL_FOLDER     = doc
+
+# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to
+# add. For more information please see
+# http://doc.trolltech.com/qthelpproject.html#custom-filters
+
+QHP_CUST_FILTER_NAME   =
+
+# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the
+# custom filter to add. For more information please see
+# <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters">
+# Qt Help Project / Custom Filters</a>.
+
+QHP_CUST_FILTER_ATTRS  =
+
+# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
+# project's
+# filter section matches.
+# <a href="http://doc.trolltech.com/qthelpproject.html#filter-attributes">
+# Qt Help Project / Filter Attributes</a>.
+
+QHP_SECT_FILTER_ATTRS  =
+
+# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can
+# be used to specify the location of Qt's qhelpgenerator.
+# If non-empty doxygen will try to run qhelpgenerator on the generated
+# .qhp file.
+
+QHG_LOCATION           =
+
+# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files
+#  will be generated, which together with the HTML files, form an Eclipse help
+# plugin. To install this plugin and make it available under the help contents
+# menu in Eclipse, the contents of the directory containing the HTML and XML
+# files needs to be copied into the plugins directory of eclipse. The name of
+# the directory within the plugins directory should be the same as
+# the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before
+# the help appears.
+
+GENERATE_ECLIPSEHELP   = NO
+
+# A unique identifier for the eclipse help plugin. When installing the plugin
+# the directory name containing the HTML and XML files should also have
+# this name.
+
+ECLIPSE_DOC_ID         = org.doxygen.Project
+
+# The DISABLE_INDEX tag can be used to turn on/off the condensed index at
+# top of each HTML page. The value NO (the default) enables the index and
+# the value YES disables it.
+
+DISABLE_INDEX          = NO
+
+# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values
+# (range 0,1..20) that doxygen will group on one line in the generated HTML
+# documentation. Note that a value of 0 will completely suppress the enum
+# values from appearing in the overview section.
+
+ENUM_VALUES_PER_LINE   = 1
+
+# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
+# structure should be generated to display hierarchical information.
+# If the tag value is set to YES, a side panel will be generated
+# containing a tree-like index structure (just like the one that
+# is generated for HTML Help). For this to work a browser that supports
+# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser).
+# Windows users are probably better off using the HTML help feature.
+
+GENERATE_TREEVIEW      = YES
+
+# By enabling USE_INLINE_TREES, doxygen will generate the Groups, Directories,
+# and Class Hierarchy pages using a tree view instead of an ordered list.
+
+USE_INLINE_TREES       = NO
+
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
+# used to set the initial width (in pixels) of the frame in which the tree
+# is shown.
+
+TREEVIEW_WIDTH         = 250
+
+# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open
+# links to external symbols imported via tag files in a separate window.
+
+EXT_LINKS_IN_WINDOW    = NO
+
+# Use this tag to change the font size of Latex formulas included
+# as images in the HTML documentation. The default is 10. Note that
+# when you change the font size after a successful doxygen run you need
+# to manually remove any form_*.png images from the HTML output directory
+# to force them to be regenerated.
+
+FORMULA_FONTSIZE       = 10
+
+# Use the FORMULA_TRANPARENT tag to determine whether or not the images
+# generated for formulas are transparent PNGs. Transparent PNGs are
+# not supported properly for IE 6.0, but are supported on all modern browsers.
+# Note that when changing this option you need to delete any form_*.png files
+# in the HTML output before the changes have effect.
+
+FORMULA_TRANSPARENT    = YES
+
+# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax
+# (see http://www.mathjax.org) which uses client side Javascript for the
+# rendering instead of using prerendered bitmaps. Use this if you do not
+# have LaTeX installed or if you want to formulas look prettier in the HTML
+# output. When enabled you also need to install MathJax separately and
+# configure the path to it using the MATHJAX_RELPATH option.
+
+USE_MATHJAX            = NO
+
+# When MathJax is enabled you need to specify the location relative to the
+# HTML output directory using the MATHJAX_RELPATH option. The destination
+# directory should contain the MathJax.js script. For instance, if the mathjax
+# directory is located at the same level as the HTML output directory, then
+# MATHJAX_RELPATH should be ../mathjax. The default value points to the
+# mathjax.org site, so you can quickly see the result without installing
+# MathJax, but it is strongly recommended to install a local copy of MathJax
+# before deployment.
+
+MATHJAX_RELPATH        = http://www.mathjax.org/mathjax
+
+# When the SEARCHENGINE tag is enabled doxygen will generate a search box
+# for the HTML output. The underlying search engine uses javascript
+# and DHTML and should work on any modern browser. Note that when using
+# HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets
+# (GENERATE_DOCSET) there is already a search function so this one should
+# typically be disabled. For large projects the javascript based search engine
+# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution.
+
+SEARCHENGINE           = YES
+
+# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
+# implemented using a PHP enabled web server instead of at the web client
+# using Javascript. Doxygen will generate the search PHP script and index
+# file to put on the web server. The advantage of the server
+# based approach is that it scales better to large projects and allows
+# full text search. The disadvantages are that it is more difficult to setup
+# and does not have live searching capabilities.
+
+SERVER_BASED_SEARCH    = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
+# generate Latex output.
+
+GENERATE_LATEX         = YES
+
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `latex' will be used as the default path.
+
+LATEX_OUTPUT           = latex
+
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
+# invoked. If left blank `latex' will be used as the default command name.
+# Note that when enabling USE_PDFLATEX this option is only used for
+# generating bitmaps for formulas in the HTML output, but not in the
+# Makefile that is written to the output directory.
+
+LATEX_CMD_NAME         = latex
+
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to
+# generate index for LaTeX. If left blank `makeindex' will be used as the
+# default command name.
+
+MAKEINDEX_CMD_NAME     = makeindex
+
+# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact
+# LaTeX documents. This may be useful for small projects and may help to
+# save some trees in general.
+
+COMPACT_LATEX          = NO
+
+# The PAPER_TYPE tag can be used to set the paper type that is used
+# by the printer. Possible values are: a4, letter, legal and
+# executive. If left blank a4wide will be used.
+
+PAPER_TYPE             = a4wide
+
+# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX
+# packages that should be included in the LaTeX output.
+
+EXTRA_PACKAGES         =
+
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for
+# the generated latex document. The header should contain everything until
+# the first chapter. If it is left blank doxygen will generate a
+# standard header. Notice: only use this tag if you know what you are doing!
+
+LATEX_HEADER           =
+
+# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for
+# the generated latex document. The footer should contain everything after
+# the last chapter. If it is left blank doxygen will generate a
+# standard footer. Notice: only use this tag if you know what you are doing!
+
+LATEX_FOOTER           =
+
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated
+# is prepared for conversion to pdf (using ps2pdf). The pdf file will
+# contain links (just like the HTML output) instead of page references
+# This makes the output suitable for online browsing using a pdf viewer.
+
+PDF_HYPERLINKS         = NO
+
+# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of
+# plain latex in the generated Makefile. Set this option to YES to get a
+# higher quality PDF documentation.
+
+USE_PDFLATEX           = NO
+
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode.
+# command to the generated LaTeX files. This will instruct LaTeX to keep
+# running if errors occur, instead of asking the user for help.
+# This option is also used when generating formulas in HTML.
+
+LATEX_BATCHMODE        = NO
+
+# If LATEX_HIDE_INDICES is set to YES then doxygen will not
+# include the index chapters (such as File Index, Compound Index, etc.)
+# in the output.
+
+LATEX_HIDE_INDICES     = NO
+
+# If LATEX_SOURCE_CODE is set to YES then doxygen will include
+# source code with syntax highlighting in the LaTeX output.
+# Note that which sources are shown also depends on other settings
+# such as SOURCE_BROWSER.
+
+LATEX_SOURCE_CODE      = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the RTF output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output
+# The RTF output is optimized for Word 97 and may not look very pretty with
+# other RTF readers or editors.
+
+GENERATE_RTF           = NO
+
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `rtf' will be used as the default path.
+
+RTF_OUTPUT             = rtf
+
+# If the COMPACT_RTF tag is set to YES Doxygen generates more compact
+# RTF documents. This may be useful for small projects and may help to
+# save some trees in general.
+
+COMPACT_RTF            = NO
+
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated
+# will contain hyperlink fields. The RTF file will
+# contain links (just like the HTML output) instead of page references.
+# This makes the output suitable for online browsing using WORD or other
+# programs which support those fields.
+# Note: wordpad (write) and others do not support links.
+
+RTF_HYPERLINKS         = NO
+
+# Load stylesheet definitions from file. Syntax is similar to doxygen's
+# config file, i.e. a series of assignments. You only have to provide
+# replacements, missing definitions are set to their default value.
+
+RTF_STYLESHEET_FILE    =
+
+# Set optional variables used in the generation of an rtf document.
+# Syntax is similar to doxygen's config file.
+
+RTF_EXTENSIONS_FILE    =
+
+#---------------------------------------------------------------------------
+# configuration options related to the man page output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_MAN tag is set to YES (the default) Doxygen will
+# generate man pages
+
+GENERATE_MAN           = NO
+
+# The MAN_OUTPUT tag is used to specify where the man pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `man' will be used as the default path.
+
+MAN_OUTPUT             = man
+
+# The MAN_EXTENSION tag determines the extension that is added to
+# the generated man pages (default is the subroutine's section .3)
+
+MAN_EXTENSION          = .3
+
+# If the MAN_LINKS tag is set to YES and Doxygen generates man output,
+# then it will generate one additional man file for each entity
+# documented in the real man page(s). These additional files
+# only source the real man page, but without them the man command
+# would be unable to find the correct page. The default is NO.
+
+MAN_LINKS              = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the XML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_XML tag is set to YES Doxygen will
+# generate an XML file that captures the structure of
+# the code including all documentation.
+
+GENERATE_XML           = NO
+
+# The XML_OUTPUT tag is used to specify where the XML pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# put in front of it. If left blank `xml' will be used as the default path.
+
+XML_OUTPUT             = xml
+
+# The XML_SCHEMA tag can be used to specify an XML schema,
+# which can be used by a validating XML parser to check the
+# syntax of the XML files.
+
+XML_SCHEMA             =
+
+# The XML_DTD tag can be used to specify an XML DTD,
+# which can be used by a validating XML parser to check the
+# syntax of the XML files.
+
+XML_DTD                =
+
+# If the XML_PROGRAMLISTING tag is set to YES Doxygen will
+# dump the program listings (including syntax highlighting
+# and cross-referencing information) to the XML output. Note that
+# enabling this will significantly increase the size of the XML output.
+
+XML_PROGRAMLISTING     = YES
+
+#---------------------------------------------------------------------------
+# configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will
+# generate an AutoGen Definitions (see autogen.sf.net) file
+# that captures the structure of the code including all
+# documentation. Note that this feature is still experimental
+# and incomplete at the moment.
+
+GENERATE_AUTOGEN_DEF   = NO
+
+#---------------------------------------------------------------------------
+# configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_PERLMOD tag is set to YES Doxygen will
+# generate a Perl module file that captures the structure of
+# the code including all documentation. Note that this
+# feature is still experimental and incomplete at the
+# moment.
+
+GENERATE_PERLMOD       = NO
+
+# If the PERLMOD_LATEX tag is set to YES Doxygen will generate
+# the necessary Makefile rules, Perl scripts and LaTeX code to be able
+# to generate PDF and DVI output from the Perl module output.
+
+PERLMOD_LATEX          = NO
+
+# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be
+# nicely formatted so it can be parsed by a human reader.
+# This is useful
+# if you want to understand what is going on.
+# On the other hand, if this
+# tag is set to NO the size of the Perl module output will be much smaller
+# and Perl will parse it just the same.
+
+PERLMOD_PRETTY         = YES
+
+# The names of the make variables in the generated doxyrules.make file
+# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX.
+# This is useful so different doxyrules.make files included by the same
+# Makefile don't overwrite each other's variables.
+
+PERLMOD_MAKEVAR_PREFIX =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor
+#---------------------------------------------------------------------------
+
+# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will
+# evaluate all C-preprocessor directives found in the sources and include
+# files.
+
+ENABLE_PREPROCESSING   = YES
+
+# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro
+# names in the source code. If set to NO (the default) only conditional
+# compilation will be performed. Macro expansion can be done in a controlled
+# way by setting EXPAND_ONLY_PREDEF to YES.
+
+MACRO_EXPANSION        = NO
+
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES
+# then the macro expansion is limited to the macros specified with the
+# PREDEFINED and EXPAND_AS_DEFINED tags.
+
+EXPAND_ONLY_PREDEF     = NO
+
+# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
+# pointed to by INCLUDE_PATH will be searched when a #include is found.
+
+SEARCH_INCLUDES        = YES
+
+# The INCLUDE_PATH tag can be used to specify one or more directories that
+# contain include files that are not input files but should be processed by
+# the preprocessor.
+
+INCLUDE_PATH           =
+
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
+# patterns (like *.h and *.hpp) to filter out the header-files in the
+# directories. If left blank, the patterns specified with FILE_PATTERNS will
+# be used.
+
+INCLUDE_FILE_PATTERNS  =
+
+# The PREDEFINED tag can be used to specify one or more macro names that
+# are defined before the preprocessor is started (similar to the -D option of
+# gcc). The argument of the tag is a list of macros of the form: name
+# or name=definition (no spaces). If the definition and the = are
+# omitted =1 is assumed. To prevent a macro definition from being
+# undefined via #undef or recursively expanded use the := operator
+# instead of the = operator.
+
+PREDEFINED             =
+
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
+# this tag can be used to specify a list of macro names that should be expanded.
+# The macro definition that is found in the sources will be used.
+# Use the PREDEFINED tag if you want to use a different macro definition that
+# overrules the definition found in the source code.
+
+EXPAND_AS_DEFINED      =
+
+# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
+# doxygen's preprocessor will remove all references to function-like macros
+# that are alone on a line, have an all uppercase name, and do not end with a
+# semicolon, because these will confuse the parser if not removed.
+
+SKIP_FUNCTION_MACROS   = YES
+
+#---------------------------------------------------------------------------
+# Configuration::additions related to external references
+#---------------------------------------------------------------------------
+
+# The TAGFILES option can be used to specify one or more tagfiles.
+# Optionally an initial location of the external documentation
+# can be added for each tagfile. The format of a tag file without
+# this location is as follows:
+#
+# TAGFILES = file1 file2 ...
+# Adding location for the tag files is done as follows:
+#
+# TAGFILES = file1=loc1 "file2 = loc2" ...
+# where "loc1" and "loc2" can be relative or absolute paths or
+# URLs. If a location is present for each tag, the installdox tool
+# does not have to be run to correct the links.
+# Note that each tag file must have a unique name
+# (where the name does NOT include the path)
+# If a tag file is not located in the directory in which doxygen
+# is run, you must also specify the path to the tagfile here.
+
+TAGFILES = doc/libosmocore.tag=../../core/html doc/libosmovty.tag=../../vty/html doc/libosmocodec.tag=../../codec/html doc/libosmocoding.tag=../../coding/html doc/libosmoctrl.tag=../../ctrl/html doc/libosmogb.tag=../../gb/html
+
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create
+# a tag file that is based on the input files it reads.
+
+GENERATE_TAGFILE       = doc/libosmousb.tag
+
+# If the ALLEXTERNALS tag is set to YES all external classes will be listed
+# in the class index. If set to NO only the inherited external classes
+# will be listed.
+
+ALLEXTERNALS           = NO
+
+# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed
+# in the modules index. If set to NO, only the current project's groups will
+# be listed.
+
+EXTERNAL_GROUPS        = YES
+
+# The PERL_PATH should be the absolute path and name of the perl script
+# interpreter (i.e. the result of `which perl').
+
+PERL_PATH              = /usr/bin/perl
+
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool
+#---------------------------------------------------------------------------
+
+# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
+# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base
+# or super classes. Setting the tag to NO turns the diagrams off. Note that
+# this option also works with HAVE_DOT disabled, but it is recommended to
+# install and use dot, since it yields more powerful graphs.
+
+CLASS_DIAGRAMS         = YES
+
+# You can define message sequence charts within doxygen comments using the \msc
+# command. Doxygen will then run the mscgen tool (see
+# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the
+# documentation. The MSCGEN_PATH tag allows you to specify the directory where
+# the mscgen tool resides. If left empty the tool is assumed to be found in the
+# default search path.
+
+MSCGEN_PATH            =
+
+# If set to YES, the inheritance and collaboration graphs will hide
+# inheritance and usage relations if the target is undocumented
+# or is not a class.
+
+HIDE_UNDOC_RELATIONS   = YES
+
+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
+# available from the path. This tool is part of Graphviz, a graph visualization
+# toolkit from AT&T and Lucent Bell Labs. The other options in this section
+# have no effect if this option is set to NO (the default)
+
+HAVE_DOT               = NO
+
+# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is
+# allowed to run in parallel. When set to 0 (the default) doxygen will
+# base this on the number of processors available in the system. You can set it
+# explicitly to a value larger than 0 to get control over the balance
+# between CPU load and processing speed.
+
+DOT_NUM_THREADS        = 0
+
+# By default doxygen will write a font called Helvetica to the output
+# directory and reference it in all dot files that doxygen generates.
+# When you want a differently looking font you can specify the font name
+# using DOT_FONTNAME. You need to make sure dot is able to find the font,
+# which can be done by putting it in a standard location or by setting the
+# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory
+# containing the font.
+
+DOT_FONTNAME           = Helvetica
+
+# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs.
+# The default size is 10pt.
+
+DOT_FONTSIZE           = 10
+
+# By default doxygen will tell dot to use the output directory to look for the
+# FreeSans.ttf font (which doxygen will put there itself). If you specify a
+# different font using DOT_FONTNAME you can set the path where dot
+# can find it using this tag.
+
+DOT_FONTPATH           =
+
+# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
+# will generate a graph for each documented class showing the direct and
+# indirect inheritance relations. Setting this tag to YES will force the
+# the CLASS_DIAGRAMS tag to NO.
+
+CLASS_GRAPH            = YES
+
+# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen
+# will generate a graph for each documented class showing the direct and
+# indirect implementation dependencies (inheritance, containment, and
+# class references variables) of the class with other documented classes.
+
+COLLABORATION_GRAPH    = YES
+
+# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen
+# will generate a graph for groups, showing the direct groups dependencies
+
+GROUP_GRAPHS           = YES
+
+# If the UML_LOOK tag is set to YES doxygen will generate inheritance and
+# collaboration diagrams in a style similar to the OMG's Unified Modeling
+# Language.
+
+UML_LOOK               = NO
+
+# If set to YES, the inheritance and collaboration graphs will show the
+# relations between templates and their instances.
+
+TEMPLATE_RELATIONS     = NO
+
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT
+# tags are set to YES then doxygen will generate a graph for each documented
+# file showing the direct and indirect include dependencies of the file with
+# other documented files.
+
+INCLUDE_GRAPH          = YES
+
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and
+# HAVE_DOT tags are set to YES then doxygen will generate a graph for each
+# documented header file showing the documented files that directly or
+# indirectly include this file.
+
+INCLUDED_BY_GRAPH      = YES
+
+# If the CALL_GRAPH and HAVE_DOT options are set to YES then
+# doxygen will generate a call dependency graph for every global function
+# or class method. Note that enabling this option will significantly increase
+# the time of a run. So in most cases it will be better to enable call graphs
+# for selected functions only using the \callgraph command.
+
+CALL_GRAPH             = NO
+
+# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then
+# doxygen will generate a caller dependency graph for every global function
+# or class method. Note that enabling this option will significantly increase
+# the time of a run. So in most cases it will be better to enable caller
+# graphs for selected functions only using the \callergraph command.
+
+CALLER_GRAPH           = NO
+
+# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen
+# will generate a graphical hierarchy of all classes instead of a textual one.
+
+GRAPHICAL_HIERARCHY    = YES
+
+# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES
+# then doxygen will show the dependencies a directory has on other directories
+# in a graphical way. The dependency relations are determined by the #include
+# relations between the files in the directories.
+
+DIRECTORY_GRAPH        = YES
+
+# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
+# generated by dot. Possible values are svg, png, jpg, or gif.
+# If left blank png will be used.
+
+DOT_IMAGE_FORMAT       = png
+
+# The tag DOT_PATH can be used to specify the path where the dot tool can be
+# found. If left blank, it is assumed the dot tool can be found in the path.
+
+DOT_PATH               = /usr/bin/dot
+
+# The DOTFILE_DIRS tag can be used to specify one or more directories that
+# contain dot files that are included in the documentation (see the
+# \dotfile command).
+
+DOTFILE_DIRS           =
+
+# The MSCFILE_DIRS tag can be used to specify one or more directories that
+# contain msc files that are included in the documentation (see the
+# \mscfile command).
+
+MSCFILE_DIRS           =
+
+# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of
+# nodes that will be shown in the graph. If the number of nodes in a graph
+# becomes larger than this value, doxygen will truncate the graph, which is
+# visualized by representing a node as a red box. Note that doxygen if the
+# number of direct children of the root node in a graph is already larger than
+# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note
+# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
+
+DOT_GRAPH_MAX_NODES    = 50
+
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the
+# graphs generated by dot. A depth value of 3 means that only nodes reachable
+# from the root by following a path via at most 3 edges will be shown. Nodes
+# that lay further from the root node will be omitted. Note that setting this
+# option to 1 or 2 may greatly reduce the computation time needed for large
+# code bases. Also note that the size of a graph can be further restricted by
+# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
+
+MAX_DOT_GRAPH_DEPTH    = 0
+
+# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
+# background. This is disabled by default, because dot on Windows does not
+# seem to support this out of the box. Warning: Depending on the platform used,
+# enabling this option may lead to badly anti-aliased labels on the edges of
+# a graph (i.e. they become hard to read).
+
+DOT_TRANSPARENT        = NO
+
+# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output
+# files in one run (i.e. multiple -o and -T options on the command line). This
+# makes dot run faster, but since only newer versions of dot (>1.8.10)
+# support this, this feature is disabled by default.
+
+DOT_MULTI_TARGETS      = NO
+
+# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will
+# generate a legend page explaining the meaning of the various boxes and
+# arrows in the dot generated graphs.
+
+GENERATE_LEGEND        = YES
+
+# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will
+# remove the intermediate dot files that are used to generate
+# the various graphs.
+
+DOT_CLEANUP            = YES

libosmocore_1.8.0.tar.xz/Makefile.am -> libosmocore_1.9.0.tar.xz/Makefile.am Changed

@@ -150,6 +150,22 @@
 	-$(DOXYGEN) $(top_builddir)/Doxyfile.gb
 	touch "$@"
 
+$(top_builddir)/doc/libosmosim.tag.prep: $(top_builddir)/Doxyfile.sim \
+		$(top_srcdir)/include/osmocom/sim/*.h \
+		$(top_srcdir)/src/sim/*.hc
+	rm -rf $(top_builddir)/doc/sim; mkdir -p $(top_builddir)/doc/sim
+	rm -rf $(top_builddir)/doc/libosmosim.map
+	-$(DOXYGEN) $(top_builddir)/Doxyfile.sim
+	touch "$@"
+
+$(top_builddir)/doc/libosmousb.tag.prep: $(top_builddir)/Doxyfile.usb \
+		$(top_srcdir)/include/osmocom/usb/*.h \
+		$(top_srcdir)/src/usb/*.hc
+	rm -rf $(top_builddir)/doc/usb; mkdir -p $(top_builddir)/doc/usb
+	rm -rf $(top_builddir)/doc/libosmousb.map
+	-$(DOXYGEN) $(top_builddir)/Doxyfile.usb
+	touch "$@"
+
 # Build for real once all depending .tag files are in place.
 # Depend on the own .tag.prep file to avoid concurrent builds of the same doc
 # tree, and to also depend on all the source files listed above.
@@ -169,7 +185,9 @@
 		$(top_builddir)/doc/libosmocodec.tag.prep \
 		$(top_builddir)/doc/libosmocoding.tag.prep \
 		$(top_builddir)/doc/libosmoctrl.tag.prep \
-		$(top_builddir)/doc/libosmogb.tag.prep
+		$(top_builddir)/doc/libosmogb.tag.prep \
+		$(top_builddir)/doc/libosmosim.tag.prep \
+		$(top_builddir)/doc/libosmousb.tag.prep
 	rm -rf $(top_builddir)/doc/core; mkdir -p $(top_builddir)/doc/core
 	$(DOXYGEN) Doxyfile.core
 
@@ -180,7 +198,9 @@
 		$(top_builddir)/doc/libosmocodec.tag.prep \
 		$(top_builddir)/doc/libosmocoding.tag.prep \
 		$(top_builddir)/doc/libosmoctrl.tag.prep \
-		$(top_builddir)/doc/libosmogb.tag.prep
+		$(top_builddir)/doc/libosmogb.tag.prep \
+		$(top_builddir)/doc/libosmosim.tag.prep \
+		$(top_builddir)/doc/libosmousb.tag.prep
 	rm -rf $(top_builddir)/doc/gsm; mkdir -p $(top_builddir)/doc/gsm
 	$(DOXYGEN) Doxyfile.gsm
 
@@ -191,7 +211,9 @@
 		$(top_builddir)/doc/libosmocodec.tag.prep \
 		$(top_builddir)/doc/libosmocoding.tag.prep \
 		$(top_builddir)/doc/libosmoctrl.tag.prep \
-		$(top_builddir)/doc/libosmogb.tag.prep
+		$(top_builddir)/doc/libosmogb.tag.prep \
+		$(top_builddir)/doc/libosmosim.tag.prep \
+		$(top_builddir)/doc/libosmousb.tag.prep
 	rm -rf $(top_builddir)/doc/isdn; mkdir -p $(top_builddir)/doc/isdn
 	$(DOXYGEN) Doxyfile.isdn
 
@@ -203,7 +225,9 @@
 		$(top_builddir)/doc/libosmocodec.tag.prep \
 		$(top_builddir)/doc/libosmocoding.tag.prep \
 		$(top_builddir)/doc/libosmoctrl.tag.prep \
-		$(top_builddir)/doc/libosmogb.tag.prep
+		$(top_builddir)/doc/libosmogb.tag.prep \
+		$(top_builddir)/doc/libosmosim.tag.prep \
+		$(top_builddir)/doc/libosmousb.tag.prep
 	rm -rf $(top_builddir)/doc/vty/html $(top_builddir)/doc/vty/latex
 	$(DOXYGEN) Doxyfile.vty
 
@@ -214,7 +238,9 @@
 		$(top_builddir)/doc/libosmovty.tag.prep \
 		$(top_builddir)/doc/libosmocoding.tag.prep \
 		$(top_builddir)/doc/libosmoctrl.tag.prep \
-		$(top_builddir)/doc/libosmogb.tag.prep
+		$(top_builddir)/doc/libosmogb.tag.prep \
+		$(top_builddir)/doc/libosmosim.tag.prep \
+		$(top_builddir)/doc/libosmousb.tag.prep
 	rm -rf $(top_builddir)/doc/codec; mkdir -p $(top_builddir)/doc/codec
 	$(DOXYGEN) Doxyfile.codec
 
@@ -225,7 +251,9 @@
 		$(top_builddir)/doc/libosmovty.tag.prep \
 		$(top_builddir)/doc/libosmocodec.tag.prep \
 		$(top_builddir)/doc/libosmoctrl.tag.prep \
-		$(top_builddir)/doc/libosmogb.tag.prep
+		$(top_builddir)/doc/libosmogb.tag.prep \
+		$(top_builddir)/doc/libosmosim.tag.prep \
+		$(top_builddir)/doc/libosmousb.tag.prep
 	rm -rf $(top_builddir)/doc/coding; mkdir -p $(top_builddir)/doc/coding
 	$(DOXYGEN) Doxyfile.coding
 
@@ -236,7 +264,9 @@
 		$(top_builddir)/doc/libosmovty.tag.prep \
 		$(top_builddir)/doc/libosmocodec.tag.prep \
 		$(top_builddir)/doc/libosmocoding.tag.prep \
-		$(top_builddir)/doc/libosmogb.tag.prep
+		$(top_builddir)/doc/libosmogb.tag.prep \
+		$(top_builddir)/doc/libosmosim.tag.prep \
+		$(top_builddir)/doc/libosmousb.tag.prep
 	rm -rf $(top_builddir)/doc/ctrl; mkdir -p $(top_builddir)/doc/ctrl
 	$(DOXYGEN) Doxyfile.ctrl
 
@@ -247,18 +277,53 @@
 		$(top_builddir)/doc/libosmovty.tag.prep \
 		$(top_builddir)/doc/libosmocodec.tag.prep \
 		$(top_builddir)/doc/libosmocoding.tag.prep \
-		$(top_builddir)/doc/libosmoctrl.tag.prep
+		$(top_builddir)/doc/libosmoctrl.tag.prep \
+		$(top_builddir)/doc/libosmosim.tag.prep \
+		$(top_builddir)/doc/libosmousb.tag.prep
 	rm -rf $(top_builddir)/doc/gb; mkdir -p $(top_builddir)/doc/gb
 	$(DOXYGEN) Doxyfile.gb
 
+$(top_builddir)/doc/sim/html/index.html: $(top_builddir)/doc/libosmosim.tag.prep \
+		$(top_builddir)/doc/libosmocore.tag.prep \
+		$(top_builddir)/doc/libosmogsm.tag.prep \
+		$(top_builddir)/doc/libosmoisdn.tag.prep \
+		$(top_builddir)/doc/libosmovty.tag.prep \
+		$(top_builddir)/doc/libosmocodec.tag.prep \
+		$(top_builddir)/doc/libosmocoding.tag.prep \
+		$(top_builddir)/doc/libosmoctrl.tag.prep \
+		$(top_builddir)/doc/libosmogb.tag.prep \
+		$(top_builddir)/doc/libosmousb.tag.prep
+	rm -rf $(top_builddir)/doc/sim; mkdir -p $(top_builddir)/doc/sim
+	$(DOXYGEN) Doxyfile.sim
+
+$(top_builddir)/doc/usb/html/index.html: $(top_builddir)/doc/libosmousb.tag.prep \
+		$(top_builddir)/doc/libosmocore.tag.prep \
+		$(top_builddir)/doc/libosmogsm.tag.prep \
+		$(top_builddir)/doc/libosmoisdn.tag.prep \
+		$(top_builddir)/doc/libosmovty.tag.prep \
+		$(top_builddir)/doc/libosmocodec.tag.prep \
+		$(top_builddir)/doc/libosmocoding.tag.prep \
+		$(top_builddir)/doc/libosmoctrl.tag.prep \
+		$(top_builddir)/doc/libosmogb.tag.prep \
+		$(top_builddir)/doc/libosmosim.tag.prep
+	rm -rf $(top_builddir)/doc/usb; mkdir -p $(top_builddir)/doc/usb
+	$(DOXYGEN) Doxyfile.usb
+
 if HAVE_DOXYGEN
 install-data-hook:
 	cd $(DESTDIR)$(htmldir) && tar xf html.tar && rm -f html.tar
 
 uninstall-hook:
-	cd $(DESTDIR)$(htmldir) && rm -rf {core,gsm,isdn,vty,codec,coding,ctrl,gb}
+	cd $(DESTDIR)$(htmldir) && rm -rf {core,gsm,isdn,vty,codec,coding,ctrl,gb,sim,usb}
 
-DX_CLEAN = doc/{core,gsm,isdn,vty,codec,coding,ctrl,gb}/html/search/* doc/{core,gsm,isdn,vty,codec,coding,ctrl,gb}/{html,latex}/* doc/html.tar doc/{core,gsm,isdn,vty,codec,coding,ctrl,gb}/doxygen_sqlite3.db doc/*.tag doc/*.tag.prep
+DX_CLEAN = \
+	doc/{core,gsm,isdn,vty,codec,coding,ctrl,gb,sim,usb}/html/search/* \
+	doc/{core,gsm,isdn,vty,codec,coding,ctrl,gb,sim,usb}/{html,latex}/* \
+	doc/{core,gsm,isdn,vty,codec,coding,ctrl,gb,sim,usb}/doxygen_sqlite3.db \
+	doc/*.tag.prep \
+	doc/*.tag \
+	doc/html.tar \
+	$(NULL)
 endif
 
 MOSTLYCLEANFILES = $(DX_CLEAN)

libosmocore_1.8.0.tar.xz/configure.ac -> libosmocore_1.9.0.tar.xz/configure.ac Changed

@@ -55,6 +55,7 @@
 	LTLDFLAGS_OSMOGSM='-Wl,--version-script=$(srcdir)/libosmogsm.map'
 	LTLDFLAGS_OSMOISDN='-Wl,--version-script=$(srcdir)/libosmoisdn.map'
 	LTLDFLAGS_OSMOCODING='-Wl,--version-script=$(srcdir)/libosmocoding.map'
+	LTLDFLAGS_OSMOCORE='-Wl,--version-script=$(srcdir)/libosmocore.map'
 	LTLDFLAGS_OSMOCTRL='-Wl,--version-script=$(srcdir)/libosmoctrl.map'
 	;;
 esac
@@ -62,11 +63,13 @@
 AC_SUBST(LTLDFLAGS_OSMOGSM)
 AC_SUBST(LTLDFLAGS_OSMOISDN)
 AC_SUBST(LTLDFLAGS_OSMOCODING)
+AC_SUBST(LTLDFLAGS_OSMOCORE)
 AC_SUBST(LTLDFLAGS_OSMOCTRL)
 
 dnl checks for header files
 AC_HEADER_STDC
 AC_CHECK_HEADERS(execinfo.h poll.h sys/select.h sys/socket.h sys/signalfd.h sys/eventfd.h sys/timerfd.h syslog.h ctype.h netinet/tcp.h netinet/in.h)
+AC_CHECK_DECL(HAVE_SYS_SOCKET_H, AC_SUBST(HAVE_SYS_SOCKET_H, 1), AC_SUBST(HAVE_SYS_SOCKET_H, 0))
 # for src/conv.c
 AC_FUNC_ALLOCA
 AC_SEARCH_LIBS(dlopen, dl dld, LIBRARY_DLOPEN="$LIBS";LIBS="")
@@ -172,6 +175,20 @@
 
 PKG_CHECK_MODULES(TALLOC, talloc >= 2.1.0)
 
+AC_ARG_ENABLE(uring, AS_HELP_STRING(--disable-uring, Build without io_uring support),
+    
+        ENABLE_URING=$enableval
+    ,
+    
+        ENABLE_URING="yes"
+    )
+AS_IF(test "x$ENABLE_URING" = "xyes", 
+	PKG_CHECK_MODULES(URING, liburing >= 0.7)
+	AC_DEFINE(HAVE_URING,1,Build with io_uring support)
+)
+AM_CONDITIONAL(ENABLE_URING, test "x$ENABLE_URING" = "xyes")
+AC_SUBST(ENABLE_URING)
+
 AC_ARG_ENABLE(pcsc, AS_HELP_STRING(--disable-pcsc, Build without PC/SC support),
     
         ENABLE_PCSC=$enableval
@@ -294,13 +311,13 @@
 
 AC_ARG_ENABLE(bsc_fd_check,
 	AS_HELP_STRING(
-		--enable-bsc-fd-check,
+		--enable-ofd-check,
 		Instrument osmo_fd_register to check that the fd is registered
 	),
 	fd_check=$enableval, fd_check="no")
-if test x"$fd_check" = x"no"
+if test x"$fd_check" = x"yes"
 then
-	AC_DEFINE(OSMO_FD_CHECK,1,Instrument the osmo_fd_register)
+	AC_DEFINE(OSMO_FD_CHECK, 1, Instrument the osmo_fd_register)
 fi
 
 AC_ARG_ENABLE(force_io_select,
@@ -310,7 +327,7 @@
 	),
 	force_io_select=$enableval, force_io_select="no")
 AS_IF(test "x$force_io_select" = "xyes", 
-	AC_DEFINE(FORCE_IO_SELECT, 1, Force the use of select() instaed of poll())
+	AC_DEFINE(FORCE_IO_SELECT, 1, Force the use of select() instead of poll())
 )
 
 AC_ARG_ENABLE(msgfile,
@@ -627,5 +644,7 @@
 	Doxyfile.coding
 	Doxyfile.gb
 	Doxyfile.ctrl
+	Doxyfile.sim
+	Doxyfile.usb
 	Makefile
 	contrib/libosmocore.spec)

libosmocore_1.8.0.tar.xz/contrib/libosmocore.spec.in -> libosmocore_1.9.0.tar.xz/contrib/libosmocore.spec.in Changed

@@ -33,6 +33,9 @@
 BuildRequires:  pkgconfig(talloc) >= 2.1.0
 BuildRequires:  pkgconfig(libmnl)
 BuildRequires:  pkgconfig(libsystemd)
+%if 0%{?centos_ver} != 7
+BuildRequires:  pkgconfig(liburing)
+%endif
 
 %description
 libosmocore is a package with various utility functions that were
@@ -59,13 +62,13 @@
 for testing GSM authentication, as well as "osmo-config-merge", a tool
 for merging Osmocom configuration files.
 
-%package -n libosmocodec0
+%package -n libosmocodec4
 Requires: osmocom-latest
 Summary:        GSM 06.10, 06.20, 06.60, 06.90 codec library
 License:        GPL-2.0-or-later
 Group:          System/Libraries
 
-%description -n libosmocodec0
+%description -n libosmocodec4
 The libosmocodec library contains an implementation of multiple
 GSM codecs:
 
@@ -79,7 +82,7 @@
 Summary:        Development files for the Osmocom GSM codec library
 License:        GPL-2.0-or-later
 Group:          Development/Libraries/C and C++
-Requires:       libosmocodec0 = %version
+Requires:       libosmocodec4 = %version
 
 %description -n libosmocodec-devel
 The libosmocodec library contains an implementation of multiple
@@ -118,14 +121,14 @@
 This subpackage contains libraries and header files for developing
 applications that want to make use of libosmocoding.
 
-%package -n libosmocore20
+%package -n libosmocore21
 Requires: osmocom-latest
 Summary:        Osmocom core library
 # crc16.c has GPL2-only clauses, the rest (*.c) is GPL-2.0+
 License:        GPL-2.0-only AND GPL-2.0-or-later
 Group:          System/Libraries
 
-%description -n libosmocore20
+%description -n libosmocore21
 libosmocore is a library with various utility functions shared
 between OpenBSC and OsmocomBB.
 
@@ -135,7 +138,7 @@
 # crc16.h has GPL2-only clauses, the rest (*.h) is GPL-2.0+
 License:        GPL-2.0-only AND GPL-2.0-or-later
 Group:          Development/Libraries/C and C++
-Requires:       libosmocore20 = %version
+Requires:       libosmocore21 = %version
 Requires:       libtalloc-devel
 Requires:       lksctp-tools-devel
 
@@ -202,13 +205,13 @@
 This subpackage contains libraries and header files for developing
 applications that want to make use of libosmogb.
 
-%package -n libosmogsm18
+%package -n libosmogsm20
 Requires: osmocom-latest
 Summary:        Osmocom GSM utility library
 License:        GPL-2.0-or-later AND AGPL-3.0-or-later
 Group:          System/Libraries
 
-%description -n libosmogsm18
+%description -n libosmogsm20
 libosmocore is a package with various utility functions that were
 originally developed as part of the OpenBSC project.
 
@@ -224,7 +227,7 @@
 License:        GPL-2.0-or-later AND AGPL-3.0-or-later
 Group:          Development/Libraries/C and C++
 Requires:       libosmocore-devel = %version
-Requires:       libosmogsm18 = %version
+Requires:       libosmogsm20 = %version
 Requires:       libosmoisdn-devel = %version
 Requires:       libosmoisdn0 = %version
 
@@ -296,13 +299,13 @@
 This subpackage contains libraries and header files for developing
 applications that want to make use of libosmosim.
 
-%package -n libosmovty9
+%package -n libosmovty13
 Requires: osmocom-latest
 Summary:        Osmocom VTY interface library
 License:        GPL-2.0-or-later
 Group:          System/Libraries
 
-%description -n libosmovty9
+%description -n libosmovty13
 libosmocore is a package with various utility functions that were
 originally developed as part of the OpenBSC project.
 
@@ -315,7 +318,7 @@
 License:        GPL-2.0-or-later
 Group:          Development/Libraries/C and C++
 Requires:       libosmocore-devel = %version
-Requires:       libosmovty9 = %version
+Requires:       libosmovty13 = %version
 
 %description -n libosmovty-devel
 The libosmovty library implements the interactive command-line on the
@@ -360,8 +363,18 @@
 %build
 echo "%version" >.tarball-version
 autoreconf -fiv
-%configure --enable-shared --disable-static --enable-systemd-logging \
+
+CONFIGURE_FLAGS="
+	--enable-shared \
+	--disable-static \
+	--enable-systemd-logging \
 	--includedir="%_includedir/%name"
+"
+%if 0%{?centos_ver} == 7
+	CONFIGURE_FLAGS="$CONFIGURE_FLAGS --disable-uring"
+%endif
+
+%configure $CONFIGURE_FLAGS
 make %{?_smp_mflags} V=1
 
 %install
@@ -372,24 +385,24 @@
 %check
 make %{?_smp_mflags} check || (find . -name testsuite.log -exec cat {} +)
 
-%post   -n libosmocodec0 -p /sbin/ldconfig
-%postun -n libosmocodec0 -p /sbin/ldconfig
+%post   -n libosmocodec4 -p /sbin/ldconfig
+%postun -n libosmocodec4 -p /sbin/ldconfig
 %post   -n libosmocoding0 -p /sbin/ldconfig
 %postun -n libosmocoding0 -p /sbin/ldconfig
-%post   -n libosmocore20 -p /sbin/ldconfig
-%postun -n libosmocore20 -p /sbin/ldconfig
+%post   -n libosmocore21 -p /sbin/ldconfig
+%postun -n libosmocore21 -p /sbin/ldconfig
 %post   -n libosmoctrl0 -p /sbin/ldconfig
 %postun -n libosmoctrl0 -p /sbin/ldconfig
 %post   -n libosmogb14 -p /sbin/ldconfig
 %postun -n libosmogb14 -p /sbin/ldconfig
-%post   -n libosmogsm18 -p /sbin/ldconfig
-%postun -n libosmogsm18 -p /sbin/ldconfig
+%post   -n libosmogsm20 -p /sbin/ldconfig
+%postun -n libosmogsm20 -p /sbin/ldconfig
 %post   -n libosmoisdn0 -p /sbin/ldconfig
 %postun -n libosmoisdn0 -p /sbin/ldconfig
 %post   -n libosmosim2 -p /sbin/ldconfig
 %postun -n libosmosim2 -p /sbin/ldconfig
-%post   -n libosmovty9 -p /sbin/ldconfig
-%postun -n libosmovty9 -p /sbin/ldconfig
+%post   -n libosmovty13 -p /sbin/ldconfig
+%postun -n libosmovty13 -p /sbin/ldconfig
 %post   -n libosmousb0 -p /sbin/ldconfig
 %postun -n libosmousb0 -p /sbin/ldconfig
 
@@ -397,9 +410,9 @@
 %defattr(-,root,root)
 %_bindir/osmo-*
 
-%files -n libosmocodec0
+%files -n libosmocodec4
 %defattr(-,root,root)
-%_libdir/libosmocodec.so.0*
+%_libdir/libosmocodec.so.4*
 
 %files -n libosmocodec-devel
 %defattr(-,root,root)
@@ -421,9 +434,9 @@
 %_libdir/libosmocoding.so
 %_libdir/pkgconfig/libosmocoding.pc
 
-%files -n libosmocore20
+%files -n libosmocore21
 %defattr(-,root,root)
-%_libdir/libosmocore.so.20*
+%_libdir/libosmocore.so.21*
 
 %files -n libosmocore-devel
 %defattr(-,root,root)
@@ -459,9 +472,9 @@
 %_libdir/libosmogb.so
 %_libdir/pkgconfig/libosmogb.pc
 
-%files -n libosmogsm18
+%files -n libosmogsm20
 %defattr(-,root,root)
-%_libdir/libosmogsm.so.18*
+%_libdir/libosmogsm.so.20*
 
 %files -n libosmogsm-devel
 %defattr(-,root,root)
@@ -496,9 +509,9 @@
 %_libdir/libosmosim.so
 %_libdir/pkgconfig/libosmosim.pc
 
-%files -n libosmovty9
+%files -n libosmovty13
 %defattr(-,root,root)
-%_libdir/libosmovty.so.9*
+%_libdir/libosmovty.so.13*
 
 %files -n libosmovty-devel
 %defattr(-,root,root)

libosmocore_1.9.0.tar.xz/contrib/struct_endianness.py Added

@@ -0,0 +1,371 @@
+#!/usr/bin/env python3
+
+'''Using mad regexes, automatically make sure that all structs with sub-byte
+integers have matching big-endian definitions. The idea is to save a lot of
+manual effort, and to automatically verify that there are no errors.
+This script most certainly has numerous holes and shortcomings, but actually,
+if you hit problems with it, rather adjust your coding style so that this
+script can deal with it...'''
+
+import re
+import sys
+import codecs
+import os.path
+
+re_struct_start = re.compile(r'^struct\s*a-zA-Z_a-zA-Z_0-9*\s*{\s*$')
+re_struct_end = re.compile(r'^}^;*;\s*$')
+
+re_substruct_start = re.compile(r'^\s+struct\s*{\s*$')
+re_substruct_end = re.compile(r'^\s+}\s*(^;*\s)a-zA-Z_a-zA-Z_0-9*\s*;\s*$')
+re_unnamed_substruct_end = re.compile(r'^\s+}\s*;\s*$')
+
+re_int_def = re.compile(r'(^\s*((const|unsigned|signed|char|int|long|int0-9+_t|uint0-9_t)\s+)+\s*)(^;*;)',
+                        re.DOTALL | re.MULTILINE)
+re_int_members = re.compile(r'(a-zA-Z_a-zA-Z_0-9*|a-zA-Z_a-zA-Z_0-9*\s*:\s*0-9+)\s*,;\s*', re.DOTALL | re.MULTILINE)
+
+re_little_endian_ifdef = re.compile(r'#\s*(if|elif)\s+OSMO_IS_LITTLE_ENDIAN\s*(==\s*1\s*|)');
+re_big_endian_ifdef = re.compile(r'#\s*(if|elif)\s+OSMO_IS_BIG_ENDIAN\s*');
+re_else = re.compile(r'#\s*else\s*');
+re_endif = re.compile(r'#\s*endif\s*');
+
+re_c_comment = re.compile(r'(/\*^*+\*/|//.?$)')
+
+def remove_c_comments(code_str):
+    return ''.join(re_c_comment.split(code_str)::2)
+
+def section_struct_body(struct_body_lines):
+    '''divide a top-level-struct body into sections of
+    'arbitrary string', 'body;\n', 'lines;\n', 'arbitrary string', ...
+    Aim: handle each sub-struct on its own, and if there already are ifdefs for
+    little and big endian, keep just the little endian bit and derive big
+    endian from it.
+    An arbitrary string is anything other than struct member definitions, like
+    a 'struct {', '} sub_name;', ...
+    "body lines" are lines that define struct members (possibly with comments).
+    Return: list of alternate arbitrary strings and variable definitions.
+    '''
+
+    # these globals are needed so that end_def() can change them from inside
+    # the function. Not very nice style, but easiest implementation.
+    global struct_body_parts
+    global arbitrary_part
+    global def_part
+
+    struct_body_parts = 
+    arbitrary_part = 
+    def_part = 
+
+    def end_def():
+        '''if there is any content, flush out recorded parts (def_part,
+        arbitrary_part) and start a new part. In short, cut a section
+        boundary.'''
+        global struct_body_parts
+        global arbitrary_part
+        global def_part
+
+        if def_part:
+            struct_body_parts.append(arbitrary_part)
+            arbitrary_part = 
+            struct_body_parts.append(def_part)
+            def_part = 
+
+    j = 0
+    while j < len(struct_body_lines):
+        line = struct_body_linesj
+
+        if (re_substruct_start.fullmatch(line)
+            or re_substruct_end.fullmatch(line)
+            or re_unnamed_substruct_end.fullmatch(line)):
+            end_def()
+            arbitrary_part.append(line)
+            j += 1
+            continue
+
+        if re_big_endian_ifdef.fullmatch(line):
+            end_def()
+            # discard big endian section
+            j += 1
+            while j < len(struct_body_lines):
+                line = struct_body_linesj
+                if re_endif.fullmatch(line):
+                    end_def()
+                    j += 1
+                    break;
+                if re_little_endian_ifdef.fullmatch(line):
+                    end_def()
+                    # keep that start of little endian section, not j++
+                    break;
+                if re_else.fullmatch(line):
+                    # there's an '#else' after big-endian. Shim a little-endian header in just for the loop.
+                    struct_body_linesj = '#if OSMO_IS_LITTLE_ENDIAN\n'
+                    break;
+                j += 1
+            continue
+
+        if re_little_endian_ifdef.fullmatch(line):
+            end_def()
+            j += 1
+            while j < len(struct_body_lines):
+                line = struct_body_linesj
+                if re_endif.fullmatch(line):
+                    end_def()
+                    j += 1
+                    break;
+                if re_big_endian_ifdef.fullmatch(line):
+                    end_def()
+                    # keep that start of big endian section, not j++
+                    break;
+                if re_else.fullmatch(line):
+                    # there's an '#else' after little-endian. Shim a big-endian header in just for the loop.
+                    struct_body_linesj = '#if OSMO_IS_BIG_ENDIAN\n'
+                    break;
+                def_part.append(line)
+                j += 1
+
+            continue
+
+        def_part.append(line)
+        j += 1
+
+    # flush the last section remaining that didn't see an explicit end
+    end_def()
+    # end_def() only flushes arbitrary_part if there was a def_part, so:
+    if arbitrary_part:
+        struct_body_parts.append(arbitrary_part)
+
+    return struct_body_parts
+
+def struct_body_to_big_endian(body_str):
+    '''Input: a multi-line string containing the body of a struct, i.e. without
+    sub-structs and without #if OSMO_IS_BIG_ENDIAN. like
+
+      '\tconst char *foo;\n\tuint8_t moo:3, goo:2;\n\tuint8_t loo:3;\n\tvoid *baz;\n'
+
+    Return None to indicate that there is no little/big endian split
+    required, or return a multi-line string of the big-endian version of this
+    same struct body, where sub-byte ints are reversed at byte boundaries, and
+    all others are copied 1:1. If there are no sub-byte integers, return None,
+    to indicate that there is no little/big endian split required.'''
+
+    # kick comments out of the code analysis. They will end up being stripped
+    # from big-endian only.
+    body_str = remove_c_comments(body_str)
+
+    def_strs = body_str.split(';')
+    def_strs = ('%s;' % def_str for def_str in def_strs if def_str.strip())
+
+    # classify defs as containing sub-byte members or not
+    # defs =  (true, 'uint8_t ', ('foo:3', 'bar:5')),
+    #          (false, 'int baz;'),...
+    defs = 
+    any_sub_byte_ints = False
+    for one_def in def_strs:
+
+        # does it have sub-string integers?
+        int_def = re_int_def.fullmatch(one_def)
+        if not int_def:
+            # not even a number, same for big and little endian
+            defs.append((False, one_def))
+            continue
+
+        int_type = int_def.group(1)
+        members_str = int_def.groups()-1
+        has_sub_byte_ints = False
+
+        members = 
+        for int_member in re_int_members.finditer(members_str):
+            member = int_member.group(1)
+            members.append(member)
+            if ':' in member:
+                has_sub_byte_ints = True
+
+        if not has_sub_byte_ints:
+            defs.append((False, one_def))
+        else:
+            defs.append((True, one_def, int_type, members))
+            any_sub_byte_ints = True
+
+    if not any_sub_byte_ints:
+        return None
+
+    # now the interesting part, go over the defs, and reverse the sub-byte ints
+    # at byte boundaries.
+
+    i = 0
+    got_bits = 0
+    byte_type = None
+    members_within_a_byte = 
+    big_endian_defs = 
+
+    big_defs = 
+    for classified_def in defs:
+        has_sub_byte_ints = classified_def0
+
+        # now the big endian part
+        if has_sub_byte_ints:
+            _, one_def, int_type, members = classified_def
+
+            if byte_type and byte_type.strip() != int_type.strip():
+                raise Exception('mismatching type continuation after incomplete byte: %r %r to %r'
+                                % (byte_type, members_within_a_byte, int_type))
+            byte_type = int_type
+
+            for member in members:
+                member_name, bits_str = member.split(':')
+                member_name = member_name.strip()
+                bits = int(bits_str)
+                member = '%s:%d' % (member_name, bits)
+                members_within_a_byte.append(member)
+                got_bits += bits
+
+                if got_bits == 8:
+                    # reverse these.
+                    big_endian_defs.append('%s%s;' % (byte_type, ', '.join(reversed(members_within_a_byte))))
+                    members_within_a_byte = 
+                    byte_type = None
+                    got_bits = 0
+
+                elif got_bits > 8:
+                    raise Exception('sub-byte int breaks clean byte bounds: %s -- %d + %d = %d bits'
+                                    % (member, got_bits - bits, bits, got_bits))
+
+        elif not has_sub_byte_ints:
+            if got_bits:
+                raise Exception('sub-byte members do not add up to clean byte bounds: %r' % members_within_a_byte)
+
+            big_endian_defs.append(classified_def1)
+
+    # strip empty lines
+    lines = l for l in (''.join(big_endian_defs).split('\n')) if l.strip()
+    # clean lines' whitespace errors we might have taken in with the type names
+    for i in range(len(lines)):
+        line = linesi
+        while len(line) and line-1 in ' \t':
+            line = line:-1
+        linesi = line
+    return '\n'.join(lines)
+
+def handle_struct_body(body_str):
+
+    big_endian_body_str = struct_body_to_big_endian(body_str)
+
+    if big_endian_body_str:
+        new_lines = '#if OSMO_IS_LITTLE_ENDIAN\n'
+        new_lines.append(body_str)
+        new_lines.append('#elif OSMO_IS_BIG_ENDIAN\n'
+                         '/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */\n')
+        new_lines.append(big_endian_body_str)
+        new_lines.append('\n#endif\n')
+        return ''.join(new_lines)
+    else:
+        return body_str
+
+def _check_file(f):
+    if not f.endswith(('.h', '.c', '.cpp')):
+        return
+
+    # section the file into
+    #  "no struct def", "struct {...};", "no struct def", ... 
+    sections = 
+    in_struct = False
+    buf = 
+    for line in codecs.open(f, "r", "utf-8").readlines():
+
+        if not in_struct and re_struct_start.fullmatch(line):
+            # flush whatever might still be in buf from before
+            sections.append(buf)
+            # start an in_struct section
+            buf = line
+            in_struct = True
+        elif in_struct and re_struct_end.fullmatch(line):
+            # add this end to the in_struct section and then start a non-struct section
+            buf.append(line)
+            sections.append(buf)
+            in_struct = False
+            buf = 
+        else:
+            buf.append(line)
+    # flush any leftovers in buf
+    if buf:
+        sections.append(buf)
+
+    # examine each struct, i.e. every second item in 'sections'
+    for i in range(len(sections)):
+        if not (i & 1):
+            continue
+
+        struct = sectionsi
+
+        # If the struct isn't packed, we need not bother.
+        # The practical use of this: in some structs we have booleans in the
+        # form of
+        #     integer flag:1;
+        # and these don't add up to bytes, and cause errors. So let's skip all
+        # non-packed structs, then all of those are out of the picture.
+        if not 'packed' in struct-1:
+            continue
+
+        try:
+
+            # assume the 'struct foo {' is on the first line, the closing brace
+            # '} __attribute...;' on the last, and the rest are individual
+            # definitions split by ';'.
+            struct_body_lines = struct1:-1
+            struct_body_parts = section_struct_body(struct_body_lines)
+
+            new_struct_body_parts = 
+            for j in range(len(struct_body_parts)):
+                part = ''.join(struct_body_partsj)
+                if not (j & 1):
+                    new_struct_body_parts.append(part)
+                else:
+                    new_struct_body_parts.append(handle_struct_body(part))
+
+            new_struct = struct0, ''.join(new_struct_body_parts), struct-1
+            sectionsi = new_struct
+        except Exception as e:
+            raise Exception('ERROR in struct %r' % struct0)
+
+    # phew. result.
+    result = ''.join((''.join(s) for s in sections))
+
+    # see if osmocom/core/endian.h is needed and included.
+    if (not f.endswith('endian.h')
+        and 'OSMO_IS_LITTLE_ENDIAN' in result
+        and '#include <osmocom/core/endian.h>' not in result):
+        # add the include after the last 'osmocom/core' include
+        last_include_start = result.rfind('#include <osmocom/core/')
+        if last_include_start < 0:
+            last_include_start = result.rfind('#include <osmocom/')
+        if last_include_start < 0:
+            last_include_start = result.rfind('#include')
+
+        if last_include_start < 0:
+            raise Exception('do not know where to include osmocom/core/endian.h in %r' % f)
+
+        insert_at = result.find('\n', last_include_start)
+
+        result = result:insert_at + '\n#include <osmocom/core/endian.h>' + resultinsert_at:
+
+    with codecs.open(f, "w", "utf-8") as fd:
+        fd.write(result)
+
+def check_file(f):
+        try:
+            _check_file(f)
+        except Exception as e:
+            raise Exception('ERROR IN FILE %r' % f)
+
+args = sys.argv1:
+if not args:
+    args = '.'
+
+for f in args:
+    if os.path.isdir(f):
+        for parent_path, subdirs, files in os.walk(f, None, None):
+            for ff in files:
+                check_file(os.path.join(parent_path, ff))
+    else:
+        check_file(f)
+
+# vim: tabstop=4 shiftwidth=4 expandtab

libosmocore_1.9.0.tar.xz/contrib/talloc_count.sh Added

@@ -0,0 +1,53 @@
+#!/bin/sh
+#
+# Print a summary of how often each named object appears in a talloc report.
+#
+# usage:
+#    talloc_count.sh my_talloc_report.txt
+# or:
+#    osmo_interact_vty.py -p 4242 -c 'show talloc-context application full'  |  talloc_count.sh
+#
+# produces output like:
+#         1 struct foo
+#         1 struct log_info
+#         1 struct log_info_cat
+#        21 msgb
+#      1391 SCCP-SCOC(N)N
+#      1402 struct osmo_fsm_inst
+#    ...
+
+f="$1"
+
+tmpdir="$(mktemp -d)"
+trap "rm -rf \"$tmpdir\"" EXIT
+
+# without input file, read stdin
+if  "x$f" = "x" ; then
+	f="$tmpdir/input"
+	cat > $f
+fi
+
+mangled="$tmpdir/mangled"
+grep contains "$f" \
+	| sed 's/ \t*contains.*//' \
+	| sed 's/^ \t*//' \
+	| sed 's/ \t \t*/ /g' \
+	| grep -v '^$' \
+	| grep -v '^0-9\+$' \
+	| sed 's/0x0-9a-fA-F\+/N/g' \
+	| sed 's/\<0-9a-fA-F\+\>/N/g' \
+	| sed 's/0-9\+/N/g' \
+	| sort \
+	> "$mangled"
+
+count() {
+	name="$1"
+	nr="$(grep -Fx "$name" "$mangled" | wc -l)"
+	printf "%6d $name\\n" $nr
+}
+
+{
+	cat "$mangled" | uniq | while read type; do
+		count "$type"
+	done
+} | sort -h

libosmocore_1.8.0.tar.xz/debian/changelog -> libosmocore_1.9.0.tar.xz/debian/changelog Changed

@@ -1,3 +1,290 @@
+libosmocore (1.9.0) unstable; urgency=medium
+
+   Oliver Smith 
+  * gsm0808_dec_channel_type: add missing len check
+  * test_gsm0808_enc_dec_channel_type -> …_speech
+  * gsm0808_chan_indicator: add SPEECH_CTM_TEXT_TELEPHONY
+  * gsm0808_enc/dec_channel_type: support data
+  * Fix typo endianess -> endianness
+  * Run struct_endianness.py
+  * gsm0808_dec_channel_type: fix dec of ch_rate_type
+  * tests: add test_gsm0808_enc_dec_channel_type_sign
+  * gsm0808_enc/dec_channel_type: fix transparent flag
+  * libosmocore.map: add tall_{ctr/msgb}_ctx
+  * rsl: put values for Channel Mode into enums
+  * rsl: RSL_CMOD_CSD_T: make enum values consistent
+  * gsm0808: make CSD enum values consistent with RSL
+  * on_dso_load_select: run after on_dso_load_ctx
+  * debian: set compat level to 10
+  * debian: depend on liburing-dev for debian >= 11
+  * contrib/libosmocore.spec: centos7: disable uring
+  * debian: fix build on ubuntu 20.04 without liburing
+
+   Neels Hofmeyr 
+  * add contrib/talloc_count.sh
+  * add osmo_prim_operation_name()
+  * add gsm0808_amr_modes_from_cfg
+  * improve test output for gsm0808_sc_cfg_from_gsm48_mr_cfg()
+  * fix 'make vty-test' for --disable-gb
+  * fix 'make vty-test' for --disable-external-tests --enable-gb
+  * contrib/talloc_count.sh: improve hexadecimal masking
+  * error log: osmo_sock_init2_multiaddr() v4/v6 mix
+  * logging vty: probe 'print' and 'logging timestamp' cmds
+  * vty: show bug in implicit go_parent_node
+  * vty: fix vty->index for implicit go_parent_node
+  * vty: move struct vty_parent_node to private API
+  * gsm: add osmo_mobile_identity_decode_from_l3_buf()
+  * gsm_04_08_gprs: add IEI "GMM TMSI Based NRI Container"
+  * improve API for osmo_routing_area_id
+
+   Max 
+  * socket: propagate error in osmo_sock_unix_init() to the caller
+  * GSMTAP: fix typo
+  * GSMTAP: add gsmtap_source_init*2()
+  * GSMTAP: add missing parameter docstrings
+  * logging: print talloc report on exit from vty test
+
+   Philipp Maier 
+  * i460_mux.c fix apidoc
+  * i460_mux: make osmo_i460_subchan_count public
+  * gsmtap_util: remove whitespace at the end of line
+  * i460_mux: add define constant for maximum number of subchannels
+  * codec: add define constants for RFC5993 and TS101318
+  * gprs_bssgp_rim: also print NSEI when sending RIM messages
+  * gprs_bssgp_rim: allow sending of encoded RIM messages
+  * gprs_bssgp_rim: add decoder for RIM ROUTING ADDRESS
+
+   Vadim Yanitskiy 
+  * gsm: fix invalid check in gsm48_decode_ssversion()
+  * gsm: add missing features to osmo_bts_features_names
+  * gsm: ensure completeness of osmo_bts_features_{descs,names}
+  * gsm/{bsslap,bssmap_le}: zero-initialize structs using memset()
+  * msgb: use OSMO_ASSERT in msgb_alloc_headroom_c()
+  * gsm: use OSMO_ASSERT() in osmo_iuup_msgb_alloc_c()
+  * debian/control: make libosmocore-doc depend on libosmo{ctrl,gb}-doc
+  * debian/control: fix typo
+  * doxygen: also generate documentation for libosmo{sim,usb}
+  * contrib/struct_endianness.py: simplify file extension check
+  * doxygen: remove documentation for non-existent params
+  * doxygen: fix various typos in commands \param and \returns
+  * gsm0502: add burst length definitions from chapter 5.2
+  * coding: clean up Makefile.am
+  * utils/Makefile.am: remove duplicate libosmogsm.la
+  * utils/Makefile.am: do not overwrite AM_CFLAGS
+  * utils/osmo-stat-dummy/Makefile.am: drop empty variables
+  * gsmtap: add missing entries to gsmtap_type_names
+  * tests/v110: assert(user_data_chunk_bits) in test_ra1()
+  * isdn: fix identical operands in v110_adapt_IR8000_to_2400()
+  * gsm_04_08: document/clarify enum gsm48_chan_mode values
+  * gsm_04_08: add more enum gsm48_chan_mode speech values
+  * gsm_04_08: add more enum gsm48_chan_mode data values
+  * gsm0808: handle new enum gsm48_chan_mode speech/data values
+  * tests: make VTY tests depend on the respective binaries
+  * fixup (partial revert): "coding: clean up Makefile.am"
+  * core: remove unnecessary #include <osmocom/core/talloc.h>
+  * libosmocore.map: add missing symbols needed for osmo-qcdiag
+  * coding: fix doxygen doc for _xcch_encode_cB()
+  * copyright: fix typo: sysmocom s/s.m.f.c./s.f.m.c./ GmbH
+  * coding: use GSM_MACBLOCK_LEN gsm0503_tch_fr_decode()
+  * coding: gsm0503_tch_f96_deinterleave() not applicable to TCH/F2.4
+  * coding: declare gsm0503_tch_f96_deinterleave()
+  * coding: fix API doc: TCH/H needs 6 bursts, not 8
+  * coding: fix API doc: TCH/AFS vs TCH/AHS
+  * coding: use gsm0503_tch_hr_decode2() in coding_test
+  * gsm: fix convolutional code definition for TCH/F4.8
+  * coding: implement TCH/F9.6, TCH/FH4.8, TCH/H2.4, TCH/F14.4
+  * coding: implement dedicated codec API for FACCH/FH
+  * coding: test FACCH/FH bitstealing in test_csd()
+  * coding: fix _tch_csd_burst_map(): do not overwrite FACCH
+  * struct osmo_sub_auth_data: remove OSMO_DEPRECATED_OUTSIDE
+  * coding: fix a copy-paste bug in gsm0503_tch_afs_decode_dtx()
+  * gsm: add gsm0502_fn2ccch_block()
+  * gsm0502: cosmetic: use ARRAY_SIZE in gsm0502_fn2ccch_block()
+  * ipa: fix a typo in ipa_ccm_rcvmsg_base(): PING -> PONG
+  * core: fix pointer access in msgb_l1-4 macros
+  * coding: remove redundant memset()s in gsm0503_tch_fr{96,144}_encode()
+  * coding: implement encoding/decoding API for TCH/F2.4
+  * lapdm: cosmetic: simplify lapdm_phsap_up(), use OSMO_PRIM_HDR
+  * gsm_08_08: define GSM0808_SCT_EXT (separately)
+  * gsm48_ie: fix gsm48_encode_bearer_cap(): encode bcap->data.transp
+  * isdn: mux_timeslot_provide_bits(): remove unused 'count'
+  * .gitignore: add include/osmocom/core/socket_compat.h
+  * tests/{v110,gsm44021}: change naming: 'test_' -> '_test'
+  * gsm_12_21.h: add flags for NM_ATT_IPACC_SUPP_FEATURES
+  * gsm_12_21.h: fix typo: NM_IPAC_F_CHANT_P{C->D}CHF
+
+   Pau Espin Pedrol 
+  * gsm_04_60.h: Better describe origin of enum osmo_gprs_nmo
+  * Move libosmogsm TS 44.060 declarations under include/osmocom/gsm/
+  * libosmogb.pc.in: Fix missing dependency on libosmogsm
+  * gsm: gsm_gsmtime2fn(): constify param
+  * cosmetic: stats_tcp: Fix typo in comment
+  * logging: Unregister osmo_fd before closing fd
+  * select: Optimize osmo_fd_get_by_fd
+  * select.c: Clarify osmo_fd_(un)register() API expectations of registered fd
+  * select.c: Clarify osmo_fd_unregister() can only be called on registered osmo_fds
+  * configure.ac: Fix logic enabling osmo_fd fd checks
+  * configure.ac: Fix typo in enable flag description
+  * select.c: osmo_fd_unregister(): Avoid assert hit with old buggy users of the API
+  * tests/Makefile.am: Move system libs at the end of list
+  * tests/Makefile.am: Drop duplicated libosmogb.la in LDADD
+  * tests/Makefile.am: Move LDADD to right position
+  * logging.c: Sanitize calls to osmo_fd_unregister()
+  * Fix parsing of TLV_TYPE_SINGLE_TV
+  * gsm: Add missing TS 24.008 SM layer IEs
+  * gsm_04_08_gprs.h: Add missing GMM IEs for T3302 and T3346
+  * gsm_04_08_gprs.h: Add enum field for GMM 'P-TMSI type' IE
+  * gb: ns2: Rename parameter name in gprs_ns2_nsvc_by_sockaddr_bind()
+  * tlv: Show bug in decoded tlv_parsed for type TLV_TYPE_SINGLE_TV
+  * Fix 'Fix parsing of TLV_TYPE_SINGLE_TV'
+  * ns2: Count transmitted/dropped in each layer implementation
+  * cosmetic: codec/Makefile.am: list sources one file per line
+  * osmo_io: Make name optional, add _set_name() API
+  * socket: Cache errno before calling further functions
+  * gsm0502.h: Document spec number
+  * gsm: Add missing IE definition for GMM Receive N-PDU Number list
+  * exec: osmo_system_nowait2(): Improve logging and error checks
+  * sockaddr_str: Introduce macro OSMO_SOCKADDR_STR_FMT_ARGS_NOT_NULL
+  * cosmetic: lapdm: Fix typo in comment
+  * tlv: Introduce API msgb_tv32_push()
+  * lapdm: Track fn of primitives in struct lapdm_msg_ctx
+  * gsm: Introduce functions to convert between FN and RFN (Reduced FN)
+  * socket: Add osmo_sock_init flag to enable SCTP ASCONF features
+  * rsl: Introduce new osmocom extension IE RSL_IE_OSMO_ABS_FRAME_NUMBER
+  * lapdm: Append RSL_IE_OSMO_ABS_FRAME_NUMBER to RSLms msgs towards upper layers
+  * Revert "lapdm: Append RSL_IE_OSMO_ABS_FRAME_NUMBER to RSLms msgs towards upper layers"
+  * Revert "rsl: Introduce new osmocom extension IE RSL_IE_OSMO_ABS_FRAME_NUMBER"
+  * lapdm: Update public lapdm_msg_ctx upon CCCH data ind
+  * socket: Avoid aborting socket creation if setsockopt for ASCONF fails
+  * gsm_12_21.h: Introduce packed structs for NM_ATT_IPACC_RLC_CFG{,_2,_3} values
+  * gsm_12_21.h: Introduce packed structs for NM_ATT_IPACC_BSSGP_CFG values
+  * gsm_12_21.h: Introduce packed structs for NM_ATT_IPACC_NS_CFG values
+  * socket: Remove OSMO_SOCK_F_SCTP_ASCONF_SUPPORTED, add osmo_sock_init2_multiaddr2()
+  * socket: Support setsokopt SCTP_INITMSG in osmo_sock_init2_multiaddr2()
+
+   Matan Perelman 
+  * gsm0808_enc_channel_type: Add spare byte
+
+   Harald Welte 
+  * Implement the XOR-2G authentication algorithm
+  * New unit test for XOR-2G authentication
+  * Rename OSMO_AUTH_ALG_XOR to OSMO_AUTH_ALG_XOR_3G
+  * convolutional coding for CSD
+  * Interleaving for CSD
+  * libosmocore.map: Add two missing entries for gsmtap*2() API
+  * Makefile.am: Make libraries depend on .map files
+  * isdn: Add V.110 encoder/decoder
+  * gsm: TS 44.021 modified V.110 frame encoding/decoding support
+  * gsm_08_58: Document IPAC RTP CSD modes in at least a few words
+  * New osmo-gsmtap-logsend utility
+  * gsmtap.h: Define a packet type for encapsulation of GSM RLP frames
+  * rate_ctr: Add rate_ctr_add2() similar to rate_ctr_inc2()
+  * Add osmo_io with initial poll backend
+  * Add osmo_gsm48_si1ro_nch_pos_{encode,decode} functions
+  * cosmetic: Fix spec reference in RSL header file
+  * gsm_08_58.h: Add 'struct rsl_ie_nch_drx_info'
+  * libosmogsm: Support authentication with 256-bit K and/or OP/OPc
+  * libosmogsm: Add OSMO_ASSERT() to ensure correct algorithm
+  * libosmogsm: Ensure MILENAGE + XOR-3G K length is 128 bit
+  * osmo-auc-gen: Convert over to osmo_auth_gen_vec*2 API
+  * libosmogsm: Allow auth API caller to specify RES length
+  * libosmogsm: Factor out the C2 derivation function
+  * libosmogsm: Avoid executing MILENAGE crypto twice (for UMTS and GSM)
+  * libosmogsm: Add support for TUAK authentication algorithm
+  * gsmtap_source_free(): Don't crash if NULL is passed
+
+   Daniel Willmann 
+  * Add libosmocore.map
+  * Add osmo_sockaddr_size() to return the size of the variant used
+  * tests: Add initial osmo_io tests
+  * osmo_io: Avoid read of uninitialized variable
+  * gpsr_ns2_udp: Use osmo_io_fd instead of osmo_fd
+  * osmo_io: Improve handling and documentation of segmentation_cb
+  * osmo_io: Support detecting non-blocking connect()
+  * osmo_io: Consistency - put read/recv callback first in osmo_io_ops
+  * osmo_io: Don't make msg in write_cb const
+  * osmo_io: Remove osmo_iofd_read/write_enable/disable
+  * socket: Ensure fd is not negative in osmo_sock_get_name_buf()
+  * osmo_io: Return early on error in osmo_iofd_register()
+  * osmo_io: Use LOGPIO instead of LOGP
+  * osmo_io: Use bitfield for various boolean flags
+  * osmo_io: Make the test more deterministic between backends
+  * osmo_io: Fix write_enable handling in iofd_txqueue
+  * osmo_io: Remove missing functions from map file
+  * osmo_io: Add osmo_iofd_notify_connected()
+  * osmo_io: Document expectation that segmentation_cb() can modify msgb
+  * osmo_io: Add function to change the maximum length of the tx_queue
+  * cosmetic: Fix doc comment
+  * osmo_io(cosmetic): End in a dot for doxygen AUTO_BRIEF
+  * osmo_io: Fix length calculation in iofd_handle_segmentation()
+  * osmo_io: Ensure correct ownership of msgb when sending
+  * osmo_io: Use MSG_NOSIGNAL to avoid SIGPIPE on write
+  * osmo_io: Add iofd_handle_recv()
+  * osmo_io: Avoid potential double free when sending msgb
+  * osmo_io: Add io_uring backend
+  * ns2: Add VTY option to change the max write queue size for UDP
+  * osmo_io: Change parent of msghdr to iofd (instead of msg)
+  * osmo_io: Use local variable to reference msghdr->msg
+
+   Eric 
+  * fix _thread order
+  * logging: remove log_initialized(void)
+  * gsm48_rest_octets: fix wrong value
+
+   Mychaela N. Falconia 
+  * codec: add osmo_efr_check_sid() function
+  * codec: add SID classification functions per GSM 06.31 & 06.81
+  * codec: add SID preening functions for FR & EFR
+  * codec: add osmo_{fr,efr}_is_any_sid() inline functions
+  * codec: add osmo_gsm611_silence_frame datum
+  * codec cosmetic: move old FR ECU code to ecu_fr_old.c
+  * codec: replace GSM-FR ECU with new implementation
+  * coding: fix decoding of EFR triplicated bits
+  * gsm0503_tch_hr_decode(): look at all 8 stealing bits
+  * gsm0503_tch_hr_encode(): accept both TS101318 and RFC5993 payloads
+  * gsm0503_tch_hr_decode2(): new function, emits TS101318 format
+  * libosmocoding.map: export gsm0503_tch_hr_decode2()
+  * coding cosmetic: gsm0503_tch_{fr,hr}_encode(): remove extra spacing
+  * codec: new functions osmo_{fr,efr}_sid_reset()
+  * codec: new function osmo_hr_sid_reset()
+  * coding: gsm0503_tch_{fr,hr}_encode(): add ability to emit BFI
+  * ecu: add is_dtx_pause() method
+
+   arehbein 
+  * core: Check return value of osmo_fd_register()
+  * core: Add function to update osmo_io_ops field for osmo_io_fd
+  * core/osmo_io: Rename variables for readability
+  * core/osmo_io: Fix reception of partial packets
+  * gsm/ipa: Add segmentation callback
+  * Revert "gsm/ipa: Add segmentation callback"
+  * select: Prevent negative index lookup on osmo_fd_lookup.table
+
+   Andreas Eversberg 
+  * ASCI: Add 3GPP TS 44.068 and 44.069 protocol definitions
+  * ASCI: Add IE transcoding according to 3GPP TS 48.008
+  * Added generation of include/osmocom/core/socket_compat.h
+  * ASCI: Add message definition and encoding according to 3GPP TS 48.008
+  * Add support for sending Bter UI frames at lapdm.c
+  * Add support for receiving Bter UI frames at lapdm.c
+  * Add short L3 header to gsm_04_08.h
+  * Fix short L3 header of SI 10 at gsm_04_08.h
+  * ASCI: Add Notification/NCH message to gsm_04_08.h
+  * lapdm: Do not return an error when enqueuing a frame
+  * Add VGCS UPLINK GRANT message structure to gsm_04_08.h
+  * ASCI: Also display group/broadcast call message names
+  * Allow 'configure <cr>' at VTY to enter config mode
+  * ASCI: Add decoding of mobile identity in TALKER INDICATION
+  * ASCI: Add missing check for return value of gsm0808_enc_speech_codec_list2()
+  * ASCI: Add BCC call state definitions
+  * LAPDM: Use correct offset to short header on recevied frame
+  * ASCI: Add definition for TALKER INDICATION and UPLINK RELEASE
+
+   Sylvain Munaut 
+  * gsm: Fix comment for TCH/F4.8 code
+  * gsm: Improve the TCH/H2.4 coding routines
+
+ -- Pau Espin Pedrol <pespin@sysmocom.de>  Tue, 12 Sep 2023 13:15:52 +0200
+
 libosmocore (1.8.0) unstable; urgency=medium
 
    Vadim Yanitskiy

libosmocore_1.8.0.tar.xz/debian/compat -> libosmocore_1.9.0.tar.xz/debian/compat Changed

libosmocore_1.8.0.tar.xz/debian/control -> libosmocore_1.9.0.tar.xz/debian/control Changed

@@ -2,7 +2,8 @@
 Maintainer: Osmocom team <openbsc@lists.osmocom.org>
 Section: libs
 Priority: optional
-Build-Depends: debhelper (>= 9),
+# liburing-dev: don't try to install it on debian 10 and ubuntu 20.04
+Build-Depends: debhelper (>= 10),
                autotools-dev,
                autoconf,
                automake,
@@ -19,6 +20,7 @@
                libusb-1.0-0-dev,
                libmnl-dev,
                libsystemd-dev,
+               liburing-dev | base-files (<< 11) | ubuntu-keyring (<< 2021),
                python3:native
 Standards-Version: 3.9.8
 Vcs-Git: https://gitea.osmocom.org/osmocom/libosmocore
@@ -29,13 +31,13 @@
 Section: libs
 Architecture: any
 Multi-Arch: foreign
-Depends: osmocom-latest, libosmocodec0 (= ${binary:Version}),
+Depends: osmocom-latest, libosmocodec4 (= ${binary:Version}),
          libosmocoding0 (= ${binary:Version}),
-         libosmocore20 (= ${binary:Version}),
+         libosmocore21 (= ${binary:Version}),
          libosmogb14 (= ${binary:Version}),
-         libosmogsm18 (= ${binary:Version}),
+         libosmogsm20 (= ${binary:Version}),
          libosmoisdn0 (= ${binary:Version}),
-         libosmovty9 (= ${binary:Version}),
+         libosmovty13 (= ${binary:Version}),
          libosmoctrl0 (= ${binary:Version}),
          libosmosim2 (= ${binary:Version}),
          libosmousb0 (= ${binary:Version}),
@@ -47,7 +49,7 @@
  least) other programs that are developed in the sphere of Free Software / Open
  Source mobile communication.
 
-Package: libosmocodec0
+Package: libosmocodec4
 Section: libs
 Architecture: any
 Multi-Arch: same
@@ -73,7 +75,7 @@
 Architecture: all
 Section: doc
 Depends: osmocom-latest, ${misc:Depends},
-         libosmocodec0,
+         libosmocodec4,
          libjs-jquery
 Description: Documentation for the osmo codec library
  This is part of the libosmocore "meta"-library. The libosmocore library
@@ -116,7 +118,7 @@
  .
  This package contains the documentation for the libosmocoding library.
 
-Package: libosmocore20
+Package: libosmocore21
 Section: libs
 Architecture: any
 Multi-Arch: same
@@ -137,13 +139,17 @@
 Architecture: all
 Section: doc
 Depends: osmocom-latest, ${misc:Depends},
-         libosmocore20,
+         libosmocore21,
          libjs-jquery,
          libosmocodec-doc,
          libosmocoding-doc,
          libosmogsm-doc,
          libosmoisdn-doc,
-         libosmovty-doc
+         libosmovty-doc,
+         libosmoctrl-doc,
+         libosmogb-doc,
+         libosmosim-doc,
+         libosmousb-doc
 Description: Documentation for the Osmo Core library
  This is part of the libosmocore "meta"-library. The libosmocore library
  contains various utility functions that were originally developed as part of
@@ -185,7 +191,7 @@
  .
  This package contains the documentation for the libosmogb library.
 
-Package: libosmogsm18
+Package: libosmogsm20
 Section: libs
 Architecture: any
 Multi-Arch: same
@@ -209,7 +215,7 @@
 Architecture: all
 Section: doc
 Depends: osmocom-latest, ${misc:Depends},
-         libosmogsm18,
+         libosmogsm20,
          libjs-jquery
 Description: Documentation for the Osmo GSM utility library
  This is part of the libosmocore "meta"-library. The libosmocore library
@@ -251,9 +257,9 @@
  (at least) other programs that are developed in the sphere of Free Software /
  Open Source mobile communication.
  .
- This package contains the documentation for the libosmoisdnm library.
+ This package contains the documentation for the libosmoisdn library.
 
-Package: libosmovty9
+Package: libosmovty13
 Section: libs
 Architecture: any
 Multi-Arch: same
@@ -274,7 +280,7 @@
 Architecture: all
 Section: doc
 Depends: osmocom-latest, ${misc:Depends},
-         libosmovty9,
+         libosmovty13,
          libjs-jquery
 Description: Documentation for the Osmo VTY library
  This is part of the libosmocore "meta"-library. The libosmocore library
@@ -332,6 +338,21 @@
  .
  The libosmosim library in particular contains routines for SIM card access.
 
+Package: libosmosim-doc
+Architecture: all
+Section: doc
+Depends: osmocom-latest, ${misc:Depends},
+         libosmosim2,
+         libjs-jquery
+Description: Documentation for the Osmo SIM library
+ This is part of the libosmocore "meta"-library. The libosmocore library
+ contains various utility functions that were originally developed as part of
+ the OpenBSC project, but which are of a more generic nature and thus useful to
+ (at least) other programs that are developed in the sphere of Free Software /
+ Open Source mobile communication.
+ .
+ This package contains the documentation for the libosmosim library.
+
 Package: libosmousb0
 Section: libs
 Architecture: any
@@ -349,6 +370,21 @@
  The libosmosub library in particular contains routines for USB device access
  via libusb-1.0, integrated into the libosmocore select event loop.
 
+Package: libosmousb-doc
+Architecture: all
+Section: doc
+Depends: osmocom-latest, ${misc:Depends},
+         libosmousb0,
+         libjs-jquery
+Description: Documentation for the Osmo USB library
+ This is part of the libosmocore "meta"-library. The libosmocore library
+ contains various utility functions that were originally developed as part of
+ the OpenBSC project, but which are of a more generic nature and thus useful to
+ (at least) other programs that are developed in the sphere of Free Software /
+ Open Source mobile communication.
+ .
+ This package contains the documentation for the libosmousb library.
+
 Package: libosmocore-dev
 Architecture: any
 Multi-Arch: same

libosmocore_1.9.0.tar.xz/debian/libosmocodec4.install Changed

libosmocore_1.8.0.tar.xz/debian/libosmocore-utils.install -> libosmocore_1.9.0.tar.xz/debian/libosmocore-utils.install Changed

libosmocore_1.9.0.tar.xz/debian/libosmocore21.install Changed

libosmocore_1.9.0.tar.xz/debian/libosmogsm20.install Changed

libosmocore_1.9.0.tar.xz/debian/libosmosim-doc.doc-base Added

libosmocore_1.9.0.tar.xz/debian/libosmosim-doc.install Added

libosmocore_1.9.0.tar.xz/debian/libosmousb-doc.doc-base Added

libosmocore_1.9.0.tar.xz/debian/libosmousb-doc.install Added

libosmocore_1.9.0.tar.xz/debian/libosmovty13.install Changed

libosmocore_1.8.0.tar.xz/debian/rules -> libosmocore_1.9.0.tar.xz/debian/rules Changed

libosmocore_1.8.0.tar.xz/include/osmocom/codec/codec.h -> libosmocore_1.9.0.tar.xz/include/osmocom/codec/codec.h Changed

@@ -15,6 +15,10 @@
 /* TS 101318 Chapter 5.3: 244 bits + 4bit sig */
 #define GSM_EFR_BYTES	31
 
+/* Number of bytes of an GSM_HR RTP payload */
+#define GSM_HR_BYTES_RTP_RFC5993 (GSM_HR_BYTES + 1)
+#define GSM_HR_BYTES_RTP_TS101318 (GSM_HR_BYTES)
+
 extern const uint16_t gsm610_bitorder;	/* FR */
 extern const uint16_t gsm620_unvoiced_bitorder; /* HR unvoiced */
 extern const uint16_t gsm620_voiced_bitorder;   /* HR voiced */
@@ -29,6 +33,8 @@
 extern const uint16_t gsm690_5_15_bitorder;	/* AMR  5.15 kbits */
 extern const uint16_t gsm690_4_75_bitorder;	/* AMR  4.75 kbits */
 
+extern const uint8_t osmo_gsm611_silence_frameGSM_FR_BYTES;
+
 extern const struct value_string osmo_amr_type_names;
 
 enum osmo_amr_type {
@@ -81,8 +87,53 @@
 	}
 }
 
+/* SID ternary classification per GSM 06.31 & 06.81 section 6.1.1 */
+enum osmo_gsm631_sid_class {
+       OSMO_GSM631_SID_CLASS_SPEECH  = 0,
+       OSMO_GSM631_SID_CLASS_INVALID = 1,
+       OSMO_GSM631_SID_CLASS_VALID   = 2,
+};
+
 bool osmo_fr_check_sid(const uint8_t *rtp_payload, size_t payload_len);
 bool osmo_hr_check_sid(const uint8_t *rtp_payload, size_t payload_len);
+bool osmo_efr_check_sid(const uint8_t *rtp_payload, size_t payload_len);
+
+enum osmo_gsm631_sid_class osmo_fr_sid_classify(const uint8_t *rtp_payload);
+enum osmo_gsm631_sid_class osmo_efr_sid_classify(const uint8_t *rtp_payload);
+
+/*! Check if given FR codec frame is any kind of SID, valid or invalid
+ *  \paramin rtp_payload Buffer with RTP payload
+ *  \returns true if the frame is an "accepted SID frame" in GSM 06.31
+ *  definition, false otherwise.
+ */
+static inline bool osmo_fr_is_any_sid(const uint8_t *rtp_payload)
+{
+	enum osmo_gsm631_sid_class sidc;
+
+	sidc = osmo_fr_sid_classify(rtp_payload);
+	return sidc != OSMO_GSM631_SID_CLASS_SPEECH;
+}
+
+/*! Check if given EFR codec frame is any kind of SID, valid or invalid
+ *  \paramin rtp_payload Buffer with RTP payload
+ *  \returns true if the frame is an "accepted SID frame" in GSM 06.81
+ *  definition, false otherwise.
+ */
+static inline bool osmo_efr_is_any_sid(const uint8_t *rtp_payload)
+{
+	enum osmo_gsm631_sid_class sidc;
+
+	sidc = osmo_efr_sid_classify(rtp_payload);
+	return sidc != OSMO_GSM631_SID_CLASS_SPEECH;
+}
+
+bool osmo_fr_sid_preen(uint8_t *rtp_payload);
+bool osmo_efr_sid_preen(uint8_t *rtp_payload);
+
+void osmo_fr_sid_reset(uint8_t *rtp_payload);
+void osmo_hr_sid_reset(uint8_t *rtp_payload);
+void osmo_efr_sid_reset(uint8_t *rtp_payload);
+
 int osmo_amr_rtp_enc(uint8_t *payload, uint8_t cmr, enum osmo_amr_type ft,
 		     enum osmo_amr_quality bfi);
 int osmo_amr_rtp_dec(const uint8_t *payload, int payload_len, uint8_t *cmr,

libosmocore_1.8.0.tar.xz/include/osmocom/codec/ecu.h -> libosmocore_1.9.0.tar.xz/include/osmocom/codec/ecu.h Changed

libosmocore_1.8.0.tar.xz/include/osmocom/coding/gsm0503_coding.h -> libosmocore_1.9.0.tar.xz/include/osmocom/coding/gsm0503_coding.h Changed

@@ -50,6 +50,9 @@
 
 int gsm0503_tch_hr_encode(ubit_t *bursts, const uint8_t *tch_data, int len);
 int gsm0503_tch_hr_decode(uint8_t *tch_data, const sbit_t *bursts, int odd,
+	int *n_errors, int *n_bits_total)
+	OSMO_DEPRECATED("Use gsm0503_tch_hr_decode2() instead");
+int gsm0503_tch_hr_decode2(uint8_t *tch_data, const sbit_t *bursts, int odd,
 	int *n_errors, int *n_bits_total);
 
 int gsm0503_tch_afs_encode(ubit_t *bursts, const uint8_t *tch_data, int len,
@@ -86,4 +89,36 @@
 int gsm0503_sch_encode(ubit_t *burst, const uint8_t *sb_info);
 int gsm0503_sch_decode(uint8_t *sb_info, const sbit_t *burst);
 
+int gsm0503_tch_fr96_encode(ubit_t *bursts, const ubit_t *data);
+int gsm0503_tch_fr96_decode(ubit_t *data, const sbit_t *bursts,
+			    int *n_errors, int *n_bits_total);
+
+int gsm0503_tch_fr48_encode(ubit_t *bursts, const ubit_t *data);
+int gsm0503_tch_fr48_decode(ubit_t *data, const sbit_t *bursts,
+			    int *n_errors, int *n_bits_total);
+
+int gsm0503_tch_hr48_encode(ubit_t *bursts, const ubit_t *data);
+int gsm0503_tch_hr48_decode(ubit_t *data, const sbit_t *bursts,
+			    int *n_errors, int *n_bits_total);
+
+int gsm0503_tch_fr24_encode(ubit_t *bursts, const ubit_t *data);
+int gsm0503_tch_fr24_decode(ubit_t *data, const sbit_t *bursts,
+			    int *n_errors, int *n_bits_total);
+
+int gsm0503_tch_hr24_encode(ubit_t *bursts, const ubit_t *data);
+int gsm0503_tch_hr24_decode(ubit_t *data, const sbit_t *bursts,
+			    int *n_errors, int *n_bits_total);
+
+int gsm0503_tch_fr144_encode(ubit_t *bursts, const ubit_t *data);
+int gsm0503_tch_fr144_decode(ubit_t *data, const sbit_t *bursts,
+			     int *n_errors, int *n_bits_total);
+
+int gsm0503_tch_fr_facch_encode(ubit_t *bursts, const uint8_t *data);
+int gsm0503_tch_fr_facch_decode(uint8_t *data, const sbit_t *bursts,
+				int *n_errors, int *n_bits_total);
+
+int gsm0503_tch_hr_facch_encode(ubit_t *bursts, const uint8_t *data);
+int gsm0503_tch_hr_facch_decode(uint8_t *data, const sbit_t *bursts,
+				int *n_errors, int *n_bits_total);
+
 /*! @} */

libosmocore_1.8.0.tar.xz/include/osmocom/coding/gsm0503_interleaving.h -> libosmocore_1.9.0.tar.xz/include/osmocom/coding/gsm0503_interleaving.h Changed

libosmocore_1.8.0.tar.xz/include/osmocom/core/Makefile.am -> libosmocore_1.9.0.tar.xz/include/osmocom/core/Makefile.am Changed

libosmocore_1.8.0.tar.xz/include/osmocom/core/bitvec.h -> libosmocore_1.9.0.tar.xz/include/osmocom/core/bitvec.h Changed

libosmocore_1.8.0.tar.xz/include/osmocom/core/endian.h -> libosmocore_1.9.0.tar.xz/include/osmocom/core/endian.h Changed

libosmocore_1.8.0.tar.xz/include/osmocom/core/gsmtap.h -> libosmocore_1.9.0.tar.xz/include/osmocom/core/gsmtap.h Changed

libosmocore_1.8.0.tar.xz/include/osmocom/core/gsmtap_util.h -> libosmocore_1.9.0.tar.xz/include/osmocom/core/gsmtap_util.h Changed

libosmocore_1.8.0.tar.xz/include/osmocom/core/logging.h -> libosmocore_1.9.0.tar.xz/include/osmocom/core/logging.h Changed

libosmocore_1.8.0.tar.xz/include/osmocom/core/msgb.h -> libosmocore_1.9.0.tar.xz/include/osmocom/core/msgb.h Changed

@@ -127,13 +127,13 @@
 #endif
 
 /*! obtain L1 header of msgb */
-#define msgb_l1(m)	((void *)(m->l1h))
+#define msgb_l1(m)	((void *)((m)->l1h))
 /*! obtain L2 header of msgb */
-#define msgb_l2(m)	((void *)(m->l2h))
+#define msgb_l2(m)	((void *)((m)->l2h))
 /*! obtain L3 header of msgb */
-#define msgb_l3(m)	((void *)(m->l3h))
+#define msgb_l3(m)	((void *)((m)->l3h))
 /*! obtain L4 header of msgb */
-#define msgb_l4(m)	((void *)(m->l4h))
+#define msgb_l4(m)	((void *)((m)->l4h))
 /*! obtain SMS header of msgb */
 #define msgb_sms(m)	msgb_l4(m)
 
@@ -529,7 +529,7 @@
 static inline struct msgb *msgb_alloc_headroom_c(const void *ctx, uint16_t size, uint16_t headroom,
 						 const char *name)
 {
-	osmo_static_assert(size >= headroom, headroom_bigger);
+	OSMO_ASSERT(size >= headroom);
 
 	struct msgb *msg = msgb_alloc_c(ctx, size, name);
 	if (OSMO_LIKELY(msg))
@@ -551,7 +551,7 @@
 static inline struct msgb *msgb_alloc_headroom(uint16_t size, uint16_t headroom,
 						const char *name)
 {
-	osmo_static_assert(size >= headroom, headroom_bigger);
+	OSMO_ASSERT(size >= headroom);
 
 	struct msgb *msg = msgb_alloc(size, name);
 	if (OSMO_LIKELY(msg))

libosmocore_1.9.0.tar.xz/include/osmocom/core/osmo_io.h Added

@@ -0,0 +1,101 @@
+/*! \file osmo_io.h
+ *  io(_uring) abstraction osmo fd compatibility
+ */
+
+#pragma once
+
+#include <osmocom/core/linuxlist.h>
+#include <osmocom/core/logging.h>
+#include <osmocom/core/msgb.h>
+#include <osmocom/core/socket.h>
+#include <osmocom/core/utils.h>
+
+
+#define LOGPIO(iofd, level, fmt, args...) \
+	LOGP(DLIO, level, "iofd(%s)" fmt, iofd->name, ## args)
+
+struct osmo_io_fd;
+
+enum osmo_io_fd_mode {
+	/*! use read() / write() calls */
+	OSMO_IO_FD_MODE_READ_WRITE,
+	/*! use recvfrom() / sendto() calls */
+	OSMO_IO_FD_MODE_RECVFROM_SENDTO,
+	/*! emulate sctp_recvmsg() and sctp_sendmsg() */
+	OSMO_IO_FD_MODE_SCTP_RECVMSG_SENDMSG,
+};
+
+enum osmo_io_backend {
+	OSMO_IO_BACKEND_POLL,
+	OSMO_IO_BACKEND_IO_URING,
+};
+
+extern const struct value_string osmo_io_backend_names;
+static inline const char *osmo_io_backend_name(enum osmo_io_backend val)
+{ return get_value_string(osmo_io_backend_names, val); }
+
+struct osmo_io_ops {
+	union {
+		/* mode OSMO_IO_FD_MODE_READ_WRITE: */
+		struct {
+			/*! call-back function when something was read from fd */
+			void (*read_cb)(struct osmo_io_fd *iofd, int res, struct msgb *msg);
+			/*! call-back function when write has completed on fd */
+			void (*write_cb)(struct osmo_io_fd *iofd, int res,
+					 struct msgb *msg);
+			/*! call-back function to segment the data at message boundaries.
+			 *  Needs to return the size of the next message. If it returns
+			 *  -EAGAIN or a value larger than msgb_length() (message is incomplete)
+			 *  osmo_io will wait for more data to be read. Other negative values
+			 *  cause the msg to be discarded.
+			 *  If a full message was received (segmentation_cb() returns a value <= msgb_length())
+			 *  the msgb will be trimmed to size by osmo_io and forwarded to the read call-back. Any
+			 *  parsing done to the msgb by segmentation_cb() will be preserved for the read_cb()
+			 *  (e.g. setting lxh or msgb->cb). */
+			int (*segmentation_cb)(struct msgb *msg);
+		};
+
+		/* mode OSMO_IO_FD_MODE_RECVFROM_SENDTO: */
+		struct {
+			/*! call-back function emulating recvfrom */
+			void (*recvfrom_cb)(struct osmo_io_fd *iofd, int res,
+					    struct msgb *msg,
+					    const struct osmo_sockaddr *saddr);
+			/*! call-back function emulating sendto */
+			void (*sendto_cb)(struct osmo_io_fd *iofd, int res,
+					  struct msgb *msg,
+					  const struct osmo_sockaddr *daddr);
+		};
+	};
+};
+
+void osmo_io_init(void);
+
+struct osmo_io_fd *osmo_iofd_setup(const void *ctx, int fd, const char *name,
+		  enum osmo_io_fd_mode mode, const struct osmo_io_ops *ioops, void *data);
+int osmo_iofd_register(struct osmo_io_fd *iofd, int fd);
+int osmo_iofd_unregister(struct osmo_io_fd *iofd);
+unsigned int osmo_iofd_txqueue_len(struct osmo_io_fd *iofd);
+void osmo_iofd_txqueue_clear(struct osmo_io_fd *iofd);
+int osmo_iofd_close(struct osmo_io_fd *iofd);
+void osmo_iofd_free(struct osmo_io_fd *iofd);
+
+void osmo_iofd_notify_connected(struct osmo_io_fd *iofd);
+
+int osmo_iofd_write_msgb(struct osmo_io_fd *iofd, struct msgb *msg);
+int osmo_iofd_sendto_msgb(struct osmo_io_fd *iofd, struct msgb *msg, int sendto_flags,
+			  const struct osmo_sockaddr *dest);
+
+void osmo_iofd_set_alloc_info(struct osmo_io_fd *iofd, unsigned int size, unsigned int headroom);
+void osmo_iofd_set_txqueue_max_length(struct osmo_io_fd *iofd, unsigned int size);
+void *osmo_iofd_get_data(const struct osmo_io_fd *iofd);
+void osmo_iofd_set_data(struct osmo_io_fd *iofd, void *data);
+
+unsigned int osmo_iofd_get_priv_nr(const struct osmo_io_fd *iofd);
+void osmo_iofd_set_priv_nr(struct osmo_io_fd *iofd, unsigned int priv_nr);
+
+int osmo_iofd_get_fd(const struct osmo_io_fd *iofd);
+const char *osmo_iofd_get_name(const struct osmo_io_fd *iofd);
+void osmo_iofd_set_name(struct osmo_io_fd *iofd, const char *name);
+
+void osmo_iofd_set_ioops(struct osmo_io_fd *iofd, const struct osmo_io_ops *ioops);

libosmocore_1.8.0.tar.xz/include/osmocom/core/prim.h -> libosmocore_1.9.0.tar.xz/include/osmocom/core/prim.h Changed

libosmocore_1.8.0.tar.xz/include/osmocom/core/rate_ctr.h -> libosmocore_1.9.0.tar.xz/include/osmocom/core/rate_ctr.h Changed

libosmocore_1.8.0.tar.xz/include/osmocom/core/sockaddr_str.h -> libosmocore_1.9.0.tar.xz/include/osmocom/core/sockaddr_str.h Changed

libosmocore_1.8.0.tar.xz/include/osmocom/core/socket.h -> libosmocore_1.9.0.tar.xz/include/osmocom/core/socket.h Changed

@@ -14,6 +14,8 @@
 
 #include <arpa/inet.h>
 
+#include <osmocom/core/defs.h>
+
 /*! maximum length of a socket name ("r=1.2.3.4:123<->l=5.6.7.8:987") */
 #define OSMO_SOCK_NAME_MAXLEN (2 + INET6_ADDRSTRLEN + 1 + 5 + 3 + 2 + INET6_ADDRSTRLEN + 1 + 5 + 1)
 
@@ -33,6 +35,29 @@
 int osmo_sockaddr_is_local(struct sockaddr *addr, unsigned int addrlen);
 int osmo_sockaddr_is_any(const struct osmo_sockaddr *addr);
 
+/*! Return the size of the variant used in the address
+ *  NOTE: This does not return the size of the in{,6}_addr, but rather the size of the
+ *  surrounding sockaddr_in{,6}.
+ *  \paramin addr the osmo_sockaddr to get the size of
+ *  \return the size of the struct variant being used. If the value in sa_family is unsupported it will return
+ *  the size of struct osmo_sockaddr. Returns 0 if addr is NULL. This way it can simply be a wrapper for sendto()
+ *  which can be called with NULL/0 for dest_addr / addrlen (and then behaves like a send() call).
+ */
+static inline socklen_t osmo_sockaddr_size(const struct osmo_sockaddr *addr)
+{
+	if (!addr)
+		return 0;
+
+	switch (addr->u.sa.sa_family) {
+	case AF_INET:
+		return sizeof(struct sockaddr_in);
+	case AF_INET6:
+		return sizeof(struct sockaddr_in6);
+	default:
+		return sizeof(struct osmo_sockaddr);
+	}
+}
+
 unsigned int osmo_sockaddr_to_str_and_uint(char *addr, unsigned int addr_len, uint16_t *port,
 					   const struct sockaddr *sa);
 size_t osmo_sockaddr_in_to_str_and_uint(char *addr, unsigned int addr_len, uint16_t *port,
@@ -91,9 +116,44 @@
 		   const char *local_host, uint16_t local_port,
 		   const char *remote_host, uint16_t remote_port, unsigned int flags);
 
+struct osmo_sock_init2_multiaddr_pars {
+	union {
+		struct {
+			uint8_t version; /* set to 0 */
+			struct {
+				bool set;
+				bool abort_on_failure;
+				uint32_t value;
+			} sockopt_auth_supported;
+			struct {
+				bool set;
+				bool abort_on_failure;
+				uint32_t value;
+			} sockopt_asconf_supported;
+			struct {
+				bool set;
+				bool abort_on_failure;
+				bool num_ostreams_present;
+				bool max_instreams_present;
+				bool max_attempts_present;
+				bool max_init_timeo_present;
+				uint16_t num_ostreams_value;
+				uint16_t max_instreams_value;
+				uint16_t max_attempts_value;
+				uint16_t max_init_timeo_value;
+			} sockopt_initmsg;
+		} sctp;
+	};
+};
 int osmo_sock_init2_multiaddr(uint16_t family, uint16_t type, uint8_t proto,
 		   const char **local_hosts, size_t local_hosts_cnt, uint16_t local_port,
-		   const char **remote_hosts, size_t remote_hosts_cnt, uint16_t remote_port, unsigned int flags);
+		   const char **remote_hosts, size_t remote_hosts_cnt, uint16_t remote_port, unsigned int flags)
+		   OSMO_DEPRECATED_OUTSIDE("Use osmo_sock_init2_multiaddr2() instead");
+int osmo_sock_init2_multiaddr2(uint16_t family, uint16_t type, uint8_t proto,
+		   const char **local_hosts, size_t local_hosts_cnt, uint16_t local_port,
+		   const char **remote_hosts, size_t remote_hosts_cnt, uint16_t remote_port,
+		   unsigned int flags, struct osmo_sock_init2_multiaddr_pars *pars);
+
 
 int osmo_sock_init_osa(uint16_t type, uint8_t proto,
 		    const struct osmo_sockaddr *local,

libosmocore_1.9.0.tar.xz/include/osmocom/core/socket_compat.h.tpl Added

libosmocore_1.8.0.tar.xz/include/osmocom/core/strrb.h -> libosmocore_1.9.0.tar.xz/include/osmocom/core/strrb.h Changed

libosmocore_1.8.0.tar.xz/include/osmocom/crypt/auth.h -> libosmocore_1.9.0.tar.xz/include/osmocom/crypt/auth.h Changed

@@ -30,12 +30,41 @@
 	OSMO_AUTH_ALG_COMP128v1,
 	OSMO_AUTH_ALG_COMP128v2,
 	OSMO_AUTH_ALG_COMP128v3,
-	OSMO_AUTH_ALG_XOR,
+	OSMO_AUTH_ALG_XOR_3G,
 	OSMO_AUTH_ALG_MILENAGE,
+	OSMO_AUTH_ALG_XOR_2G,
+	OSMO_AUTH_ALG_TUAK,
 	_OSMO_AUTH_ALG_NUM,
 };
+/* Backwards-compatibility. We used to call XOR-3G just "XOR" which became ambiguous when
+ * we started to add XOR-2G support. */
+#define OSMO_AUTH_ALG_XOR OSMO_AUTH_ALG_XOR_3G
 
 /*! permanent (secret) subscriber auth data */
+struct osmo_sub_auth_data2 {
+	enum osmo_sub_auth_type type;
+	enum osmo_auth_algo algo;
+	union {
+		struct {
+			/* See 3GPP TS 33.102 Section 9.3.7 Length of authentication parameters */
+			uint8_t opc32; /*!< operator invariant value */
+			uint8_t opc_len; /*!< OPc length (in bytes): 16 or 32 */
+			uint8_t k32;	/*!< secret key of the subscriber */
+			uint8_t k_len;	/*!< K length (in bytes): 16 or 32 */
+			uint8_t amf2;
+			uint64_t sqn;	/*!< sequence number (in: prev sqn; out: used sqn) */
+			int opc_is_op;	/*!< is the OPC field OPC (0) or OP (1) ? */
+			unsigned int ind_bitlen; /*!< nr of bits not in SEQ, only SQN */
+			unsigned int ind; /*!< which IND slot to use an SQN from */
+			uint64_t sqn_ms; /*!< sqn from AUTS (output value only) */
+		} umts;
+		struct {
+			uint8_t kiOSMO_A5_MAX_KEY_LEN_BYTES;	/*!< secret key */
+		} gsm;
+	} u;
+};
+
+/* deprecated older structure without support for 32-byte K/OPc */
 struct osmo_sub_auth_data {
 	enum osmo_sub_auth_type type;
 	enum osmo_auth_algo algo;
@@ -63,7 +92,7 @@
 	uint8_t ckOSMO_A5_MAX_KEY_LEN_BYTES;		/*!< ciphering key */
 	uint8_t ikOSMO_A5_MAX_KEY_LEN_BYTES;		/*!< integrity key */
 	uint8_t res16;	/*!< authentication result */
-	uint8_t res_len;	/*!< length (in bytes) of res */
+	uint8_t res_len;	/*!< length (in bytes) of res: 4..16 bytes */
 	uint8_t kc8;		/*!< Kc for GSM encryption (A5) */
 	uint8_t sres4;	/*!< authentication result for GSM */
 	uint32_t auth_types;	/*!< bitmask of OSMO_AUTH_TYPE_* */
@@ -78,22 +107,32 @@
 
 	/*! callback for generate authentication vectors */
 	int (*gen_vec)(struct osmo_auth_vector *vec,
-			struct osmo_sub_auth_data *aud,
+			struct osmo_sub_auth_data2 *aud,
 			const uint8_t *_rand);
 
-	/* callback for generationg auth vectors + re-sync */
+	/*! callback for generating auth vectors + re-sync */
 	int (*gen_vec_auts)(struct osmo_auth_vector *vec,
-			    struct osmo_sub_auth_data *aud,
+			    struct osmo_sub_auth_data2 *aud,
 			    const uint8_t *auts, const uint8_t *rand_auts,
 			    const uint8_t *_rand);
 };
 
 int osmo_auth_gen_vec(struct osmo_auth_vector *vec,
-		      struct osmo_sub_auth_data *aud, const uint8_t *_rand);
+		      struct osmo_sub_auth_data *aud, const uint8_t *_rand)
+	OSMO_DEPRECATED_OUTSIDE("Use osmo_auth_gen_vec2 instead");
+
+int osmo_auth_gen_vec2(struct osmo_auth_vector *vec,
+		       struct osmo_sub_auth_data2 *aud, const uint8_t *_rand);
 
 int osmo_auth_gen_vec_auts(struct osmo_auth_vector *vec,
 			   struct osmo_sub_auth_data *aud,
 			   const uint8_t *auts, const uint8_t *rand_auts,
+			   const uint8_t *_rand)
+	OSMO_DEPRECATED_OUTSIDE("Use osmo_auth_gen_vec_auts2 instead");
+
+int osmo_auth_gen_vec_auts2(struct osmo_auth_vector *vec,
+			   struct osmo_sub_auth_data2 *aud,
+			   const uint8_t *auts, const uint8_t *rand_auts,
 			   const uint8_t *_rand);
 
 int osmo_auth_register(struct osmo_auth_impl *impl);
@@ -106,5 +145,6 @@
 enum osmo_auth_algo osmo_auth_alg_parse(const char *name);
 
 void osmo_auth_c3(uint8_t kc, const uint8_t ck, const uint8_t ik);
+void osmo_auth_c2(uint8_t sres4, const uint8_t *res, size_t res_len, uint8_t sres_deriv_func);
 
 /* @} */

libosmocore_1.8.0.tar.xz/include/osmocom/ctrl/control_cmd.h -> libosmocore_1.9.0.tar.xz/include/osmocom/ctrl/control_cmd.h Changed

libosmocore_1.8.0.tar.xz/include/osmocom/gprs/gprs_bssgp_rim.h -> libosmocore_1.9.0.tar.xz/include/osmocom/gprs/gprs_bssgp_rim.h Changed

libosmocore_1.8.0.tar.xz/include/osmocom/gprs/gprs_ns2.h -> libosmocore_1.9.0.tar.xz/include/osmocom/gprs/gprs_ns2.h Changed

libosmocore_1.8.0.tar.xz/include/osmocom/gprs/gprs_rlc.h -> libosmocore_1.9.0.tar.xz/include/osmocom/gprs/gprs_rlc.h Changed

@@ -1,54 +1,4 @@
-/*! \file gprs_rlc.h */
-
 #pragma once
 
-#include <stdint.h>
-
-/*! Structure for CPS coding and puncturing scheme (TS 04.60 10.4.8a) */
-struct egprs_cps {
-	uint8_t bits;
-	uint8_t mcs;
-	uint8_t p2;
-};
-
-/*! CPS puncturing table selection (TS 04.60 10.4.8a) */
-enum egprs_cps_punc {
-	EGPRS_CPS_P1,
-	EGPRS_CPS_P2,
-	EGPRS_CPS_P3,
-	EGPRS_CPS_NONE = -1,
-};
-
-/*! EGPRS header types (TS 04.60 10.0a.2) */
-enum egprs_hdr_type {
-        EGPRS_HDR_TYPE1,
-        EGPRS_HDR_TYPE2,
-        EGPRS_HDR_TYPE3,
-};
-
-enum osmo_gprs_cs {
-	OSMO_GPRS_CS_NONE,
-	OSMO_GPRS_CS1,
-	OSMO_GPRS_CS2,
-	OSMO_GPRS_CS3,
-	OSMO_GPRS_CS4,
-	OSMO_GPRS_MCS1,
-	OSMO_GPRS_MCS2,
-	OSMO_GPRS_MCS3,
-	OSMO_GPRS_MCS4,
-	OSMO_GPRS_MCS5,
-	OSMO_GPRS_MCS6,
-	OSMO_GPRS_MCS7,
-	OSMO_GPRS_MCS8,
-	OSMO_GPRS_MCS9,
-	_NUM_OSMO_GPRS_CS
-};
-
-int egprs_get_cps(struct egprs_cps *cps, uint8_t type, uint8_t bits);
-
-int osmo_gprs_ul_block_size_bits(enum osmo_gprs_cs cs);
-int osmo_gprs_dl_block_size_bits(enum osmo_gprs_cs cs);
-int osmo_gprs_ul_block_size_bytes(enum osmo_gprs_cs cs);
-int osmo_gprs_dl_block_size_bytes(enum osmo_gprs_cs cs);
-enum osmo_gprs_cs osmo_gprs_ul_cs_by_block_bytes(uint8_t block_size);
-enum osmo_gprs_cs osmo_gprs_dl_cs_by_block_bytes(uint8_t block_size);
+#pragma message "Header osmocom/gprs/gprs_rlc.h is deprecated, include osmocom/gsm/protocol/gsm_44_060.h instead"
+#include <osmocom/gsm/protocol/gsm_44_060.h>

libosmocore_1.8.0.tar.xz/include/osmocom/gprs/protocol/gsm_04_60.h -> libosmocore_1.9.0.tar.xz/include/osmocom/gprs/protocol/gsm_04_60.h Changed

@@ -1,201 +1,4 @@
-/*! \file gsm_04_60.h
- * General Packet Radio Service (GPRS).
- * Radio Link Control / Medium Access Control (RLC/MAC) protocol
- * 3GPP TS 04.60 version 8.27.0 Release 1999
- */
-
 #pragma once
 
-#include <stdint.h>
-#include <osmocom/core/endian.h>
-
-/* TS 04.60  10.3a.4.1.1 */
-struct gprs_rlc_ul_header_egprs_1 {
-#if OSMO_IS_LITTLE_ENDIAN
-	uint8_t r:1,
-		 si:1,
-		 cv:4,
-		 tfi_hi:2;
-	uint8_t tfi_lo:3,
-		 bsn1_hi:5;
-	uint8_t bsn1_lo:6,
-		 bsn2_hi:2;
-	uint8_t bsn2_lo:8;
-	uint8_t cps:5,
-		 rsb:1,
-		 pi:1,
-		 spare_hi:1;
-	uint8_t spare_lo:6,
-		 dummy:2;
-#elif OSMO_IS_BIG_ENDIAN
-/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */
-	uint8_t tfi_hi:2, cv:4, si:1, r:1;
-	uint8_t bsn1_hi:5, tfi_lo:3;
-	uint8_t bsn2_hi:2, bsn1_lo:6;
-	uint8_t bsn2_lo:8;
-	uint8_t spare_hi:1, pi:1, rsb:1, cps:5;
-	uint8_t dummy:2, spare_lo:6;
-#endif
-} __attribute__ ((packed));
-
-/* TS 04.60  10.3a.4.2.1 */
-struct gprs_rlc_ul_header_egprs_2 {
-#if OSMO_IS_LITTLE_ENDIAN
-	uint8_t r:1,
-		 si:1,
-		 cv:4,
-		 tfi_hi:2;
-	uint8_t tfi_lo:3,
-		 bsn1_hi:5;
-	uint8_t bsn1_lo:6,
-		 cps_hi:2;
-	uint8_t cps_lo:1,
-		 rsb:1,
-		 pi:1,
-		 spare_hi:5;
-	uint8_t spare_lo:5,
-		 dummy:3;
-#elif OSMO_IS_BIG_ENDIAN
-/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */
-	uint8_t tfi_hi:2, cv:4, si:1, r:1;
-	uint8_t bsn1_hi:5, tfi_lo:3;
-	uint8_t cps_hi:2, bsn1_lo:6;
-	uint8_t spare_hi:5, pi:1, rsb:1, cps_lo:1;
-	uint8_t dummy:3, spare_lo:5;
-#endif
-} __attribute__ ((packed));
-
-/* TS 04.60  10.3a.4.3.1 */
-struct gprs_rlc_ul_header_egprs_3 {
-#if OSMO_IS_LITTLE_ENDIAN
-	uint8_t r:1,
-		 si:1,
-		 cv:4,
-		 tfi_hi:2;
-	uint8_t tfi_lo:3,
-		 bsn1_hi:5;
-	uint8_t bsn1_lo:6,
-		 cps_hi:2;
-	uint8_t cps_lo:2,
-		 spb:2,
-		 rsb:1,
-		 pi:1,
-		 spare:1,
-		 dummy:1;
-#elif OSMO_IS_BIG_ENDIAN
-/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */
-	uint8_t tfi_hi:2, cv:4, si:1, r:1;
-	uint8_t bsn1_hi:5, tfi_lo:3;
-	uint8_t cps_hi:2, bsn1_lo:6;
-	uint8_t dummy:1, spare:1, pi:1, rsb:1, spb:2, cps_lo:2;
-#endif
-} __attribute__ ((packed));
-
-struct gprs_rlc_dl_header_egprs_1 {
-#if OSMO_IS_LITTLE_ENDIAN
-	uint8_t usf:3,
-		 es_p:2,
-		 rrbp:2,
-		 tfi_hi:1;
-	uint8_t tfi_lo:4,
-		 pr:2,
-		 bsn1_hi:2;
-	uint8_t bsn1_mid:8;
-	uint8_t bsn1_lo:1,
-		 bsn2_hi:7;
-	uint8_t bsn2_lo:3,
-		 cps:5;
-#elif OSMO_IS_BIG_ENDIAN
-/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */
-	uint8_t tfi_hi:1, rrbp:2, es_p:2, usf:3;
-	uint8_t bsn1_hi:2, pr:2, tfi_lo:4;
-	uint8_t bsn1_mid:8;
-	uint8_t bsn2_hi:7, bsn1_lo:1;
-	uint8_t cps:5, bsn2_lo:3;
-#endif
-} __attribute__ ((packed));
-
-struct gprs_rlc_dl_header_egprs_2 {
-#if OSMO_IS_LITTLE_ENDIAN
-	uint8_t usf:3,
-		 es_p:2,
-		 rrbp:2,
-		 tfi_hi:1;
-	uint8_t tfi_lo:4,
-		 pr:2,
-		 bsn1_hi:2;
-	uint8_t bsn1_mid:8;
-	uint8_t bsn1_lo:1,
-		 cps:3,
-		 dummy:4;
-#elif OSMO_IS_BIG_ENDIAN
-/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */
-	uint8_t tfi_hi:1, rrbp:2, es_p:2, usf:3;
-	uint8_t bsn1_hi:2, pr:2, tfi_lo:4;
-	uint8_t bsn1_mid:8;
-	uint8_t dummy:4, cps:3, bsn1_lo:1;
-#endif
-} __attribute__ ((packed));
-
-struct gprs_rlc_dl_header_egprs_3 {
-#if OSMO_IS_LITTLE_ENDIAN
-	uint8_t usf:3,
-		 es_p:2,
-		 rrbp:2,
-		 tfi_hi:1;
-	uint8_t tfi_lo:4,
-		 pr:2,
-		 bsn1_hi:2;
-	uint8_t bsn1_mid:8;
-	uint8_t bsn1_lo:1,
-		 cps:4,
-		 spb:2,
-		 dummy:1;
-#elif OSMO_IS_BIG_ENDIAN
-/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */
-	uint8_t tfi_hi:1, rrbp:2, es_p:2, usf:3;
-	uint8_t bsn1_hi:2, pr:2, tfi_lo:4;
-	uint8_t bsn1_mid:8;
-	uint8_t dummy:1, spb:2, cps:4, bsn1_lo:1;
-#endif
-} __attribute__ ((packed));
-
-/* TS 03.60 Chapter 6.3.3.1: Network Mode of Operation */
-enum osmo_gprs_nmo {
-	GPRS_NMO_I	= 0,	/* CS pagin on GPRS paging or traffic channel */
-	GPRS_NMO_II	= 1,	/* all paging on CCCH */
-	GPRS_NMO_III	= 2,	/* no paging coordination */
-};
-
-/* TS 44.060 12.24 */
-struct osmo_gprs_cell_options {
-	enum osmo_gprs_nmo nmo;
-	/* T3168: wait for packet uplink assignment message */
-	uint32_t t3168;	/* in milliseconds */
-	/* T3192: wait for release of the TBF after reception of the final block */
-	uint32_t t3192;	/* in milliseconds */
-	uint32_t drx_timer_max;/* in seconds */
-	uint32_t bs_cv_max;
-	uint8_t  supports_egprs_11bit_rach;
-	bool ctrl_ack_type_use_block; /* use PACKET CONTROL ACKNOWLEDGMENT */
-
-	uint8_t ext_info_present;
-	struct {
-		uint8_t egprs_supported;
-		uint8_t use_egprs_p_ch_req;
-		uint8_t bep_period;
-		uint8_t pfc_supported;
-		uint8_t dtm_supported;
-		uint8_t bss_paging_coordination;
-		bool ccn_active;
-	} ext_info;
-};
-
-/* TS 04.60 Table 12.9.2 */
-struct osmo_gprs_power_ctrl_pars {
-	uint8_t alpha;
-	uint8_t t_avg_w;
-	uint8_t t_avg_t;
-	uint8_t pc_meas_chan;
-	uint8_t n_avg_i;
-};
+#pragma message "Header osmocom/gprs/protocol/gsm_04_60.h is deprecated, include osmocom/gsm/protocol/gsm_44_060.h instead"
+#include <osmocom/gsm/protocol/gsm_44_060.h>

libosmocore_1.8.0.tar.xz/include/osmocom/gprs/protocol/gsm_08_18.h -> libosmocore_1.9.0.tar.xz/include/osmocom/gprs/protocol/gsm_08_18.h Changed

libosmocore_1.8.0.tar.xz/include/osmocom/gsm/Makefile.am -> libosmocore_1.9.0.tar.xz/include/osmocom/gsm/Makefile.am Changed

libosmocore_1.8.0.tar.xz/include/osmocom/gsm/bts_features.h -> libosmocore_1.9.0.tar.xz/include/osmocom/gsm/bts_features.h Changed

libosmocore_1.8.0.tar.xz/include/osmocom/gsm/cbsp.h -> libosmocore_1.9.0.tar.xz/include/osmocom/gsm/cbsp.h Changed

libosmocore_1.8.0.tar.xz/include/osmocom/gsm/gsm0502.h -> libosmocore_1.9.0.tar.xz/include/osmocom/gsm/gsm0502.h Changed

@@ -1,4 +1,7 @@
-/*! \file gsm0502.h */
+/*! \defgroup gsm0502 GSM 05.02 / 3GPP TS 45.002
+ *  @{
+ * \file gsm0502.h
+ */
 
 #pragma once
 
@@ -31,6 +34,36 @@
 #define GSM_TDMA_FN_DEC(fn) \
 	((fn) = GSM_TDMA_FN_SUB((fn), 1))
 
+/* 5.2.3.1 Normal burst for GMSK (1 bit per symbol) */
+#define GSM_NBITS_NB_GMSK_TAIL		3
+#define GSM_NBITS_NB_GMSK_PAYLOAD	(2 * 58)
+#define GSM_NBITS_NB_GMSK_TRAIN_SEQ	26
+#define GSM_NBITS_NB_GMSK_BURST		148  /* without guard period */
+
+/* 5.2.3.3 Normal burst for 8-PSK (3 bits per symbol) */
+#define GSM_NBITS_NB_8PSK_TAIL		(GSM_NBITS_NB_GMSK_TAIL * 3)
+#define GSM_NBITS_NB_8PSK_PAYLOAD	(GSM_NBITS_NB_GMSK_PAYLOAD * 3)
+#define GSM_NBITS_NB_8PSK_TRAIN_SEQ	(GSM_NBITS_NB_GMSK_TRAIN_SEQ * 3)
+#define GSM_NBITS_NB_8PSK_BURST		(GSM_NBITS_NB_GMSK_BURST * 3)
+
+/* 5.2.5 Synchronization burst (also GMSK) */
+#define GSM_NBITS_SB_GMSK_TAIL		GSM_NBITS_NB_GMSK_TAIL
+#define GSM_NBITS_SB_GMSK_PAYLOAD	(2 * 39)
+#define GSM_NBITS_SB_GMSK_ETRAIN_SEQ	64
+#define GSM_NBITS_SB_GMSK_BURST		GSM_NBITS_NB_GMSK_BURST
+
+/* 5.2.6 Dummy burst (also GMSK) */
+#define GSM_NBITS_DB_GMSK_TAIL		GSM_NBITS_NB_GMSK_TAIL
+#define GSM_NBITS_DB_GMSK_MIXED		142
+#define GSM_NBITS_DB_GMSK_BURST		GSM_NBITS_NB_GMSK_BURST
+
+/* 5.2.7 Access burst (also GMSK) */
+#define GSM_NBITS_AB_GMSK_ETAIL		8
+#define GSM_NBITS_AB_GMSK_SYNCH_SEQ	41
+#define GSM_NBITS_AB_GMSK_PAYLOAD	36
+#define GSM_NBITS_AB_GMSK_TAIL		GSM_NBITS_NB_GMSK_TAIL
+#define GSM_NBITS_AB_GMSK_BURST		GSM_NBITS_NB_GMSK_BURST
+
 /* Table 5 Clause 7 TS 05.02 */
 static inline unsigned int
 gsm0502_get_n_pag_blocks(const struct gsm48_control_channel_descr *chan_desc)
@@ -75,3 +108,7 @@
 uint16_t gsm0502_hop_seq_gen(const struct gsm_time *t,
 			     uint8_t hsn, uint8_t maio,
 			     size_t n, const uint16_t *ma);
+
+int gsm0502_fn2ccch_block(uint32_t fn);
+
+/*! @} */

libosmocore_1.8.0.tar.xz/include/osmocom/gsm/gsm0808.h -> libosmocore_1.9.0.tar.xz/include/osmocom/gsm/gsm0808.h Changed

@@ -26,11 +26,11 @@
 #include <osmocom/gsm/protocol/gsm_23_003.h>
 #include <osmocom/core/utils.h>
 
+#include <osmocom/core/socket_compat.h>
+
 #define BSSMAP_MSG_SIZE 1024
 #define BSSMAP_MSG_HEADROOM 512
 
-struct sockaddr_storage;
-
 struct msgb;
 struct gsm0808_cell_id_list2;
 
@@ -332,6 +332,243 @@
 };
 struct msgb *gsm0808_create_handover_performed(const struct gsm0808_handover_performed *params);
 
+/*! 3GPP TS 48.008 §3.2.1.50 VGCS/VBS SETUP */
+struct gsm0808_vgcs_vbs_setup {
+	struct gsm0808_group_callref callref;
+
+	bool priority_present;
+	struct gsm0808_priority priority;
+
+	bool vgcs_feature_flags_present;
+	struct gsm0808_vgcs_feature_flags flags;
+};
+struct msgb *gsm0808_create_vgcs_vbs_setup(const struct gsm0808_vgcs_vbs_setup *params);
+
+/*! 3GPP TS 48.008 §3.2.1.51 VGCS/VBS SETUP ACK */
+struct gsm0808_vgcs_vbs_setup_ack {
+	bool vgcs_feature_flags_present;
+	struct gsm0808_vgcs_feature_flags flags;
+};
+struct msgb *gsm0808_create_vgcs_vbs_setup_ack(const struct gsm0808_vgcs_vbs_setup_ack *params);
+
+/*! 3GPP TS 48.008 §3.2.1.52 VGCS/VBS SETUP REFUSE */
+struct msgb *gsm0808_create_vgcs_vbs_setup_refuse(enum gsm0808_cause cause);
+
+/*! 3GPP TS 48.008 §3.2.1.53 VGCS/VBS ASSIGNMENT REQUEST */
+struct gsm0808_vgcs_vbs_assign_req {
+	struct gsm0808_channel_type channel_type;
+	enum gsm0808_assignment_requirement ass_req;
+	struct gsm0808_cell_id cell_identifier;
+	struct gsm0808_group_callref callref;
+
+	bool priority_present;
+	struct gsm0808_priority priority;
+
+	bool cic_present;
+	uint16_t cic;
+
+	bool downlink_dtx_flag_present;
+	enum gsm0808_downlink_dtx_flag downlink_dtx_flag;
+
+	bool encryption_information_present;
+	struct gsm0808_encrypt_info encryption_information;
+
+	bool vstk_rand_present;
+	uint8_t vstk_rand5;
+
+	bool vstk_present;
+	uint8_t vstk16;
+
+	bool cils_present;
+	struct gsm0808_cell_id_list_segment cils;
+
+	bool aoip_transport_layer_present;
+	struct sockaddr_storage aoip_transport_layer;
+
+	bool call_id_present;
+	uint32_t call_id;
+
+	bool codec_list_present;
+	struct gsm0808_speech_codec_list codec_list_msc_preferred;
+};
+struct msgb *gsm0808_create_vgcs_vbs_assign_req(const struct gsm0808_vgcs_vbs_assign_req *params);
+
+/*! 3GPP TS 48.008 §3.2.1.54 VGCS/VBS ASSIGNMENT RESULT */
+struct gsm0808_vgcs_vbs_assign_res {
+	struct gsm0808_channel_type channel_type;
+	struct gsm0808_cell_id cell_identifier;
+
+	bool chosen_channel_present;
+	uint8_t chosen_channel;
+
+	bool cic_present;
+	uint16_t cic;
+
+	bool circuit_pool_present;
+	uint8_t circuit_pool;
+
+	bool aoip_transport_layer_present;
+	struct sockaddr_storage aoip_transport_layer;
+
+	bool codec_present;
+	struct gsm0808_speech_codec codec_msc_chosen;
+
+	bool call_id_present;
+	uint32_t call_id;
+};
+struct msgb *gsm0808_create_vgcs_vbs_assign_res(const struct gsm0808_vgcs_vbs_assign_res *params);
+
+/*! 3GPP TS 48.008 §3.2.1.55 VGCS/VBS ASSIGNMENT FAILURE */
+struct gsm0808_vgcs_vbs_assign_fail {
+	enum gsm0808_cause cause;
+
+	bool circuit_pool_present;
+	uint8_t circuit_pool;
+
+	bool cpl_present;
+	struct gsm0808_circuit_pool_list cpl;
+
+	bool codec_list_present;
+	struct gsm0808_speech_codec_list codec_list_bss_supported;
+};
+struct msgb *gsm0808_create_vgcs_vbs_assign_fail(const struct gsm0808_vgcs_vbs_assign_fail *params);
+
+/*! 3GPP TS 48.008 §3.2.1.57 (VGCS) UPLINK REQUEST */
+struct gsm0808_uplink_request {
+	bool talker_priority_present;
+	enum gsm0808_talker_priority talker_priority;
+
+	bool cell_identifier_present;
+	struct gsm0808_cell_id cell_identifier;
+
+	bool l3_present;
+	struct gsm0808_layer_3_information l3;
+
+	bool mi_present;
+	struct osmo_mobile_identity mi;
+};
+struct msgb *gsm0808_create_uplink_request(const struct gsm0808_uplink_request *params);
+
+/*! 3GPP TS 48.008 §3.2.1.58 (VGCS) UPLINK REQUEST ACKNOWLEDGE */
+struct gsm0808_uplink_request_ack {
+	bool talker_priority_present;
+	enum gsm0808_talker_priority talker_priority;
+
+	bool emerg_set_ind_present;
+
+	bool talker_identity_present;
+	struct gsm0808_talker_identity talker_identity;
+};
+struct msgb *gsm0808_create_uplink_request_ack(const struct gsm0808_uplink_request_ack *params);
+
+/*! 3GPP TS 48.008 §3.2.1.59 (VGCS) UPLINK REQUEST CONFIRM */
+struct gsm0808_uplink_request_cnf {
+	struct gsm0808_cell_id cell_identifier;
+
+	bool talker_identity_present;
+	struct gsm0808_talker_identity talker_identity;
+
+	/* mandatory! */
+	struct gsm0808_layer_3_information l3;
+};
+struct msgb *gsm0808_create_uplink_request_cnf(const struct gsm0808_uplink_request_cnf *params);
+
+/*! 3GPP TS 48.008 §3.2.1.59a (VGCS) UPLINK APPLICATION DATA */
+struct gsm0808_uplink_app_data {
+	struct gsm0808_cell_id cell_identifier;
+	struct gsm0808_layer_3_information l3;
+	bool bt_ind;
+};
+struct msgb *gsm0808_create_uplink_app_data(const struct gsm0808_uplink_app_data *params);
+
+/*! 3GPP TS 48.008 §3.2.1.60 (VGCS) UPLINK RELEASE INDICATION */
+struct gsm0808_uplink_release_ind {
+	enum gsm0808_cause cause;
+
+	bool talker_priority_present;
+	enum gsm0808_talker_priority talker_priority;
+};
+struct msgb *gsm0808_create_uplink_release_ind(const struct gsm0808_uplink_release_ind *params);
+
+/*! 3GPP TS 48.008 §3.2.1.61 (VGCS) UPLINK REJECT COMMAND */
+struct gsm0808_uplink_reject_cmd {
+	enum gsm0808_cause cause;
+
+	bool current_talker_priority_present;
+	enum gsm0808_talker_priority current_talker_priority;
+	bool rejected_talker_priority_present;
+	enum gsm0808_talker_priority rejected_talker_priority;
+
+	bool talker_identity_present;
+	struct gsm0808_talker_identity talker_identity;
+};
+struct msgb *gsm0808_create_uplink_reject_cmd(const struct gsm0808_uplink_reject_cmd *params);
+
+/*! 3GPP TS 48.008 §3.2.1.62 (VGCS) UPLINK RELEASE COMMAND */
+struct msgb *gsm0808_create_uplink_release_cmd(const enum gsm0808_cause cause);
+
+/*! 3GPP TS 48.008 §3.2.1.63 (VGCS) UPLINK SEIZED COMMAND */
+struct gsm0808_uplink_seized_cmd {
+	enum gsm0808_cause cause;
+
+	bool talker_priority_present;
+	enum gsm0808_talker_priority talker_priority;
+
+	bool emerg_set_ind_present;
+
+	bool talker_identity_present;
+	struct gsm0808_talker_identity talker_identity;
+};
+struct msgb *gsm0808_create_uplink_seized_cmd(const struct gsm0808_uplink_seized_cmd *params);
+
+/*! 3GPP TS 48.008 §3.2.1.78 VGCS ADDITIONAL INFORMATION */
+struct msgb *gsm0808_create_vgcs_additional_info(const struct gsm0808_talker_identity *ti);
+
+/*! 3GPP TS 48.008 §3.2.1.79 VGCS/VBS AREA CELL INFO */
+struct gsm0808_vgcs_vbs_area_cell_info {
+	struct gsm0808_cell_id_list_segment cils;
+
+	bool ass_req_present;
+	enum gsm0808_assignment_requirement ass_req;
+};
+struct msgb *gsm0808_create_vgcs_vbs_area_cell_info(const struct gsm0808_vgcs_vbs_area_cell_info *params);
+
+/*! 3GPP TS 48.008 §3.2.1.80 VGCS/VBS ASSIGNMENT STATUS */
+struct gsm0808_vgcs_vbs_assign_stat {
+	/* established cells */
+	bool cils_est_present;
+	struct gsm0808_cell_id_list_segment cils_est;
+
+	/* cells to be established */
+	bool cils_tbe_present;
+	struct gsm0808_cell_id_list_segment cils_tbe;
+
+	/* released cells - no user present */
+	bool cils_rel_present;
+	struct gsm0808_cell_id_list_segment cils_rel;
+
+	/* not established cells - no establishment possible */
+	bool cils_ne_present;
+	struct gsm0808_cell_id_list_segment cils_ne;
+
+	bool cell_status_present;
+	enum gsm0808_vgcs_vbs_cell_status cell_status;
+};
+struct msgb *gsm0808_create_vgcs_vbs_assign_stat(const struct gsm0808_vgcs_vbs_assign_stat *params);
+
+/*! 3GPP TS 48.008 §3.2.1.81 VGCS SMS */
+struct msgb *gsm0808_create_vgcs_sms(const struct gsm0808_sms_to_vgcs *sms);
+
+/*! 3GPP TS 48.008 §3.2.1.82 (VGCS/VBS) NOTIFICATION DATA */
+struct gsm0808_notification_data {
+	struct gsm0808_application_data app_data;
+	struct gsm0808_data_identity data_ident;
+
+	bool msisdn_present;
+	char msisdnMSISDN_MAXLEN + 1;
+};
+struct msgb *gsm0808_create_notification_data(const struct gsm0808_notification_data *parms);
+
 struct msgb *gsm0808_create_dtap(struct msgb *msg, uint8_t link_id);
 void gsm0808_prepend_dtap_header(struct msgb *msg, uint8_t link_id);

libosmocore_1.8.0.tar.xz/include/osmocom/gsm/gsm0808_utils.h -> libosmocore_1.9.0.tar.xz/include/osmocom/gsm/gsm0808_utils.h Changed

@@ -31,6 +31,8 @@
 #include <osmocom/gsm/gsm23003.h>
 #include <osmocom/gsm/gsm_utils.h>
 #include <osmocom/gsm/tlv.h>
+#include <osmocom/gsm/gsm48.h>
+#include <osmocom/core/endian.h>
 
  /*! (225-1)/2 is the maximum number of elements in a cell identifier list. */
 #define GSM0808_CELL_ID_LIST2_MAXLEN		127
@@ -62,6 +64,164 @@
 	unsigned int id_list_len;
 };
 
+/*! Packed representation of a Priority IE (GGPP TS 48.008 3.2.2.18) */
+struct gsm0808_priority {
+#if OSMO_IS_LITTLE_ENDIAN
+	uint8_t pvi:1,			/* Preemption Vulnerability indicator */
+		qa:1,			/* Queuing allowed indicator */
+		priority_level:4,	/* Priority level: 1 == hightest, 14 == lowest */
+		pci:1,			/* Preemption Capability indicator */
+		spare:1;
+#elif OSMO_IS_BIG_ENDIAN
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
+	uint8_t spare:1, pci:1, priority_level:4, qa:1, pvi:1;
+#endif
+} __attribute__ ((packed));
+
+/*! Packed representation of a VGCS Feature Flags IE (3GPP TS 48.008 3.2.2.88) */
+struct gsm0808_vgcs_feature_flags {
+#if OSMO_IS_LITTLE_ENDIAN
+	uint8_t tp_ind:1,		/* Talker priority supported */
+		as_ind_circuit:1,	/* A-interface circuit sharing supported */
+		as_ind_link:1,		/* A-interface link sharing supported */
+		bss_res:1,		/* BSS supports re-establishment */
+		tcp:1,			/* Talker channel parameter supported */
+		spare:3;
+#elif OSMO_IS_BIG_ENDIAN
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
+	uint8_t spare:3, tcp:1, bss_res:1, as_ind_link:1, as_ind_circuit:1, tp_ind:1;
+#endif
+} __attribute__ ((packed));
+
+/* TS 48.008 3.2.2.52 */
+enum gsm0808_assignment_requirement {
+	GSM0808_ASRQ_DELAY_ALLOWED		= 0x00,
+	GSM0808_ASRQ_IMMEDIATE			= 0x01,
+	GSM0808_ASRQ_IMMEDIATE_ON_DEMAND	= 0x02,
+};
+
+/* TS 48.008 Table 10.5.8 */
+enum gsm0808_service_flag {
+	GSM0808_SF_VBS				= 0,
+	GSM0808_SF_VGCS				= 1,
+};
+
+enum gsm0808_call_priority {
+	GSM0808_CALL_PRIORITY_NONE		= 0x00,
+	GSM0808_CALL_PRIORITY_LEVEL_4		= 0x01,
+	GSM0808_CALL_PRIORITY_LEVEL_3		= 0x02,
+	GSM0808_CALL_PRIORITY_LEVEL_2		= 0x03,
+	GSM0808_CALL_PRIORITY_LEVEL_1		= 0x04,
+	GSM0808_CALL_PRIORITY_LEVEL_0		= 0x05,
+	GSM0808_CALL_PRIORITY_LEVEL_B		= 0x06,
+	GSM0808_CALL_PRIORITY_LEVEL_A		= 0x07,
+};
+
+/*! Packed representation of a Group Call Reference IE (3GPP TS 48.008 3.2.2.55) */
+struct gsm0808_group_callref {
+#if OSMO_IS_LITTLE_ENDIAN
+	uint8_t call_ref_hi3;
+	uint8_t call_priority:3,
+		af:1,			/* Acknowledgement flag */
+		sf:1,			/* Service flag */
+		call_ref_lo:3;
+	uint8_t spare:4,
+		ciphering_info:4;
+#elif OSMO_IS_BIG_ENDIAN
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
+	uint8_t call_ref_hi3;
+	uint8_t call_ref_lo:3, sf:1, af:1, call_priority:3;
+	uint8_t ciphering_info:4, spare:4;
+#endif
+} __attribute__ ((packed));
+
+/* TS 48.008 3.2.2.26 */
+enum gsm0808_downlink_dtx_flag {
+	GSM0808_DTX_FLAG_ALLOW			= 0,
+	GSM0808_DTX_FLAG_FORBID			= 1,
+};
+
+/*! Parsed representation of a Cell Identifier List Segment IE (3GPP TS 48.008 3.2.2.27a) */
+struct gsm0808_cell_id_list_segment {
+	uint8_t seq_last;
+	uint8_t seq_number;
+	struct gsm0808_cell_id_list2 cil;
+};
+
+/*! Parsed representation of a Circuit Pool List IE (3GPP TS 48.008 3.2.2.26) */
+#define CIRCUIT_POOL_LIST_MAXLEN 252
+struct gsm0808_circuit_pool_list {
+	uint8_t poolCIRCUIT_POOL_LIST_MAXLEN;
+	unsigned int list_len;
+};
+
+/* 3GPP TS 48.008 Table  3.2.2.90.1 Talker Priority */
+enum gsm0808_talker_priority {
+	GSM0808_TALKER_PRIORITY_NORMAL		= 0x00,
+	GSM0808_TALKER_PRIORITY_PRIVILEGED	= 0x01,
+	GSM0808_TALKER_PRIORITY_EMERGENCY	= 0x02,
+};
+
+/*! Parsed representation of a Layer 3 Information IE (3GPP TS 48.008 3.2.2.24) */
+#define LAYER_3_INFORMATION_MAXLEN 252
+struct gsm0808_layer_3_information {
+	uint8_t l3LAYER_3_INFORMATION_MAXLEN;
+	unsigned int l3_len;
+};
+
+/*! Parsed representation of a Talker Identity IE (3GPP TS 48.008 3.2.2.91) */
+#define TALKER_IDENTITY_MAXLEN 17
+struct gsm0808_talker_identity {
+	uint8_t talker_idTALKER_IDENTITY_MAXLEN;
+	unsigned int id_bits;
+};
+
+/* 3GPP TS 48.008 3.2.2.94 VGCS/VBS Cell Status */
+enum gsm0808_vgcs_vbs_cell_status {
+	GSM0808_CSTAT_ESTABLISHED		= 0x00,
+	GSM0808_CSTAT_NOT_ESTABLISHED1		= 0x01,
+	GSM0808_CSTAT_RELEASED_NO_USER		= 0x02,
+	GSM0808_CSTAT_NOT_ESTABLISHED2		= 0x03,
+};
+
+/*! Parsed representation of a SMS to VGCS IE (3GPP TS 48.008 3.2.2.92) */
+#define SMS_TO_VGCS_MAXLEN 252
+struct gsm0808_sms_to_vgcs {
+	uint8_t smsSMS_TO_VGCS_MAXLEN;
+	unsigned int sms_len;
+};
+
+/*! Parsed representation of a Application Data IE (3GPP TS 48.008 3.2.2.98) */
+#define APP_DATA_MAXLEN 9
+struct gsm0808_application_data {
+	uint8_t dataAPP_DATA_MAXLEN;
+	unsigned int data_len;
+};
+
+/*! Packed representation of a Data Identity IE (GGPP TS 48.008 3.2.2.99) */
+enum gsm0808_application_idndicator {
+	GSM0808_AI_APP_DATA			= 0x00,
+	GSM0808_AI_CONFIRM_APP_DATA		= 0x01,
+};
+
+#define GSM0808_DP_MASK_TALKERS_LISTENERS	0x04
+#define GSM0808_DP_MASK_DISPATCHERS		0x02
+#define GSM0808_DP_MASK_NETWORK_APP		0x01
+
+struct gsm0808_data_identity {
+#if OSMO_IS_LITTLE_ENDIAN
+	uint8_t ai:1,	/* Application Indicator */
+		di:4,	/* Data identifier */
+		dp:3;	/* Distribution parameter (bit mask) */
+#elif OSMO_IS_BIG_ENDIAN
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
+	uint8_t dp:3, di:4, ai:1;
+#endif
+} __attribute__ ((packed));
+
+/*! Parsed representation of a MSISDN IE (3GPP TS 48.008 3.2.2.101) */
+#define MSISDN_MAXLEN 20
+
 /*! LCLS-related parameters from 3GPP TS 48.008 */
 struct osmo_lcls {
 	enum gsm0808_lcls_config config;   /**< §3.2.2.116 Configuration */
@@ -188,37 +348,34 @@
 static inline enum gsm0808_permitted_speech gsm0808_permitted_speech(enum gsm_chan_t type,
 								     enum gsm48_chan_mode mode)
 {
-	switch (mode) {
-	case GSM48_CMODE_SPEECH_V1:
-		switch (type) {
-		case GSM_LCHAN_TCH_F:
-			return GSM0808_PERM_FR1;
-		case GSM_LCHAN_TCH_H:
-			return GSM0808_PERM_HR1;
-		default:
-			return 0;
-		}
-	case GSM48_CMODE_SPEECH_EFR:
-		switch (type) {
-		case GSM_LCHAN_TCH_F:
-			return GSM0808_PERM_FR2;
-		case GSM_LCHAN_TCH_H:
-			return GSM0808_PERM_HR2;
-		default:
-			return 0;
-		}
-	case GSM48_CMODE_SPEECH_AMR:
-		switch (type) {
-		case GSM_LCHAN_TCH_F:
-			return GSM0808_PERM_FR3;
-		case GSM_LCHAN_TCH_H:
-			return GSM0808_PERM_HR3;
-		default:
-			return 0;
-		}
+#define MODE_TYPE(mode, type) ((mode << 16) | type)
+
+	switch (MODE_TYPE(mode, type)) {
+	case MODE_TYPE(GSM48_CMODE_SPEECH_V1, GSM_LCHAN_TCH_F):
+		return GSM0808_PERM_FR1;
+	case MODE_TYPE(GSM48_CMODE_SPEECH_V1, GSM_LCHAN_TCH_H):
+		return GSM0808_PERM_HR1;
+	case MODE_TYPE(GSM48_CMODE_SPEECH_EFR, GSM_LCHAN_TCH_F):
+		return GSM0808_PERM_FR2;
+	case MODE_TYPE(GSM48_CMODE_SPEECH_EFR, GSM_LCHAN_TCH_H):
+		return GSM0808_PERM_HR2; /* (deprecated) */
+	case MODE_TYPE(GSM48_CMODE_SPEECH_AMR, GSM_LCHAN_TCH_F):
+		return GSM0808_PERM_FR3;
+	case MODE_TYPE(GSM48_CMODE_SPEECH_AMR, GSM_LCHAN_TCH_H):
+		return GSM0808_PERM_HR3;
+	case MODE_TYPE(GSM48_CMODE_SPEECH_V4, GSM_LCHAN_TCH_F):
+		return GSM0808_PERM_FR4;
+	case MODE_TYPE(GSM48_CMODE_SPEECH_V4, GSM_LCHAN_TCH_H):
+		return GSM0808_PERM_HR4;
+	case MODE_TYPE(GSM48_CMODE_SPEECH_V5, GSM_LCHAN_TCH_F):
+		return GSM0808_PERM_FR5; /* FR only */
+	case MODE_TYPE(GSM48_CMODE_SPEECH_V6, GSM_LCHAN_TCH_H):
+		return GSM0808_PERM_HR6; /* HR only */
 	default:
 		return 0;
 	}
+
+#undef MODE_TYPE
 }
 
 /*! Return 3GPP TS 48.008 3.2.2.33 Chosen Channel. */
@@ -230,6 +387,9 @@
 	case GSM48_CMODE_SPEECH_V1:
 	case GSM48_CMODE_SPEECH_EFR:
 	case GSM48_CMODE_SPEECH_AMR:
+	case GSM48_CMODE_SPEECH_V4:
+	case GSM48_CMODE_SPEECH_V5:
+	case GSM48_CMODE_SPEECH_V6:
 		channel_mode = 0x9;
 		break;
 	case GSM48_CMODE_SIGN:
@@ -247,6 +407,33 @@
 	case GSM48_CMODE_DATA_3k6:
 		channel_mode = 0xd;
 		break;
+	case GSM48_CMODE_DATA_29k0:
+		channel_mode = 0x1;
+		break;
+	case GSM48_CMODE_DATA_32k0:
+		channel_mode = 0x2;
+		break;
+	case GSM48_CMODE_DATA_43k5:
+		channel_mode = 0x3;
+		break;
+	case GSM48_CMODE_DATA_43k5_14k5:
+		channel_mode = 0x4;
+		break;
+	case GSM48_CMODE_DATA_29k0_14k5:
+		channel_mode = 0x5;
+		break;
+	case GSM48_CMODE_DATA_43k5_29k0:
+		channel_mode = 0x6;
+		break;
+	case GSM48_CMODE_DATA_14k5_43k5:
+		channel_mode = 0x7;
+		break;
+	case GSM48_CMODE_DATA_14k5_29k0:
+		channel_mode = 0xa;
+		break;
+	case GSM48_CMODE_DATA_29k0_43k5:
+		channel_mode = 0xf;
+		break;
 	default:
 		return 0;
 	}
@@ -264,6 +451,7 @@
 	case GSM_LCHAN_TCH_H:
 		channel = 0x9;
 		break;
+	/* TODO: more than 1 TCHs? */
 	default:
 		return 0;
 	}
@@ -275,4 +463,23 @@
 char *gsm0808_channel_type_name_buf(char *buf, size_t buf_len, const struct gsm0808_channel_type *ct);
 char *gsm0808_channel_type_name_c(const void *ctx, const struct gsm0808_channel_type *ct);
 
+uint8_t gsm0808_enc_group_callref(struct msgb *msg, const struct gsm0808_group_callref *gc);
+int gsm0808_dec_group_callref(struct gsm0808_group_callref *gc, const uint8_t *elem, uint8_t len);
+uint8_t gsm0808_enc_priority(struct msgb *msg, const struct gsm0808_priority *pri);
+int gsm0808_dec_priority(struct gsm0808_priority *pri, const uint8_t *elem, uint8_t len);
+uint8_t gsm0808_enc_vgcs_feature_flags(struct msgb *msg, const struct gsm0808_vgcs_feature_flags *ff);
+int gsm0808_dec_vgcs_feature_flags(struct gsm0808_vgcs_feature_flags *ff, const uint8_t *elem, uint8_t len);
+uint8_t gsm0808_enc_talker_identity(struct msgb *msg, const struct gsm0808_talker_identity *ti);
+int gsm0808_dec_talker_identity(struct gsm0808_talker_identity *ti, const uint8_t *elem, uint8_t len);
+uint8_t gsm0808_enc_data_identity(struct msgb *msg, const struct gsm0808_data_identity *ai);
+int gsm0808_dec_data_identity(struct gsm0808_data_identity *ai, const uint8_t *elem, uint8_t len);
+uint8_t gsm0808_enc_msisdn(struct msgb *msg, const char *msisdn);
+int gsm0808_dec_msisdn(char *msisdn, const char *elem, uint8_t len);
+uint8_t gsm0808_enc_assign_req(struct msgb *msg, const enum gsm0808_assignment_requirement ar);
+int gsm0808_dec_assign_req(enum gsm0808_assignment_requirement *ar, const uint8_t *elem, uint8_t len);
+uint8_t gsm0808_enc_cell_id_list_segment(struct msgb *msg, uint8_t ie_type,
+					 const struct gsm0808_cell_id_list_segment *ci);
+int gsm0808_dec_cell_id_list_segment(struct gsm0808_cell_id_list_segment *ci, const uint8_t *elem, uint8_t len);
+int gsm0808_dec_call_id(uint32_t *ci, const uint8_t *elem, uint8_t len);
+
 /*! @} */

libosmocore_1.9.0.tar.xz/include/osmocom/gsm/gsm44021.h Added

libosmocore_1.8.0.tar.xz/include/osmocom/gsm/gsm48.h -> libosmocore_1.9.0.tar.xz/include/osmocom/gsm/gsm48.h Changed

@@ -20,7 +20,9 @@
  * To mark an invalid / unset MNC, this value shall be used. */
 #define GSM_MCC_MNC_INVALID 0xFFFF
 
-/* A parsed GPRS routing area */
+/* A parsed GPRS routing area.
+ * Preferably use struct osmo_routing_area_id, it is better integrated with API like osmo_plmn_cmp().
+ */
 struct gprs_ra_id {
 	uint16_t	mcc;
 	uint16_t	mnc;
@@ -96,12 +98,17 @@
 int osmo_mobile_identity_cmp(const struct osmo_mobile_identity *a, const struct osmo_mobile_identity *b);
 int osmo_mobile_identity_decode(struct osmo_mobile_identity *mi, const uint8_t *mi_data, uint8_t mi_len,
 				bool allow_hex);
+int osmo_mobile_identity_decode_from_l3_buf(struct osmo_mobile_identity *mi, const uint8_t *l3_data, size_t l3_len,
+					    bool allow_hex);
 int osmo_mobile_identity_decode_from_l3(struct osmo_mobile_identity *mi, struct msgb *msg, bool allow_hex);
 int osmo_mobile_identity_encoded_len(const struct osmo_mobile_identity *mi, int *mi_digits);
 int osmo_mobile_identity_encode_buf(uint8_t *buf, size_t buflen, const struct osmo_mobile_identity *mi, bool allow_hex);
 int osmo_mobile_identity_encode_msgb(struct msgb *msg, const struct osmo_mobile_identity *mi, bool allow_hex);
 
 /* Parse Routeing Area Identifier */
+int osmo_routing_area_id_decode(struct osmo_routing_area_id *dst, const uint8_t *ra_data, size_t ra_data_len);
+int osmo_routing_area_id_encode_buf(uint8_t *buf, size_t buflen, const struct osmo_routing_area_id *src);
+int osmo_routing_area_id_encode_msgb(struct msgb *msg, const struct osmo_routing_area_id *src);
 void gsm48_parse_ra(struct gprs_ra_id *raid, const uint8_t *buf);
 void gsm48_encode_ra(struct gsm48_ra_id *out, const struct gprs_ra_id *raid);
 int gsm48_construct_ra(uint8_t *buf, const struct gprs_ra_id *raid) OSMO_DEPRECATED("Use gsm48_encode_ra() instead");

libosmocore_1.8.0.tar.xz/include/osmocom/gsm/gsm48_rest_octets.h -> libosmocore_1.9.0.tar.xz/include/osmocom/gsm/gsm48_rest_octets.h Changed

libosmocore_1.8.0.tar.xz/include/osmocom/gsm/gsm_utils.h -> libosmocore_1.9.0.tar.xz/include/osmocom/gsm/gsm_utils.h Changed

libosmocore_1.8.0.tar.xz/include/osmocom/gsm/lapdm.h -> libosmocore_1.9.0.tar.xz/include/osmocom/gsm/lapdm.h Changed

libosmocore_1.8.0.tar.xz/include/osmocom/gsm/protocol/Makefile.am -> libosmocore_1.9.0.tar.xz/include/osmocom/gsm/protocol/Makefile.am Changed

libosmocore_1.8.0.tar.xz/include/osmocom/gsm/protocol/gsm_03_41.h -> libosmocore_1.9.0.tar.xz/include/osmocom/gsm/protocol/gsm_03_41.h Changed

@@ -25,7 +25,7 @@
 		uint8_t update:4;
 		uint8_t code_lo:4;
 #elif OSMO_IS_BIG_ENDIAN
-/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
 		uint8_t gs:2, code_hi:6;
 		uint8_t code_lo:4, update:4;
 #endif
@@ -36,7 +36,7 @@
 		uint8_t language:4;
 		uint8_t group:4;
 #elif OSMO_IS_BIG_ENDIAN
-/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
 		uint8_t group:4, language:4;
 #endif
 	} dcs;
@@ -45,7 +45,7 @@
 		uint8_t total:4;
 		uint8_t current:4;
 #elif OSMO_IS_BIG_ENDIAN
-/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
 		uint8_t current:4, total:4;
 #endif
 	} page;
@@ -63,7 +63,7 @@
 		uint8_t update:4;
 		uint8_t code_lo:4;
 #elif OSMO_IS_BIG_ENDIAN
-/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
 		uint8_t gs:2, alert:1, popup:1, code_hi:4;
 		uint8_t code_lo:4, update:4;
 #endif

libosmocore_1.8.0.tar.xz/include/osmocom/gsm/protocol/gsm_04_08.h -> libosmocore_1.9.0.tar.xz/include/osmocom/gsm/protocol/gsm_04_08.h Changed

@@ -22,7 +22,7 @@
 		 rev_lev:2,
 		 spare:1;
 #elif OSMO_IS_BIG_ENDIAN
-/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
 	uint8_t spare:1, rev_lev:2, es_ind:1, a5_1:1, pwr_lev:3;
 #endif
 } __attribute__ ((packed));
@@ -51,7 +51,7 @@
 		 spare4:1,
 		 cm3:1;
 #elif OSMO_IS_BIG_ENDIAN
-/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
 	uint8_t spare:1, rev_lev:2, es_ind:1, a5_1:1, pwr_lev:3;
 	uint8_t	spare2:1, ps_cap:1, ss_scr:2, sm_cap:1, vbs:1, vgcs:1, fc:1;
 	uint8_t	cm3:1, spare4:1, lcsva_cap:1, spare3:1, solsa:1, cmsp:1, a5_3:1, a5_2:1;
@@ -280,7 +280,7 @@
 	uint8_t	w16:6,
 		 w15_lo:2;
 #elif OSMO_IS_BIG_ENDIAN
-/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
 	uint8_t	form_id:5, f0:1, w1_hi:2;
 	uint8_t	w1_lo;
 	uint8_t	w2_hi;
@@ -335,7 +335,7 @@
 	uint8_t	w17:5,
 		 w16_lo:3;
 #elif OSMO_IS_BIG_ENDIAN
-/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
 	uint8_t	form_id:7, orig_arfcn_hi:1;
 	uint8_t	orig_arfcn_mid;
 	uint8_t	orig_arfcn_lo:1, w1_hi:7;
@@ -396,7 +396,7 @@
 		 w21:4,
 		 w20_lo:3;
 #elif OSMO_IS_BIG_ENDIAN
-/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
 	uint8_t	form_id:7, orig_arfcn_hi:1;
 	uint8_t	orig_arfcn_mid;
 	uint8_t	orig_arfcn_lo:1, w1_hi:7;
@@ -459,7 +459,7 @@
 		 w27:3,
 		 w26_lo:1;
 #elif OSMO_IS_BIG_ENDIAN
-/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
 	uint8_t	form_id:7, orig_arfcn_hi:1;
 	uint8_t	orig_arfcn_mid;
 	uint8_t	orig_arfcn_lo:1, w1:7;
@@ -489,7 +489,7 @@
 		 orig_arfcn_lo:1;
 	uint8_t rrfcn8_11113;
 #elif OSMO_IS_BIG_ENDIAN
-/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
 	uint8_t	form_id:7, orig_arfcn_hi:1;
 	uint8_t	orig_arfcn_mid;
 	uint8_t	orig_arfcn_lo:1, rrfcn1_7:7;
@@ -509,7 +509,7 @@
 			uint8_t hsn:6,
 				 maio_low:2;
 #elif OSMO_IS_BIG_ENDIAN
-/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
 			uint8_t tsc:3, h:1, maio_high:4;
 			uint8_t maio_low:2, hsn:6;
 #endif
@@ -522,7 +522,7 @@
 				 tsc:3;
 			uint8_t arfcn_low;
 #elif OSMO_IS_BIG_ENDIAN
-/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
 			uint8_t tsc:3, h:1, spare:2, arfcn_high:2;
 			uint8_t arfcn_low;
 #endif
@@ -573,7 +573,7 @@
 	uint8_t	bsic_nc6:6,
 		 bcch_f_nc6_lo:2;
 #elif OSMO_IS_BIG_ENDIAN
-/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
 	uint8_t	ba_used:1, dtx_used:1, rxlev_full:6;
 	uint8_t	spare:1, meas_valid:1, rxlev_sub:6;
 	uint8_t	spare2:1, rxqual_full:3, rxqual_sub:3, no_nc_n_hi:1;
@@ -616,7 +616,7 @@
 		 m10_2 : 1,
 		 m12_2 : 1;
 #elif OSMO_IS_BIG_ENDIAN
-/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
 	uint8_t ver:3, nscb:1, icmi:1, spare:1, smod:2;
 	uint8_t m12_2:1, m10_2:1, m7_95:1, m7_40:1, m6_70:1, m5_90:1, m5_15:1, m4_75:1;
 #endif
@@ -629,7 +629,7 @@
 		 spare:2,
 		 atc:1;
 #elif OSMO_IS_BIG_ENDIAN
-/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
 	uint8_t atc:1, spare:2, power_level:5;
 #endif
 } __attribute__((packed));
@@ -644,7 +644,7 @@
 	uint8_t t2; /* ACC 8-15 barred flags */
 	uint8_t t3; /* ACC 0-7 barred flags */
 #elif OSMO_IS_BIG_ENDIAN
-/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
 	uint8_t max_trans:2, tx_integer:4, cell_bar:1, re:1;
 	uint8_t t2;
 	uint8_t t3;
@@ -702,7 +702,7 @@
 	uint8_t t2:5,
 		 t3_low:3;
 #elif OSMO_IS_BIG_ENDIAN
-/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
 	uint8_t ra;
 	uint8_t t1:5, t3_high:3;
 	uint8_t t3_low:3, t2:5;
@@ -717,7 +717,7 @@
 	uint8_t t2:5,
 		 t3_low:3;
 #elif OSMO_IS_BIG_ENDIAN
-/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
 	uint8_t t1:5, t3_high:3;
 	uint8_t t3_low:3, t2:5;
 #endif
@@ -731,7 +731,7 @@
 		 nci:1,
 		 sync_ie:4;
 #elif OSMO_IS_BIG_ENDIAN
-/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
 	uint8_t sync_ie:4, nci:1, rot:1, si:2;
 #endif
 } __attribute__((packed));
@@ -746,18 +746,58 @@
 	uint8_t mode;
 } __attribute__ ((packed));
 
+/*! 10.5.2.6 Channel Mode value */
 enum gsm48_chan_mode {
+	/*! Signalling only (TCH/F or TCH/H)  */
 	GSM48_CMODE_SIGN	= 0x00,
+	/*! Speech: FR (TCH/FS) or HR (TCH/HS) */
 	GSM48_CMODE_SPEECH_V1	= 0x01,
-	GSM48_CMODE_SPEECH_EFR	= 0x21,
-	GSM48_CMODE_SPEECH_AMR	= 0x41,
+	/*! Speech: EFR (TCH/EFS) */
+	GSM48_CMODE_SPEECH_EFR	= 0x21, /*!< a.k.a. V2 */
+	/*! Speech: AMR (TCH/AFS or TCH/AHS) */
+	GSM48_CMODE_SPEECH_AMR	= 0x41, /*!< a.k.a. V3 */
+	/*! Speech: OFR AMR-WB (O-TCH/WFS) or OHR AMR-WB (O-TCH/WHS) */
+	GSM48_CMODE_SPEECH_V4	= 0x81,
+	/*! Speech: FR AMR-WB (TCH/WFS) */
+	GSM48_CMODE_SPEECH_V5	= 0x82,
+	/*! Speech: OHR AMR (O-TCH/AHS) */
+	GSM48_CMODE_SPEECH_V6	= 0x83,
+
+	/* ECSD: 43.5 kbit/s (DL) + 14.5 kbit/s (UL) */
+	GSM48_CMODE_DATA_43k5_14k5	= 0x61,
+	/* ECSD: 29.0 kbit/s (DL) + 14.5 kbit/s (UL) */
+	GSM48_CMODE_DATA_29k0_14k5	= 0x62,
+	/* ECSD: 43.5 kbit/s (DL) + 29.0 kbit/s (UL) */
+	GSM48_CMODE_DATA_43k5_29k0	= 0x64,
+	/* ECSD: 14.5 kbit/s (DL) + 43.5 kbit/s (UL) */
+	GSM48_CMODE_DATA_14k5_43k5	= 0x67,
+	/* ECSD: 14.5 kbit/s (DL) + 29.0 kbit/s (UL) */
+	GSM48_CMODE_DATA_14k5_29k0	= 0x65,
+	/* ECSD: 29.0 kbit/s (DL) + 43.5 kbit/s (UL) */
+	GSM48_CMODE_DATA_29k0_43k5	= 0x66,
+
+	/*! ECSD: 43.5 kbit/s radio interface rate, 43.2 kbit/s services (E-TCH/F43.2) */
+	GSM48_CMODE_DATA_43k5	= 0x27,
+	/*! ECSD: 32.0 kbit/s radio interface rate, 32.0 kbit/s services (E-TCH/F32.0) */
+	GSM48_CMODE_DATA_32k0	= 0x63,
+	/*! ECSD: 29.0 kbit/s radio interface rate, 28.8 kbit/s services (E-TCH/F28.8) */
+	GSM48_CMODE_DATA_29k0	= 0x43,
+	/*! CSD: 14.5 kbit/s radio interface rate, 14.4 kbit/s services (TCH/F14.4) */
 	GSM48_CMODE_DATA_14k5	= 0x0f,
+	/*! CSD: 12.0 kbit/s radio interface rate, 9.6 kbit/s services (TCH/F9.6) */
 	GSM48_CMODE_DATA_12k0	= 0x03,
+	/*! CSD: 6.0 kbit/s radio interface rate, 4.8 kbit/s services (TCH/{F,H}4.8) */
 	GSM48_CMODE_DATA_6k0	= 0x0b,
+	/*! CSD: 3.6 kbit/s radio interface rate, 2.4 kbit/s and less services (TCH/{F,H}2.4) */
 	GSM48_CMODE_DATA_3k6	= 0x13,
+
+	/*! Same as GSM48_CMODE_SPEECH_V1, in VAMOS mode */
 	GSM48_CMODE_SPEECH_V1_VAMOS	= 0xc1,
+	/*! Same as GSM48_CMODE_SPEECH_EFR, in VAMOS mode */
 	GSM48_CMODE_SPEECH_V2_VAMOS	= 0xc2,
+	/*! Same as GSM48_CMODE_SPEECH_AMR, in VAMOS mode */
 	GSM48_CMODE_SPEECH_V3_VAMOS	= 0xc3,
+	/*! Speech: GSM48_CMODE_SPEECH_V5, in VAMOS mode */
 	GSM48_CMODE_SPEECH_V5_VAMOS	= 0xc5,
 };
 
@@ -797,7 +837,7 @@
 		 arfcn_hi:2;
 	uint8_t arfcn_lo;
 #elif OSMO_IS_BIG_ENDIAN
-/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
 	uint8_t arfcn_hi:2, ncc:3, bcc:3;
 	uint8_t arfcn_lo;
 #endif
@@ -840,7 +880,7 @@
 	uint8_t mi_len;
 	uint8_t mi0;
 #elif OSMO_IS_BIG_ENDIAN
-/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
 	uint8_t key_seq:4, spare:4;
 	union {
 		uint32_t classmark2;
@@ -867,7 +907,7 @@
 	         spare:4;
 	uint8_t rand16;
 #elif OSMO_IS_BIG_ENDIAN
-/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
 	uint8_t spare:4, key_seq:4;
 	uint8_t rand16;
 #endif
@@ -888,7 +928,7 @@
 	uint8_t mi_len;
 	uint8_t mi0;
 #elif OSMO_IS_BIG_ENDIAN
-/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
 	uint8_t key_seq:4, type:4;
 	struct gsm48_loc_area_id lai;
 	struct gsm48_classmark1 classmark1;
@@ -904,6 +944,20 @@
 	uint8_t data0;
 } __attribute__ ((packed));
 
+/* Short header */
+struct gsm48_hdr_sh {
+#if OSMO_IS_LITTLE_ENDIAN
+	uint8_t	l2_header:2,	/* < short layer 2 header : bit(2) > See 3GPP TS 44.006 §6.4a */
+		msg_type:5,	/* < message type : bit(5) > See 3GPP TS 44.018 Table 10.4.2 */
+		rr_short_pd:1;	/* < RR short PD : bit > See 3GPP TS 24.007 §11.3.2 */
+	uint8_t data0;
+#elif OSMO_IS_BIG_ENDIAN
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
+	uint8_t	rr_short_pd:1, msg_type:5, l2_header:2;
+	uint8_t data0;
+#endif
+} __attribute__ ((packed));
+
 /* Section 9.1.3x System information Type header */
 struct gsm48_system_information_type_header {
 #if OSMO_IS_LITTLE_ENDIAN
@@ -912,7 +966,7 @@
 		skip_indicator:4;
 	uint8_t system_information;
 #elif OSMO_IS_BIG_ENDIAN
-/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
 	uint8_t l2_plen;
 	uint8_t skip_indicator:4, rr_protocol_discriminator:4;
 	uint8_t system_information;
@@ -928,7 +982,7 @@
 		 neci:1,
 		 acs:1;
 #elif OSMO_IS_BIG_ENDIAN
-/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
 	uint8_t cell_resel_hyst:3, ms_txpwr_max_ccch:5;
 	uint8_t acs:1, neci:1, rxlev_acc_min:6;
 #endif
@@ -947,7 +1001,7 @@
 		spare_2 :1;
 	uint8_t t3212;
 #elif OSMO_IS_BIG_ENDIAN
-/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
 	uint8_t mscr:1, att:1, bs_ag_blks_res:3, ccch_conf:3;
 	uint8_t spare_2:1, cbq3:2, spare_1:2, bs_pa_mfrms:3;
 	uint8_t t3212;
@@ -970,7 +1024,7 @@
 	/* either DN-IND or top bit of DTX IND */
 		 d:1;
 #elif OSMO_IS_BIG_ENDIAN
-/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
 	uint8_t d:1, pwrc:1, dtx:2, radio_link_timeout:4;
 #endif
 } __attribute__ ((packed));
@@ -991,7 +1045,7 @@
 	uint8_t mi0;
 	/* optional priority level */
 #elif OSMO_IS_BIG_ENDIAN
-/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
 	uint8_t cipher_key_seq:4, cm_service_type:4;
 	union {
 		uint32_t classmark;
@@ -1074,7 +1128,7 @@
 	uint8_t system_information;
 	uint8_t bcch_frequency_list16;
 #elif OSMO_IS_BIG_ENDIAN
-/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
 	uint8_t skip_indicator:4, rr_protocol_discriminator:4;
 	uint8_t system_information;
 	uint8_t bcch_frequency_list16;
@@ -1089,7 +1143,7 @@
 	uint8_t system_information;
 	uint8_t bcch_frequency_list16;
 #elif OSMO_IS_BIG_ENDIAN
-/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
         uint8_t skip_indicator:4, rr_protocol_discriminator:4;
 	uint8_t system_information;
 	uint8_t bcch_frequency_list16;
@@ -1104,7 +1158,7 @@
 	uint8_t system_information;
 	uint8_t bcch_frequency_list16;
 #elif OSMO_IS_BIG_ENDIAN
-/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
         uint8_t skip_indicator:4, rr_protocol_discriminator:4;
 	uint8_t system_information;
 	uint8_t bcch_frequency_list16;
@@ -1123,7 +1177,7 @@
 	uint8_t ncc_permitted;
 	uint8_t rest_octets0;
 #elif OSMO_IS_BIG_ENDIAN
-/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
 	uint8_t skip_indicator:4, rr_protocol_discriminator:4;
 	uint8_t system_information;
 	uint16_t cell_identity;
@@ -1137,17 +1191,24 @@
 /* Section 9.1.50 System Information type 10 (ASCI) */
 struct gsm48_system_information_type_10 {
 #if OSMO_IS_LITTLE_ENDIAN
-	uint8_t rr_short_pd:1,	/* < RR short PD : bit > See 3GPP TS 24.007 §11.3.2 */
+	uint8_t	l2_header:2,	/* < short layer 2 header : bit(2) > See 3GPP TS 44.006 §6.4a */
 		msg_type:5,	/* < message type : bit(5) > See 3GPP TS 44.018 Table 10.4.2 */
-		l2_header:2;	/* < short layer 2 header : bit(2) > See 3GPP TS 44.006 §6.4a */
+		rr_short_pd:1;	/* < RR short PD : bit > See 3GPP TS 24.007 §11.3.2 */
 	uint8_t rest_octets0;	/* < SI10 Rest Octets : bit(160) > See 3GPP TS 44.018 §10.5.2.44 */
 #elif OSMO_IS_BIG_ENDIAN
-/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */
-	uint8_t l2_header:2, msg_type:5, rr_short_pd:1;
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
+	uint8_t	rr_short_pd:1, msg_type:5, l2_header:2;
 	uint8_t rest_octets0;
 #endif
 } __attribute__ ((packed));
 
+/* TS 44.018 Section 9.1.49 */
+struct gsm0408_vgcs_ul_grant {
+	struct gsm48_hdr hdr;
+	struct gsm48_req_ref req_ref;
+	uint8_t ta;
+} __attribute__ ((packed));
+
 /* Section 9.1.43a System Information type 13 */
 struct gsm48_system_information_type_13 {
 	struct gsm48_system_information_type_header header;
@@ -1203,7 +1264,7 @@
 		 cr:1,
 		 spare:3;
 #elif OSMO_IS_BIG_ENDIAN
-/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
 	uint8_t spare:3, cr:1, alg_id:3, sc:1;
 #endif
 } __attribute__((packed));
@@ -1248,6 +1309,14 @@
 	uint8_t rest0;
 } __attribute__ ((packed));
 
+/* Section 9.1.21b */
+struct gsm48_notification_nch {
+	uint8_t l2_plen;
+	uint8_t proto_discr;
+	uint8_t msg_type;
+	uint8_t data0;
+} __attribute__((packed));
+
 /* Section 9.1.22 */
 struct gsm48_paging1 {
 #if OSMO_IS_LITTLE_ENDIAN
@@ -1260,7 +1329,7 @@
 		 cneed2:2;
 	uint8_t data0;
 #elif OSMO_IS_BIG_ENDIAN
-/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
 	uint8_t l2_plen;
 	uint8_t proto_discr;
 	uint8_t msg_type;
@@ -1283,7 +1352,7 @@
 	uint32_t tmsi2;
 	uint8_t data0;
 #elif OSMO_IS_BIG_ENDIAN
-/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
 	uint8_t l2_plen;
 	uint8_t proto_discr;
 	uint8_t msg_type;
@@ -1313,7 +1382,7 @@
 		 spare2:4;
 	uint8_t rest0;
 #elif OSMO_IS_BIG_ENDIAN
-/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
 	uint8_t l2_plen;
 	uint8_t proto_discr;
 	uint8_t msg_type;
@@ -1336,7 +1405,7 @@
 	struct gsm48_classmark2 cm2;
 	uint8_t data0;
 #elif OSMO_IS_BIG_ENDIAN
-/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
 	uint8_t spare:5, key_seq:3;
 	uint8_t cm2_len;
 	struct gsm48_classmark2 cm2;
@@ -1349,6 +1418,18 @@
 	uint8_t rr_cause;
 } __attribute__((packed));
 
+/* Section 9.1.44 */
+struct gsm48_talker_indication {
+	uint8_t cm2_len;
+	struct gsm48_classmark2 cm2;
+	uint8_t data0;
+} __attribute__((packed));
+
+/* Section 9.1.48 */
+struct gsm48_uplink_release {
+	uint8_t rr_cause;
+} __attribute__((packed));
+
 /* Section 10.2 + GSM 04.07 12.2.3.1.1 + 3GPP TS 24.007 11.2.3.1.1 */
 #define GSM48_PDISC_GROUP_CC	0x00
 #define GSM48_PDISC_BCAST_CC	0x01
@@ -1367,6 +1448,9 @@
 #define GSM48_PDISC_TEST	0x0f	/* as per 11.10, 04.14 */
 #define GSM48_PDISC_MASK	0x0f
 
+/* Section 11.3.2.1 3GPP TS 24.007: Short PDISC */
+#define GSM48_PDISC_SH_RR	0
+
 extern const struct value_string gsm48_pdisc_names;
 static inline const char *gsm48_pdisc_name(uint8_t val)
 { return get_value_string(gsm48_pdisc_names, val); }
@@ -1734,6 +1818,10 @@
 #define GSM48_IE_FRQSHORT_AFTER	0x02
 #define GSM48_IE_MUL_RATE_CFG	0x03	/* 10.5.2.21aa */
 #define GSM48_IE_FREQ_L_AFTER	0x05
+#define GSM48_IE_GROUP_CIP_SEQ_HO 0x08 /* HO = Half Octet Tag */
+#define GSM48_IE_CIP_MODE_SET_HO 0x09 /* HO = Half Octet Tag */
+#define GSM48_IE_GPRS_RESUMPT_HO 0xc0 /* HO = Half Octet Tag */
+#define GSM48_IE_SYNC_IND_HO	0x0d /* HO = Half Octet Tag */
 #define GSM48_IE_MSLOT_DESC	0x10
 #define GSM48_IE_CHANMODE_2	0x11
 #define GSM48_IE_FRQSHORT_BEFORE 0x12
@@ -1775,20 +1863,21 @@
 #define GSM48_IE_START_TIME	0x7c
 #define GSM48_IE_INDIVIDUAL_PRIORITIES 0x7c /* 44.018 Section 9.1.7 */
 #define GSM48_IE_TIMING_ADVANCE	0x7d
-#define GSM48_IE_GROUP_CIP_SEQ	0x80
-#define GSM48_IE_CIP_MODE_SET	0x90
-#define GSM48_IE_GPRS_RESUMPT	0xc0
-#define GSM48_IE_SYNC_IND	0xd0
+#define GSM48_IE_GROUP_CIP_SEQ 0x80 /* DEPRECATED, use GSM48_IE_GROUP_CIP_SEQ_HO instead */
+#define GSM48_IE_CIP_MODE_SET  0x90  /* DEPRECATED, use GSM48_IE_CIP_MODE_SET_HO instead */
+#define GSM48_IE_GPRS_RESUMPT  0xc0 /* DEPRECATED, use GSM48_IE_GPRS_RESUMPT_HO instead */
+#define GSM48_IE_SYNC_IND      0xd0 /* DEPRECATED, use GSM48_IE_SYNC_IND_HO instead */
 /* System Information 4 (types are equal IEs above) */
 #define GSM48_IE_CBCH_CHAN_DESC	0x64
 #define GSM48_IE_CBCH_MOB_AL	0x72
 
 /* Additional MM elements */
+#define GSM48_IE_PRIORITY_LEV_HO 0x08 /* HO = Half Octet Tag */
 #define GSM48_IE_LOCATION_AREA	0x13
 #define GSM48_IE_AUTN		0x20
 #define GSM48_IE_AUTH_RES_EXT	0x21
 #define GSM48_IE_AUTS		0x22
-#define GSM48_IE_PRIORITY_LEV	0x80
+#define GSM48_IE_PRIORITY_LEV	0x80 /* DEPRECATED, use GSM48_IE_PRIORITY_LEV_HO instead */
 #define GSM48_IE_FOLLOW_ON_PROC	0xa1
 #define GSM48_IE_CTS_PERMISSION	0xa2

libosmocore_1.8.0.tar.xz/include/osmocom/gsm/protocol/gsm_04_08_gprs.h -> libosmocore_1.9.0.tar.xz/include/osmocom/gsm/protocol/gsm_04_08_gprs.h Changed

@@ -82,6 +82,8 @@
 
 enum gsm48_gprs_ie_mm {
 	GSM48_IE_GMM_CIPH_CKSN		= 0x08, /* 10.5.1.2 */
+	GSM48_IE_GMM_PTMSI_TYPE		= 0x0e, /* 10.5.5.29 */
+	GSM48_IE_GMM_TMSI_BASED_NRI_C	= 0x10, /* 10.5.5.31 */
 	GSM48_IE_GMM_TIMER_READY	= 0x17,	/* 10.5.7.3 */
 	GSM48_IE_GMM_ALLOC_PTMSI	= 0x18,	/* 10.5.1.4 */
 	GSM48_IE_GMM_PTMSI_SIG		= 0x19,	/* 10.5.5.8 */
@@ -89,27 +91,39 @@
 	GSM48_IE_GMM_AUTH_SRES		= 0x22,	/* 10.5.3.2 */
 	GSM48_IE_GMM_IMEISV		= 0x23,	/* 10.5.1.4 */
 	GSM48_IE_GMM_CAUSE		= 0x25,	/* 10.5.5.14 */
+	GSM48_IE_GMM_RX_NPDU_NUM_LIST	= 0x26, /* 10.5.5.11 */
 	GSM48_IE_GMM_DRX_PARAM		= 0x27,	/* 10.5.5.6 */
 	GSM48_IE_GMM_AUTN		= 0x28,	/* 10.5.3.1.1 */
 	GSM48_IE_GMM_AUTH_RES_EXT	= 0x29, /* 10.5.3.2.1 */
+	GSM48_IE_GMM_TIMER_T3302	= 0x2A,	/* 10.5.7.4 */
 	GSM48_IE_GMM_AUTH_FAIL_PAR	= 0x30,	/* 10.5.3.2.2 */
 	GSM48_IE_GMM_MS_NET_CAPA	= 0x31,	/* 10.5.5.12 */
 	GSM48_IE_GMM_PDP_CTX_STATUS	= 0x32,	/* 10.5.7.1 */
 	GSM48_IE_GMM_PS_LCS_CAPA	= 0x33,	/* 10.5.5.22 */
 	GSM48_IE_GMM_GMM_MBMS_CTX_ST	= 0x35,	/* 10.5.7.6 */
+	GSM48_IE_GMM_TIMER_T3346	= 0x3A,	/* 10.5.7.4 */
 	GSM48_IE_GMM_NET_FEAT_SUPPORT	= 0xB0,	/* 10.5.5.23 */
 };
 
 enum gsm48_gprs_ie_sm {
+	GSM48_IE_GSM_RADIO_PRIO		= 0x08,	/* 10.5.7.2 */
+	GSM48_IE_GSM_DEV_PROP		= 0x0C,	/* 10.5.7.8 */
 	GSM48_IE_GSM_APN		= 0x28,	/* 10.5.6.1 */
 	GSM48_IE_GSM_PROTO_CONF_OPT	= 0x27,	/* 10.5.6.3 */
 	GSM48_IE_GSM_PDP_ADDR		= 0x2b, /* 10.5.6.4 */
 	GSM48_IE_GSM_AA_TMR		= 0x29,	/* 10.5.7.3 */
+	GSM48_IE_GSM_QOS		= 0x30,	/* 10.5.6.5 */
+	GSM48_IE_GSM_TFT		= 0x31,	/* 10.5.6.12 */
+	GSM48_IE_GSM_LLC_SAPI		= 0x32,	/* 10.5.6.9 */
+	GSM48_IE_GSM_MBIFOM_CONT	= 0x33,	/* 10.5.6.21 */
+	GSM48_IE_GSM_PFI		= 0x34,	/* 10.5.6.11 */
 	GSM48_IE_GSM_NAME_FULL		= 0x43, /* 10.5.3.5a */
 	GSM48_IE_GSM_NAME_SHORT		= 0x45, /* 10.5.3.5a */
 	GSM48_IE_GSM_TIMEZONE		= 0x46, /* 10.5.3.8 */
 	GSM48_IE_GSM_UTC_AND_TZ		= 0x47, /* 10.5.3.9 */
 	GSM48_IE_GSM_LSA_ID		= 0x48, /* 10.5.3.11 */
+	GSM48_IE_GSM_EXT_QOS		= 0x5C, /* 10.5.6.5B */
+	GSM48_IE_GSM_EXT_PROTO_CONF_OPT	= 0x7B, /* 10.5.6.3a */
 
 	/* Fake IEs that are not present on the Layer3 air interface,
 	 * but which we use to simplify internal APIs */
@@ -128,7 +142,7 @@
 	struct gsm48_ra_id ra_id; /* 10.5.5.15 */
 	uint8_t data0;
 #elif OSMO_IS_BIG_ENDIAN
-/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
 	uint8_t upd_result:4, force_stby:4;
 	uint8_t ra_upd_timer;
 	struct gsm48_ra_id ra_id;
@@ -157,7 +171,7 @@
 	struct gsm48_ra_id ra_id; /* 10.5.5.15 */
 	uint8_t data0;
 #elif OSMO_IS_BIG_ENDIAN
-/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
 	uint8_t force_stby:4, att_result:4;
 	uint8_t ra_upd_timer;
 	uint8_t radio_prio;
@@ -175,7 +189,7 @@
 		ac_ref_nr:4;	/* 10.5.5.19 */
 	uint8_t data0;
 #elif OSMO_IS_BIG_ENDIAN
-/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
 	uint8_t imeisv_req:4, ciph_alg:4;
 	uint8_t ac_ref_nr:4, force_stby:4;
 	uint8_t data0;
@@ -189,7 +203,7 @@
 		spare:4;
 	uint8_t data0;
 #elif OSMO_IS_BIG_ENDIAN
-/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
 	uint8_t spare:4, ac_ref_nr:4;
 	uint8_t data0;
 #endif

libosmocore_1.8.0.tar.xz/include/osmocom/gsm/protocol/gsm_04_12.h -> libosmocore_1.9.0.tar.xz/include/osmocom/gsm/protocol/gsm_04_12.h Changed

libosmocore_1.8.0.tar.xz/include/osmocom/gsm/protocol/gsm_04_14.h -> libosmocore_1.9.0.tar.xz/include/osmocom/gsm/protocol/gsm_04_14.h Changed

@@ -30,7 +30,7 @@
 		loop_mech:3,
 		tn:3;
 #elif OSMO_IS_BIG_ENDIAN
-/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
 	uint8_t tn:3, loop_mech:3, chc:2;
 #endif
 } __attribute__((packed));
@@ -43,7 +43,7 @@
 		chc:2,
 		spare:2;
 #elif OSMO_IS_BIG_ENDIAN
-/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
 	uint8_t spare:2, chc:2, loop_mech:3, err_ind:1;
 #endif
 } __attribute__((packed));
@@ -70,7 +70,7 @@
 		dl_tx_offset:3,
 		_spare:4;
 #elif OSMO_IS_BIG_ENDIAN
-/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
 	uint16_t d:12,
 		spare:3,
 		l:1;
@@ -86,7 +86,7 @@
 		dl_tx_offset:3,
 		m:1;
 #elif OSMO_IS_BIG_ENDIAN
-/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
 	uint8_t m:1, dl_tx_offset:3, _spare:4;
 #endif
 } __attribute__((packed));

libosmocore_1.8.0.tar.xz/include/osmocom/gsm/protocol/gsm_08_08.h -> libosmocore_1.9.0.tar.xz/include/osmocom/gsm/protocol/gsm_08_08.h Changed

@@ -54,7 +54,7 @@
 			dlci_spare:3,
 			dlci_cc:2;
 #elif OSMO_IS_BIG_ENDIAN
-/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
 			uint8_t dlci_cc:2, dlci_spare:3, dlci_sapi:3;
 #endif
 		};
@@ -168,12 +168,15 @@
 	BSS_MAP_MSG_VGCS_VBS_QUEUING_INDICATION	= 30,
 	BSS_MAP_MSG_UPLINK_RQST		= 31,
 	BSS_MAP_MSG_UPLINK_RQST_ACKNOWLEDGE	= 39,
+	BSS_MAP_MSG_VGCS_VBS_ASSIGNMENT_STATUS	= 59,
+	BSS_MAP_MSG_VGCS_VBS_AREA_CELL_INFO	= 60,
 	BSS_MAP_MSG_UPLINK_RQST_CONFIRMATION	= 73,
 	BSS_MAP_MSG_UPLINK_RELEASE_INDICATION	= 74,
 	BSS_MAP_MSG_UPLINK_REJECT_CMD	= 75,
 	BSS_MAP_MSG_UPLINK_RELEASE_CMD	= 76,
 	BSS_MAP_MSG_UPLINK_SEIZED_CMD	= 77,
 	BSS_MAP_MSG_VGCS_ADDL_INFO		= 0x60,
+	BSS_MAP_MSG_VGCS_SMS			= 0x61,
 	BSS_MAP_MSG_NOTIFICATION_DATA		= 0x62,
 	BSS_MAP_MSG_UPLINK_APP_DATA		= 0x63,
 
@@ -443,6 +446,7 @@
 	GSM0808_CHAN_SPEECH = 1,
 	GSM0808_CHAN_DATA   = 2,
 	GSM0808_CHAN_SIGN   = 3,
+	GSM0808_CHAN_SPEECH_CTM_TEXT_TELEPHONY = 4,
 };
 
 /* GSM 08.08 3.2.2.11 Channel Type */
@@ -499,6 +503,42 @@
 	GSM0808_PERM_HR6	= 0x45, /*!< OHR AMR */
 };
 
+/* 3GPP TS 48.008 3.2.2.11 Channel Type
+ * Transparent: Data Rate */
+enum gsm0808_data_rate_transp {
+	GSM0808_DATA_RATE_TRANSP_32k0	 = 0x3a,
+	GSM0808_DATA_RATE_TRANSP_28k8	 = 0x39,
+	GSM0808_DATA_RATE_TRANSP_14k4	 = 0x18,
+	GSM0808_DATA_RATE_TRANSP_9k6	 = 0x10,
+	GSM0808_DATA_RATE_TRANSP_4k8	 = 0x11,
+	GSM0808_DATA_RATE_TRANSP_2k4	 = 0x12,
+	GSM0808_DATA_RATE_TRANSP_1k2	 = 0x13,
+	GSM0808_DATA_RATE_TRANSP_600	 = 0x14,
+	GSM0808_DATA_RATE_TRANSP_1200_75 = 0x15,
+};
+
+/* 3GPP TS 48.008 3.2.2.11 Channel Type
+ * Non-Transparent: Radio Interface Data Rate (preferred) */
+enum gsm0808_data_rate_non_transp {
+	GSM0808_DATA_RATE_NON_TRANSP_12000_6000	= 0x00,
+	GSM0808_DATA_RATE_NON_TRANSP_43k5	= 0x34,
+	GSM0808_DATA_RATE_NON_TRANSP_29k0	= 0x31,
+	GSM0808_DATA_RATE_NON_TRANSP_14k5	= 0x14,
+	GSM0808_DATA_RATE_NON_TRANSP_12k0	= 0x10,
+	GSM0808_DATA_RATE_NON_TRANSP_6k0	= 0x11,
+};
+
+/* 3GPP TS 48.008 3.2.2.11 Channel Type
+ * Non-Transparent: Allowed Radio Interface Data Rate (all possible allowed) */
+enum gsm0808_data_rate_allowed_r_if {
+	GSM0808_DATA_RATE_NON_TRANSP_ALLOWED_43k5 = 0x40,
+	GSM0808_DATA_RATE_NON_TRANSP_ALLOWED_32k0 = 0x20,
+	GSM0808_DATA_RATE_NON_TRANSP_ALLOWED_29k0 = 0x10,
+	GSM0808_DATA_RATE_NON_TRANSP_ALLOWED_14k5 = 0x08,
+	GSM0808_DATA_RATE_NON_TRANSP_ALLOWED_12k0 = 0x02,
+	GSM0808_DATA_RATE_NON_TRANSP_ALLOWED_6k0  = 0x01,
+};
+
 extern const struct value_string gsm0808_permitted_speech_names;
 static inline const char *gsm0808_permitted_speech_name(enum gsm0808_permitted_speech val)
 { return get_value_string(gsm0808_permitted_speech_names, val); }
@@ -517,6 +557,12 @@
 	GSM0808_SCT_CSD	= 0xfd, /*!< CSData (see also TS 26.103) */
 };
 
+/* Codec Extension (the real Codec Type follows in the next octet).
+ * This value is intentionally not included in gsm0808_speech_codec_type,
+ * because {enc,dec}_speech_codec() functions take care of the extended
+ * encoding internally.  It shall not be used in struct gsm0808_speech_codec. */
+#define GSM0808_SCT_EXT	0x0f
+
 extern const struct value_string gsm0808_speech_codec_type_names;
 static inline const char *gsm0808_speech_codec_type_name(enum gsm0808_speech_codec_type val)
 { return get_value_string(gsm0808_speech_codec_type_names, val); }
@@ -650,6 +696,29 @@
 	GSM0808_SC_CFG_AMR_12_2 = 0x0080,
 };
 
+/* Bit index of a mode as returned by gsm0808_amr_modes_from_cfg.
+ * Example:
+ *   if (gsm0808_amr_modes_from_cfgfull_rate ? 1 : 09 & GSM0808_AMR_MODE_4_75)
+ *       printf("S9 supports 4k75");
+ */
+enum gsm0808_amr_mode {
+	GSM0808_AMR_MODE_4_75 = 0,
+	GSM0808_AMR_MODE_5_15,
+	GSM0808_AMR_MODE_5_90,
+	GSM0808_AMR_MODE_6_70,
+	GSM0808_AMR_MODE_7_40,
+	GSM0808_AMR_MODE_7_95,
+	GSM0808_AMR_MODE_10_2,
+	GSM0808_AMR_MODE_12_2,
+};
+extern const struct value_string gsm0808_amr_mode_names;
+static inline const char *gsm0808_amr_mode_name(enum gsm0808_amr_mode val)
+{
+	return get_value_string(gsm0808_amr_mode_names, val);
+}
+
+extern const uint8_t gsm0808_amr_modes_from_cfg216;
+
 /* 3GPP TS 48.008 3.2.2.103 Speech Codec List */
 #define SPEECH_CODEC_MAXLEN 255
 struct gsm0808_speech_codec_list {
@@ -657,13 +726,32 @@
 	uint8_t len;
 };
 
+/* 3GPP TS 48.008 3.2.2.11 Channel Type
+ * Asymmetry Preference (used for data, non-transparent service) */
+enum gsm0808_channel_type_asym_pref {
+	GSM0808_CT_ASYM_PREF_NOT_APPLICABLE = 0,
+	GSM0808_CT_ASYM_PREF_UL		    = 1,
+	GSM0808_CT_ASYM_PREF_DL		    = 2,
+	GSM0808_CT_ASYM_PREF_SPARE	    = 3,
+};
+
 /* 3GPP TS 48.008 3.2.2.11 Channel Type */
 #define CH_TYPE_PERM_SPCH_MAXLEN 9
 struct gsm0808_channel_type {
 	uint8_t ch_indctr;
 	uint8_t ch_rate_type;
+
+	/* Speech only */
 	uint8_t perm_spchCH_TYPE_PERM_SPCH_MAXLEN;
 	unsigned int perm_spch_len;
+
+	/* Data only */
+	bool data_transparent;
+	uint8_t data_rate;
+	bool data_rate_allowed_is_set;
+	uint8_t data_rate_allowed;
+	bool data_asym_pref_is_set;
+	enum gsm0808_channel_type_asym_pref data_asym_pref;
 };
 
 /* 3GPP TS 48.008 3.2.2.10 Encryption Information */
@@ -727,7 +815,7 @@
 	uint8_t error_pointer_bit_spare:4,
 			error_pointer_bit:4;
 #elif OSMO_IS_BIG_ENDIAN
-/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
 	uint8_t error_pointer_bit:4, error_pointer_bit_spare:4;
 #endif
 	uint8_t msg0; /*! received message which provoked the error */

libosmocore_1.8.0.tar.xz/include/osmocom/gsm/protocol/gsm_08_58.h -> libosmocore_1.9.0.tar.xz/include/osmocom/gsm/protocol/gsm_08_58.h Changed

@@ -126,7 +126,7 @@
 		rxqual:3,
 		reserved:1;
 #elif OSMO_IS_BIG_ENDIAN
-/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
 	uint8_t reserved:1, rxqual:3, ul_sacch:1, dl_sacch:1, dl_facch_all:1, dl_facch_cmd:1;
 #endif
 } __attribute__ ((packed));
@@ -139,7 +139,7 @@
 		facch_enable:1,
 		sacch_enable:1;
 #elif OSMO_IS_BIG_ENDIAN
-/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
 	uint8_t sacch_enable:1, facch_enable:1, rxqual:3, overpower_db:3;
 #endif
 } __attribute__ ((packed));
@@ -496,51 +496,66 @@
 	RSL_CMOD_SPD_DATA	= 0x02,
 	RSL_CMOD_SPD_SIGN	= 0x03,
 };
-#define RSL_CMOD_CRT_SDCCH		0x01
-#define RSL_CMOD_CRT_TCH_Bm		0x08	/* full-rate */
-#define RSL_CMOD_CRT_TCH_Lm		0x09	/* half-rate */
-#define RSL_CMOD_CRT_TCH_BI_Bm		0x0a	/* full-rate: bi-directional (multislot) */
-#define RSL_CMOD_CRT_TCH_UNI_Bm		0x1a	/* full-rate: uni-directional (multislot) */
-#define RSL_CMOD_CRT_TCH_GROUP_Bm	0x18	/* full-rate: group call channel */
-#define RSL_CMOD_CRT_TCH_GROUP_Lm	0x19	/* half-rate: group call channel */
-#define RSL_CMOD_CRT_TCH_BCAST_Bm	0x28	/* full-rate: broadcast call channel */
-#define RSL_CMOD_CRT_TCH_BCAST_Lm	0x29	/* half-rate: broadcast call channel */
-#define RSL_CMOD_CRT_OSMO_TCH_VAMOS_Bm	0x88	/* full-rate in VAMOS mode */
-#define RSL_CMOD_CRT_OSMO_TCH_VAMOS_Lm	0x89	/* half-rate in VAMOS mode */
-/* Speech */
-#define RSL_CMOD_SP_GSM1	0x01
-#define RSL_CMOD_SP_GSM2	0x11
-#define RSL_CMOD_SP_GSM3	0x21
-#define RSL_CMOD_SP_GSM4	0x31
-#define RSL_CMOD_SP_GSM5	0x09
-#define RSL_CMOD_SP_GSM6	0x0d
-/* non-transparent data (asymmetric) */
-#define RSL_CMOD_CSD_NTA_43k5_14k5	0x61	/* asymmetric 43.5 kbit/s (DL) + 14.5 kbit/s (UL) */
-#define RSL_CMOD_CSD_NTA_29k0_14k5	0x62	/* asymmetric 29.0 kbit/s (DL) + 14.5 kbit/s (UL) */
-#define RSL_CMOD_CSD_NTA_43k5_29k0	0x63	/* asymmetric 43.5 kbit/s (DL) + 29.0 kbit/s (UL) */
-#define RSL_CMOD_CSD_NTA_14k5_43k5	0x69	/* asymmetric 14.5 kbit/s (DL) + 43.5 kbit/s (UL) */
-#define RSL_CMOD_CSD_NTA_14k5_29k0	0x6a	/* asymmetric 14.5 kbit/s (DL) + 29.0 kbit/s (UL) */
-#define RSL_CMOD_CSD_NTA_29k0_43k5	0x6b	/* asymmetric 29.0 kbit/s (DL) + 43.5 kbit/s (UL) */
-/* non-transparent data */
-#define RSL_CMOD_CSD_NT_43k5	0x74
-#define RSL_CMOD_CSD_NT_28k8	0x71
-#define RSL_CMOD_CSD_NT_14k5	0x58
-#define RSL_CMOD_CSD_NT_12k0	0x50
-#define RSL_CMOD_CSD_NT_6k0	0x51
+/*! Channel rate and type */
+enum rsl_cmod_crt {
+	RSL_CMOD_CRT_SDCCH		= 0x01,
+	RSL_CMOD_CRT_TCH_Bm		= 0x08,	/* full-rate */
+	RSL_CMOD_CRT_TCH_Lm		= 0x09,	/* half-rate */
+	RSL_CMOD_CRT_TCH_BI_Bm		= 0x0a,	/* full-rate: bi-directional (multislot) */
+	RSL_CMOD_CRT_TCH_UNI_Bm		= 0x1a,	/* full-rate: uni-directional (multislot) */
+	RSL_CMOD_CRT_TCH_GROUP_Bm	= 0x18,	/* full-rate: group call channel */
+	RSL_CMOD_CRT_TCH_GROUP_Lm	= 0x19,	/* half-rate: group call channel */
+	RSL_CMOD_CRT_TCH_BCAST_Bm	= 0x28,	/* full-rate: broadcast call channel */
+	RSL_CMOD_CRT_TCH_BCAST_Lm	= 0x29,	/* half-rate: broadcast call channel */
+	RSL_CMOD_CRT_OSMO_TCH_VAMOS_Bm	= 0x88,	/* full-rate in VAMOS mode */
+	RSL_CMOD_CRT_OSMO_TCH_VAMOS_Lm	= 0x89,	/* half-rate in VAMOS mode */
+};
+/*! Speech */
+enum rsl_cmod_sp {
+	RSL_CMOD_SP_GSM1	= 0x01,
+	RSL_CMOD_SP_GSM2	= 0x11,
+	RSL_CMOD_SP_GSM3	= 0x21,
+	RSL_CMOD_SP_GSM4	= 0x31,
+	RSL_CMOD_SP_GSM5	= 0x09,
+	RSL_CMOD_SP_GSM6	= 0x0d,
+};
+/*! Non-transparent data */
+enum rsl_cmod_csd_nt {
+	RSL_CMOD_CSD_NTA_43k5_14k5	= 0x61,	/* asymmetric 43.5 kbit/s (DL) + 14.5 kbit/s (UL) */
+	RSL_CMOD_CSD_NTA_29k0_14k5	= 0x62,	/* asymmetric 29.0 kbit/s (DL) + 14.5 kbit/s (UL) */
+	RSL_CMOD_CSD_NTA_43k5_29k0	= 0x63,	/* asymmetric 43.5 kbit/s (DL) + 29.0 kbit/s (UL) */
+	RSL_CMOD_CSD_NTA_14k5_43k5	= 0x69,	/* asymmetric 14.5 kbit/s (DL) + 43.5 kbit/s (UL) */
+	RSL_CMOD_CSD_NTA_14k5_29k0	= 0x6a,	/* asymmetric 14.5 kbit/s (DL) + 29.0 kbit/s (UL) */
+	RSL_CMOD_CSD_NTA_29k0_43k5	= 0x6b,	/* asymmetric 29.0 kbit/s (DL) + 43.5 kbit/s (UL) */
+	RSL_CMOD_CSD_NT_43k5		= 0x74,
+	RSL_CMOD_CSD_NT_28k8		= 0x71,
+	RSL_CMOD_CSD_NT_14k5		= 0x58,
+	RSL_CMOD_CSD_NT_12k0		= 0x50,
+	RSL_CMOD_CSD_NT_6k0		= 0x51,
+};
 /* legacy #defines with wrong name */
 #define RSL_CMOD_SP_NT_14k5	RSL_CMOD_CSD_NT_14k5
 #define RSL_CMOD_SP_NT_12k0	RSL_CMOD_CSD_NT_12k0
 #define RSL_CMOD_SP_NT_6k0	RSL_CMOD_CSD_NT_6k0
-/* transparent data */
-#define RSL_CMOD_CSD_T_32000	0x38
-#define RSL_CMOD_CSD_T_29000	0x39
-#define RSL_CMOD_CSD_T_14400	0x18
-#define RSL_CMOD_CSD_T_9600	0x10
-#define RSL_CMOD_CSD_T_4800	0x11
-#define RSL_CMOD_CSD_T_2400	0x12
-#define RSL_CMOD_CSD_T_1200	0x13
-#define RSL_CMOD_CSD_T_600	0x14
-#define RSL_CMOD_CSD_T_1200_75	0x15
+#define RSL_CMOD_CSD_T_32000	RSL_CMOD_CSD_T_32k0
+#define RSL_CMOD_CSD_T_29000	RSL_CMOD_CSD_T_29k0
+#define RSL_CMOD_CSD_T_14400	RSL_CMOD_CSD_T_14k4
+#define RSL_CMOD_CSD_T_9600	RSL_CMOD_CSD_T_9k6
+#define RSL_CMOD_CSD_T_4800	RSL_CMOD_CSD_T_4k8
+#define RSL_CMOD_CSD_T_2400	RSL_CMOD_CSD_T_2k4
+#define RSL_CMOD_CSD_T_1200	RSL_CMOD_CSD_T_1k2
+/*! Transparent data */
+enum rsl_cmod_csd_t {
+	RSL_CMOD_CSD_T_32k0	= 0x38,
+	RSL_CMOD_CSD_T_29k0	= 0x39,
+	RSL_CMOD_CSD_T_14k4	= 0x18,
+	RSL_CMOD_CSD_T_9k6	= 0x10,
+	RSL_CMOD_CSD_T_4k8	= 0x11,
+	RSL_CMOD_CSD_T_2k4	= 0x12,
+	RSL_CMOD_CSD_T_1k2	= 0x13,
+	RSL_CMOD_CSD_T_600	= 0x14,
+	RSL_CMOD_CSD_T_1200_75	= 0x15,
+};
 
 /*! RSL Channel Identification IE (Chapter 9.3.5) */
 struct rsl_ie_chan_ident {
@@ -658,7 +673,7 @@
 #define RSL_CHANNEED_TCH_F	0x02
 #define RSL_CHANNEED_TCH_ForH	0x03
 
-/*! RSL Cell Broadcast Command (Chapter 9.3.45) */
+/*! RSL Cell Broadcast Command (Chapter 9.3.41) */
 struct rsl_ie_cb_cmd_type {
 #if OSMO_IS_LITTLE_ENDIAN
 	uint8_t last_block:2;
@@ -666,7 +681,7 @@
 	uint8_t def_bcast:1;
 	uint8_t command:4;
 #elif OSMO_IS_BIG_ENDIAN
-/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
 	uint8_t command:4, def_bcast:1, spare:1, last_block:2;
 #endif
 } __attribute__ ((packed));
@@ -684,6 +699,23 @@
 #define RSL_CB_CMD_LASTBLOCK_2		2
 #define RSL_CB_CMD_LASTBLOCK_3		3
 
+/*! NCH DRX Information (Chapter 9.3.47) */
+struct rsl_ie_nch_drx_info {
+#if OSMO_IS_LITTLE_ENDIAN
+	uint8_t nln:2;
+	uint8_t emlpp_priority:3;
+	uint8_t nln_status:1;
+	uint8_t spare:2;
+#elif OSMO_IS_BIG_ENDIAN
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
+	uint8_t spare:2, nln_status:1, emlpp_priority:3, nln:2;
+#endif
+} __attribute__ ((packed));
+
+/*! Command Indicator (Chapter 9.3.48) */
+#define RSL_CMD_INDICATOR_START	0x00
+#define RSL_CMD_INDICATOR_STOP	0x01
+
 /* Chapter 3.3.2.3 Brocast control channel */
 /* CCCH-CONF, NC is not combined */
 #define RSL_BCCH_CCCH_CONF_1_NC	0x00
@@ -729,10 +761,10 @@
 
 /* RSL_IE_IPAC_RTP_CSD_FMT, lower four bits */
 enum rsl_ipac_rtp_csd_format_d {
-	RSL_IPAC_RTP_CSD_EXT_TRAU = 0,
-	RSL_IPAC_RTP_CSD_NON_TRAU = 1,
-	RSL_IPAC_RTP_CSD_TRAU_BTS = 2,
-	RSL_IPAC_RTP_CSD_IWF_FREE = 3,
+	RSL_IPAC_RTP_CSD_EXT_TRAU = 0,	/*!< TRAU-like RTP format, without leading zero-bits */
+	RSL_IPAC_RTP_CSD_NON_TRAU = 1,	/*!< packed 16k (252/288 bit) / 8k (126 bit) in RTP */
+	RSL_IPAC_RTP_CSD_TRAU_BTS = 2,	/*!< TRAU in BTS; V.110 in RTP/CLEARMODE */
+	RSL_IPAC_RTP_CSD_IWF_FREE = 3,	/*!< unknown proprietary IWF-free BTS-BTS data */
 };
 /* RSL_IE_IPAC_RTP_CSD_FMT, upper four bits */
 enum rsl_ipac_rtp_csd_format_ir {
@@ -817,7 +849,7 @@
 		ave_method:3;
 	uint8_t params0;
 #elif OSMO_IS_BIG_ENDIAN
-/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
 	uint8_t reserved:1, param_id:2, h_reqave:5;
 	uint8_t ave_method:3, h_reqt:5;
 	uint8_t params0;
@@ -833,7 +865,7 @@
 	uint8_t h_reqt:5,
 		ave_method:3;
 #elif OSMO_IS_BIG_ENDIAN
-/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
 	uint8_t reserved:2, ave_enabled:1, h_reqave:5;
 	uint8_t ave_method:3, h_reqt:5;
 #endif
@@ -857,7 +889,7 @@
 	uint8_t u_rxqual:3, reserved_u_rxqual:1,
 		l_rxqual:3, reserved_l_rxqual:1;
 #elif OSMO_IS_BIG_ENDIAN
-/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
 	uint8_t reserved_l_rxlev:2, l_rxlev:6;
 	uint8_t reserved_u_rxlev:2, u_rxlev:6;
 	uint8_t reserved_l_rxqual:1, l_rxqual:3, reserved_u_rxqual:1, u_rxqual:3;
@@ -893,7 +925,7 @@
 	uint8_t ms_range_max:6,
 		reserved_ms_range:2;
 #elif OSMO_IS_BIG_ENDIAN
-/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
 	uint8_t reserved_l_rxlev_ul:2, l_rxlev_ul_h:6;
 	uint8_t reserved_l_rxlev_dl:2, l_rxlev_dl_h:6;
 	uint8_t reserved_rxlev_ul:2, rxlev_ul_ih:6;
@@ -917,7 +949,7 @@
 	uint8_t pc_interval:5, reserved_pc:3;
 	uint8_t red_step_size:4, inc_step_size:4;
 #elif OSMO_IS_BIG_ENDIAN
-/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
 	uint8_t reserved_p1:3, p1:5;
 	uint8_t reserved_n1:3, n1:5;
 	uint8_t reserved_p2:3, p2:5;
@@ -939,7 +971,7 @@
 	uint8_t upper_p:5, reserved_upper_p:3;
 	uint8_t upper_n:5, reserved_upper_n:3;
 #elif OSMO_IS_BIG_ENDIAN
-/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
 	uint8_t reserved_lower_p:3, lower_p:5;
 	uint8_t reserved_lower_n:3, lower_n:5;
 	uint8_t reserved_upper_p:3, upper_p:5;
@@ -980,7 +1012,7 @@
 	uint8_t reserved;
 
 #elif OSMO_IS_BIG_ENDIAN
-/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
 	uint8_t reserved_p5:3, p5:5;
 	uint8_t reserved_n5:3, n5:5;
 	uint8_t reserved_p6:3, p6:5;
@@ -1003,7 +1035,7 @@
 		s:1,
 		reserved1:1;
 #elif OSMO_IS_BIG_ENDIAN
-/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
 	uint8_t reserved0:2, bsic:6;
 	uint8_t reserved1:1, s:1, ba_used:1, bcch_freq:5;
 #endif
@@ -1018,7 +1050,7 @@
 	uint8_t ms_txpwr_max_def:5,
 		reserved_ms_txpwr_max_def:3;
 #elif OSMO_IS_BIG_ENDIAN
-/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
 	uint8_t reserved_rxlev_min_def:2, rxlev_min_def:6;
 	uint8_t reserved_ho_margin_def:3, ho_margin_def:5;
 	uint8_t reserved_ms_txpwr_max_def:3, ms_txpwr_max_def:5;
@@ -1031,7 +1063,7 @@
 		sdcch_ho_umts:1,
 		reserved:6;
 #elif OSMO_IS_BIG_ENDIAN
-/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
 	uint8_t reserved:6, sdcch_ho_umts:1, sdcch_ho_gsm:1;
 #endif
 }__attribute__ ((packed));
@@ -1055,7 +1087,7 @@
 			ms_pwr:5;
 		uint8_t ta;
 #elif OSMO_IS_BIG_ENDIAN
-/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
 		uint8_t ms_pwr:5, fpc_epc:1, srr_sro:1, reserved:1;
 		uint8_t ta;
 #endif

libosmocore_1.8.0.tar.xz/include/osmocom/gsm/protocol/gsm_12_21.h -> libosmocore_1.9.0.tar.xz/include/osmocom/gsm/protocol/gsm_12_21.h Changed

@@ -775,6 +775,98 @@
 	NM_IPAC_EIE_BTS_ID		= 0x25,
 };
 
+/*! ip.access support flags for NM_IPAC_EIE_FREQ_BANDS */
+#define NM_IPAC_F_FREQ_BAND_PGSM		(1 << 0)
+#define NM_IPAC_F_FREQ_BAND_EGSM		(1 << 1)
+#define NM_IPAC_F_FREQ_BAND_RGSM		(1 << 2)
+#define NM_IPAC_F_FREQ_BAND_DCS			(1 << 3)
+#define NM_IPAC_F_FREQ_BAND_PCS			(1 << 4)
+#define NM_IPAC_F_FREQ_BAND_850			(1 << 5)
+#define NM_IPAC_F_FREQ_BAND_480			(1 << 6)
+#define NM_IPAC_F_FREQ_BAND_450			(1 << 7)
+
+/*! ip.access support flags for NM_IPAC_EIE_CIPH_ALGOS */
+#define NM_IPAC_F_CIPH_ALGO_A51			(1 << 0)
+#define NM_IPAC_F_CIPH_ALGO_A52			(1 << 1)
+#define NM_IPAC_F_CIPH_ALGO_A53			(1 << 2)
+#define NM_IPAC_F_CIPH_ALGO_A54			(1 << 3)
+#define NM_IPAC_F_CIPH_ALGO_A55			(1 << 4)
+#define NM_IPAC_F_CIPH_ALGO_A56			(1 << 5)
+#define NM_IPAC_F_CIPH_ALGO_A57			(1 << 6)
+#define NM_IPAC_F_CIPH_ALGO_A58			(1 << 7)
+
+/*! ip.access support flags for NM_IPAC_EIE_CHAN_TYPES (1st octet) */
+#define NM_IPAC_F_CHANT_TCHF			(1 << 0)
+#define NM_IPAC_F_CHANT_TCHH			(1 << 1)
+#define NM_IPAC_F_CHANT_SDCCH8			(1 << 2)
+#define NM_IPAC_F_CHANT_BCCH			(1 << 3)
+#define NM_IPAC_F_CHANT_BCCH_SDCCH4		(1 << 4)
+#define NM_IPAC_F_CHANT_BCH			(1 << 5)
+#define NM_IPAC_F_CHANT_BCCH_SDCCH4_CBCH	(1 << 6)
+#define NM_IPAC_F_CHANT_SDCCH8_CBCH		(1 << 7)
+/*! ip.access support flags for NM_IPAC_EIE_CHAN_TYPES (2nd octet) */
+#define NM_IPAC_F_CHANT_PDCHF			(1 << 8)
+#define NM_IPAC_F_CHANT_TCHF_PDCHF		(1 << 9)
+#define NM_IPAC_F_CHANT_TCHH_PDCHH		(1 << 10)
+#define NM_IPAC_F_CHANT_TCHF_TCHH		(1 << 11)
+
+/*! ip.access support flags for NM_IPAC_EIE_CHAN_MODES (speech codecs) */
+#define NM_IPAC_F_CHANM_SPEECH_FS		(1 << 0)
+#define NM_IPAC_F_CHANM_SPEECH_EFS		(1 << 1)
+#define NM_IPAC_F_CHANM_SPEECH_AFS		(1 << 2)
+#define NM_IPAC_F_CHANM_SPEECH_HS		(1 << 3)
+#define NM_IPAC_F_CHANM_SPEECH_AHS		(1 << 4)
+/*! ip.access support flags for NM_IPAC_EIE_CHAN_MODES (CSD non-transparent) */
+#define NM_IPAC_F_CHANM_CSD_NT_4k8		(1 << 8)
+#define NM_IPAC_F_CHANM_CSD_NT_9k6		(1 << 9)
+#define NM_IPAC_F_CHANM_CSD_NT_14k4		(1 << 10)
+/*! ip.access support flags for NM_IPAC_EIE_CHAN_MODES (CSD transparent) */
+#define NM_IPAC_F_CHANM_CSD_T_1200_75		(1 << 16)
+#define NM_IPAC_F_CHANM_CSD_T_600		(1 << 17)
+#define NM_IPAC_F_CHANM_CSD_T_1k2		(1 << 18)
+#define NM_IPAC_F_CHANM_CSD_T_2k4		(1 << 19)
+#define NM_IPAC_F_CHANM_CSD_T_4k8		(1 << 20)
+#define NM_IPAC_F_CHANM_CSD_T_9k6		(1 << 21)
+#define NM_IPAC_F_CHANM_CSD_T_14k4		(1 << 22)
+
+/*! ip.access support flags for NM_IPAC_EIE_GPRS_CODING (GPRS) */
+#define NM_IPAC_F_GPRS_CODING_CS1		(1 << 0)
+#define NM_IPAC_F_GPRS_CODING_CS2		(1 << 1)
+#define NM_IPAC_F_GPRS_CODING_CS3		(1 << 2)
+#define NM_IPAC_F_GPRS_CODING_CS4		(1 << 3)
+/*! ip.access support flags for NM_IPAC_EIE_GPRS_CODING (EGPRS) */
+#define NM_IPAC_F_GPRS_CODING_MCS1		(1 << 7)
+#define NM_IPAC_F_GPRS_CODING_MCS2		(1 << 8)
+#define NM_IPAC_F_GPRS_CODING_MCS3		(1 << 9)
+#define NM_IPAC_F_GPRS_CODING_MCS4		(1 << 10)
+#define NM_IPAC_F_GPRS_CODING_MCS5		(1 << 11)
+#define NM_IPAC_F_GPRS_CODING_MCS6		(1 << 12)
+#define NM_IPAC_F_GPRS_CODING_MCS7		(1 << 13)
+#define NM_IPAC_F_GPRS_CODING_MCS8		(1 << 14)
+#define NM_IPAC_F_GPRS_CODING_MCS9		(1 << 15)
+
+/*! ip.access support flags for NM_IPAC_EIE_RTP_FEATURES */
+#define NM_IPAC_F_RTP_FEAT_COMPR_CONTROL	(1 << 0) /* RTP Compression Control */
+#define NM_IPAC_F_RTP_FEAT_IR_8k		(1 << 1) /* IR  8 kbit/s */
+#define NM_IPAC_F_RTP_FEAT_IR_16k		(1 << 2) /* IR 16 kbit/s */
+#define NM_IPAC_F_RTP_FEAT_IR_32k		(1 << 3) /* IR 32 kbit/s */
+#define NM_IPAC_F_RTP_FEAT_IR_64k		(1 << 4) /* IR 64 kbit/s */
+#define NM_IPAC_F_RTP_FEAT_MULTIPLEX_RTP	(1 << 6) /* RTP Multiplexing */
+#define NM_IPAC_F_RTP_FEAT_MULTIPLEX_SRTP	(1 << 7) /* SRTP Multiplexing */
+
+/*! ip.access support flags for NM_IPAC_EIE_RSL_FEATURES */
+#define NM_IPAC_F_RSL_FEAT_PHYSICAL_CONTEXT	(1 << 0)
+#define NM_IPAC_F_RSL_FEAT_DYN_PDCH_ACT		(1 << 1)
+#define NM_IPAC_F_RSL_FEAT_RTP_PT2		(1 << 2)
+
+extern const struct value_string abis_nm_ipacc_freq_band_desc;
+extern const struct value_string abis_nm_ipacc_ciph_algo_desc;
+extern const struct value_string abis_nm_ipacc_chant_desc;
+extern const struct value_string abis_nm_ipacc_chanm_desc;
+extern const struct value_string abis_nm_ipacc_gprs_coding_desc;
+extern const struct value_string abis_nm_ipacc_rtp_feat_desc;
+extern const struct value_string abis_nm_ipacc_rsl_feat_desc;
+
 /*! ip.access NWL BCCH information type */
 enum ipac_bcch_info_type {
 	IPAC_BINF_RXLEV			= (1 << 8),
@@ -790,6 +882,62 @@
 	IPAC_BINF_CELL_ALLOC		= (1 << 2),
 };
 
+/*! ip.access NM_ATT_IPACC_NS_CFG value */
+struct abis_nm_ipacc_att_ns_cfg {
+	uint8_t un_blocking_timer;	/* (un)blocking Timer (Tns-block) timeout */
+	uint8_t un_blocking_retries;	/* (un)blocking Timer (Tns-block) number of retries */
+	uint8_t reset_timer;		/* Reset Timer (Tns-reset) timeout */
+	uint8_t reset_retries;		/* Reset Timer (Tns-reset) number of retries */
+	uint8_t test_timer;		/* Test Timer (Tns-test) timeout */
+	uint8_t alive_timer;		/* Alive Timer (Tns-alive) timeout */
+	uint8_t alive_retries;		/* Alive Timer (Tns-alive) number of retries */
+} __attribute__((packed));
+
+/*! ip.access NM_ATT_IPACC_BSSGP_CFG value */
+struct abis_nm_ipacc_att_bssgp_cfg {
+	uint8_t t1_s;			/* blocking timer (T1) */
+	uint8_t t1_blocking_retries;	/* blocking retries */
+	uint8_t t1_unblocking_retries;	/* unblocking retries */
+	uint8_t t2_s;			/* reset timer (T2) */
+	uint8_t t2_retries;		/* reset retries */
+	uint8_t t3_100ms;		/* suspend timer (T3) in 100ms */
+	uint8_t t3_retries;		/* suspend retries */
+	uint8_t t4_100ms;		/* resume timer (T4) in 100ms */
+	uint8_t t4_retries;		/* resume retries */
+	uint8_t t5_s;			/* capability update timer (T5) */
+	uint8_t t5_retries;		/* capability update retries */
+} __attribute__((packed));
+
+/*! ip.access NM_ATT_IPACC_RLC_CFG value */
+struct abis_nm_ipacc_att_rlc_cfg {
+	uint8_t t3142;
+	uint8_t t3169;
+	uint8_t t3191;
+	uint8_t t3193_10ms;
+	uint8_t t3195;
+	uint8_t n3101;
+	uint8_t n3103;
+	uint8_t n3105;
+	uint8_t rlc_cv_countdown;
+} __attribute__((packed));
+
+/*! ip.access NM_ATT_IPACC_RLC_CFG_2 value */
+struct abis_nm_ipacc_att_rlc_cfg_2 {
+	/* T downlink TBF extension (0..500, network order) */
+	uint16_t t_dl_tbf_ext_10ms;
+	/* T uplink TBF extension (0..500, network order) */
+	uint16_t t_ul_tbf_ext_10ms;
+	/* Initial CS to use: CS1 -> 1, CS2 -> 2, CS3 -> 3, CS4 -> 4 */
+	uint8_t initial_cs;
+} __attribute__((packed));
+
+/*! ip.access NM_ATT_IPACC_RLC_CFG_3 value */
+struct abis_nm_ipacc_att_rlc_cfg_3 {
+	/* Initial MCS to use when EGPRS is used:
+	 * MCS1 -> 1, MCS2 -> 2, ..., MCS9 -> 9 */
+	uint8_t initial_mcs;
+} __attribute__((packed));
+
 /*! Osmocom NSVC address type for NM_ATT_OSMO_NS_LINK_CFG */
 enum osmo_oml_nsvc_address_type {
 	OSMO_NSVC_ADDR_UNSPEC		= 0x00,

libosmocore_1.8.0.tar.xz/include/osmocom/gsm/protocol/gsm_23_032.h -> libosmocore_1.9.0.tar.xz/include/osmocom/gsm/protocol/gsm_23_032.h Changed

@@ -54,7 +54,7 @@
 	uint8_t spare:4,
 		type:4;
 #elif OSMO_IS_BIG_ENDIAN
-/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
 	uint8_t type:4, spare:4;
 #endif
 } __attribute__ ((packed));
@@ -73,7 +73,7 @@
 	uint8_t unc:7,
 		spare2:1;
 #elif OSMO_IS_BIG_ENDIAN
-/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
 	struct gad_raw_head h;
 	uint8_t lat3;
 	uint8_t lon3;
@@ -94,7 +94,7 @@
 	uint8_t confidence:7,
 		spare3:1;
 #elif OSMO_IS_BIG_ENDIAN
-/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
 	struct gad_raw_head h;
 	uint8_t lat3;
 	uint8_t lon3;
@@ -111,7 +111,7 @@
 		uint8_t num_points:4;
 		uint8_t type:4; /*!< type = GAD_TYPE_POLYGON */
 #elif OSMO_IS_BIG_ENDIAN
-/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
 		uint8_t type:4, num_points:4;
 #endif
 	} h;
@@ -144,7 +144,7 @@
 	uint8_t confidence:7,
 		spare4:1;
 #elif OSMO_IS_BIG_ENDIAN
-/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
 	struct gad_raw_head h;
 	uint8_t lat3;
 	uint8_t lon3;
@@ -170,7 +170,7 @@
 	uint8_t confidence:7,
 		spare2:1;
 #elif OSMO_IS_BIG_ENDIAN
-/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
 	struct gad_raw_head h;
 	uint8_t lat3;
 	uint8_t lon3;
@@ -194,7 +194,7 @@
 	uint8_t confidence:7,
 		spare1:1;
 #elif OSMO_IS_BIG_ENDIAN
-/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
 	struct gad_raw_head h;
 	uint8_t lat4;
 	uint8_t lon4;
@@ -221,7 +221,7 @@
 	uint8_t v_confidence:7,
 		spare2:1;
 #elif OSMO_IS_BIG_ENDIAN
-/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
 	struct gad_raw_head h;
 	uint8_t lat4;
 	uint8_t lon4;

libosmocore_1.8.0.tar.xz/include/osmocom/gsm/protocol/gsm_23_041.h -> libosmocore_1.9.0.tar.xz/include/osmocom/gsm/protocol/gsm_23_041.h Changed

libosmocore_1.8.0.tar.xz/include/osmocom/gsm/protocol/gsm_25_415.h -> libosmocore_1.9.0.tar.xz/include/osmocom/gsm/protocol/gsm_25_415.h Changed

@@ -24,7 +24,7 @@
 	/* payload part */
 	uint8_t payload0;
 #elif OSMO_IS_BIG_ENDIAN
-/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
 	uint8_t pdu_type:4, frame_nr:4;
 	uint8_t fqc:2, rfci:6;
 	uint8_t header_crc:6, payload_crc_hi:2;
@@ -47,7 +47,7 @@
 	/* payload part */
 	uint8_t payload0;
 #elif OSMO_IS_BIG_ENDIAN
-/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
 	uint8_t pdu_type:4, frame_nr:4;
 	uint8_t fqc:2, rfci:6;
 	uint8_t header_crc:6, spare:2;
@@ -70,7 +70,7 @@
 	/* payload part */
 	uint8_t payload0;
 #elif OSMO_IS_BIG_ENDIAN
-/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
 	uint8_t pdu_type:4, ack_nack:2, frame_nr:2;
 	uint8_t mode_version:4, proc_ind:4;
 	uint8_t header_crc:6, payload_crc_hi:2;
@@ -87,7 +87,7 @@
 		lri:1;
 	uint8_t subflow_length0; /* 1 or 2 bytes depending on li */
 #elif OSMO_IS_BIG_ENDIAN
-/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
 	uint8_t lri:1, li:1, rfci:6;
 	uint8_t subflow_length0;
 #endif
@@ -100,7 +100,7 @@
 		spare:3;
 	uint8_t rfci_data0; /* struct iuup_ctrl_init_rfci_hdr* */
 #elif OSMO_IS_BIG_ENDIAN
-/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
 	uint8_t spare:3, ti:1, num_subflows_per_rfci:3, chain_ind:1;
 	uint8_t rfci_data0; /* struct iuup_ctrl_init_rfci_hdr* */
 ;
@@ -113,7 +113,7 @@
 		data_pdu_type:4;
 	uint8_t spare_extension0;
 #elif OSMO_IS_BIG_ENDIAN
-/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
 	uint16_t versions_supported;
 	uint8_t data_pdu_type:4, spare:4;
 	uint8_t spare_extension0;
@@ -128,7 +128,7 @@
 		error_distance:2;
 	uint8_t spare_extension0;
 #elif OSMO_IS_BIG_ENDIAN
-/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
 	struct iuup_pdutype14_hdr hdr;
 	uint8_t error_distance:2, error_cause:6;
 	uint8_t spare_extension0;
@@ -149,7 +149,7 @@
 		error_cause:6;
 	uint8_t spare_extension0;
 #elif OSMO_IS_BIG_ENDIAN
-/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
 	struct iuup_pdutype14_hdr hdr;
 	uint8_t error_cause:6, spare:2;
 	uint8_t spare_extension0;

libosmocore_1.8.0.tar.xz/include/osmocom/gsm/protocol/gsm_44_004.h -> libosmocore_1.9.0.tar.xz/include/osmocom/gsm/protocol/gsm_44_004.h Changed

libosmocore_1.9.0.tar.xz/include/osmocom/gsm/protocol/gsm_44_060.h Added

@@ -0,0 +1,252 @@
+/*! \file gsm_44_060.h
+ * General Packet Radio Service (GPRS).
+ * Radio Link Control / Medium Access Control (RLC/MAC) protocol
+ * 3GPP TS 44.060
+ */
+
+#pragma once
+
+#include <stdint.h>
+#include <osmocom/core/endian.h>
+
+/* TS 44.060  10.3a.4.1.1 */
+struct gprs_rlc_ul_header_egprs_1 {
+#if OSMO_IS_LITTLE_ENDIAN
+	uint8_t r:1,
+		 si:1,
+		 cv:4,
+		 tfi_hi:2;
+	uint8_t tfi_lo:3,
+		 bsn1_hi:5;
+	uint8_t bsn1_lo:6,
+		 bsn2_hi:2;
+	uint8_t bsn2_lo:8;
+	uint8_t cps:5,
+		 rsb:1,
+		 pi:1,
+		 spare_hi:1;
+	uint8_t spare_lo:6,
+		 dummy:2;
+#elif OSMO_IS_BIG_ENDIAN
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
+	uint8_t tfi_hi:2, cv:4, si:1, r:1;
+	uint8_t bsn1_hi:5, tfi_lo:3;
+	uint8_t bsn2_hi:2, bsn1_lo:6;
+	uint8_t bsn2_lo:8;
+	uint8_t spare_hi:1, pi:1, rsb:1, cps:5;
+	uint8_t dummy:2, spare_lo:6;
+#endif
+} __attribute__ ((packed));
+
+/* TS 44.060  10.3a.4.2.1 */
+struct gprs_rlc_ul_header_egprs_2 {
+#if OSMO_IS_LITTLE_ENDIAN
+	uint8_t r:1,
+		 si:1,
+		 cv:4,
+		 tfi_hi:2;
+	uint8_t tfi_lo:3,
+		 bsn1_hi:5;
+	uint8_t bsn1_lo:6,
+		 cps_hi:2;
+	uint8_t cps_lo:1,
+		 rsb:1,
+		 pi:1,
+		 spare_hi:5;
+	uint8_t spare_lo:5,
+		 dummy:3;
+#elif OSMO_IS_BIG_ENDIAN
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
+	uint8_t tfi_hi:2, cv:4, si:1, r:1;
+	uint8_t bsn1_hi:5, tfi_lo:3;
+	uint8_t cps_hi:2, bsn1_lo:6;
+	uint8_t spare_hi:5, pi:1, rsb:1, cps_lo:1;
+	uint8_t dummy:3, spare_lo:5;
+#endif
+} __attribute__ ((packed));
+
+/* TS 44.060  10.3a.4.3.1 */
+struct gprs_rlc_ul_header_egprs_3 {
+#if OSMO_IS_LITTLE_ENDIAN
+	uint8_t r:1,
+		 si:1,
+		 cv:4,
+		 tfi_hi:2;
+	uint8_t tfi_lo:3,
+		 bsn1_hi:5;
+	uint8_t bsn1_lo:6,
+		 cps_hi:2;
+	uint8_t cps_lo:2,
+		 spb:2,
+		 rsb:1,
+		 pi:1,
+		 spare:1,
+		 dummy:1;
+#elif OSMO_IS_BIG_ENDIAN
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
+	uint8_t tfi_hi:2, cv:4, si:1, r:1;
+	uint8_t bsn1_hi:5, tfi_lo:3;
+	uint8_t cps_hi:2, bsn1_lo:6;
+	uint8_t dummy:1, spare:1, pi:1, rsb:1, spb:2, cps_lo:2;
+#endif
+} __attribute__ ((packed));
+
+struct gprs_rlc_dl_header_egprs_1 {
+#if OSMO_IS_LITTLE_ENDIAN
+	uint8_t usf:3,
+		 es_p:2,
+		 rrbp:2,
+		 tfi_hi:1;
+	uint8_t tfi_lo:4,
+		 pr:2,
+		 bsn1_hi:2;
+	uint8_t bsn1_mid:8;
+	uint8_t bsn1_lo:1,
+		 bsn2_hi:7;
+	uint8_t bsn2_lo:3,
+		 cps:5;
+#elif OSMO_IS_BIG_ENDIAN
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
+	uint8_t tfi_hi:1, rrbp:2, es_p:2, usf:3;
+	uint8_t bsn1_hi:2, pr:2, tfi_lo:4;
+	uint8_t bsn1_mid:8;
+	uint8_t bsn2_hi:7, bsn1_lo:1;
+	uint8_t cps:5, bsn2_lo:3;
+#endif
+} __attribute__ ((packed));
+
+struct gprs_rlc_dl_header_egprs_2 {
+#if OSMO_IS_LITTLE_ENDIAN
+	uint8_t usf:3,
+		 es_p:2,
+		 rrbp:2,
+		 tfi_hi:1;
+	uint8_t tfi_lo:4,
+		 pr:2,
+		 bsn1_hi:2;
+	uint8_t bsn1_mid:8;
+	uint8_t bsn1_lo:1,
+		 cps:3,
+		 dummy:4;
+#elif OSMO_IS_BIG_ENDIAN
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
+	uint8_t tfi_hi:1, rrbp:2, es_p:2, usf:3;
+	uint8_t bsn1_hi:2, pr:2, tfi_lo:4;
+	uint8_t bsn1_mid:8;
+	uint8_t dummy:4, cps:3, bsn1_lo:1;
+#endif
+} __attribute__ ((packed));
+
+struct gprs_rlc_dl_header_egprs_3 {
+#if OSMO_IS_LITTLE_ENDIAN
+	uint8_t usf:3,
+		 es_p:2,
+		 rrbp:2,
+		 tfi_hi:1;
+	uint8_t tfi_lo:4,
+		 pr:2,
+		 bsn1_hi:2;
+	uint8_t bsn1_mid:8;
+	uint8_t bsn1_lo:1,
+		 cps:4,
+		 spb:2,
+		 dummy:1;
+#elif OSMO_IS_BIG_ENDIAN
+/* auto-generated from the little endian part above (libosmocore/contrib/struct_endianness.py) */
+	uint8_t tfi_hi:1, rrbp:2, es_p:2, usf:3;
+	uint8_t bsn1_hi:2, pr:2, tfi_lo:4;
+	uint8_t bsn1_mid:8;
+	uint8_t dummy:1, spb:2, cps:4, bsn1_lo:1;
+#endif
+} __attribute__ ((packed));
+
+/* TS 44.060 Table 12.24.2
+* Meaning of values documented in TS 23.060 Chapter 6.3.3.1: Network Mode of Operation */
+enum osmo_gprs_nmo {
+	GPRS_NMO_I	= 0,	/* CS pagin on GPRS paging or traffic channel */
+	GPRS_NMO_II	= 1,	/* all paging on CCCH */
+	GPRS_NMO_III	= 2,	/* no paging coordination */
+};
+
+/* TS 44.060 12.24 */
+struct osmo_gprs_cell_options {
+	enum osmo_gprs_nmo nmo;
+	/* T3168: wait for packet uplink assignment message */
+	uint32_t t3168;	/* in milliseconds */
+	/* T3192: wait for release of the TBF after reception of the final block */
+	uint32_t t3192;	/* in milliseconds */
+	uint32_t drx_timer_max;/* in seconds */
+	uint32_t bs_cv_max;
+	uint8_t  supports_egprs_11bit_rach;
+	bool ctrl_ack_type_use_block; /* use PACKET CONTROL ACKNOWLEDGMENT */
+
+	uint8_t ext_info_present;
+	struct {
+		uint8_t egprs_supported;
+		uint8_t use_egprs_p_ch_req;
+		uint8_t bep_period;
+		uint8_t pfc_supported;
+		uint8_t dtm_supported;
+		uint8_t bss_paging_coordination;
+		bool ccn_active;
+	} ext_info;
+};
+
+/* TS 44.060 Table 12.9.2 */
+struct osmo_gprs_power_ctrl_pars {
+	uint8_t alpha;
+	uint8_t t_avg_w;
+	uint8_t t_avg_t;
+	uint8_t pc_meas_chan;
+	uint8_t n_avg_i;
+};
+
+
+/*! Structure for CPS coding and puncturing scheme (TS 44.060 10.4.8a) */
+struct egprs_cps {
+	uint8_t bits;
+	uint8_t mcs;
+	uint8_t p2;
+};
+
+/*! CPS puncturing table selection (TS 44.060 10.4.8a) */
+enum egprs_cps_punc {
+	EGPRS_CPS_P1,
+	EGPRS_CPS_P2,
+	EGPRS_CPS_P3,
+	EGPRS_CPS_NONE = -1,
+};
+
+/*! EGPRS header types (TS 44.060 10.0a.2) */
+enum egprs_hdr_type {
+	EGPRS_HDR_TYPE1,
+	EGPRS_HDR_TYPE2,
+	EGPRS_HDR_TYPE3,
+};
+
+enum osmo_gprs_cs {
+	OSMO_GPRS_CS_NONE,
+	OSMO_GPRS_CS1,
+	OSMO_GPRS_CS2,
+	OSMO_GPRS_CS3,
+	OSMO_GPRS_CS4,
+	OSMO_GPRS_MCS1,
+	OSMO_GPRS_MCS2,
+	OSMO_GPRS_MCS3,
+	OSMO_GPRS_MCS4,
+	OSMO_GPRS_MCS5,
+	OSMO_GPRS_MCS6,
+	OSMO_GPRS_MCS7,
+	OSMO_GPRS_MCS8,
+	OSMO_GPRS_MCS9,
+	_NUM_OSMO_GPRS_CS
+};
+
+int egprs_get_cps(struct egprs_cps *cps, uint8_t type, uint8_t bits);
+
+int osmo_gprs_ul_block_size_bits(enum osmo_gprs_cs cs);
+int osmo_gprs_dl_block_size_bits(enum osmo_gprs_cs cs);
+int osmo_gprs_ul_block_size_bytes(enum osmo_gprs_cs cs);
+int osmo_gprs_dl_block_size_bytes(enum osmo_gprs_cs cs);
+enum osmo_gprs_cs osmo_gprs_ul_cs_by_block_bytes(uint8_t block_size);
+enum osmo_gprs_cs osmo_gprs_dl_cs_by_block_bytes(uint8_t block_size);

libosmocore_1.9.0.tar.xz/include/osmocom/gsm/protocol/gsm_44_068.h Added

@@ -0,0 +1,136 @@
+#pragma once
+#include <stdint.h>
+#include <osmocom/core/utils.h>
+
+/* Group Call Control (GCC) is an ETSI/3GPP standard protocol used between
+ * MS (Mobile Station) and MSC (Mobile Switchting Center) in 2G/GSM-R network.
+ * It is specified in 3GPP TS 44.068.
+ *
+ * (C) 2023 by Sysmocom s.f.m.c. GmbH
+ * All Rights Reserved
+ *
+ * Author: Andreas Eversberg
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ */
+
+/* 9 Information Element Identifiers */
+enum osmo_gsm44068_iei {
+	OSMO_GSM44068_IEI_MOBILE_IDENTITY		= 0x17,
+	OSMO_GSM44068_IEI_USER_USER			= 0x7E,
+	OSMO_GSM44068_IEI_CALL_STATE			= 0xA0,
+	OSMO_GSM44068_IEI_STATE_ATTRIBUTES		= 0xB0,
+	OSMO_GSM44068_IEI_TALKER_PRIORITY		= 0xC0,
+	OSMO_GSM44068_IEI_SMS_INDICATIONS		= 0xD0,
+};
+
+/* 9.3 Message Type */
+enum osmo_gsm44068_msg_type {
+	OSMO_GSM44068_MSGT_IMMEDIATE_SETUP		= 0x31,
+	OSMO_GSM44068_MSGT_SETUP			= 0x32,
+	OSMO_GSM44068_MSGT_CONNECT			= 0x33,
+	OSMO_GSM44068_MSGT_TERMINATION			= 0x34,
+	OSMO_GSM44068_MSGT_TERMINATION_REQUEST		= 0x35,
+	OSMO_GSM44068_MSGT_TERMINATION_REJECT		= 0x36,
+	OSMO_GSM44068_MSGT_STATUS			= 0x38,
+	OSMO_GSM44068_MSGT_GET_STATUS			= 0x39,
+	OSMO_GSM44068_MSGT_SET_PARAMETER		= 0x3a,
+	OSMO_GSM44068_MSGT_IMMEDIATE_SETUP_2		= 0x3b,
+};
+
+/* Table 9.2 priority */
+enum osmo_gsm44068_priority_level {
+	OSMO_GSM44068_PRIO_LEVEL_4			= 0x1,
+	OSMO_GSM44068_PRIO_LEVEL_3			= 0x2,
+	OSMO_GSM44068_PRIO_LEVEL_2			= 0x3,
+	OSMO_GSM44068_PRIO_LEVEL_1			= 0x4,
+	OSMO_GSM44068_PRIO_LEVEL_0			= 0x5,
+	OSMO_GSM44068_PRIO_LEVEL_B			= 0x6,
+	OSMO_GSM44068_PRIO_LEVEL_A			= 0x7,
+};
+
+/* 9.4.2 Call State */
+enum osmo_gsm44068_call_state {
+	OSMO_GSM44068_CSTATE_U0				= 0x0,
+	OSMO_GSM44068_CSTATE_U1				= 0x1,
+	OSMO_GSM44068_CSTATE_U2sl_U2			= 0x2,
+	OSMO_GSM44068_CSTATE_U3				= 0x3,
+	OSMO_GSM44068_CSTATE_U4				= 0x4,
+	OSMO_GSM44068_CSTATE_U5				= 0x5,
+	OSMO_GSM44068_CSTATE_U0p			= 0x6,
+	OSMO_GSM44068_CSTATE_U2wr_U6			= 0x7,
+	OSMO_GSM44068_CSTATE_U2r			= 0x8,
+	OSMO_GSM44068_CSTATE_U2ws			= 0x9,
+	OSMO_GSM44068_CSTATE_U2sr			= 0xa,
+	OSMO_GSM44068_CSTATE_U2nc			= 0xb,
+};
+
+/* 9.4.3 Cause */
+enum osmo_gsm44068_cause {
+	OSMO_GSM44068_CAUSE_ILLEGAL_MS			= 0x03,
+	OSMO_GSM44068_CAUSE_IMEI_NOT_ACCEPTED		= 0x05,
+	OSMO_GSM44068_CAUSE_ILLEGAL_ME			= 0x06,
+	OSMO_GSM44068_CAUSE_SERVICE_NOT_AUTHORIZED	= 0x08,
+	OSMO_GSM44068_CAUSE_APP_NOT_SUPPORTED_ON_PROTO	= 0x09,
+	OSMO_GSM44068_CAUSE_RR_CONNECTION_ABORTED	= 0x0a,
+	OSMO_GSM44068_CAUSE_NORMAL_CALL_CLEARING	= 0x10,
+	OSMO_GSM44068_CAUSE_NETWORK_FAILURE		= 0x11,
+	OSMO_GSM44068_CAUSE_BUSY			= 0x14,
+	OSMO_GSM44068_CAUSE_CONGESTION			= 0x16,
+	OSMO_GSM44068_CAUSE_USER_NOT_ORIGINATOR		= 0x17,
+	OSMO_GSM44068_CAUSE_NET_WANTS_TO_MAINTAIN_CALL	= 0x18,
+	OSMO_GSM44068_CAUSE_RESPONSE_TO_GET_STATUS	= 0x1e,
+	OSMO_GSM44068_CAUSE_SERVICE_OPTION_NOT_SUBSCR	= 0x20,
+	OSMO_GSM44068_CAUSE_REQUESTED_SERVICE_NOT_SUB	= 0x21,
+	OSMO_GSM44068_CAUSE_SERVICE_OPTION_OOO		= 0x22,
+	OSMO_GSM44068_CAUSE_CALL_CANNOT_BE_IDENTIFIED	= 0x26,
+	OSMO_GSM44068_CAUSE_RETRY_UPON_ENTRY_NEW_CALL	= 0x30, /* up to 0x3f */
+	OSMO_GSM44068_CAUSE_INVALID_TRANSACTION_ID	= 0x51,
+	OSMO_GSM44068_CAUSE_SEMANTICALLY_INCORRECT_MSG	= 0x5f,
+	OSMO_GSM44068_CAUSE_INVALID_MANDATORY_INFO	= 0x60,
+	OSMO_GSM44068_CAUSE_MESSAGE_TYPE_NON_EXISTENT	= 0x61,
+	OSMO_GSM44068_CAUSE_MESSAGE_TYPE_NOT_COMPAT	= 0x62,
+	OSMO_GSM44068_CAUSE_IE_NON_EXISTENT		= 0x63,
+	OSMO_GSM44068_CAUSE_IE_NOT_COMPAT		= 0x64,
+	OSMO_GSM44068_CAUSE_PROTOCOL_ERROR		= 0x70,
+};
+
+/* 9.4.4 Originator Indication */
+#define OSMO_GSM44068_OI_MS_IS_ORIGINATOR		0x01
+
+/* 9.4.7 State Attributes */
+#define OSMO_GSM44068_DA_DOWNLINK_ATTACHED		0x08
+#define OSMO_GSM44068_UA_UPLINK_ATTACHED		0x04
+#define OSMO_GSM44068_COMM_T				0x02
+
+/* 9.4.9 Talker Priority */
+enum osmo_gsm44068_talker_priority {
+	OSMO_GSM44068_PRIO_NORMAL			= 0x0,
+	OSMO_GSM44068_PRIO_PRIVILEGED			= 0x1,
+	OSMO_GSM44068_PRIO_EMERGENCY			= 0x2,
+};
+
+/* 9.4.10 SMS Indications */
+#define OSMO_GSM44068_DC_DATA_CONFIDENTALLY_RQD		0x02
+#define OSMO_GSM44068_GP_GUARANTEED_PRIVACY_RQD		0x01
+
+extern const struct value_string osmo_gsm44068_msg_type_names;
+extern const struct value_string osmo_gsm44068_priority_level_names;
+extern const struct value_string osmo_gsm44068_cause_names;
+extern const struct value_string osmo_gsm44068_call_state_names;
+extern const struct value_string osmo_gsm44068_talker_priority_names;
+
+extern const struct tlv_definition osmo_gsm44068_att_tlvdef;

libosmocore_1.8.0.tar.xz/include/osmocom/gsm/protocol/gsm_44_318.h -> libosmocore_1.9.0.tar.xz/include/osmocom/gsm/protocol/gsm_44_318.h Changed

libosmocore_1.8.0.tar.xz/include/osmocom/gsm/protocol/gsm_49_031.h -> libosmocore_1.9.0.tar.xz/include/osmocom/gsm/protocol/gsm_49_031.h Changed

libosmocore_1.8.0.tar.xz/include/osmocom/gsm/tlv.h -> libosmocore_1.9.0.tar.xz/include/osmocom/gsm/tlv.h Changed

libosmocore_1.8.0.tar.xz/include/osmocom/isdn/Makefile.am -> libosmocore_1.9.0.tar.xz/include/osmocom/isdn/Makefile.am Changed

libosmocore_1.8.0.tar.xz/include/osmocom/isdn/i460_mux.h -> libosmocore_1.9.0.tar.xz/include/osmocom/isdn/i460_mux.h Changed

libosmocore_1.9.0.tar.xz/include/osmocom/isdn/v110.h Added

@@ -0,0 +1,50 @@
+#pragma once
+
+#include <osmocom/core/bits.h>
+
+/* See Section 5.1.2.1 of ITU-T V.110 */
+#define MAX_D_BITS	48
+#define MAX_E_BITS	7
+#define MAX_S_BITS	9
+#define MAX_X_BITS	2
+
+/*! a 'decoded' representation of a single V.110 frame. contains unpacket D, E, S and X bits */
+struct osmo_v110_decoded_frame {
+	ubit_t d_bitsMAX_D_BITS;
+	ubit_t e_bitsMAX_E_BITS;
+	ubit_t s_bitsMAX_S_BITS;
+	ubit_t x_bitsMAX_X_BITS;
+};
+
+int osmo_v110_decode_frame(struct osmo_v110_decoded_frame *fr, const ubit_t *ra_bits, size_t n_bits);
+int osmo_v110_encode_frame(ubit_t *ra_bits, size_t n_bits, const struct osmo_v110_decoded_frame *fr);
+
+void osmo_v110_ubit_dump(FILE *outf, const ubit_t *fr, size_t in_len);
+
+
+/*! enum for each supported V.110 synchronous RA1 function (one for each user bitrate) */
+enum osmo_v100_sync_ra1_rate {
+	OSMO_V110_SYNC_RA1_600,
+	OSMO_V110_SYNC_RA1_1200,
+	OSMO_V110_SYNC_RA1_2400,
+	OSMO_V110_SYNC_RA1_4800,
+	OSMO_V110_SYNC_RA1_7200,
+	OSMO_V110_SYNC_RA1_9600,
+	OSMO_V110_SYNC_RA1_12000,
+	OSMO_V110_SYNC_RA1_14400,
+	OSMO_V110_SYNC_RA1_19200,
+	OSMO_V110_SYNC_RA1_24000,
+	OSMO_V110_SYNC_RA1_28800,
+	OSMO_V110_SYNC_RA1_38400,
+	_NUM_OSMO_V110_SYNC_RA1
+};
+
+int osmo_v110_sync_ra1_get_user_data_chunk_bitlen(enum osmo_v100_sync_ra1_rate rate);
+int osmo_v110_sync_ra1_get_user_data_rate(enum osmo_v100_sync_ra1_rate rate);
+int osmo_v110_sync_ra1_get_intermediate_rate(enum osmo_v100_sync_ra1_rate rate);
+
+int osmo_v110_sync_ra1_user_to_ir(enum osmo_v100_sync_ra1_rate rate, struct osmo_v110_decoded_frame *fr,
+				  const ubit_t *d_in, size_t in_len);
+
+int osmo_v110_sync_ra1_ir_to_user(enum osmo_v100_sync_ra1_rate rate, ubit_t *d_out, size_t out_len,
+				  const struct osmo_v110_decoded_frame *fr);

libosmocore_1.8.0.tar.xz/include/osmocom/vty/vty.h -> libosmocore_1.9.0.tar.xz/include/osmocom/vty/vty.h Changed

libosmocore_1.8.0.tar.xz/libosmogb.pc.in -> libosmocore_1.9.0.tar.xz/libosmogb.pc.in Changed

libosmocore_1.8.0.tar.xz/src/codec/Makefile.am -> libosmocore_1.9.0.tar.xz/src/codec/Makefile.am Changed

libosmocore_1.8.0.tar.xz/src/codec/ecu.c -> libosmocore_1.9.0.tar.xz/src/codec/ecu.c Changed

@@ -44,7 +44,7 @@
 
 /*! initialize an ECU instance for given codec.
  *  \paramin ctx talloc context from which to allocate
- *  \parmain codec codec for which to initialize/create ECU */
+ *  \paramin codec codec for which to initialize/create ECU */
 struct osmo_ecu_state *osmo_ecu_init(void *ctx, enum osmo_ecu_codec codec)
 {
 	if (codec >= ARRAY_SIZE(g_ecu_ops))
@@ -96,6 +96,20 @@
 	return g_ecu_opsst->codec->frame_out(st, frame_out);
 }
 
+/*! check if the current state of this ECU is a DTX pause.
+ *  \paramin st ECU state/instance on which to operate
+ *  \return true if DTX pause, false otherwise */
+bool osmo_ecu_is_dtx_pause(struct osmo_ecu_state *st)
+{
+	if (st->codec >= ARRAY_SIZE(g_ecu_ops))
+		return false;
+	if (!g_ecu_opsst->codec)
+		return false;
+	if (!g_ecu_opsst->codec->is_dtx_pause)
+		return false;
+	return g_ecu_opsst->codec->is_dtx_pause(st);
+}
+
 /***********************************************************************
  * low-level API for ECU implementations
  ***********************************************************************/

libosmocore_1.8.0.tar.xz/src/codec/ecu_fr.c -> libosmocore_1.9.0.tar.xz/src/codec/ecu_fr.c Changed

@@ -1,9 +1,15 @@
 /*
  * (C) 2017 by sysmocom - s.f.m.c. GmbH
  * (C) 2017 by Philipp Maier <pmaier@sysmocom.de>
- *
  * All Rights Reserved
  *
+ * Significantly reworked in 2023 by Mother
+ * Mychaela N. Falconia <falcon@freecalypso.org> - however,
+ * Mother Mychaela's contributions are NOT subject to copyright.
+ * No rights reserved, all rights relinquished.
+ * Portions of this code are based on Themyscira libgsmfrp,
+ * a public domain library by the same author.
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
@@ -14,6 +20,46 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
+ *
+ * The present ECU implementation for GSM-FR is closely based on the
+ * TS 46.011 spec from 3GPP; more specifically, it is based on the
+ * Example solution presented in Chapter 6 of that spec, adapted for
+ * libosmocodec ECU architecture, and comes as close to fulfilling
+ * the spec's officially stated requirements (Chapter 5) as is
+ * possible within this Osmocom-imposed architecture.  Please note
+ * the following areas where the present implementation fails to
+ * fulfill the original intent of GSM spec authors:
+ *
+ * - The "lost SID" criterion, defined in GSM 06.31, is based on the
+ *   TAF bit from the Radio Subsystem.  However, libosmocodec ECU API
+ *   does not include this flag, thus spec requirements related to
+ *   lost SID conditions cannot be implemented in a strictly compliant
+ *   manner.  The present implementation improvises its own "lost SID"
+ *   detector (not strictly spec-compliant) by counting frame_out()
+ *   calls in between good traffic frame inputs via frame_in().
+ *
+ * - In the architecture envisioned and assumed in the GSM specs,
+ *   the ECU function of GSM 06.11 was never intended to be a fully
+ *   modular component with its own bona fide I/O interfaces - this
+ *   approach appears to be an Osmocom invention - instead this ECU
+ *   function was intended to be subsumed in the Rx DTX handler
+ *   component of GSM 06.31, also incorporating the comfort noise
+ *   generator of GSM 06.12 - and unlike the narrower-scope ECU,
+ *   this slightly-larger-scope Rx DTX handler is a modular component
+ *   with well-defined I/O interfaces.  In the case of BFI conditions
+ *   following a SID, GSM 06.11 spec was written with the assumption
+ *   that the ECU controls the comfort noise generator via internal
+ *   signals, as opposed to emitting "corrected" SID frames on a
+ *   modular interface going to a CN generator located somewhere else.
+ *   Thus the "correct" behavior for a fully modularized ECU is unclear,
+ *   and an argument can be made that the very existence of such a
+ *   fully modularized ECU is incorrect in itself.  The present
+ *   implementation re-emits a "rejuvenated" form of the last saved
+ *   SID frame during BFI conditions following a SID within the
+ *   permitted window of 48 frames, then starts emitting muted SIDs
+ *   with Xmaxc decreasing by 4 on each frame, and finally switches
+ *   to emitting non-SID silence frames (Table 1 of TS 46.011)
+ *   once Xmaxc reaches 0.
  */
 
 #include <stdbool.h>
@@ -21,144 +67,214 @@
 #include <stdint.h>
 #include <errno.h>
 
-#include <osmocom/core/bitvec.h>
+#include <osmocom/core/prbs.h>
 
-#include <osmocom/codec/gsm610_bits.h>
 #include <osmocom/codec/codec.h>
 #include <osmocom/codec/ecu.h>
 
-/* See also GSM 06.11, chapter 6 Example solution */
-#define GSM610_XMAXC_REDUCE	4
-#define GSM610_XMAXC_LEN	6
-
-/**
- * Reduce the XMAXC field. When the XMAXC field reaches
- * zero the function will return true.
- */
-static bool reduce_xmaxcr(struct bitvec *frame_bitvec,
-	const unsigned int index)
-{
-	unsigned int field_index;
-	uint64_t field;
-
-	field_index = index;
-	field = bitvec_read_field(frame_bitvec, &field_index, GSM610_XMAXC_LEN);
-	if (field > GSM610_XMAXC_REDUCE)
-		field -= GSM610_XMAXC_REDUCE;
-	else
-		field = 0;
+/* See TS 46.011, Chapter 6 Example solution */
+#define GSM611_XMAXC_REDUCE	4
 
-	field_index = index;
-	bitvec_write_field(frame_bitvec, &field_index, field, GSM610_XMAXC_LEN);
+/* The first 5 bytes of RTP encoding neatly contain the magic nibble
+ * and LARc parameters, which also happens to be the part of SID frames
+ * that needs to be passed through as-is. */
+#define	SID_PREFIX_LEN		5
+
+enum ecu_principal_state {
+	STATE_NO_DATA,
+	STATE_SPEECH,
+	STATE_SP_MUTING,
+	STATE_SID,
+	STATE_SID_MUTING,
+};
 
-	return field == 0;
-}
+struct fr_ecu_state {
+	enum ecu_principal_state pr_state;
+	uint8_t speech_frameGSM_FR_BYTES;
+	uint8_t sid_prefixSID_PREFIX_LEN;
+	uint8_t sid_xmaxc;
+	uint8_t sid_reemit_count;
+	struct osmo_prbs_state prng;
+	bool last_input_was_sid;
+};
 
-/**
- * Reduce all XMAXC fields in the frame. When all XMAXC fields
- * reach zero, then the function will return true.
+/* This function is the frame input to the ECU - all inputs to this
+ * function have been received by the Radio Subsystem as good traffic
+ * frames in the GSM 06.31 definition.
  */
-static bool reduce_xmaxcr_all(struct bitvec *frame_bitvec)
+static void fr_ecu_input(struct fr_ecu_state *fr, const uint8_t *frame)
 {
-	bool silent = true;
+	enum osmo_gsm631_sid_class sidc;
 
-	silent &= reduce_xmaxcr(frame_bitvec, GSM610_RTP_XMAXC00);
-	silent &= reduce_xmaxcr(frame_bitvec, GSM610_RTP_XMAXC10);
-	silent &= reduce_xmaxcr(frame_bitvec, GSM610_RTP_XMAXC20);
-	silent &= reduce_xmaxcr(frame_bitvec, GSM610_RTP_XMAXC30);
-
-	return silent;
+	sidc = osmo_fr_sid_classify(frame);
+	switch (sidc) {
+	case OSMO_GSM631_SID_CLASS_SPEECH:
+		memcpy(fr->speech_frame, frame, GSM_FR_BYTES);
+		fr->pr_state = STATE_SPEECH;
+		fr->last_input_was_sid = false;
+		return;
+	case OSMO_GSM631_SID_CLASS_INVALID:
+		/* GSM 06.31 section 6.1.2 says: "an invalid SID frame
+		 * shall be substituted by the last valid SID frame
+		 * and the procedure for valid SID frames be applied."
+		 * However, libosmocodec ECU architecture prevents us
+		 * from doing what the spec says: the frame_in() method
+		 * gets a const frame that can't be modified, and
+		 * frame_out() will never get called when BFI=0, even
+		 * when the "good traffic frame" (in the BFI=0 sense)
+		 * is an invalid SID by the bit-counting rule.
+		 * Thus there is no place where we can re-emit a cached
+		 * copy of the last valid SID upon receiving an invalid SID.
+		 *
+		 * In the standard GSM architecture this problem never
+		 * arises because the ECU is not a separate component
+		 * but is coupled with the CN generator, thus the output
+		 * from the Rx DTX handler block will be a CN frame,
+		 * for both valid-SID and invalid-SID inputs to the block.
+		 * But what can we do within the constraints of libosmocodec
+		 * ECU framework?  We treat the invalid SID almost like a
+		 * BFI, doing almost nothing in the frame_in() method,
+		 * but we reset sid_reemit_count because by the rules of
+		 * GSM 06.31 an invalid SID is still an accepted SID frame
+		 * for the purpose of "lost SID" logic. */
+		fr->sid_reemit_count = 0;
+		fr->last_input_was_sid = true;
+		return;
+	case OSMO_GSM631_SID_CLASS_VALID:
+		/* save LARc part */
+		memcpy(fr->sid_prefix, frame, SID_PREFIX_LEN);
+		/* save Xmaxc from the last subframe */
+		fr->sid_xmaxc = ((frame27 & 0x1F) << 1) | (frame28 >> 7);
+		fr->pr_state = STATE_SID;
+		fr->sid_reemit_count = 0;
+		fr->last_input_was_sid = true;
+		return;
+	default:
+		/* There are only 3 possible SID classifications per GSM 06.31
+		 * section 6.1.1, thus any other return value is a grave error
+		 * in the code. */
+		OSMO_ASSERT(0);
+	}
 }
 
-/* Use certain modifications to conceal the errors in a full rate frame */
-static int conceal_frame(uint8_t *frame)
+/* Reduce all 4 Xmaxc fields in the frame.  When all 4 Xmaxc fields
+ * reach 0, the function will return true for "mute".
+ */
+static bool reduce_xmaxc(uint8_t *frame)
 {
-	struct bitvec *frame_bitvec;
-	unsigned int len;
-	bool silent;
-	int rc = 0;
-
-	/* In case we already deal with a silent frame,
-	 * there is nothing to, we just abort immediately */
-	if (osmo_fr_check_sid(frame, GSM_FR_BYTES))
-		return 0;
-
-	/* Attempt to allocate memory for bitvec */
-	frame_bitvec = bitvec_alloc(GSM_FR_BYTES, NULL);
-	if (!frame_bitvec)
-		return -ENOMEM;
+	bool mute_flag = true;
+	uint8_t sub, xmaxc;
 
-	/* Convert a frame to bitvec */
-	len = bitvec_unpack(frame_bitvec, frame);
-	if (len != GSM_FR_BYTES) {
-		rc = -EIO;
-		goto leave;
+	for (sub = 0; sub < 4; sub++) {
+		xmaxc = ((framesub*7+6 & 0x1F) << 1) | (framesub*7+7 >> 7);
+		if (xmaxc > GSM611_XMAXC_REDUCE) {
+			xmaxc -= GSM611_XMAXC_REDUCE;
+			mute_flag = false;
+		} else
+			xmaxc = 0;
+		framesub*7+6 &= 0xE0;
+		framesub*7+6 |= xmaxc >> 1;
+		framesub*7+7 &= 0x7F;
+		framesub*7+7 |= (xmaxc & 1) << 7;
 	}
+	return mute_flag;
+}
 
-	/* Fudge frame parameters */
-	silent = reduce_xmaxcr_all(frame_bitvec);
+/* TS 46.011 chapter 6, paragraph 4, last sentence: "The grid position
+ * parameters are chosen randomly between 0 and 3 during this time."
+ * (The "during this time" qualifier refers to the speech muting state.)
+ * This sentence in the spec must have been overlooked by previous ECU
+ * implementors, as this aspect of the muting logic was missing.
+ */
+static void random_grid_pos(struct fr_ecu_state *fr, uint8_t *frame)
+{
+	uint8_t sub;
 
-	/* If we reached silence level, mute the frame
-	 * completely, this also means that we can
-	 * save the bitvec_pack operation */
-	if (silent) {
-		memset(frame, 0x00, GSM_FR_BYTES);
-		frame0 = 0xd0;
-		goto leave;
+	for (sub = 0; sub < 4; sub++) {
+		framesub*7+6 &= 0x9F;
+		framesub*7+6 |= osmo_prbs_get_ubit(&fr->prng) << 6;
+		framesub*7+6 |= osmo_prbs_get_ubit(&fr->prng) << 5;
 	}
+}
 
-	/* Convert back to packed byte form */
-	len = bitvec_pack(frame_bitvec, frame);
-	if (len != GSM_FR_BYTES) {
-		rc = -EIO;
-		goto leave;
+/* Like reduce_xmaxc() above, but for comfort noise rather than speech. */
+static bool reduce_xmaxc_sid(struct fr_ecu_state *fr)
+{
+	if (fr->sid_xmaxc > GSM611_XMAXC_REDUCE) {
+		fr->sid_xmaxc -= GSM611_XMAXC_REDUCE;
+		return false;
 	}
-
-leave:
-	bitvec_free(frame_bitvec);
-	return rc;
+	fr->sid_xmaxc = 0;
+	return true;
 }
 
-/*!
- * To be called when a good frame is received.
- * This function will then create a backup of the frame
- * and reset the internal state.
- * \paramin state The state object for the ECU
- * \paramout frame The valid frame (GSM_FR_BYTES bytes in RTP payload format)
+/* This function implements the part which is peculiar to the present
+ * "standalone" packaging of GSM-FR ECU, without a directly coupled
+ * comfort noise generator - it re-emits synthetic SID frames during
+ * DTX pauses, initially unchanged from the saved SID and later muted.
  */
-void osmo_ecu_fr_reset(struct osmo_ecu_fr_state *state, const uint8_t *frame)
+static void reemit_sid(struct fr_ecu_state *fr, uint8_t *frame)
 {
-	state->subsequent_lost_frame = false;
-	memcpy(state->frame_backup, frame, GSM_FR_BYTES);
+	uint8_t *p, sub;
+
+	memcpy(frame, fr->sid_prefix, SID_PREFIX_LEN);
+	p = frame + SID_PREFIX_LEN;
+	for (sub = 0; sub < 4; sub++) {
+		*p++ = 0;
+		*p++ = fr->sid_xmaxc >> 1;
+		*p++ = (fr->sid_xmaxc & 1) << 7;
+		*p++ = 0;
+		*p++ = 0;
+		*p++ = 0;
+		*p++ = 0;
+	}
 }
 
-/*!
- * To be called when a bad frame is received.
- * This function will then generate a replacement frame
- * that can be used to conceal the dropout.
- * \paramin state The state object for the ECU
- * \paramout frame The buffer to fill with GSM_FR_BYTES of replacement frame
- * \returns 0 if the frame was sucessfully filled
+/* This function is responsible for generating the ECU's output
+ * in the event that the Radio Subsystem does not have a good
+ * traffic frame - conditions corresponding to BFI=1 in the specs.
  */
-int osmo_ecu_fr_conceal(struct osmo_ecu_fr_state *state, uint8_t *frame)
+static void fr_ecu_output(struct fr_ecu_state *fr, uint8_t *frame)
 {
-	int rc;
+	bool mute;
 
-	/* For subsequent frames we run the error concealment
-	 * functions on the backed up frame before we restore
-	 * the backup */
-	if (state->subsequent_lost_frame) {
-		rc = conceal_frame(state->frame_backup);
-		if (rc)
-			return rc;
+	switch (fr->pr_state) {
+	case STATE_NO_DATA:
+		memcpy(frame, osmo_gsm611_silence_frame, GSM_FR_BYTES);
+		return;
+	case STATE_SPEECH:
+		/* TS 46.011 chapter 6: "The first lost speech frame is
+		 * replaced at the speech decoder input by the previous
+		 * good speech frame." */
+		memcpy(frame, fr->speech_frame, GSM_FR_BYTES);
+		fr->pr_state = STATE_SP_MUTING;
+		return;
+	case STATE_SP_MUTING:
+		mute = reduce_xmaxc(fr->speech_frame);
+		memcpy(frame, fr->speech_frame, GSM_FR_BYTES);
+		random_grid_pos(fr, frame);
+		if (mute)
+			fr->pr_state = STATE_NO_DATA;
+		return;
+	case STATE_SID:
+		fr->sid_reemit_count++;
+		if (fr->sid_reemit_count >= 48) {
+			fr->pr_state = STATE_SID_MUTING;
+			reduce_xmaxc_sid(fr);
+		}
+		reemit_sid(fr, frame);
+		return;
+	case STATE_SID_MUTING:
+		if (reduce_xmaxc_sid(fr)) {
+			fr->pr_state = STATE_NO_DATA;
+			memcpy(frame, osmo_gsm611_silence_frame, GSM_FR_BYTES);
+		} else
+			reemit_sid(fr, frame);
+		return;
+	default:
+		/* a severe bug in the state machine! */
+		OSMO_ASSERT(0);
 	}
-
-	/* Restore the backed up frame and set flag in case
-	 * we receive even more bad frames */
-	memcpy(frame, state->frame_backup, GSM_FR_BYTES);
-	state->subsequent_lost_frame = true;
-
-	return 0;
 }
 
 /***********************************************************************
@@ -168,7 +284,8 @@
 static struct osmo_ecu_state *ecu_fr_init(void *ctx, enum osmo_ecu_codec codec)
 {
 	struct osmo_ecu_state *st;
-	size_t size = sizeof(*st) + sizeof(struct osmo_ecu_fr_state);
+	struct fr_ecu_state *fr;
+	size_t size = sizeof(*st) + sizeof(*fr);
 
 	st = talloc_named_const(ctx, size, "ecu_state_FR");
 	if (!st)
@@ -176,6 +293,9 @@
 
 	memset(st, 0, size);
 	st->codec = codec;
+	fr = (struct fr_ecu_state *) &st->data;
+	fr->pr_state = STATE_NO_DATA;
+	osmo_prbs_state_init(&fr->prng, &osmo_prbs15);
 
 	return st;
 }
@@ -183,28 +303,39 @@
 static int ecu_fr_frame_in(struct osmo_ecu_state *st, bool bfi, const uint8_t *frame,
 			   unsigned int frame_bytes)
 {
-	struct osmo_ecu_fr_state *fr = (struct osmo_ecu_fr_state *) &st->data;
+	struct fr_ecu_state *fr = (struct fr_ecu_state *) &st->data;
+
 	if (bfi)
 		return 0;
+	if (frame_bytes != GSM_FR_BYTES)
+		return 0;
+	if ((frame0 & 0xF0) != 0xD0)
+		return 0;
 
-	osmo_ecu_fr_reset(fr, frame);
+	fr_ecu_input(fr, frame);
 	return 0;
 }
 
 static int ecu_fr_frame_out(struct osmo_ecu_state *st, uint8_t *frame_out)
 {
-	struct osmo_ecu_fr_state *fr = (struct osmo_ecu_fr_state *) &st->data;
+	struct fr_ecu_state *fr = (struct fr_ecu_state *) &st->data;
+
+	fr_ecu_output(fr, frame_out);
+	return GSM_FR_BYTES;
+}
+
+static bool ecu_fr_is_dtx_pause(struct osmo_ecu_state *st)
+{
+	struct fr_ecu_state *fr = (struct fr_ecu_state *) &st->data;
 
-	if (osmo_ecu_fr_conceal(fr, frame_out) == 0)
-		return GSM_FR_BYTES;
-	else
-		return -1;
+	return fr->last_input_was_sid;
 }
 
 static const struct osmo_ecu_ops osmo_ecu_ops_fr = {
 	.init = ecu_fr_init,
 	.frame_in = ecu_fr_frame_in,
 	.frame_out = ecu_fr_frame_out,
+	.is_dtx_pause = ecu_fr_is_dtx_pause,
 };
 
 static __attribute__((constructor)) void on_dso_load_ecu_fr(void)

libosmocore_1.9.0.tar.xz/src/codec/ecu_fr_old.c Added

@@ -0,0 +1,166 @@
+/*
+ * (C) 2017 by sysmocom - s.f.m.c. GmbH
+ * (C) 2017 by Philipp Maier <pmaier@sysmocom.de>
+ *
+ * All Rights Reserved
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ *
+ * This module implements legacy, deprecated osmo_ecu_fr_reset() and
+ * osmo_ecu_fr_conceal() functions only - see ecu_fr.c for the new
+ * GSM-FR ECU implementation.
+ */
+
+#include <stdbool.h>
+#include <string.h>
+#include <stdint.h>
+#include <errno.h>
+
+#include <osmocom/core/bitvec.h>
+
+#include <osmocom/codec/gsm610_bits.h>
+#include <osmocom/codec/codec.h>
+#include <osmocom/codec/ecu.h>
+
+/* See also GSM 06.11, chapter 6 Example solution */
+#define GSM610_XMAXC_REDUCE	4
+#define GSM610_XMAXC_LEN	6
+
+/**
+ * Reduce the XMAXC field. When the XMAXC field reaches
+ * zero the function will return true.
+ */
+static bool reduce_xmaxcr(struct bitvec *frame_bitvec,
+	const unsigned int index)
+{
+	unsigned int field_index;
+	uint64_t field;
+
+	field_index = index;
+	field = bitvec_read_field(frame_bitvec, &field_index, GSM610_XMAXC_LEN);
+	if (field > GSM610_XMAXC_REDUCE)
+		field -= GSM610_XMAXC_REDUCE;
+	else
+		field = 0;
+
+	field_index = index;
+	bitvec_write_field(frame_bitvec, &field_index, field, GSM610_XMAXC_LEN);
+
+	return field == 0;
+}
+
+/**
+ * Reduce all XMAXC fields in the frame. When all XMAXC fields
+ * reach zero, then the function will return true.
+ */
+static bool reduce_xmaxcr_all(struct bitvec *frame_bitvec)
+{
+	bool silent = true;
+
+	silent &= reduce_xmaxcr(frame_bitvec, GSM610_RTP_XMAXC00);
+	silent &= reduce_xmaxcr(frame_bitvec, GSM610_RTP_XMAXC10);
+	silent &= reduce_xmaxcr(frame_bitvec, GSM610_RTP_XMAXC20);
+	silent &= reduce_xmaxcr(frame_bitvec, GSM610_RTP_XMAXC30);
+
+	return silent;
+}
+
+/* Use certain modifications to conceal the errors in a full rate frame */
+static int conceal_frame(uint8_t *frame)
+{
+	struct bitvec *frame_bitvec;
+	unsigned int len;
+	bool silent;
+	int rc = 0;
+
+	/* In case we already deal with a silent frame,
+	 * there is nothing to, we just abort immediately */
+	if (osmo_fr_check_sid(frame, GSM_FR_BYTES))
+		return 0;
+
+	/* Attempt to allocate memory for bitvec */
+	frame_bitvec = bitvec_alloc(GSM_FR_BYTES, NULL);
+	if (!frame_bitvec)
+		return -ENOMEM;
+
+	/* Convert a frame to bitvec */
+	len = bitvec_unpack(frame_bitvec, frame);
+	if (len != GSM_FR_BYTES) {
+		rc = -EIO;
+		goto leave;
+	}
+
+	/* Fudge frame parameters */
+	silent = reduce_xmaxcr_all(frame_bitvec);
+
+	/* If we reached silence level, mute the frame
+	 * completely, this also means that we can
+	 * save the bitvec_pack operation */
+	if (silent) {
+		memset(frame, 0x00, GSM_FR_BYTES);
+		frame0 = 0xd0;
+		goto leave;
+	}
+
+	/* Convert back to packed byte form */
+	len = bitvec_pack(frame_bitvec, frame);
+	if (len != GSM_FR_BYTES) {
+		rc = -EIO;
+		goto leave;
+	}
+
+leave:
+	bitvec_free(frame_bitvec);
+	return rc;
+}
+
+/*!
+ * To be called when a good frame is received.
+ * This function will then create a backup of the frame
+ * and reset the internal state.
+ * \paramin state The state object for the ECU
+ * \paramout frame The valid frame (GSM_FR_BYTES bytes in RTP payload format)
+ */
+void osmo_ecu_fr_reset(struct osmo_ecu_fr_state *state, const uint8_t *frame)
+{
+	state->subsequent_lost_frame = false;
+	memcpy(state->frame_backup, frame, GSM_FR_BYTES);
+}
+
+/*!
+ * To be called when a bad frame is received.
+ * This function will then generate a replacement frame
+ * that can be used to conceal the dropout.
+ * \paramin state The state object for the ECU
+ * \paramout frame The buffer to fill with GSM_FR_BYTES of replacement frame
+ * \returns 0 if the frame was successfully filled
+ */
+int osmo_ecu_fr_conceal(struct osmo_ecu_fr_state *state, uint8_t *frame)
+{
+	int rc;
+
+	/* For subsequent frames we run the error concealment
+	 * functions on the backed up frame before we restore
+	 * the backup */
+	if (state->subsequent_lost_frame) {
+		rc = conceal_frame(state->frame_backup);
+		if (rc)
+			return rc;
+	}
+
+	/* Restore the backed up frame and set flag in case
+	 * we receive even more bad frames */
+	memcpy(frame, state->frame_backup, GSM_FR_BYTES);
+	state->subsequent_lost_frame = true;
+
+	return 0;
+}

libosmocore_1.8.0.tar.xz/src/codec/gsm610.c -> libosmocore_1.9.0.tar.xz/src/codec/gsm610.c Changed

@@ -296,6 +296,35 @@
 	29,	/* LARc5:0 */
 };
 
+/*
+ * Table 1 in section 6 of 3GPP TS 46.011 (substitution and muting of lost
+ * frames) specifies a silence frame in the form of GSM 06.10 parameters;
+ * the following const datum is this GSM 06.11 silence frame in GSM-FR
+ * RTP encoding.
+ */
+const uint8_t osmo_gsm611_silence_frameGSM_FR_BYTES = {
+	0xDA, 0xA7, 0xAA, 0xA5, 0x1A,
+	0x50, 0x20, 0x38, 0xE4, 0x6D, 0xB9, 0x1B,
+	0x50, 0x20, 0x38, 0xE4, 0x6D, 0xB9, 0x1B,
+	0x50, 0x20, 0x38, 0xE4, 0x6D, 0xB9, 0x1B,
+	0x50, 0x20, 0x38, 0xE4, 0x6D, 0xB9, 0x1B,
+};
+
+static const uint16_t sid_code_word_bits95 = {
+	/* bit numbers are relative to the RTP frame beginning,
+	 * with signature bits included in the count. */
+	57, 58, 60, 61, 63, 64, 66, 67, 69, 70, 72, 73,
+	75, 76, 78, 79, 81, 82, 84, 85, 87, 88, 90, 91,
+	93, 94, 113, 114, 116, 117, 119, 120, 122, 123,
+	125, 126, 128, 129, 131, 132, 134, 135, 137,
+	138, 140, 141, 143, 144, 146, 147, 149, 150,
+	169, 170, 172, 173, 175, 176, 178, 179, 181,
+	182, 184, 185, 187, 188, 190, 191, 193, 194,
+	196, 197, 199, 200, 202, 203, 205, 206, 225,
+	226, 228, 229, 231, 232, 234, 235, 237, 240,
+	243, 246, 249, 252, 255, 258, 261
+};
+
 /*! Check whether RTP frame contains FR SID code word according to
  *  TS 101 318 §5.1.2
  *  \paramin rtp_payload Buffer with RTP payload
@@ -305,16 +334,7 @@
 bool osmo_fr_check_sid(const uint8_t *rtp_payload, size_t payload_len)
 {
 	struct bitvec bv;
-	uint16_t i, z_bits = { 57, 58, 60, 61, 63, 64, 66, 67, 69, 70, 72, 73,
-				 75, 76, 78, 79, 81, 82, 84, 85, 87, 88, 90, 91,
-				 93, 94, 113, 114, 116, 117, 119, 120, 122, 123,
-				 125, 126, 128, 129, 131, 132, 134, 135, 137,
-				 138, 140, 141, 143, 144, 146, 147, 149, 150,
-				 169, 170, 172, 173, 175, 176, 178, 179, 181,
-				 182, 184, 185, 187, 188, 190, 191, 193, 194,
-				 196, 197, 199, 200, 202, 203, 205, 206, 225,
-				 226, 228, 229, 231, 232, 234, 235, 237, 240,
-				 243, 246, 249, 252, 255, 258, 261 };
+	uint16_t i;
 
 	/* signature does not match Full Rate SID */
 	if ((rtp_payload0 >> 4) != 0xD)
@@ -323,10 +343,120 @@
 	bv.data = (uint8_t *) rtp_payload;
 	bv.data_len = payload_len;
 
-	/* code word is all 0 at given bits, numbered from 1 */
-	for (i = 0; i < ARRAY_SIZE(z_bits); i++)
-		if (bitvec_get_bit_pos(&bv, z_bitsi) != ZERO)
+	/* code word is all 0 at given bits */
+	for (i = 0; i < ARRAY_SIZE(sid_code_word_bits); i++) {
+		if (bitvec_get_bit_pos(&bv, sid_code_word_bitsi) != ZERO)
 			return false;
+	}
 
 	return true;
 }
+
+/*! Classify potentially-SID FR codec frame in RTP format according
+ *  to the rules of GSM 06.31 §6.1.1
+ *  \paramin rtp_payload Buffer with RTP payload
+ *  \returns enum osmo_gsm631_sid_class, with symbolic values
+ *  OSMO_GSM631_SID_CLASS_SPEECH, OSMO_GSM631_SID_CLASS_INVALID or
+ *  OSMO_GSM631_SID_CLASS_VALID corresponding to the 3 possible bit-counting
+ *  classifications prescribed by the spec.
+ *
+ *  Differences between the more familiar osmo_fr_check_sid() and the present
+ *  function are:
+ *
+ *  1. osmo_fr_check_sid() returns true only if the SID frame is absolutely
+ *     perfect, with all 95 bits of the SID code word zeroed.  However, the
+ *     rules of GSM 06.31 §6.1.1 allow up to one bit to be in error,
+ *     and the frame is still accepted as valid SID.
+ *
+ *  2. The third possible state of invalid SID is not handled at all by the
+ *     simpler osmo_fr_check_sid() function.
+ *
+ *  3. osmo_fr_check_sid() includes a check for 0xD RTP signature, and returns
+ *     false if that signature nibble is wrong.  That check is not included
+ *     in the present version because there is no place for it in the
+ *     ETSI-prescribed classification, it is neither speech nor SID.  The
+ *     assumption is that this function is used to classify the bit content
+ *     of received codec frames, not their RTP encoding - the latter needs
+ *     to be validated beforehand.
+ *
+ *  Which function should one use?  The answer depends on the specific
+ *  circumstances, and needs to be addressed on a case-by-case basis.
+ */
+enum osmo_gsm631_sid_class osmo_fr_sid_classify(const uint8_t *rtp_payload)
+{
+	struct bitvec bv;
+	uint16_t i, n;
+
+	bv.data = (uint8_t *) rtp_payload;
+	bv.data_len = GSM_FR_BYTES;
+
+	/* count not-SID-matching bits per the spec */
+	n = 0;
+	for (i = 0; i < ARRAY_SIZE(sid_code_word_bits); i++) {
+		if (bitvec_get_bit_pos(&bv, sid_code_word_bitsi) != ZERO)
+			n++;
+		if (n >= 16)
+			return OSMO_GSM631_SID_CLASS_SPEECH;
+	}
+	if (n >= 2)
+		return OSMO_GSM631_SID_CLASS_INVALID;
+	else
+		return OSMO_GSM631_SID_CLASS_VALID;
+}
+
+/*! Reset the SID field and the unused bits of a potentially corrupted,
+ *  but still valid GSM-FR SID frame in RTP encoding to their pristine state.
+ *  \paramin rtp_payload Buffer with RTP payload - must be writable!
+ *
+ *  Per GSM 06.12 section 5.2, a freshly minted SID frame carries 60 bits
+ *  of comfort noise parameters (LARc and 4 times Xmaxc), while the remaining
+ *  200 bits are all zeros; the latter 200 all-0 bits further break down into
+ *  95 bits of SID field (checked by receivers to detect SID) and 105 unused
+ *  bits which receivers are told to ignore.  Network elements that receive
+ *  SID frames from call leg A uplink and need to retransmit them on leg B
+ *  downlink should "rejuvenate" received SID frames prior to retransmission;
+ *  this function does the job.
+ */
+void osmo_fr_sid_reset(uint8_t *rtp_payload)
+{
+	uint8_t *p, sub;
+
+	p = rtp_payload + 5;	/* skip magic+LARc */
+	for (sub = 0; sub < 4; sub++) {
+		*p++ = 0;
+		*p++ &= 0x1F;	/* upper 5 bits of Xmaxc field */
+		*p++ &= 0x80;	/* and the lsb spilling into the next byte */
+		*p++ = 0;
+		*p++ = 0;
+		*p++ = 0;
+		*p++ = 0;
+	}
+}
+
+/*! Preen potentially-SID FR codec frame in RTP format, ensuring that it is
+ *  either a speech frame or a valid SID, and if the latter, making it a
+ *  perfect, error-free SID frame.
+ *  \paramin rtp_payload Buffer with RTP payload - must be writable!
+ *  \returns true if the frame is good, false otherwise
+ */
+bool osmo_fr_sid_preen(uint8_t *rtp_payload)
+{
+	enum osmo_gsm631_sid_class sidc;
+
+	sidc = osmo_fr_sid_classify(rtp_payload);
+	switch (sidc) {
+	case OSMO_GSM631_SID_CLASS_SPEECH:
+		return true;
+	case OSMO_GSM631_SID_CLASS_INVALID:
+		return false;
+	case OSMO_GSM631_SID_CLASS_VALID:
+		/* "Rejuvenate" this SID frame, correcting any errors */
+		osmo_fr_sid_reset(rtp_payload);
+		return true;
+	default:
+		/* There are only 3 possible SID classifications per GSM 06.31
+		 * section 6.1.1, thus any other return value is a grave error
+		 * in the code. */
+		OSMO_ASSERT(0);
+	}
+}

libosmocore_1.8.0.tar.xz/src/codec/gsm620.c -> libosmocore_1.9.0.tar.xz/src/codec/gsm620.c Changed

@@ -21,6 +21,7 @@
 
 #include <stdint.h>
 #include <stdbool.h>
+#include <string.h>
 
 #include <osmocom/core/bitvec.h>
 #include <osmocom/core/utils.h>
@@ -285,3 +286,31 @@
 
 	return true;
 }
+
+/*! Reset the SID field of a potentially corrupted, but still valid GSM-HR
+ *  SID frame in TS 101 318 format to its pristine state (full SID codeword).
+ *  \paramin rtp_payload Buffer with RTP payload - must be writable!
+ *
+ *  Per GSM 06.22 section 5.3, a freshly minted SID frame consists of 33 bits
+ *  of comfort noise parameters and 79 bits of SID codeword (all 1s).  Network
+ *  elements that receive SID frames from call leg A uplink and need to
+ *  retransmit them on leg B downlink should "rejuvenate" received SID frames
+ *  prior to retransmission by resetting the SID field to its pristine state
+ *  of all 1s; this function does the job.
+ *
+ *  Important note: because of HR-specific quirks (lack of exact bit counting
+ *  rules in GSM 06.41 spec compared to 06.31 & 06.81, plus the fact that such
+ *  bit counting can only be done efficiently in the GSM 05.03 channel decoder
+ *  prior to bit reordering based on voiced or unvoiced mode), a generic
+ *  (usable from any network element) SID classification function similar to
+ *  osmo_{fr,efr}_sid_classify() unfortunately cannot exist for HR.  Therefore,
+ *  the triggering condition for invoking this SID rejuvenation/reset function
+ *  can only be an out-of-band SID indication, as in GSM 08.61 TRAU frames
+ *  or RFC 5993 ToC octet.
+ */
+void osmo_hr_sid_reset(uint8_t *rtp_payload)
+{
+	/* set all 79 SID codeword bits to 1 */
+	rtp_payload4 |= 0x7F;
+	memset(rtp_payload + 5, 0xFF, 9);
+}

libosmocore_1.8.0.tar.xz/src/codec/gsm660.c -> libosmocore_1.9.0.tar.xz/src/codec/gsm660.c Changed

@@ -20,6 +20,10 @@
  */
 
 #include <stdint.h>
+#include <stdbool.h>
+
+#include <osmocom/core/bitvec.h>
+#include <osmocom/core/utils.h>
 #include <osmocom/codec/codec.h>
 
 /* GSM EFR - subjective importance bit ordering */
@@ -253,3 +257,161 @@
 	243,					/* 258 -> PULSE 4_9: b0     */
 	246,					/* 259 -> PULSE 4_10: b0    */
 };
+
+static const uint8_t sid_code_word_bits95 = {
+	/* bit numbers are relative to "pure" EFR frame beginning,
+	 * not counting the signature bits. */
+	   45,  46,  48,  49,  50,  51,  52,  53,  54,  55,
+	   56,  57,  58,  59,  60,  61,  62,  63,  64,  65,
+	   66,  67,  68,  94,  95,  96,  98,  99, 100, 101,
+	  102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+	  112, 113, 114, 115, 116, 117, 118, 148, 149, 150,
+	  151, 152, 153, 154, 155, 156, 157, 158, 159, 160,
+	  161, 162, 163, 164, 165, 166, 167, 168, 169, 170,
+	  171, 196, 197, 198, 199, 200, 201, 202, 203, 204,
+	  205, 206, 207, 208, 209, 212, 213, 214, 215, 216,
+	  217, 218, 219, 220, 221
+};
+
+/*! Check whether RTP frame contains EFR SID code word according to
+ *  TS 101 318 §5.3.2
+ *  \paramin rtp_payload Buffer with RTP payload
+ *  \paramin payload_len Length of payload
+ *  \returns true if code word is found, false otherwise
+ */
+bool osmo_efr_check_sid(const uint8_t *rtp_payload, size_t payload_len)
+{
+	struct bitvec bv;
+	uint16_t i;
+
+	/* signature does not match Enhanced Full Rate SID */
+	if ((rtp_payload0 >> 4) != 0xC)
+		return false;
+
+	bv.data = (uint8_t *) rtp_payload;
+	bv.data_len = payload_len;
+
+	/* code word is all 1 at given bits */
+	for (i = 0; i < ARRAY_SIZE(sid_code_word_bits); i++) {
+		if (bitvec_get_bit_pos(&bv, sid_code_word_bitsi+4) != ONE)
+			return false;
+	}
+
+	return true;
+}
+
+/*! Classify potentially-SID EFR codec frame in RTP format according
+ *  to the rules of GSM 06.81 §6.1.1
+ *  \paramin rtp_payload Buffer with RTP payload
+ *  \returns enum osmo_gsm631_sid_class, with symbolic values
+ *  OSMO_GSM631_SID_CLASS_SPEECH, OSMO_GSM631_SID_CLASS_INVALID or
+ *  OSMO_GSM631_SID_CLASS_VALID corresponding to the 3 possible bit-counting
+ *  classifications prescribed by the spec.
+ *
+ *  Differences between the more familiar osmo_efr_check_sid() and the present
+ *  function are:
+ *
+ *  1. osmo_efr_check_sid() returns true only if the SID frame is absolutely
+ *     perfect, with all 95 bits of the SID code word set.  However, the
+ *     rules of GSM 06.81 §6.1.1 allow up to one bit to be in error,
+ *     and the frame is still accepted as valid SID.
+ *
+ *  2. The third possible state of invalid SID is not handled at all by the
+ *     simpler osmo_efr_check_sid() function.
+ *
+ *  3. osmo_efr_check_sid() includes a check for 0xC RTP signature, and returns
+ *     false if that signature nibble is wrong.  That check is not included
+ *     in the present version because there is no place for it in the
+ *     ETSI-prescribed classification, it is neither speech nor SID.  The
+ *     assumption is that this function is used to classify the bit content
+ *     of received codec frames, not their RTP encoding - the latter needs
+ *     to be validated beforehand.
+ *
+ *  Which function should one use?  The answer depends on the specific
+ *  circumstances, and needs to be addressed on a case-by-case basis.
+ */
+enum osmo_gsm631_sid_class osmo_efr_sid_classify(const uint8_t *rtp_payload)
+{
+	struct bitvec bv;
+	uint16_t i, n;
+
+	bv.data = (uint8_t *) rtp_payload;
+	bv.data_len = GSM_EFR_BYTES;
+
+	/* count not-SID-matching bits per the spec */
+	n = 0;
+	for (i = 0; i < ARRAY_SIZE(sid_code_word_bits); i++) {
+		if (bitvec_get_bit_pos(&bv, sid_code_word_bitsi+4) != ONE)
+			n++;
+		if (n >= 16)
+			return OSMO_GSM631_SID_CLASS_SPEECH;
+	}
+	if (n >= 2)
+		return OSMO_GSM631_SID_CLASS_INVALID;
+	else
+		return OSMO_GSM631_SID_CLASS_VALID;
+}
+
+/*! Reset the SID field of a potentially corrupted, but still valid GSM-EFR
+ *  SID frame in RTP encoding to its pristine state (full SID code word).
+ *  \paramin rtp_payload Buffer with RTP payload - must be writable!
+ *
+ *  Per GSM 06.62 section 5.3, a freshly minted SID frame consists of 58 bits
+ *  of comfort noise parameters (LSF and 4 times fixed codebook gain), 95 bits
+ *  of SID code word (all 1s) and 91 unused bits (all 0s).  Network elements
+ *  that receive SID frames from call leg A uplink and need to retransmit them
+ *  on leg B downlink should "rejuvenate" received SID frames prior to
+ *  retransmission by resetting the SID field to its pristine state of all 1s;
+ *  this function does the job.
+ *
+ *  Potential TODO: it would be nice to also zero out the remaining 91 bits
+ *  which the spec leaves as reserved, clearing out leg A radio bit errors -
+ *  but do we really need to?
+ */
+void osmo_efr_sid_reset(uint8_t *rtp_payload)
+{
+	/* set all 95 SID code word bits to 1 */
+	rtp_payload6  |= 0x6F;
+	rtp_payload7   = 0xFF;
+	rtp_payload8   = 0xFF;
+	rtp_payload9  |= 0x80;
+	rtp_payload12 |= 0x3B;
+	rtp_payload13  = 0xFF;
+	rtp_payload14  = 0xFF;
+	rtp_payload15 |= 0xE0;
+	rtp_payload19  = 0xFF;
+	rtp_payload20  = 0xFF;
+	rtp_payload21  = 0xFF;
+	rtp_payload25  = 0xFF;
+	rtp_payload26 |= 0xFC;
+	rtp_payload27  = 0xFF;
+	rtp_payload28 |= 0xC0;
+}
+
+/*! Preen potentially-SID EFR codec frame in RTP format, ensuring that it is
+ *  either a speech frame or a valid SID, and if the latter, making it a
+ *  perfect, error-free SID frame.
+ *  \paramin rtp_payload Buffer with RTP payload - must be writable!
+ *  \returns true if the frame is good, false otherwise
+ */
+bool osmo_efr_sid_preen(uint8_t *rtp_payload)
+{
+	enum osmo_gsm631_sid_class sidc;
+
+	sidc = osmo_efr_sid_classify(rtp_payload);
+	switch (sidc) {
+	case OSMO_GSM631_SID_CLASS_SPEECH:
+		return true;
+	case OSMO_GSM631_SID_CLASS_INVALID:
+		return false;
+	case OSMO_GSM631_SID_CLASS_VALID:
+		/* "Rejuvenate" this SID frame, correcting any errors */
+		osmo_efr_sid_reset(rtp_payload);
+		return true;
+	default:
+		/* There are only 3 possible SID classifications per GSM 06.81
+		 * section 6.1.1, thus any other return value is a grave error
+		 * in the code. */
+		OSMO_ASSERT(0);
+	}
+}

libosmocore_1.8.0.tar.xz/src/coding/Makefile.am -> libosmocore_1.9.0.tar.xz/src/coding/Makefile.am Changed

libosmocore_1.8.0.tar.xz/src/coding/gsm0503_coding.c -> libosmocore_1.9.0.tar.xz/src/coding/gsm0503_coding.c Changed

@@ -31,9 +31,7 @@
 #include <osmocom/core/crcgen.h>
 #include <osmocom/core/endian.h>
 
-#include <osmocom/gprs/protocol/gsm_04_60.h>
-#include <osmocom/gprs/gprs_rlc.h>
-
+#include <osmocom/gsm/protocol/gsm_44_060.h>
 #include <osmocom/gsm/protocol/gsm_04_08.h>
 #include <osmocom/gsm/gsm0503.h>
 #include <osmocom/codec/codec.h>
@@ -608,7 +606,7 @@
 
 /*! convenience wrapper for encoding to coded bits
  *  \paramout cB caller-allocated buffer for 456 coded bits as per TS 05.03 4.1.3
- *  \paramout l2_data to-be-encoded L2 Frame
+ *  \paramin l2_data to-be-encoded L2 Frame
  *  \returns 0 */
 static int _xcch_encode_cB(ubit_t *cB, const uint8_t *l2_data)
 {
@@ -1574,24 +1572,22 @@
 	}
 }
 
-/* assemble a HR codec frame in format as used inside RTP */
+/* assemble a HR codec frame in the canonical format of ETSI TS 101 318 */
 static void tch_hr_reassemble(uint8_t *tch_data, const ubit_t *b_bits)
 {
-	int i, j;
-
-	tch_data0 = 0x00; /* F = 0, FT = 000 */
-	memset(tch_data + 1, 0, 14);
+	int i;
 
-	for (i = 0, j = 8; i < 112; i++, j++)
-		tch_dataj >> 3 |= (b_bitsi << (7 - (j & 7)));
+	memset(tch_data, 0, GSM_HR_BYTES);
+	for (i = 0; i < 112; i++)
+		tch_datai >> 3 |= (b_bitsi << (7 - (i & 7)));
 }
 
 static void tch_hr_disassemble(ubit_t *b_bits, const uint8_t *tch_data)
 {
-	int i, j;
+	int i;
 
-	for (i = 0, j = 8; i < 112; i++, j++)
-		b_bitsi = (tch_dataj >> 3 >> (7 - (j & 7))) & 1;
+	for (i = 0; i < 112; i++)
+		b_bitsi = (tch_datai >> 3 >> (7 - (i & 7))) & 1;
 }
 
 /* assemble a EFR codec frame in format as used inside RTP */
@@ -1806,7 +1802,7 @@
 	s119 = (sum >= 2);
 	memcpy(s + 121, w + 125, 53);
 	sum = s172 + w178 + w179;
-	s172 = (sum > 2);
+	s172 = (sum >= 2);
 	memcpy(s + 174, w + 180, 50);
 	sum = s222 + w230 + w231;
 	s222 = (sum >= 2);
@@ -1862,7 +1858,7 @@
 			return -1;
 		}
 
-		return 23;
+		return GSM_MACBLOCK_LEN;
 	}
 
 	osmo_conv_decode_ber(&gsm0503_tch_fr, cB, conv, n_errors, n_bits_total);
@@ -1929,40 +1925,39 @@
 
 	switch (len) {
 	case GSM_EFR_BYTES: /* TCH EFR */
-
 		tch_efr_disassemble(s, tch_data);
-
 		tch_efr_protected(s, b);
-
 		osmo_crc8gen_set_bits(&gsm0503_tch_efr_crc8, b, 65, p);
-
 		tch_efr_reorder(w, s, p);
-
 		tch_efr_w_to_d(d, w);
-
 		goto coding_efr_fr;
 	case GSM_FR_BYTES: /* TCH FR */
 		tch_fr_disassemble(w, tch_data, net_order);
-
 		tch_fr_b_to_d(d, w);
-
 coding_efr_fr:
 		osmo_crc8gen_set_bits(&gsm0503_tch_fr_crc3, d, 50, p);
-
 		tch_fr_reorder(conv, d, p);
-
 		memcpy(cB + 378, d + 182, 78);
-
 		osmo_conv_encode(&gsm0503_tch_fr, conv, cB);
-
 		h = 0;
-
+		break;
+	case 0:			/* no data, induce BFI in the receiver */
+		/* Do the same thing that sysmoBTS PHY does when fed a 0-length
+		 * payload for DL: set all u(k) bits to 0, and do the same
+		 * with all class 2 bits.  This operation is NOT the same as
+		 * an FR codec frame of all zero bits: with all-zeros d(k) input
+		 * the CRC3 function will produce 111 output, whereas we
+		 * transmit 000 in those parity bits too.  The result will be
+		 * an induced BFI (bad frame indication) condition in the
+		 * receiver, for both TCH/FS and TCH/EFS decoders. */
+		memset(conv, 0, sizeof(conv));
+		memset(cB + 378, 0, 78);
+		osmo_conv_encode(&gsm0503_tch_fr, conv, cB);
+		h = 0;
 		break;
 	case GSM_MACBLOCK_LEN: /* FACCH */
 		_xcch_encode_cB(cB, tch_data);
-
 		h = 1;
-
 		break;
 	default:
 		return -1;
@@ -1979,13 +1974,13 @@
 }
 
 /*! Perform channel decoding of a HR(v1) channel according TS 05.03
- *  \paramout tch_data Codec frame in RTP payload format
- *  \paramin bursts buffer containing the symbols of 8 bursts
+ *  \paramout tch_data Codec frame in TS 101 318 canonical format
+ *  \paramin bursts buffer containing the symbols of 6 bursts
  *  \paramin odd Odd (1) or even (0) frame number
  *  \paramout n_errors Number of detected bit errors
  *  \paramout n_bits_total Total number of bits
  *  \returns length of bytes used in \a tch_data output buffer; negative on error */
-int gsm0503_tch_hr_decode(uint8_t *tch_data, const sbit_t *bursts, int odd,
+int gsm0503_tch_hr_decode2(uint8_t *tch_data, const sbit_t *bursts, int odd,
 	int *n_errors, int *n_bits_total)
 {
 	sbit_t iB912, cB456, h;
@@ -1999,7 +1994,7 @@
 			steal -= h;
 		}
 
-		for (i = 2; i < 5; i++) {
+		for (i = 2; i < 6; i++) {
 			gsm0503_tch_burst_unmap(NULL, &burstsi * 116, &h, 1);
 			steal -= h;
 		}
@@ -2052,7 +2047,35 @@
 
 	tch_hr_reassemble(tch_data, b);
 
-	return 15;
+	return GSM_HR_BYTES;
+}
+
+/*! Perform channel decoding of a HR(v1) channel according TS 05.03,
+ *  deprecated legacy API.
+ *  \paramout tch_data Codec frame in pseudo-RFC5993 format
+ *  \paramin bursts buffer containing the symbols of 6 bursts
+ *  \paramin odd Odd (1) or even (0) frame number
+ *  \paramout n_errors Number of detected bit errors
+ *  \paramout n_bits_total Total number of bits
+ *  \returns length of bytes used in \a tch_data output buffer; negative on error
+ *
+ *  The HR1 codec frame format returned by this function is pseudo-RFC5993,
+ *  not true RFC 5993, as there is no SID classification being done
+ *  and the FT bits in the ToC octet are always set to 0 - but this
+ *  arguably-bogus format is the legacy public API.
+ */
+int gsm0503_tch_hr_decode(uint8_t *tch_data, const sbit_t *bursts, int odd,
+	int *n_errors, int *n_bits_total)
+{
+	int rc;
+
+	rc = gsm0503_tch_hr_decode2(tch_data, bursts, odd, n_errors,
+				    n_bits_total);
+	if (rc != GSM_HR_BYTES)
+		return rc;
+	memmove(tch_data + 1, tch_data, GSM_HR_BYTES);
+	tch_data0 = 0x00;	/* FT=0, note absence of SID classification */
+	return GSM_HR_BYTES_RTP_RFC5993;
 }
 
 /*! Perform channel encoding on a TCH/HS channel according to TS 05.03
@@ -2067,46 +2090,41 @@
 	int i;
 
 	switch (len) {
-	case 15: /* TCH HR */
+	case GSM_HR_BYTES_RTP_RFC5993:	/* TCH HR with RFC 5993 prefix */
+		tch_data++;
+		/* fall-through */
+	case GSM_HR_BYTES:	/* TCH HR in "pure" form */
 		tch_hr_disassemble(b, tch_data);
-
 		tch_hr_b_to_d(d, b);
-
 		osmo_crc8gen_set_bits(&gsm0503_tch_fr_crc3, d + 73, 22, p);
-
 		tch_hr_reorder(conv, d, p);
-
-		osmo_conv_encode(&gsm0503_tch_hr, conv, cB);
-
 		memcpy(cB + 211, d + 95, 17);
-
+hr_conv_coding:
+		osmo_conv_encode(&gsm0503_tch_hr, conv, cB);
 		h = 0;
-
 		gsm0503_tch_hr_interleave(cB, iB);
-
 		for (i = 0; i < 4; i++) {
 			gsm0503_tch_burst_map(&iBi * 114,
 				&burstsi * 116, &h, i >> 1);
 		}
-
 		break;
+	case 0:			/* no data, induce BFI in the receiver */
+		/* see comments in gsm0503_tch_fr_encode() - same deal here */
+		memset(conv, 0, sizeof(conv));
+		memset(cB + 211, 0, 17);
+		goto hr_conv_coding;
 	case GSM_MACBLOCK_LEN: /* FACCH */
 		_xcch_encode_cB(cB, tch_data);
-
 		h = 1;
-
 		gsm0503_tch_fr_interleave(cB, iB);
-
 		for (i = 0; i < 6; i++) {
 			gsm0503_tch_burst_map(&iBi * 114,
 				&burstsi * 116, &h, i >> 2);
 		}
-
 		for (i = 2; i < 4; i++) {
 			gsm0503_tch_burst_map(&iBi * 114 + 456,
 				&burstsi * 116, &h, 1);
 		}
-
 		break;
 	default:
 		return -1;
@@ -2244,7 +2262,7 @@
 			tch_amr_sid_update_append(sid_first_dummy, 0,
 						  (codec_mode_req) ? codec*ft
 						  : codecid > 0 ? id : 0);
-			tch_amr_reassemble(tch_data, conv, 39);
+			tch_amr_reassemble(tch_data, sid_first_dummy, 39);
 			len = 5;
 			goto out;
 		case AFS_SID_UPDATE: /* TODO: parse CMI _and_ CMC/CMR (16 + 16 bit) */
@@ -2608,9 +2626,9 @@
 	return id;
 }
 
-/*! Perform channel decoding of a TCH/AFS channel according TS 05.03
+/*! Perform channel decoding of a TCH/AHS channel according TS 05.03
  *  \paramout tch_data Codec frame in RTP payload format
- *  \paramin bursts buffer containing the symbols of 8 bursts
+ *  \paramin bursts buffer containing the symbols of 6 bursts
  *  \paramin odd Is this an odd (1) or even (0) frame number?
  *  \paramin codec_mode_req is this CMR (1) or CMC (0)
  *  \paramin codec array of active codecs (active codec set)
@@ -2631,9 +2649,9 @@
 					  n_bits_total, NULL);
 }
 
-/*! Perform channel decoding of a TCH/AFS channel according TS 05.03
+/*! Perform channel decoding of a TCH/AHS channel according TS 05.03
  *  \paramout tch_data Codec frame in RTP payload format
- *  \paramin bursts buffer containing the symbols of 8 bursts
+ *  \paramin bursts buffer containing the symbols of 6 bursts
  *  \paramin odd Is this an odd (1) or even (0) frame number?
  *  \paramin codec_mode_req is this CMR (1) or CMC (0)
  *  \paramin codec array of active codecs (active codec set)
@@ -3267,4 +3285,491 @@
 	return 0;
 }
 
+/*
+ * GSM CSD transcoding
+ */
+
+static inline void _tch_csd_burst_map(ubit_t *burst, const ubit_t *iB)
+{
+	unsigned int i;
+
+	/* hu(B): copy *even* numbered bits if not stolen by FACCH */
+	if (burst58 == 0) {
+		for (i = 0; i < 57; i += 2)
+			bursti |= iBi;
+		for (i = 58; i < 114; i += 2)
+			bursti + 2 |= iBi;
+	}
+
+	/* hl(B): copy *odd* numbered bits if not stolen by FACCH */
+	if (burst57 == 0) {
+		for (i = 1; i < 57; i += 2)
+			bursti |= iBi;
+		for (i = 57; i < 114; i += 2)
+			bursti + 2 |= iBi;
+	}
+}
+
+/*! Perform channel encoding of a TCH/F9.6 channel as per section 3.3.
+ *  \paramout bursts Caller-allocated buffer for symbols of 22 bursts,
+ *                     22 * 2 * 58 == 2552 bits total.
+ *  \paramin data Data to be encoded (240 unpacked bits).
+ *  \returns 0 in case of success; negative on error. */
+int gsm0503_tch_fr96_encode(ubit_t *bursts, const ubit_t *data)
+{
+	ubit_t iB22 * 114, cB4 * 114;
+	ubit_t conv4 * 60 + 4;
+
+	/* 3.3.2 Block code: b1(60) + b2(60) + b3(60) + b4(60) + pad(4) */
+	memcpy(&conv0, &data0, 4 * 60);
+	/* pad(4) is set to 0 by osmo_conv_encode() below */
+
+	/* 3.3.3 Convolutional encoder */
+	osmo_conv_encode(&gsm0503_tch_f96, &conv0, &cB0);
+
+	/* 3.3.4 Interleaving */
+	memset(&iB0, 0, sizeof(iB));
+	gsm0503_tch_f96_interleave(&cB0, &iB0);
+
+	/* 3.3.5 Mapping on a burst: as specified for TCH/FS in subclause 3.1.4 */
+	for (unsigned int i = 0; i < 22; i++)
+		_tch_csd_burst_map(&burstsi * 116, &iBi * 114);
+
+	return 0;
+}
+
+/*! Perform channel decoding of a TCH/F9.6 channel as per section 3.3.
+ *  \paramout data Caller-allocated buffer for decoded data (240 unpacked bits).
+ *  \paramin bursts Buffer containing the symbols of 22 bursts,
+ *                    22 * 2 * 58 == 2552 bits total.
+ *  \paramout n_errors Number of detected bit errors.
+ *  \paramout n_bits_total Total number of bits.
+ *  \returns Number of unpacked bits used in the output buffer; negative on error. */
+int gsm0503_tch_fr96_decode(ubit_t *data, const sbit_t *bursts,
+			    int *n_errors, int *n_bits_total)
+{
+	sbit_t iB22 * 114, cB4 * 114;
+	ubit_t conv4 * 60 + 4;
+
+	/* 3.3.5 Mapping on a burst: as specified for TCH/FS in subclause 3.1.4 */
+	for (unsigned int i = 0; i < 22; i++) {
+		memcpy(&iBi * 114, &burstsi * 116, 57);
+		memcpy(&iBi * 114 + 57, &burstsi * 116 + 59, 57);
+	}
+
+	/* 3.3.4 Interleaving */
+	gsm0503_tch_f96_deinterleave(&cB0, &iB0);
+
+	/* 3.3.3 Convolutional encoder */
+	osmo_conv_decode_ber(&gsm0503_tch_f96, &cB0, &conv0, n_errors, n_bits_total);
+
+	/* 3.3.2 Block code: b1(60) + b2(60) + b3(60) + b4(60) + pad(4) */
+	memcpy(&data0, &conv0, 4 * 60);
+
+	return 4 * 60;
+}
+
+/*! Perform channel encoding of a TCH/F4.8 channel as per section 3.4.
+ *  \paramout bursts Caller-allocated buffer for symbols of 22 bursts,
+ *                     22 * 2 * 58 == 2552 bits total.
+ *  \paramin data Data to be encoded (120 unpacked bits).
+ *  \returns 0 in case of success; negative on error */
+int gsm0503_tch_fr48_encode(ubit_t *bursts, const ubit_t *data)
+{
+	ubit_t iB22 * 114, cB4 * 114;
+	ubit_t conv2 * 60 + 32;
+
+	/* 3.4.2 Block code:
+	 *
+	 * Sixteen bits equal to 0 are added to the 60 information bits, the result
+	 * being a block of 76 bits, {u(0),u(1),...,u(75)}, with:
+	 *
+	 * u(19k+p) = d(15k+p)    for k = 0,1,2,3 and p = 0,1,...,14;
+	 * u(19k+p) = 0           for k = 0,1,2,3 and p = 15,16,17,18.
+	 *
+	 * Two such blocks forming a block of 152 bits: u1 + u2. */
+	for (unsigned int k = 0; k < 2 * 4; k++) {
+		memcpy(&conv19 * k, &data15 * k, 15);
+		memset(&conv19 * k + 15, 0, 4);
+	}
+
+	/* 3.4.3 Convolutional encoder */
+	osmo_conv_encode(&gsm0503_tch_f48, &conv0, &cB0);
+
+	/* 3.4.4 Interleaving: as specified for the TCH/F9.6 in subclause 3.3.4 */
+	memset(&iB0, 0, sizeof(iB));
+	gsm0503_tch_f96_interleave(&cB0, &iB0);
+
+	/* 3.4.5 Mapping on a burst: as specified for TCH/FS in subclause 3.1.4 */
+	for (unsigned int i = 0; i < 22; i++)
+		_tch_csd_burst_map(&burstsi * 116, &iBi * 114);
+
+	return 0;
+}
+
+/*! Perform channel decoding of a TCH/F4.8 channel as per section 3.4.
+ *  \paramout data Caller-allocated buffer for decoded data (120 unpacked bits).
+ *  \paramin bursts Buffer containing the symbols of 22 bursts,
+ *                    22 * 2 * 58 == 2552 bits total.
+ *  \paramout n_errors Number of detected bit errors.
+ *  \paramout n_bits_total Total number of bits.
+ *  \returns Number of unpacked bits used in the output buffer; negative on error. */
+int gsm0503_tch_fr48_decode(ubit_t *data, const sbit_t *bursts,
+			    int *n_errors, int *n_bits_total)
+{
+	sbit_t iB22 * 114, cB4 * 114;
+	ubit_t conv2 * 60 + 32;
+
+	/* 3.4.5 Mapping on a burst: as specified for TCH/FS in subclause 3.1.4 */
+	for (unsigned int i = 0; i < 22; i++) {
+		memcpy(&iBi * 114, &burstsi * 116, 57);
+		memcpy(&iBi * 114 + 57, &burstsi * 116 + 59, 57);
+	}
+
+	/* 3.4.4 Interleaving: as specified for the TCH/F9.6 in subclause 3.3.4 */
+	gsm0503_tch_f96_deinterleave(&cB0, &iB0);
+
+	/* 3.4.3 Convolutional encoder */
+	osmo_conv_decode_ber(&gsm0503_tch_f48, &cB0, &conv0, n_errors, n_bits_total);
+
+	/* 3.4.2 Block code:
+	 *
+	 * Sixteen bits equal to 0 are added to the 60 information bits, the result
+	 * being a block of 76 bits, {u(0),u(1),...,u(75)}, with:
+	 *
+	 * u(19k+p) = d(15k+p)    for k = 0,1,2,3 and p = 0,1,...,14;
+	 * u(19k+p) = 0           for k = 0,1,2,3 and p = 15,16,17,18.
+	 *
+	 * Two such blocks forming a block of 152 bits: u1 + u2. */
+	for (unsigned int k = 0; k < 2 * 4; k++)
+		memcpy(&data15 * k, &conv19 * k, 15);
+
+	return 2 * 60;
+}
+
+/*! Perform channel encoding of a TCH/H4.8 channel as per section 3.5.
+ *  The algorithm is identical to TCH/F9.6, so it's just a wrapper.
+ *  \paramout bursts Caller-allocated buffer for symbols of 22 bursts,
+ *                     22 * 2 * 58 == 2552 bits total.
+ *  \paramin data Data to be encoded (240 unpacked bits).
+ *  \returns 0 in case of success; negative on error */
+int gsm0503_tch_hr48_encode(ubit_t *bursts, const ubit_t *data)
+{
+	return gsm0503_tch_fr96_encode(bursts, data);
+}
+
+/*! Perform channel decoding of a TCH/H4.8 channel as per section 3.5.
+ *  The algorithm is identical to TCH/F9.6, so it's just a wrapper.
+ *  \paramout data Caller-allocated buffer for decoded data (240 unpacked bits).
+ *  \paramin bursts Buffer containing the symbols of 22 bursts,
+ *                    22 * 2 * 58 == 2552 bits total.
+ *  \paramout n_errors Number of detected bit errors.
+ *  \paramout n_bits_total Total number of bits.
+ *  \returns Number of unpacked bits used in the output buffer; negative on error. */
+int gsm0503_tch_hr48_decode(ubit_t *data, const sbit_t *bursts,
+			    int *n_errors, int *n_bits_total)
+{
+	return gsm0503_tch_fr96_decode(data, bursts, n_errors, n_bits_total);
+}
+
+/*! Perform channel encoding of a TCH/F2.4 channel as per section 3.6.
+ *  \paramout bursts Caller-allocated buffer for symbols of 8 bursts,
+ *                     8 * 2 * 58 == 928 bits total.
+ *  \paramin data Data to be encoded (72 unpacked bits).
+ *  \returns 0 in case of success; negative on error */
+int gsm0503_tch_fr24_encode(ubit_t *bursts, const ubit_t *data)
+{
+	ubit_t iB8 * 114, cB4 * 114;
+	const ubit_t h = 0;
+
+	/* 3.6.{1-3} Block code and Convolutional encoder */
+	osmo_conv_encode(&gsm0503_tch_f24, &data0, &cB0);
+
+	/* 3.6.4 Interleaving: as specified for the TCH/FS in subclause 3.1.3 */
+	gsm0503_tch_fr_interleave(&cB0, &iB0);
+
+	/* 3.6.5 Mapping on a burst: as specified for TCH/FS in subclause 3.1.4 */
+	for (unsigned int i = 0; i < 8; i++)
+		gsm0503_tch_burst_map(&iBi * 114, &burstsi * 116, &h, i >> 2);
+
+	return 0;
+}
+
+/*! Perform channel decoding of a TCH/F2.4 channel as per section 3.6.
+ *  \paramout data Caller-allocated buffer for decoded data (72 unpacked bits).
+ *  \paramin bursts Buffer containing the symbols of 8 bursts,
+ *                    8 * 2 * 58 == 928 bits total.
+ *  \paramout n_errors Number of detected bit errors.
+ *  \paramout n_bits_total Total number of bits.
+ *  \returns Number of unpacked bits used in the output buffer; negative on error. */
+int gsm0503_tch_fr24_decode(ubit_t *data, const sbit_t *bursts,
+			    int *n_errors, int *n_bits_total)
+{
+	sbit_t iB8 * 114, cB4 * 114;
+
+	/* 3.6.5 Mapping on a burst: as specified for TCH/FS in subclause 3.1.4 */
+	for (unsigned int i = 0; i < 8; i++)
+		gsm0503_tch_burst_unmap(&iBi * 114, &burstsi * 116, NULL, i >> 2);
+
+	/* 3.6.4 Interleaving: as specified for the TCH/FS in subclause 3.1.3 */
+	gsm0503_tch_fr_deinterleave(&cB0, &iB0);
+
+	/* 3.6.{1-3} Block code and Convolutional encoder */
+	osmo_conv_decode_ber(&gsm0503_tch_f24, &cB0, &data0, n_errors, n_bits_total);
+
+	return 72;
+}
+
+/*! Perform channel encoding of a TCH/H2.4 channel as per section 3.7.
+ *  \paramout bursts Caller-allocated buffer for symbols of 22 bursts,
+ *                     22 * 2 * 58 == 2552 bits total.
+ *  \paramin data Data to be encoded (144 unpacked bits).
+ *  \returns 0 in case of success; negative on error */
+int gsm0503_tch_hr24_encode(ubit_t *bursts, const ubit_t *data)
+{
+	ubit_t iB22 * 114, cB4 * 114;
+
+	/* 3.7.{1-3} Block code and Convolutional encoder */
+	osmo_conv_encode(&gsm0503_tch_h24, &data 0, &cB  0);
+	osmo_conv_encode(&gsm0503_tch_h24, &data72, &cB228);
+
+	/* 3.7.4 Interleaving: as specified for the TCH/F9.6 in subclause 3.3.4 */
+	memset(&iB0, 0, sizeof(iB));
+	gsm0503_tch_f96_interleave(&cB0, &iB0);
+
+	/* 3.7.5 Mapping on a burst: as specified for TCH/FS in subclause 3.1.4 */
+	for (unsigned int i = 0; i < 22; i++)
+		_tch_csd_burst_map(&burstsi * 116, &iBi * 114);
+
+	return 0;
+}
+
+/*! Perform channel decoding of a TCH/H2.4 channel as per section 3.7.
+ *  \paramout data Caller-allocated buffer for decoded data (144 unpacked bits).
+ *  \paramin bursts Buffer containing the symbols of 22 bursts,
+ *                    22 * 2 * 58 == 2552 bits total.
+ *  \paramout n_errors Number of detected bit errors.
+ *  \paramout n_bits_total Total number of bits.
+ *  \returns Number of unpacked bits used in the output buffer; negative on error. */
+int gsm0503_tch_hr24_decode(ubit_t *data, const sbit_t *bursts,
+			    int *n_errors, int *n_bits_total)
+{
+	int n_errors_l2, n_bits_total_l2;
+	sbit_t iB22 * 114, cB4 * 114;
+
+	/* 3.7.5 Mapping on a burst: as specified for TCH/FS in subclause 3.1.4 */
+	for (unsigned int i = 0; i < 22; i++) {
+		memcpy(&iBi * 114, &burstsi * 116, 57);
+		memcpy(&iBi * 114 + 57, &burstsi * 116 + 59, 57);
+	}
+
+	/* 3.7.4 Interleaving: as specified for the TCH/F9.6 in subclause 3.3.4 */
+	gsm0503_tch_f96_deinterleave(&cB0, &iB0);
+
+	/* 3.7.{1-3} Block code and Convolutional encoder */
+	osmo_conv_decode_ber(&gsm0503_tch_h24, &cB  0, &data 0, &n_errors_l0, &n_bits_total_l0);
+	osmo_conv_decode_ber(&gsm0503_tch_h24, &cB228, &data72, &n_errors_l1, &n_bits_total_l1);
+
+	if (n_errors)
+		*n_errors = n_errors_l0 + n_errors_l1;
+
+	if (n_bits_total)
+		*n_bits_total = n_bits_total_l0 + n_bits_total_l1;
+
+	return 2 * 72;
+}
+
+/*! Perform channel encoding of a TCH/F14.4 channel as per section 3.8.
+ *  \paramout bursts Caller-allocated buffer for symbols of 22 bursts,
+ *                     22 * 2 * 58 == 2552 bits total.
+ *  \paramin data Data to be encoded (290 unpacked bits).
+ *  \returns 0 in case of success; negative on error */
+int gsm0503_tch_fr144_encode(ubit_t *bursts, const ubit_t *data)
+{
+	ubit_t iB22 * 114, cB4 * 114;
+	ubit_t conv290 + 4;
+
+	/* 3.8.2 Block code: b(290) + pad(4) */
+	memcpy(&conv0, &data0, 290);
+	/* pad(4) is set to 0 by osmo_conv_encode() below */
+
+	/* 3.8.3 Convolutional encoder */
+	osmo_conv_encode(&gsm0503_tch_f144, &conv0, &cB0);
+
+	/* 3.8.4 Interleaving */
+	memset(&iB0, 0, sizeof(iB));
+	gsm0503_tch_f96_interleave(&cB0, &iB0);
+
+	/* 3.8.5 Mapping on a burst: as specified for TCH/FS in subclause 3.1.4 */
+	for (unsigned int i = 0; i < 22; i++)
+		_tch_csd_burst_map(&burstsi * 116, &iBi * 114);
+
+	return 0;
+}
+
+/*! Perform channel decoding of a TCH/14.4 channel as per section 3.8.
+ *  \paramout data Caller-allocated buffer for decoded data (290 unpacked bits).
+ *  \paramin bursts Buffer containing the symbols of 22 bursts,
+ *                    22 * 2 * 58 == 2552 bits total.
+ *  \paramout n_errors Number of detected bit errors.
+ *  \paramout n_bits_total Total number of bits.
+ *  \returns Number of unpacked bits used in the output buffer; negative on error. */
+int gsm0503_tch_fr144_decode(ubit_t *data, const sbit_t *bursts,
+			     int *n_errors, int *n_bits_total)
+{
+	sbit_t iB22 * 114, cB4 * 114;
+	ubit_t conv294;
+
+	/* 3.8.5 Mapping on a burst: as specified for TCH/FS in subclause 3.1.4 */
+	for (unsigned int i = 0; i < 22; i++) {
+		memcpy(&iBi * 114, &burstsi * 116, 57);
+		memcpy(&iBi * 114 + 57, &burstsi * 116 + 59, 57);
+	}
+
+	/* 3.8.4 Interleaving: as specified for the TCH/F9.6 in subclause 3.3.4 */
+	gsm0503_tch_f96_deinterleave(&cB0, &iB0);
+
+	/* 3.8.3 Convolutional encoder */
+	osmo_conv_decode_ber(&gsm0503_tch_f144, &cB0, &conv0, n_errors, n_bits_total);
+
+	/* 3.8.2 Block code: b(290) + pad(4) */
+	memcpy(&data0, &conv0, 290);
+
+	return 290;
+}
+
+/*
+ * FACCH/FH transcoding
+ */
+
+/*! Perform channel encoding of a FACCH/F data as per section 4.2.
+ *  \paramout bursts Caller-allocated buffer for symbols of 8 bursts,
+ *                     8 * 2 * 58 == 928 bits total.
+ *  \paramin data FACCH MAC block to be encoded (GSM_MACBLOCK_LEN).
+ *  \returns 0 in case of success; negative on error */
+int gsm0503_tch_fr_facch_encode(ubit_t *bursts, const uint8_t *data)
+{
+	ubit_t iB8 * 114, cB4 * 114;
+	const ubit_t h = 1;
+
+	/* 4.2.1-3 as specified for the SACCH in 4.1.1-3 */
+	_xcch_encode_cB(&cB0, &data0);
+
+	/* 4.2.4 Interleaving: as specified for the TCH/FS in subclause 3.1.3 */
+	gsm0503_tch_fr_interleave(&cB0, &iB0);
+
+	/* 4.2.5 Mapping on a Burst:
+	 * - hu(B)=1 the even numbered bits in the first 4 bursts and
+	 * - hl(B)=1 the odd numbered bits of the last 4 bursts are stolen. */
+	for (unsigned int i = 0; i < 8; i++)
+		gsm0503_tch_burst_map(&iBi * 114, &burstsi * 116, &h, i >> 2);
+
+	return 0;
+}
+
+/*! Perform channel decoding of a FACCH/F data as per section 4.2.
+ *  \paramout data Caller-allocated buffer for decoded FACCH (GSM_MACBLOCK_LEN).
+ *  \paramin bursts Buffer containing the symbols of 8 bursts,
+ *                     8 * 2 * 58 == 928 bits total.
+ *  \paramout n_errors Number of detected bit errors.
+ *  \paramout n_bits_total Total number of bits.
+ *  \returns Number of bytes used in the output buffer; negative on error. */
+int gsm0503_tch_fr_facch_decode(uint8_t *data, const sbit_t *bursts,
+				int *n_errors, int *n_bits_total)
+{
+	sbit_t iB8 * 114, cB4 * 114;
+	int steal = 0;
+
+	/* FACCH decision: sum of 4 first hu(B) and 4 last hl(B) soft-bits */
+	for (unsigned int i = 0; i < 4; i++)
+		steal -= burstsi * 116 + 58; /* hu(B) */
+	for (unsigned int i = 4; i < 8; i++)
+		steal -= burstsi * 116 + 57; /* hl(B) */
+	if (steal <= 0)
+		return -1;
+
+	/* 4.2.5 Mapping on a Burst:
+	 * - hu(B)=1 the even numbered bits in the first 4 bursts and
+	 * - hl(B)=1 the odd numbered bits of the last 4 bursts are stolen. */
+	for (unsigned int i = 0; i < 8; i++)
+		gsm0503_tch_burst_unmap(&iBi * 114, &burstsi * 116, NULL, i >> 2);
+
+	/* 4.2.4 Interleaving: as specified for the TCH/FS in subclause 3.1.3 */
+	gsm0503_tch_fr_deinterleave(&cB0, &iB0);
+
+	/* 4.2.1-3 as specified for the SACCH in 4.1.1-3 */
+	if (_xcch_decode_cB(&data0, &cB0, n_errors, n_bits_total) != 0)
+		return -1;
+
+	return GSM_MACBLOCK_LEN;
+}
+
+/*! Perform channel encoding of a FACCH/H data as per section 4.3.
+ *  \paramout bursts Caller-allocated buffer for symbols of 6 bursts,
+ *                     6 * 2 * 58 == 696 bits total.
+ *  \paramin data FACCH MAC block to be encoded (GSM_MACBLOCK_LEN).
+ *  \returns 0 in case of success; negative on error */
+int gsm0503_tch_hr_facch_encode(ubit_t *bursts, const uint8_t *data)
+{
+	ubit_t iB8 * 114, cB4 * 114;
+	const ubit_t h = 1;
+
+	/* 4.3.1-3 as specified for the SACCH in 4.1.1-3 */
+	_xcch_encode_cB(&cB0, &data0);
+
+	/* 4.3.4 Interleaving */
+	gsm0503_tch_fr_interleave(&cB0, &iB0);
+
+	/* 4.3.5 Mapping on a Burst:
+	 * - hu(B)=1 the even numbered bits of the first 2 bursts,
+	 * - hu(B)=1 & hl(B)=1 all bits of the middle 2 bursts and
+	 * - hl(B)=1 the odd numbered bits of the last 2 bursts are stolen. */
+	for (unsigned int i = 0; i < 6; i++)
+		gsm0503_tch_burst_map(&iBi * 114, &burstsi * 116, &h, i >> 2);
+	for (unsigned int i = 2; i < 4; i++)
+		gsm0503_tch_burst_map(&iBi * 114 + 456, &burstsi * 116, &h, 1);
+
+	return 0;
+}
+
+/*! Perform channel decoding of a FACCH/H data as per section 4.3.
+ *  \paramout data Caller-allocated buffer for decoded FACCH (GSM_MACBLOCK_LEN).
+ *  \paramin bursts Buffer containing the symbols of 6 bursts,
+ *                     6 * 2 * 58 == 696 bits total.
+ *  \paramout n_errors Number of detected bit errors.
+ *  \paramout n_bits_total Total number of bits.
+ *  \returns Number of bytes used in the output buffer; negative on error. */
+int gsm0503_tch_hr_facch_decode(uint8_t *data, const sbit_t *bursts,
+				int *n_errors, int *n_bits_total)
+{
+	sbit_t iB8 * 114, cB4 * 114;
+	int steal = 0;
+
+	/* FACCH decision: sum of 4 first hu(B) and 4 last hl(B) soft-bits */
+	for (unsigned int i = 0; i < 4; i++)
+		steal -= burstsi * 116 + 58; /* hu(B) */
+	for (unsigned int i = 2; i < 6; i++)
+		steal -= burstsi * 116 + 57; /* hl(B) */
+	if (steal <= 0)
+		return -1;
+
+	/* 4.3.5 Mapping on a Burst:
+	 * - hu(B)=1 the even numbered bits of the first 2 bursts,
+	 * - hu(B)=1 & hl(B)=1 all bits of the middle 2 bursts and
+	 * - hl(B)=1 the odd numbered bits of the last 2 bursts are stolen. */
+	for (unsigned int i = 0; i < 6; i++)
+		gsm0503_tch_burst_unmap(&iBi * 114, &burstsi * 116, NULL, i >> 2);
+	for (unsigned int i = 2; i < 4; i++)
+		gsm0503_tch_burst_unmap(&iBi * 114 + 456, &burstsi * 116, NULL, 1);
+
+	/* 4.3.4 Interleaving */
+	gsm0503_tch_fr_deinterleave(&cB0, &iB0);
+
+	/* 4.3.1-3 as specified for the SACCH in 4.1.1-3 */
+	if (_xcch_decode_cB(&data0, &cB0, n_errors, n_bits_total) != 0)
+		return -1;
+
+	return GSM_MACBLOCK_LEN;
+}
+
 /*! @} */

libosmocore_1.8.0.tar.xz/src/coding/gsm0503_interleaving.c -> libosmocore_1.9.0.tar.xz/src/coding/gsm0503_interleaving.c Changed

@@ -678,4 +678,56 @@
 	}
 }
 
+/* 3GPP TS 45.003 Section 3.3.4
+ * The coded bits are reordered and interleaved according to the following rule:
+ *	i(B,j) = c(n,k) for k = 0,1,...,455
+ *		n = 0,1,...,N,N + 1,...
+ *		B = B0 +4n + (k mod 19) + (k div 114)
+ *		j = (k mod 19) + 19 (k mod 6)
+ *
+ * The result of the interleaving is a distribution of the reordered 114
+ * bit of a given data block, n = N, over 19 blocks, 6 bits equally
+ * distributed in each block, in a diagonal way over consecutive blocks.
+ *
+ * Or in other words the interleaving is a distribution of the encoded,
+ * reordered 456 bits from four given input data blocks, which taken
+ * together give n = N, over 22 bursts, 6 bits equally distributed in
+ * the first and 22 nd bursts, 12 bits distributed in the second and 21
+ * st bursts, 18 bits distributed in the third and 20 th bursts and 24
+ * bits distributed in the other 16 bursts.
+ *
+ * The block of coded data is interleaved "diagonal", where a new block
+ * of coded data starts with every fourth burst and is distributed over
+ * 22 bursts.
+ *
+ * Also used for TCH/F4.8, TCH/H4.8, and TCH/H2.4 and TCH/F14.4 */
+void gsm0503_tch_f96_interleave(const ubit_t *cB, ubit_t *iB)
+{
+	int j, k, B;
+
+	for (k = 0; k < 456; k++) {
+		/* upper bound for B: 4*n + 18 + 4 = 4*n + 22 */
+		B = /* B0 + 4n + */ (k % 19) + (k / 114);
+		/* upper bound for j: 18 + 19*5 = 113 */
+		j = (k % 19) + 19 * (k % 6);
+		/* upper iB index: 4*n+23*114-1 */
+		iBB * 114 + j = cBk;
+	}
+}
+
+void gsm0503_tch_f96_deinterleave(sbit_t *cB, const sbit_t *iB)
+{
+	int j, k, B;
+
+	for (k = 0; k < 456; k++) {
+		/* upper bound for B: 4*n + 18 + 4 = 4*n + 22 */
+		B = /* B0 + 4n + */ (k % 19) + (k / 114);
+		/* upper bound for j: 18 + 19*5 = 113 */
+		j = (k % 19) + 19 * (k % 6);
+		/* upper iB index: 4*n+23*114-1 */
+		cBk = iBB * 114 + j;
+	}
+}
+
+
 /*! @} */

libosmocore_1.8.0.tar.xz/src/coding/libosmocoding.map -> libosmocore_1.9.0.tar.xz/src/coding/libosmocoding.map Changed

libosmocore_1.8.0.tar.xz/src/core/Makefile.am -> libosmocore_1.9.0.tar.xz/src/core/Makefile.am Changed

@@ -1,10 +1,10 @@
 # This is _NOT_ the library release version, it's an API version.
 # Please read chapter "Library interface versions" of the libtool documentation
 # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html
-LIBVERSION=20:0:0
+LIBVERSION=21:0:0
 
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir)
-AM_CFLAGS = -Wall $(TALLOC_CFLAGS) $(PTHREAD_CFLAGS) $(LIBSCTP_CFLAGS) $(LIBMNL_CFLAGS)
+AM_CFLAGS = -Wall $(TALLOC_CFLAGS) $(PTHREAD_CFLAGS) $(LIBSCTP_CFLAGS) $(LIBMNL_CFLAGS) $(URING_CFLAGS)
 
 if ENABLE_PSEUDOTALLOC
 AM_CPPFLAGS += -I$(top_srcdir)/src/pseudotalloc
@@ -18,6 +18,7 @@
 	$(LIBRARY_RT) \
 	$(PTHREAD_LIBS) \
 	$(LIBSCTP_LIBS) \
+	$(URING_LIBS) \
 	$(NULL)
 
 libosmocore_la_SOURCES = \
@@ -50,6 +51,8 @@
 	msgb.c \
 	netdev.c \
 	netns.c \
+	osmo_io.c \
+	osmo_io_poll.c \
 	panic.c \
 	prbs.c \
 	prim.c \
@@ -107,10 +110,18 @@
 	conv_acc_sse_impl.h \
 	conv_acc_neon_impl.h \
 	crcXXgen.c.tpl \
+	osmo_io_internal.h \
 	stat_item_internal.h \
+	libosmocore.map \
 	$(NULL)
 
-libosmocore_la_LDFLAGS = -version-info $(LIBVERSION) -no-undefined
+EXTRA_libosmocore_la_DEPENDENCIES = libosmocore.map
+
+libosmocore_la_LDFLAGS = \
+	$(LTLDFLAGS_OSMOCORE) \
+	-version-info \
+	$(LIBVERSION) \
+	-no-undefined
 
 if ENABLE_PLUGIN
 libosmocore_la_SOURCES += plugin.c
@@ -146,5 +157,9 @@
 libosmocore_la_LIBADD += probes.lo
 endif
 
+if ENABLE_URING
+libosmocore_la_SOURCES += osmo_io_uring.c
+endif
+
 crc%gen.c: crcXXgen.c.tpl
 	$(AM_V_GEN)sed -e's/XX/$*/g' $< > $@

libosmocore_1.8.0.tar.xz/src/core/bitvec.c -> libosmocore_1.9.0.tar.xz/src/core/bitvec.c Changed

libosmocore_1.8.0.tar.xz/src/core/context.c -> libosmocore_1.9.0.tar.xz/src/core/context.c Changed

libosmocore_1.8.0.tar.xz/src/core/exec.c -> libosmocore_1.9.0.tar.xz/src/core/exec.c Changed

@@ -74,7 +74,7 @@
  *
  *  Constraints: Keys up to a maximum length of 255 characters are supported.
  *
- *  \oaramout out caller-allocated array of pointers for the generated output
+ *  \paramout out caller-allocated array of pointers for the generated output
  *  \paramin out_len size of out (number of pointers)
  *  \paramin in input environment (NULL-terminated list of pointers like **environ)
  *  \paramin whitelist whitelist of permitted keys in environment (like **environ)
@@ -131,7 +131,7 @@
  *  Constraints: If the same key exists in 'out' and 'in', duplicate keys are
  *  generated.  It is a simple append, without any duplicate checks.
  *
- *  \oaramout out caller-allocated array of pointers for the generated output
+ *  \paramout out caller-allocated array of pointers for the generated output
  *  \paramin out_len size of out (number of pointers)
  *  \paramin in input environment (NULL-terminated list of pointers like **environ)
  *  \returns number of entries filled in 'out'; negative on error */
@@ -213,10 +213,18 @@
 	int rc;
 
 	if (user) {
+		if (getpw_buflen == -1) /* Value was indeterminate */
+			getpw_buflen = 16384; /* Should be more than enough */
 		char bufgetpw_buflen;
-		getpwnam_r(user, &_pw, buf, sizeof(buf), &pw);
-		if (!pw)
+		rc = getpwnam_r(user, &_pw, buf, sizeof(buf), &pw);
+		if (rc < 0) {
+			LOGP(DLGLOBAL, LOGL_ERROR, "getpwnam_r(\"%s\") failed: %s\n", user, strerror(-rc));
+			return rc;
+		}
+		if (!pw) {
+			LOGP(DLGLOBAL, LOGL_ERROR, "getpwnam_r(\"%s\"): user not found!\n", user);
 			return -EINVAL;
+		}
 	}
 
 	rc = fork();
@@ -264,6 +272,9 @@
 		return -EIO;
 	} else {
 		/* we are in the parent */
+		if (rc == -1)
+			LOGP(DLGLOBAL, LOGL_ERROR, "fork() error executing command '%s': %s\n",
+			     command, strerror(errno));
 		return rc;
 	}
 }

libosmocore_1.8.0.tar.xz/src/core/gsmtap_util.c -> libosmocore_1.9.0.tar.xz/src/core/gsmtap_util.c Changed

@@ -232,12 +232,12 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 
-/*! Create a new (sending) GSMTAP source socket 
+/*! Create a new (sending) GSMTAP source socket
  *  \paramin host host name or IP address in string format
  *  \paramin port UDP port number in host byte order
  *  \return file descriptor of the new socket
  *
- * Opens a GSMTAP source (sending) socket, conncet it to host/port and
+ * Opens a GSMTAP source (sending) socket, connect it to host/port and
  * return resulting fd.  If \a host is NULL, the destination address
  * will be localhost.  If \a port is 0, the default \ref
  * GSMTAP_UDP_PORT will be used.
@@ -253,6 +253,30 @@
 				OSMO_SOCK_F_CONNECT);
 }
 
+/*! Create a new (sending) GSMTAP source socket
+ *  \paramin local_host local host name or IP address in string format
+ *  \paramin local_port local UDP port number in host byte order
+ *  \paramin rem_host remote host name or IP address in string format
+ *  \paramin rem_port remote UDP port number in host byte order
+ *  \return file descriptor of the new socket
+ *
+ * Opens a GSMTAP source (sending) socket, connect it to remote host/port,
+ * bind to local host/port and return resulting fd.
+ * If \a local_host is NULL, the default address is used.
+ * If \a local_port is 0, than random unused port will be selected by OS.
+ * If \a rem_host is NULL, the destination address will be localhost.
+ * If \a rem_port is 0, the default \ref GSMTAP_UDP_PORT will be used.
+ */
+int gsmtap_source_init_fd2(const char *local_host, uint16_t local_port, const char *rem_host, uint16_t rem_port)
+{
+	if (!local_host)
+		return gsmtap_source_init_fd(rem_host, rem_port);
+
+	return osmo_sock_init2(AF_UNSPEC, SOCK_DGRAM, IPPROTO_UDP, local_host, local_port,
+			       rem_host ? rem_host : "localhost", rem_port ? rem_port : GSMTAP_UDP_PORT,
+			       OSMO_SOCK_F_BIND | OSMO_SOCK_F_CONNECT);
+}
+
 /*! Add a local sink to an existing GSMTAP source and return fd
  *  \paramin gsmtap_fd file descriptor of the gsmtap socket
  *  \returns file descriptor of locally bound receive socket
@@ -447,22 +471,25 @@
 
 
 /*! Open GSMTAP source socket, connect and register osmo_fd
- *  \paramin host host name or IP address in string format
- *  \paramin port UDP port number in host byte order
+ *  \paramin local_host IP address in string format
+ *  \paramin local_port UDP port number in host byte order
+ *  \paramin rem_host host name or IP address in string format
+ *  \paramin rem_port UDP port number in host byte order
  *  \paramin ofd_wq_mode Register \ref osmo_wqueue (1) or not (0)
  *  \return callee-allocated \ref gsmtap_inst
  *
- * Open GSMTAP source (sending) socket, connect it to host/port,
+ * Open GSMTAP source (sending) socket, connect it to remote host/port,
+ * bind it local host/port,
  * allocate 'struct gsmtap_inst' and optionally osmo_fd/osmo_wqueue
  * registration.
  */
-struct gsmtap_inst *gsmtap_source_init(const char *host, uint16_t port,
-					int ofd_wq_mode)
+struct gsmtap_inst *gsmtap_source_init2(const char *local_host, uint16_t local_port,
+					const char *rem_host, uint16_t rem_port, int ofd_wq_mode)
 {
 	struct gsmtap_inst *gti;
 	int fd, rc;
 
-	fd = gsmtap_source_init_fd(host, port);
+	fd = gsmtap_source_init_fd2(local_host, local_port, rem_host, rem_port);
 	if (fd < 0)
 		return NULL;
 
@@ -486,8 +513,27 @@
 	return gti;
 }
 
+/*! Open GSMTAP source socket, connect and register osmo_fd
+ *  \paramin host host name or IP address in string format
+ *  \paramin port UDP port number in host byte order
+ *  \paramin ofd_wq_mode Register \ref osmo_wqueue (1) or not (0)
+ *  \return callee-allocated \ref gsmtap_inst
+ *
+ * Open GSMTAP source (sending) socket, connect it to host/port,
+ * allocate 'struct gsmtap_inst' and optionally osmo_fd/osmo_wqueue
+ * registration.
+ */
+struct gsmtap_inst *gsmtap_source_init(const char *host, uint16_t port,
+					int ofd_wq_mode)
+{
+	return gsmtap_source_init2(NULL, 0, host, port, ofd_wq_mode);
+}
+
 void gsmtap_source_free(struct gsmtap_inst *gti)
 {
+	if (!gti)
+		return;
+
 	if (gti->ofd_wq_mode) {
 		osmo_fd_unregister(&gti->wq.bfd);
 		osmo_wqueue_clear(&gti->wq);
@@ -540,6 +586,8 @@
 	{ GSMTAP_TYPE_TETRA_I1,		"TETRA V+D"  },
 	{ GSMTAP_TYPE_TETRA_I1_BURST,	"TETRA bursts" },
 	{ GSMTAP_TYPE_WMX_BURST,	"WiMAX burst" },
+	{ GSMTAP_TYPE_GB_LLC,		"GPRS Gb LLC" },
+	{ GSMTAP_TYPE_GB_SNDCP,		"GPRS Gb SNDCP" },
 	{ GSMTAP_TYPE_GMR1_UM,		"GMR-1 air interfeace (MES-MS<->GTS)"},
 	{ GSMTAP_TYPE_UMTS_RLC_MAC,	"UMTS RLC/MAC" },
 	{ GSMTAP_TYPE_UMTS_RRC,		"UMTS RRC" },
@@ -548,6 +596,9 @@
 	{ GSMTAP_TYPE_LTE_MAC_FRAMED,	"LTE MAC with context hdr" },
 	{ GSMTAP_TYPE_OSMOCORE_LOG,	"libosmocore logging" },
 	{ GSMTAP_TYPE_QC_DIAG,		"Qualcomm DIAG" },
+	{ GSMTAP_TYPE_LTE_NAS,		"LTE Non-Access Stratum" },
+	{ GSMTAP_TYPE_E1T1,		"E1/T1 lines" },
+	{ GSMTAP_TYPE_GSM_RLP,		"GSM Radio Link Protocol" },
 	{ 0, NULL }
 };

libosmocore_1.9.0.tar.xz/src/core/libosmocore.map Added

@@ -0,0 +1,596 @@
+LIBOSMOCORE_1.0 {
+global:
+
+assert_loginfo;
+bit_value_to_char;
+bitvec_add_array;
+bitvec_alloc;
+bitvec_fill;
+bitvec_find_bit_pos;
+bitvec_free;
+bitvec_get_bit_high;
+bitvec_get_bit_pos;
+bitvec_get_bit_pos_high;
+bitvec_get_bytes;
+bitvec_get_int16_msb;
+bitvec_get_nth_set_bit;
+bitvec_get_uint;
+bitvec_pack;
+bitvec_read_field;
+bitvec_rl;
+bitvec_rl_curbit;
+bitvec_set_bit;
+bitvec_set_bit_pos;
+bitvec_set_bits;
+bitvec_set_bytes;
+bitvec_set_u64;
+bitvec_set_uint;
+bitvec_shiftl;
+bitvec_spare_padding;
+bitvec_to_string_r;
+bitvec_unhex;
+bitvec_unpack;
+bitvec_write_field;
+bitvec_zero;
+chantype_gsmtap2rsl;
+chantype_rsl2gsmtap;
+chantype_rsl2gsmtap2;
+get_string_value;
+get_value_string;
+get_value_string_or_null;
+gsmtap_gsm_channel_names;
+gsmtap_makemsg;
+gsmtap_makemsg_ex;
+gsmtap_send;
+gsmtap_send_ex;
+gsmtap_sendmsg;
+gsmtap_sendmsg_free;
+gsmtap_source_add_sink;
+gsmtap_source_add_sink_fd;
+gsmtap_source_free;
+gsmtap_source_init;
+gsmtap_source_init2;
+gsmtap_source_init_fd;
+gsmtap_source_init_fd2;
+gsmtap_type_names;
+log_add_target;
+log_category_name;
+log_check_level;
+log_del_target;
+log_enable_multithread;
+log_fini;
+log_init;
+log_level_str;
+loglevel_strs;
+logp;
+logp2;
+log_parse_category;
+log_parse_category_mask;
+log_parse_level;
+logp_stub;
+log_reset_context;
+log_set_all_filter;
+log_set_category_filter;
+log_set_context;
+log_set_log_level;
+log_set_print_category;
+log_set_print_category_hex;
+log_set_print_extended_timestamp;
+log_set_print_filename;
+log_set_print_filename2;
+log_set_print_filename_pos;
+log_set_print_level;
+log_set_print_tid;
+log_set_print_timestamp;
+log_set_use_color;
+log_target_create;
+log_target_create_file;
+log_target_create_file_stream;
+log_target_create_gsmtap;
+log_target_create_rb;
+log_target_create_stderr;
+log_target_create_syslog;
+log_target_create_systemd;
+log_target_destroy;
+log_target_file_reopen;
+log_target_file_switch_to_stream;
+log_target_file_switch_to_wqueue;
+log_target_find;
+log_target_rb_avail_size;
+log_target_rb_get;
+log_target_rb_used_size;
+log_target_systemd_set_raw;
+log_targets_reopen;
+log_tgt_mutex_lock_impl;
+log_tgt_mutex_unlock_impl;
+msgb_alloc;
+msgb_alloc_c;
+msgb_copy;
+msgb_copy_c;
+msgb_copy_resize;
+msgb_copy_resize_c;
+msgb_data;
+msgb_dequeue;
+msgb_enqueue;
+_msgb_eq;
+msgb_free;
+msgb_hexdump;
+msgb_hexdump_buf;
+msgb_hexdump_c;
+msgb_length;
+msgb_printf;
+msgb_reset;
+msgb_resize_area;
+msgb_set_talloc_ctx;
+msgb_talloc_ctx_init;
+osmo_base64_decode;
+osmo_base64_encode;
+osmo_bcd2char;
+osmo_bcd2str;
+osmo_bit_reversal;
+osmo_char2bcd;
+osmo_clock_gettime;
+osmo_clock_override_add;
+osmo_clock_override_enable;
+osmo_clock_override_gettimespec;
+osmo_close_all_fds_above;
+osmo_config_list_parse;
+osmo_constant_time_cmp;
+osmo_conv_decode;
+osmo_conv_decode_acc;
+osmo_conv_decode_deinit;
+osmo_conv_decode_flush;
+osmo_conv_decode_get_best_end_state;
+osmo_conv_decode_get_output;
+osmo_conv_decode_init;
+osmo_conv_decode_reset;
+osmo_conv_decode_rewind;
+osmo_conv_decode_scan;
+osmo_conv_encode;
+osmo_conv_encode_flush;
+osmo_conv_encode_init;
+osmo_conv_encode_load_state;
+osmo_conv_encode_raw;
+osmo_conv_get_input_length;
+osmo_conv_get_output_length;
+osmo_counter_alloc;
+osmo_counter_difference;
+osmo_counter_free;
+osmo_counter_get_by_name;
+osmo_counters_count;
+osmo_counters_for_each;
+osmo_crc16;
+osmo_crc16_ccitt;
+osmo_crc16_ccitt_table;
+osmo_crc16_table;
+osmo_crc16gen_check_bits;
+osmo_crc16gen_compute_bits;
+osmo_crc16gen_set_bits;
+osmo_crc32gen_check_bits;
+osmo_crc32gen_compute_bits;
+osmo_crc32gen_set_bits;
+osmo_crc64gen_check_bits;
+osmo_crc64gen_compute_bits;
+osmo_crc64gen_set_bits;
+osmo_crc8gen_check_bits;
+osmo_crc8gen_compute_bits;
+osmo_crc8gen_set_bits;
+osmo_ctx;
+osmo_ctx_init;
+osmo_daemonize;
+osmo_decode_big_endian;
+osmo_encode_big_endian;
+osmo_environment_append;
+osmo_environment_filter;
+osmo_environment_whitelist;
+osmo_escape_cstr_buf;
+osmo_escape_cstr_c;
+osmo_escape_str;
+osmo_escape_str_buf;
+osmo_escape_str_buf2;
+osmo_escape_str_buf3;
+osmo_escape_str_c;
+osmo_event_for_prim;
+osmo_fd_close;
+osmo_fd_disp_fds;
+osmo_fd_fill_fds;
+osmo_fd_get_by_fd;
+osmo_fd_is_registered;
+osmo_fd_register;
+osmo_fd_setup;
+osmo_fd_unregister;
+osmo_fd_update_when;
+osmo_float_str_to_int;
+osmo_fsm_event_name;
+osmo_fsm_find_by_name;
+osmo_fsm_inst_alloc;
+osmo_fsm_inst_alloc_child;
+_osmo_fsm_inst_broadcast_children;
+osmo_fsm_inst_change_parent;
+_osmo_fsm_inst_dispatch;
+osmo_fsm_inst_find_by_id;
+osmo_fsm_inst_find_by_name;
+osmo_fsm_inst_free;
+osmo_fsm_inst_name;
+_osmo_fsm_inst_state_chg;
+_osmo_fsm_inst_state_chg_keep_or_start_timer;
+_osmo_fsm_inst_state_chg_keep_or_start_timer_ms;
+_osmo_fsm_inst_state_chg_keep_timer;
+_osmo_fsm_inst_state_chg_ms;
+_osmo_fsm_inst_term;
+_osmo_fsm_inst_term_children;
+osmo_fsm_inst_unlink_parent;
+osmo_fsm_inst_update_id;
+osmo_fsm_inst_update_id_f;
+osmo_fsm_inst_update_id_f_sanitize;
+osmo_fsm_log_addr;
+osmo_fsm_log_timeouts;
+osmo_fsm_register;
+osmo_fsm_set_dealloc_ctx;
+osmo_fsm_state_name;
+osmo_fsm_term_cause_names;
+osmo_fsm_term_safely;
+osmo_fsm_unregister;
+osmo_generate_backtrace;
+osmo_get_macaddr;
+osmo_gettid;
+osmo_gettimeofday;
+osmo_gettimeofday_override;
+osmo_gettimeofday_override_add;
+osmo_gettimeofday_override_time;
+osmo_g_fsms;
+osmo_hexdump;
+osmo_hexdump_buf;
+osmo_hexdump_c;
+osmo_hexdump_nospc;
+osmo_hexdump_nospc_c;
+osmo_hexparse;
+osmo_identifier_sanitize_buf;
+osmo_identifier_valid;
+osmo_init_ignore_signals;
+osmo_init_logging;
+osmo_init_logging2;
+osmo_int_to_float_str_buf;
+osmo_int_to_float_str_c;
+osmo_io_backend_names;
+osmo_iofd_close;
+osmo_iofd_free;
+osmo_iofd_get_data;
+osmo_iofd_get_fd;
+osmo_iofd_get_name;
+osmo_iofd_set_name;
+osmo_iofd_get_priv_nr;
+osmo_iofd_init;
+osmo_iofd_ops;
+osmo_iofd_register;
+osmo_iofd_sendto_msgb;
+osmo_iofd_set_alloc_info;
+osmo_iofd_set_data;
+osmo_iofd_set_ioops;
+osmo_iofd_set_priv_nr;
+osmo_iofd_set_txqueue_max_length;
+osmo_iofd_setup;
+osmo_iofd_txqueue_clear;
+osmo_iofd_txqueue_len;
+osmo_iofd_unregister;
+osmo_iofd_uring_init;
+osmo_iofd_notify_connected;
+osmo_iofd_write_msgb;
+osmo_ip_str_type;
+osmo_isdnhdlc_decode;
+osmo_isdnhdlc_encode;
+osmo_isdnhdlc_out_init;
+osmo_isdnhdlc_rcv_init;
+osmo_is_hexstr;
+osmo_isqrt32;
+osmo_it_q_alloc;
+osmo_it_q_by_name;
+_osmo_it_q_dequeue;
+osmo_it_q_destroy;
+_osmo_it_q_enqueue;
+osmo_it_q_flush;
+osmo_log_backtrace;
+osmo_log_info;
+osmo_log_target_list;
+osmo_luhn;
+osmo_macaddr_parse;
+osmo_mnl_destroy;
+osmo_mnl_init;
+osmo_netdev_add_addr;
+osmo_netdev_add_route;
+osmo_netdev_alloc;
+osmo_netdev_free;
+osmo_netdev_get_dev_name;
+osmo_netdev_get_ifindex;
+osmo_netdev_get_name;
+osmo_netdev_get_netns_name;
+osmo_netdev_get_priv_data;
+osmo_netdev_ifupdown;
+osmo_netdev_is_registered;
+osmo_netdev_register;
+osmo_netdev_set_dev_name_chg_cb;
+osmo_netdev_set_ifindex;
+osmo_netdev_set_ifupdown_ind_cb;
+osmo_netdev_set_mtu_chg_cb;
+osmo_netdev_set_netns_name;
+osmo_netdev_set_priv_data;
+osmo_netdev_unregister;
+osmo_netns_open_fd;
+osmo_netns_switch_enter;
+osmo_netns_switch_exit;
+osmo_nibble_shift_left_unal;
+osmo_nibble_shift_right;
+osmo_panic;
+osmo_pbit2ubit;
+osmo_pbit2ubit_ext;
+osmo_plugin_load_all;
+osmo_prbs11;
+osmo_prbs15;
+osmo_prbs7;
+osmo_prbs9;
+osmo_prbs_get_ubit;
+osmo_prbs_get_ubits;
+osmo_prbs_state_init;
+osmo_prim_op_names;
+osmo_print_n;
+osmo_quote_cstr_buf;
+osmo_quote_cstr_c;
+osmo_quote_str;
+osmo_quote_str_buf;
+osmo_quote_str_buf2;
+osmo_quote_str_buf3;
+osmo_quote_str_c;
+osmo_revbytebits_32;
+osmo_revbytebits_8;
+osmo_revbytebits_buf;
+osmo_sbit2ubit;
+osmo_select_init;
+osmo_select_main;
+osmo_select_main_ctx;
+osmo_select_shutdown_done;
+osmo_select_shutdown_request;
+osmo_select_shutdown_requested;
+osmo_separated_identifiers_valid;
+osmo_sercomm_change_speed;
+osmo_sercomm_drv_pull;
+osmo_sercomm_drv_rx_char;
+osmo_sercomm_init;
+osmo_sercomm_initialized;
+osmo_sercomm_register_rx_cb;
+osmo_sercomm_sendmsg;
+osmo_sercomm_tx_queue_depth;
+osmo_serial_clear_custom_baudrate;
+osmo_serial_init;
+osmo_serial_set_baudrate;
+osmo_serial_set_custom_baudrate;
+osmo_serial_speed_t;
+osmo_set_panic_handler;
+osmo_signal_dispatch;
+osmo_signalfd_setup;
+osmo_signal_register_handler;
+osmo_signal_talloc_ctx_init;
+osmo_signal_unregister_handler;
+osmo_sockaddr_cmp;
+osmo_sockaddr_from_octets;
+osmo_sockaddr_in_to_str_and_uint;
+osmo_sockaddr_is_any;
+osmo_sockaddr_is_local;
+osmo_sockaddr_local_ip;
+osmo_sockaddr_netmask_to_prefixlen;
+osmo_sockaddr_ntop;
+osmo_sockaddr_port;
+osmo_sockaddr_set_port;
+osmo_sockaddr_str_cmp;
+osmo_sockaddr_str_from_32;
+osmo_sockaddr_str_from_32h;
+osmo_sockaddr_str_from_32n;
+osmo_sockaddr_str_from_in6_addr;
+osmo_sockaddr_str_from_in_addr;
+osmo_sockaddr_str_from_sockaddr;
+osmo_sockaddr_str_from_sockaddr_in;
+osmo_sockaddr_str_from_sockaddr_in6;
+osmo_sockaddr_str_from_str;
+osmo_sockaddr_str_from_str2;
+osmo_sockaddr_str_is_nonzero;
+osmo_sockaddr_str_is_set;
+osmo_sockaddr_str_to_32;
+osmo_sockaddr_str_to_32h;
+osmo_sockaddr_str_to_32n;
+osmo_sockaddr_str_to_in6_addr;
+osmo_sockaddr_str_to_in_addr;
+osmo_sockaddr_str_to_sockaddr;
+osmo_sockaddr_str_to_sockaddr_in;
+osmo_sockaddr_str_to_sockaddr_in6;
+osmo_sockaddr_to_octets;
+osmo_sockaddr_to_str;
+osmo_sockaddr_to_str_and_uint;
+osmo_sockaddr_to_str_buf;
+osmo_sockaddr_to_str_buf2;
+osmo_sockaddr_to_str_c;
+osmo_sock_get_ip_and_port;
+osmo_sock_get_local_ip;
+osmo_sock_get_local_ip_port;
+osmo_sock_get_name;
+osmo_sock_get_name2;
+osmo_sock_get_name2_c;
+osmo_sock_get_name_buf;
+osmo_sock_get_remote_ip;
+osmo_sock_get_remote_ip_port;
+osmo_sock_init;
+osmo_sock_init2;
+osmo_sock_init2_multiaddr;
+osmo_sock_init2_multiaddr2;
+osmo_sock_init2_ofd;
+osmo_sock_init_ofd;
+osmo_sock_init_osa;
+osmo_sock_init_osa_ofd;
+osmo_sock_init_sa;
+osmo_sock_local_ip;
+osmo_sock_mcast_all_set;
+osmo_sock_mcast_iface_set;
+osmo_sock_mcast_loop_set;
+osmo_sock_mcast_subscribe;
+osmo_sock_mcast_ttl_set;
+osmo_sock_set_dscp;
+osmo_sock_set_priority;
+osmo_sock_unix_init;
+osmo_sock_unix_init_ofd;
+osmo_stat_item_dec;
+osmo_stat_item_flush;
+osmo_stat_item_for_each_group;
+osmo_stat_item_for_each_item;
+osmo_stat_item_get_by_name;
+osmo_stat_item_get_desc;
+osmo_stat_item_get_group_by_name_idx;
+osmo_stat_item_get_group_by_name_idxname;
+osmo_stat_item_get_last;
+osmo_stat_item_group_alloc;
+osmo_stat_item_group_free;
+osmo_stat_item_group_get_item;
+osmo_stat_item_group_reset;
+osmo_stat_item_group_set_name;
+osmo_stat_item_inc;
+osmo_stat_item_init;
+osmo_stat_item_reset;
+osmo_stat_item_set;
+osmo_stats_config;
+osmo_stats_init;
+osmo_stats_report;
+osmo_stats_reporter_alloc;
+osmo_stats_reporter_create_log;
+osmo_stats_reporter_create_statsd;
+osmo_stats_reporter_disable;
+osmo_stats_reporter_enable;
+osmo_stats_reporter_find;
+osmo_stats_reporter_free;
+osmo_stats_reporter_list;
+osmo_stats_reporter_send;
+osmo_stats_reporter_send_buffer;
+osmo_stats_reporter_set_flush_period;
+osmo_stats_reporter_set_local_addr;
+osmo_stats_reporter_set_max_class;
+osmo_stats_reporter_set_mtu;
+osmo_stats_reporter_set_name_prefix;
+osmo_stats_reporter_set_remote_addr;
+osmo_stats_reporter_set_remote_port;
+osmo_stats_reporter_udp_close;
+osmo_stats_reporter_udp_open;
+osmo_stats_set_interval;
+osmo_stats_tcp_osmo_fd_register;
+osmo_stats_tcp_osmo_fd_unregister;
+osmo_stats_tcp_set_interval;
+osmo_stderr_target;
+osmo_str2bcd;
+osmo_str2lower;
+osmo_str2upper;
+osmo_strlcpy;
+osmo_strnchr;
+osmo_strrb_add;
+osmo_strrb_create;
+osmo_strrb_elements;
+osmo_strrb_get_nth;
+_osmo_strrb_is_bufindex_valid;
+osmo_strrb_is_empty;
+osmo_str_startswith;
+osmo_str_to_int;
+osmo_str_to_int64;
+osmo_str_tolower;
+osmo_str_tolower_buf;
+osmo_str_tolower_c;
+osmo_str_toupper;
+osmo_str_toupper_buf;
+osmo_str_toupper_c;
+osmo_system_nowait;
+osmo_system_nowait2;
+osmo_t4_encode;
+osmo_talloc_replace_string_fmt;
+osmo_tcp_stats_config;
+_osmo_tdef_fsm_inst_state_chg;
+osmo_tdef_get;
+osmo_tdef_get_entry;
+osmo_tdef_get_state_timeout;
+osmo_tdef_range_str_buf;
+osmo_tdef_set;
+osmo_tdefs_reset;
+osmo_tdef_unit_names;
+osmo_tdef_val_in_range;
+osmo_time_cc_cleanup;
+osmo_time_cc_init;
+osmo_time_cc_set_flag;
+osmo_timer_add;
+osmo_timer_del;
+osmo_timerfd_disable;
+osmo_timerfd_schedule;
+osmo_timerfd_setup;
+osmo_timer_pending;
+osmo_timer_remaining;
+osmo_timers_check;
+osmo_timer_schedule;
+osmo_timer_setup;
+osmo_timers_nearest;
+osmo_timers_nearest_ms;
+osmo_timers_prepare;
+osmo_timers_update;
+osmo_tundev_alloc;
+osmo_tundev_close;
+osmo_tundev_free;
+osmo_tundev_get_dev_name;
+osmo_tundev_get_name;
+osmo_tundev_get_netdev;
+osmo_tundev_get_netns_name;
+osmo_tundev_get_priv_data;
+osmo_tundev_is_open;
+osmo_tundev_open;
+osmo_tundev_send;
+osmo_tundev_set_data_ind_cb;
+osmo_tundev_set_dev_name;
+osmo_tundev_set_netns_name;
+osmo_tundev_set_priv_data;
+osmo_ubit2pbit;
+osmo_ubit2pbit_ext;
+osmo_ubit2sbit;
+osmo_ubit_dump;
+osmo_ubit_dump_buf;
+osmo_use_count_by;
+osmo_use_count_find;
+osmo_use_count_free;
+_osmo_use_count_get_put;
+osmo_use_count_make_static_entries;
+osmo_use_count_name_buf;
+osmo_use_count_to_str_buf;
+osmo_use_count_to_str_c;
+osmo_use_count_total;
+osmo_vlogp;
+osmo_wqueue_bfd_cb;
+osmo_wqueue_clear;
+osmo_wqueue_enqueue;
+osmo_wqueue_enqueue_quiet;
+osmo_wqueue_init;
+rate_ctr_add;
+rate_ctr_difference;
+rate_ctr_for_each_counter;
+rate_ctr_for_each_group;
+rate_ctr_get_by_name;
+rate_ctr_get_group_by_name_idx;
+rate_ctr_group_alloc;
+rate_ctr_group_free;
+rate_ctr_group_get_ctr;
+rate_ctr_group_reset;
+rate_ctr_group_set_name;
+rate_ctr_init;
+rate_ctr_reset;
+rb_erase;
+rb_first;
+rb_insert_color;
+rb_last;
+rb_next;
+rb_prev;
+rb_replace_node;
+sercomm_drv_lock;
+sercomm_drv_unlock;
+tall_ctr_ctx; /* deprecated */
+tall_log_ctx;
+tall_msgb_ctx; /* deprecated */
+
+local: *;
+};

libosmocore_1.8.0.tar.xz/src/core/logging.c -> libosmocore_1.9.0.tar.xz/src/core/logging.c Changed

@@ -313,6 +313,12 @@
 		.enabled = 1, .loglevel = LOGL_NOTICE,
 		.color = "\03338;5;11m",
 	},
+	INT2IDX(DLIO) = {
+		.name = "DLIO",
+		.description = "libosmocore IO Subsystem",
+		.enabled = 1, .loglevel = LOGL_NOTICE,
+		.color = "\03338;5;67m",
+	},
 };
 
 void assert_loginfo(const char *src)
@@ -1161,6 +1167,7 @@
 	if (target->type == LOG_TGT_TYPE_FILE) {
 		osmo_fd_unregister(&wq->bfd);
 		close(wq->bfd.fd);
+		wq->bfd.fd = -1;
 	}
 
 	/* release the queue itself */
@@ -1328,11 +1335,11 @@
 		wq = target->tgt_file.wqueue;
 		if (wq) {
 			if (wq->bfd.fd >= 0) {
+				osmo_fd_unregister(&wq->bfd);
 				if (target->type == LOG_TGT_TYPE_FILE)
 					close(wq->bfd.fd);
 				wq->bfd.fd = -1;
 			}
-			osmo_fd_unregister(&wq->bfd);
 			osmo_wqueue_clear(wq);
 			talloc_free(wq);
 			target->tgt_file.wqueue = NULL;
@@ -1375,8 +1382,8 @@
 			return -errno;
 	} else {
 		wq = target->tgt_file.wqueue;
-		osmo_fd_unregister(&wq->bfd);
 		if (wq->bfd.fd >= 0) {
+			osmo_fd_unregister(&wq->bfd);
 			close(wq->bfd.fd);
 			wq->bfd.fd = -1;
 		}

libosmocore_1.8.0.tar.xz/src/core/mnl.c -> libosmocore_1.9.0.tar.xz/src/core/mnl.c Changed

libosmocore_1.8.0.tar.xz/src/core/netdev.c -> libosmocore_1.9.0.tar.xz/src/core/netdev.c Changed

libosmocore_1.8.0.tar.xz/src/core/netns.c -> libosmocore_1.9.0.tar.xz/src/core/netns.c Changed

libosmocore_1.9.0.tar.xz/src/core/osmo_io.c Added

@@ -0,0 +1,673 @@
+/*! \file osmo_io.c
+ * New osmocom async I/O API.
+ *
+ * (C) 2022 by Harald Welte <laforge@osmocom.org>
+ * (C) 2022-2023 by sysmocom - s.f.m.c. GmbH <info@sysmocom.de>
+ * Author: Daniel Willmann <dwillmann@sysmocom.de>
+ *
+ * All Rights Reserved.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ */
+
+#include "../config.h"
+#if defined(__linux__)
+
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <talloc.h>
+#include <unistd.h>
+#include <string.h>
+#include <stdbool.h>
+#include <errno.h>
+
+#include <osmocom/core/osmo_io.h>
+#include <osmocom/core/linuxlist.h>
+#include <osmocom/core/logging.h>
+#include <osmocom/core/msgb.h>
+#include <osmocom/core/socket.h>
+#include <osmocom/core/talloc.h>
+#include <osmocom/core/utils.h>
+
+#include "osmo_io_internal.h"
+
+/*! This environment variable can be set to manually set the backend used in osmo_io */
+#define OSMO_IO_BACKEND_ENV "LIBOSMO_IO_BACKEND"
+
+const struct value_string osmo_io_backend_names = {
+	{ OSMO_IO_BACKEND_POLL, "poll" },
+	{ OSMO_IO_BACKEND_IO_URING, "io_uring" },
+	{ 0, NULL }
+};
+
+static enum osmo_io_backend g_io_backend;
+
+/* Used by some tests, can't be static */
+struct iofd_backend_ops osmo_iofd_ops;
+
+#if defined(HAVE_URING)
+void osmo_iofd_uring_init(void);
+#endif
+
+/*! initialize osmo_io for the current thread */
+void osmo_iofd_init(void)
+{
+	switch (g_io_backend) {
+	case OSMO_IO_BACKEND_POLL:
+		break;
+#if defined(HAVE_URING)
+	case OSMO_IO_BACKEND_IO_URING:
+		osmo_iofd_uring_init();
+		break;
+#endif
+	default:
+		OSMO_ASSERT(0);
+		break;
+	}
+}
+
+/* ensure main thread always has pre-initialized osmo_io
+ * priority 103: run after on_dso_load_select */
+static __attribute__((constructor(103))) void on_dso_load_osmo_io(void)
+{
+	char *backend = getenv(OSMO_IO_BACKEND_ENV);
+	if (backend == NULL)
+		backend = OSMO_IO_BACKEND_DEFAULT;
+
+	if (!strcmp("POLL", backend)) {
+		g_io_backend = OSMO_IO_BACKEND_POLL;
+		osmo_iofd_ops = iofd_poll_ops;
+#if defined(HAVE_URING)
+	} else if (!strcmp("IO_URING", backend)) {
+		g_io_backend = OSMO_IO_BACKEND_IO_URING;
+		osmo_iofd_ops = iofd_uring_ops;
+#endif
+	} else {
+		fprintf(stderr, "Invalid osmo_io backend requested: \"%s\"\nCheck the environment variable %s\n", backend, OSMO_IO_BACKEND_ENV);
+		exit(1);
+	}
+
+	osmo_iofd_init();
+}
+
+/*! Allocate the msghdr.
+ *  \paramin iofd the osmo_io file structure
+ *  \paramin action the action this msg(hdr) is for (read, write, ..)
+ *  \paramin msg the msg buffer to use. Will allocate a new one if NULL
+ *  \returns the newly allocated msghdr or NULL in case of error */
+struct iofd_msghdr *iofd_msghdr_alloc(struct osmo_io_fd *iofd, enum iofd_msg_action action, struct msgb *msg)
+{
+	bool free_msg = false;
+	struct iofd_msghdr *hdr;
+
+	if (!msg) {
+		msg = iofd_msgb_alloc(iofd);
+		if (!msg)
+			return NULL;
+		free_msg = true;
+	} else {
+		talloc_steal(iofd, msg);
+	}
+
+	hdr = talloc_zero(iofd, struct iofd_msghdr);
+	if (!hdr) {
+		if (free_msg)
+			talloc_free(msg);
+		return NULL;
+	}
+
+	hdr->action = action;
+	hdr->iofd = iofd;
+	hdr->msg = msg;
+
+	return hdr;
+}
+
+/*! Free the msghdr.
+ *  \paramin msghdr the msghdr to free
+ */
+void iofd_msghdr_free(struct iofd_msghdr *msghdr)
+{
+	/* msghdr->msg is never owned by msghdr, it will either be freed in the send path or
+	 * or passed on to the read callback which takes ownership. */
+	talloc_free(msghdr);
+}
+
+/*! convenience wrapper to call msgb_alloc with parameters from osmo_io_fd */
+struct msgb *iofd_msgb_alloc(struct osmo_io_fd *iofd)
+{
+	uint16_t headroom = iofd->msgb_alloc.headroom;
+
+	OSMO_ASSERT(iofd->msgb_alloc.size < 0xffff - headroom);
+	return msgb_alloc_headroom_c(iofd,
+				     iofd->msgb_alloc.size + headroom, headroom,
+				     iofd->name ? : "iofd_msgb");
+}
+
+/*! return the pending msgb in iofd or NULL if there is none*/
+struct msgb *iofd_msgb_pending(struct osmo_io_fd *iofd)
+{
+	struct msgb *msg = NULL;
+
+	msg = iofd->pending;
+	iofd->pending = NULL;
+
+	return msg;
+}
+
+/*! Return the pending msgb or allocate and return a new one */
+struct msgb *iofd_msgb_pending_or_alloc(struct osmo_io_fd *iofd)
+{
+	struct msgb *msg = NULL;
+
+	msg = iofd_msgb_pending(iofd);
+	if (!msg)
+		msg = iofd_msgb_alloc(iofd);
+
+	return msg;
+}
+
+/*! Enqueue a message to be sent.
+ *
+ *  Enqueues the message at the back of the queue provided there is enough space.
+ *  \paramin iofd the file descriptor
+ *  \paramin msghdr the message to enqueue
+ *  \returns 0 if the message was enqueued succcessfully,
+ *    -ENOSPC if the queue already contains the maximum number of messages
+ */
+int iofd_txqueue_enqueue(struct osmo_io_fd *iofd, struct iofd_msghdr *msghdr)
+{
+	if (iofd->tx_queue.current_length >= iofd->tx_queue.max_length)
+		return -ENOSPC;
+
+	llist_add_tail(&msghdr->list, &iofd->tx_queue.msg_queue);
+	iofd->tx_queue.current_length++;
+
+	if (iofd->tx_queue.current_length == 1 && !IOFD_FLAG_ISSET(iofd, IOFD_FLAG_CLOSED))
+		osmo_iofd_ops.write_enable(iofd);
+
+	return 0;
+}
+
+/*! Enqueue a message at the front.
+ *
+ *  Used to enqueue a msgb from a partial send again. This function will always
+ *  enqueue the message, even if the maximum number of messages is reached.
+ *  \paramin iofd the file descriptor
+ *  \paramin msghdr the message to enqueue
+ */
+void iofd_txqueue_enqueue_front(struct osmo_io_fd *iofd, struct iofd_msghdr *msghdr)
+{
+	llist_add(&msghdr->list, &iofd->tx_queue.msg_queue);
+	iofd->tx_queue.current_length++;
+
+	if (iofd->tx_queue.current_length == 1 && !IOFD_FLAG_ISSET(iofd, IOFD_FLAG_CLOSED))
+		osmo_iofd_ops.write_enable(iofd);
+}
+
+/*! Dequeue a message from the front.
+ *
+ *  \paramin iofd the file descriptor
+ *  \returns the msghdr from the front of the queue or NULL if the queue is empty
+ */
+struct iofd_msghdr *iofd_txqueue_dequeue(struct osmo_io_fd *iofd)
+{
+	struct llist_head *lh;
+
+	if (iofd->tx_queue.current_length == 0)
+		return NULL;
+
+	lh = iofd->tx_queue.msg_queue.next;
+
+	OSMO_ASSERT(lh);
+	iofd->tx_queue.current_length--;
+	llist_del(lh);
+
+	if (iofd->tx_queue.current_length == 0)
+		osmo_iofd_ops.write_disable(iofd);
+
+	return llist_entry(lh, struct iofd_msghdr, list);
+}
+
+/*! Handle segmentation of the msg. If this function returns *_HANDLE_ONE or MORE then the data in msg will contain
+ *  one complete message.
+ *  If there are bytes left over, *pending_out will point to a msgb with the remaining data.
+*/
+static enum iofd_seg_act iofd_handle_segmentation(struct osmo_io_fd *iofd, struct msgb *msg, struct msgb **pending_out)
+{
+	int extra_len, received_len;
+	struct msgb *msg_pending;
+
+	/* Save the start of message before segmentation_cb (which could change it) */
+	uint8_t *data = msg->data;
+
+	received_len = msgb_length(msg);
+
+	if (!iofd->io_ops.segmentation_cb) {
+		*pending_out = NULL;
+		return IOFD_SEG_ACT_HANDLE_ONE;
+	}
+
+	int expected_len = iofd->io_ops.segmentation_cb(msg);
+	if (expected_len == -EAGAIN) {
+		goto defer;
+	} else if (expected_len < 0) {
+		/* Something is wrong, skip this msgb */
+		LOGPIO(iofd, LOGL_ERROR, "segmentation_cb returned error (%d), skipping msg of size %d\n",
+		       expected_len, received_len);
+		*pending_out = NULL;
+		msgb_free(msg);
+		return IOFD_SEG_ACT_DEFER;
+	}
+
+	extra_len = received_len - expected_len;
+	/* No segmentation needed, return the whole msgb */
+	if (extra_len == 0) {
+		*pending_out = NULL;
+		return IOFD_SEG_ACT_HANDLE_ONE;
+	/* segment is incomplete */
+	} else if (extra_len < 0) {
+		goto defer;
+	}
+
+	/* msgb contains more than one segment */
+	/* Copy the trailing data over */
+	msg_pending = iofd_msgb_alloc(iofd);
+	memcpy(msgb_data(msg_pending), data + expected_len, extra_len);
+	msgb_put(msg_pending, extra_len);
+	*pending_out = msg_pending;
+
+	/* Trim the original msgb to size. Don't use msgb_trim because we need to reference
+	 * msg->data from before it might have been modified by the segmentation_cb(). */
+	msg->tail = data + expected_len;
+	msg->len = msg->tail - msg->data;
+	return IOFD_SEG_ACT_HANDLE_MORE;
+
+defer:
+	*pending_out = msg;
+	return IOFD_SEG_ACT_DEFER;
+}
+
+/*! Restore message boundaries on read() and pass individual messages to the read callback
+ */
+void iofd_handle_segmented_read(struct osmo_io_fd *iofd, struct msgb *msg, int rc)
+{
+	int res;
+	struct msgb *pending = NULL;
+
+	if (rc <= 0) {
+		iofd->io_ops.read_cb(iofd, rc, msg);
+		return;
+	}
+
+	do {
+		res = iofd_handle_segmentation(iofd, msg, &pending);
+		if (res != IOFD_SEG_ACT_DEFER || rc < 0)
+			iofd->io_ops.read_cb(iofd, rc, msg);
+		if (res == IOFD_SEG_ACT_HANDLE_MORE)
+			msg = pending;
+	} while (res == IOFD_SEG_ACT_HANDLE_MORE);
+
+	OSMO_ASSERT(iofd->pending == NULL);
+	iofd->pending = pending;
+}
+
+void iofd_handle_recv(struct osmo_io_fd *iofd, struct msgb *msg, int rc, struct iofd_msghdr *hdr)
+{
+	talloc_steal(iofd->msgb_alloc.ctx, msg);
+	switch (iofd->mode) {
+	case OSMO_IO_FD_MODE_READ_WRITE:
+		iofd_handle_segmented_read(iofd, msg, rc);
+		break;
+	case OSMO_IO_FD_MODE_RECVFROM_SENDTO:
+		iofd->io_ops.recvfrom_cb(iofd, rc, msg, &hdr->osa);
+		break;
+	case OSMO_IO_FD_MODE_SCTP_RECVMSG_SENDMSG:
+		/* TODO Implement */
+		OSMO_ASSERT(false);
+		break;
+	}
+}
+
+/* Public functions */
+
+/*! Send a message through a connected socket.
+ *
+ *  Appends the message to the internal transmit queue.
+ *  If the function returns success (0) it will take ownership of the msgb and
+ *  internally call msgb_free() after the write request completes.
+ *  In case of an error the msgb needs to be freed by the caller.
+ *  \paramin iofd file descriptor to write to
+ *  \paramin msg message buffer to write
+ *  \returns 0 in case of success; a negative value in case of error
+ */
+int osmo_iofd_write_msgb(struct osmo_io_fd *iofd, struct msgb *msg)
+{
+	int rc;
+	struct iofd_msghdr *msghdr = iofd_msghdr_alloc(iofd, IOFD_ACT_WRITE, msg);
+	if (!msghdr)
+		return -ENOMEM;
+
+	msghdr->flags = MSG_NOSIGNAL;
+	msghdr->iov0.iov_base = msgb_data(msghdr->msg);
+	msghdr->iov0.iov_len = msgb_length(msghdr->msg);
+	msghdr->hdr.msg_iov = &msghdr->iov0;
+	msghdr->hdr.msg_iovlen = 1;
+
+	rc = iofd_txqueue_enqueue(iofd, msghdr);
+	if (rc < 0) {
+		iofd_msghdr_free(msghdr);
+		LOGPIO(iofd, LOGL_ERROR, "enqueueing message failed (%d). Rejecting msgb\n", rc);
+		return rc;
+	}
+
+	return 0;
+}
+
+/*! Send a message through an unconnected socket.
+ *
+ *  Appends the message to the internal transmit queue.
+ *  If the function returns success (0), it will take ownership of the msgb and
+ *  internally call msgb_free() after the write request completes.
+ *  In case of an error the msgb needs to be freed by the caller.
+ *  \paramin iofd file descriptor to write to
+ *  \paramin msg message buffer to send
+ *  \paramin sendto_flags Flags to pass to the send call
+ *  \paramin dest destination address to send the message to
+ *  \returns 0 in case of success; a negative value in case of error
+ */
+int osmo_iofd_sendto_msgb(struct osmo_io_fd *iofd, struct msgb *msg, int sendto_flags, const struct osmo_sockaddr *dest)
+{
+	int rc;
+
+	OSMO_ASSERT(iofd->mode == OSMO_IO_FD_MODE_RECVFROM_SENDTO);
+
+	struct iofd_msghdr *msghdr = iofd_msghdr_alloc(iofd, IOFD_ACT_SENDTO, msg);
+	if (!msghdr)
+		return -ENOMEM;
+
+	if (dest) {
+		msghdr->osa = *dest;
+		msghdr->hdr.msg_name = &msghdr->osa.u.sa;
+		msghdr->hdr.msg_namelen = osmo_sockaddr_size(&msghdr->osa);
+	}
+	msghdr->flags = sendto_flags;
+	msghdr->iov0.iov_base = msgb_data(msghdr->msg);
+	msghdr->iov0.iov_len = msgb_length(msghdr->msg);
+	msghdr->hdr.msg_iov = &msghdr->iov0;
+	msghdr->hdr.msg_iovlen = 1;
+
+	rc = iofd_txqueue_enqueue(iofd, msghdr);
+	if (rc < 0) {
+		iofd_msghdr_free(msghdr);
+		LOGPIO(iofd, LOGL_ERROR, "enqueueing message failed (%d). Rejecting msgb\n", rc);
+		return rc;
+	}
+
+	return 0;
+}
+
+/*! Allocate and setup a new iofd.
+ *  \paramin ctx the parent context from which to allocate
+ *  \paramin fd the underlying system file descriptor
+ *  \paramin name the name of the iofd
+ *  \paramin mode the mode of the iofd, whether it should use read()/write(), sendto()/recvfrom()
+ *  \paramin ioops structure with read/write/send/recv callbacks
+ *  \paramin data user data pointer accessible by the ioops callbacks
+ *  \returns The newly allocated osmo_io_fd struct or NULL on failure
+ */
+struct osmo_io_fd *osmo_iofd_setup(const void *ctx, int fd, const char *name, enum osmo_io_fd_mode mode,
+		  const struct osmo_io_ops *ioops, void *data)
+{
+	struct osmo_io_fd *iofd = talloc_zero(ctx, struct osmo_io_fd);
+	if (!iofd)
+		return NULL;
+
+	iofd->fd = fd;
+	iofd->mode = mode;
+	IOFD_FLAG_SET(iofd, IOFD_FLAG_CLOSED);
+
+	if (name)
+		iofd->name = talloc_strdup(iofd, name);
+
+	if (ioops)
+		iofd->io_ops = *ioops;
+
+	iofd->pending = NULL;
+
+	iofd->data = data;
+
+	iofd->msgb_alloc.ctx = ctx;
+	iofd->msgb_alloc.size = OSMO_IO_DEFAULT_MSGB_SIZE;
+	iofd->msgb_alloc.headroom = OSMO_IO_DEFAULT_MSGB_HEADROOM;
+
+	iofd->tx_queue.max_length = 32;
+	INIT_LLIST_HEAD(&iofd->tx_queue.msg_queue);
+
+	return iofd;
+}
+
+/*! Register the fd with the underlying backend.
+ *
+ *  \paramin iofd the iofd file descriptor
+ *  \paramin fd the system fd number that will be registeres. If negative will use the one already set.
+ *  \returns zero on success, a negative value on error
+*/
+int osmo_iofd_register(struct osmo_io_fd *iofd, int fd)
+{
+	int rc = 0;
+
+	if (fd >= 0)
+		iofd->fd = fd;
+
+	if (osmo_iofd_ops.register_fd)
+		rc = osmo_iofd_ops.register_fd(iofd);
+	if (rc)
+		return rc;
+
+	IOFD_FLAG_UNSET(iofd, IOFD_FLAG_CLOSED);
+	osmo_iofd_ops.read_enable(iofd);
+
+	if (iofd->tx_queue.current_length > 0)
+		osmo_iofd_ops.write_enable(iofd);
+
+	return rc;
+}
+
+/*! Unregister the fd from the underlying backend.
+ *
+ *  \paramin iofd the file descriptor
+ *  \returns zero on success, a negative value on error
+ */
+int osmo_iofd_unregister(struct osmo_io_fd *iofd)
+{
+	if (osmo_iofd_ops.unregister_fd)
+		return osmo_iofd_ops.unregister_fd(iofd);
+	IOFD_FLAG_SET(iofd, IOFD_FLAG_CLOSED);
+
+	return 0;
+}
+
+/*! Get the number of messages in the tx queue.
+ *
+ *  \paramin iofd the file descriptor
+ */
+unsigned int osmo_iofd_txqueue_len(struct osmo_io_fd *iofd)
+{
+	return iofd->tx_queue.current_length;
+}
+
+/*! Clear the transmit queue of the the iofd.
+ *
+ *  This function frees all messages currently pending in the transmit queue
+ *  \paramin iofd the file descriptor
+ */
+void osmo_iofd_txqueue_clear(struct osmo_io_fd *iofd)
+{
+	struct iofd_msghdr *hdr;
+	while ((hdr = iofd_txqueue_dequeue(iofd))) {
+		msgb_free(hdr->msg);
+		iofd_msghdr_free(hdr);
+	}
+}
+
+/*! Free the iofd.
+ *
+ *  This function is safe to use in the read/write callbacks and will defer freeing it until safe to do so.
+ *  The iofd will be closed before.
+ *  \paramin iofd the file descriptor
+ */
+void osmo_iofd_free(struct osmo_io_fd *iofd)
+{
+	if (!iofd)
+		return;
+
+	osmo_iofd_close(iofd);
+
+	if (!IOFD_FLAG_ISSET(iofd, IOFD_FLAG_IN_CALLBACK)) {
+		talloc_free(iofd);
+	} else {
+		/* Prevent our parent context from freeing us prematurely */
+		talloc_steal(NULL, iofd);
+		IOFD_FLAG_SET(iofd, IOFD_FLAG_TO_FREE);
+	}
+}
+
+/*! Close the iofd.
+ *
+ *  This function closes the underlying fd and clears any messages in the tx queue
+ *  The iofd is not freed and can be assigned a new file descriptor with osmo_iofd_register()
+ *  \paramin iofd the file descriptor
+ *  \ returns 0 on success, a negative value otherwise
+ */
+int osmo_iofd_close(struct osmo_io_fd *iofd)
+{
+	int rc = 0;
+
+	if (IOFD_FLAG_ISSET(iofd, IOFD_FLAG_CLOSED))
+		return rc;
+
+	IOFD_FLAG_SET(iofd, IOFD_FLAG_CLOSED);
+
+	/* Free pending msgs in tx queue */
+	osmo_iofd_txqueue_clear(iofd);
+	msgb_free(iofd->pending);
+
+	iofd->pending = NULL;
+
+	if (osmo_iofd_ops.close)
+		rc = osmo_iofd_ops.close(iofd);
+	iofd->fd = -1;
+	return rc;
+}
+
+/*! Set the size and headroom of the msgb allocated when receiving messages.
+ *  \paramin iofd the file descriptor
+ *  \paramin size the size of the msgb when receiving data
+ *  \paramin headroom the headroom of the msgb when receiving data
+ */
+void osmo_iofd_set_alloc_info(struct osmo_io_fd *iofd, unsigned int size, unsigned int headroom)
+{
+	iofd->msgb_alloc.headroom = headroom;
+	iofd->msgb_alloc.size = size;
+}
+
+/*! Set the maximum number of messages enqueued for sending.
+ *  \paramin iofd the file descriptor
+ *  \paramin size the maximum size of the transmit queue
+ */
+void osmo_iofd_set_txqueue_max_length(struct osmo_io_fd *iofd, unsigned int max_length)
+{
+	iofd->tx_queue.max_length = max_length;
+}
+
+/*! Get the associated user-data from an iofd.
+ *  \paramin iofd the file descriptor
+ *  \returns the data that was previously set with \ref osmo_iofd_setup()
+ */
+void *osmo_iofd_get_data(const struct osmo_io_fd *iofd)
+{
+	return iofd->data;
+}
+
+/*! Set the associated user-data from an iofd.
+ *  \paramin iofd the file descriptor
+ *  \paramin data the data to set
+ */
+void osmo_iofd_set_data(struct osmo_io_fd *iofd, void *data)
+{
+	iofd->data = data;
+}
+
+/*! Get the private number from an iofd.
+ *  \paramin iofd the file descriptor
+ *  \returns the private number that was previously set with \ref osmo_iofd_set_priv_nr()
+ */
+unsigned int osmo_iofd_get_priv_nr(const struct osmo_io_fd *iofd)
+{
+	return iofd->priv_nr;
+}
+
+/*! Set the private number from an iofd.
+ *  \paramin iofd the file descriptor
+ *  \paramin priv_nr the private number to set
+ */
+void osmo_iofd_set_priv_nr(struct osmo_io_fd *iofd, unsigned int priv_nr)
+{
+	iofd->priv_nr = priv_nr;
+}
+
+/*! Get the underlying file descriptor from an iofd.
+ *  \paramin iofd the file descriptor
+ *  \returns the underlying file descriptor number */
+int osmo_iofd_get_fd(const struct osmo_io_fd *iofd)
+{
+	return iofd->fd;
+}
+
+/*! Get the name of the file descriptor.
+ *  \paramin iofd the file descriptor
+ *  \returns the name of the iofd as given in \ref osmo_iofd_setup() */
+const char *osmo_iofd_get_name(const struct osmo_io_fd *iofd)
+{
+	return iofd->name;
+}
+
+/*! Set the name of the file descriptor.
+ *  \paramin iofd the file descriptor
+ *  \paramin name the name to set on the file descriptor */
+void osmo_iofd_set_name(struct osmo_io_fd *iofd, const char *name)
+{
+	osmo_talloc_replace_string(iofd, &iofd->name, name);
+}
+
+/*! Set the osmo_io_ops for an iofd.
+ *  \paramin iofd Target iofd file descriptor
+ *  \paramin ioops osmo_io_ops structure to be set */
+void osmo_iofd_set_ioops(struct osmo_io_fd *iofd, const struct osmo_io_ops *ioops)
+{
+	iofd->io_ops = *ioops;
+}
+
+/*! Notify the user if/when the socket is connected.
+ *  When the socket is connected the write_cb will be called.
+ *  \paramin iofd the file descriptor */
+void osmo_iofd_notify_connected(struct osmo_io_fd *iofd)
+{
+	OSMO_ASSERT(iofd->mode == OSMO_IO_FD_MODE_READ_WRITE);
+	osmo_iofd_ops.write_enable(iofd);
+}
+
+
+#endif /* defined(__linux__) */

libosmocore_1.9.0.tar.xz/src/core/osmo_io_internal.h Added

@@ -0,0 +1,145 @@
+/*! \file osmo_io_internal.h */
+
+#pragma once
+
+#include <unistd.h>
+#include <stdbool.h>
+
+#include <osmocom/core/osmo_io.h>
+#include <osmocom/core/linuxlist.h>
+#include <osmocom/core/msgb.h>
+#include <osmocom/core/select.h>
+#include <osmocom/core/socket.h>
+
+#include "../config.h"
+
+#define OSMO_IO_DEFAULT_MSGB_SIZE 1024
+#define OSMO_IO_DEFAULT_MSGB_HEADROOM 128
+
+extern const struct iofd_backend_ops iofd_poll_ops;
+#define OSMO_IO_BACKEND_DEFAULT "POLL"
+
+#if defined(HAVE_URING)
+extern const struct iofd_backend_ops iofd_uring_ops;
+#endif
+
+struct iofd_backend_ops {
+	int (*register_fd)(struct osmo_io_fd *iofd);
+	int (*unregister_fd)(struct osmo_io_fd *iofd);
+	int (*close)(struct osmo_io_fd *iofd);
+	void (*write_enable)(struct osmo_io_fd *iofd);
+	void (*write_disable)(struct osmo_io_fd *iofd);
+	void (*read_enable)(struct osmo_io_fd *iofd);
+	void (*read_disable)(struct osmo_io_fd *iofd);
+};
+
+#define IOFD_FLAG_CLOSED (1<<0)
+#define IOFD_FLAG_IN_CALLBACK (1<<1)
+#define IOFD_FLAG_TO_FREE (1<<2)
+#define IOFD_FLAG_NOTIFY_CONNECTED (1<<3)
+
+#define IOFD_FLAG_SET(iofd, flag) \
+	(iofd)->flags |= (flag)
+
+#define IOFD_FLAG_UNSET(iofd, flag) \
+	(iofd)->flags &= ~(flag)
+
+#define IOFD_FLAG_ISSET(iofd, flag) ((iofd)->flags & (flag))
+
+struct osmo_io_fd {
+	/*! linked list for internal management */
+	struct llist_head list;
+	/*! actual operating-system level file decriptor */
+	int fd;
+	/*! type of read/write mode to use */
+	enum osmo_io_fd_mode mode;
+
+	/*! flags to guard closing/freeing of iofd */
+	uint32_t flags;
+
+	/*! human-readable name to associte with fd */
+	char *name;
+
+	/*! send/recv (msg) callback functions */
+	struct osmo_io_ops io_ops;
+	/*! Pending msgb to keep partial data during segmentation */
+	struct msgb *pending;
+
+	/*! data pointer passed through to call-back function */
+	void *data;
+	/*! private number, extending \a data */
+	unsigned int priv_nr;
+
+	struct {
+		/*! talloc context from which to allocate msgb when reading */
+		const void *ctx;
+		/*! size of msgb to allocate (excluding headroom) */
+		unsigned int size;
+		/*! headroom to allocate when allocating msgb's */
+		unsigned int headroom;
+	} msgb_alloc;
+
+	struct {
+		/*! maximum length of write queue */
+		unsigned int max_length;
+		/*! current length of write queue */
+		unsigned int current_length;
+		/*! actual linked list implementing the transmit queue */
+		struct llist_head msg_queue;
+	} tx_queue;
+
+	union {
+		struct {
+			struct osmo_fd ofd;
+		} poll;
+		struct {
+			bool read_enabled;
+			bool write_enabled;
+			void *read_msghdr;
+			void *write_msghdr;
+			/* TODO: index into array of registered fd's? */
+		} uring;
+	} u;
+};
+
+enum iofd_msg_action {
+	IOFD_ACT_READ,
+	IOFD_ACT_WRITE,
+	IOFD_ACT_RECVFROM,
+	IOFD_ACT_SENDTO,
+	// TODO: SCTP_*
+};
+
+
+/* serialized version of 'struct msghdr' employed by sendmsg/recvmsg */
+struct iofd_msghdr {
+	struct llist_head list;
+	enum iofd_msg_action action;
+	struct msghdr hdr;
+	struct osmo_sockaddr osa;
+	struct iovec iov1;
+	int flags;
+
+	struct msgb *msg;
+	struct osmo_io_fd *iofd;
+};
+
+enum iofd_seg_act {
+	IOFD_SEG_ACT_HANDLE_ONE,
+	IOFD_SEG_ACT_HANDLE_MORE,
+	IOFD_SEG_ACT_DEFER,
+};
+
+struct iofd_msghdr *iofd_msghdr_alloc(struct osmo_io_fd *iofd, enum iofd_msg_action action, struct msgb *msg);
+void iofd_msghdr_free(struct iofd_msghdr *msghdr);
+
+struct msgb *iofd_msgb_alloc(struct osmo_io_fd *iofd);
+struct msgb *iofd_msgb_pending(struct osmo_io_fd *iofd);
+struct msgb *iofd_msgb_pending_or_alloc(struct osmo_io_fd *iofd);
+
+void iofd_handle_recv(struct osmo_io_fd *iofd, struct msgb *msg, int rc, struct iofd_msghdr *msghdr);
+void iofd_handle_segmented_read(struct osmo_io_fd *iofd, struct msgb *msg, int rc);
+
+int iofd_txqueue_enqueue(struct osmo_io_fd *iofd, struct iofd_msghdr *msghdr);
+void iofd_txqueue_enqueue_front(struct osmo_io_fd *iofd, struct iofd_msghdr *msghdr);
+struct iofd_msghdr *iofd_txqueue_dequeue(struct osmo_io_fd *iofd);

libosmocore_1.9.0.tar.xz/src/core/osmo_io_poll.c Added

@@ -0,0 +1,182 @@
+/*! \file osmo_io_poll.c
+ * New osmocom async I/O API.
+ *
+ * (C) 2022 by Harald Welte <laforge@osmocom.org>
+ * (C) 2022-2023 by sysmocom - s.f.m.c. GmbH <info@sysmocom.de>
+ * Author: Daniel Willmann <dwillmann@sysmocom.de>
+ *
+ * All Rights Reserved.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ */
+
+#include "../config.h"
+#if defined(__linux__)
+
+#include <errno.h>
+#include <stdio.h>
+#include <talloc.h>
+#include <unistd.h>
+#include <stdbool.h>
+#include <sys/socket.h>
+
+#include <osmocom/core/osmo_io.h>
+#include <osmocom/core/linuxlist.h>
+#include <osmocom/core/logging.h>
+#include <osmocom/core/msgb.h>
+#include <osmocom/core/select.h>
+#include <osmocom/core/socket.h>
+#include <osmocom/core/talloc.h>
+#include <osmocom/core/utils.h>
+
+#include "osmo_io_internal.h"
+
+static void iofd_poll_ofd_cb_recvmsg_sendmsg(struct osmo_fd *ofd, unsigned int what)
+{
+	struct osmo_io_fd *iofd = ofd->data;
+	struct msgb *msg;
+	int rc, flags = 0;
+
+	if (what & OSMO_FD_READ) {
+		struct iofd_msghdr hdr;
+		msg = iofd_msgb_pending_or_alloc(iofd);
+		if (!msg) {
+			LOGPIO(iofd, LOGL_ERROR, "Could not allocate msgb for reading\n");
+			OSMO_ASSERT(0);
+		}
+
+		hdr.msg = msg;
+		hdr.iov0.iov_base = msg->tail;
+		hdr.iov0.iov_len = msgb_tailroom(msg);
+		hdr.hdr.msg_iov = &hdr.iov0;
+		hdr.hdr.msg_iovlen = 1;
+		hdr.hdr.msg_name = &hdr.osa.u.sa;
+		hdr.hdr.msg_namelen = sizeof(struct osmo_sockaddr);
+
+		rc = recvmsg(ofd->fd, &hdr.hdr, flags);
+		if (rc > 0)
+			msgb_put(msg, rc);
+
+		iofd_handle_recv(iofd, msg, rc, &hdr);
+	}
+
+	if (IOFD_FLAG_ISSET(iofd, IOFD_FLAG_CLOSED))
+		return;
+
+	if (what & OSMO_FD_WRITE) {
+		struct iofd_msghdr *msghdr = iofd_txqueue_dequeue(iofd);
+		if (msghdr) {
+			msg = msghdr->msg;
+
+			rc = sendmsg(ofd->fd, &msghdr->hdr, msghdr->flags);
+			if (rc > 0 && rc < msgb_length(msg)) {
+				msgb_pull(msg, rc);
+				iofd_txqueue_enqueue_front(iofd, msghdr);
+				return;
+			}
+
+			switch (iofd->mode) {
+			case OSMO_IO_FD_MODE_READ_WRITE:
+				iofd->io_ops.write_cb(iofd, rc, msg);
+				break;
+			case OSMO_IO_FD_MODE_RECVFROM_SENDTO:
+				iofd->io_ops.sendto_cb(iofd, rc, msg, &msghdr->osa);
+				break;
+			case OSMO_IO_FD_MODE_SCTP_RECVMSG_SENDMSG:
+				OSMO_ASSERT(false);
+				break;
+			}
+
+			talloc_free(msghdr);
+			msgb_free(msg);
+		} else {
+			if (iofd->mode == OSMO_IO_FD_MODE_READ_WRITE)
+				/* Socket is writable, but we have no data to send. A non-blocking/async
+				   connect() is signalled this way. */
+				iofd->io_ops.write_cb(iofd, 0, NULL);
+			if (osmo_iofd_txqueue_len(iofd) == 0)
+				iofd_poll_ops.write_disable(iofd);
+		}
+
+	}
+}
+
+static int iofd_poll_ofd_cb_dispatch(struct osmo_fd *ofd, unsigned int what)
+{
+	struct osmo_io_fd *iofd = ofd->data;
+
+	IOFD_FLAG_SET(iofd, IOFD_FLAG_IN_CALLBACK);
+	iofd_poll_ofd_cb_recvmsg_sendmsg(ofd, what);
+	IOFD_FLAG_UNSET(iofd, IOFD_FLAG_IN_CALLBACK);
+
+	if (IOFD_FLAG_ISSET(iofd, IOFD_FLAG_TO_FREE)) {
+		talloc_free(iofd);
+		return 0;
+	}
+
+	return 0;
+}
+
+int iofd_poll_register(struct osmo_io_fd *iofd)
+{
+	struct osmo_fd *ofd = &iofd->u.poll.ofd;
+	osmo_fd_setup(ofd, iofd->fd, 0, &iofd_poll_ofd_cb_dispatch, iofd, 0);
+	return osmo_fd_register(ofd);
+}
+
+int iofd_poll_unregister(struct osmo_io_fd *iofd)
+{
+	struct osmo_fd *ofd = &iofd->u.poll.ofd;
+	osmo_fd_unregister(ofd);
+
+	return 0;
+}
+
+int iofd_poll_close(struct osmo_io_fd *iofd)
+{
+	osmo_fd_close(&iofd->u.poll.ofd);
+
+	return 0;
+}
+
+void iofd_poll_read_enable(struct osmo_io_fd *iofd)
+{
+	osmo_fd_read_enable(&iofd->u.poll.ofd);
+}
+
+void iofd_poll_read_disable(struct osmo_io_fd *iofd)
+{
+	osmo_fd_read_disable(&iofd->u.poll.ofd);
+}
+
+void iofd_poll_write_enable(struct osmo_io_fd *iofd)
+{
+	osmo_fd_write_enable(&iofd->u.poll.ofd);
+}
+
+void iofd_poll_write_disable(struct osmo_io_fd *iofd)
+{
+	osmo_fd_write_disable(&iofd->u.poll.ofd);
+}
+
+const struct iofd_backend_ops iofd_poll_ops = {
+	.register_fd = iofd_poll_register,
+	.unregister_fd = iofd_poll_unregister,
+	.close = iofd_poll_close,
+	.write_enable = iofd_poll_write_enable,
+	.write_disable = iofd_poll_write_disable,
+	.read_enable = iofd_poll_read_enable,
+	.read_disable = iofd_poll_read_disable,
+};
+
+#endif /* defined(__linux__) */

libosmocore_1.9.0.tar.xz/src/core/osmo_io_uring.c Added

@@ -0,0 +1,428 @@
+/*! \file osmo_io_uring.c
+ * io_uring backend for osmo_io.
+ *
+ * (C) 2022-2023 by sysmocom s.f.m.c.
+ * Author: Daniel Willmann <daniel@sysmocom.de>
+ *
+ * All Rights Reserved.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ */
+
+/* TODO:
+ * Parameters:
+ * - number of simultaneous read/write in uring for given fd
+ *
+ */
+
+#include "../config.h"
+#if defined(__linux__)
+
+#include <stdio.h>
+#include <talloc.h>
+#include <unistd.h>
+#include <string.h>
+#include <stdbool.h>
+#include <errno.h>
+
+#include <sys/eventfd.h>
+#include <liburing.h>
+
+#include <osmocom/core/osmo_io.h>
+#include <osmocom/core/linuxlist.h>
+#include <osmocom/core/logging.h>
+#include <osmocom/core/msgb.h>
+#include <osmocom/core/select.h>
+#include <osmocom/core/talloc.h>
+#include <osmocom/core/utils.h>
+#include <osmocom/core/socket.h>
+
+#include "osmo_io_internal.h"
+
+#define IOFD_URING_ENTRIES 4096
+
+struct osmo_io_uring {
+	struct osmo_fd event_ofd;
+	struct io_uring ring;
+};
+
+static __thread struct osmo_io_uring g_ring;
+
+static void iofd_uring_cqe(struct io_uring *ring);
+static int iofd_uring_poll_cb(struct osmo_fd *ofd, unsigned int what)
+{
+	struct io_uring *ring = ofd->data;
+	eventfd_t val;
+	int rc;
+
+	if (what & OSMO_FD_READ) {
+		rc = eventfd_read(ofd->fd, &val);
+		if (rc < 0) {
+			LOGP(DLIO, LOGL_ERROR, "eventfd_read() returned error\n");
+			return rc;
+		}
+
+		iofd_uring_cqe(ring);
+	}
+	if (what & OSMO_FD_WRITE)
+		OSMO_ASSERT(0);
+
+	return 0;
+}
+
+/*! initialize the uring and tie it into our event loop */
+void osmo_iofd_uring_init(void)
+{
+	int rc;
+	rc = io_uring_queue_init(IOFD_URING_ENTRIES, &g_ring.ring, 0);
+	if (rc < 0)
+		OSMO_ASSERT(0);
+
+	rc = eventfd(0, 0);
+	if (rc < 0) {
+		io_uring_queue_exit(&g_ring.ring);
+		OSMO_ASSERT(0);
+	}
+
+	osmo_fd_setup(&g_ring.event_ofd, rc, OSMO_FD_READ, iofd_uring_poll_cb, &g_ring.ring, 0);
+	osmo_fd_register(&g_ring.event_ofd);
+	io_uring_register_eventfd(&g_ring.ring, rc);
+}
+
+
+static void iofd_uring_submit_recv(struct osmo_io_fd *iofd, enum iofd_msg_action action)
+{
+	struct msgb *msg;
+	struct iofd_msghdr *msghdr;
+	struct io_uring_sqe *sqe;
+
+	msg = iofd_msgb_pending_or_alloc(iofd);
+	if (!msg) {
+		LOGPIO(iofd, LOGL_ERROR, "Could not allocate msgb for reading\n");
+		OSMO_ASSERT(0);
+	}
+
+	msghdr = iofd_msghdr_alloc(iofd, action, msg);
+	if (!msghdr) {
+		LOGPIO(iofd, LOGL_ERROR, "Could not allocate msghdr for reading\n");
+		OSMO_ASSERT(0);
+	}
+
+	msghdr->iov0.iov_base = msg->tail;
+	msghdr->iov0.iov_len = msgb_tailroom(msg);
+
+	switch (action) {
+	case IOFD_ACT_READ:
+		break;
+	case IOFD_ACT_RECVFROM:
+		msghdr->hdr.msg_iov = &msghdr->iov0;
+		msghdr->hdr.msg_iovlen = 1;
+		msghdr->hdr.msg_name = &msghdr->osa.u.sa;
+		msghdr->hdr.msg_namelen = osmo_sockaddr_size(&msghdr->osa);
+		break;
+	default:
+		OSMO_ASSERT(0);
+	}
+
+	sqe = io_uring_get_sqe(&g_ring.ring);
+	if (!sqe) {
+		LOGPIO(iofd, LOGL_ERROR, "Could not get io_uring_sqe\n");
+		OSMO_ASSERT(0);
+	}
+
+	switch (action) {
+	case IOFD_ACT_READ:
+		io_uring_prep_readv(sqe, iofd->fd, msghdr->iov, 1, 0);
+		break;
+	case IOFD_ACT_RECVFROM:
+		io_uring_prep_recvmsg(sqe, iofd->fd, &msghdr->hdr, msghdr->flags);
+		break;
+	default:
+		OSMO_ASSERT(0);
+	}
+	io_uring_sqe_set_data(sqe, msghdr);
+
+	io_uring_submit(&g_ring.ring);
+	/* NOTE: This only works if we have one read per fd */
+	iofd->u.uring.read_msghdr = msghdr;
+}
+
+static void iofd_uring_handle_recv(struct iofd_msghdr *msghdr, int rc)
+{
+	struct osmo_io_fd *iofd = msghdr->iofd;
+	struct msgb *msg = msghdr->msg;
+
+	if (rc > 0)
+		msgb_put(msg, rc);
+
+	if (!IOFD_FLAG_ISSET(iofd, IOFD_FLAG_CLOSED))
+		iofd_handle_recv(iofd, msg, rc, msghdr);
+
+	if (iofd->u.uring.read_enabled && !IOFD_FLAG_ISSET(iofd, IOFD_FLAG_CLOSED))
+		iofd_uring_submit_recv(iofd, msghdr->action);
+	else
+		iofd->u.uring.read_msghdr = NULL;
+
+
+	iofd_msghdr_free(msghdr);
+}
+
+static int iofd_uring_submit_tx(struct osmo_io_fd *iofd);
+
+static void iofd_uring_handle_tx(struct iofd_msghdr *msghdr, int rc)
+{
+	struct osmo_io_fd *iofd = msghdr->iofd;
+	struct msgb *msg = msghdr->msg;
+
+	if (IOFD_FLAG_ISSET(iofd, IOFD_FLAG_CLOSED))
+		goto out_free;
+
+	/* Error during write */
+	if (rc < 0) {
+		if (msghdr->action == IOFD_ACT_WRITE)
+			iofd->io_ops.write_cb(iofd, rc, msg);
+		else if (msghdr->action == IOFD_ACT_SENDTO)
+			iofd->io_ops.sendto_cb(iofd, rc, msg, &msghdr->osa);
+		else
+			OSMO_ASSERT(0);
+		goto out_free;
+	}
+
+	/* Incomplete write */
+	if (rc < msgb_length(msg)) {
+		/* Re-enqueue remaining data */
+		msgb_pull(msg, rc);
+		msghdr->iov0.iov_len = msgb_length(msg);
+		iofd_txqueue_enqueue_front(iofd, msghdr);
+		goto out;
+	}
+
+	if (msghdr->action == IOFD_ACT_WRITE)
+		iofd->io_ops.write_cb(iofd, rc, msg);
+	else if (msghdr->action == IOFD_ACT_SENDTO)
+		iofd->io_ops.sendto_cb(iofd, rc, msg, &msghdr->osa);
+	else
+		OSMO_ASSERT(0);
+
+out_free:
+	msgb_free(msghdr->msg);
+	iofd_msghdr_free(msghdr);
+
+out:
+	iofd->u.uring.write_msghdr = NULL;
+	if (iofd->u.uring.write_enabled && !IOFD_FLAG_ISSET(iofd, IOFD_FLAG_CLOSED))
+		iofd_uring_submit_tx(iofd);
+}
+
+static void iofd_uring_handle_completion(struct iofd_msghdr *msghdr, int res)
+{
+	struct osmo_io_fd *iofd = msghdr->iofd;
+
+	IOFD_FLAG_SET(iofd, IOFD_FLAG_IN_CALLBACK);
+
+	switch (msghdr->action) {
+	case IOFD_ACT_READ:
+	case IOFD_ACT_RECVFROM:
+		iofd_uring_handle_recv(msghdr, res);
+		break;
+	case IOFD_ACT_WRITE:
+	case IOFD_ACT_SENDTO:
+		iofd_uring_handle_tx(msghdr, res);
+		break;
+	default:
+		OSMO_ASSERT(0)
+	}
+
+	if (!iofd->u.uring.read_msghdr && !iofd->u.uring.write_msghdr)
+		IOFD_FLAG_UNSET(iofd, IOFD_FLAG_IN_CALLBACK);
+
+	if (IOFD_FLAG_ISSET(iofd, IOFD_FLAG_TO_FREE) && !iofd->u.uring.read_msghdr && !iofd->u.uring.write_msghdr)
+		talloc_free(iofd);
+}
+
+static void iofd_uring_cqe(struct io_uring *ring)
+{
+	int rc;
+	struct io_uring_cqe *cqe;
+	struct iofd_msghdr *msghdr;
+
+	while (io_uring_peek_cqe(ring, &cqe) == 0) {
+
+		msghdr = io_uring_cqe_get_data(cqe);
+		if (!msghdr) {
+			LOGP(DLIO, LOGL_DEBUG, "Cancellation returned\n");
+			io_uring_cqe_seen(ring, cqe);
+			continue;
+		}
+
+		rc = cqe->res;
+		/* Hand the entry back to the kernel before */
+		io_uring_cqe_seen(ring, cqe);
+
+		iofd_uring_handle_completion(msghdr, rc);
+
+	}
+}
+
+static int iofd_uring_submit_tx(struct osmo_io_fd *iofd)
+{
+	struct io_uring_sqe *sqe;
+	struct iofd_msghdr *msghdr;
+
+	msghdr = iofd_txqueue_dequeue(iofd);
+	if (!msghdr)
+		return -ENODATA;
+
+	sqe = io_uring_get_sqe(&g_ring.ring);
+	if (!sqe) {
+		LOGPIO(iofd, LOGL_ERROR, "Could not get io_uring_sqe\n");
+		OSMO_ASSERT(0);
+	}
+
+	io_uring_sqe_set_data(sqe, msghdr);
+
+	switch (msghdr->action) {
+	case IOFD_ACT_WRITE:
+	case IOFD_ACT_SENDTO:
+		io_uring_prep_sendmsg(sqe, msghdr->iofd->fd, &msghdr->hdr, msghdr->flags);
+		break;
+	default:
+		OSMO_ASSERT(0);
+	}
+
+	io_uring_submit(&g_ring.ring);
+	iofd->u.uring.write_msghdr = msghdr;
+
+	return 0;
+}
+
+static void iofd_uring_write_enable(struct osmo_io_fd *iofd);
+static void iofd_uring_read_enable(struct osmo_io_fd *iofd);
+
+static int iofd_uring_register(struct osmo_io_fd *iofd)
+{
+	return 0;
+}
+
+static int iofd_uring_unregister(struct osmo_io_fd *iofd)
+{
+	struct io_uring_sqe *sqe;
+	if (iofd->u.uring.read_msghdr) {
+		sqe = io_uring_get_sqe(&g_ring.ring);
+		OSMO_ASSERT(sqe != NULL);
+		io_uring_sqe_set_data(sqe, NULL);
+		LOGPIO(iofd, LOGL_DEBUG, "Cancelling read\n");
+		io_uring_prep_cancel(sqe, iofd->u.uring.read_msghdr, 0);
+	}
+
+	if (iofd->u.uring.write_msghdr) {
+		sqe = io_uring_get_sqe(&g_ring.ring);
+		OSMO_ASSERT(sqe != NULL);
+		io_uring_sqe_set_data(sqe, NULL);
+		LOGPIO(iofd, LOGL_DEBUG, "Cancelling write\n");
+		io_uring_prep_cancel(sqe, iofd->u.uring.write_msghdr, 0);
+	}
+	io_uring_submit(&g_ring.ring);
+
+	return 0;
+}
+
+static void iofd_uring_write_enable(struct osmo_io_fd *iofd)
+{
+	iofd->u.uring.write_enabled = true;
+
+	if (iofd->u.uring.write_msghdr)
+		return;
+
+	if (osmo_iofd_txqueue_len(iofd) > 0)
+		iofd_uring_submit_tx(iofd);
+	else if (iofd->mode == OSMO_IO_FD_MODE_READ_WRITE) {
+		/* Empty write request to check when the socket is connected */
+		struct iofd_msghdr *msghdr;
+		struct io_uring_sqe *sqe;
+		struct msgb *msg = msgb_alloc_headroom(0, 0, "io_uring write dummy");
+		if (!msg) {
+			LOGPIO(iofd, LOGL_ERROR, "Could not allocate msgb for writing\n");
+			OSMO_ASSERT(0);
+		}
+		msghdr = iofd_msghdr_alloc(iofd, IOFD_ACT_WRITE, msg);
+		if (!msghdr) {
+			LOGPIO(iofd, LOGL_ERROR, "Could not allocate msghdr for writing\n");
+			OSMO_ASSERT(0);
+		}
+
+		msghdr->iov0.iov_base = msgb_data(msg);
+		msghdr->iov0.iov_len = msgb_tailroom(msg);
+
+		sqe = io_uring_get_sqe(&g_ring.ring);
+		if (!sqe) {
+			LOGPIO(iofd, LOGL_ERROR, "Could not get io_uring_sqe\n");
+			OSMO_ASSERT(0);
+		}
+		// Prep msgb/iov
+		io_uring_prep_writev(sqe, iofd->fd, msghdr->iov, 1, 0);
+		io_uring_sqe_set_data(sqe, msghdr);
+
+		io_uring_submit(&g_ring.ring);
+		iofd->u.uring.write_msghdr = msghdr;
+	}
+}
+
+static void iofd_uring_write_disable(struct osmo_io_fd *iofd)
+{
+	iofd->u.uring.write_enabled = false;
+}
+
+static void iofd_uring_read_enable(struct osmo_io_fd *iofd)
+{
+	iofd->u.uring.read_enabled = true;
+
+	if (iofd->u.uring.read_msghdr)
+		return;
+
+	switch (iofd->mode) {
+	case OSMO_IO_FD_MODE_READ_WRITE:
+		iofd_uring_submit_recv(iofd, IOFD_ACT_READ);
+		break;
+	case OSMO_IO_FD_MODE_RECVFROM_SENDTO:
+		iofd_uring_submit_recv(iofd, IOFD_ACT_RECVFROM);
+		break;
+	default:
+		OSMO_ASSERT(0);
+	}
+}
+
+static void iofd_uring_read_disable(struct osmo_io_fd *iofd)
+{
+	iofd->u.uring.read_enabled = false;
+}
+
+static int iofd_uring_close(struct osmo_io_fd *iofd)
+{
+	iofd_uring_read_disable(iofd);
+	iofd_uring_write_disable(iofd);
+	iofd_uring_unregister(iofd);
+	return close(iofd->fd);
+}
+
+const struct iofd_backend_ops iofd_uring_ops = {
+	.register_fd = iofd_uring_register,
+	.unregister_fd = iofd_uring_unregister,
+	.close = iofd_uring_close,
+	.write_enable = iofd_uring_write_enable,
+	.write_disable = iofd_uring_write_disable,
+	.read_enable = iofd_uring_read_enable,
+	.read_disable = iofd_uring_read_disable,
+};
+
+#endif /* defined(__linux__) */

libosmocore_1.8.0.tar.xz/src/core/select.c -> libosmocore_1.9.0.tar.xz/src/core/select.c Changed

@@ -54,6 +54,39 @@
 static __thread struct llist_head osmo_fds; /* TLS cannot use LLIST_HEAD() */
 static __thread int unregistered_count;
 
+/* Array of struct osmo_fd * (size "max_fd") ordered by "ofd->fd" */
+static __thread struct {
+	struct osmo_fd **table;
+	unsigned int size;
+} osmo_fd_lookup;
+
+static void osmo_fd_lookup_table_extend(unsigned int new_max_fd)
+{
+	unsigned int min_new_size;
+	unsigned int pw2;
+	unsigned int new_size;
+
+	/* First calculate the minimally required new size of the array in bytes: */
+	min_new_size = (new_max_fd + 1) * sizeof(struct osmo_fd *);
+	/* Now find the lower power of two of min_new_size (in bytes): */
+	pw2 = 32 - __builtin_clz(min_new_size);
+	/* get next (upper side) power of 2: */
+	pw2++;
+	OSMO_ASSERT(pw2 <= 31); /* Avoid shifting more than 31 bits */
+	new_size = 1 << (pw2 + 1);
+
+	/* Let's make it at least 1024B, to avoid reallocating quickly at startup */
+	if (new_size < 1024)
+		new_size = 1024;
+	if (new_size > osmo_fd_lookup.size) {
+		uint8_t *ptr = talloc_realloc_size(OTC_GLOBAL, osmo_fd_lookup.table, new_size);
+		OSMO_ASSERT(ptr);
+		memset(ptr + osmo_fd_lookup.size, 0, new_size - osmo_fd_lookup.size);
+		osmo_fd_lookup.table = (struct osmo_fd **)ptr;
+		osmo_fd_lookup.size = new_size;
+	}
+}
+
 #ifndef FORCE_IO_SELECT
 struct poll_state {
 	/* array of pollfd */
@@ -118,6 +151,9 @@
 /*! Register a new file descriptor with select loop abstraction
  *  \paramin fd osmocom file descriptor to be registered
  *  \returns 0 on success; negative in case of error
+ *
+ *  The API expects fd field of the struct osmo_fd to remain unchanged while
+ *  registered, ie until osmo_fd_unregister() is called on it.
  */
 int osmo_fd_register(struct osmo_fd *fd)
 {
@@ -142,8 +178,10 @@
 		return flags;
 
 	/* Register FD */
-	if (fd->fd > maxfd)
+	if (fd->fd > maxfd) {
 		maxfd = fd->fd;
+		osmo_fd_lookup_table_extend(maxfd);
+	}
 
 #ifdef OSMO_FD_CHECK
 	if (osmo_fd_is_registered(fd)) {
@@ -166,12 +204,17 @@
 #endif /* FORCE_IO_SELECT */
 
 	llist_add_tail(&fd->list, &osmo_fds);
+	osmo_fd_lookup.tablefd->fd = fd;
 
 	return 0;
 }
 
 /*! Unregister a file descriptor from select loop abstraction
  *  \paramin fd osmocom file descriptor to be unregistered
+ *
+ *  Caller is responsible for ensuring the fd is really registered before calling this API.
+ *  This function must be called before changing the value of the fd field in
+ *  the struct osmo_fd.
  */
 void osmo_fd_unregister(struct osmo_fd *fd)
 {
@@ -184,6 +227,21 @@
 	g_poll.num_registered--;
 #endif /* FORCE_IO_SELECT */
 
+	if (OSMO_UNLIKELY(fd->fd < 0  || fd->fd > maxfd)) {
+		/* Some old users used to incorrectly set fd = -1 *before* calling osmo_unregister().
+		 * Hence, in order to keep backward compatibility it's not possible to assert() here.
+		 * Instead, print an error message since this is actually a bug in the API user. */
+#ifdef OSMO_FD_CHECK
+		osmo_panic("osmo_fd_unregister(fd=%u) out of expected range (0..%u), fix your code!!!\n",
+			   fd->fd, maxfd);
+#else
+		fprintf(stderr, "osmo_fd_unregister(fd=%u) out of expected range (0..%u), fix your code!!!\n",
+			fd->fd, maxfd);
+		return;
+#endif
+	}
+
+	osmo_fd_lookup.tablefd->fd = NULL;
 	/* If existent, free any statistical data */
 	osmo_stats_tcp_osmo_fd_unregister(fd);
 }
@@ -464,23 +522,21 @@
  *  \returns \ref osmo_fd for \ref fd; NULL in case it doesn't exist */
 struct osmo_fd *osmo_fd_get_by_fd(int fd)
 {
-	struct osmo_fd *ofd;
-
-	llist_for_each_entry(ofd, &osmo_fds, list) {
-		if (ofd->fd == fd)
-			return ofd;
-	}
-	return NULL;
+	if (fd > maxfd || fd < 0)
+		return NULL;
+	return osmo_fd_lookup.tablefd;
 }
 
 /*! initialize the osmocom select abstraction for the current thread */
 void osmo_select_init(void)
 {
 	INIT_LLIST_HEAD(&osmo_fds);
+	osmo_fd_lookup_table_extend(0);
 }
 
-/* ensure main thread always has pre-initialized osmo_fds */
-static __attribute__((constructor)) void on_dso_load_select(void)
+/* ensure main thread always has pre-initialized osmo_fds
+ * priority 102: must run after on_dso_load_ctx */
+static __attribute__((constructor(102))) void on_dso_load_select(void)
 {
 	osmo_select_init();
 }

libosmocore_1.8.0.tar.xz/src/core/socket.c -> libosmocore_1.9.0.tar.xz/src/core/socket.c Changed

@@ -249,7 +249,7 @@
 			if (rc < 0) {
 				LOGP(DLGLOBAL, LOGL_ERROR, "unable to listen on socket: %s\n",
 					strerror(errno));
-				return rc;
+				return -errno;
 			}
 			break;
 		}
@@ -561,19 +561,21 @@
 			rc = setsockopt(sfd, SOL_SOCKET, SO_REUSEADDR,
 					&on, sizeof(on));
 			if (rc < 0) {
+				int err = errno;
 				_SOCKADDR_TO_STR(sastr, local);
 				LOGP(DLGLOBAL, LOGL_ERROR,
 				     "cannot setsockopt socket: " OSMO_SOCKADDR_STR_FMT ": %s\n",
-				     OSMO_SOCKADDR_STR_FMT_ARGS(sastr), strerror(errno));
+				     OSMO_SOCKADDR_STR_FMT_ARGS(sastr), strerror(err));
 				close(sfd);
 				return rc;
 			}
 		}
 
 		if (bind(sfd, &local->u.sa, sizeof(struct osmo_sockaddr)) == -1) {
+			int err = errno;
 			_SOCKADDR_TO_STR(sastr, local);
 			LOGP(DLGLOBAL, LOGL_ERROR, "unable to bind socket: " OSMO_SOCKADDR_STR_FMT ": %s\n",
-				     OSMO_SOCKADDR_STR_FMT_ARGS(sastr), strerror(errno));
+				     OSMO_SOCKADDR_STR_FMT_ARGS(sastr), strerror(err));
 			close(sfd);
 			return -1;
 		}
@@ -594,9 +596,10 @@
 
 		rc = connect(sfd, &remote->u.sa, sizeof(struct osmo_sockaddr));
 		if (rc != 0 && errno != EINPROGRESS) {
+			int err = errno;
 			_SOCKADDR_TO_STR(sastr, remote);
 			LOGP(DLGLOBAL, LOGL_ERROR, "unable to connect socket: " OSMO_SOCKADDR_STR_FMT ": %s\n",
-			     OSMO_SOCKADDR_STR_FMT_ARGS(sastr), strerror(errno));
+			     OSMO_SOCKADDR_STR_FMT_ARGS(sastr), strerror(err));
 			close(sfd);
 			return rc;
 		}
@@ -693,6 +696,76 @@
 	return 0;
 }
 
+static int setsockopt_sctp_auth_supported(int fd, uint32_t val)
+{
+#ifdef SCTP_AUTH_SUPPORTED
+	struct sctp_assoc_value assoc_val = {
+		.assoc_id = SCTP_FUTURE_ASSOC,
+		.assoc_value = val,
+	};
+	return setsockopt(fd, IPPROTO_SCTP, SCTP_AUTH_SUPPORTED, &assoc_val, sizeof(assoc_val));
+#else
+#pragma message "setsockopt(SCTP_AUTH_SUPPORTED) not supported! some SCTP features may not be available!"
+	LOGP(DLGLOBAL, LOGL_NOTICE, "Built without support for setsockopt(SCTP_AUTH_SUPPORTED), skipping\n");
+	return -ENOTSUP;
+#endif
+}
+
+static int setsockopt_sctp_asconf_supported(int fd, uint32_t val)
+{
+#ifdef SCTP_ASCONF_SUPPORTED
+	struct sctp_assoc_value assoc_val = {
+		.assoc_id = SCTP_FUTURE_ASSOC,
+		.assoc_value = val,
+	};
+	return setsockopt(fd, IPPROTO_SCTP, SCTP_ASCONF_SUPPORTED, &assoc_val, sizeof(assoc_val));
+#else
+#pragma message "setsockopt(SCTP_ASCONF_SUPPORTED) not supported! some SCTP features may not be available!"
+	LOGP(DLGLOBAL, LOGL_NOTICE, "Built without support for setsockopt(SCTP_ASCONF_SUPPORTED), skipping\n");
+	return -ENOTSUP;
+#endif
+}
+
+static int setsockopt_sctp_initmsg(int fd, const struct osmo_sock_init2_multiaddr_pars *pars)
+{
+	if (!pars->sctp.sockopt_initmsg.num_ostreams_present &&
+	    !pars->sctp.sockopt_initmsg.max_instreams_present &&
+	    !pars->sctp.sockopt_initmsg.max_attempts_present &&
+	    !pars->sctp.sockopt_initmsg.max_init_timeo_present)
+		return 0; /* nothing to set/do */
+
+#ifdef SCTP_INITMSG
+	struct sctp_initmsg si = {0};
+	socklen_t si_len = sizeof(si);
+	int rc;
+
+	/* If at least one field not present, obtain current value from kernel: */
+	if (!pars->sctp.sockopt_initmsg.num_ostreams_present ||
+	    !pars->sctp.sockopt_initmsg.max_instreams_present ||
+	    !pars->sctp.sockopt_initmsg.max_attempts_present ||
+	    !pars->sctp.sockopt_initmsg.max_init_timeo_present) {
+		rc = getsockopt(fd, IPPROTO_SCTP, SCTP_INITMSG, &si, &si_len);
+		if (rc < 0)
+			return rc;
+	}
+
+	if (pars->sctp.sockopt_initmsg.num_ostreams_present)
+		si.sinit_num_ostreams = pars->sctp.sockopt_initmsg.num_ostreams_value;
+	if (pars->sctp.sockopt_initmsg.max_instreams_present)
+		si.sinit_max_instreams = pars->sctp.sockopt_initmsg.max_instreams_value;
+	if (pars->sctp.sockopt_initmsg.max_attempts_present)
+		si.sinit_max_attempts = pars->sctp.sockopt_initmsg.max_attempts_value;
+	if (pars->sctp.sockopt_initmsg.max_init_timeo_present)
+		si.sinit_max_init_timeo = pars->sctp.sockopt_initmsg.max_init_timeo_value;
+
+	return setsockopt(fd, IPPROTO_SCTP, SCTP_INITMSG, &si, sizeof(si));
+#else
+#pragma message "setsockopt(SCTP_INITMSG) not supported! some SCTP features may not be available!"
+	LOGP(DLGLOBAL, LOGL_NOTICE, "Built without support for setsockopt(SCTP_INITMSG), skipping\n");
+	return -ENOTSUP
+#endif
+}
+
 /*! Initialize a socket (including bind and/or connect) with multiple local or remote addresses.
  *  \paramin family Address Family like AF_INET, AF_INET6, AF_UNSPEC
  *  \paramin type Socket type like SOCK_DGRAM, SOCK_STREAM
@@ -717,6 +790,38 @@
 		   const char **local_hosts, size_t local_hosts_cnt, uint16_t local_port,
 		   const char **remote_hosts, size_t remote_hosts_cnt, uint16_t remote_port,
 		   unsigned int flags)
+{
+	return osmo_sock_init2_multiaddr2(family, type, proto, local_hosts, local_hosts_cnt, local_port,
+					      remote_hosts, remote_hosts_cnt, remote_port, flags, NULL);
+}
+
+/*! Initialize a socket (including bind and/or connect) with multiple local or remote addresses.
+ *  \paramin family Address Family like AF_INET, AF_INET6, AF_UNSPEC
+ *  \paramin type Socket type like SOCK_DGRAM, SOCK_STREAM
+ *  \paramin proto Protocol like IPPROTO_TCP, IPPROTO_UDP
+ *  \paramin local_hosts array of char pointers (strings), each containing local host name or IP address in string form
+ *  \paramin local_hosts_cnt length of local_hosts (in items)
+ *  \paramin local_port local port number in host byte order
+ *  \paramin remote_host array of char pointers (strings), each containing remote host name or IP address in string form
+ *  \paramin remote_hosts_cnt length of remote_hosts (in items)
+ *  \paramin remote_port remote port number in host byte order
+ *  \paramin flags flags like \ref OSMO_SOCK_F_CONNECT
+ *  \paramin pars Extra parameters for multi-address specific protocols, such as SCTP. Can be NULL.
+ *  \returns socket file descriptor on success; negative on error
+ *
+ * This function is similar to \ref osmo_sock_init2(), but can be passed an
+ * array of local or remote addresses for protocols supporting multiple
+ * addresses per socket, like SCTP (currently only one supported). This function
+ * should not be used by protocols not supporting this kind of features, but
+ * rather \ref osmo_sock_init2() should be used instead.
+ * See \ref osmo_sock_init2() for more information on flags and general behavior.
+ *
+ * pars: If "pars" parameter is passed to the function, sctp.version shall be set to 0.
+ */
+int osmo_sock_init2_multiaddr2(uint16_t family, uint16_t type, uint8_t proto,
+		   const char **local_hosts, size_t local_hosts_cnt, uint16_t local_port,
+		   const char **remote_hosts, size_t remote_hosts_cnt, uint16_t remote_port,
+		   unsigned int flags, struct osmo_sock_init2_multiaddr_pars *pars)
 
 {
 	struct addrinfo *res_locOSMO_SOCK_MAX_ADDRS, *res_remOSMO_SOCK_MAX_ADDRS;
@@ -736,6 +841,9 @@
 	if (proto != IPPROTO_SCTP)
 		return -ENOTSUP;
 
+	if (pars && pars->sctp.version != 0)
+		return -EINVAL;
+
 	if ((flags & (OSMO_SOCK_F_BIND | OSMO_SOCK_F_CONNECT)) == 0) {
 		LOGP(DLGLOBAL, LOGL_ERROR, "invalid: you have to specify either "
 			"BIND or CONNECT flags\n");
@@ -776,7 +884,11 @@
 	if (((flags & OSMO_SOCK_F_BIND) && (flags & OSMO_SOCK_F_CONNECT)) &&
 	    !addrinfo_has_in6addr_any((const struct addrinfo **)res_loc, local_hosts_cnt) &&
 	    (loc_has_v4addr != rem_has_v4addr || loc_has_v6addr != rem_has_v6addr)) {
-		LOGP(DLGLOBAL, LOGL_ERROR, "Invalid v4 vs v6 in local vs remote addresses\n");
+		LOGP(DLGLOBAL, LOGL_ERROR, "Invalid v4 vs v6 in local vs remote addresses: "
+		     "local:%s%s remote:%s%s\n",
+		     loc_has_v4addr ? " v4" : "", loc_has_v6addr ? " v6" : "",
+		     rem_has_v4addr ? " v4" : "", rem_has_v6addr ? " v6" : ""
+		     );
 		rc = -EINVAL;
 		goto ret_freeaddrinfo;
 	}
@@ -794,15 +906,61 @@
 		rc = setsockopt(sfd, SOL_SOCKET, SO_REUSEADDR,
 				&on, sizeof(on));
 		if (rc < 0) {
+			int err = errno;
 			multiaddr_snprintf(strbuf, sizeof(strbuf), local_hosts, local_hosts_cnt);
 			LOGP(DLGLOBAL, LOGL_ERROR,
 			     "cannot setsockopt socket:"
 			     " %s:%u: %s\n",
 			     strbuf, local_port,
-			     strerror(errno));
+			     strerror(err));
 			goto ret_close;
 		}
 
+		if (pars && pars->sctp.sockopt_auth_supported.set) {
+			/* RFC 5061 4.2.7: ASCONF also requires AUTH feature. */
+			rc = setsockopt_sctp_auth_supported(sfd, pars->sctp.sockopt_auth_supported.value);
+			if (rc < 0) {
+				int err = errno;
+				multiaddr_snprintf(strbuf, sizeof(strbuf), local_hosts, local_hosts_cnt);
+				LOGP(DLGLOBAL, LOGL_ERROR,
+				     "cannot setsockopt(SCTP_AUTH_SUPPORTED) socket: %s:%u: %s\n",
+				     strbuf, local_port, strerror(err));
+				if (pars->sctp.sockopt_auth_supported.abort_on_failure)
+					goto ret_close;
+				/* do not fail, some features such as Peer Primary Address won't be available
+				 * unless configured system-wide through sysctl */
+			}
+		}
+
+		if (pars && pars->sctp.sockopt_asconf_supported.set) {
+			rc = setsockopt_sctp_asconf_supported(sfd, pars->sctp.sockopt_asconf_supported.value);
+			if (rc < 0) {
+				int err = errno;
+				multiaddr_snprintf(strbuf, sizeof(strbuf), local_hosts, local_hosts_cnt);
+				LOGP(DLGLOBAL, LOGL_ERROR,
+				     "cannot setsockopt(SCTP_ASCONF_SUPPORTED) socket: %s:%u: %s\n",
+				     strbuf, local_port, strerror(err));
+				if (pars->sctp.sockopt_asconf_supported.abort_on_failure)
+					goto ret_close;
+				/* do not fail, some features such as Peer Primary Address won't be available
+				 * unless configured system-wide through sysctl */
+			}
+		}
+
+		if (pars && pars->sctp.sockopt_initmsg.set) {
+			rc = setsockopt_sctp_initmsg(sfd, pars);
+			if (rc < 0) {
+				int err = errno;
+				multiaddr_snprintf(strbuf, sizeof(strbuf), local_hosts, local_hosts_cnt);
+				LOGP(DLGLOBAL, LOGL_ERROR,
+				     "cannot setsockopt(SCTP_INITMSG) socket: %s:%u: %s\n",
+				     strbuf, local_port, strerror(err));
+				if (pars->sctp.sockopt_initmsg.abort_on_failure)
+					goto ret_close;
+				/* do not fail, some parameters will be left as the global default */
+			}
+		}
+
 		/* Build array of addresses taking first entry for each host.
 		   TODO: Ideally we should use backtracking storing last used
 		   indexes and trying next combination if connect() fails .*/
@@ -817,9 +975,10 @@
 
 		rc = sctp_bindx(sfd, (struct sockaddr *)addrs_buf, local_hosts_cnt, SCTP_BINDX_ADD_ADDR);
 		if (rc == -1) {
+			int err = errno;
 			multiaddr_snprintf(strbuf, sizeof(strbuf), local_hosts, local_hosts_cnt);
 			LOGP(DLGLOBAL, LOGL_NOTICE, "unable to bind socket: %s:%u: %s\n",
-			     strbuf, local_port, strerror(errno));
+			     strbuf, local_port, strerror(err));
 			rc = -ENODEV;
 			goto ret_close;
 		}
@@ -839,9 +998,10 @@
 
 		rc = sctp_connectx(sfd, (struct sockaddr *)addrs_buf, remote_hosts_cnt, NULL);
 		if (rc != 0 && errno != EINPROGRESS) {
+			int err = errno;
 			multiaddr_snprintf(strbuf, sizeof(strbuf), remote_hosts, remote_hosts_cnt);
 			LOGP(DLGLOBAL, LOGL_ERROR, "unable to connect socket: %s:%u: %s\n",
-				strbuf, remote_port, strerror(errno));
+				strbuf, remote_port, strerror(err));
 			rc = -ENODEV;
 			goto ret_close;
 		}
@@ -1393,7 +1553,7 @@
 
 	sfd = socket(AF_UNIX, type, proto);
 	if (sfd < 0)
-		return -1;
+		return -errno;
 
 	if (flags & OSMO_SOCK_F_CONNECT) {
 		rc = connect(sfd, (struct sockaddr *)&local, namelen);
@@ -1413,13 +1573,13 @@
 	rc = osmo_sock_init_tail(sfd, type, flags);
 	if (rc < 0) {
 		close(sfd);
-		sfd = -1;
+		sfd = rc;
 	}
 
 	return sfd;
 err:
 	close(sfd);
-	return -1;
+	return -errno;
 }
 
 /*! Initialize a unix domain socket and fill \ref osmo_fd
@@ -1546,6 +1706,11 @@
 	char portbuf_l6, portbuf_r6;
 	int rc;
 
+	if (fd < 0) {
+		osmo_strlcpy(str, "<error-bad-fd>", str_len);
+		return -EBADF;
+	}
+
 	/* get local */
 	if ((rc = osmo_sock_get_ip_and_port(fd, hostbuf_l, sizeof(hostbuf_l), portbuf_l, sizeof(portbuf_l), true))) {
 		osmo_strlcpy(str, "<error-in-getsockname>", str_len);

libosmocore_1.8.0.tar.xz/src/core/stats_tcp.c -> libosmocore_1.9.0.tar.xz/src/core/stats_tcp.c Changed

libosmocore_1.8.0.tar.xz/src/core/strrb.c -> libosmocore_1.9.0.tar.xz/src/core/strrb.c Changed

libosmocore_1.8.0.tar.xz/src/core/tun.c -> libosmocore_1.9.0.tar.xz/src/core/tun.c Changed

libosmocore_1.8.0.tar.xz/src/ctrl/Makefile.am -> libosmocore_1.9.0.tar.xz/src/ctrl/Makefile.am Changed

libosmocore_1.8.0.tar.xz/src/ctrl/control_if.c -> libosmocore_1.9.0.tar.xz/src/ctrl/control_if.c Changed

libosmocore_1.8.0.tar.xz/src/gb/Makefile.am -> libosmocore_1.9.0.tar.xz/src/gb/Makefile.am Changed

libosmocore_1.8.0.tar.xz/src/gb/frame_relay.c -> libosmocore_1.9.0.tar.xz/src/gb/frame_relay.c Changed

libosmocore_1.8.0.tar.xz/src/gb/gprs_bssgp_rim.c -> libosmocore_1.9.0.tar.xz/src/gb/gprs_bssgp_rim.c Changed

@@ -49,12 +49,13 @@
 	{ 0, NULL }
 };
 
-/*! Parse a RIM Routing information IE (3GPP TS 48.018, chapter 11.3.70).
+/*! Parse a RIM Routing address IE (3GPP TS 29.060, chapter 7.7.57 and 7.7.77).
  *  \paramout ri user provided memory to store the parsed results.
- *  \paramin buf input buffer of the value part of the IE.
+ *  \paramin buf input buffer of the value part of the RIM Routing address IE.
+ *  \discrin discr value part (one byte) of the RIM Routing Address Discriminator IE.
  *  \returns length of parsed octets, -EINVAL on error. */
-int bssgp_parse_rim_ri(struct bssgp_rim_routing_info *ri, const uint8_t *buf,
-		       unsigned int len)
+int bssgp_parse_rim_ra(struct bssgp_rim_routing_info *ri, const uint8_t *buf,
+		       unsigned int len, uint8_t discr)
 {
 	struct gprs_ra_id raid_temp;
 
@@ -62,23 +63,22 @@
 	if (len < 2)
 		return -EINVAL;
 
-	ri->discr = buf0 & 0x0f;
-	buf++;
+	ri->discr = discr;
 
 	switch (ri->discr) {
 	case BSSGP_RIM_ROUTING_INFO_GERAN:
-		if (len < 9)
+		if (len < 8)
 			return -EINVAL;
 		ri->geran.cid = bssgp_parse_cell_id(&ri->geran.raid, buf);
-		return 9;
+		return 8;
 	case BSSGP_RIM_ROUTING_INFO_UTRAN:
-		if (len < 9)
+		if (len < 8)
 			return -EINVAL;
 		gsm48_parse_ra(&ri->utran.raid, buf);
 		ri->utran.rncid = osmo_load16be(buf + 6);
-		return 9;
+		return 8;
 	case BSSGP_RIM_ROUTING_INFO_EUTRAN:
-		if (len < 7 || len > 14)
+		if (len < 6 || len > 13)
 			return -EINVAL;
 		/* Note: 3GPP TS 24.301 Figure 9.9.3.32.1 and 3GPP TS 24.008
 		 * Figure 10.5.130 specify MCC/MNC encoding in the same way,
@@ -88,14 +88,35 @@
 		ri->eutran.tai.mnc = raid_temp.mnc;
 		ri->eutran.tai.mnc_3_digits = raid_temp.mnc_3_digits;
 		ri->eutran.tai.tac = osmo_load16be(buf + 3);
-		memcpy(ri->eutran.global_enb_id, buf + 5, len - 6);
-	        ri->eutran.global_enb_id_len = len - 6;
+		memcpy(ri->eutran.global_enb_id, buf + 5, len - 5);
+		ri->eutran.global_enb_id_len = len - 5;
 		return len;
 	default:
 		return -EINVAL;
 	}
 }
 
+/*! Parse a RIM Routing information IE (3GPP TS 48.018, chapter 11.3.70).
+ *  \paramout ri user provided memory to store the parsed results.
+ *  \paramin buf input buffer of the value part of the IE.
+ *  \returns length of parsed octets, -EINVAL on error. */
+int bssgp_parse_rim_ri(struct bssgp_rim_routing_info *ri, const uint8_t *buf,
+		       unsigned int len)
+{
+	uint8_t discr;
+	int rc;
+
+	if (len < 1)
+		return -EINVAL;
+
+	discr = buf0 & 0x0f;
+
+	rc = bssgp_parse_rim_ra(ri, buf + 1, len - 1, discr);
+	if (rc < 0)
+		return rc;
+	return rc + 1;
+}
+
 /*! Encode a RIM Routing information IE (3GPP TS 48.018, chapter 11.3.70).
  *  \paramout buf user provided memory (at least 14 byte) for the generated value part of the IE.
  *  \paramin ri user provided input data struct.
@@ -1171,13 +1192,32 @@
 	msgb_bvci(msg) = 0;	/* Signalling */
 
 	bgph = (struct bssgp_normal_hdr *)msgb_bssgph(msg);
-	DEBUGP(DLBSSGP, "BSSGP BVCI=0 Tx RIM-PDU:%s, src=%s, dest=%s\n",
-	       bssgp_pdu_str(bgph->pdu_type),
+	DEBUGP(DLBSSGP, "BSSGP BVCI=0 NSEI=%u Tx RIM-PDU:%s, src=%s, dest=%s\n",
+	       nsei, bssgp_pdu_str(bgph->pdu_type),
 	       bssgp_rim_ri_name_buf(ri_src_str, sizeof(ri_src_str), &pdu->routing_info_src),
 	       bssgp_rim_ri_name_buf(ri_dest_str, sizeof(ri_dest_str), &pdu->routing_info_dest));
 
 	return bssgp_ns_send(bssgp_ns_send_data, msg);
 }
+
+/*! Send encoded RAN TRANSPARENT CONTAINER via BSSGP (3GPP TS 29.060, section 7.7.43).
+ *  \paramin msg user provided memory for the encoded RAN TRANSPARENT CONTAINER to be sent.
+ *             (this function will take ownership of msg).
+ *  \paramin nsei BSSGP network service entity identifier (NSEI).
+ *  \returns 0 on sccess, -EINVAL on error. */
+int bssgp_tx_rim_encoded(struct msgb *msg, uint16_t nsei)
+{
+	struct bssgp_normal_hdr *bgph;
+
+	msgb_nsei(msg) = nsei;
+	msgb_bvci(msg) = 0;	/* Signalling */
+
+	bgph = (struct bssgp_normal_hdr *)msgb_bssgph(msg);
+	DEBUGP(DLBSSGP, "BSSGP BVCI=0 NSEI=%u Tx RIM-PDU:%s\n",
+	       nsei, bssgp_pdu_str(bgph->pdu_type));
+
+	return bssgp_ns_send(bssgp_ns_send_data, msg);
+}
 
 /* For internal use only (called from gprs_bssgp.c) */
 int bssgp_rx_rim(struct msgb *msg, struct tlv_parsed *tp, uint16_t bvci)

libosmocore_1.8.0.tar.xz/src/gb/gprs_ns.c -> libosmocore_1.9.0.tar.xz/src/gb/gprs_ns.c Changed

libosmocore_1.8.0.tar.xz/src/gb/gprs_ns2.c -> libosmocore_1.9.0.tar.xz/src/gb/gprs_ns2.c Changed

libosmocore_1.8.0.tar.xz/src/gb/gprs_ns2_fr.c -> libosmocore_1.9.0.tar.xz/src/gb/gprs_ns2_fr.c Changed

libosmocore_1.8.0.tar.xz/src/gb/gprs_ns2_frgre.c -> libosmocore_1.9.0.tar.xz/src/gb/gprs_ns2_frgre.c Changed

libosmocore_1.8.0.tar.xz/src/gb/gprs_ns2_internal.h -> libosmocore_1.9.0.tar.xz/src/gb/gprs_ns2_internal.h Changed

libosmocore_1.8.0.tar.xz/src/gb/gprs_ns2_message.c -> libosmocore_1.9.0.tar.xz/src/gb/gprs_ns2_message.c Changed

libosmocore_1.8.0.tar.xz/src/gb/gprs_ns2_udp.c -> libosmocore_1.9.0.tar.xz/src/gb/gprs_ns2_udp.c Changed

@@ -28,6 +28,7 @@
 
 #include <errno.h>
 
+#include <osmocom/core/osmo_io.h>
 #include <osmocom/core/select.h>
 #include <osmocom/core/sockaddr_str.h>
 #include <osmocom/core/socket.h>
@@ -46,7 +47,7 @@
 };
 
 struct priv_bind {
-	struct osmo_fd fd;
+	struct osmo_io_fd *iofd;
 	struct osmo_sockaddr addr;
 	int dscp;
 	uint8_t priority;
@@ -68,7 +69,8 @@
 
 	priv = bind->priv;
 
-	osmo_fd_close(&priv->fd);
+	osmo_iofd_free(priv->iofd);
+	priv->iofd = NULL;
 	talloc_free(priv);
 }
 
@@ -118,10 +120,10 @@
 
 /*! Find a NS-VC by its remote socket address.
  *  \paramin bind in which to search
- *  \paramin saddr remote peer socket adddress to search
+ *  \paramin rem_addr remote peer socket address to search
  *  \returns NS-VC matching sockaddr; NULL if none found */
 struct gprs_ns2_vc *gprs_ns2_nsvc_by_sockaddr_bind(struct gprs_ns2_vc_bind *bind,
-						   const struct osmo_sockaddr *saddr)
+						   const struct osmo_sockaddr *rem_addr)
 {
 	struct gprs_ns2_vc *nsvc;
 	struct priv_vc *vcpriv;
@@ -130,9 +132,9 @@
 
 	llist_for_each_entry(nsvc, &bind->nsvc, blist) {
 		vcpriv = nsvc->priv;
-		if (vcpriv->remote.u.sa.sa_family != saddr->u.sa.sa_family)
+		if (vcpriv->remote.u.sa.sa_family != rem_addr->u.sa.sa_family)
 			continue;
-		if (osmo_sockaddr_cmp(&vcpriv->remote, saddr))
+		if (osmo_sockaddr_cmp(&vcpriv->remote, rem_addr))
 			continue;
 
 		return nsvc;
@@ -143,17 +145,11 @@
 
 static inline int nsip_sendmsg(struct gprs_ns2_vc_bind *bind,
 			       struct msgb *msg,
-			       struct osmo_sockaddr *dest)
+			       const struct osmo_sockaddr *dest)
 {
-	int rc;
 	struct priv_bind *priv = bind->priv;
 
-	rc = sendto(priv->fd.fd, msg->data, msg->len, 0,
-		    &dest->u.sa, sizeof(*dest));
-
-	msgb_free(msg);
-
-	return rc;
+	return osmo_iofd_sendto_msgb(priv->iofd, msg, 0, dest);
 }
 
 /*! send the msg and free it afterwards.
@@ -171,40 +167,7 @@
 	return rc;
 }
 
-/* Read a single NS-over-IP message */
-static struct msgb *read_nsip_msg(struct osmo_fd *bfd, int *error, struct osmo_sockaddr *saddr,
-				  const struct gprs_ns2_vc_bind *bind)
-{
-	struct msgb *msg = ns2_msgb_alloc();
-	int ret = 0;
-	socklen_t saddr_len = sizeof(*saddr);
-
-	if (!msg) {
-		*error = -ENOMEM;
-		return NULL;
-	}
-
-	ret = recvfrom(bfd->fd, msg->data, NS_ALLOC_SIZE - NS_ALLOC_HEADROOM, 0,
-			&saddr->u.sa, &saddr_len);
-	if (ret < 0) {
-		LOGBIND(bind, LOGL_ERROR, "recv error %s during NSIP recvfrom %s\n",
-			strerror(errno), osmo_sock_get_name2(bfd->fd));
-		msgb_free(msg);
-		*error = ret;
-		return NULL;
-	} else if (ret == 0) {
-		msgb_free(msg);
-		*error = ret;
-		return NULL;
-	}
-
-	msg->l2h = msg->data;
-	msgb_put(msg, ret);
-
-	return msg;
-}
-
-static struct priv_vc *ns2_driver_alloc_vc(struct gprs_ns2_vc_bind *bind, struct gprs_ns2_vc *nsvc, struct osmo_sockaddr *remote)
+static struct priv_vc *ns2_driver_alloc_vc(struct gprs_ns2_vc_bind *bind, struct gprs_ns2_vc *nsvc, const struct osmo_sockaddr *remote)
 {
 	struct priv_vc *priv = talloc_zero(bind, struct priv_vc);
 	if (!priv)
@@ -216,24 +179,22 @@
 	return priv;
 }
 
-static int handle_nsip_read(struct osmo_fd *bfd)
+static void handle_nsip_recvfrom(struct osmo_io_fd *iofd, int error, struct msgb *msg,
+				 const struct osmo_sockaddr *saddr)
 {
 	int rc = 0;
-	int error = 0;
-	struct gprs_ns2_vc_bind *bind = bfd->data;
-	struct osmo_sockaddr saddr;
+	struct gprs_ns2_vc_bind *bind = osmo_iofd_get_data(iofd);
 	struct gprs_ns2_vc *nsvc;
-	struct msgb *msg = read_nsip_msg(bfd, &error, &saddr, bind);
+
 	struct msgb *reject;
 
-	if (!msg)
-		return -EINVAL;
+	msg->l2h = msgb_data(msg);
 
 	/* check if a vc is available */
-	nsvc = gprs_ns2_nsvc_by_sockaddr_bind(bind, &saddr);
+	nsvc = gprs_ns2_nsvc_by_sockaddr_bind(bind, saddr);
 	if (!nsvc) {
 		/* VC not found */
-		rc = ns2_create_vc(bind, msg, &saddr, "newconnection", &reject, &nsvc);
+		rc = ns2_create_vc(bind, msg, saddr, "newconnection", &reject, &nsvc);
 		switch (rc) {
 		case NS2_CS_FOUND:
 			break;
@@ -243,10 +204,10 @@
 			goto out;
 		case NS2_CS_REJECTED:
 			/* nsip_sendmsg will free reject */
-			rc = nsip_sendmsg(bind, reject, &saddr);
+			rc = nsip_sendmsg(bind, reject, saddr);
 			goto out;
 		case NS2_CS_CREATED:
-			ns2_driver_alloc_vc(bind, nsvc, &saddr);
+			ns2_driver_alloc_vc(bind, nsvc, saddr);
 			/* only start the fsm for non SNS. SNS will take care of its own */
 			if (nsvc->nse->dialect != GPRS_NS2_DIALECT_SNS)
 				ns2_vc_fsm_start(nsvc);
@@ -254,29 +215,31 @@
 		}
 	}
 
-	return ns2_recv_vc(nsvc, msg);
+	ns2_recv_vc(nsvc, msg);
+	return;
 
 out:
 	msgb_free(msg);
-	return rc;
 }
 
-static int handle_nsip_write(struct osmo_fd *bfd)
-{
-	/* FIXME: actually send the data here instead of nsip_sendmsg() */
-	return -EIO;
-}
-
-static int nsip_fd_cb(struct osmo_fd *bfd, unsigned int what)
+static void handle_nsip_sendto(struct osmo_io_fd *iofd, int res,
+			       struct msgb *msg,
+			       const struct osmo_sockaddr *daddr)
 {
-	int rc = 0;
+	struct gprs_ns2_vc_bind *bind = osmo_iofd_get_data(iofd);
+	struct gprs_ns2_vc *nsvc;
 
-	if (what & OSMO_FD_READ)
-		rc = handle_nsip_read(bfd);
-	if (what & OSMO_FD_WRITE)
-		rc = handle_nsip_write(bfd);
+	nsvc = gprs_ns2_nsvc_by_sockaddr_bind(bind, daddr);
+	if (!nsvc)
+		return;
 
-	return rc;
+	if (OSMO_LIKELY(res >= 0)) {
+		RATE_CTR_INC_NS(nsvc, NS_CTR_PKTS_OUT);
+		RATE_CTR_ADD_NS(nsvc, NS_CTR_BYTES_OUT, res);
+	} else {
+		RATE_CTR_INC_NS(nsvc, NS_CTR_PKTS_OUT_DROP);
+		RATE_CTR_ADD_NS(nsvc, NS_CTR_BYTES_OUT_DROP, msgb_length(msg));
+	}
 }
 
 /*! Find NS bind for a given socket address
@@ -321,6 +284,11 @@
 	struct priv_bind *priv;
 	int rc;
 
+	struct osmo_io_ops ioops = {
+		.sendto_cb = &handle_nsip_sendto,
+		.recvfrom_cb = &handle_nsip_recvfrom,
+	};
+
 	if (local->u.sa.sa_family != AF_INET && local->u.sa.sa_family != AF_INET6)
 		return -EINVAL;
 
@@ -353,12 +321,11 @@
 		gprs_ns2_free_bind(bind);
 		return -ENOMEM;
 	}
-	priv->fd.cb = nsip_fd_cb;
-	priv->fd.data = bind;
+
 	priv->addr = *local;
 	priv->dscp = dscp;
 
-	rc = osmo_sock_init_osa_ofd(&priv->fd, SOCK_DGRAM, IPPROTO_UDP,
+	rc = osmo_sock_init_osa(SOCK_DGRAM, IPPROTO_UDP,
 				 local, NULL,
 				 OSMO_SOCK_F_BIND | OSMO_SOCK_F_DSCP(priv->dscp));
 	if (rc < 0) {
@@ -366,6 +333,11 @@
 		return rc;
 	}
 
+	priv->iofd = osmo_iofd_setup(bind, rc, "NS bind", OSMO_IO_FD_MODE_RECVFROM_SENDTO, &ioops, bind);
+	osmo_iofd_register(priv->iofd, rc);
+	osmo_iofd_set_alloc_info(priv->iofd, 4096, 128);
+	osmo_iofd_set_txqueue_max_length(priv->iofd, nsi->txqueue_max_length);
+
 	/* IPv4: max fragmented payload can be (13 bit) * 8 byte => 65535.
 	 * IPv6: max payload can be 65535 (RFC 2460).
 	 * UDP header = 8 byte */
@@ -521,7 +493,7 @@
 	if (dscp != priv->dscp) {
 		priv->dscp = dscp;
 
-		rc = osmo_sock_set_dscp(priv->fd.fd, dscp);
+		rc = osmo_sock_set_dscp(osmo_iofd_get_fd(priv->iofd), dscp);
 		if (rc < 0) {
 			LOGBIND(bind, LOGL_ERROR, "Failed to set the DSCP to %u with ret(%d) errno(%d)\n",
 				dscp, rc, errno);
@@ -543,7 +515,7 @@
 	if (priority != priv->priority) {
 		priv->priority = priority;
 
-		rc = osmo_sock_set_priority(priv->fd.fd, priority);
+		rc = osmo_sock_set_priority(osmo_iofd_get_fd(priv->iofd), priority);
 		if (rc < 0) {
 			LOGBIND(bind, LOGL_ERROR, "Failed to set the priority to %u with ret(%d) errno(%d)\n",
 				priority, rc, errno);
@@ -603,6 +575,14 @@
 	return NULL;
 }
 
+void ns2_ip_set_txqueue_max_length(struct gprs_ns2_vc_bind *bind, unsigned int max_length)
+{
+	struct priv_bind *priv = bind->priv;
+	OSMO_ASSERT(gprs_ns2_is_ip_bind(bind));
+
+	osmo_iofd_set_txqueue_max_length(priv->iofd, max_length);
+}
+
 /*! set the signalling and data weight for this bind
  * \paramin bind
  * \paramin signalling the signalling weight

libosmocore_1.8.0.tar.xz/src/gb/gprs_ns2_vty.c -> libosmocore_1.9.0.tar.xz/src/gb/gprs_ns2_vty.c Changed

@@ -36,6 +36,7 @@
 #include <osmocom/core/fsm.h>
 #include <osmocom/core/linuxlist.h>
 #include <osmocom/core/msgb.h>
+#include <osmocom/core/osmo_io.h>
 #include <osmocom/core/rate_ctr.h>
 #include <osmocom/core/select.h>
 #include <osmocom/core/talloc.h>
@@ -595,6 +596,9 @@
 			get_value_string(gprs_ns_timer_strs, i),
 			vty_nsi->timeouti, VTY_NEWLINE);
 
+	if (vty_nsi->txqueue_max_length != NS_DEFAULT_TXQUEUE_MAX_LENGTH)
+		vty_out(vty, " txqueue-max-length %u%s", vty_nsi->txqueue_max_length, VTY_NEWLINE);
+
 	ret = config_write_ns_bind(vty);
 	if (ret)
 		return ret;
@@ -1707,6 +1711,27 @@
 	return CMD_WARNING;
 }
 
+DEFUN(cfg_ns_txqueue_max_length, cfg_ns_txqueue_max_length_cmd,
+      "txqueue-max-length <1-4096>",
+      "Set the maximum length of the txqueue (for UDP)\n"
+      "Maximum length of the txqueue\n")
+{
+	struct gprs_ns2_vc_bind *bind;
+	uint32_t max_length = atoi(argv0);
+	vty_nsi->txqueue_max_length = max_length;
+
+
+	llist_for_each_entry(bind, &vty_nsi->binding, list) {
+		if (!gprs_ns2_is_ip_bind(bind))
+			continue;
+
+		ns2_ip_set_txqueue_max_length(bind, max_length);
+	}
+
+
+	return CMD_SUCCESS;
+}
+
 DEFUN(cfg_ns_nse_ip_sns_bind, cfg_ns_nse_ip_sns_bind_cmd,
       "ip-sns-bind BINDID",
       "IP SNS binds\n"
@@ -2292,6 +2317,8 @@
 	install_lib_element(L_NS_NODE, &cfg_ns_ip_sns_default_bind_cmd);
 	install_lib_element(L_NS_NODE, &cfg_no_ns_ip_sns_default_bind_cmd);
 
+	install_lib_element(L_NS_NODE, &cfg_ns_txqueue_max_length_cmd);
+
 	install_node(&ns_bind_node, NULL);
 	install_lib_element(L_NS_BIND_NODE, &cfg_ns_bind_listen_cmd);
 	install_lib_element(L_NS_BIND_NODE, &cfg_no_ns_bind_listen_cmd);

libosmocore_1.8.0.tar.xz/src/gb/libosmogb.map -> libosmocore_1.9.0.tar.xz/src/gb/libosmogb.map Changed

libosmocore_1.8.0.tar.xz/src/gsm/Makefile.am -> libosmocore_1.9.0.tar.xz/src/gsm/Makefile.am Changed

@@ -1,7 +1,7 @@
 # This is _NOT_ the library release version, it's an API version.
 # Please read chapter "Library interface versions" of the libtool documentation
 # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html
-LIBVERSION=19:0:1
+LIBVERSION=20:0:0
 
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include
 AM_CFLAGS = -Wall $(TALLOC_CFLAGS)
@@ -15,6 +15,8 @@
 		 milenage/common.h milenage/crypto.h milenage/includes.h \
 		 milenage/milenage.h
 
+noinst_HEADERS += tuak/KeccakP-1600-3gpp.h tuak/tuak.h
+
 noinst_LTLIBRARIES = libgsmint.la
 lib_LTLIBRARIES = libosmogsm.la
 
@@ -26,14 +28,15 @@
 			gprs_cipher_core.c gprs_rlc.c gsm0480.c abis_nm.c gsm0502.c \
 			gsm0411_utils.c gsm0411_smc.c gsm0411_smr.c gsm0414.c \
 			lapdm.c kasumi.c gsm29205.c gsm_04_08_gprs.c \
-			auth_core.c auth_comp128v1.c auth_comp128v23.c auth_xor.c \
+			auth_core.c auth_comp128v1.c auth_comp128v23.c auth_xor.c auth_xor_2g.c \
 			auth_milenage.c milenage/aes-encblock.c gea.c \
 			milenage/aes-internal.c milenage/aes-internal-enc.c \
 			milenage/milenage.c gan.c ipa.c gsm0341.c apn.c \
+			tuak/KeccakP-1600-3gpp.c tuak/tuak.c auth_tuak.c \
 			gsup.c gsup_sms.c gprs_gea.c gsm0503_conv.c oap.c gsm0808_utils.c \
 			gsm23003.c gsm23236.c mncc.c bts_features.c oap_client.c \
 			gsm29118.c gsm48_rest_octets.c cbsp.c gsm48049.c \
-			gad.c bsslap.c bssmap_le.c kdf.c iuup.c
+			gad.c bsslap.c bssmap_le.c kdf.c iuup.c gsm44021.c gsm44068.c
 
 libgsmint_la_LDFLAGS = -no-undefined
 libgsmint_la_LIBADD = $(top_builddir)/src/core/libosmocore.la $(top_builddir)/src/isdn/libosmoisdn.la
@@ -52,6 +55,7 @@
 endif
 
 EXTRA_DIST = libosmogsm.map
+EXTRA_libosmogsm_la_DEPENDENCIES = libosmogsm.map
 
 # Convolutional codes generation
 gsm0503_conv.c: $(top_srcdir)/utils/conv_gen.py $(top_srcdir)/utils/conv_codes_gsm.py

libosmocore_1.8.0.tar.xz/src/gsm/abis_nm.c -> libosmocore_1.9.0.tar.xz/src/gsm/abis_nm.c Changed

@@ -707,6 +707,100 @@
 	/* FIXME: bounds check */
 };
 
+const struct value_string abis_nm_ipacc_freq_band_desc = {
+	{ NM_IPAC_F_FREQ_BAND_PGSM,	"P-GSM" },
+	{ NM_IPAC_F_FREQ_BAND_EGSM,	"E-GSM" },
+	{ NM_IPAC_F_FREQ_BAND_RGSM,	"R-GSM" },
+	{ NM_IPAC_F_FREQ_BAND_DCS,	"DCS-1800" },
+	{ NM_IPAC_F_FREQ_BAND_PCS,	"PCS-1900" },
+	{ NM_IPAC_F_FREQ_BAND_850,	"850" },
+	{ NM_IPAC_F_FREQ_BAND_480,	"480" },
+	{ NM_IPAC_F_FREQ_BAND_450,	"450" },
+	{ 0, NULL }
+};
+
+const struct value_string abis_nm_ipacc_ciph_algo_desc = {
+	{ NM_IPAC_F_CIPH_ALGO_A51,	"A5/1" },
+	{ NM_IPAC_F_CIPH_ALGO_A52,	"A5/2" },
+	{ NM_IPAC_F_CIPH_ALGO_A53,	"A5/3" },
+	{ NM_IPAC_F_CIPH_ALGO_A54,	"A5/4" },
+	{ NM_IPAC_F_CIPH_ALGO_A55,	"A5/5" },
+	{ NM_IPAC_F_CIPH_ALGO_A56,	"A5/6" },
+	{ NM_IPAC_F_CIPH_ALGO_A57,	"A5/7" },
+	{ NM_IPAC_F_CIPH_ALGO_A58,	"A5/8" },
+	{ 0, NULL }
+};
+
+const struct value_string abis_nm_ipacc_chant_desc = {
+	{ NM_IPAC_F_CHANT_TCHF,			"TCH/F" },
+	{ NM_IPAC_F_CHANT_TCHH,			"TCH/H" },
+	{ NM_IPAC_F_CHANT_SDCCH8,		"SDCCH/8" },
+	{ NM_IPAC_F_CHANT_BCCH,			"BCCH" },
+	{ NM_IPAC_F_CHANT_BCCH_SDCCH4,		"BCCH+SDCCH/4" },
+	{ NM_IPAC_F_CHANT_BCH,			"BCH" },
+	{ NM_IPAC_F_CHANT_BCCH_SDCCH4_CBCH,	"BCCH+SDCCH/4+CBCH" },
+	{ NM_IPAC_F_CHANT_SDCCH8_CBCH,		"SDCCH/8+CBCH" },
+	{ NM_IPAC_F_CHANT_PDCHF,		"PDCH/F" },
+	{ NM_IPAC_F_CHANT_TCHF_PDCHF,		"TCH/F or PDCH/F" },
+	{ NM_IPAC_F_CHANT_TCHH_PDCHH,		"TCH/H+PDCH/H" },
+	{ NM_IPAC_F_CHANT_TCHF_TCHH,		"TCH/F or TCH/H" },
+	{ 0, NULL }
+};
+
+const struct value_string abis_nm_ipacc_chanm_desc = {
+	{ NM_IPAC_F_CHANM_SPEECH_FS,		"FR1/FS" },
+	{ NM_IPAC_F_CHANM_SPEECH_EFS,		"FR2/EFS" },
+	{ NM_IPAC_F_CHANM_SPEECH_AFS,		"FR3/AFS" },
+	{ NM_IPAC_F_CHANM_SPEECH_HS,		"HR1/HS" },
+	{ NM_IPAC_F_CHANM_SPEECH_AHS,		"HR3/AHS" },
+	{ NM_IPAC_F_CHANM_CSD_NT_4k8,		"CSD NT 4.8 kbit/s" },
+	{ NM_IPAC_F_CHANM_CSD_NT_9k6,		"CSD NT 9.6 kbit/s" },
+	{ NM_IPAC_F_CHANM_CSD_NT_14k4,		"CSD NT 14.4 kbit/s" },
+	{ NM_IPAC_F_CHANM_CSD_T_1200_75,	"CSD T 1200/75 kbit/s" },
+	{ NM_IPAC_F_CHANM_CSD_T_600,		"CSD T 600 kbit/s" },
+	{ NM_IPAC_F_CHANM_CSD_T_1k2,		"CSD T 1k2 kbit/s" },
+	{ NM_IPAC_F_CHANM_CSD_T_2k4,		"CSD T 2.4 kbit/s" },
+	{ NM_IPAC_F_CHANM_CSD_T_4k8,		"CSD T 4.8 kbit/s" },
+	{ NM_IPAC_F_CHANM_CSD_T_9k6,		"CSD T 9.6 kbit/s" },
+	{ NM_IPAC_F_CHANM_CSD_T_14k4,		"CSD T 14.4 kbit/s" },
+	{ 0, NULL }
+};
+
+const struct value_string abis_nm_ipacc_gprs_coding_desc = {
+	{ NM_IPAC_F_GPRS_CODING_CS1,		"CS1" },
+	{ NM_IPAC_F_GPRS_CODING_CS2,		"CS2" },
+	{ NM_IPAC_F_GPRS_CODING_CS3,		"CS3" },
+	{ NM_IPAC_F_GPRS_CODING_CS4,		"CS4" },
+	{ NM_IPAC_F_GPRS_CODING_MCS1,		"MCS1" },
+	{ NM_IPAC_F_GPRS_CODING_MCS2,		"MCS2" },
+	{ NM_IPAC_F_GPRS_CODING_MCS3,		"MCS3" },
+	{ NM_IPAC_F_GPRS_CODING_MCS4,		"MCS4" },
+	{ NM_IPAC_F_GPRS_CODING_MCS5,		"MCS5" },
+	{ NM_IPAC_F_GPRS_CODING_MCS6,		"MCS6" },
+	{ NM_IPAC_F_GPRS_CODING_MCS7,		"MCS7" },
+	{ NM_IPAC_F_GPRS_CODING_MCS8,		"MCS8" },
+	{ NM_IPAC_F_GPRS_CODING_MCS9,		"MCS9" },
+	{ 0, NULL }
+};
+
+const struct value_string abis_nm_ipacc_rtp_feat_desc = {
+	{ NM_IPAC_F_RTP_FEAT_COMPR_CONTROL,	"Compression Control" },
+	{ NM_IPAC_F_RTP_FEAT_IR_8k,		"Intermediate Rate 8 kbit/s" },
+	{ NM_IPAC_F_RTP_FEAT_IR_16k,		"Intermediate Rate 16 kbit/s" },
+	{ NM_IPAC_F_RTP_FEAT_IR_32k,		"Intermediate Rate 32 kbit/s" },
+	{ NM_IPAC_F_RTP_FEAT_IR_64k,		"Intermediate Rate 64 kbit/s" },
+	{ NM_IPAC_F_RTP_FEAT_MULTIPLEX_RTP,	"RTP Multiplex" },
+	{ NM_IPAC_F_RTP_FEAT_MULTIPLEX_SRTP,	"SRTP Multiplex" },
+	{ 0, NULL }
+};
+
+const struct value_string abis_nm_ipacc_rsl_feat_desc = {
+	{ NM_IPAC_F_RSL_FEAT_PHYSICAL_CONTEXT,	"Physical Context" },
+	{ NM_IPAC_F_RSL_FEAT_DYN_PDCH_ACT,	"Dynamic PDCH Activation" },
+	{ NM_IPAC_F_RSL_FEAT_RTP_PT2,		"RTP Payload Type 2" },
+	{ 0, NULL }
+};
+
 /*! Pack 3GPP TS 12.21 § 8.8.2 Failure Event Report into msgb */
 struct msgb *abis_nm_fail_evt_rep(enum abis_nm_event_type t,
 				  enum abis_nm_severity s,

libosmocore_1.8.0.tar.xz/src/gsm/auth_comp128v1.c -> libosmocore_1.9.0.tar.xz/src/gsm/auth_comp128v1.c Changed

libosmocore_1.8.0.tar.xz/src/gsm/auth_comp128v23.c -> libosmocore_1.9.0.tar.xz/src/gsm/auth_comp128v23.c Changed

libosmocore_1.8.0.tar.xz/src/gsm/auth_core.c -> libosmocore_1.9.0.tar.xz/src/gsm/auth_core.c Changed

@@ -1,4 +1,4 @@
-/* (C) 2010-2012 by Harald Welte <laforge@gnumonks.org>
+/* (C) 2010-2023 by Harald Welte <laforge@gnumonks.org>
  *
  * All Rights Reserved
  *
@@ -36,6 +36,35 @@
 
 static LLIST_HEAD(osmo_auths);
 
+/* generate auth_data2 from auth_data (for legacy API/ABI compatibility */
+static int auth_data2auth_data2(struct osmo_sub_auth_data2 *out, const struct osmo_sub_auth_data *in)
+{
+	out->type = in->type;
+	out->algo = in->algo;
+	switch (in->type) {
+	case OSMO_AUTH_TYPE_NONE:
+		return 0;
+	case OSMO_AUTH_TYPE_GSM:
+		memcpy(out->u.gsm.ki, in->u.gsm.ki, sizeof(out->u.gsm.ki));
+		break;
+	case OSMO_AUTH_TYPE_UMTS:
+		memcpy(out->u.umts.opc, in->u.umts.opc, sizeof(in->u.umts.opc));
+		out->u.umts.opc_len = sizeof(in->u.umts.opc);
+		memcpy(out->u.umts.k, in->u.umts.k, sizeof(in->u.umts.k));
+		out->u.umts.k_len = sizeof(in->u.umts.k);
+		memcpy(out->u.umts.amf, in->u.umts.amf, sizeof(out->u.umts.amf));
+		out->u.umts.sqn = in->u.umts.sqn;
+		out->u.umts.opc_is_op = in->u.umts.opc_is_op;
+		out->u.umts.ind_bitlen = in->u.umts.ind_bitlen;
+		out->u.umts.ind = in->u.umts.ind;
+		out->u.umts.sqn_ms = in->u.umts.sqn_ms;
+		break;
+	default:
+		return -EINVAL;
+	}
+	return 0;
+}
+
 static struct osmo_auth_impl *selected_auths_OSMO_AUTH_ALG_NUM;
 
 /*! Register an authentication algorithm implementation with the core
@@ -138,6 +167,42 @@
 }
 
 /*! Generate authentication vector
+ *  \paramout vec Generated authentication vector. See below!
+ *  \paramin aud Subscriber-specific key material
+ *  \paramin _rand Random challenge to be used
+ *  \returns 0 on success, negative error on failure
+ *
+ * This function performs the core cryptographic function of the AUC,
+ * computing authentication triples/quintuples based on the permanent
+ * subscriber data and a random value.  The result is what is forwarded
+ * by the AUC via HLR and VLR to the MSC which will then be able to
+ * invoke authentication with the MS.
+ *
+ * Contrary to the older osmo_auth_gen_vec(), the caller must specify
+ * the desired RES length in the vec->res_len field prior to calling
+ * this function.  The requested length must match the capabilities of
+ * the chosen algorithm (e.g. 4/8 for MILENAGE).
+ */
+int osmo_auth_gen_vec2(struct osmo_auth_vector *vec,
+		       struct osmo_sub_auth_data2 *aud,
+		       const uint8_t *_rand)
+{
+	struct osmo_auth_impl *impl = selected_authsaud->algo;
+	int rc;
+
+	if (!impl)
+		return -ENOENT;
+
+	rc = impl->gen_vec(vec, aud, _rand);
+	if (rc < 0)
+		return rc;
+
+	memcpy(vec->rand, _rand, sizeof(vec->rand));
+
+	return 0;
+}
+
+/*! Generate authentication vector
  *  \paramout vec Generated authentication vector
  *  \paramin aud Subscriber-specific key material
  *  \paramin _rand Random challenge to be used
@@ -153,13 +218,58 @@
 		      struct osmo_sub_auth_data *aud,
 		      const uint8_t *_rand)
 {
+	struct osmo_sub_auth_data2 aud2;
+	int rc;
+
+	if (aud->type == OSMO_AUTH_TYPE_UMTS) {
+		/* old API callers are not expected to initialize this struct field,
+		 * and always expect an 8-byte RES value */
+		vec->res_len = 8;
+	}
+
+	rc = auth_data2auth_data2(&aud2, aud);
+	if (rc < 0)
+		return rc;
+
+	rc = osmo_auth_gen_vec2(vec, &aud2, _rand);
+	if (aud->type == OSMO_AUTH_TYPE_UMTS)
+		aud->u.umts.sqn = aud2.u.umts.sqn;
+
+	return rc;
+}
+
+/*! Generate authentication vector and re-sync sequence
+ *  \paramout vec Generated authentication vector. See below!
+ *  \paramin aud Subscriber-specific key material
+ *  \paramin auts AUTS value sent by the SIM/MS
+ *  \paramin rand_auts RAND value sent by the SIM/MS
+ *  \paramin _rand Random challenge to be used to generate vector
+ *  \returns 0 on success, negative error on failure
+ *
+ * This function performs a special variant of the core cryptographic
+ * function of the AUC: computing authentication triples/quintuples
+ * based on the permanent subscriber data, a random value as well as the
+ * AUTS and RAND values returned by the SIM/MS.  This special variant is
+ * needed if the sequence numbers between MS and AUC have for some
+ * reason become different.
+ *
+ * Contrary to the older osmo_auth_gen_vec_auts(), the caller must specify
+ * the desired RES length in the vec->res_len field prior to calling
+ * this function.  The requested length must match the capabilities of
+ * the chosen algorithm (e.g. 4/8 for MILENAGE).
+ */
+int osmo_auth_gen_vec_auts2(struct osmo_auth_vector *vec,
+			    struct osmo_sub_auth_data2 *aud,
+			    const uint8_t *auts, const uint8_t *rand_auts,
+			    const uint8_t *_rand)
+{
 	struct osmo_auth_impl *impl = selected_authsaud->algo;
 	int rc;
 
-	if (!impl)
+	if (!impl || !impl->gen_vec_auts)
 		return -ENOENT;
 
-	rc = impl->gen_vec(vec, aud, _rand);
+	rc = impl->gen_vec_auts(vec, aud, auts, rand_auts, _rand);
 	if (rc < 0)
 		return rc;
 
@@ -188,19 +298,26 @@
 			   const uint8_t *auts, const uint8_t *rand_auts,
 			   const uint8_t *_rand)
 {
-	struct osmo_auth_impl *impl = selected_authsaud->algo;
+	struct osmo_sub_auth_data2 aud2;
 	int rc;
 
-	if (!impl || !impl->gen_vec_auts)
-		return -ENOENT;
+	if (aud->type == OSMO_AUTH_TYPE_UMTS) {
+		/* old API callers are not expected to initialize this struct field,
+		 * and always expect an 8-byte RES value */
+		vec->res_len = 8;
+	}
 
-	rc = impl->gen_vec_auts(vec, aud, auts, rand_auts, _rand);
+	rc = auth_data2auth_data2(&aud2, aud);
 	if (rc < 0)
 		return rc;
 
-	memcpy(vec->rand, _rand, sizeof(vec->rand));
+	rc = osmo_auth_gen_vec_auts2(vec, &aud2, auts, rand_auts, _rand);
+	if (aud->type == OSMO_AUTH_TYPE_UMTS) {
+		aud->u.umts.sqn = aud2.u.umts.sqn;
+		aud->u.umts.sqn_ms = aud2.u.umts.sqn_ms;
+	}
 
-	return 0;
+	return rc;
 }
 
 static const struct value_string auth_alg_vals = {
@@ -208,8 +325,10 @@
 	{ OSMO_AUTH_ALG_COMP128v1, "COMP128v1" },
 	{ OSMO_AUTH_ALG_COMP128v2, "COMP128v2" },
 	{ OSMO_AUTH_ALG_COMP128v3, "COMP128v3" },
-	{ OSMO_AUTH_ALG_XOR, "XOR" },
+	{ OSMO_AUTH_ALG_XOR_3G, "XOR-3G" },
 	{ OSMO_AUTH_ALG_MILENAGE, "MILENAGE" },
+	{ OSMO_AUTH_ALG_XOR_2G, "XOR-2G" },
+	{ OSMO_AUTH_ALG_TUAK, "TUAK" },
 	{ 0, NULL }
 };
 
@@ -245,4 +364,33 @@
 		kci = cki ^ cki + 8 ^ iki ^ iki + 8;
 }
 
+/*! Derive GSM SRES from UMTS XRES (auth function c2 from 3GPP TS 33.103 Section 6.8.1.2
+ *  \paramout sres GSM SRES value, 4 byte target buffer
+ *  \paramin res UMTS XRES, 4..16 bytes input buffer
+ *  \paramin res_len length of res parameter (in bytes)
+ *  \paramin sres_deriv_func SRES derivation function (1 or 2, see 3GPP TS 55.205 Section 4
+ */
+void osmo_auth_c2(uint8_t sres4, const uint8_t *res, size_t res_len, uint8_t sres_deriv_func)
+{
+	uint8_t xres16;
+
+	OSMO_ASSERT(sres_deriv_func == 1 || sres_deriv_func == 2);
+	OSMO_ASSERT(res_len <= sizeof(xres));
+
+	memcpy(xres, res, res_len);
+
+	/* zero-pad the end, if XRES is < 16 bytes */
+	if (res_len < sizeof(xres))
+		memset(xres+res_len, 0, sizeof(xres)-res_len);
+
+	if (sres_deriv_func == 1) {
+		/* SRES derivation function #1 */
+		for (unsigned int i = 0; i < 4; i++)
+			sresi = xresi ^ xres4+i ^ xres8+i ^ xres12+i;
+	} else {
+		/* SRES derivation function #2 */
+		memcpy(sres, xres, 4);
+	}
+}
+
 /*! @} */

libosmocore_1.8.0.tar.xz/src/gsm/auth_milenage.c -> libosmocore_1.9.0.tar.xz/src/gsm/auth_milenage.c Changed

@@ -19,6 +19,7 @@
  *
  */
 
+#include <errno.h>
 #include <osmocom/crypt/auth.h>
 #include <osmocom/core/bits.h>
 #include "milenage/common.h"
@@ -28,7 +29,7 @@
  *  @{
  */
 
-static const uint8_t *gen_opc_if_needed(const struct osmo_sub_auth_data *aud, uint8_t *gen_opc)
+static const uint8_t *gen_opc_if_needed(const struct osmo_sub_auth_data2 *aud, uint8_t *gen_opc)
 {
 	int rc;
 
@@ -43,7 +44,7 @@
 }
 
 static int milenage_gen_vec(struct osmo_auth_vector *vec,
-			    struct osmo_sub_auth_data *aud,
+			    struct osmo_sub_auth_data2 *aud,
 			    const uint8_t *_rand)
 {
 	size_t res_len = sizeof(vec->res);
@@ -53,7 +54,15 @@
 	uint8_t sqn6;
 	uint64_t ind_mask;
 	uint64_t seq_1;
-	int rc;
+
+	OSMO_ASSERT(aud->algo == OSMO_AUTH_ALG_MILENAGE);
+
+	if (aud->u.umts.k_len != 16)
+		return -EINVAL;
+	if (aud->u.umts.opc_len != 16)
+		return -EINVAL;
+	if (vec->res_len != 4 && vec->res_len != 8)
+		return -EINVAL;
 
 	opc = gen_opc_if_needed(aud, gen_opc);
 	if (!opc)
@@ -127,10 +136,9 @@
 	milenage_generate(opc, aud->u.umts.amf, aud->u.umts.k,
 			  sqn, _rand,
 			  vec->autn, vec->ik, vec->ck, vec->res, &res_len);
-	vec->res_len = res_len;
-	rc = gsm_milenage(opc, aud->u.umts.k, _rand, vec->sres, vec->kc);
-	if (rc < 0)
-		return rc;
+
+	osmo_auth_c3(vec->kc, vec->ck, vec->ik);
+	osmo_auth_c2(vec->sres, vec->res, vec->res_len, 1);
 
 	vec->auth_types = OSMO_AUTH_TYPE_UMTS | OSMO_AUTH_TYPE_GSM;
 
@@ -141,7 +149,7 @@
 }
 
 static int milenage_gen_vec_auts(struct osmo_auth_vector *vec,
-				 struct osmo_sub_auth_data *aud,
+				 struct osmo_sub_auth_data2 *aud,
 				 const uint8_t *auts, const uint8_t *rand_auts,
 				 const uint8_t *_rand)
 {
@@ -150,6 +158,13 @@
 	const uint8_t *opc;
 	int rc;
 
+	OSMO_ASSERT(aud->algo == OSMO_AUTH_ALG_MILENAGE);
+
+	if (aud->u.umts.k_len != 16)
+		return -EINVAL;
+	if (aud->u.umts.opc_len != 16)
+		return -EINVAL;
+
 	opc = gen_opc_if_needed(aud, gen_opc);
 
 	rc = milenage_auts(opc, aud->u.umts.k, rand_auts, auts, sqn_out);

libosmocore_1.9.0.tar.xz/src/gsm/auth_tuak.c Added

@@ -0,0 +1,207 @@
+/*! \file auth_tuak.c
+ * GSM/GPRS/3G authentication core infrastructure */
+/*
+ * (C) 2023 by Harald Welte <laforge@osmocom.org>
+ *
+ * All Rights Reserved
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ */
+
+/* NOTE: TUAK offers a lot of size variability in terms of size of length of MAC_A, MAC_S,
+ * but this is not used within 3GPP.  The different sizes of Kc and RES are handled via
+ * osmo_sub_auth_data2. */
+
+#include <errno.h>
+#include <osmocom/crypt/auth.h>
+#include <osmocom/core/bits.h>
+#include "tuak/tuak.h"
+
+/*! \addtogroup auth
+ *  @{
+ */
+
+static const uint8_t *gen_opc_if_needed(const struct osmo_sub_auth_data2 *aud, uint8_t *gen_opc)
+{
+	int rc;
+
+	/* Check if we only know OP and compute OPC if required */
+	if (aud->type == OSMO_AUTH_TYPE_UMTS && aud->u.umts.opc_is_op) {
+		rc = tuak_opc_gen(gen_opc, aud->u.umts.k, aud->u.umts.k_len, aud->u.umts.opc);
+		if (rc < 0)
+			return NULL;
+		return gen_opc;
+	}
+
+	return aud->u.umts.opc;
+}
+
+static int tuak_gen_vec(struct osmo_auth_vector *vec,
+			struct osmo_sub_auth_data2 *aud,
+			const uint8_t *_rand)
+{
+	size_t res_len = vec->res_len;
+	uint64_t next_sqn;
+	uint8_t gen_opc32;
+	const uint8_t *opc;
+	uint8_t sqn6;
+	uint64_t ind_mask;
+	uint64_t seq_1;
+
+	switch (vec->res_len) {
+	case 4:
+	case 8:
+	case 16:
+		break;
+	default:
+		return -EINVAL;
+	}
+
+	OSMO_ASSERT(aud->algo == OSMO_AUTH_ALG_TUAK);
+
+	if (aud->u.umts.k_len != 16 && aud->u.umts.k_len != 32)
+		return -EINVAL;
+	if (aud->u.umts.opc_len != 32)
+		return -EINVAL;
+
+	opc = gen_opc_if_needed(aud, gen_opc);
+	if (!opc)
+		return -1;
+
+	/* Determine next SQN, according to 3GPP TS 33.102:
+	 * SQN consists of SEQ and a lower significant part of IND bits:
+	 *
+	 * |----------SEQ------------|
+	 * |------------------------SQN-----------|
+	 *                           |-----IND----|
+	 *
+	 * The IND part is used as "slots": e.g. a given HLR client will always
+	 * get the same IND part, called ind here, with incrementing SEQ. In
+	 * the USIM, each IND slot enforces that its SEQ are used in ascending
+	 * order -- as long as that constraint is satisfied, the SQN may jump
+	 * forwards and backwards. For example, for ind_bitlen == 5, asking the
+	 * USIM for SQN = 32, 64, 33 is allowed, because 32 and 64 are
+	 * SEQ || (ind == 0), and though 33 is below 64, it is ind == 1 and
+	 * allowed.  Not allowed would be 32, 96, 64, because 64 would go
+	 * backwards after 96, both being ind == 0.
+	 *
+	 * From the last used SQN, we want to increment SEQ + 1, and then pick
+	 * the matching IND part.
+	 *
+	 * IND size is suggested in TS 33.102 as 5 bits. SQN is 48 bits long.
+	 * If ind_bitlen is passed too large here, the algorithms will break
+	 * down. But at which point should we return an error? A sane limit
+	 * seems to be ind_bitlen == 10, but to protect against failure,
+	 * limiting ind_bitlen to 28 is enough, 28 being the number of bits
+	 * suggested for the delta in 33.102, which is discussed to still
+	 * require 2^15 > 32000 authentications to wrap the SQN back to the
+	 * start.
+	 *
+	 * Note that if a caller with ind == 1 generates N vectors, the SQN
+	 * stored after this will reflect SEQ + N. If then another caller with
+	 * ind == 2 generates another N vectors, this will then use SEQ + N
+	 * onwards and end up with SEQ + N + N. In other words, most of each
+	 * SEQ's IND slots will remain unused. When looking at SQN being 48
+	 * bits wide, after dropping ind_bitlen (say 5) from it, we will still
+	 * have a sequence range of 2^43 = 8.8e12, eight trillion sequences,
+	 * which is large enough to not bother further. With the maximum
+	 * ind_bitlen of 28 enforced below, we still get more than 1 million
+	 * sequences, which is also sufficiently large.
+	 *
+	 * An ind_bitlen of zero may be passed from legacy callers that are not
+	 * aware of the IND extension. For these, below algorithm works out as
+	 * before, simply incrementing SQN by 1.
+	 *
+	 * This is also a mechanism for tools like the osmo-auc-gen to directly
+	 * request a given SQN to be used. With ind_bitlen == 0 the caller can
+	 * be sure that this code will increment SQN by exactly one before
+	 * generating a tuple, thus a caller would simply pass
+	 * { .ind_bitlen = 0, .ind = 0, .sqn = (desired_sqn - 1) }
+	 */
+
+	if (aud->u.umts.ind_bitlen > OSMO_MILENAGE_IND_BITLEN_MAX)
+		return -2;
+
+	seq_1 = 1LL << aud->u.umts.ind_bitlen;
+	ind_mask = ~(seq_1 - 1);
+
+	/* the ind index must not affect the SEQ part */
+	if (aud->u.umts.ind >= seq_1)
+		return -3;
+
+	/* keep the incremented SQN local until gsm_milenage() succeeded. */
+	next_sqn = ((aud->u.umts.sqn + seq_1) & ind_mask) + aud->u.umts.ind;
+
+	osmo_store64be_ext(next_sqn, sqn, 6);
+
+	tuak_generate(opc, aud->u.umts.amf, aud->u.umts.k, aud->u.umts.k_len,
+		      sqn, _rand, vec->autn, vec->ik, vec->ck, vec->res, &res_len);
+
+	/* generate the GSM Kc + SRES values using C2 + C3 functions */
+	osmo_auth_c3(vec->kc, vec->ck, vec->ik);
+	osmo_auth_c2(vec->sres, vec->res, vec->res_len, 1);
+
+	vec->auth_types = OSMO_AUTH_TYPE_UMTS | OSMO_AUTH_TYPE_GSM;
+
+	/* for storage in the caller's AUC database */
+	aud->u.umts.sqn = next_sqn;
+
+	return 0;
+}
+
+static int tuak_gen_vec_auts(struct osmo_auth_vector *vec,
+			     struct osmo_sub_auth_data2 *aud,
+			     const uint8_t *auts, const uint8_t *rand_auts,
+			     const uint8_t *_rand)
+{
+	uint8_t sqn_out6;
+	uint8_t gen_opc32;
+	const uint8_t *opc;
+	int rc;
+
+	OSMO_ASSERT(aud->algo == OSMO_AUTH_ALG_TUAK);
+
+	if (aud->u.umts.k_len != 16 && aud->u.umts.k_len != 32)
+		return -EINVAL;
+	if (aud->u.umts.opc_len != 32)
+		return -EINVAL;
+
+	opc = gen_opc_if_needed(aud, gen_opc);
+
+	rc = tuak_auts(opc, aud->u.umts.k, sizeof(aud->u.umts.k), rand_auts, auts, sqn_out);
+	if (rc < 0)
+		return rc;
+
+	aud->u.umts.sqn_ms = osmo_load64be_ext(sqn_out, 6) >> 16;
+	/* Update our "largest used SQN" from the USIM -- milenage_gen_vec()
+	 * below will increment SQN. */
+	aud->u.umts.sqn = aud->u.umts.sqn_ms;
+
+	return tuak_gen_vec(vec, aud, _rand);
+}
+
+static struct osmo_auth_impl tuak_alg = {
+	.algo = OSMO_AUTH_ALG_TUAK,
+	.name = "TUAK (libosmogsm built-in)",
+	.priority = 1000,
+	.gen_vec = &tuak_gen_vec,
+	.gen_vec_auts = &tuak_gen_vec_auts,
+};
+
+static __attribute__((constructor)) void on_dso_load_tuak(void)
+{
+	osmo_auth_register(&tuak_alg);
+}
+
+/*! @} */

libosmocore_1.8.0.tar.xz/src/gsm/auth_xor.c -> libosmocore_1.9.0.tar.xz/src/gsm/auth_xor.c Changed

@@ -43,19 +43,23 @@
 
 /* 3GPP TS 34.108, section 8.1.2.1 */
 static int xor_gen_vec(struct osmo_auth_vector *vec,
-		       struct osmo_sub_auth_data *aud,
+		       struct osmo_sub_auth_data2 *aud,
 		       const uint8_t *_rand)
 {
 	uint8_t xdout16, cdout8;
 	uint8_t ak6, xmac8;
 	int i;
 
+	OSMO_ASSERT(aud->algo == OSMO_AUTH_ALG_XOR_3G);
+
 	/* Step 1: xdout = (ki or k) ^ rand */
 	if (aud->type == OSMO_AUTH_TYPE_GSM)
 		xor(xdout, aud->u.gsm.ki, _rand, sizeof(xdout));
-	else if (aud->type == OSMO_AUTH_TYPE_UMTS)
+	else if (aud->type == OSMO_AUTH_TYPE_UMTS) {
+		if (aud->u.umts.k_len != 16)
+			return -EINVAL;
 		xor(xdout, aud->u.umts.k, _rand, sizeof(xdout));
-	else
+	} else
 		return -ENOTSUP;
 
 	/**
@@ -125,7 +129,7 @@
 
 /* 3GPP TS 34.108, section 8.1.2.2 */
 static int xor_gen_vec_auts(struct osmo_auth_vector *vec,
-			    struct osmo_sub_auth_data *aud,
+			    struct osmo_sub_auth_data2 *aud,
 			    const uint8_t *auts,
 			    const uint8_t *rand_auts,
 			    const uint8_t *_rand)
@@ -134,12 +138,16 @@
 	uint8_t ak6, xmac8;
 	uint8_t sqnms6;
 
+	OSMO_ASSERT(aud->algo == OSMO_AUTH_ALG_XOR_3G);
+
 	/* Step 1: xdout = (ki or k) ^ rand */
 	if (aud->type == OSMO_AUTH_TYPE_GSM)
 		xor(xdout, aud->u.gsm.ki, _rand, sizeof(xdout));
-	else if (aud->type == OSMO_AUTH_TYPE_UMTS)
+	else if (aud->type == OSMO_AUTH_TYPE_UMTS) {
+		if (aud->u.umts.k_len != 16)
+			return -EINVAL;
 		xor(xdout, aud->u.umts.k, _rand, sizeof(xdout));
-	else
+	} else
 		return -ENOTSUP;
 
 	/* Step 2: ak = xdout2-8 */
@@ -168,8 +176,8 @@
 }
 
 static struct osmo_auth_impl xor_alg = {
-	.algo = OSMO_AUTH_ALG_XOR,
-	.name = "XOR (libosmogsm built-in)",
+	.algo = OSMO_AUTH_ALG_XOR_3G,
+	.name = "XOR-3G (libosmogsm built-in)",
 	.priority = 1000,
 	.gen_vec = &xor_gen_vec,
 	.gen_vec_auts = &xor_gen_vec_auts,

libosmocore_1.9.0.tar.xz/src/gsm/auth_xor_2g.c Added

@@ -0,0 +1,81 @@
+/*! \file auth_xor.c
+ * GSM XOR-2G algorithm as specified in Annex 4 (A.4.1.2) of 3GPP TS 51.010-1.
+ * This is implemented by typical GSM MS tester */
+
+/*
+ * (C) 2023 by Harald Welte <laforge@gnumonks.org>
+ *
+ * All Rights Reserved
+ *
+ * Author: Daniel Willmann <dwillmann@sysmocom.de>
+ *
+ * All Rights Reserved
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ */
+
+#include <string.h>
+#include <stdint.h>
+#include <errno.h>
+
+#include <osmocom/crypt/auth.h>
+
+/*! \addtogroup auth
+ *  @{
+ */
+
+static void xor(uint8_t *out, const uint8_t *a, const uint8_t *b, size_t len)
+{
+	size_t i;
+
+	for (i = 0; i < len; i++)
+		outi = ai ^ bi;
+}
+
+/* GSM XOR-2G algorithm as specified in Annex 4 (A.4.1.2) of 3GPP TS 51.010-1. */
+static int xor2g_gen_vec(struct osmo_auth_vector *vec,
+			 struct osmo_sub_auth_data2 *aud,
+			 const uint8_t *_rand)
+{
+	uint8_t res116;
+
+	OSMO_ASSERT(aud->algo == OSMO_AUTH_ALG_XOR_2G);
+
+	if (aud->type != OSMO_AUTH_TYPE_GSM)
+		return -ENOTSUP;
+
+	/* Step 1: XOR to the challenge RAND, a predefined number Ki, having the same bit length (128 bits) as
+	 * RAND. */
+	xor(res1, aud->u.gsm.ki, _rand, sizeof(res1));
+
+	/* Step 2: The most significant 32 bits of RES1 form SRES. */
+	memcpy(vec->sres, res1, 4);
+	/* The next 64 bits of RES1 form Kc */
+	memcpy(vec->kc, res1+4, 8);
+
+	vec->auth_types = OSMO_AUTH_TYPE_GSM;
+	return 0;
+}
+
+static struct osmo_auth_impl xor2g_alg = {
+	.algo = OSMO_AUTH_ALG_XOR_2G,
+	.name = "XOR-2G (libosmogsm built-in)",
+	.priority = 1000,
+	.gen_vec = &xor2g_gen_vec,
+};
+
+static __attribute__((constructor)) void on_dso_load_xor(void)
+{
+	osmo_auth_register(&xor2g_alg);
+}
+
+/*! @} */

libosmocore_1.8.0.tar.xz/src/gsm/bsslap.c -> libosmocore_1.9.0.tar.xz/src/gsm/bsslap.c Changed

libosmocore_1.8.0.tar.xz/src/gsm/bssmap_le.c -> libosmocore_1.9.0.tar.xz/src/gsm/bssmap_le.c Changed

@@ -180,7 +180,7 @@
 					struct osmo_bssmap_le_err **err, void *err_ctx,
 					const uint8_t *elem, uint8_t len)
 {
-	*lt = (struct bssmap_le_location_type){};
+	memset(lt, 0x00, sizeof(*lt));
 
 	if (!elem || len < 1)
 		DEC_ERR(-EINVAL, msgt, iei, LCS_CAUSE_UNSPECIFIED, "zero length");
@@ -348,7 +348,7 @@
 		       struct osmo_bssmap_le_err **err, void *err_ctx,
 		       const uint8_t *data, uint8_t len)
 {
-	*lcs_cause = (struct lcs_cause_ie){};
+	memset(lcs_cause, 0x00, sizeof(*lcs_cause));
 
 	if (!data || len < 1)
 		DEC_ERR(-EINVAL, msgt, iei, LCS_CAUSE_UNSPECIFIED, "zero length");
@@ -558,7 +558,7 @@
 					      struct osmo_bssmap_le_err **err, void *err_ctx,
 					      const struct tlv_parsed *tp)
 {
-	*params = (struct bssmap_le_perform_loc_req){};
+	memset(params, 0x00, sizeof(*params));
 
 	DEC_IE_MANDATORY(msgt, BSSMAP_LE_IEI_LOCATION_TYPE, osmo_bssmap_le_ie_dec_location_type,
 			 &params->location_type);
@@ -606,7 +606,7 @@
 					       struct osmo_bssmap_le_err **err, void *err_ctx,
 					       const struct tlv_parsed *tp)
 {
-	*params = (struct bssmap_le_perform_loc_resp){};
+	memset(params, 0x00, sizeof(*params));
 
 	DEC_IE_OPTIONAL_FLAG(msgt, BSSMAP_LE_IEI_GEO_LOCATION, osmo_bssmap_le_ie_dec_gad, &params->location_estimate,
 			     params->location_estimate_present);
@@ -630,7 +630,7 @@
 						struct osmo_bssmap_le_err **err, void *err_ctx,
 						const struct tlv_parsed *tp)
 {
-	*params = (struct lcs_cause_ie){};
+	memset(params, 0x00, sizeof(*params));
 
 	DEC_IE_MANDATORY(msgt, BSSMAP_LE_IEI_LCS_CAUSE, osmo_lcs_cause_dec, params);
 	return 0;
@@ -647,7 +647,8 @@
 						 struct osmo_bssmap_le_err **err, void *err_ctx,
 						 const struct tlv_parsed *tp)
 {
-	*params = (struct bssmap_le_conn_oriented_info){};
+	memset(params, 0x00, sizeof(*params));
+
 	DEC_IE_MANDATORY(msgt, BSSMAP_LE_IEI_APDU, osmo_bssmap_le_ie_dec_apdu, &params->apdu);
 	return 0;
 }
@@ -711,7 +712,7 @@
 	int ies_len;
 	struct tlv_parsed tp;
 
-	*pdu = (struct bssmap_le_pdu){};
+	memset(pdu, 0x00, sizeof(*pdu));
 
 	if (len < 1)
 		DEC_ERR(-EINVAL, -1, -1, LCS_CAUSE_UNSPECIFIED, "zero length");
@@ -798,7 +799,7 @@
 		return RC; \
 	} while(0)
 
-	*pdu = (struct bssap_le_pdu){};
+	memset(pdu, 0x00, sizeof(*pdu));
 
 	h = msgb_l2(msg);
 	if (!h)

libosmocore_1.8.0.tar.xz/src/gsm/bts_features.c -> libosmocore_1.9.0.tar.xz/src/gsm/bts_features.c Changed

@@ -16,6 +16,7 @@
  *  GNU General Public License for more details.
  */
 
+#include <osmocom/core/utils.h>
 #include <osmocom/gsm/bts_features.h>
 
 const struct value_string osmo_bts_features_descs = {
@@ -49,6 +50,9 @@
 	{ 0, NULL }
 };
 
+/* Ensure that all BTS_FEAT_* entries are present in osmo_bts_features_descs */
+osmo_static_assert(ARRAY_SIZE(osmo_bts_features_descs) == _NUM_BTS_FEAT + 1, _bts_features_descs);
+
 /*! return description string of a BTS feature (osmo_bts_features_descs).
  * To get the plain feature name, use osmo_bts_features_name() instead. */
 const char *osmo_bts_feature_name(enum osmo_bts_features feature)
@@ -82,5 +86,10 @@
 	{ BTS_FEAT_DYN_TS_SDCCH8, "DYN_TS_SDCCH8" },
 	{ BTS_FEAT_ACCH_TEMP_OVP, "ACCH_TEMP_OVP" },
 	{ BTS_FEAT_OSMUX, "OSMUX" },
+	{ BTS_FEAT_VBS, "VBS" },
+	{ BTS_FEAT_VGCS, "VGCS" },
 	{}
 };
+
+/* Ensure that all BTS_FEAT_* entries are present in osmo_bts_features_names */
+osmo_static_assert(ARRAY_SIZE(osmo_bts_features_names) == _NUM_BTS_FEAT + 1, _bts_features_names);

libosmocore_1.8.0.tar.xz/src/gsm/cbsp.c -> libosmocore_1.9.0.tar.xz/src/gsm/cbsp.c Changed

libosmocore_1.8.0.tar.xz/src/gsm/gprs_rlc.c -> libosmocore_1.9.0.tar.xz/src/gsm/gprs_rlc.c Changed

libosmocore_1.8.0.tar.xz/src/gsm/gsm0411_utils.c -> libosmocore_1.9.0.tar.xz/src/gsm/gsm0411_utils.c Changed

libosmocore_1.8.0.tar.xz/src/gsm/gsm0502.c -> libosmocore_1.9.0.tar.xz/src/gsm/gsm0502.c Changed

@@ -260,3 +260,38 @@
 
 	return ma ? mamai : mai;
 }
+
+#define CB_FCCH		-1
+#define CB_SCH		-2
+#define CB_BCCH		-3
+#define CB_IDLE		-4
+
+/* Clause 7 Table 3 and Figure 8a */
+static const int ccch_block_table51 = {
+	CB_FCCH, CB_SCH,			/* 0..1 */
+	CB_BCCH, CB_BCCH, CB_BCCH, CB_BCCH,	/* 2..5: BCCH */
+	0, 0, 0, 0,				/* 6..9: B0 */
+	CB_FCCH, CB_SCH,			/* 10..11 */
+	1, 1, 1, 1,				/* 12..15: B1 */
+	2, 2, 2, 2,				/* 16..19: B2 */
+	CB_FCCH, CB_SCH,			/* 20..21 */
+	3, 3, 3, 3,				/* 22..25: B3 */
+	4, 4, 4, 4,				/* 26..29: B4 */
+	CB_FCCH, CB_SCH,			/* 30..31 */
+	5, 5, 5, 5,				/* 32..35: B5 */
+	6, 6, 6, 6,				/* 36..39: B6 */
+	CB_FCCH, CB_SCH,			/* 40..41 */
+	7, 7, 7, 7,				/* 42..45: B7 */
+	8, 8, 8, 8,				/* 46..49: B8 */
+	CB_IDLE					/* 50: Idle */
+};
+
+/*! Calculate CCCH block number from the given TDMA frame number.
+ *  \paramin fn TDMA frame number (of first or last burst).
+ *  \returns CCCH block number 0..8 or a negative value,
+ *           if the given frame number cannot carry CCCH.
+ */
+int gsm0502_fn2ccch_block(uint32_t fn)
+{
+	return ccch_block_tablefn % ARRAY_SIZE(ccch_block_table);
+}

libosmocore_1.8.0.tar.xz/src/gsm/gsm0808.c -> libosmocore_1.9.0.tar.xz/src/gsm/gsm0808.c Changed

@@ -17,6 +17,8 @@
  *
  */
 
+#include "config.h"
+
 #include <string.h>
 
 #include <osmocom/core/byteswap.h>
@@ -1514,6 +1516,663 @@
 	return msg;
 }
 
+/*! Create BSSMAP VGCS/VBS SETUP message, 3GPP TS 48.008 3.2.1.50.
+ * Sent from the MSC to the BSC to request VGCS/VBS call. */
+struct msgb *gsm0808_create_vgcs_vbs_setup(const struct gsm0808_vgcs_vbs_setup *params)
+{
+	struct msgb *msg;
+
+	msg = msgb_alloc_headroom(BSSMAP_MSG_SIZE, BSSMAP_MSG_HEADROOM, "BSSMAP-VGCS/VBS-SETUP");
+	if (!msg)
+		return NULL;
+
+	/* Message Type, 3.2.2.1 */
+	msgb_v_put(msg, BSS_MAP_MSG_VGCS_VBS_SETUP);
+
+	/* Group Call Reference, 3.2.2.55 */
+	gsm0808_enc_group_callref(msg, &params->callref);
+
+	/* Priority, 3.2.2.18 */
+	if (params->priority_present)
+		gsm0808_enc_priority(msg, &params->priority);
+
+	/* VGCS Feature Flags, 3.2.2.88 */
+	if (params->vgcs_feature_flags_present)
+		gsm0808_enc_vgcs_feature_flags(msg, &params->flags);
+
+	/* prepend header with final length */
+	msg->l3h = msgb_tv_push(msg, BSSAP_MSG_BSS_MANAGEMENT, msgb_length(msg));
+
+	return msg;
+}
+
+/*! Create BSSMAP VGCS/VBS SETUP ACK message, 3GPP TS 48.008 3.2.1.51.
+ * Sent from the BSC to the MSC to confirm VGCS/VBS call. */
+struct msgb *gsm0808_create_vgcs_vbs_setup_ack(const struct gsm0808_vgcs_vbs_setup_ack *params)
+{
+	struct msgb *msg;
+
+	msg = msgb_alloc_headroom(BSSMAP_MSG_SIZE, BSSMAP_MSG_HEADROOM, "BSSMAP-VGCS/VBS-SETUP-ACK");
+	if (!msg)
+		return NULL;
+
+	/* Message Type, 3.2.2.1 */
+	msgb_v_put(msg, BSS_MAP_MSG_VGCS_VBS_SETUP_ACK);
+
+	/* VGCS Feature Flags, 3.2.2.88 */
+	if (params->vgcs_feature_flags_present)
+		gsm0808_enc_vgcs_feature_flags(msg, &params->flags);
+
+	/* prepend header with final length */
+	msg->l3h = msgb_tv_push(msg, BSSAP_MSG_BSS_MANAGEMENT, msgb_length(msg));
+
+	return msg;
+}
+
+/*! Create BSSMAP VGCS/VBS SETUP REFUSE message, 3GPP TS 48.008 3.2.1.52.
+ * Sent from the BSC to the MSC to reject VGCS/VBS call. */
+struct msgb *gsm0808_create_vgcs_vbs_setup_refuse(enum gsm0808_cause cause)
+{
+	struct msgb *msg;
+
+	msg = msgb_alloc_headroom(BSSMAP_MSG_SIZE, BSSMAP_MSG_HEADROOM, "BSSMAP-VGCS/VBS-SETUP-REFUSE");
+	if (!msg)
+		return NULL;
+
+	/* Message Type, 3.2.2.1 */
+	msgb_v_put(msg, BSS_MAP_MSG_VGCS_VBS_SETUP_REFUSE);
+
+	/* Cause, 3.2.2.5 */
+	gsm0808_enc_cause(msg, cause);
+
+	/* prepend header with final length */
+	msg->l3h = msgb_tv_push(msg, BSSAP_MSG_BSS_MANAGEMENT, msgb_length(msg));
+
+	return msg;
+}
+
+/*! Create BSSMAP VGCS/VBS ASSIGNMENT REQUEST message, 3GPP TS 48.008 3.2.1.53.
+ * Sent from the MSC to the BSC to assign radio resources for a VGCS/VBS. */
+struct msgb *gsm0808_create_vgcs_vbs_assign_req(const struct gsm0808_vgcs_vbs_assign_req *params)
+{
+	struct msgb *msg;
+
+	msg = msgb_alloc_headroom(BSSMAP_MSG_SIZE, BSSMAP_MSG_HEADROOM, "BSSMAP-VGCS/VBS-ASSIGNMENT-REQUEST");
+	if (!msg)
+		return NULL;
+
+	/* Message Type, 3.2.2.1 */
+	msgb_v_put(msg, BSS_MAP_MSG_VGCS_VBS_ASSIGNMENT_RQST);
+
+	/* Channel Type, 3.2.2.11 */
+	gsm0808_enc_channel_type(msg, &params->channel_type);
+
+	/* Assignment Requrirement, 3.2.2.52 */
+	gsm0808_enc_assign_req(msg, params->ass_req);
+
+	/* Cell Identifier, 3.2.2.17 */
+	gsm0808_enc_cell_id(msg, &params->cell_identifier);
+
+	/* Group Call Reference, 3.2.2.55 */
+	gsm0808_enc_group_callref(msg, &params->callref);
+
+	/* Priority, 3.2.2.18 */
+	if (params->priority_present)
+		gsm0808_enc_priority(msg, &params->priority);
+
+	/* Circuit Identity Code, 3.2.2.2 */
+	if (params->cic_present)
+		msgb_tv16_put(msg, GSM0808_IE_CIRCUIT_IDENTITY_CODE, params->cic);
+
+	/* Downlink DTX Flag, 3.2.2.26 */
+	if (params->downlink_dtx_flag_present)
+		msgb_tv_put(msg, GSM0808_IE_DOWNLINK_DTX_FLAG, params->downlink_dtx_flag);
+
+	/* Encryption Information, 3.2.2.10 */
+	if (params->encryption_information_present)
+		gsm0808_enc_encrypt_info(msg, &params->encryption_information);
+
+	/* VSTK_RAND Imformation, 3.2.2.83 */
+	if (params->vstk_rand_present)
+		msgb_tlv_put(msg, GSM0808_IE_VSTK_RAND_INFO, sizeof(params->vstk_rand), params->vstk_rand);
+
+	/* VSTK Information, 3.2.2.84 */
+	if (params->vstk_present)
+		msgb_tlv_put(msg, GSM0808_IE_VSTK_INFO, sizeof(params->vstk), params->vstk);
+
+	/* Cell Identifier List Segment, 3.2.2.27a */
+	if (params->cils_present)
+		gsm0808_enc_cell_id_list_segment(msg, GSM0808_IE_CELL_ID_LIST_SEGMENT, &params->cils);
+
+	/* AoIP Transport Layer Address (MGW), 3.2.2.102 */
+	if (params->aoip_transport_layer_present)
+		gsm0808_enc_aoip_trasp_addr(msg, &params->aoip_transport_layer);
+
+	/* Call Identifier, 3.2.2.105 */
+	if (params->call_id_present) {
+		/* NOTE: 3GPP TS 48.008, section 3.2.2.105 specifies that
+		 * the least significant byte shall be transmitted first. */
+		msgb_v_put(msg, GSM0808_IE_CALL_ID);
+		osmo_store32le(params->call_id, msgb_put(msg, sizeof(uint32_t)));
+	}
+
+	/* Codec List (MSC Preferred) 3.2.2.103 */
+	if (params->codec_list_present) {
+		if (gsm0808_enc_speech_codec_list2(msg, &params->codec_list_msc_preferred) < 0)
+			goto exit_free;
+	}
+
+	/* prepend header with final length */
+	msg->l3h = msgb_tv_push(msg, BSSAP_MSG_BSS_MANAGEMENT, msgb_length(msg));
+
+	return msg;
+
+exit_free:
+	msgb_free(msg);
+	return NULL;
+}
+
+/*! Create BSSMAP VGCS/VBS ASSIGNMENT RESULT message, 3GPP TS 48.008 3.2.1.54.
+ * Sent from the BSC to the MSC to indicate assignment/deassingment of radio resources for a VGCS/VBS. */
+struct msgb *gsm0808_create_vgcs_vbs_assign_res(const struct gsm0808_vgcs_vbs_assign_res *params)
+{
+	struct msgb *msg;
+
+	msg = msgb_alloc_headroom(BSSMAP_MSG_SIZE, BSSMAP_MSG_HEADROOM, "BSSMAP-VGCS/VBS-ASSIGNMENT-RESULT");
+	if (!msg)
+		return NULL;
+
+	/* Message Type, 3.2.2.1 */
+	msgb_v_put(msg, BSS_MAP_MSG_VGCS_VBS_ASSIGNMENT_RESULT);
+
+	/* Channel Type, 3.2.2.11 */
+	gsm0808_enc_channel_type(msg, &params->channel_type);
+
+	/* Cell Identifier, 3.2.2.17 */
+	gsm0808_enc_cell_id(msg, &params->cell_identifier);
+
+	/* Chosen Channel, 3.2.2.33 */
+	if (params->chosen_channel_present)
+		msgb_tv_put(msg, GSM0808_IE_CHOSEN_CHANNEL, params->chosen_channel);
+
+	/* Circuit Identity Code, 3.2.2.2 */
+	if (params->cic_present)
+		msgb_tv16_put(msg, GSM0808_IE_CIRCUIT_IDENTITY_CODE, params->cic);
+
+	/* Circuit Pool, 3.2.2.45 */
+	if (params->circuit_pool_present)
+		msgb_tv_put(msg, GSM0808_IE_CIRCUIT_POOL, params->circuit_pool);
+
+	/* AoIP Transport Layer Address (BSS), 3.2.2.102 */
+	if (params->aoip_transport_layer_present)
+		gsm0808_enc_aoip_trasp_addr(msg, &params->aoip_transport_layer);
+
+	/* Codec (MSC Chosen) 3.2.2.103 */
+	if (params->codec_present) {
+		if (gsm0808_enc_speech_codec2(msg, &params->codec_msc_chosen) < 0)
+			goto exit_free;
+	}
+
+	/* Call Identifier, 3.2.2.105 */
+	if (params->call_id_present) {
+		/* NOTE: 3GPP TS 48.008, section 3.2.2.105 specifies that
+		 * the least significant byte shall be transmitted first. */
+		msgb_v_put(msg, GSM0808_IE_CALL_ID);
+		osmo_store32le(params->call_id, msgb_put(msg, sizeof(uint32_t)));
+	}
+
+	/* prepend header with final length */
+	msg->l3h = msgb_tv_push(msg, BSSAP_MSG_BSS_MANAGEMENT, msgb_length(msg));
+
+	return msg;
+
+exit_free:
+	msgb_free(msg);
+	return NULL;
+}
+
+/*! Create BSSMAP VGCS/VBS ASSIGNMENT FAILURE message, 3GPP TS 48.008 3.2.1.55.
+ * Sent from the BSC to the MSC to indicate assignment failure for a VGCS/VBS. */
+struct msgb *gsm0808_create_vgcs_vbs_assign_fail(const struct gsm0808_vgcs_vbs_assign_fail *params)
+{
+	struct msgb *msg;
+
+	msg = msgb_alloc_headroom(BSSMAP_MSG_SIZE, BSSMAP_MSG_HEADROOM, "BSSMAP-VGCS/VBS-ASSIGNMENT-RESULT");
+	if (!msg)
+		return NULL;
+
+	/* Message Type, 3.2.2.1 */
+	msgb_v_put(msg, BSS_MAP_MSG_VGCS_VBS_ASSIGNMENT_FAILURE);
+
+	/* Cause, 3.2.2.5 */
+	gsm0808_enc_cause(msg, params->cause);
+
+	/* Circuit Pool, 3.2.2.45 */
+	if (params->circuit_pool_present)
+		msgb_tv_put(msg, GSM0808_IE_CIRCUIT_POOL, params->circuit_pool);
+
+	/* Circuit Pool List, 3.2.2.46 */
+	if (params->circuit_pool_present)
+		msgb_tlv_put(msg, GSM0808_IE_CIRCUIT_POOL_LIST, params->cpl.list_len, params->cpl.pool);
+
+	/* Codec List (BSS Supported) 3.2.2.103 */
+	if (params->codec_list_present) {
+		if (gsm0808_enc_speech_codec_list2(msg, &params->codec_list_bss_supported) < 0)
+			goto exit_free;
+	}
+
+	/* prepend header with final length */
+	msg->l3h = msgb_tv_push(msg, BSSAP_MSG_BSS_MANAGEMENT, msgb_length(msg));
+
+	return msg;
+
+exit_free:
+	msgb_free(msg);
+	return NULL;
+}
+
+/*! Create BSSMAP VGCS/VBS QUEUING INDICATION message, 3GPP TS 48.008 3.2.1.56.
+ * Sent from the BSC to the MSC to indicate delay in assignment for a VGCS/VBS. */
+struct msgb *gsm0808_create_vgcs_queuing_ind(void)
+{
+	struct msgb *msg;
+	uint8_t val = BSS_MAP_MSG_VGCS_VBS_QUEUING_INDICATION;
+
+	msg = msgb_alloc_headroom(BSSMAP_MSG_SIZE, BSSMAP_MSG_HEADROOM, "BSSMAP-VGCS/VBS-QUEUING-INDICATION");
+	if (!msg)
+		return NULL;
+
+	msg->l3h = msg->data;
+	msgb_tlv_put(msg, BSSAP_MSG_BSS_MANAGEMENT, 1, &val);
+
+	return msg;
+}
+
+/*! Create BSSMAP (VGCS) UPLINK REQUEST message, 3GPP TS 48.008 3.2.1.57.
+ * Sent from the BSC to the MSC to indicate that a mobile requested access to uplink. */
+struct msgb *gsm0808_create_uplink_request(const struct gsm0808_uplink_request *params)
+{
+	struct msgb *msg;
+	int rc;
+
+	msg = msgb_alloc_headroom(BSSMAP_MSG_SIZE, BSSMAP_MSG_HEADROOM, "BSSMAP-UPLINK-REQUEST");
+	if (!msg)
+		return NULL;
+
+	/* Message Type, 3.2.2.1 */
+	msgb_v_put(msg, BSS_MAP_MSG_UPLINK_RQST);
+
+	/* Talker Priority, 3.2.2.89 */
+	if (params->talker_priority_present)
+		msgb_tv_put(msg, GSM0808_IE_TALKER_PRIORITY, params->talker_priority);
+
+	/* Cell Identifier, 3.2.2.17 */
+	if (params->cell_identifier_present)
+		gsm0808_enc_cell_id(msg, &params->cell_identifier);
+
+	/* Layer 3 Information, 3.2.2.24 */
+	if (params->l3_present)
+		msgb_tlv_put(msg, GSM0808_IE_LAYER_3_INFORMATION, params->l3.l3_len, params->l3.l3);
+
+	/* Mobile Identity,  3.2.2.41 */
+	if (params->mi_present) {
+		rc = osmo_mobile_identity_encode_msgb(msg, &params->mi, false);
+		if (rc < 0) {
+			msgb_free(msg);
+			return NULL;
+		}
+	}
+
+	/* prepend header with final length */
+	msg->l3h = msgb_tv_push(msg, BSSAP_MSG_BSS_MANAGEMENT, msgb_length(msg));
+
+	return msg;
+}
+
+/*! Create BSSMAP (VGCS) UPLINK REQUEST ACKNOWLEDGE message, 3GPP TS 48.008 3.2.1.58.
+ * Sent from the MSC to the BSC to indicate that access to uplink was granted. */
+struct msgb *gsm0808_create_uplink_request_ack(const struct gsm0808_uplink_request_ack *params)
+{
+	struct msgb *msg;
+
+	msg = msgb_alloc_headroom(BSSMAP_MSG_SIZE, BSSMAP_MSG_HEADROOM, "BSSMAP-UPLINK-REQUEST-ACKNOWLEDGE");
+	if (!msg)
+		return NULL;
+
+	/* Message Type, 3.2.2.1 */
+	msgb_v_put(msg, BSS_MAP_MSG_UPLINK_RQST_ACKNOWLEDGE);
+
+	/* Talker Priority, 3.2.2.89 */
+	if (params->talker_priority_present)
+		msgb_tv_put(msg, GSM0808_IE_TALKER_PRIORITY, params->talker_priority);
+
+	/* Emergency set indication, 3.2.2.90 */
+	if (params->emerg_set_ind_present)
+		msgb_v_put(msg, GSM0808_IE_EMERGENCY_SET_INDICATION);
+
+	/* Talker Identity, 3.2.2.91 */
+	if (params->talker_identity_present)
+		gsm0808_enc_talker_identity(msg, &params->talker_identity);
+
+	/* prepend header with final length */
+	msg->l3h = msgb_tv_push(msg, BSSAP_MSG_BSS_MANAGEMENT, msgb_length(msg));
+
+	return msg;
+}
+
+/*! Create BSSMAP (VGCS) UPLINK CONFIRM message, 3GPP TS 48.008 3.2.1.59.
+ * Sent from the BSC to the MSC to indicate that access to uplink was has been successfully established. */
+struct msgb *gsm0808_create_uplink_request_cnf(const struct gsm0808_uplink_request_cnf *params)
+{
+	struct msgb *msg;
+
+	msg = msgb_alloc_headroom(BSSMAP_MSG_SIZE, BSSMAP_MSG_HEADROOM, "BSSMAP-UPLINK-REQUEST-CONFIRM");
+	if (!msg)
+		return NULL;
+
+	/* Message Type, 3.2.2.1 */
+	msgb_v_put(msg, BSS_MAP_MSG_UPLINK_RQST_CONFIRMATION);
+
+	/* Cell Identifier, 3.2.2.17 */
+	gsm0808_enc_cell_id(msg, &params->cell_identifier);
+
+	/* Talker Identity, 3.2.2.91 */
+	if (params->talker_identity_present)
+		gsm0808_enc_talker_identity(msg, &params->talker_identity);
+
+	/* Layer 3 Information, 3.2.2.24 */
+	msgb_tlv_put(msg, GSM0808_IE_LAYER_3_INFORMATION, params->l3.l3_len, params->l3.l3);
+
+	/* prepend header with final length */
+	msg->l3h = msgb_tv_push(msg, BSSAP_MSG_BSS_MANAGEMENT, msgb_length(msg));
+
+	return msg;
+}
+
+/*! Create BSSMAP (VGCS) UPLINK APPLICATION DATA message, 3GPP TS 48.008 3.2.1.59a.
+ * Sent from the BSC to the MSC to pass L3 info from the talker. */
+struct msgb *gsm0808_create_uplink_app_data(const struct gsm0808_uplink_app_data *params)
+{
+	struct msgb *msg;
+	uint8_t val;
+
+	msg = msgb_alloc_headroom(BSSMAP_MSG_SIZE, BSSMAP_MSG_HEADROOM, "BSSMAP-UPLINK-APPLICATION-DATA");
+	if (!msg)
+		return NULL;
+
+	/* Message Type, 3.2.2.1 */
+	msgb_v_put(msg, BSS_MAP_MSG_UPLINK_APP_DATA);
+
+	/* Cell Identifier, 3.2.2.17 */
+	gsm0808_enc_cell_id(msg, &params->cell_identifier);
+
+	/* Layer 3 Information, 3.2.2.24 */
+	msgb_tlv_put(msg, GSM0808_IE_LAYER_3_INFORMATION, params->l3.l3_len, params->l3.l3);
+
+	/* Application Data Information, 3.2.2.100 */
+	val = params->bt_ind;
+	msgb_tlv_put(msg, GSM0808_IE_APP_DATA_INFO, 1, &val);
+
+	/* prepend header with final length */
+	msg->l3h = msgb_tv_push(msg, BSSAP_MSG_BSS_MANAGEMENT, msgb_length(msg));
+
+	return msg;
+}
+
+/*! Create BSSMAP (VGCS) UPLINK RELEASE INDICATION message, 3GPP TS 48.008 3.2.1.60.
+ * Sent from the BSC to the MSC to indicate that the uplink has been released. */
+struct msgb *gsm0808_create_uplink_release_ind(const struct gsm0808_uplink_release_ind *params)
+{
+	struct msgb *msg;
+
+	msg = msgb_alloc_headroom(BSSMAP_MSG_SIZE, BSSMAP_MSG_HEADROOM, "BSSMAP-UPLINK-RELEASE-INDICATION");
+	if (!msg)
+		return NULL;
+
+	/* Message Type, 3.2.2.1 */
+	msgb_v_put(msg, BSS_MAP_MSG_UPLINK_RELEASE_INDICATION);
+
+	/* Cause, 3.2.2.5 */
+	gsm0808_enc_cause(msg, params->cause);
+
+	/* Talker Priority, 3.2.2.89 */
+	if (params->talker_priority_present)
+		msgb_tv_put(msg, GSM0808_IE_TALKER_PRIORITY, params->talker_priority);
+
+	/* prepend header with final length */
+	msg->l3h = msgb_tv_push(msg, BSSAP_MSG_BSS_MANAGEMENT, msgb_length(msg));
+
+	return msg;
+}
+
+/*! Create BSSMAP (VGCS) UPLINK REJECT COMMAND message, 3GPP TS 48.008 3.2.1.61.
+ * Sent from the MSC to the BSC to indicate that the uplink is not available for allocation. */
+struct msgb *gsm0808_create_uplink_reject_cmd(const struct gsm0808_uplink_reject_cmd *params)
+{
+	struct msgb *msg;
+
+	msg = msgb_alloc_headroom(BSSMAP_MSG_SIZE, BSSMAP_MSG_HEADROOM, "BSSMAP-UPLINK-REJECT-COMMAND");
+	if (!msg)
+		return NULL;
+
+	/* Message Type, 3.2.2.1 */
+	msgb_v_put(msg, BSS_MAP_MSG_UPLINK_REJECT_CMD);
+
+	/* Cause, 3.2.2.5 */
+	gsm0808_enc_cause(msg, params->cause);
+
+	/* Talker Priority, 3.2.2.89 */
+	if (params->current_talker_priority_present)
+		msgb_tv_put(msg, GSM0808_IE_TALKER_PRIORITY, params->current_talker_priority);
+
+	/* Talker Priority, 3.2.2.89 */
+	if (params->rejected_talker_priority_present)
+		msgb_tv_put(msg, GSM0808_IE_TALKER_PRIORITY, params->rejected_talker_priority);
+
+	/* Talker Identity, 3.2.2.91 */
+	if (params->talker_identity_present)
+		gsm0808_enc_talker_identity(msg, &params->talker_identity);
+
+	/* prepend header with final length */
+	msg->l3h = msgb_tv_push(msg, BSSAP_MSG_BSS_MANAGEMENT, msgb_length(msg));
+
+	return msg;
+}
+
+/*! Create BSSMAP (VGCS) UPLINK RELEASE COMMAND message, 3GPP TS 48.008 3.2.1.62.
+ * Sent from the MSC to the BSC to indicate that the uplink is available for allocation. */
+struct msgb *gsm0808_create_uplink_release_cmd(const enum gsm0808_cause cause)
+{
+	struct msgb *msg;
+
+	msg = msgb_alloc_headroom(BSSMAP_MSG_SIZE, BSSMAP_MSG_HEADROOM, "BSSMAP-UPLINK-RELEASE-COMMAND");
+	if (!msg)
+		return NULL;
+
+	/* Message Type, 3.2.2.1 */
+	msgb_v_put(msg, BSS_MAP_MSG_UPLINK_RELEASE_CMD);
+
+	/* Cause, 3.2.2.5 */
+	gsm0808_enc_cause(msg, cause);
+
+	/* prepend header with final length */
+	msg->l3h = msgb_tv_push(msg, BSSAP_MSG_BSS_MANAGEMENT, msgb_length(msg));
+
+	return msg;
+}
+
+/*! Create BSSMAP (VGCS) UPLINK SEIZED COMMAND message, 3GPP TS 48.008 3.2.1.62.
+ * Sent from the MSC to the BSC to indicate that the uplink is no longer available for allocation. */
+struct msgb *gsm0808_create_uplink_seized_cmd(const struct gsm0808_uplink_seized_cmd *params)
+{
+	struct msgb *msg;
+
+	msg = msgb_alloc_headroom(BSSMAP_MSG_SIZE, BSSMAP_MSG_HEADROOM, "BSSMAP-UPLINK-SEIZED-COMMAND");
+	if (!msg)
+		return NULL;
+
+	/* Message Type, 3.2.2.1 */
+	msgb_v_put(msg, BSS_MAP_MSG_UPLINK_SEIZED_CMD);
+
+	/* Cause, 3.2.2.5 */
+	gsm0808_enc_cause(msg, params->cause);
+
+	/* Talker Priority, 3.2.2.89 */
+	if (params->talker_priority_present)
+		msgb_tv_put(msg, GSM0808_IE_TALKER_PRIORITY, params->talker_priority);
+
+	/* Emergency set indication, 3.2.2.90 */
+	if (params->emerg_set_ind_present)
+		msgb_v_put(msg, GSM0808_IE_EMERGENCY_SET_INDICATION);
+
+	/* Talker Identity, 3.2.2.91 */
+	if (params->talker_identity_present)
+		gsm0808_enc_talker_identity(msg, &params->talker_identity);
+
+	/* prepend header with final length */
+	msg->l3h = msgb_tv_push(msg, BSSAP_MSG_BSS_MANAGEMENT, msgb_length(msg));
+
+	return msg;
+}
+
+/*! Create BSSMAP VGCS ADDITIONAL INFORMATION message, 3GPP TS 48.008 3.2.1.78.
+ * Sent from the MSC to the BSC to transfer talker identity. */
+struct msgb *gsm0808_create_vgcs_additional_info(const struct gsm0808_talker_identity *ti)
+{
+	struct msgb *msg;
+
+	msg = msgb_alloc_headroom(BSSMAP_MSG_SIZE, BSSMAP_MSG_HEADROOM, "BSSMAP-VGCS-ADDITIONAL-INFO");
+	if (!msg)
+		return NULL;
+
+	/* Message Type, 3.2.2.1 */
+	msgb_v_put(msg, BSS_MAP_MSG_VGCS_ADDL_INFO);
+
+	/* Talker Identity, 3.2.2.91 */
+	gsm0808_enc_talker_identity(msg, ti);
+
+	/* prepend header with final length */
+	msg->l3h = msgb_tv_push(msg, BSSAP_MSG_BSS_MANAGEMENT, msgb_length(msg));
+
+	return msg;
+}
+
+/*! Create BSSMAP VGCS/VBS AREA CELL INFO message, 3GPP TS 48.008 3.2.1.79.
+ * Sent from the BSC to the MSC to transfer additional infos about cells. */
+struct msgb *gsm0808_create_vgcs_vbs_area_cell_info(const struct gsm0808_vgcs_vbs_area_cell_info *params)
+{
+	struct msgb *msg;
+
+	msg = msgb_alloc_headroom(BSSMAP_MSG_SIZE, BSSMAP_MSG_HEADROOM, "BSSMAP-VGCS/VBS-AREA-CELL-INFO");
+	if (!msg)
+		return NULL;
+
+	/* Message Type, 3.2.2.1 */
+	msgb_v_put(msg, BSS_MAP_MSG_VGCS_VBS_ASSIGNMENT_RQST);
+
+	/* Cell Identifier List Segment, 3.2.2.27a */
+	gsm0808_enc_cell_id_list_segment(msg, GSM0808_IE_CELL_ID_LIST_SEGMENT, &params->cils);
+
+	/* Assignment Requrirement, 3.2.2.52 */
+	if (params->ass_req_present)
+		gsm0808_enc_assign_req(msg, params->ass_req);
+
+	/* prepend header with final length */
+	msg->l3h = msgb_tv_push(msg, BSSAP_MSG_BSS_MANAGEMENT, msgb_length(msg));
+
+	return msg;
+}
+
+/*! Create BSSMAP VGCS/VBS ASSIGNMENT STATUS message, 3GPP TS 48.008 3.2.1.80.
+ * Sent from the BSC to the MSC to indicate assignment status for each cell. */
+struct msgb *gsm0808_create_vgcs_vbs_assign_stat(const struct gsm0808_vgcs_vbs_assign_stat *params)
+{
+	struct msgb *msg;
+	uint8_t val;
+
+	msg = msgb_alloc_headroom(BSSMAP_MSG_SIZE, BSSMAP_MSG_HEADROOM, "BSSMAP-VGCS/VBS-ASSIGNMENT-STATUS");
+	if (!msg)
+		return NULL;
+
+	/* Message Type, 3.2.2.1 */
+	msgb_v_put(msg, BSS_MAP_MSG_VGCS_VBS_ASSIGNMENT_STATUS);
+
+	/* Cell Identifier List Segment, 3.2.2.27b */
+	if (params->cils_est_present)
+		gsm0808_enc_cell_id_list_segment(msg, GSM0808_IE_CELL_ID_LIST_SEG_EST_CELLS, &params->cils_est);
+	/* Cell Identifier List Segment, 3.2.2.27c */
+	if (params->cils_tbe_present)
+		gsm0808_enc_cell_id_list_segment(msg, GSM0808_IE_CELL_ID_LIST_SEG_CELLS_TBE, &params->cils_tbe);
+	/* Cell Identifier List Segment, 3.2.2.27e */
+	if (params->cils_rel_present)
+		gsm0808_enc_cell_id_list_segment(msg, GSM0808_IE_CELL_ID_LIST_SEG_REL_CELLS, &params->cils_rel);
+	/* Cell Identifier List Segment, 3.2.2.27f */
+	if (params->cils_ne_present)
+		gsm0808_enc_cell_id_list_segment(msg, GSM0808_IE_CELL_ID_LIST_SEG_NE_CELLS, &params->cils_ne);
+
+	/* VGCS/VBS Cell Status, 3.2.2.94 */
+	if (params->cell_status_present) {
+		val = params->cell_status;
+		msgb_tlv_put(msg, GSM0808_IE_VGCS_VBS_CELL_STATUS, 1, &val);
+	}
+
+	/* prepend header with final length */
+	msg->l3h = msgb_tv_push(msg, BSSAP_MSG_BSS_MANAGEMENT, msgb_length(msg));
+
+	return msg;
+}
+
+/*! Create BSSMAP VGCS SMS message, 3GPP TS 48.008 3.2.1.81.
+ * Sent from the MSC to the BSC to send an SMS to VGCS. */
+struct msgb *gsm0808_create_vgcs_sms(const struct gsm0808_sms_to_vgcs *sms)
+{
+	struct msgb *msg;
+
+	msg = msgb_alloc_headroom(BSSMAP_MSG_SIZE, BSSMAP_MSG_HEADROOM, "BSSMAP-VGCS-SMS");
+	if (!msg)
+		return NULL;
+
+	/* SMS to VGCS, 3.2.2.92 */
+	msgb_tlv_put(msg, GSM0808_IE_VGCS_VBS_CELL_STATUS, sms->sms_len, sms->sms);
+
+	/* prepend header with final length */
+	msg->l3h = msgb_tv_push(msg, BSSAP_MSG_BSS_MANAGEMENT, msgb_length(msg));
+
+	return msg;
+}
+
+/*! Create BSSMAP (VGCS/VBS) NOTIFICATION DATA message, 3GPP TS 48.008 3.2.1.82.
+ * Sent from the MSC to the BSC to send application specific data. */
+struct msgb *gsm0808_create_notification_data(const struct gsm0808_notification_data *params)
+{
+	struct msgb *msg;
+
+	msg = msgb_alloc_headroom(BSSMAP_MSG_SIZE, BSSMAP_MSG_HEADROOM, "BSSMAP-VGCS-SMS");
+	if (!msg)
+		return NULL;
+
+	/* Message Type, 3.2.2.1 */
+	msgb_v_put(msg, BSS_MAP_MSG_NOTIFICATION_DATA);
+
+	/* Application Data, 3.2.2.98 */
+	msgb_tlv_put(msg, GSM0808_IE_APP_DATA, params->app_data.data_len, params->app_data.data);
+
+	/* Data Identity, 3.2.2.99 */
+	gsm0808_enc_data_identity(msg, &params->data_ident);
+
+	/* MSISDN, 3.2.2.101 */
+	if (params->msisdn_present)
+		gsm0808_enc_msisdn(msg, params->msisdn);
+
+	/* prepend header with final length */
+	msg->l3h = msgb_tv_push(msg, BSSAP_MSG_BSS_MANAGEMENT, msgb_length(msg));
+
+	return msg;
+}
+
+/* Note that EMERGENCY RESET INDICATION and EMERGENCY RESET COMMAND cannot be implemented, due to lack of
+ * message type information in the specifications. */
+
 /* As per 3GPP TS 48.008 version 11.7.0 Release 11 */
 static const struct tlv_definition bss_att_tlvdef = {
 	.def = {
@@ -1775,7 +2434,9 @@
 	{ BSS_MAP_MSG_VGCS_VBS_ASSIGNMENT_RQST,	"VGCS/VBS ASSIGN REQ" },
 	{ BSS_MAP_MSG_VGCS_VBS_ASSIGNMENT_RESULT, "VGCS/VBS ASSIGN RES" },
 	{ BSS_MAP_MSG_VGCS_VBS_ASSIGNMENT_FAILURE, "VGCS/VBS ASSIGN FAIL" },
+	{ BSS_MAP_MSG_VGCS_VBS_ASSIGNMENT_STATUS, "VGCS/VBS ASSIGN STATUS" },
 	{ BSS_MAP_MSG_VGCS_VBS_QUEUING_INDICATION, "VGCS/VBS QUEUING IND" },
+	{ BSS_MAP_MSG_VGCS_VBS_AREA_CELL_INFO,	"VGCS/VBS AREA CELL INFO" },
 	{ BSS_MAP_MSG_UPLINK_RQST,		"UPLINK REQ" },
 	{ BSS_MAP_MSG_UPLINK_RQST_ACKNOWLEDGE,	"UPLINK REQ ACK" },
 	{ BSS_MAP_MSG_UPLINK_RQST_CONFIRMATION,	"UPLINK REQ CONF" },
@@ -1784,6 +2445,7 @@
 	{ BSS_MAP_MSG_UPLINK_RELEASE_CMD,	"UPLINK REL CMD" },
 	{ BSS_MAP_MSG_UPLINK_SEIZED_CMD,	"UPLINK SEIZED CMD" },
 	{ BSS_MAP_MSG_VGCS_ADDL_INFO,		"VGCS ADDL INFO" },
+	{ BSS_MAP_MSG_VGCS_SMS,			"VGCS SMS" },
 	{ BSS_MAP_MSG_NOTIFICATION_DATA,	"NOTIF DATA" },
 	{ BSS_MAP_MSG_UPLINK_APP_DATA,		"UPLINK APP DATA" },
 
@@ -1822,6 +2484,7 @@
 	{ GSM0808_SCT_HR3, "HR3" },
 	{ GSM0808_SCT_HR4, "HR4" },
 	{ GSM0808_SCT_HR6, "HR6" },
+	{ GSM0808_SCT_EXT, "Codec Extension" },
 	{ GSM0808_SCT_CSD, "CSD" },
 	{ 0, NULL }
 };
@@ -2028,4 +2691,101 @@
 	{ 0, NULL }
 };
 
+/* Convert one S0-S15 bit to its set of AMR modes, for HR AMR and FR AMR.
+ * This is 3GPP TS 28.062 Table 7.11.3.1.3-2: "Preferred Configurations", with some configurations removed as specified
+ * in 3GPP TS 48.008 3.2.2.103:
+ *
+ *  FR_AMR is coded ‘0011’.
+ *  S11, S13 and S15 are reserved and coded with zeroes.
+ *
+ *  HR_AMR is coded ‘0100’.
+ *  S6 - S7 and S11 – S15 are reserved and coded with zeroes.
+ *
+ * Meaning: for FR, exclude all Optimisation Mode configurations.
+ * For HR, exclude all that are not supported by HR AMR -- drop all that include at least one of
+ * 10.2 or 12.2.
+ *
+ * Also, for HR, drop 12.2k from S1.
+ *
+ * The first array dimension is 0 for half rate and 1 for full rate.
+ * The second array dimension is the configuration number (0..15) aka Sn.
+ * The values are bitmask combinations of (1 << GSM0808_AMR_MODE_nnnn).
+ *
+ * For example, accumulate all modes that are possible in a given my_s15_s0:
+ *
+ *   uint8_t modes = 0;
+ *   for (s_bit = 0; s_bit < 15; s_bit++)
+ *       if (my_s15_s0 & (1 << s_bit))
+ *           modes |= gsm0808_amr_modes_from_cfgfull_rate ? 1 : 0s_bit;
+ *   for (i = 0; i < 8; i++)
+ *       if (modes & (1 << i))
+ *           printf(" %s", gsm0808_amr_mode_name(i));
+ */
+const uint8_t gsm0808_amr_modes_from_cfg216 = {
+#define B(X) (1 << (GSM0808_AMR_MODE_##X))
+	/* HR */
+	{
+		/* Sn = modes */
+		 0 = B(4_75),
+		 1 = B(4_75)         | B(5_90)           | B(7_40),
+		 2 = B(5_90),
+		 3 = B(6_70),
+		 4 = B(7_40),
+		 5 = B(7_95),
+		 6 = 0,
+		 7 = 0,
+
+		 8 = B(4_75)         | B(5_90),
+		 9 = B(4_75)         | B(5_90) | B(6_70),
+		10 = B(4_75)         | B(5_90) | B(6_70) | B(7_40),
+		11 = 0,
+		12 = 0,
+		13 = 0,
+		14 = 0,
+		15 = 0,
+	},
+	/* FR */
+	{
+		/* Sn = modes */
+		 0 = B(4_75),
+		 1 = B(4_75)         | B(5_90)           | B(7_40)                     | B(12_2),
+		 2 = B(5_90),
+		 3 = B(6_70),
+		 4 = B(7_40),
+		 5 = B(7_95),
+		 6 = B(10_2),
+		 7 = B(12_2),
+
+		 8 = B(4_75)         | B(5_90),
+		 9 = B(4_75)         | B(5_90) | B(6_70),
+		10 = B(4_75)         | B(5_90) | B(6_70) | B(7_40),
+		11 = 0,
+		12 = B(4_75)         | B(5_90) | B(6_70)                     | B(10_2),
+		13 = 0,
+		14 = B(4_75)         | B(5_90)                     | B(7_95)           | B(12_2),
+		15 = 0,
+	}
+};
+
+/* AMR mode names from GSM0808_AMR_MODE_*, for use with gsm0808_amr_modes_from_cfg.
+ *
+ * For example:
+ *   printf("S9: ");
+ *   uint8_t s9_modes = gsm0808_amr_modes_from_cfgfull_rate ? 1 : 09;
+ *   for (bit = 0; bit < 8; bit++)
+ *       if (s9_modes & (1 << bit))
+ *           printf("%s,", gsm0808_amr_mode_name(bit));
+ */
+const struct value_string gsm0808_amr_mode_names = {
+	{ GSM0808_AMR_MODE_4_75, "4.75" },
+	{ GSM0808_AMR_MODE_5_15, "5.15" },
+	{ GSM0808_AMR_MODE_5_90, "5.90" },
+	{ GSM0808_AMR_MODE_6_70, "6.70" },
+	{ GSM0808_AMR_MODE_7_40, "7.40" },
+	{ GSM0808_AMR_MODE_7_95, "7.95" },
+	{ GSM0808_AMR_MODE_10_2, "10.2" },
+	{ GSM0808_AMR_MODE_12_2, "12.2" },
+	{}
+};
+
 /*! @} */

libosmocore_1.8.0.tar.xz/src/gsm/gsm0808_utils.c -> libosmocore_1.9.0.tar.xz/src/gsm/gsm0808_utils.c Changed

@@ -255,7 +255,7 @@
 		header |= (1 << 4);
 
 	if (type_extended) {
-		header |= 0x0f;
+		header |= GSM0808_SCT_EXT;
 		msgb_put_u8(msg, header);
 		msgb_put_u8(msg, sc->type);
 	} else {
@@ -347,7 +347,7 @@
 
 	/* An extended codec type needs at least two fields,
 	 * bail if the input data length is not sufficient. */
-	if ((header & 0x0F) == 0x0F && len < 2)
+	if ((header & 0x0F) == GSM0808_SCT_EXT && len < 2)
 		return -EINVAL;
 
 	elem++;
@@ -362,7 +362,7 @@
 	if (header & (1 << 4))
 		sc->tf = true;
 
-	if ((header & 0x0F) != 0x0F) {
+	if ((header & 0x0F) != GSM0808_SCT_EXT) {
 		sc->type = (header & 0x0F);
 	} else {
 		sc->type = *elem;
@@ -499,12 +499,6 @@
 
 	OSMO_ASSERT(ct->perm_spch_len <= CHANNEL_TYPE_ELEMENT_MAXLEN - 2);
 
-	/* FIXME: Implement encoding support for Data
-	 * and Speech + CTM Text Telephony */
-	if ((ct->ch_indctr & 0x0f) != GSM0808_CHAN_SPEECH
-	    && (ct->ch_indctr & 0x0f) != GSM0808_CHAN_SIGN)
-		OSMO_ASSERT(false);
-
 	msgb_put_u8(msg, GSM0808_IE_CHANNEL_TYPE);
 	tlv_len = msgb_put(msg, 1);
 	old_tail = msg->tail;
@@ -512,12 +506,45 @@
 	msgb_put_u8(msg, ct->ch_indctr & 0x0f);
 	msgb_put_u8(msg, ct->ch_rate_type);
 
-	for (i = 0; i < ct->perm_spch_len; i++) {
-		byte = ct->perm_spchi;
+	switch (ct->ch_indctr) {
+	case GSM0808_CHAN_DATA:
+		byte = ct->data_rate;
+
+		if (!ct->data_transparent)
+			byte |= 0x40; /* Set T/NT */
+
+		if (ct->data_rate_allowed_is_set) {
+			OSMO_ASSERT(!ct->data_transparent);
+			byte |= 0x80; /* Set ext */
+			msgb_put_u8(msg, byte);
+
+			byte = ct->data_rate_allowed;
+			if (ct->data_asym_pref_is_set) {
+				byte |= 0x80; /* Set ext */
+				msgb_put_u8(msg, byte);
 
-		if (i < ct->perm_spch_len - 1)
-			byte |= 0x80;
+				/* Set asymmetry indication, rest is spare */
+				byte = ct->data_asym_pref << 5;
+			}
+		}
 		msgb_put_u8(msg, byte);
+		break;
+	case GSM0808_CHAN_SPEECH:
+	case GSM0808_CHAN_SPEECH_CTM_TEXT_TELEPHONY:
+		for (i = 0; i < ct->perm_spch_len; i++) {
+			byte = ct->perm_spchi;
+
+			if (i < ct->perm_spch_len - 1)
+				byte |= 0x80;
+			msgb_put_u8(msg, byte);
+		}
+		break;
+	case GSM0808_CHAN_SIGN:
+		/* Octet 5 is spare */
+		msgb_put_u8(msg, 0);
+		break;
+	default:
+		OSMO_ASSERT(false);
 	}
 
 	*tlv_len = (uint8_t) (msg->tail - old_tail);
@@ -546,17 +573,60 @@
 
 	ct->ch_indctr = (*elem) & 0x0f;
 	elem++;
-	ct->ch_rate_type = (*elem) & 0x0f;
+	ct->ch_rate_type = *elem;
 	elem++;
 
-	for (i = 0; i < ARRAY_SIZE(ct->perm_spch); i++) {
+	switch (ct->ch_indctr) {
+	case GSM0808_CHAN_DATA:
 		byte = *elem;
 		elem++;
-		ct->perm_spchi = byte & 0x7f;
-		if ((byte & 0x80) == 0x00)
-			break;
+		ct->data_transparent = !(byte & 0x40); /* T/NT */
+		ct->data_rate = byte & 0x3f;
+
+		/* Optional extension for non-transparent service */
+		if (byte & 0x80) {
+			if (ct->data_transparent)
+				return -EINVAL;
+			if (elem - old_elem >= len)
+				return -EOVERFLOW;
+			byte = *elem;
+			elem++;
+
+			ct->data_rate_allowed_is_set = true;
+			ct->data_rate_allowed = byte & 0x7f;
+
+			/* Optional extension */
+			if (byte & 0x80) {
+				if (elem - old_elem >= len)
+					return -EOVERFLOW;
+				byte = *elem;
+				elem++;
+
+				ct->data_asym_pref_is_set = true;
+				ct->data_asym_pref = byte & 0x60 >> 5;
+			}
+		}
+		break;
+	case GSM0808_CHAN_SPEECH:
+	case GSM0808_CHAN_SPEECH_CTM_TEXT_TELEPHONY:
+		for (i = 0; i < ARRAY_SIZE(ct->perm_spch); i++) {
+			if (elem - old_elem >= len)
+				return -EOVERFLOW;
+
+			byte = *elem;
+			elem++;
+			ct->perm_spchi = byte & 0x7f;
+			if ((byte & 0x80) == 0x00)
+				break;
+		}
+		ct->perm_spch_len = i + 1;
+		break;
+	case GSM0808_CHAN_SIGN:
+		/* Octet 5 is spare */
+		break;
+	default:
+		return -ENOTSUP;
 	}
-	ct->perm_spch_len = i + 1;
 
 	return (int)(elem - old_elem);
 }
@@ -2140,4 +2210,367 @@
 	return gsm0808_channel_type_name_buf(buf, 128, ct);
 }
 
+/*! Encode Group Call Reference IE (3GPP TS 48.008 3.2.2.55).
+ *  \paramout msg Message Buffer to which IE is to be appended
+ *  \paramin gc Group Call Reference to be encoded
+ *  \returns number of bytes appended to \a msg */
+uint8_t gsm0808_enc_group_callref(struct msgb *msg, const struct gsm0808_group_callref *gc)
+{
+	uint8_t *old_tail;
+	uint8_t *tlv_len;
+
+	OSMO_ASSERT(msg);
+	OSMO_ASSERT(gc);
+
+	msgb_put_u8(msg, GSM0808_IE_GROUP_CALL_REFERENCE);
+	tlv_len = msgb_put(msg, 1);
+	old_tail = msg->tail;
+
+	memcpy(msgb_put(msg, sizeof(*gc)), gc, sizeof(*gc));
+
+	*tlv_len = (uint8_t) (msg->tail - old_tail);
+	return *tlv_len + 2;
+}
+
+/*! Decode Group Call Reference IE (3GPP TS 48.008 3.2.2.55).
+ *  \paramout gc Group Call Reference structure to store data
+ *  \paramin elem IE value to be decoded.
+ *  \paramin len Length of \a elem in bytes.
+ *  \returns number of bytes parsed; negative on error */
+int gsm0808_dec_group_callref(struct gsm0808_group_callref *gc, const uint8_t *elem, uint8_t len)
+{
+	OSMO_ASSERT(gc);
+	OSMO_ASSERT(elem);
+
+	if (len != sizeof(*gc))
+		return -EINVAL;
+
+	memcpy(gc, elem, sizeof(*gc));
+
+	return len;
+}
+
+/*! Encode Priority IE (3GPP TS 48.008 3.2.2.18).
+ *  \paramout msg Message Buffer to which IE is to be appended
+ *  \paramin pri Priority to be encoded
+ *  \returns number of bytes appended to \a msg */
+uint8_t gsm0808_enc_priority(struct msgb *msg, const struct gsm0808_priority *pri)
+{
+	uint8_t *old_tail;
+	uint8_t *tlv_len;
+
+	OSMO_ASSERT(msg);
+	OSMO_ASSERT(pri);
+
+	msgb_put_u8(msg, GSM0808_IE_PRIORITY);
+	tlv_len = msgb_put(msg, 1);
+	old_tail = msg->tail;
+
+	memcpy(msgb_put(msg, sizeof(*pri)), pri, sizeof(*pri));
+
+	*tlv_len = (uint8_t) (msg->tail - old_tail);
+	return *tlv_len + 2;
+}
+
+/*! Decode Priority IE (3GPP TS 48.008 3.2.2.18).
+ *  \paramout pri Priority structure to store data
+ *  \paramin elem IE value to be decoded.
+ *  \paramin len Length of \a elem in bytes.
+ *  \returns number of bytes parsed; negative on error */
+int gsm0808_dec_priority(struct gsm0808_priority *pri, const uint8_t *elem, uint8_t len)
+{
+	OSMO_ASSERT(pri);
+	OSMO_ASSERT(elem);
+
+	if (len != sizeof(*pri))
+		return -EINVAL;
+
+	memcpy(pri, elem, sizeof(*pri));
+
+	return len;
+}
+
+/*! Encode VGCS Feature Flags IE (3GPP TS 48.008 3.2.2.88).
+ *  \paramout msg Message Buffer to which IE is to be appended
+ *  \paramin ff VGCS Feature Flags to be encoded
+ *  \returns number of bytes appended to \a msg */
+uint8_t gsm0808_enc_vgcs_feature_flags(struct msgb *msg, const struct gsm0808_vgcs_feature_flags *ff)
+{
+	uint8_t *old_tail;
+	uint8_t *tlv_len;
+
+	OSMO_ASSERT(msg);
+	OSMO_ASSERT(ff);
+
+	msgb_put_u8(msg, GSM0808_IE_VGCS_FEATURE_FLAGS);
+	tlv_len = msgb_put(msg, 1);
+	old_tail = msg->tail;
+
+	memcpy(msgb_put(msg, sizeof(*ff)), ff, sizeof(*ff));
+
+	*tlv_len = (uint8_t) (msg->tail - old_tail);
+	return *tlv_len + 2;
+}
+
+/*! Decode VGCS Feature Flags IE (3GPP TS 48.008 3.2.2.88).
+ *  \paramout ff VGCS Feature Flags structure to store data
+ *  \paramin elem IE value to be decoded.
+ *  \paramin len Length of \a elem in bytes.
+ *  \returns number of bytes parsed; negative on error */
+int gsm0808_dec_vgcs_feature_flags(struct gsm0808_vgcs_feature_flags *ff, const uint8_t *elem, uint8_t len)
+{
+	OSMO_ASSERT(ff);
+	OSMO_ASSERT(elem);
+
+	if (len != sizeof(*ff))
+		return -EINVAL;
+
+	memcpy(ff, elem, sizeof(*ff));
+
+	return len;
+}
+
+/*! Encode Data Identity IE (3GPP TS 48.008 3.2.2.99).
+ *  \paramout msg Message Buffer to which IE is to be appended
+ *  \paramin di Data Identity to be encoded
+ *  \returns number of bytes appended to \a msg */
+uint8_t gsm0808_enc_data_identity(struct msgb *msg, const struct gsm0808_data_identity *ti)
+{
+	uint8_t *old_tail;
+	uint8_t *tlv_len;
+
+	OSMO_ASSERT(msg);
+	OSMO_ASSERT(ti);
+
+	msgb_put_u8(msg, GSM0808_IE_DATA_IDENTITY);
+	tlv_len = msgb_put(msg, 1);
+	old_tail = msg->tail;
+
+	memcpy(msgb_put(msg, sizeof(*ti)), ti, sizeof(*ti));
+
+	*tlv_len = (uint8_t) (msg->tail - old_tail);
+	return *tlv_len + 2;
+}
+
+/*! Decode Data Identity IE (3GPP TS 48.008 3.2.2.99).
+ *  \paramout di Data Identity structure to store data
+ *  \paramin elem IE value to be decoded.
+ *  \paramin len Length of \a elem in bytes.
+ *  \returns number of bytes parsed; negative on error */
+int gsm0808_dec_data_identity(struct gsm0808_data_identity *ti, const uint8_t *elem, uint8_t len)
+{
+	OSMO_ASSERT(ti);
+	OSMO_ASSERT(elem);
+
+	if (len < sizeof(*ti))
+		return -EINVAL;
+
+	memcpy(ti, elem, sizeof(*ti));
+
+	return len;
+}
+
+/*! Encode MSISDN IE (3GPP TS 48.008 3.2.2.101).
+ *  \paramout msg Message Buffer to which IE is to be appended
+ *  \paramin msisdn MSISDN to be encoded
+ *  \returns number of bytes appended to \a msg */
+uint8_t gsm0808_enc_msisdn(struct msgb *msg, const char *msisdn)
+{
+	uint8_t *tlv_len;
+	uint8_t bcd_lv11;
+	int rc;
+
+	OSMO_ASSERT(msg);
+	OSMO_ASSERT(msisdn);
+
+	rc = gsm48_encode_bcd_number(bcd_lv, sizeof(bcd_lv), 0, msisdn);
+	if (rc < 1)
+		return 0;
+
+	msgb_put_u8(msg, GSM0808_IE_MSISDN);
+	tlv_len = msgb_put(msg, rc);
+
+	memcpy(tlv_len, bcd_lv, rc);
+
+	*tlv_len = rc - 1;
+	return *tlv_len + 2;
+}
+
+/*! Decode MSISDN IE (3GPP TS 48.008 3.2.2.101).
+ *  \paramout msisdn MSISDN structure to store data
+ *  \paramin elem IE value to be decoded.
+ *  \paramin len Length of \a elem in bytes.
+ *  \returns number of bytes parsed; negative on error */
+int gsm0808_dec_msisdn(char *msisdn, const char *elem, uint8_t len)
+{
+	OSMO_ASSERT(msisdn);
+	OSMO_ASSERT(elem);
+
+	if (len < 1)
+		return -EINVAL;
+
+	gsm48_decode_bcd_number(msisdn, MSISDN_MAXLEN + 1, (uint8_t *)(elem - 1), 0);
+
+	return len;
+}
+
+/*! Encode Talker Identity IE (3GPP TS 48.008 3.2.2.91).
+ *  \paramout msg Message Buffer to which IE is to be appended
+ *  \paramin ti Talker Identity to be encoded
+ *  \returns number of bytes appended to \a msg */
+uint8_t gsm0808_enc_talker_identity(struct msgb *msg, const struct gsm0808_talker_identity *ti)
+{
+	uint8_t *old_tail;
+	uint8_t *tlv_len;
+	uint8_t *ptr;
+	unsigned int bytes;
+
+	OSMO_ASSERT(msg);
+	OSMO_ASSERT(ti);
+
+	msgb_put_u8(msg, GSM0808_IE_TALKER_IDENTITY);
+	tlv_len = msgb_put(msg, 1);
+	old_tail = msg->tail;
+
+	bytes = (ti->id_bits + 7) >> 3;
+	ptr = msgb_put(msg, 1 + bytes);
+	ptr0 = -ti->id_bits & 0x7;
+	memcpy(ptr + 1, ti->talker_id, bytes);
+
+	*tlv_len = (uint8_t) (msg->tail - old_tail);
+	return *tlv_len + 2;
+}
+
+/*! Decode Talker Identity IE (3GPP TS 48.008 3.2.2.91).
+ *  \paramout ti Talker Identity structure to store data
+ *  \paramin elem IE value to be decoded.
+ *  \paramin len Length of \a elem in bytes.
+ *  \returns number of bytes parsed; negative on error */
+int gsm0808_dec_talker_identity(struct gsm0808_talker_identity *ti, const uint8_t *elem, uint8_t len)
+{
+	OSMO_ASSERT(ti);
+	OSMO_ASSERT(elem);
+
+	if (len < 2)
+		return -EINVAL;
+	unsigned int bytes;
+
+	bytes = len - 1;
+	if (bytes > TALKER_IDENTITY_MAXLEN)
+		return -EINVAL;
+	ti->id_bits = (bytes << 3) - (elem0 & 0x7);
+	memcpy(ti->talker_id, elem + 1, bytes);
+
+	return len;
+}
+
+/*! Encode Assignment Requirements IE (3GPP TS 48.008 3.2.2.52).
+ *  \paramout msg Message Buffer to which IE is to be appended
+ *  \paramin ar Assignment Requirement to be encoded
+ *  \returns number of bytes appended to \a msg */
+uint8_t gsm0808_enc_assign_req(struct msgb *msg, const enum gsm0808_assignment_requirement ar)
+{
+	uint8_t *ptr;
+
+	OSMO_ASSERT(msg);
+
+	msgb_put_u8(msg, GSM0808_IE_ASSIGNMENT_REQUIREMENT);
+
+	ptr = msgb_put(msg, 1);
+	ptr0 = ar;
+
+	return 2;
+}
+
+/*! Decode Assignment Requirements IE (3GPP TS 48.008 3.2.2.52).
+ *  \paramout ar Assignment Requirements enum to store data
+ *  \paramin elem IE value to be decoded.
+ *  \paramin len Length of \a elem in bytes.
+ *  \returns number of bytes parsed; negative on error */
+int gsm0808_dec_assign_req(enum gsm0808_assignment_requirement *ar, const uint8_t *elem, uint8_t len)
+{
+	OSMO_ASSERT(ar);
+	OSMO_ASSERT(elem);
+
+	if (len != 1)
+		return -EINVAL;
+
+	*ar = elem0;
+
+	return 1;
+}
+
+/*! Encode Cell Identifier List Segment IE (3GPP TS 48.008 3.2.2.27a).
+ *  \paramout msg Message Buffer to which IE is to be appended
+ *  \paramin ie_type Type of IE to use (5 different lists are specified.)
+ *  \paramin ci Cell Identifier List Segment to be encoded
+ *  \returns number of bytes appended to \a msg */
+uint8_t gsm0808_enc_cell_id_list_segment(struct msgb *msg, uint8_t ie_type,
+					 const struct gsm0808_cell_id_list_segment *ci)
+{
+	uint8_t *old_tail;
+	uint8_t *tlv_len;
+	int rc;
+
+	OSMO_ASSERT(msg);
+	OSMO_ASSERT(ci);
+
+	msgb_put_u8(msg, ie_type);
+	tlv_len = msgb_put(msg, 1);
+	old_tail = msg->tail;
+
+	msgb_put_u8(msg, (ci->seq_last << 4) | ci->seq_number);
+
+	rc = gsm0808_enc_cell_id_list2(msg, &ci->cil);
+	if (rc <= 0)
+		return rc;
+
+	*tlv_len = (uint8_t) (msg->tail - old_tail);
+	return *tlv_len + 2;
+}
+
+/*! Decode Cell Identifier List Segment IE (3GPP TS 48.008 3.2.2.27a).
+ *  \paramout ci Cell Identifier List Segment structure to store data
+ *  \paramin elem IE value to be decoded.
+ *  \paramin len Length of \a elem in bytes.
+ *  \returns number of bytes parsed; negative on error */
+int gsm0808_dec_cell_id_list_segment(struct gsm0808_cell_id_list_segment *ci, const uint8_t *elem, uint8_t len)
+{
+	int rc;
+
+	OSMO_ASSERT(ci);
+	OSMO_ASSERT(elem);
+
+	if (len < 1)
+		return -EINVAL;
+
+	ci->seq_last = elem0 >> 4;
+	ci->seq_number = elem0 & 0x0f;
+
+	rc = gsm0808_dec_cell_id_list2(&ci->cil, elem + 1, len - 1);
+	if (rc < 0)
+		return rc;
+
+	return len;
+}
+
+/*! Decode Call Identifier IE (3GPP TS 48.008 3.2.2.105).
+ *  \paramout ci Call Identifier structure to store data
+ *  \paramin elem IE value to be decoded.
+ *  \paramin len Length of \a elem in bytes.
+ *  \returns number of bytes parsed; negative on error */
+int gsm0808_dec_call_id(uint32_t *ci, const uint8_t *elem, uint8_t len)
+{
+	OSMO_ASSERT(ci);
+	OSMO_ASSERT(elem);
+
+	if (len != 4)
+		return -EINVAL;
+
+	/* The Call Identifier is stored as little endian. */
+	*ci = osmo_load32le(elem);
+
+	return 4;
+}
+
 /*! @} */

libosmocore_1.9.0.tar.xz/src/gsm/gsm44021.c Added

@@ -0,0 +1,303 @@
+/*************************************************************************
+ * GSM CSD modified V.110 frame decoding/encoding (ubits <-> struct with D/S/X/E bits)
+ *************************************************************************/
+
+/* (C) 2022 by Harald Welte <laforge@osmocom.org>
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ */
+
+#include <errno.h>
+#include <osmocom/core/bits.h>
+#include <osmocom/isdn/v110.h>
+
+/*! Decode a 60-bit GSM 12kbit/s CSD frame present as 60 ubits into a struct osmo_v110_decoded_frame.
+ *  \paramout caller-allocated output data structure, filled by this function
+ *  \paramin ra_bits One V.110 frame as 60 unpacked bits. */
+int osmo_csd_12k_6k_decode_frame(struct osmo_v110_decoded_frame *fr, const ubit_t *ra_bits, size_t n_bits)
+{
+	/* 3GPP TS 44.021 Section 8.1.2 / 8.1.3
+	D1	D2	D3	D4	D5	D6	S1
+	D7	D8	D9	D10	D11	D12	X
+	D13	D14	D15	D16	D17	D18	S3
+	D19	D20	D21	D22	D23	D24	S4
+	E4	E5	E6	E7	D25	D26	D27
+	D28	D29	D30	S6	D31	D32	D33
+	D34	D35	D36	X	D37	D38	D39
+	D40	D41	D42	S8	D43	D44	D45
+	D46	D47	D48	S9 */
+
+	if (n_bits < 60)
+		return -EINVAL;
+
+	/* X1 .. X2 */
+	fr->x_bits0 = ra_bits1 * 7 + 6;
+	fr->x_bits1 = ra_bits6 * 7 + 3;
+
+	/* S1, S3, S4, S6, S8, S9 */
+	fr->s_bits0 = ra_bits0 * 7 + 6;
+	fr->s_bits2 = ra_bits2 * 7 + 6;
+	fr->s_bits3 = ra_bits3 * 7 + 6;
+	fr->s_bits5 = ra_bits5 * 7 + 3;
+	fr->s_bits7 = ra_bits7 * 7 + 3;
+	fr->s_bits8 = ra_bits8 * 7 + 3;
+
+	/* E1 .. E3 must be set by out-of-band knowledge! */
+
+	/* E4 .. E7 */
+	memcpy(fr->e_bits+3, ra_bits + 4 * 7 + 0, 4);
+
+	/* D-bits */
+	memcpy(fr->d_bits + 0 * 6 + 0, ra_bits + 0 * 7 + 0, 6);
+	memcpy(fr->d_bits + 1 * 6 + 0, ra_bits + 1 * 7 + 0, 6);
+	memcpy(fr->d_bits + 2 * 6 + 0, ra_bits + 2 * 7 + 0, 6);
+	memcpy(fr->d_bits + 3 * 6 + 0, ra_bits + 3 * 7 + 0, 6);
+	memcpy(fr->d_bits + 4 * 6 + 0, ra_bits + 4 * 7 + 4, 3);
+	memcpy(fr->d_bits + 4 * 6 + 3, ra_bits + 5 * 7 + 0, 3);
+	memcpy(fr->d_bits + 5 * 6 + 0, ra_bits + 5 * 7 + 4, 3);
+	memcpy(fr->d_bits + 5 * 6 + 3, ra_bits + 6 * 7 + 0, 3);
+	memcpy(fr->d_bits + 6 * 6 + 0, ra_bits + 6 * 7 + 4, 3);
+	memcpy(fr->d_bits + 6 * 6 + 3, ra_bits + 7 * 7 + 0, 3);
+	memcpy(fr->d_bits + 7 * 6 + 0, ra_bits + 7 * 7 + 4, 3);
+	memcpy(fr->d_bits + 7 * 6 + 3, ra_bits + 8 * 7 + 0, 3);
+
+	return 0;
+}
+
+int osmo_csd_12k_6k_encode_frame(ubit_t *ra_bits, size_t ra_bits_size, const struct osmo_v110_decoded_frame *fr)
+{
+	if (ra_bits_size < 60)
+		return -EINVAL;
+
+	/* X1 .. X2 */
+	ra_bits1 * 7 + 6 = fr->x_bits0;
+	ra_bits6 * 7 + 3 = fr->x_bits1;
+
+	/* S1, S3, S4, S6, S8, S9 */
+	ra_bits0 * 7 + 6 = fr->s_bits0;
+	ra_bits2 * 7 + 6 = fr->s_bits2;
+	ra_bits3 * 7 + 6 = fr->s_bits3;
+	ra_bits5 * 7 + 3 = fr->s_bits5;
+	ra_bits7 * 7 + 3 = fr->s_bits7;
+	ra_bits8 * 7 + 3 = fr->s_bits8;
+
+	/* E1 .. E3 are dropped */
+
+	/* E4 .. E7 */
+	memcpy(ra_bits + 4 * 7 + 0, fr->e_bits+3, 4);
+
+	/* D-bits */
+	memcpy(ra_bits + 0 * 7 + 0, fr->d_bits + 0 * 6 + 0, 6);
+	memcpy(ra_bits + 1 * 7 + 0, fr->d_bits + 1 * 6 + 0, 6);
+	memcpy(ra_bits + 2 * 7 + 0, fr->d_bits + 2 * 6 + 0, 6);
+	memcpy(ra_bits + 3 * 7 + 0, fr->d_bits + 3 * 6 + 0, 6);
+	memcpy(ra_bits + 4 * 7 + 4, fr->d_bits + 4 * 6 + 0, 3);
+	memcpy(ra_bits + 5 * 7 + 0, fr->d_bits + 4 * 6 + 3, 3);
+	memcpy(ra_bits + 5 * 7 + 4, fr->d_bits + 5 * 6 + 0, 3);
+	memcpy(ra_bits + 6 * 7 + 0, fr->d_bits + 5 * 6 + 3, 3);
+	memcpy(ra_bits + 6 * 7 + 4, fr->d_bits + 6 * 6 + 0, 3);
+	memcpy(ra_bits + 7 * 7 + 0, fr->d_bits + 6 * 6 + 3, 3);
+	memcpy(ra_bits + 7 * 7 + 4, fr->d_bits + 7 * 6 + 0, 3);
+	memcpy(ra_bits + 8 * 7 + 0, fr->d_bits + 7 * 6 + 3, 3);
+
+	return 60;
+}
+
+/*! Decode a 36-bit GSM 3k6kbit/s CSD frame present as 36 ubits into a struct osmo_v110_decoded_frame.
+ *  \paramout caller-allocated output data structure, filled by this function
+ *  \paramin ra_bits One V.110 frame as 36 unpacked bits. */
+int osmo_csd_3k6_decode_frame(struct osmo_v110_decoded_frame *fr, const ubit_t *ra_bits, size_t n_bits)
+{
+
+	/* 3GPP TS 44.021 Section 8.1.4
+	D1	D2	D3	S1	D4	D5	D6	X
+	D7	D8	D9	S3	D10	D11	D12	S4
+	E4	E5	E6	E7	D13	D14	D15	S6
+	D16	D17	D18	X	D19	D20	D21	S8
+	D22	D23	D24	S9
+	*/
+
+	if (n_bits < 36)
+		return -EINVAL;
+
+	/* X1 .. X2 */
+	fr->x_bits0 = ra_bits0 * 8 + 7;
+	fr->x_bits1 = ra_bits3 * 8 + 3;
+
+	/* S1, S3, S4, S6, S8, S9 */
+	fr->s_bits0 = ra_bits0 * 8 + 3;
+	fr->s_bits2 = ra_bits1 * 8 + 3;
+	fr->s_bits3 = ra_bits1 * 8 + 7;
+	fr->s_bits5 = ra_bits2 * 8 + 7;
+	fr->s_bits7 = ra_bits3 * 8 + 7;
+	fr->s_bits8 = ra_bits4 * 8 + 3;
+
+	/* E1 .. E3 must be set by out-of-band knowledge! */
+
+	/* E4 .. E7 */
+	memcpy(fr->e_bits+3, ra_bits + 2 * 8 + 0, 4);
+
+	/* D-bits */
+	unsigned int d_idx = 0;
+	fr->d_bitsd_idx++ = ra_bits0 * 8 + 0;	/* D1 */
+	fr->d_bitsd_idx++ = ra_bits0 * 8 + 0;	/* D1 */
+	fr->d_bitsd_idx++ = ra_bits0 * 8 + 1;	/* D2 */
+	fr->d_bitsd_idx++ = ra_bits0 * 8 + 1;	/* D2 */
+	fr->d_bitsd_idx++ = ra_bits0 * 8 + 2;	/* D3 */
+	fr->d_bitsd_idx++ = ra_bits0 * 8 + 2;	/* D3 */
+	fr->d_bitsd_idx++ = ra_bits0 * 8 + 4;	/* D4 */
+	fr->d_bitsd_idx++ = ra_bits0 * 8 + 4;	/* D4 */
+	fr->d_bitsd_idx++ = ra_bits0 * 8 + 5;	/* D5 */
+	fr->d_bitsd_idx++ = ra_bits0 * 8 + 5;	/* D5 */
+	fr->d_bitsd_idx++ = ra_bits0 * 8 + 6;	/* D6 */
+	fr->d_bitsd_idx++ = ra_bits0 * 8 + 6;	/* D6 */
+
+	fr->d_bitsd_idx++ = ra_bits1 * 8 + 0;	/* D7 */
+	fr->d_bitsd_idx++ = ra_bits1 * 8 + 0;	/* D7 */
+	fr->d_bitsd_idx++ = ra_bits1 * 8 + 1;	/* D8 */
+	fr->d_bitsd_idx++ = ra_bits1 * 8 + 1;	/* D8 */
+	fr->d_bitsd_idx++ = ra_bits1 * 8 + 2;	/* D9 */
+	fr->d_bitsd_idx++ = ra_bits1 * 8 + 2;	/* D9 */
+	fr->d_bitsd_idx++ = ra_bits1 * 8 + 4;	/* D10 */
+	fr->d_bitsd_idx++ = ra_bits1 * 8 + 4;	/* D10 */
+	fr->d_bitsd_idx++ = ra_bits1 * 8 + 5;	/* D11 */
+	fr->d_bitsd_idx++ = ra_bits1 * 8 + 5;	/* D11 */
+	fr->d_bitsd_idx++ = ra_bits1 * 8 + 6;	/* D12 */
+	fr->d_bitsd_idx++ = ra_bits1 * 8 + 6;	/* D12 */
+
+	fr->d_bitsd_idx++ = ra_bits2 * 8 + 4;	/* D13 */
+	fr->d_bitsd_idx++ = ra_bits2 * 8 + 4;	/* D13 */
+	fr->d_bitsd_idx++ = ra_bits2 * 8 + 5;	/* D14 */
+	fr->d_bitsd_idx++ = ra_bits2 * 8 + 5;	/* D14 */
+	fr->d_bitsd_idx++ = ra_bits2 * 8 + 6;	/* D15 */
+	fr->d_bitsd_idx++ = ra_bits2 * 8 + 6;	/* D15 */
+
+	fr->d_bitsd_idx++ = ra_bits3 * 8 + 0;	/* D16 */
+	fr->d_bitsd_idx++ = ra_bits3 * 8 + 0;	/* D16 */
+	fr->d_bitsd_idx++ = ra_bits3 * 8 + 1;	/* D17 */
+	fr->d_bitsd_idx++ = ra_bits3 * 8 + 1;	/* D17 */
+	fr->d_bitsd_idx++ = ra_bits3 * 8 + 2;	/* D18 */
+	fr->d_bitsd_idx++ = ra_bits3 * 8 + 2;	/* D18 */
+	fr->d_bitsd_idx++ = ra_bits3 * 8 + 4;	/* D19 */
+	fr->d_bitsd_idx++ = ra_bits3 * 8 + 4;	/* D19 */
+	fr->d_bitsd_idx++ = ra_bits3 * 8 + 5;	/* D20 */
+	fr->d_bitsd_idx++ = ra_bits3 * 8 + 5;	/* D20 */
+	fr->d_bitsd_idx++ = ra_bits3 * 8 + 6;	/* D21 */
+	fr->d_bitsd_idx++ = ra_bits3 * 8 + 6;	/* D21 */
+
+	fr->d_bitsd_idx++ = ra_bits4 * 8 + 0;	/* D22 */
+	fr->d_bitsd_idx++ = ra_bits4 * 8 + 0;	/* D22 */
+	fr->d_bitsd_idx++ = ra_bits4 * 8 + 1;	/* D23 */
+	fr->d_bitsd_idx++ = ra_bits4 * 8 + 1;	/* D23 */
+	fr->d_bitsd_idx++ = ra_bits4 * 8 + 2;	/* D24 */
+	fr->d_bitsd_idx++ = ra_bits4 * 8 + 2;	/* D24 */
+
+	OSMO_ASSERT(d_idx == 48);
+
+	return 0;
+}
+
+int osmo_csd_3k6_encode_frame(ubit_t *ra_bits, size_t ra_bits_size, const struct osmo_v110_decoded_frame *fr)
+{
+	if (ra_bits_size < 36)
+		return -EINVAL;
+
+	/* X1 .. X2 */
+	ra_bits0 * 8 + 7 = fr->x_bits0;
+	ra_bits3 * 8 + 3 = fr->x_bits1;
+
+	/* S1, S3, S4, S6, S8, S9 */
+	ra_bits0 * 8 + 3 = fr->s_bits0;
+	ra_bits1 * 8 + 3 = fr->s_bits2;
+	ra_bits1 * 8 + 7 = fr->s_bits3;
+	ra_bits2 * 8 + 7 = fr->s_bits5;
+	ra_bits3 * 8 + 7 = fr->s_bits7;
+	ra_bits4 * 8 + 3 = fr->s_bits8;
+
+	/* E1 .. E3 are ignored */
+
+	/* E4 .. E7 */
+	memcpy(ra_bits + 2 * 8 + 0, fr->e_bits+3, 4);
+
+	/* D-bits */
+	unsigned int d_idx = 0;
+	ra_bits0 * 8 + 0 = fr->d_bitsd_idx; d_idx += 2;
+	ra_bits0 * 8 + 1 = fr->d_bitsd_idx; d_idx += 2;
+	ra_bits0 * 8 + 2 = fr->d_bitsd_idx; d_idx += 2;
+	ra_bits0 * 8 + 4 = fr->d_bitsd_idx; d_idx += 2;
+	ra_bits0 * 8 + 5 = fr->d_bitsd_idx; d_idx += 2;
+	ra_bits0 * 8 + 6 = fr->d_bitsd_idx; d_idx += 2;
+
+	ra_bits1 * 8 + 0 = fr->d_bitsd_idx; d_idx += 2;
+	ra_bits1 * 8 + 1 = fr->d_bitsd_idx; d_idx += 2;
+	ra_bits1 * 8 + 2 = fr->d_bitsd_idx; d_idx += 2;
+	ra_bits1 * 8 + 4 = fr->d_bitsd_idx; d_idx += 2;
+	ra_bits1 * 8 + 5 = fr->d_bitsd_idx; d_idx += 2;
+	ra_bits1 * 8 + 6 = fr->d_bitsd_idx; d_idx += 2;
+
+	ra_bits2 * 8 + 4 = fr->d_bitsd_idx; d_idx += 2;
+	ra_bits2 * 8 + 5 = fr->d_bitsd_idx; d_idx += 2;
+	ra_bits2 * 8 + 6 = fr->d_bitsd_idx; d_idx += 2;
+
+	ra_bits3 * 8 + 0 = fr->d_bitsd_idx; d_idx += 2;
+	ra_bits3 * 8 + 1 = fr->d_bitsd_idx; d_idx += 2;
+	ra_bits3 * 8 + 2 = fr->d_bitsd_idx; d_idx += 2;
+	ra_bits3 * 8 + 4 = fr->d_bitsd_idx; d_idx += 2;
+	ra_bits3 * 8 + 5 = fr->d_bitsd_idx; d_idx += 2;
+	ra_bits3 * 8 + 6 = fr->d_bitsd_idx; d_idx += 2;
+
+	ra_bits4 * 8 + 0 = fr->d_bitsd_idx; d_idx += 2;
+	ra_bits4 * 8 + 1 = fr->d_bitsd_idx; d_idx += 2;
+	ra_bits4 * 8 + 2 = fr->d_bitsd_idx; d_idx += 2;
+
+	OSMO_ASSERT(d_idx == 48);
+
+	return 36;
+}
+
+/*! Print a encoded "CSD modififed V.110" frame in the same table-like structure as the spec.
+ *  \param outf output FILE stream to which to dump
+ *  \paramin fr unpacked bits to dump
+ *  \paramin in_len length of unpacked bits available at fr. */
+void osmo_csd_ubit_dump(FILE *outf, const ubit_t *fr, size_t in_len)
+{
+	switch (in_len) {
+	case 60:
+		for (unsigned int septet = 0; septet < 9; septet++) {
+			if (septet < 8) {
+				fprintf(outf, "%d\t%d\t%d\t%d\t%d\t%d\t%d\n", frseptet * 7 + 0,
+					frseptet * 7 + 1, frseptet * 7 + 2, frseptet * 7 + 3,
+					frseptet * 7 + 4, frseptet * 7 + 5, frseptet*7 + 6);
+			} else {
+				fprintf(outf, "%d\t%d\t%d\t%d\n", frseptet * 7 + 0,
+					frseptet * 7 + 1, frseptet * 7 + 2, frseptet * 7 + 3);
+			}
+		}
+		break;
+	case 36:
+		for (unsigned int octet = 0; octet < 5; octet++) {
+			if (octet < 4) {
+				fprintf(outf, "%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\n",
+					froctet * 8 + 0, froctet * 8 + 1, froctet * 8 + 2,
+					froctet * 8 + 3, froctet * 8 + 4, froctet * 8 + 5,
+					froctet * 8 + 6, froctet * 8 + 7);
+			} else {
+				fprintf(outf, "%d\t%d\t%d\t%d\n", froctet * 8 + 0,
+					froctet * 8 + 1, froctet * 8 + 2, froctet * 8 + 3);
+			}
+		}
+		break;
+	default:
+		fprintf(outf, "invalid input data length: %zu\n", in_len);
+	}
+}

libosmocore_1.9.0.tar.xz/src/gsm/gsm44068.c Added

@@ -0,0 +1,121 @@
+/* Group Call Control (GCC) is an ETSI/3GPP standard protocol used between
+ * MS (Mobile Station) and MSC (Mobile Switchting Center) in 2G/GSM-R network.
+ * It is specified in 3GPP TS 44.068.
+ *
+ * (C) 2023 by Sysmocom s.f.m.c. GmbH
+ * All Rights Reserved
+ *
+ * Author: Andreas Eversberg
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ */
+
+#include <stddef.h>
+#include <osmocom/gsm/tlv.h>
+#include <osmocom/gsm/protocol/gsm_44_068.h>
+
+/***********************************************************************
+ * Protocol Definitions
+ ***********************************************************************/
+
+const struct value_string osmo_gsm44068_msg_type_names = {
+	{ OSMO_GSM44068_MSGT_IMMEDIATE_SETUP,		"IMMEDIATE SETUP" },
+	{ OSMO_GSM44068_MSGT_SETUP,			"SETUP" },
+	{ OSMO_GSM44068_MSGT_CONNECT,			"CONNECT" },
+	{ OSMO_GSM44068_MSGT_TERMINATION,		"TERMINATION" },
+	{ OSMO_GSM44068_MSGT_TERMINATION_REQUEST,	"TERMINATION REQUEST" },
+	{ OSMO_GSM44068_MSGT_TERMINATION_REJECT,	"TERMINATION REJECT" },
+	{ OSMO_GSM44068_MSGT_STATUS,			"STATUS" },
+	{ OSMO_GSM44068_MSGT_GET_STATUS,		"GET STATUS" },
+	{ OSMO_GSM44068_MSGT_SET_PARAMETER,		"SET PARAMETER" },
+	{ OSMO_GSM44068_MSGT_IMMEDIATE_SETUP_2,		"IMMEDIATE SETUP 2" },
+	{ 0, NULL }
+};
+
+const struct value_string osmo_gsm44068_priority_level_names = {
+	{ OSMO_GSM44068_PRIO_LEVEL_4,			"priority level 4" },
+	{ OSMO_GSM44068_PRIO_LEVEL_3,			"priority level 3" },
+	{ OSMO_GSM44068_PRIO_LEVEL_2,			"priority level 2" },
+	{ OSMO_GSM44068_PRIO_LEVEL_1,			"priority level 1" },
+	{ OSMO_GSM44068_PRIO_LEVEL_0,			"priority level 0" },
+	{ OSMO_GSM44068_PRIO_LEVEL_B,			"priority level B" },
+	{ OSMO_GSM44068_PRIO_LEVEL_A,			"priority level A" },
+	{ 0, NULL }
+};
+
+const struct value_string osmo_gsm44068_cause_names = {
+	{ OSMO_GSM44068_CAUSE_ILLEGAL_MS,		"Illegal MS" },
+	{ OSMO_GSM44068_CAUSE_IMEI_NOT_ACCEPTED,	"IMEI not accepted" },
+	{ OSMO_GSM44068_CAUSE_ILLEGAL_ME,		"Illegal ME" },
+	{ OSMO_GSM44068_CAUSE_SERVICE_NOT_AUTHORIZED,	"Service not authorized" },
+	{ OSMO_GSM44068_CAUSE_APP_NOT_SUPPORTED_ON_PROTO, "Application not supported on the protocol" },
+	{ OSMO_GSM44068_CAUSE_RR_CONNECTION_ABORTED,	"RR connection aborted" },
+	{ OSMO_GSM44068_CAUSE_NORMAL_CALL_CLEARING,	"Normal call clearing" },
+	{ OSMO_GSM44068_CAUSE_NETWORK_FAILURE,		"Network failure" },
+	{ OSMO_GSM44068_CAUSE_BUSY,			"Busy" },
+	{ OSMO_GSM44068_CAUSE_CONGESTION,		"Congestion" },
+	{ OSMO_GSM44068_CAUSE_USER_NOT_ORIGINATOR,	"User not originator of call" },
+	{ OSMO_GSM44068_CAUSE_NET_WANTS_TO_MAINTAIN_CALL, "Network wants to maintain call" },
+	{ OSMO_GSM44068_CAUSE_RESPONSE_TO_GET_STATUS,	"Response to GET STATUS" },
+	{ OSMO_GSM44068_CAUSE_SERVICE_OPTION_NOT_SUBSCR, "Service option not supported" },
+	{ OSMO_GSM44068_CAUSE_REQUESTED_SERVICE_NOT_SUB, "Requested service option not subscribed" },
+	{ OSMO_GSM44068_CAUSE_SERVICE_OPTION_OOO,	"Service option temporarily out of order" },
+	{ OSMO_GSM44068_CAUSE_CALL_CANNOT_BE_IDENTIFIED, "Call cannot be identified" },
+	{ OSMO_GSM44068_CAUSE_RETRY_UPON_ENTRY_NEW_CALL, "retry upon entry into a new cell" },
+	{ OSMO_GSM44068_CAUSE_INVALID_TRANSACTION_ID,	"Invalid transaction identifier value" },
+	{ OSMO_GSM44068_CAUSE_SEMANTICALLY_INCORRECT_MSG, "Semantically incorrect message" },
+	{ OSMO_GSM44068_CAUSE_INVALID_MANDATORY_INFO,	"Invalid mandatory information" },
+	{ OSMO_GSM44068_CAUSE_MESSAGE_TYPE_NON_EXISTENT, "Message type non-existent or not implemented" },
+	{ OSMO_GSM44068_CAUSE_MESSAGE_TYPE_NOT_COMPAT,	"Message type not compatible with the protocol state" },
+	{ OSMO_GSM44068_CAUSE_IE_NON_EXISTENT,		"Information element non-existent or not implemented" },
+	{ OSMO_GSM44068_CAUSE_IE_NOT_COMPAT,		"Message type not compatible with the protocol state" },
+	{ OSMO_GSM44068_CAUSE_PROTOCOL_ERROR,		"Protocol error, unspecified" },
+	{ 0, NULL }
+};
+
+const struct value_string osmo_gsm44068_call_state_names = {
+	{ OSMO_GSM44068_CSTATE_U0,			"U0" },
+	{ OSMO_GSM44068_CSTATE_U1,			"U1" },
+	{ OSMO_GSM44068_CSTATE_U2sl_U2,			"U2sl/U2" },
+	{ OSMO_GSM44068_CSTATE_U3,			"U3" },
+	{ OSMO_GSM44068_CSTATE_U4,			"U4" },
+	{ OSMO_GSM44068_CSTATE_U5,			"U5" },
+	{ OSMO_GSM44068_CSTATE_U0p,			"U0.p" },
+	{ OSMO_GSM44068_CSTATE_U2wr_U6,			"U2wr/U6" },
+	{ OSMO_GSM44068_CSTATE_U2r,			"U2r" },
+	{ OSMO_GSM44068_CSTATE_U2ws,			"U2ws" },
+	{ OSMO_GSM44068_CSTATE_U2sr,			"U2sr" },
+	{ OSMO_GSM44068_CSTATE_U2nc,			"U2nc" },
+	{ 0, NULL }
+};
+
+const struct value_string osmo_gsm44068_talker_priority_names = {
+	{ OSMO_GSM44068_PRIO_NORMAL,			"Normal" },
+	{ OSMO_GSM44068_PRIO_PRIVILEGED,		"Privileged" },
+	{ OSMO_GSM44068_PRIO_EMERGENCY,			"Emergency" },
+	{ 0, NULL }
+};
+
+const struct tlv_definition osmo_gsm44068_att_tlvdef = {
+	.def = {
+		OSMO_GSM44068_IEI_MOBILE_IDENTITY =	{ TLV_TYPE_TLV },
+		OSMO_GSM44068_IEI_USER_USER =		{ TLV_TYPE_TLV },
+		OSMO_GSM44068_IEI_CALL_STATE =	{ TLV_TYPE_SINGLE_TV },
+		OSMO_GSM44068_IEI_STATE_ATTRIBUTES =	{ TLV_TYPE_SINGLE_TV },
+		OSMO_GSM44068_IEI_TALKER_PRIORITY =	{ TLV_TYPE_SINGLE_TV },
+		OSMO_GSM44068_IEI_SMS_INDICATIONS =	{ TLV_TYPE_SINGLE_TV },
+	},
+};

libosmocore_1.8.0.tar.xz/src/gsm/gsm48.c -> libosmocore_1.9.0.tar.xz/src/gsm/gsm48.c Changed

@@ -42,6 +42,7 @@
 #include <osmocom/gsm/protocol/gsm_08_58.h>
 #include <osmocom/gsm/protocol/gsm_04_08_gprs.h>
 #include <osmocom/gsm/protocol/gsm_23_003.h>
+#include <osmocom/gsm/protocol/gsm_44_068.h>
 
 /*! \addtogroup gsm0408
  *  @{
@@ -129,10 +130,10 @@
 		GSM48_IE_REALTIME_DIFF	= { TLV_TYPE_TLV },
 		GSM48_IE_START_TIME		= { TLV_TYPE_FIXED, 2 },
 		GSM48_IE_TIMING_ADVANCE	= { TLV_TYPE_TV },
-		GSM48_IE_GROUP_CIP_SEQ	= { TLV_TYPE_SINGLE_TV },
-		GSM48_IE_CIP_MODE_SET		= { TLV_TYPE_SINGLE_TV },
-		GSM48_IE_GPRS_RESUMPT		= { TLV_TYPE_SINGLE_TV },
-		GSM48_IE_SYNC_IND		= { TLV_TYPE_SINGLE_TV },
+		GSM48_IE_GROUP_CIP_SEQ_HO	= { TLV_TYPE_SINGLE_TV },
+		GSM48_IE_CIP_MODE_SET_HO	= { TLV_TYPE_SINGLE_TV },
+		GSM48_IE_GPRS_RESUMPT_HO	= { TLV_TYPE_SINGLE_TV },
+		GSM48_IE_SYNC_IND_HO		= { TLV_TYPE_SINGLE_TV },
 	},
 };
 
@@ -148,7 +149,7 @@
 		GSM48_IE_NET_DST		= { TLV_TYPE_TLV },
 
 		GSM48_IE_LOCATION_AREA	= { TLV_TYPE_FIXED, 5 },
-		GSM48_IE_PRIORITY_LEV		= { TLV_TYPE_SINGLE_TV },
+		GSM48_IE_PRIORITY_LEV_HO	= { TLV_TYPE_SINGLE_TV },
 		GSM48_IE_FOLLOW_ON_PROC	= { TLV_TYPE_T },
 		GSM48_IE_CTS_PERMISSION	= { TLV_TYPE_T },
 	},
@@ -448,10 +449,25 @@
 	{ GSM48_CMODE_SPEECH_V1,	"SPEECH_V1" },
 	{ GSM48_CMODE_SPEECH_EFR,	"SPEECH_EFR" },
 	{ GSM48_CMODE_SPEECH_AMR,	"SPEECH_AMR" },
+	{ GSM48_CMODE_SPEECH_V4,	"SPEECH_V4" },
+	{ GSM48_CMODE_SPEECH_V5,	"SPEECH_V5" },
+	{ GSM48_CMODE_SPEECH_V6,	"SPEECH_V6" },
+
+	{ GSM48_CMODE_DATA_43k5_14k5,	"DATA_43k5_14k5" },
+	{ GSM48_CMODE_DATA_29k0_14k5,	"DATA_29k0_14k5" },
+	{ GSM48_CMODE_DATA_43k5_29k0,	"DATA_43k5_29k0" },
+	{ GSM48_CMODE_DATA_14k5_43k5,	"DATA_14k5_43k5" },
+	{ GSM48_CMODE_DATA_14k5_29k0,	"DATA_14k5_29k0" },
+	{ GSM48_CMODE_DATA_29k0_43k5,	"DATA_29k0_43k5" },
+
+	{ GSM48_CMODE_DATA_43k5,	"DATA_43k5" },
+	{ GSM48_CMODE_DATA_32k0,	"DATA_32k0" },
+	{ GSM48_CMODE_DATA_29k0,	"DATA_29k0" },
 	{ GSM48_CMODE_DATA_14k5,	"DATA_14k5" },
 	{ GSM48_CMODE_DATA_12k0,	"DATA_12k0" },
 	{ GSM48_CMODE_DATA_6k0,		"DATA_6k0" },
 	{ GSM48_CMODE_DATA_3k6,		"DATA_3k6" },
+
 	{ GSM48_CMODE_SPEECH_V1_VAMOS,	"SPEECH_V1_VAMOS" },
 	{ GSM48_CMODE_SPEECH_V2_VAMOS,	"SPEECH_V2_VAMOS" },
 	{ GSM48_CMODE_SPEECH_V3_VAMOS,	"SPEECH_V3_VAMOS" },
@@ -493,6 +509,8 @@
 		return GSM48_CMODE_SPEECH_EFR;
 	case GSM48_CMODE_SPEECH_V3_VAMOS:
 		return GSM48_CMODE_SPEECH_AMR;
+	case GSM48_CMODE_SPEECH_V5_VAMOS:
+		return GSM48_CMODE_SPEECH_V5;
 	default:
 		return mode;
 	}
@@ -846,11 +864,13 @@
  * osmo_mobile_identity.
  *
  * \paramout mi  Return buffer for decoded Mobile Identity.
- * \paramin msg  The Complete Layer 3 message to extract from (LU, CM Service Req or Paging Resp).
+ * \paramin l3_data  The Complete Layer 3 message to extract from (LU, CM Service Req or Paging Resp).
+ * \paramin l3_len  Length of l3_data in bytes.
  * \returns 0 on success, negative on error: return codes as defined in osmo_mobile_identity_decode(), or
  *          -ENOTSUP = not a Complete Layer 3 message,
  */
-int osmo_mobile_identity_decode_from_l3(struct osmo_mobile_identity *mi, struct msgb *msg, bool allow_hex)
+int osmo_mobile_identity_decode_from_l3_buf(struct osmo_mobile_identity *mi, const uint8_t *l3_data, size_t l3_len,
+					    bool allow_hex)
 {
 	const struct gsm48_hdr *gh;
 	int8_t pdisc = 0;
@@ -869,10 +889,10 @@
 		.tmsi = GSM_RESERVED_TMSI,
 	};
 
-	if (msgb_l3len(msg) < sizeof(*gh))
+	if (l3_len < sizeof(*gh))
 		return -EBADMSG;
 
-	gh = msgb_l3(msg);
+	gh = (void *)l3_data;
 	pdisc = gsm48_hdr_pdisc(gh);
 	mtype = gsm48_hdr_msg_type(gh);
 
@@ -882,12 +902,12 @@
 		switch (mtype) {
 		case GSM48_MT_MM_LOC_UPD_REQUEST:
 			/* First make sure that lu-> can be dereferenced */
-			if (msgb_l3len(msg) < sizeof(*gh) + sizeof(*lu))
+			if (l3_len < sizeof(*gh) + sizeof(*lu))
 				return -EBADMSG;
 
 			/* Now we know there is enough msgb data to read a lu->mi_len, so also check that */
 			lu = (struct gsm48_loc_upd_req*)gh->data;
-			if (msgb_l3len(msg) < sizeof(*gh) + sizeof(*lu) + lu->mi_len)
+			if (l3_len < sizeof(*gh) + sizeof(*lu) + lu->mi_len)
 				return -EBADMSG;
 			mi_data = lu->mi;
 			mi_len = lu->mi_len;
@@ -897,7 +917,7 @@
 		case GSM48_MT_MM_CM_REEST_REQ:
 			/* Unfortunately in Phase1 the Classmark2 length is variable, so we cannot
 			 * just use gsm48_service_request struct, and need to parse it manually. */
-			if (msgb_l3len(msg) < sizeof(*gh) + 2)
+			if (l3_len < sizeof(*gh) + 2)
 				return -EBADMSG;
 
 			cm2_len = gh->data1;
@@ -905,7 +925,7 @@
 			goto got_cm2;
 
 		case GSM48_MT_MM_IMSI_DETACH_IND:
-			if (msgb_l3len(msg) < sizeof(*gh) + sizeof(*idi))
+			if (l3_len < sizeof(*gh) + sizeof(*idi))
 				return -EBADMSG;
 			idi = (struct gsm48_imsi_detach_ind*) gh->data;
 			mi_data = idi->mi;
@@ -913,7 +933,7 @@
 			goto got_mi;
 
 		case GSM48_MT_MM_ID_RESP:
-			if (msgb_l3len(msg) < sizeof(*gh) + 2)
+			if (l3_len < sizeof(*gh) + 2)
 				return -EBADMSG;
 			mi_data = gh->data+1;
 			mi_len = gh->data0;
@@ -928,13 +948,24 @@
 
 		switch (mtype) {
 		case GSM48_MT_RR_PAG_RESP:
-			if (msgb_l3len(msg) < sizeof(*gh) + sizeof(*paging_response))
+			if (l3_len < sizeof(*gh) + sizeof(*paging_response))
 				return -EBADMSG;
 			paging_response = (struct gsm48_pag_resp*)gh->data;
 			cm2_len = paging_response->cm2_len;
 			cm2_buf = (uint8_t*)&paging_response->cm2;
 			goto got_cm2;
 
+		case GSM48_MT_RR_TALKER_IND:
+			/* Check minimum size: Header + CM2 LV + minimum MI LV */
+			if (l3_len < sizeof(*gh) + 4 + 2)
+				return -EBADMSG;
+			/* CM2 shall be always 3 bytes in length */
+			if (gh->data0 != 3)
+				return -EBADMSG;
+			cm2_len = gh->data0;
+			cm2_buf = gh->data + 1;
+			goto got_cm2;
+
 		default:
 			break;
 		}
@@ -947,7 +978,7 @@
 	/* MI (Mobile Identity) LV follows the Classmark2 */
 
 	/* There must be at least a mi_len byte after the CM2 */
-	if (cm2_buf + cm2_len + 1 > msg->tail)
+	if (cm2_buf + cm2_len + 1 > l3_data + l3_len)
 		return -EBADMSG;
 
 	mi_start = cm2_buf + cm2_len;
@@ -956,12 +987,27 @@
 
 got_mi:
 	/* mi_data points at the start of the Mobile Identity coding of mi_len bytes */
-	if (mi_data + mi_len > msg->tail)
+	if (mi_data + mi_len > l3_data + l3_len)
 		return -EBADMSG;
 
 	return osmo_mobile_identity_decode(mi, mi_data, mi_len, allow_hex);
 }
 
+/*! Extract Mobile Identity from a Complete Layer 3 message.
+ *
+ * Determine the Mobile Identity data and call osmo_mobile_identity_decode() to return a decoded struct
+ * osmo_mobile_identity.
+ *
+ * \paramout mi  Return buffer for decoded Mobile Identity.
+ * \paramin msg  The Complete Layer 3 message to extract from (LU, CM Service Req or Paging Resp).
+ * \returns 0 on success, negative on error: return codes as defined in osmo_mobile_identity_decode(), or
+ *          -ENOTSUP = not a Complete Layer 3 message,
+ */
+int osmo_mobile_identity_decode_from_l3(struct osmo_mobile_identity *mi, struct msgb *msg, bool allow_hex)
+{
+	return osmo_mobile_identity_decode_from_l3_buf(mi, msgb_l3(msg), msgb_l3len(msg), allow_hex);
+}
+
 /*! Return a human readable representation of a struct osmo_mobile_identity.
  * Write a string like "IMSI-1234567", "TMSI-0x1234ABCD" or "NONE", "NULL".
  * \paramout buf  String buffer to write to.
@@ -1300,7 +1346,64 @@
 	return 1;
 }
 
-/*! Parse TS 04.08 Routing Area Identifier
+/*! Decode to struct osmo_routing_area_id from a 3GPP TS 24.008 § 10.5.5.15 Routing area identification.
+ * \paramout dst  Store the decoded result here.
+ * \paramin ra_data  The start of a Routing Area ID in encoded form, to be decoded.
+ * \paramin ra_data_len  Buffer size available to read from at *ra_data.
+ * \return the number of decoded bytes on success, or negative on error (if the input buffer is too small).
+ */
+int osmo_routing_area_id_decode(struct osmo_routing_area_id *dst, const uint8_t *ra_data, size_t ra_data_len)
+{
+	const struct gsm48_ra_id *ra_id;
+	if (ra_data_len < sizeof(*ra_id))
+		return -ENOSPC;
+
+	gsm48_decode_lai2((void *)ra_data, &dst->lac);
+
+	ra_id = (void *)ra_data;
+	dst->rac = ra_id->rac;
+
+	return sizeof(*ra_id);
+}
+
+/*! Encode struct osmo_routing_area_id to a 3GPP TS 24.008 § 10.5.5.15 Routing area identification: write to a buffer.
+ * \paramout buf  Return buffer for encoded Mobile Identity.
+ * \paramin buflen  sizeof(buf).
+ * \paramin src  RA to encode.
+ * \return Amount of bytes written to buf, or negative on error.
+ */
+int osmo_routing_area_id_encode_buf(uint8_t *buf, size_t buflen, const struct osmo_routing_area_id *src)
+{
+	struct gsm48_ra_id *ra_id;
+	if (buflen < sizeof(*ra_id))
+		return -ENOSPC;
+
+	gsm48_generate_lai2((void *)buf, &src->lac);
+
+	ra_id = (void *)buf;
+	ra_id->rac = src->rac;
+
+	return sizeof(*ra_id);
+}
+
+/*! Encode struct osmo_routing_area_id to a 3GPP TS 24.008 § 10.5.5.15 Routing area identification: append to msgb.
+ * To succeed, the msgb must have tailroom >= sizeof(struct gsm48_ra_id).
+ * \paramout msg  Append to this msgb.
+ * \paramin src  Encode this Routing Area ID.
+ * \return Number of bytes appended to msgb, or negative on error.
+ */
+int osmo_routing_area_id_encode_msgb(struct msgb *msg, const struct osmo_routing_area_id *src)
+{
+	int rc = osmo_routing_area_id_encode_buf(msg->tail, msgb_tailroom(msg), src);
+	if (rc <= 0)
+		return rc;
+	msgb_put(msg, rc);
+	return rc;
+}
+
+/*! Parse TS 04.08 Routing Area Identifier.
+ * Preferably use osmo_routing_area_id_decode() instead: struct osmo_routing_area_id is better integrated with other API
+ * like osmo_plmn_cmp().
  *  \paramout Caller-provided memory for decoded RA ID
  *  \paramin buf Input buffer pointing to RAI IE value */
 void gsm48_parse_ra(struct gprs_ra_id *raid, const uint8_t *buf)
@@ -1664,6 +1767,10 @@
 	case GSM48_PDISC_CC:
 		msgt_names = gsm48_cc_msgtype_names;
 		break;
+	case GSM48_PDISC_GROUP_CC:
+	case GSM48_PDISC_BCAST_CC:
+		msgt_names = osmo_gsm44068_msg_type_names;
+		break;
 	case GSM48_PDISC_NC_SS:
 		msgt_names = gsm48_nc_ss_msgtype_names;
 		break;

libosmocore_1.8.0.tar.xz/src/gsm/gsm48_ie.c -> libosmocore_1.9.0.tar.xz/src/gsm/gsm48_ie.c Changed

libosmocore_1.8.0.tar.xz/src/gsm/gsm48_rest_octets.c -> libosmocore_1.9.0.tar.xz/src/gsm/gsm48_rest_octets.c Changed

@@ -59,6 +59,82 @@
 	return bv.data_len;
 }
 
+struct nch_pos {
+	uint8_t num_blocks;
+	uint8_t first_block;
+};
+
+/* 3GPP TS 44.010 Table 10.5.2.32.1b */
+static const struct nch_pos si1ro_nch_positions = {
+	0x00 = {1,  0},
+	0x01 = {1,  1},
+	0x02 = {1,  2},
+	0x03 = {1,  3},
+	0x04 = {1,  4},
+	0x05 = {1,  5},
+	0x06 = {1,  6},
+
+	0x07 = {2,  0},
+	0x08 = {2,  1},
+	0x09 = {2,  2},
+	0x0a = {2,  3},
+	0x0b = {2,  4},
+	0x0c = {2,  5},
+
+	0x0d = {3,  0},
+	0x0e = {3,  1},
+	0x0f = {3,  2},
+	0x10 = {3,  3},
+	0x11 = {3,  4},
+
+	0x12 = {4,  0},
+	0x13 = {4,  1},
+	0x14 = {4,  2},
+	0x15 = {4,  3},
+
+	0x16 = {5,  0},
+	0x17 = {5,  1},
+	0x18 = {5,  2},
+
+	0x19 = {6,  0},
+	0x1a = {6,  1},
+
+	0x1b = {7,  0},
+};
+
+/*! Decode the 5-bit 'NCH position' field within SI1 Rest Octets.
+ *  \paramin value 5-bit value from SI1 rest octets
+ *  \paramout num_blocks Number of CCCH used for NCH
+ *  \paramout first_block First CCCH block used for NCH
+ *  \returns 0 on success; negative in case of error */
+int osmo_gsm48_si1ro_nch_pos_decode(uint8_t value, uint8_t *num_blocks, uint8_t *first_block)
+{
+	if (value >= ARRAY_SIZE(si1ro_nch_positions))
+		return -EINVAL;
+
+	*num_blocks = si1ro_nch_positionsvalue.num_blocks;
+	*first_block = si1ro_nch_positionsvalue.first_block;
+
+	return 0;
+}
+
+/*! Encode the 5-bit 'NCH position' field within SI1 Rest Octets.
+ *  \paramin num_blocks Number of CCCH used for NCH
+ *  \paramin first_block First CCCH block used for NCH
+ *  \returns 5-bit value for SI1 rest octets on success; negative in case of error */
+int osmo_gsm48_si1ro_nch_pos_encode(uint8_t num_blocks, uint8_t first_block)
+{
+	unsigned int i;
+
+	for (i = 0; i < ARRAY_SIZE(si1ro_nch_positions); i++) {
+		if (si1ro_nch_positionsi.num_blocks == num_blocks &&
+		    si1ro_nch_positionsi.first_block == first_block) {
+			return i;
+		}
+	}
+	return -EINVAL;
+}
+
 /* Append Repeated E-UTRAN Neighbour Cell to bitvec: see 3GPP TS 44.018 Table 10.5.2.33b.1 */
 static inline bool append_eutran_neib_cell(struct bitvec *bv, const struct osmo_earfcn_si2q *e, size_t *e_offset,
 					   uint8_t budget)

libosmocore_1.8.0.tar.xz/src/gsm/gsm_utils.c -> libosmocore_1.9.0.tar.xz/src/gsm/gsm_utils.c Changed

@@ -80,6 +80,7 @@
 #include <osmocom/gsm/gsm_utils.h>
 #include <osmocom/gsm/meas_rep.h>
 #include <osmocom/gsm/protocol/gsm_04_08.h>
+#include <osmocom/gsm/gsm0502.h>
 
 #include <stdlib.h>
 #include <stdint.h>
@@ -885,7 +886,7 @@
 /*! Encode decoded \ref gsm_time to Frame Number
  *  \paramin time GSM Time in decoded structure
  *  \returns GSM Frame Number */
-uint32_t gsm_gsmtime2fn(struct gsm_time *time)
+uint32_t gsm_gsmtime2fn(const struct gsm_time *time)
 {
 	uint32_t fn;
 
@@ -924,6 +925,45 @@
 	return osmo_dump_gsmtime_buf(buf, 64, tm);
 }
 
+#define GSM_RFN_THRESHOLD (GSM_RFN_MODULUS / 2)
+uint32_t gsm_rfn2fn(uint16_t rfn, uint32_t curr_fn)
+{
+	uint32_t curr_rfn;
+	uint32_t fn_rounded;
+	const uint32_t rfn32 = rfn; /* used as 32bit for calculations */
+
+	/* Ensure that all following calculations are performed with the
+	 * relative frame number */
+	OSMO_ASSERT(rfn32 < GSM_RFN_MODULUS);
+
+	/* Compute an internal relative frame number from the full internal
+	   frame number */
+	curr_rfn = gsm_fn2rfn(curr_fn);
+
+	/* Compute a "rounded" version of the internal frame number, which
+	 * exactly fits in the RFN_MODULUS raster */
+	fn_rounded = GSM_TDMA_FN_SUB(curr_fn, curr_rfn);
+
+	/* If the delta between the internal and the external relative frame
+	 * number exceeds a certain limit, we need to assume that the incoming
+	 * request belongs to a the previous rfn period. To correct this,
+	 * we roll back the rounded frame number by one RFN_MODULUS */
+	if (GSM_TDMA_FN_DIFF(rfn32, curr_rfn) > GSM_RFN_THRESHOLD) {
+		/* Race condition between rfn and curr_fn detected:  rfn belongs
+		to the previous RFN_MODULUS cycle, wrapping... */
+		if (fn_rounded < GSM_RFN_MODULUS) {
+			/* Corner case detected: wrapping crosses GSM_MAX_FN border */
+			fn_rounded = GSM_TDMA_FN_SUB(GSM_MAX_FN, (GSM_TDMA_FN_SUB(GSM_RFN_MODULUS, fn_rounded)));
+		} else {
+			fn_rounded = GSM_TDMA_FN_SUB(fn_rounded, GSM_RFN_MODULUS);
+		}
+	}
+
+	/* The real frame number is the sum of the rounded frame number and the
+	 * relative framenumber computed via RACH */
+	return GSM_TDMA_FN_SUM(fn_rounded, rfn32);
+}
+
 /*! append range1024 encoded data to bit vector
  *  \paramout bv Caller-provided output bit-vector
  *  \paramin r Input Range1024 sructure */

libosmocore_1.8.0.tar.xz/src/gsm/ipa.c -> libosmocore_1.9.0.tar.xz/src/gsm/ipa.c Changed

libosmocore_1.8.0.tar.xz/src/gsm/iuup.c -> libosmocore_1.9.0.tar.xz/src/gsm/iuup.c Changed

libosmocore_1.8.0.tar.xz/src/gsm/lapdm.c -> libosmocore_1.9.0.tar.xz/src/gsm/lapdm.c Changed

@@ -57,6 +57,7 @@
 #define LAPDm_ADDR_SAPI(addr) (((addr) >> 2) & 0x7)
 #define LAPDm_ADDR_CR(addr) (((addr) >> 1) & 0x1)
 #define LAPDm_ADDR_EA(addr) ((addr) & 0x1)
+#define LAPDm_ADDR_SHORT_L2(addr) ((addr) & 0x3)
 
 /* TS 04.06 Table 3 / Section 3.4.3 */
 #define LAPDm_CTRL_I(nr, ns, p)	((((nr) & 0x7) << 5) | (((p) & 0x1) << 4) | (((ns) & 0x7) << 1))
@@ -253,7 +254,7 @@
  *  \paramin t200_ms_dcch per-SAPI array of T200 in milli-seconds for DCCH
  *  \paramin t200_ms_acch per-SAPI array of T200 in milli-seconds for SACCH
  *  \paramin chan_t GSM channel type (to correctly set N200)
- *  \parmain name_pfx human-readable name (copied by function + extended with ACCH/DCCH)
+ *  \paramin name_pfx human-readable name (copied by function + extended with ACCH/DCCH)
  */
 int lapdm_channel_init3(struct lapdm_channel *lc, enum lapdm_mode mode,
 			const int *t200_ms_dcch, const int *t200_ms_acch, enum gsm_chan_t chan_t,
@@ -361,7 +362,7 @@
 		*msgb_push(msg, 1) = link_id;
 		*msgb_push(msg, 1) = chan_nr;
 		msgb_enqueue(&dl->dl.tx_queue, msg);
-		return -EBUSY;
+		return 0;
 	}
 
 	osmo_prim_init(&pp.oph, SAP_GSM_PH, PRIM_PH_DATA,
@@ -699,7 +700,7 @@
 
 /* input into layer2 (from layer 1) */
 static int l2_ph_data_ind(struct msgb *msg, struct lapdm_entity *le,
-	uint8_t chan_nr, uint8_t link_id)
+	uint8_t chan_nr, uint8_t link_id, uint32_t fn)
 {
 	uint8_t cbits = chan_nr >> 3;
 	uint8_t sapi; /* we cannot take SAPI from link_id, as L1 has no clue */
@@ -714,6 +715,7 @@
 	memset(&mctx, 0, sizeof(mctx));
 	mctx.chan_nr = chan_nr;
 	mctx.link_id = link_id;
+	mctx.fn = fn;
 
 	/* check for L1 chan_nr/link_id and determine LAPDm hdr format */
 	if (cbits == 0x10 || cbits == 0x12) {
@@ -725,15 +727,24 @@
 		if (mctx.link_id & 0x40) {
 			/* It was received from network on SACCH */
 
-			/* If UI on SACCH sent by BTS, lapdm_fmt must be B4 */
-			if (le->mode == LAPDM_MODE_MS
-			 && LAPDm_CTRL_is_U(msg->l2h3)
-			 && LAPDm_CTRL_U_BITS(msg->l2h3) == 0) {
+			/* A Short L3 header has both bits == 0. */
+			if (LAPDm_ADDR_SHORT_L2(msg->l2h2) == 0) {
+				mctx.lapdm_fmt = LAPDm_FMT_Bter;
+				n201 = N201_Bter_SACCH;
+				sapi = 0;
+			} else if (le->mode == LAPDM_MODE_MS
+				&& LAPDm_CTRL_is_U(msg->l2h3)
+				&& LAPDm_CTRL_U_BITS(msg->l2h3) == 0) {
+				/* If UI on SACCH sent by BTS, lapdm_fmt must be B4 */
 				mctx.lapdm_fmt = LAPDm_FMT_B4;
 				n201 = N201_B4;
+				/* sapi is found after two-btyte L1 header */
+				sapi = (msg->l2h2 >> 2) & 7;
 			} else {
 				mctx.lapdm_fmt = LAPDm_FMT_B;
 				n201 = N201_AB_SACCH;
+				/* sapi is found after two-btyte L1 header */
+				sapi = (msg->l2h2 >> 2) & 7;
 			}
 			/* SACCH frames have a two-byte L1 header that
 			 * OsmocomBB L1 doesn't strip */
@@ -741,11 +752,17 @@
 			mctx.ta_ind = msg->l2h1;
 			msgb_pull(msg, 2);
 			msg->l2h += 2;
-			sapi = (msg->l2h0 >> 2) & 7;
 		} else {
-			mctx.lapdm_fmt = LAPDm_FMT_B;
-			n201 = N201_AB_SDCCH;
-			sapi = (msg->l2h0 >> 2) & 7;
+			/* A Short L3 header has both bits == 0. */
+			if (LAPDm_ADDR_SHORT_L2(msg->l2h0) == 0) {
+				mctx.lapdm_fmt = LAPDm_FMT_Bter;
+				n201 = N201_Bter_SDCCH;
+				sapi = 0;
+			} else {
+				mctx.lapdm_fmt = LAPDm_FMT_B;
+				n201 = N201_AB_SDCCH;
+				sapi = (msg->l2h0 >> 2) & 7;
+			}
 		}
 	}
 
@@ -838,10 +855,10 @@
 		rc = lapd_ph_data_ind(msg, &lctx);
 		break;
 	case LAPDm_FMT_Bter:
-		/* FIXME */
-		msgb_free(msg);
-		break;
+		/* fall-through */
 	case LAPDm_FMT_Bbis:
+		/* Update context so that users can read fields like fn: */
+		memcpy(&mctx.dl->mctx, &mctx, sizeof(mctx.dl->mctx));
 		/* directly pass up to layer3 */
 		msg->l3h = msg->l2h;
 		msgb_pull_to_l3(msg);
@@ -895,56 +912,33 @@
 	if (oph->sap != SAP_GSM_PH) {
 		LOGP(DLLAPD, LOGL_ERROR, "primitive for unknown SAP %u\n",
 			oph->sap);
-		rc = -ENODEV;
-		goto free;
+		msgb_free(oph->msg);
+		return -ENODEV;
 	}
 
-	switch (oph->primitive) {
-	case PRIM_PH_DATA:
-		if (oph->operation != PRIM_OP_INDICATION) {
-			LOGP(DLLAPD, LOGL_ERROR, "PH_DATA is not INDICATION %u\n",
-				oph->operation);
-			rc = -ENODEV;
-			goto free;
-		}
+	switch (OSMO_PRIM_HDR(oph)) {
+	case OSMO_PRIM(PRIM_PH_DATA, PRIM_OP_INDICATION):
 		rc = l2_ph_data_ind(oph->msg, le, pp->u.data.chan_nr,
-				    pp->u.data.link_id);
+				    pp->u.data.link_id, pp->u.data.fn);
 		break;
-	case PRIM_PH_RTS:
-		if (oph->operation != PRIM_OP_INDICATION) {
-			LOGP(DLLAPD, LOGL_ERROR, "PH_RTS is not INDICATION %u\n",
-				oph->operation);
-			rc = -ENODEV;
-			goto free;
-		}
+	case OSMO_PRIM(PRIM_PH_RTS, PRIM_OP_INDICATION):
 		rc = l2_ph_data_conf(oph->msg, le);
 		break;
-	case PRIM_PH_RACH:
-		switch (oph->operation) {
-		case PRIM_OP_INDICATION:
-			rc = l2_ph_rach_ind(le, pp->u.rach_ind.ra, pp->u.rach_ind.fn,
-					    pp->u.rach_ind.acc_delay);
-			break;
-		case PRIM_OP_CONFIRM:
-			rc = l2_ph_chan_conf(oph->msg, le, pp->u.rach_ind.fn);
-			break;
-		default:
-			rc = -EIO;
-			goto free;
-		}
+	case OSMO_PRIM(PRIM_PH_RACH, PRIM_OP_INDICATION):
+		rc = l2_ph_rach_ind(le, pp->u.rach_ind.ra, pp->u.rach_ind.fn,
+				    pp->u.rach_ind.acc_delay);
+		break;
+	case OSMO_PRIM(PRIM_PH_RACH, PRIM_OP_CONFIRM):
+		rc = l2_ph_chan_conf(oph->msg, le, pp->u.rach_ind.fn);
 		break;
 	default:
 		LOGP(DLLAPD, LOGL_ERROR, "Unknown primitive %u\n",
 			oph->primitive);
-		rc = -EINVAL;
-		goto free;
+		msgb_free(oph->msg);
+		return -EINVAL;
 	}
 
 	return rc;
-
-free:
-	msgb_free(oph->msg);
-	return rc;
 }
 
 
@@ -1030,6 +1024,7 @@
 	uint8_t sapi = link_id & 7;
 	struct tlv_parsed tv;
 	int length, ui_bts;
+	bool use_b_ter;
 
 	if (!le) {
 		LOGDL(&dl->dl, LOGL_ERROR, "lapdm_datalink without entity error\n");
@@ -1055,8 +1050,10 @@
 	}
 	msg->l3h = (uint8_t *) TLVP_VAL(&tv, RSL_IE_L3_INFO);
 	length = TLVP_LEN(&tv, RSL_IE_L3_INFO);
+	/* check for Bter frame */
+	use_b_ter = (length == ((link_id & 0x40) ? 21 : 23) && sapi == 0);
 	/* check if the layer3 message length exceeds N201 */
-	if (length + ((link_id & 0x40) ? 4 : 2) + !ui_bts > 23) {
+	if (length + ((link_id & 0x40) ? 4 : 2) + !ui_bts > 23 && !use_b_ter) {
 		LOGDL(&dl->dl, LOGL_ERROR, "frame too large: %d > N201(%d) "
 			"(discarding)\n", length,
 			((link_id & 0x40) ? 18 : 20) + ui_bts);
@@ -1071,11 +1068,14 @@
 	msgb_trim(msg, length);
 
 	/* Push L1 + LAPDm header on msgb */
-	msg->l2h = msgb_push(msg, 2 + !ui_bts);
-	msg->l2h0 = LAPDm_ADDR(LAPDm_LPD_NORMAL, sapi, dl->dl.cr.loc2rem.cmd);
-	msg->l2h1 = LAPDm_CTRL_U(LAPDm_U_UI, 0);
-	if (!ui_bts)
-		msg->l2h2 = LAPDm_LEN(length);
+	if (!use_b_ter) {
+		msg->l2h = msgb_push(msg, 2 + !ui_bts);
+		msg->l2h0 = LAPDm_ADDR(LAPDm_LPD_NORMAL, sapi, dl->dl.cr.loc2rem.cmd);
+		msg->l2h1 = LAPDm_CTRL_U(LAPDm_U_UI, 0);
+		if (!ui_bts)
+			msg->l2h2 = LAPDm_LEN(length);
+	} else
+		msg->l2h = msg->data;
 	if (link_id & 0x40) {
 		msg->l2h = msgb_push(msg, 2);
 		msg->l2h0 = le->tx_power;

libosmocore_1.8.0.tar.xz/src/gsm/libosmogsm.map -> libosmocore_1.9.0.tar.xz/src/gsm/libosmogsm.map Changed

@@ -40,6 +40,14 @@
 abis_nm_get_sw_conf;
 abis_nm_get_sw_desc_len;
 
+abis_nm_ipacc_freq_band_desc;
+abis_nm_ipacc_ciph_algo_desc;
+abis_nm_ipacc_chant_desc;
+abis_nm_ipacc_chanm_desc;
+abis_nm_ipacc_gprs_coding_desc;
+abis_nm_ipacc_rtp_feat_desc;
+abis_nm_ipacc_rsl_feat_desc;
+
 osmo_sitype_strs;
 osmo_c4;
 osmo_get_rand_id;
@@ -111,6 +119,7 @@
 gsm0502_calc_paging_group;
 gsm0502_fn_remap;
 gsm0502_hop_seq_gen;
+gsm0502_fn2ccch_block;
 
 gsm0503_xcch;
 gsm0503_rach;
@@ -121,6 +130,11 @@
 gsm0503_cs2_np;
 gsm0503_cs3_np;
 gsm0503_tch_fr;
+gsm0503_tch_f24;
+gsm0503_tch_h24;
+gsm0503_tch_f48;
+gsm0503_tch_f96;
+gsm0503_tch_f144;
 gsm0503_tch_hr;
 gsm0503_tch_afs_12_2;
 gsm0503_tch_afs_10_2;
@@ -205,6 +219,25 @@
 gsm0808_create_handover_complete;
 gsm0808_create_handover_failure;
 gsm0808_create_handover_performed;
+gsm0808_create_vgcs_vbs_setup;
+gsm0808_create_vgcs_vbs_setup_ack;
+gsm0808_create_vgcs_vbs_setup_refuse;
+gsm0808_create_vgcs_vbs_assign_req;
+gsm0808_create_vgcs_vbs_assign_res;
+gsm0808_create_vgcs_vbs_assign_fail;
+gsm0808_create_uplink_request;
+gsm0808_create_uplink_request_ack;
+gsm0808_create_uplink_request_cnf;
+gsm0808_create_uplink_app_data;
+gsm0808_create_uplink_release_ind;
+gsm0808_create_uplink_reject_cmd;
+gsm0808_create_uplink_release_cmd;
+gsm0808_create_uplink_seized_cmd;
+gsm0808_create_vgcs_additional_info;
+gsm0808_create_vgcs_vbs_area_cell_info;
+gsm0808_create_vgcs_vbs_assign_stat;
+gsm0808_create_vgcs_sms;
+gsm0808_create_notification_data;
 gsm0808_create_common_id;
 gsm0808_prepend_dtap_header;
 gsm0808_enc_cause;
@@ -227,6 +260,23 @@
 gsm0808_enc_cell_id_list2;
 gsm0808_dec_cell_id_list;
 gsm0808_dec_cell_id_list2;
+gsm0808_enc_group_callref;
+gsm0808_dec_group_callref;
+gsm0808_enc_priority;
+gsm0808_dec_priority;
+gsm0808_enc_vgcs_feature_flags;
+gsm0808_dec_vgcs_feature_flags;
+gsm0808_enc_data_identity;
+gsm0808_dec_data_identity;
+gsm0808_enc_msisdn;
+gsm0808_dec_msisdn;
+gsm0808_enc_talker_identity;
+gsm0808_dec_talker_identity;
+gsm0808_enc_assign_req;
+gsm0808_dec_assign_req;
+gsm0808_enc_cell_id_list_segment;
+gsm0808_dec_cell_id_list_segment;
+gsm0808_dec_call_id;
 gsm0808_cell_id_list_add;
 gsm0808_cell_id_to_list;
 gsm0808_cell_id_to_cgi;
@@ -248,6 +298,8 @@
 gsm0808_speech_codec_from_chan_type;
 gsm0808_sc_cfg_from_gsm48_mr_cfg;
 gsm48_mr_cfg_from_gsm0808_sc_cfg;
+gsm0808_amr_modes_from_cfg;
+gsm0808_amr_mode_names;
 gsm0808_speech_codec_type_names;
 gsm0808_permitted_speech_names;
 gsm0808_chosen_enc_alg_names;
@@ -330,6 +382,8 @@
 osmo_gsm48_rest_octets_si13_encode;
 osmo_gsm48_rest_octets_si3_decode;
 osmo_gsm48_rest_octets_si4_decode;
+osmo_gsm48_si1ro_nch_pos_encode;
+osmo_gsm48_si1ro_nch_pos_decode;
 gsm48_rr_short_pd_msg_name;
 gsm48_rr_msg_name;
 gsm48_cc_state_name;
@@ -385,10 +439,14 @@
 osmo_mobile_identity_to_str_c;
 osmo_mobile_identity_cmp;
 osmo_mobile_identity_decode;
+osmo_mobile_identity_decode_from_l3_buf;
 osmo_mobile_identity_decode_from_l3;
 osmo_mobile_identity_encoded_len;
 osmo_mobile_identity_encode_buf;
 osmo_mobile_identity_encode_msgb;
+osmo_routing_area_id_decode;
+osmo_routing_area_id_encode_buf;
+osmo_routing_area_id_encode_msgb;
 gsm48_mm_att_tlvdef;
 gsm48_number_of_paging_subchannels;
 gsm48_parse_ra;
@@ -462,6 +520,13 @@
 gsm48_pdisc_msgtype_name_c;
 gsm48_reject_value_names;
 
+osmo_gsm44068_msg_type_names;
+osmo_gsm44068_priority_level_names;
+osmo_gsm44068_cause_names;
+osmo_gsm44068_call_state_names;
+osmo_gsm44068_talker_priority_names;
+osmo_gsm44068_att_tlvdef;
+
 gsm_7bit_decode;
 gsm_7bit_decode_ussd;
 gsm_7bit_encode;
@@ -487,6 +552,7 @@
 osmo_dump_gsmtime;
 osmo_dump_gsmtime_buf;
 osmo_dump_gsmtime_c;
+gsm_rfn2fn;
 
 gsm_milenage;
 gsm_septet_encode;
@@ -545,11 +611,14 @@
 osmo_auth_alg_name;
 osmo_auth_alg_parse;
 osmo_auth_gen_vec;
+osmo_auth_gen_vec2;
 osmo_auth_gen_vec_auts;
+osmo_auth_gen_vec_auts2;
 osmo_auth_3g_from_2g;
 osmo_auth_load;
 osmo_auth_register;
 osmo_auth_supported;
+osmo_auth_c2;
 osmo_auth_c3;
 osmo_sub_auth_type_names;
 
@@ -785,5 +854,11 @@
 osmo_iuup_rnl_prim_alloc;
 osmo_iuup_tnl_prim_alloc;
 
+osmo_csd_12k_6k_decode_frame;
+osmo_csd_12k_6k_encode_frame;
+osmo_csd_3k6_decode_frame;
+osmo_csd_3k6_encode_frame;
+osmo_csd_ubit_dump;
+
 local: *;
 };

libosmocore_1.8.0.tar.xz/src/gsm/milenage/milenage.c -> libosmocore_1.9.0.tar.xz/src/gsm/milenage/milenage.c Changed

libosmocore_1.8.0.tar.xz/src/gsm/rsl.c -> libosmocore_1.9.0.tar.xz/src/gsm/rsl.c Changed

libosmocore_1.8.0.tar.xz/src/gsm/tlv_parser.c -> libosmocore_1.9.0.tar.xz/src/gsm/tlv_parser.c Changed

@@ -126,7 +126,7 @@
  *  \paraminout msg Caller-allocated message buffer with sufficient tailroom
  *  \paramin type TLV type/format to use during encode
  *  \paramin tag Tag of TLV to be encoded
- *  \parmain len Length of TLV to be encoded
+ *  \paramin len Length of TLV to be encoded
  *  \paramin val Value part of TLV to be encoded
  *  \returns 0 on success; negative in case of error */
 int tlv_encode_one(struct msgb *msg, enum tlv_type type, uint8_t tag,
@@ -225,7 +225,11 @@
  *  \paramin def structure defining the valid TLV tags / configurations
  *  \paramin buf the input data buffer to be parsed
  *  \paramin buf_len length of the input data buffer
- *  \returns number of bytes consumed by the TLV entry / IE parsed; negative in case of error
+ *  \returns number of bytes consumed by the TLV entry / IE parsed; negative in case of error.
+ *
+ * In IEs of type TLV_TYPE_SINGLE_TV, the data pointer \ref o_val will point to the
+ * byte shared by both the Tag and te Value, hence the tag is to be trimmed
+ * by the caller.
  */
 int tlv_parse_one(uint8_t *o_tag, uint16_t *o_len, const uint8_t **o_val,
 		  const struct tlv_definition *def,
@@ -241,7 +245,13 @@
 	*o_tag = tag;
 
 	/* single octet TV IE */
-	if (def->deftag & 0xf0.type == TLV_TYPE_SINGLE_TV) {
+	if (def->deftag >> 4.type == TLV_TYPE_SINGLE_TV) {
+		*o_tag = tag >> 4;
+		*o_val = buf;
+		*o_len = 1;
+		return 1;
+	} else if ((tag > 0x0f) && (def->deftag & 0xf0.type == TLV_TYPE_SINGLE_TV)) {
+	    /* backward compat for old IEs with half-octet tag defined as 0xN0: */
 		*o_tag = tag & 0xf0;
 		*o_val = buf;
 		*o_len = 1;

libosmocore_1.9.0.tar.xz/src/gsm/tuak Added

libosmocore_1.9.0.tar.xz/src/gsm/tuak/KeccakP-1600-3gpp.c Added

@@ -0,0 +1,176 @@
+/* -----------------------------------------------------------------------
+ * code extracted from 3GPP TS 35.231, annex E for Keccak core functions
+ * https://portal.3gpp.org/desktopmodules/Specifications/SpecificationDetails.aspx?specificationId=2402
+ *-----------------------------------------------------------------------*/
+
+/* This code may be freely used or adapted.
+*/
+
+#include "KeccakP-1600-3gpp.h"
+
+
+const uint8_t Rho25		= {0,1,62,28,27,36,44,6,55,20,3,10,43,25,39,41,45,
+   15,21,8,18,2,61,56,14};
+
+const uint8_t Pi25		= {0,6,12,18,24,3,9,10,16,22,1,7,13,19,20,4,5,11,17,
+   23,2,8,14,15,21};
+
+const uint8_t Iota24	= {1,146,218,112,155,33,241,89,138,136,57,42,187,203,
+   217,83,82,192,26,106,241,208,33,120};
+
+#define ROTATE64(value, n)	\
+((((uint64_t)(value))<<(n)) | (((uint64_t)(value))>>(64-(n))))
+
+/* ---------------------------------------------------------------------
+   64-bit version of Keccak_f(1600)
+   ---------------------------------------------------------------------
+*/
+void Keccak_f_64(uint64_t s25)
+{	uint64_t t5;
+	uint8_t i, j, round;
+
+	for(round=0; round<24; ++round)
+	{	/* Theta function */
+		for(i=0; i<5; ++i)
+			ti = si ^ s5+i ^ s10+i ^ s15+i ^ s20+i;
+		for(i=0; i<5; ++i, s+=5)
+		{	s0 ^= t4 ^ ROTATE64(t1, 1);
+			s1 ^= t0 ^ ROTATE64(t2, 1);
+			s2 ^= t1 ^ ROTATE64(t3, 1);
+			s3 ^= t2 ^ ROTATE64(t4, 1);
+			s4 ^= t3 ^ ROTATE64(t0, 1);
+		}
+		s -= 25;
+
+		/* Rho function */
+		for(i=1; i<25; ++i)
+			si = ROTATE64(si, Rhoi);
+
+		/* Pi function */
+		for(t1 = si=1; (j=Pii) > 1; si=sj, i=j);
+		si = t1;
+
+		/* Chi function */
+		for(i=0; i<5; ++i, s += 5)
+		{	t0 = (~s1) & s2;
+			t1 = (~s2) & s3;
+			t2 = (~s3) & s4;
+			t3 = (~s4) & s0;
+			t4 = (~s0) & s1;
+			for(j=0; j<5; ++j) sj ^= tj;
+		}
+		s -= 25;
+
+		/* Iota function */
+		t0 = Iotaround;
+		*s ^= (t0 | (t0<<11) | (t0<<26) | (t0<<57)) 
+              & 0x800000008000808BULL; /* set & mask bits 0,1,3,7,15,31,63 */
+	}
+}
+
+
+/* ---------------------------------------------------------------------
+   8-bit version of Keccak_f(1600)
+   ---------------------------------------------------------------------
+*/
+void Keccak_f_8(uint8_t s200)
+{	uint8_t t40, i, j, k, round;
+
+	for(round=0; round<24; ++round)
+	{	/* Theta function */
+		for(i=0; i<40; ++i)
+			ti=si^s40+i^s80+i^s120+i^s160+i;
+		for(i=0; i<200; i+=8)
+			for(j = (i+32)%40, k=0; k<8; ++k)
+				si+k ^= tj+k;
+		for(i=0; i<40; ti = (ti<<1)|j, i+=8)
+			for(j = ti+7>>7, k=7; k; --k)
+				ti+k = (ti+k<<1)|(ti+k-1>>7);
+		for(i=0; i<200; i+=8)
+			for(j = (i+8)%40, k=0; k<8; ++k)
+				si+k ^= tj+k;
+
+		/* Rho function */
+		for(i=8; i<200; i+=8)
+		{	for(j = Rhoi>>3>>3, k=0; k<8; ++k) 	/* j:=bytes to shift, s->t 		*/
+				t(k+j)&7 = si+k;
+			for(j = Rhoi>>3&7, k=7; k; --k) 	   /* j:=bits  to shift, t->s 	*/
+				si+k = (tk<<j) | (tk-1>>(8-j));
+			si = (t0<<j) | (t7>>(8-j));
+		}
+
+		/* Pi function */
+		for(k=8; k<16; ++k) tk = sk;		/* =memcpy(t+8, s+8, 8) 				 	*/
+		for(i=1; (j=Pii)>1; i=j)
+			for(k=0; k<8; ++k)						/* =memcpy(s+(i<<3), s+(j<<3), 8)	*/
+				s(i<<3)|k = s(j<<3)|k;
+		for(k=0; k<8; ++k)							/* =memcpy(s+(i<<3), t+8, 8) 		 	*/
+			s(i<<3)|k = tk+8;
+
+		/* Chi function */
+		for(i=0; i<200; i+=40)
+		{	for(j=0; j<40; ++j)
+				tj=(~si+(j+8)%40) & si+(j+16)%40;
+			for(j=0; j<40; ++j)	si+j^=tj;
+		}
+
+		/* Iota function */
+		k = Iotaround;
+		s0 ^= k & 0x8B;			/* bits 0, 1, 3, 7 */
+		s1 ^= (k<<3)&0x80;		/* bit 15 */
+		s3 ^= (k<<2)&0x80;		/* bit 31 */
+		s7 ^= (k<<1)&0x80;		/* bit 63 */
+
+	}
+}
+
+/* ---------------------------------------------------------------------
+   32-bit version of Keccak_f(1600)
+   ---------------------------------------------------------------------
+*/
+void Keccak_f_32(uint32_t s50)
+{	uint32_t t10;
+	uint8_t i, j, round, k;
+
+	for(round=0; round<24; ++round)
+	{	/* Theta function */
+		for(i=0; i<10; ++i)
+			ti = si ^ s10+i ^ s20+i ^ s30+i ^ s40+i;
+		for(i=0; i<5; ++i)
+			for(j=8, k=2; ; j%=10, k=(k+2)%10)
+			{	*s++ ^= tj++ ^ ((tk<<1)|(tk+1>>31));
+				*s++ ^= tj++ ^ ((tk+1<<1)|(tk>>31));
+				if(j==8) break;
+			}
+		s -= 50;
+
+		/* Rho function */
+		for(i=2; i<50; i+=2)
+		{	k = Rhoi>>1 & 0x1f;
+			t0 = (si+1 << k) | (si >> (32-k));
+			t1 = (si << k) | (si+1 >> (32-k));
+			k = Rhoi>>1 >> 5;
+			si = t1-k, si+1 = tk;
+		}
+
+		/* Pi function */
+		for(i=2, t0=s2, t1=s3; (j=(Pii>>1<<1))>2; i=j)
+			si=sj, si+1=sj+1;
+		si=t0, si+1=t1;
+
+		/* Chi function */
+		for(i=0; i<5; ++i, s+=10)
+		{	for(j=0; j<10; ++j)
+				tj = (~s(j+2)%10) & s(j+4)%10;
+			for(j=0; j<10; ++j)
+				sj ^= tj;
+		}
+		s -= 50;
+
+		/* Iota function */
+		t0 = Iotaround;
+		s0 ^= (t0 | (t0<<11) | (t0<<26)) & 0x8000808B;
+		s1 ^= (t0<<25) & 0x80000000;
+	}
+}
+

libosmocore_1.9.0.tar.xz/src/gsm/tuak/KeccakP-1600-3gpp.h Added

libosmocore_1.9.0.tar.xz/src/gsm/tuak/tuak.c Added

@@ -0,0 +1,372 @@
+/* (C) 2023 by Harald Welte <laforge@osmocom.org>
+ *
+ * All Rights Reserved
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <stdint.h>
+#include <string.h>
+#include <string.h>
+#include <errno.h>
+
+#include <osmocom/core/utils.h>
+
+#include "KeccakP-1600-3gpp.h"
+
+/* TUAK authentication algorithm
+ * as proposed by 3GPP as an alternative to Milenage
+ * algorithm based on SHA-3 (more exactly its KeccakP-1600 permutation)
+ * see 3GPP TS 35.231, 232 and 233 */
+
+static unsigned int g_keccak_iterations = 1;
+static const char algoname = "TUAK1.0";
+const uint8_t zero1616 = { 0, };
+
+void tuak_set_keccak_iterations(unsigned int i)
+{
+	g_keccak_iterations = i;
+}
+
+/* append data from 'input' to 'buf' at 'idx', reversing byte order */
+#define PUSH_DATA(buf, idx, input, nbytes)	\
+	for (int i = nbytes-1; i >= 0; i--) {	\
+		bufidx++ = inputi;		\
+	}
+
+/* like memcpy(), but reversing they order of bytes */
+void memcpy_reverse(uint8_t *dst, const uint8_t *src, size_t len)
+{
+	for (size_t i = 0; i < len; i++)
+		dsti = srclen-i-1;
+}
+
+static void tuak_core(uint8_t buf200, const uint8_t *opc, uint8_t instance, const uint8_t *_rand,
+		      const uint8_t *amf, const uint8_t *sqn, const uint8_t *k, uint8_t k_len_bytes,
+		      unsigned int keccac_iterations)
+{
+	unsigned int idx = 0;
+
+	PUSH_DATA(buf, idx, opc, 32);
+	bufidx++ = instance;
+	PUSH_DATA(buf, idx, algoname, strlen(algoname)); /* without trailing NUL */
+	PUSH_DATA(buf, idx, _rand, 16);
+	PUSH_DATA(buf, idx, amf, 2);
+	PUSH_DATA(buf, idx, sqn, 6);
+	PUSH_DATA(buf, idx, k, k_len_bytes);
+	memset(buf+idx, 0, 32-k_len_bytes); idx += 32-k_len_bytes;
+	bufidx++ = 0x1f;
+	memset(buf+idx, 0, 38); idx += 38;
+	bufidx++ = 0x80;
+	memset(buf+idx, 0, 64); idx += 64;
+	OSMO_ASSERT(idx == 200);
+
+	for (unsigned int i = 0; i < keccac_iterations; i++)
+		Keccak_f_64((uint64_t *) buf);
+}
+
+/**
+ * tuak_f1 - TUAK f1 algorithm
+ * @opc: OPc = 256-bit value derived from OP and K
+ * @k: K = 128-bit or 256-bit subscriber key
+ * @_rand: RAND = 128-bit random challenge
+ * @sqn: SQN = 48-bit sequence number
+ * @amf: AMF = 16-bit authentication management field
+ * @mac_a: Buffer for MAC-A = 64/128/256-bit network authentication code
+ * Returns: 0 on success, -1 on failure
+ */
+int tuak_f1(const uint8_t *opc, const uint8_t *k, uint8_t k_len_bytes, const uint8_t *_rand,
+	    const uint8_t *sqn, const uint8_t *amf, uint8_t *mac_a, uint8_t mac_a_len_bytes,
+	    unsigned int keccac_iterations)
+{
+	uint8_t buf200;
+	uint8_t instance = 0x00;
+
+	switch (mac_a_len_bytes) {
+	case 8:
+		instance |= 0x08;
+		break;
+	case 16:
+		instance |= 0x10;
+		break;
+	case 32:
+		instance |= 0x20;
+		break;
+	default:
+		return -EINVAL;
+	}
+
+	switch (k_len_bytes) {
+	case 16:
+		break;
+	case 32:
+		instance |= 0x01;
+		break;
+	default:
+		return -EINVAL;
+	}
+
+	tuak_core(buf, opc, instance, _rand, amf, sqn, k, k_len_bytes, keccac_iterations);
+
+	memcpy_reverse(mac_a, buf, mac_a_len_bytes);
+
+	return 0;
+}
+
+/**
+ * tuak_f1star - TUAK f1* algorithm
+ * @opc: OPc = 256-bit value derived from OP and K
+ * @k: K = 128-bit or 256-bit subscriber key
+ * @_rand: RAND = 128-bit random challenge
+ * @sqn: SQN = 48-bit sequence number
+ * @amf: AMF = 16-bit authentication management field
+ * @mac_s: Buffer for MAC-S = 64/128/256-bit resync authentication code
+ * Returns: 0 on success, -1 on failure
+ */
+int tuak_f1star(const uint8_t *opc, const uint8_t *k, uint8_t k_len_bytes, const uint8_t *_rand,
+		const uint8_t *sqn, const uint8_t *amf, uint8_t *mac_s, uint8_t mac_s_len_bytes,
+		unsigned int keccac_iterations)
+{
+	uint8_t buf200;
+	uint8_t instance = 0x80;
+
+	switch (mac_s_len_bytes) {
+	case 8:
+		instance |= 0x08;
+		break;
+	case 16:
+		instance |= 0x10;
+		break;
+	case 32:
+		instance |= 0x20;
+		break;
+	default:
+		return -EINVAL;
+	}
+
+	switch (k_len_bytes) {
+	case 16:
+		break;
+	case 32:
+		instance |= 0x01;
+		break;
+	default:
+		return -EINVAL;
+	}
+
+	tuak_core(buf, opc, instance, _rand, amf, sqn, k, k_len_bytes, keccac_iterations);
+
+	memcpy_reverse(mac_s, buf, mac_s_len_bytes);
+
+	return 0;
+}
+
+/**
+ * tuak_f2345 - TUAK f2, f3, f4, f5, algorithms
+ * @opc: OPc = 256-bit value derived from OP and K
+ * @k: K = 128/256-bit subscriber key
+ * @_rand: RAND = 128-bit random challenge
+ * @res: Buffer for RES = 32/64/128/256-bit signed response (f2), or %NULL
+ * @ck: Buffer for CK = 128/256-bit confidentiality key (f3), or %NULL
+ * @ik: Buffer for IK = 128/256-bit integrity key (f4), or %NULL
+ * @ak: Buffer for AK = 48-bit anonymity key (f5), or %NULL
+ * Returns: 0 on success, -1 on failure
+ */
+int tuak_f2345(const uint8_t *opc, const uint8_t *k, uint8_t k_len_bytes,
+	       const uint8_t *_rand, uint8_t *res, uint8_t res_len_bytes,
+	       uint8_t *ck, uint8_t ck_len_bytes,
+	       uint8_t *ik, uint8_t ik_len_bytes, uint8_t *ak, unsigned int keccac_iterations)
+{
+	uint8_t buf200;
+	uint8_t instance = 0x40;
+
+	switch (res_len_bytes) {
+	case 4:
+		break;
+	case 8:
+		instance |= 0x08;
+		break;
+	case 16:
+		instance |= 0x10;
+		break;
+	case 32:
+		instance |= 0x20;
+		break;
+	default:
+		return -EINVAL;
+	}
+
+	switch (ck_len_bytes) {
+	case 16:
+		break;
+	case 32:
+		instance |= 0x04;
+		break;
+	default:
+		return -EINVAL;
+	}
+
+	switch (ik_len_bytes) {
+	case 16:
+		break;
+	case 32:
+		instance |= 0x02;
+		break;
+	default:
+		return -EINVAL;
+	}
+
+	switch (k_len_bytes) {
+	case 16:
+		break;
+	case 32:
+		instance |= 0x01;
+		break;
+	default:
+		return -EINVAL;
+	}
+
+	tuak_core(buf, opc, instance, _rand, zero16, zero16, k, k_len_bytes, keccac_iterations);
+
+	if (res)
+		memcpy_reverse(res, buf, res_len_bytes);
+
+	if (ck)
+		memcpy_reverse(ck, buf + 32, ck_len_bytes);
+
+	if (ik)
+		memcpy_reverse(ik, buf + 64, ik_len_bytes);
+
+	if (ak)
+		memcpy_reverse(ak, buf + 96, 6);
+
+	return 0;
+}
+
+/**
+ * tuak_f5star - TUAK f5* algorithm
+ * @opc: OPc = 256-bit value derived from OP and K
+ * @k: K = 128/256-bit subscriber key
+ * @_rand: RAND = 128-bit random challenge
+ * @ak: Buffer for AK = 48-bit anonymity key (f5)
+ * Returns: 0 on success, -1 on failure
+ */
+int tuak_f5star(const uint8_t *opc, const uint8_t *k, uint8_t k_len_bytes,
+		const uint8_t *_rand, uint8_t *ak, unsigned int keccac_iterations)
+{
+	uint8_t buf200;
+	uint8_t instance = 0xc0;
+
+	switch (k_len_bytes) {
+	case 16:
+		break;
+	case 32:
+		instance += 1;
+		break;
+	default:
+		return -EINVAL;
+	}
+
+	tuak_core(buf, opc, instance, _rand, zero16, zero16, k, k_len_bytes, keccac_iterations);
+
+	memcpy_reverse(ak, buf + 96, 6);
+
+	return 0;
+}
+
+/**
+ * tuak_generate - Generate AKA AUTN,IK,CK,RES
+ * @opc: OPc = 256-bit operator variant algorithm configuration field (encr.)
+ * @amf: AMF = 16-bit authentication management field
+ * @k: K = 128/256-bit subscriber key
+ * @sqn: SQN = 48-bit sequence number
+ * @_rand: RAND = 128-bit random challenge
+ * @autn: Buffer for AUTN = 128-bit authentication token
+ * @ik: Buffer for IK = 128/256-bit integrity key (f4), or %NULL
+ * @ck: Buffer for CK = 128/256-bit confidentiality key (f3), or %NULL
+ * @res: Buffer for RES = 32/64/128-bit signed response (f2), or %NULL
+ * @res_len: Max length for res; set to used length or 0 on failure
+ */
+void tuak_generate(const uint8_t *opc, const uint8_t *amf, const uint8_t *k, uint8_t k_len_bytes,
+		   const uint8_t *sqn, const uint8_t *_rand, uint8_t *autn, uint8_t *ik,
+		   uint8_t *ck, uint8_t *res, size_t *res_len)
+{
+	int i;
+	uint8_t mac_a8, ak6;
+
+	if (*res_len < 4) {
+		*res_len = 0;
+		return;
+	}
+	if (tuak_f1(opc, k, k_len_bytes, _rand, sqn, amf, mac_a, sizeof(mac_a), g_keccak_iterations) ||
+	    tuak_f2345(opc, k, k_len_bytes, _rand, res, *res_len, ck, 16, ik, 16, ak, g_keccak_iterations)) {
+		*res_len = 0;
+		return;
+	}
+
+	/* AUTN = (SQN ^ AK) || AMF || MAC */
+	for (i = 0; i < 6; i++)
+		autni = sqni ^ aki;
+	memcpy(autn + 6, amf, 2);
+	memcpy(autn + 8, mac_a, 8);
+}
+
+
+/**
+ * tuak_auts - Milenage AUTS validation
+ * @opc: OPc = 256-bit operator variant algorithm configuration field (encr.)
+ * @k: K = 128/256-bit subscriber key
+ * @_rand: RAND = 128-bit random challenge
+ * @auts: AUTS = 112-bit authentication token from client
+ * @sqn: Buffer for SQN = 48-bit sequence number
+ * Returns: 0 = success (sqn filled), -1 on failure
+ */
+int tuak_auts(const uint8_t *opc, const uint8_t *k, uint8_t k_len_bytes,
+	      const uint8_t *_rand, const uint8_t *auts, uint8_t *sqn)
+{
+	uint8_t amf2 = { 0x00, 0x00 }; /* TS 33.102 v7.0.0, 6.3.3 */
+	uint8_t ak6, mac_s8;
+	int i;
+
+	if (tuak_f5star(opc, k, k_len_bytes, _rand, ak, g_keccak_iterations))
+		return -1;
+	for (i = 0; i < 6; i++)
+		sqni = autsi ^ aki;
+	if (tuak_f1star(opc, k, k_len_bytes, _rand, sqn, amf, mac_s, 8, g_keccak_iterations) ||
+	    memcmp(mac_s, auts + 6, 8) != 0)
+		return -1;
+	return 0;
+}
+
+int tuak_opc_gen(uint8_t *opc, const uint8_t *k, uint8_t k_len_bytes, const uint8_t *op)
+{
+	uint8_t buf200;
+	uint8_t instance;
+
+	switch (k_len_bytes) {
+	case 16:
+		instance = 0x00;
+		break;
+	case 32:
+		instance = 0x01;
+		break;
+	default:
+		return -EINVAL;
+	}
+
+	tuak_core(buf, op, instance, zero16, zero16, zero16, k, k_len_bytes, g_keccak_iterations);
+
+	memcpy_reverse(opc, buf, 32);
+
+	return 0;
+}

libosmocore_1.9.0.tar.xz/src/gsm/tuak/tuak.h Added

@@ -0,0 +1,33 @@
+#pragma once
+#include <stdint.h>
+
+/* low-level functions */
+
+int tuak_f1(const uint8_t *opc, const uint8_t *k, uint8_t k_len_bytes, const uint8_t *_rand,
+	    const uint8_t *sqn, const uint8_t *amf, uint8_t *mac_a, uint8_t mac_a_len_bytes,
+	    unsigned int keccac_iterations);
+
+int tuak_f1star(const uint8_t *opc, const uint8_t *k, uint8_t k_len_bytes, const uint8_t *_rand,
+		const uint8_t *sqn, const uint8_t *amf, uint8_t *mac_s, uint8_t mac_s_len_bytes,
+		unsigned int keccac_iterations);
+
+int tuak_f2345(const uint8_t *opc, const uint8_t *k, uint8_t k_len_bytes,
+	       const uint8_t *_rand, uint8_t *res, uint8_t res_len_bytes,
+	       uint8_t *ck, uint8_t ck_len_bytes,
+	       uint8_t *ik, uint8_t ik_len_bytes, uint8_t *ak, unsigned int keccac_iterations);
+
+int tuak_f5star(const uint8_t *opc, const uint8_t *k, uint8_t k_len_bytes,
+		const uint8_t *_rand, uint8_t *ak, unsigned int keccac_iterations);
+
+/* high-level API */
+
+void tuak_set_keccak_iterations(unsigned int i);
+
+void tuak_generate(const uint8_t *opc, const uint8_t *amf, const uint8_t *k, uint8_t k_len_bytes,
+		   const uint8_t *sqn, const uint8_t *_rand, uint8_t *autn, uint8_t *ik,
+		   uint8_t *ck, uint8_t *res, size_t *res_len);
+
+int tuak_auts(const uint8_t *opc, const uint8_t *k, uint8_t k_len_bytes,
+	      const uint8_t *_rand, const uint8_t *auts, uint8_t *sqn);
+
+int tuak_opc_gen(uint8_t *opc, const uint8_t *k, uint8_t k_len_bytes, const uint8_t *op);

libosmocore_1.8.0.tar.xz/src/isdn/Makefile.am -> libosmocore_1.9.0.tar.xz/src/isdn/Makefile.am Changed

libosmocore_1.8.0.tar.xz/src/isdn/i460_mux.c -> libosmocore_1.9.0.tar.xz/src/isdn/i460_mux.c Changed

@@ -23,8 +23,10 @@
 #include <osmocom/core/msgb.h>
 #include <osmocom/isdn/i460_mux.h>
 
-/* count the number of sub-channels in this I460 slot */
-static int osmo_i460_subchan_count(struct osmo_i460_timeslot *ts)
+/*! count the number of sub-channels in this I.460 slot.
+ *  \paramin ts timeslot that holds the I.460 subchannels.
+ *  \return number of subchannels.  */
+int osmo_i460_subchan_count(struct osmo_i460_timeslot *ts)
 {
 	int i, num_used = 0;
 
@@ -119,10 +121,10 @@
 	}
 }
 
-/*! Data from E1 timeslot into de-multiplexer
- *  \paramin ts timeslot state
- *  \paramin data input data bytes as received from E1/T1
- *  \paramin data_len length of data in bytes */
+/*! Feed multiplexed data (from an E1 timeslot) into de-multiplexer.
+ *  \paramin ts timeslot state.
+ *  \paramin data input data bytes as received from E1/T1.
+ *  \paramin data_len length of data in bytes. */
 void osmo_i460_demux_in(struct osmo_i460_timeslot *ts, const uint8_t *data, size_t data_len)
 {
 	struct osmo_i460_subchan *schan;
@@ -195,7 +197,7 @@
 
 /*! provide one byte with the subchan-specific bits of given sub-channel.
  *  \paramin schan sub-channel that is to provide bits
- *  \parmaout mask bitmask of those bits filled in
+ *  \paramout mask bitmask of those bits filled in
  *  \returns bits of given sub-channel */
 static uint8_t mux_subchan_provide_bits(struct osmo_i460_subchan *schan, uint8_t *mask)
 {
@@ -243,16 +245,14 @@
 /* provide one byte of multiplexed I.460 bits */
 static uint8_t mux_timeslot_provide_bits(struct osmo_i460_timeslot *ts)
 {
-	int i, count = 0;
 	uint8_t ret = 0xff; /* unused bits must be '1' as per I.460 */
 
-	for (i = 0; i < ARRAY_SIZE(ts->schan); i++) {
+	for (int i = 0; i < ARRAY_SIZE(ts->schan); i++) {
 		struct osmo_i460_subchan *schan = &ts->schani;
 		uint8_t bits, mask;
 
 		if (schan->rate == OSMO_I460_RATE_NONE)
 			continue;
-		count++;
 		bits = mux_subchan_provide_bits(schan, &mask);
 		ret &= ~mask;
 		ret |= bits;
@@ -262,11 +262,10 @@
 }
 
 
-/*! Data from E1 timeslot into de-multiplexer
- *  \paramin ts timeslot state
- *  \paramout out caller-provided buffer where to store generated output bytes
- *  \paramin out_len number of bytes to be stored at out
- */
+/*! Get multiplexed data from de-multiplexer (for feeding it into an E1 timeslot).
+ *  \paramin ts timeslot state.
+ *  \paramout out caller-provided buffer where to store generated output bytes.
+ *  \paramin out_len number of bytes to be stored at out. */
 int osmo_i460_mux_out(struct osmo_i460_timeslot *ts, uint8_t *out, size_t out_len)
 {
 	int i;

libosmocore_1.8.0.tar.xz/src/isdn/libosmoisdn.map -> libosmocore_1.9.0.tar.xz/src/isdn/libosmoisdn.map Changed

libosmocore_1.9.0.tar.xz/src/isdn/v110.c Added

@@ -0,0 +1,583 @@
+/* V.110 frames according to ITU-T V.110
+ *
+ * This code implements the following functionality:
+ * - parsing/encoding of osmo_v110_decoded_frame from/to actual 80-bit V.110 frame
+ * - synchronous rate adapting of user bit rate to V.110 D-bits as per Table 6
+ *
+ * It is (at least initially) a very "naive" implementation, as it first and foremost
+ * aims to be functional and correct, rather than efficient in any way.  Hence it
+ * operates on unpacked bits (ubit_t, 1 bit per byte), and has various intermediate
+ * representations and indirect function calls.  If needed, a more optimized variant
+ * can always be developed later on.
+ */
+
+/* (C) 2022 by Harald Welte <laforge@osmocom.org>
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ */
+
+#include <stdint.h>
+#include <errno.h>
+
+#include <osmocom/core/bits.h>
+
+#include <osmocom/isdn/v110.h>
+
+/*************************************************************************
+ * V.110 frame decoding/encoding (ubits <-> struct with D/S/X/E bits)
+ *************************************************************************/
+
+/*! Decode a 80-bit V.110 frame present as 80 ubits into a struct osmo_v110_decoded_frame.
+ *  \paramout fr caller-allocated output data structure, filled by this function
+ *  \paramin ra_bits One V.110 frame as 80 unpacked bits.
+ *  \paramin n_bits number of unpacked bits provided in ra_bits
+ *  \returns 0 in case of success; negative on error. */
+int osmo_v110_decode_frame(struct osmo_v110_decoded_frame *fr, const ubit_t *ra_bits, size_t n_bits)
+{
+	if (n_bits < 80)
+		return -EINVAL;
+
+	/* X1 .. X2 */
+	fr->x_bits0 = ra_bits2 * 8 + 7;
+	fr->x_bits1 = ra_bits7 * 8 + 7;
+
+	/* S1, S3, S4, S6, S8, S9 */
+	fr->s_bits0 = ra_bits1 * 8 + 7;
+	fr->s_bits2 = ra_bits3 * 8 + 7;
+	fr->s_bits3 = ra_bits4 * 8 + 7;
+	fr->s_bits5 = ra_bits6 * 8 + 7;
+	fr->s_bits7 = ra_bits8 * 8 + 7;
+	fr->s_bits8 = ra_bits9 * 8 + 7;
+
+	/* E1 .. E7 */
+	memcpy(fr->e_bits, ra_bits + 5 * 8 + 1, 7);
+
+	/* D-bits */
+	memcpy(fr->d_bits + 0 * 6, ra_bits + 1 * 8 + 1, 6);
+	memcpy(fr->d_bits + 1 * 6, ra_bits + 2 * 8 + 1, 6);
+	memcpy(fr->d_bits + 2 * 6, ra_bits + 3 * 8 + 1, 6);
+	memcpy(fr->d_bits + 3 * 6, ra_bits + 4 * 8 + 1, 6);
+
+	memcpy(fr->d_bits + 4 * 6, ra_bits + 6 * 8 + 1, 6);
+	memcpy(fr->d_bits + 5 * 6, ra_bits + 7 * 8 + 1, 6);
+	memcpy(fr->d_bits + 6 * 6, ra_bits + 8 * 8 + 1, 6);
+	memcpy(fr->d_bits + 7 * 6, ra_bits + 9 * 8 + 1, 6);
+
+	return 0;
+}
+
+/*! Encode a struct osmo_v110_decoded_frame into an 80-bit V.110 frame as ubits.
+ *  \paramout ra_bits caller-provided output buffer at leat 80 ubits large
+ *  \paramin n_bits length of ra_bits. Must be at least 80.
+ *  \paramin input data structure
+ *  \returns number of bits written to ra_bits */
+int osmo_v110_encode_frame(ubit_t *ra_bits, size_t n_bits, const struct osmo_v110_decoded_frame *fr)
+{
+	if (n_bits < 80)
+		return -ENOSPC;
+
+	/* alignment pattern */
+	memset(ra_bits+0, 0, 8);
+	for (int i = 1; i < 10; i++)
+		ra_bitsi*8 = 1;
+
+	/* X1 .. X2 */
+	ra_bits2 * 8 + 7 = fr->x_bits0;
+	ra_bits7 * 8 + 7 = fr->x_bits1;
+
+	/* S1, S3, S4, S6, S8, S9 */
+	ra_bits1 * 8 + 7 = fr->s_bits0;
+	ra_bits3 * 8 + 7 = fr->s_bits2;
+	ra_bits4 * 8 + 7 = fr->s_bits3;
+	ra_bits6 * 8 + 7 = fr->s_bits5;
+	ra_bits8 * 8 + 7 = fr->s_bits7;
+	ra_bits9 * 8 + 7 = fr->s_bits8;
+
+	/* E1 .. E7 */
+	memcpy(ra_bits + 5 * 8 + 1, fr->e_bits, 7);
+
+	/* D-bits */
+	memcpy(ra_bits + 1 * 8 + 1, fr->d_bits + 0 * 6, 6);
+	memcpy(ra_bits + 2 * 8 + 1, fr->d_bits + 1 * 6, 6);
+	memcpy(ra_bits + 3 * 8 + 1, fr->d_bits + 2 * 6, 6);
+	memcpy(ra_bits + 4 * 8 + 1, fr->d_bits + 3 * 6, 6);
+
+	memcpy(ra_bits + 6 * 8 + 1, fr->d_bits + 4 * 6, 6);
+	memcpy(ra_bits + 7 * 8 + 1, fr->d_bits + 5 * 6, 6);
+	memcpy(ra_bits + 8 * 8 + 1, fr->d_bits + 6 * 6, 6);
+	memcpy(ra_bits + 9 * 8 + 1, fr->d_bits + 7 * 6, 6);
+
+	return 10 * 8;
+}
+
+/*! Print a encoded V.110 frame in the same table-like structure as the spec.
+ *  \param outf output FILE stream to which to dump
+ *  \paramin fr unpacked bits to dump
+ *  \paramin in_len length of unpacked bits available at fr. */
+void osmo_v110_ubit_dump(FILE *outf, const ubit_t *fr, size_t in_len)
+{
+	if (in_len < 80)
+		fprintf(outf, "short input data\n");
+
+	for (unsigned int octet = 0; octet < 10; octet++) {
+		fprintf(outf, "%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\n",
+			froctet * 8 + 0, froctet * 8 + 1, froctet * 8 + 2, froctet * 8 + 3,
+			froctet * 8 + 4, froctet * 8 + 5, froctet * 8 + 6, froctet * 8 + 7);
+	}
+}
+
+/*************************************************************************
+ * RA1 synchronous rate adaptation
+ *************************************************************************/
+
+/* I actually couldn't find any reference as to the value of F(ill) bits */
+#define F 1
+
+/*! Adapt from 6 synchronous 600bit/s input bits to a decoded V.110 frame.
+ *  \paramout fr caller-allocated output frame to which E+D bits are stored
+ *  \paramin d_in input user bits
+ *  \paramin in_len number of bits in d_in. Must be 6.
+ *  \returns 0 on success; negative in case of error. */
+static int v110_adapt_600_to_IR8000(struct osmo_v110_decoded_frame *fr, const ubit_t *d_in, size_t in_len)
+{
+	if (in_len != 6)
+		return -EINVAL;
+
+	/* Table 6a / V.110 */
+	fr->e_bits0 = 1;
+	fr->e_bits1 = 0;
+	fr->e_bits2 = 0;
+	for (int i = 0; i < 6; i++)
+		memset(fr->d_bits + i*8, d_ini, 8);
+
+	return 0;
+}
+
+static int v110_adapt_IR8000_to_600(ubit_t *d_out, size_t out_len, const struct osmo_v110_decoded_frame *fr)
+{
+	if (out_len < 6)
+		return -ENOSPC;
+
+	if (fr->e_bits0 != 1 || fr->e_bits1 != 0 || fr->e_bits2 != 0)
+		return -EINVAL;
+
+	for (int i = 0; i < 6; i++) {
+		/* we only use one of the bits, not some kind of consistency check or majority vote */
+		d_outi = fr->d_bitsi*8;
+	}
+
+	return 6;
+}
+
+/*! Adapt from 12 synchronous 1200bit/s input bits to a decoded V.110 frame.
+ *  \paramout fr caller-allocated output frame to which E+D bits are stored
+ *  \paramin d_in input user bits
+ *  \paramin in_len number of bits in d_in. Must be 12.
+ *  \returns 0 on success; negative in case of error. */
+static int v110_adapt_1200_to_IR8000(struct osmo_v110_decoded_frame *fr, const ubit_t *d_in, size_t in_len)
+{
+	if (in_len != 12)
+		return -EINVAL;
+
+	/* Table 6b / V.110 */
+	fr->e_bits0 = 0;
+	fr->e_bits1 = 1;
+	fr->e_bits2 = 0;
+	for (int i = 0; i < 12; i++)
+		memset(fr->d_bits + i*4, d_ini, 4);
+
+	return 0;
+}
+
+static int v110_adapt_IR8000_to_1200(ubit_t *d_out, size_t out_len, const struct osmo_v110_decoded_frame *fr)
+{
+	if (out_len < 12)
+		return -ENOSPC;
+
+	if (fr->e_bits0 != 0 || fr->e_bits1 != 1 || fr->e_bits2 != 0)
+		return -EINVAL;
+
+	for (int i = 0; i < 12; i++) {
+		/* we only use one of the bits, not some kind of consistency check or majority vote */
+		d_outi = fr->d_bitsi*4;
+	}
+
+	return 12;
+}
+
+/*! Adapt from 24 synchronous 2400bit/s input bits to a decoded V.110 frame.
+ *  \paramout fr caller-allocated output frame to which E+D bits are stored
+ *  \paramin d_in input user bits
+ *  \paramin in_len number of bits in d_in. Must be 24.
+ *  \returns 0 on success; negative in case of error. */
+static int v110_adapt_2400_to_IR8000(struct osmo_v110_decoded_frame *fr, const ubit_t *d_in, size_t in_len)
+{
+	if (in_len != 24)
+		return -EINVAL;
+
+	/* Table 6c / V.110 */
+	fr->e_bits0 = 1;
+	fr->e_bits1 = 1;
+	fr->e_bits2 = 0;
+	for (int i = 0; i < 24; i++) {
+		fr->d_bitsi*2 + 0 = d_ini;
+		fr->d_bitsi*2 + 1 = d_ini;
+	}
+
+	return 0;
+}
+
+static int v110_adapt_IR8000_to_2400(ubit_t *d_out, size_t out_len, const struct osmo_v110_decoded_frame *fr)
+{
+	if (out_len < 24)
+		return -ENOSPC;
+
+	/* Table 6c / V.110 */
+	if (fr->e_bits0 != 1 || fr->e_bits1 != 1 || fr->e_bits2 != 0)
+		return -EINVAL;
+
+	for (int i = 0; i < 24; i++) {
+		/* we only use one of the bits, not some kind of consistency check or majority vote */
+		d_outi = fr->d_bitsi*2;
+	}
+
+	return 24;
+}
+
+/*! Adapt from 36 synchronous N x 3600bit/s input bits to a decoded V.110 frame.
+ *  \paramout fr caller-allocated output frame to which E+D bits are stored
+ *  \paramin d_in input user bits
+ *  \paramin in_len number of bits in d_in. Must be 36.
+ *  \returns 0 on success; negative in case of error. */
+static int v110_adapt_Nx3600_to_IR(struct osmo_v110_decoded_frame *fr, const ubit_t *d_in, size_t in_len)
+{
+	int d_idx = 0;
+
+	if (in_len != 36)
+		return -EINVAL;
+
+	/* Table 6d / V.110 */
+	fr->e_bits0 = 1;
+	fr->e_bits1 = 0;
+	fr->e_bits2 = 1;
+
+	memcpy(fr->d_bits + d_idx, d_in + 0, 10); d_idx += 10;	/* D1..D10 */
+	memset(fr->d_bits + d_idx, F, 2); d_idx += 2;
+	memcpy(fr->d_bits + d_idx, d_in + 10, 2); d_idx += 2;	/* D11..D12 */
+	memset(fr->d_bits + d_idx, F, 2); d_idx += 2;
+	memcpy(fr->d_bits + d_idx, d_in + 12, 2); d_idx += 2;	/* D13..D14 */
+	memset(fr->d_bits + d_idx, F, 2); d_idx += 2;
+	memcpy(fr->d_bits + d_idx, d_in + 14, 14); d_idx += 14;	/* D15..D28 */
+	memset(fr->d_bits + d_idx, F, 2); d_idx += 2;
+	memcpy(fr->d_bits + d_idx, d_in + 28, 2); d_idx += 2;	/* D29..D30 */
+	memset(fr->d_bits + d_idx, F, 2); d_idx += 2;
+	memcpy(fr->d_bits + d_idx, d_in + 30, 2); d_idx += 2;	/* D31..D32 */
+	memset(fr->d_bits + d_idx, F, 2); d_idx += 2;
+	memcpy(fr->d_bits + d_idx, d_in + 32, 4); d_idx += 4;	/* D33..D36 */
+
+	OSMO_ASSERT(d_idx == 48);
+
+	return 0;
+}
+
+static int v110_adapt_IR_to_Nx3600(ubit_t *d_out, size_t out_len, const struct osmo_v110_decoded_frame *fr)
+{
+	int d_idx = 0;
+
+	if (out_len < 36)
+		return -ENOSPC;
+
+	if (fr->e_bits0 != 1 || fr->e_bits1 != 0 || fr->e_bits2 != 1)
+		return -EINVAL;
+
+	memcpy(d_out + 0, fr->d_bits + d_idx, 10); d_idx += 10;	/* D1..D10 */
+	d_idx += 2;
+	memcpy(d_out + 10, fr->d_bits + d_idx, 2); d_idx += 2;	/* D11..D12 */
+	d_idx += 2;
+	memcpy(d_out + 12, fr->d_bits + d_idx, 2); d_idx += 2;	/* D13..D14 */
+	d_idx += 2;
+	memcpy(d_out + 14, fr->d_bits + d_idx, 14); d_idx += 14;/* D15..D28 */
+	d_idx += 2;
+	memcpy(d_out + 28, fr->d_bits + d_idx, 2); d_idx += 2;	/* D29..D30 */
+	d_idx += 2;
+	memcpy(d_out + 30, fr->d_bits + d_idx, 2); d_idx += 2;	/* D31..D32 */
+	d_idx += 2;
+	memcpy(d_out + 32, fr->d_bits + d_idx, 4); d_idx += 4;	/* D33..D36 */
+
+	OSMO_ASSERT(d_idx == 48);
+
+	return 36;
+}
+
+
+/*! Adapt from 48 synchronous N x 4800bit/s input bits to a decoded V.110 frame.
+ *  \paramout fr caller-allocated output frame to which E+D bits are stored
+ *  \paramin d_in input user bits
+ *  \paramin in_len number of bits in d_in. Must be 48.
+ *  \returns 0 on success; negative in case of error. */
+static int v110_adapt_Nx4800_to_IR(struct osmo_v110_decoded_frame *fr, const ubit_t *d_in, size_t in_len)
+{
+	if (in_len != 48)
+		return -EINVAL;
+
+	/* Table 6e / V.110 */
+	fr->e_bits0 = 0;
+	fr->e_bits1 = 1;
+	fr->e_bits2 = 1;
+
+	memcpy(fr->d_bits, d_in, 48);
+
+	return 0;
+}
+
+static int v110_adapt_IR_to_Nx4800(ubit_t *d_out, size_t out_len, const struct osmo_v110_decoded_frame *fr)
+{
+	if (out_len < 48)
+		return -ENOSPC;
+
+	if (fr->e_bits0 != 0 || fr->e_bits1 != 1 || fr->e_bits2 != 1)
+		return -EINVAL;
+
+	memcpy(d_out, fr->d_bits, 48);
+
+	return 48;
+}
+
+/*! Adapt from 30 synchronous N x 12000bit/s input bits to a decoded V.110 frame.
+ *  \paramout fr caller-allocated output frame to which E+D bits are stored
+ *  \paramin d_in input user bits
+ *  \paramin in_len number of bits in d_in. Must be 30.
+ *  \returns 0 on success; negative in case of error. */
+static int v110_adapt_Nx12000_to_IR(struct osmo_v110_decoded_frame *fr, const ubit_t *d_in, size_t in_len)
+{
+	int d_idx = 0;
+
+	if (in_len != 30)
+		return -EINVAL;
+
+	/* Table 6f / V.110 */
+	fr->e_bits0 = 0;
+	fr->e_bits1 = 0;
+	fr->e_bits2 = 1;
+
+	memcpy(fr->d_bits + d_idx, d_in + 0, 10); d_idx += 10;	/* D1..D10 */
+	memset(fr->d_bits + d_idx, F, 2); d_idx += 2;
+	memcpy(fr->d_bits + d_idx, d_in + 10, 2); d_idx += 2;	/* D11..D12 */
+	memset(fr->d_bits + d_idx, F, 2); d_idx += 2;
+	memcpy(fr->d_bits + d_idx, d_in + 12, 2); d_idx += 2;	/* D13..D14 */
+	memset(fr->d_bits + d_idx, F, 2); d_idx += 2;
+	fr->d_bitsd_idx++ = d_in14;				/* D15 */
+	memset(fr->d_bits + d_idx, F, 3); d_idx += 3;
+	memcpy(fr->d_bits + d_idx, d_in + 15, 10); d_idx += 10;	/* D16..D25 */
+	memset(fr->d_bits + d_idx, F, 2); d_idx += 2;
+	memcpy(fr->d_bits + d_idx, d_in + 25, 2); d_idx += 2;	/* D26..D27 */
+	memset(fr->d_bits + d_idx, F, 2); d_idx += 2;
+	memcpy(fr->d_bits + d_idx, d_in + 27, 2); d_idx += 2;	/* D28..D29 */
+	memset(fr->d_bits + d_idx, F, 2); d_idx += 2;
+	fr->d_bitsd_idx++ = d_in29;				/* D30 */
+	memset(fr->d_bits + d_idx, F, 3); d_idx += 3;
+
+	OSMO_ASSERT(d_idx == 48);
+
+	return 0;
+}
+
+static int v110_adapt_IR_to_Nx12000(ubit_t *d_out, size_t out_len, const struct osmo_v110_decoded_frame *fr)
+{
+	int d_idx = 0;
+
+	if (out_len < 30)
+		return -ENOSPC;
+
+	if (fr->e_bits0 != 0 || fr->e_bits1 != 0 || fr->e_bits2 != 1)
+		return -EINVAL;
+
+	memcpy(d_out + 0, fr->d_bits + d_idx, 10); d_idx += 10;	/* D1..D10 */
+	d_idx += 2;
+	memcpy(d_out + 10, fr->d_bits + d_idx, 2); d_idx += 2;	/* D11..D12 */
+	d_idx += 2;
+	memcpy(d_out + 12, fr->d_bits + d_idx, 2); d_idx += 2;	/* D13..D14 */
+	d_idx += 2;
+	d_out14 = fr->d_bitsd_idx++;			/* D15 */
+	d_idx += 3;
+	memcpy(d_out + 15, fr->d_bits + d_idx, 10); d_idx += 10;/* D16..D25 */
+	d_idx += 2;
+	memcpy(d_out + 25, fr->d_bits + d_idx, 2); d_idx += 2;	/* D26..D27 */
+	d_idx += 2;
+	memcpy(d_out + 27, fr->d_bits + d_idx, 2); d_idx += 2;	/* D28..D29 */
+	d_idx += 2;
+	d_out29 = fr->d_bitsd_idx++;			/* D30 */
+	d_idx += 3;
+
+	OSMO_ASSERT(d_idx == 48);
+
+	return 30;
+}
+
+/* definition of a synchronous V.110 RA1 rate adaptation. There is one for each supported tuple
+ * of user data rate and intermediate rate (IR). */
+struct osmo_v110_sync_ra1 {
+	unsigned int data_rate;
+	unsigned int intermediate_rate;
+	unsigned int user_data_chunk_bits;
+	/*! RA1 function in user bitrate -> intermediate rate direction */
+	int (*adapt_user_to_ir)(struct osmo_v110_decoded_frame *fr, const ubit_t *d_in, size_t in_len);
+	/*! RA1 function in intermediate rate -> user bitrate direction */
+	int (*adapt_ir_to_user)(ubit_t *d_out, size_t out_len, const struct osmo_v110_decoded_frame *fr);
+};
+
+/* all of the synchronous data signalling rates; see Table 1/V.110 */
+static const struct osmo_v110_sync_ra1 osmo_v110_sync_ra1_def_NUM_OSMO_V110_SYNC_RA1 = {
+	OSMO_V110_SYNC_RA1_600 = {
+		.data_rate = 600,
+		.intermediate_rate = 8000,
+		.user_data_chunk_bits = 6,
+		.adapt_user_to_ir = v110_adapt_600_to_IR8000,
+		.adapt_ir_to_user = v110_adapt_IR8000_to_600,
+	},
+	OSMO_V110_SYNC_RA1_1200 = {
+		.data_rate = 1200,
+		.intermediate_rate = 8000,
+		.user_data_chunk_bits = 12,
+		.adapt_user_to_ir = v110_adapt_1200_to_IR8000,
+		.adapt_ir_to_user = v110_adapt_IR8000_to_1200,
+	},
+	OSMO_V110_SYNC_RA1_2400 = {
+		.data_rate = 2400,
+		.intermediate_rate = 8000,
+		.user_data_chunk_bits = 24,
+		.adapt_user_to_ir = v110_adapt_2400_to_IR8000,
+		.adapt_ir_to_user = v110_adapt_IR8000_to_2400,
+	},
+	OSMO_V110_SYNC_RA1_4800 = {
+		.data_rate = 4800,
+		.intermediate_rate = 8000,
+		.user_data_chunk_bits = 48,
+		.adapt_user_to_ir = v110_adapt_Nx4800_to_IR,
+		.adapt_ir_to_user = v110_adapt_IR_to_Nx4800,
+	},
+	OSMO_V110_SYNC_RA1_7200 = {
+		.data_rate = 7200,
+		.intermediate_rate = 16000,
+		.user_data_chunk_bits = 36,
+		.adapt_user_to_ir = v110_adapt_Nx3600_to_IR,
+		.adapt_ir_to_user = v110_adapt_IR_to_Nx3600,
+	},
+	OSMO_V110_SYNC_RA1_9600 = {
+		.data_rate = 9600,
+		.intermediate_rate = 16000,
+		.user_data_chunk_bits = 48,
+		.adapt_user_to_ir = v110_adapt_Nx4800_to_IR,
+		.adapt_ir_to_user = v110_adapt_IR_to_Nx4800,
+	},
+	OSMO_V110_SYNC_RA1_12000 = {
+		.data_rate = 12000,
+		.intermediate_rate = 32000,
+		.user_data_chunk_bits = 30,
+		.adapt_user_to_ir = v110_adapt_Nx12000_to_IR,
+		.adapt_ir_to_user = v110_adapt_IR_to_Nx12000,
+	},
+	OSMO_V110_SYNC_RA1_14400 = {
+		.data_rate = 14400,
+		.intermediate_rate = 32000,
+		.user_data_chunk_bits = 36,
+		.adapt_user_to_ir = v110_adapt_Nx3600_to_IR,
+		.adapt_ir_to_user = v110_adapt_IR_to_Nx3600,
+	},
+	OSMO_V110_SYNC_RA1_19200 = {
+		.data_rate = 19200,
+		.intermediate_rate = 32000,
+		.user_data_chunk_bits = 48,
+		.adapt_user_to_ir = v110_adapt_Nx4800_to_IR,
+		.adapt_ir_to_user = v110_adapt_IR_to_Nx4800,
+	},
+	OSMO_V110_SYNC_RA1_24000 = {
+		.data_rate = 24000,
+		.intermediate_rate = 64000,
+		.user_data_chunk_bits = 30,
+		.adapt_user_to_ir = v110_adapt_Nx12000_to_IR,
+		.adapt_ir_to_user = v110_adapt_IR_to_Nx12000,
+	},
+	OSMO_V110_SYNC_RA1_28800 = {
+		.data_rate = 28800,
+		.intermediate_rate = 64000,
+		.user_data_chunk_bits = 36,
+		.adapt_user_to_ir = v110_adapt_Nx3600_to_IR,
+		.adapt_ir_to_user = v110_adapt_IR_to_Nx3600,
+	},
+	OSMO_V110_SYNC_RA1_38400 = {
+		.data_rate = 38400,
+		.intermediate_rate = 64000,
+		.user_data_chunk_bits = 48,
+		.adapt_user_to_ir = v110_adapt_Nx4800_to_IR,
+		.adapt_ir_to_user = v110_adapt_IR_to_Nx4800,
+	},
+};
+
+/*! obtain the size (in number of bits) of the user data bits in one V.110
+ *  frame for specified RA1 rate */
+int osmo_v110_sync_ra1_get_user_data_chunk_bitlen(enum osmo_v100_sync_ra1_rate rate)
+{
+	if (rate < 0 || rate >= _NUM_OSMO_V110_SYNC_RA1)
+		return -EINVAL;
+
+	return osmo_v110_sync_ra1_defrate.user_data_chunk_bits;
+}
+
+/*! obtain the user data rate (in bits/s) for specified RA1 rate */
+int osmo_v110_sync_ra1_get_user_data_rate(enum osmo_v100_sync_ra1_rate rate)
+{
+	if (rate < 0 || rate >= _NUM_OSMO_V110_SYNC_RA1)
+		return -EINVAL;
+
+	return osmo_v110_sync_ra1_defrate.data_rate;
+}
+
+/*! obtain the intermediate rate (in bits/s) for specified RA1 rate */
+int osmo_v110_sync_ra1_get_intermediate_rate(enum osmo_v100_sync_ra1_rate rate)
+{
+	if (rate < 0 || rate >= _NUM_OSMO_V110_SYNC_RA1)
+		return -EINVAL;
+
+	return osmo_v110_sync_ra1_defrate.intermediate_rate;
+}
+
+/*! perform V.110 RA1 function in user rate -> intermediate rate direction.
+ *  \paramin rate specification of the user bitrate
+ *  \paramout fr caller-allocated output buffer for the decoded V.110 frame generated
+ *  \paramin d_in input user data (unpacked bits)
+ *  \paramin in_len length of user input data (in number of bits)
+ *  \returns 0 on success; negative in case of error */
+int osmo_v110_sync_ra1_user_to_ir(enum osmo_v100_sync_ra1_rate rate, struct osmo_v110_decoded_frame *fr,
+				  const ubit_t *d_in, size_t in_len)
+{
+	if (rate < 0 || rate >= _NUM_OSMO_V110_SYNC_RA1)
+		return -EINVAL;
+
+	return osmo_v110_sync_ra1_defrate.adapt_user_to_ir(fr, d_in, in_len);
+}
+
+/*! perform V.110 RA1 function in intermediate rate -> user rate direction.
+ *  \paramin rate specification of the user bitrate
+ *  \paramout d_out caller-allocated output user data (unpacked bits)
+ *  \paramout out_len length of d_out output buffer
+ *  \paramin fr decoded V.110 frame used as input
+ *  \returns number of unpacked bits written to d_out on success; negative in case of error */
+int osmo_v110_sync_ra1_ir_to_user(enum osmo_v100_sync_ra1_rate rate, ubit_t *d_out, size_t out_len,
+				  const struct osmo_v110_decoded_frame *fr)
+{
+	if (rate < 0 || rate >= _NUM_OSMO_V110_SYNC_RA1)
+		return -EINVAL;
+
+	return osmo_v110_sync_ra1_defrate.adapt_ir_to_user(d_out, out_len, fr);
+}

libosmocore_1.8.0.tar.xz/src/vty/Makefile.am -> libosmocore_1.9.0.tar.xz/src/vty/Makefile.am Changed

libosmocore_1.8.0.tar.xz/src/vty/command.c -> libosmocore_1.9.0.tar.xz/src/vty/command.c Changed

@@ -77,6 +77,21 @@
 /* Host information structure. */
 struct host host;
 
+struct vty_parent_node {
+	struct llist_head entry;
+
+	/*! private data, specified by creator */
+	void *priv;
+	void *index;
+
+	/*! Node status of this vty */
+	int node;
+
+	/*! When reading from a config file, these are the indenting characters expected for children of
+	 * this VTY node. */
+	char *indent;
+};
+
 /* Standard command node structures. */
 struct cmd_node auth_node = {
 	AUTH_NODE,
@@ -2438,6 +2453,7 @@
 	llist_del(&parent->entry);
 	vty->node = parent->node;
 	vty->priv = parent->priv;
+	vty->index = parent->index;
 	if (vty->indent)
 		talloc_free(vty->indent);
 	vty->indent = parent->indent;
@@ -2648,6 +2664,7 @@
 		struct vty_parent_node this_node = {
 				.node = vty->node,
 				.priv = vty->priv,
+				.index = vty->index,
 				.indent = vty->indent,
 			};
 		struct vty_parent_node *parent = vty_parent(vty);
@@ -2923,6 +2940,7 @@
 		this_node = (struct vty_parent_node){
 				.node = vty->node,
 				.priv = vty->priv,
+				.index = vty->index,
 				.indent = vty->indent,
 			};
 
@@ -2979,7 +2997,7 @@
 /* Configration from terminal */
 DEFUN(config_terminal,
       config_terminal_cmd,
-      "configure terminal",
+      "configure terminal",
       "Configuration from vty interface\n" "Configuration terminal\n")
 {
 	if (vty_config_lock(vty))

libosmocore_1.8.0.tar.xz/tests/Makefile.am -> libosmocore_1.9.0.tar.xz/tests/Makefile.am Changed

@@ -10,7 +10,8 @@
 
 check_PROGRAMS = timer/timer_test sms/sms_test ussd/ussd_test		\
                  bits/bitrev_test a5/a5_test		                \
-                 conv/conv_test auth/milenage_test lapd/lapd_test	\
+                 conv/conv_test auth/milenage_test auth/tuak_test	\
+		 lapd/lapd_test						\
                  gsm0808/gsm0808_test gsm0408/gsm0408_test		\
 		 gprs/gprs_test	kasumi/kasumi_test gea/gea_test		\
 		 logging/logging_test codec/codec_test			\
@@ -49,6 +50,11 @@
 		 smscb/smscb_test                                       \
 		 smscb/gsm0341_test                                     \
 		 smscb/cbsp_test                                        \
+		 auth/xor2g_test                                        \
+		 v110/frame_test                                        \
+		 v110/ra1_test                                          \
+		 gsm44021/frame_csd_test                                \
+		 osmo_io/osmo_io_test					\
 		 $(NULL)
 
 if ENABLE_MSGFILE
@@ -89,38 +95,46 @@
 base64_base64_test_SOURCES = base64/base64_test.c
 
 utils_utils_test_SOURCES = utils/utils_test.c
-utils_utils_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/libosmogsm.la
+utils_utils_test_LDADD = $(top_builddir)/src/gsm/libosmogsm.la $(LDADD)
 
 stats_stats_test_SOURCES = stats/stats_test.c
-stats_stats_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/libosmogsm.la
+stats_stats_test_LDADD = $(top_builddir)/src/gsm/libosmogsm.la $(LDADD)
 stats_stats_test_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/src/core
 
 stats_stats_vty_test_SOURCES = stats/stats_vty_test.c
-stats_stats_vty_test_LDADD = $(LDADD) $(top_builddir)/src/vty/libosmovty.la
+stats_stats_vty_test_LDADD = $(top_builddir)/src/vty/libosmovty.la $(LDADD)
 
 a5_a5_test_SOURCES = a5/a5_test.c
-a5_a5_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/libgsmint.la
+a5_a5_test_LDADD = $(top_builddir)/src/gsm/libgsmint.la $(LDADD)
 
 kasumi_kasumi_test_SOURCES = kasumi/kasumi_test.c
-kasumi_kasumi_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/libgsmint.la
+kasumi_kasumi_test_LDADD = $(top_builddir)/src/gsm/libgsmint.la $(LDADD)
 
 comp128_comp128_test_SOURCES = comp128/comp128_test.c
-comp128_comp128_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/libosmogsm.la
+comp128_comp128_test_LDADD = $(top_builddir)/src/gsm/libosmogsm.la $(LDADD)
 
 auth_milenage_test_SOURCES = auth/milenage_test.c
-auth_milenage_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/libosmogsm.la
+auth_milenage_test_LDADD = $(top_builddir)/src/gsm/libosmogsm.la $(LDADD)
+
+auth_tuak_test_SOURCES = auth/tuak_test.c
+auth_tuak_test_LDADD = $(top_builddir)/src/gsm/libgsmint.la $(LDADD)
+auth_tuak_test_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/src
+
+auth_xor2g_test_SOURCES = auth/xor2g_test.c
+auth_xor2g_test_LDADD = $(top_builddir)/src/gsm/libosmogsm.la $(LDADD)
 
 abis_abis_test_SOURCES = abis/abis_test.c
-abis_abis_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/libosmogsm.la
+abis_abis_test_LDADD = $(top_builddir)/src/gsm/libosmogsm.la $(LDADD)
 
 ctrl_ctrl_test_SOURCES = ctrl/ctrl_test.c
-ctrl_ctrl_test_LDADD = $(LDADD) \
+ctrl_ctrl_test_LDADD = \
 	$(top_builddir)/src/ctrl/libosmoctrl.la \
 	$(top_builddir)/src/gsm/libosmogsm.la \
-	$(top_builddir)/src/vty/libosmovty.la
+	$(top_builddir)/src/vty/libosmovty.la \
+	$(LDADD)
 
 gea_gea_test_SOURCES = gea/gea_test.c
-gea_gea_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/libosmogsm.la
+gea_gea_test_LDADD = $(top_builddir)/src/gsm/libosmogsm.la $(LDADD)
 
 bits_bitrev_test_SOURCES = bits/bitrev_test.c
 
@@ -131,105 +145,116 @@
 bits_bitfield_test_SOURCES = bits/bitfield_test.c
 
 conv_conv_test_SOURCES = conv/conv_test.c conv/conv.c
-conv_conv_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/libgsmint.la
+conv_conv_test_LDADD = $(top_builddir)/src/gsm/libgsmint.la $(LDADD)
 
 gsm0502_gsm0502_test_SOURCES = gsm0502/gsm0502_test.c
-gsm0502_gsm0502_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/libosmogsm.la
+gsm0502_gsm0502_test_LDADD = $(top_builddir)/src/gsm/libosmogsm.la $(LDADD)
 
 dtx_dtx_gsm0503_test_SOURCES = dtx/dtx_gsm0503_test.c
-dtx_dtx_gsm0503_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/libosmogsm.la \
-			     $(top_builddir)/src/coding/libosmocoding.la
+dtx_dtx_gsm0503_test_LDADD = $(top_builddir)/src/gsm/libosmogsm.la \
+			     $(top_builddir)/src/coding/libosmocoding.la \
+			     $(LDADD)
 
 conv_conv_gsm0503_test_SOURCES = conv/conv_gsm0503_test.c conv/conv.c conv/gsm0503_test_vectors.c
-conv_conv_gsm0503_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/libgsmint.la
+conv_conv_gsm0503_test_LDADD = $(top_builddir)/src/gsm/libgsmint.la $(LDADD)
 conv_conv_gsm0503_test_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/tests/conv
 
 gsm0808_gsm0808_test_SOURCES = gsm0808/gsm0808_test.c
-gsm0808_gsm0808_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/libosmogsm.la
+gsm0808_gsm0808_test_LDADD = $(top_builddir)/src/gsm/libosmogsm.la $(LDADD)
 
 gsm29205_gsm29205_test_SOURCES = gsm29205/gsm29205_test.c
-gsm29205_gsm29205_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/libosmogsm.la
+gsm29205_gsm29205_test_LDADD = $(top_builddir)/src/gsm/libosmogsm.la $(LDADD)
 
 gsm0408_gsm0408_test_SOURCES = gsm0408/gsm0408_test.c
-gsm0408_gsm0408_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/libosmogsm.la
+gsm0408_gsm0408_test_LDADD = $(top_builddir)/src/gsm/libosmogsm.la $(LDADD)
 
 gsm48_rest_octets_test_SOURCES = gsm48/rest_octets_test.c
-gsm48_rest_octets_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/libosmogsm.la
+gsm48_rest_octets_test_LDADD = $(top_builddir)/src/gsm/libosmogsm.la $(LDADD)
 
 gprs_gprs_test_SOURCES = gprs/gprs_test.c
-gprs_gprs_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/libosmogsm.la
+gprs_gprs_test_LDADD = $(top_builddir)/src/gsm/libosmogsm.la $(LDADD)
 
 lapd_lapd_test_SOURCES = lapd/lapd_test.c
-lapd_lapd_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/libosmogsm.la $(top_builddir)/src/isdn/libosmoisdn.la
+lapd_lapd_test_LDADD = $(top_builddir)/src/gsm/libosmogsm.la \
+		       $(top_builddir)/src/isdn/libosmoisdn.la \
+		       $(LDADD)
 
 msgb_msgb_test_SOURCES = msgb/msgb_test.c
 
 msgfile_msgfile_test_SOURCES = msgfile/msgfile_test.c
 
 smscb_smscb_test_SOURCES = smscb/smscb_test.c
-smscb_smscb_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/libosmogsm.la
+smscb_smscb_test_LDADD = $(top_builddir)/src/gsm/libosmogsm.la $(LDADD)
 
 smscb_gsm0341_test_SOURCES = smscb/gsm0341_test.c
-smscb_gsm0341_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/libosmogsm.la
+smscb_gsm0341_test_LDADD = $(top_builddir)/src/gsm/libosmogsm.la $(LDADD)
 
 smscb_cbsp_test_SOURCES = smscb/cbsp_test.c
-smscb_cbsp_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/libosmogsm.la
+smscb_cbsp_test_LDADD = $(top_builddir)/src/gsm/libosmogsm.la $(LDADD)
 
 sms_sms_test_SOURCES = sms/sms_test.c
-sms_sms_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/libosmogsm.la
+sms_sms_test_LDADD = $(top_builddir)/src/gsm/libosmogsm.la $(LDADD)
 
 timer_timer_test_SOURCES = timer/timer_test.c
 
 timer_clk_override_test_SOURCES = timer/clk_override_test.c
 
 ussd_ussd_test_SOURCES = ussd/ussd_test.c
-ussd_ussd_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/libosmogsm.la
+ussd_ussd_test_LDADD = $(top_builddir)/src/gsm/libosmogsm.la $(LDADD)
 
 gb_bssgp_fc_test_SOURCES = gb/bssgp_fc_test.c
-gb_bssgp_fc_test_LDADD = $(LDADD) $(top_builddir)/src/gb/libosmogb.la \
+gb_bssgp_fc_test_LDADD = $(top_builddir)/src/gb/libosmogb.la \
 			 $(top_builddir)/src/vty/libosmovty.la \
-			 $(top_builddir)/src/gsm/libosmogsm.la
+			 $(top_builddir)/src/gsm/libosmogsm.la \
+			 $(LDADD)
 
 gb_gprs_bssgp_test_SOURCES = gb/gprs_bssgp_test.c
-gb_gprs_bssgp_test_LDADD = $(LDADD) $(top_builddir)/src/gb/libosmogb.la $(LIBRARY_DLSYM) \
-			   $(top_builddir)/src/vty/libosmovty.la \
+gb_gprs_bssgp_test_LDADD = $(top_builddir)/src/vty/libosmovty.la \
 			   $(top_builddir)/src/gsm/libosmogsm.la \
-			   $(top_builddir)/src/gb/libosmogb.la
+			   $(top_builddir)/src/gb/libosmogb.la \
+			   $(LDADD) \
+			   $(LIBRARY_DLSYM)
 
 gb_gprs_bssgp_rim_test_SOURCES = gb/gprs_bssgp_rim_test.c
-gb_gprs_bssgp_rim_test_LDADD = $(LDADD) $(top_builddir)/src/gb/libosmogb.la $(LIBRARY_DLSYM) \
-			       $(top_builddir)/src/gb/libosmogb.la
+gb_gprs_bssgp_rim_test_LDADD = $(top_builddir)/src/gb/libosmogb.la \
+			       $(LDADD) \
+			       $(LIBRARY_DLSYM)
 
 gb_gprs_ns_test_SOURCES = gb/gprs_ns_test.c
-gb_gprs_ns_test_LDADD = $(LDADD) $(top_builddir)/src/gb/libosmogb.la $(LIBRARY_DLSYM) \
+gb_gprs_ns_test_LDADD = $(top_builddir)/src/gb/libosmogb.la \
 			$(top_builddir)/src/vty/libosmovty.la \
-			$(top_builddir)/src/gsm/libosmogsm.la
+			$(top_builddir)/src/gsm/libosmogsm.la \
+			$(LDADD) \
+			$(LIBRARY_DLSYM)
 
 gb_gprs_ns2_test_SOURCES = gb/gprs_ns2_test.c
-gb_gprs_ns2_test_LDADD = $(LDADD) $(LIBRARY_DLSYM) \
-			$(top_builddir)/src/vty/libosmovty.la \
+gb_gprs_ns2_test_LDADD = $(top_builddir)/src/vty/libosmovty.la \
 			$(top_builddir)/src/gsm/libosmogsm.la \
 			$(top_builddir)/src/core/libosmocore.la \
-			$(top_builddir)/src/gb/libosmogb-test.la
+			$(top_builddir)/src/gb/libosmogb-test.la \
+			$(LDADD) \
+			$(LIBRARY_DLSYM)
 
 logging_logging_test_SOURCES = logging/logging_test.c
 
 logging_logging_vty_test_SOURCES = logging/logging_vty_test.c
-logging_logging_vty_test_LDADD = $(LDADD) $(top_builddir)/src/vty/libosmovty.la
+logging_logging_vty_test_LDADD = $(top_builddir)/src/vty/libosmovty.la $(LDADD)
 
 vty_vty_transcript_test_SOURCES = vty/vty_transcript_test.c
-vty_vty_transcript_test_LDADD = $(LDADD) $(top_builddir)/src/vty/libosmovty.la
+vty_vty_transcript_test_LDADD = $(top_builddir)/src/vty/libosmovty.la $(LDADD)
 
 fr_fr_test_SOURCES = fr/fr_test.c
-fr_fr_test_LDADD = $(LDADD) $(top_builddir)/src/gb/libosmogb.la $(LIBRARY_DLSYM) \
+fr_fr_test_LDADD = $(top_builddir)/src/gb/libosmogb.la \
 		   $(top_builddir)/src/vty/libosmovty.la \
-		   $(top_builddir)/src/gsm/libosmogsm.la
+		   $(top_builddir)/src/gsm/libosmogsm.la \
+		   $(LDADD) \
+		   $(LIBRARY_DLSYM)
 
 codec_codec_test_SOURCES = codec/codec_test.c
-codec_codec_test_LDADD = $(LDADD) $(top_builddir)/src/codec/libosmocodec.la
+codec_codec_test_LDADD = $(top_builddir)/src/codec/libosmocodec.la $(LDADD)
 
 codec_codec_ecu_fr_test_SOURCES = codec/codec_ecu_fr_test.c
-codec_codec_ecu_fr_test_LDADD = $(LDADD) $(top_builddir)/src/codec/libosmocodec.la
+codec_codec_ecu_fr_test_LDADD = $(top_builddir)/src/codec/libosmocodec.la $(LDADD)
 
 loggingrb_loggingrb_test_SOURCES = loggingrb/loggingrb_test.c
 loggingrb_loggingrb_test_LDADD = $(LDADD)
@@ -237,30 +262,31 @@
 strrb_strrb_test_SOURCES = strrb/strrb_test.c
 
 vty_vty_test_SOURCES = vty/vty_test.c
-vty_vty_test_LDADD = $(LDADD) $(top_builddir)/src/vty/libosmovty.la
+vty_vty_test_LDADD = $(top_builddir)/src/vty/libosmovty.la $(LDADD)
 
 sim_sim_test_SOURCES = sim/sim_test.c
-sim_sim_test_LDADD = $(LDADD) $(top_builddir)/src/sim/libosmosim.la \
-		     $(top_builddir)/src/gsm/libosmogsm.la
+sim_sim_test_LDADD = $(top_builddir)/src/sim/libosmosim.la \
+		     $(top_builddir)/src/gsm/libosmogsm.la \
+		     $(LDADD)
 
 tlv_tlv_test_SOURCES = tlv/tlv_test.c
-tlv_tlv_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/libosmogsm.la
+tlv_tlv_test_LDADD = $(top_builddir)/src/gsm/libosmogsm.la $(LDADD)
 
 gsup_gsup_test_SOURCES = gsup/gsup_test.c
-gsup_gsup_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/libosmogsm.la
+gsup_gsup_test_LDADD = $(top_builddir)/src/gsm/libosmogsm.la $(LDADD)
 
 oap_oap_test_SOURCES = oap/oap_test.c
-oap_oap_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/libosmogsm.la
+oap_oap_test_LDADD = $(top_builddir)/src/gsm/libosmogsm.la $(LDADD)
 
 oap_oap_client_test_SOURCES = oap/oap_client_test.c
-oap_oap_client_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/libosmogsm.la
+oap_oap_client_test_LDADD = $(top_builddir)/src/gsm/libosmogsm.la $(LDADD)
 
 fsm_fsm_test_SOURCES = fsm/fsm_test.c
 fsm_fsm_test_LDADD = \
-	$(LDADD) \
 	$(top_builddir)/src/ctrl/libosmoctrl.la \
 	$(top_builddir)/src/gsm/libosmogsm.la \
-	$(top_builddir)/src/vty/libosmovty.la
+	$(top_builddir)/src/vty/libosmovty.la \
+	$(LDADD)
 
 fsm_fsm_dealloc_test_SOURCES = fsm/fsm_dealloc_test.c
 fsm_fsm_dealloc_test_LDADD = $(LDADD)
@@ -270,10 +296,11 @@
 socket_socket_test_SOURCES = socket/socket_test.c
 
 coding_coding_test_SOURCES = coding/coding_test.c
-coding_coding_test_LDADD = $(LDADD) \
+coding_coding_test_LDADD = \
   $(top_builddir)/src/gsm/libosmogsm.la \
   $(top_builddir)/src/codec/libosmocodec.la \
-  $(top_builddir)/src/coding/libosmocoding.la
+  $(top_builddir)/src/coding/libosmocoding.la \
+  $(LDADD)
 
 endian_endian_test_SOURCES = endian/endian_test.c
 
@@ -282,22 +309,22 @@
 prbs_prbs_test_SOURCES = prbs/prbs_test.c
 
 gsm23003_gsm23003_test_SOURCES = gsm23003/gsm23003_test.c
-gsm23003_gsm23003_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/libosmogsm.la
+gsm23003_gsm23003_test_LDADD = $(top_builddir)/src/gsm/libosmogsm.la $(LDADD)
 
 gsm23236_gsm23236_test_SOURCES = gsm23236/gsm23236_test.c
-gsm23236_gsm23236_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/libosmogsm.la
+gsm23236_gsm23236_test_LDADD = $(top_builddir)/src/gsm/libosmogsm.la $(LDADD)
 
 tdef_tdef_test_SOURCES = tdef/tdef_test.c
 tdef_tdef_test_LDADD = $(LDADD)
 
 tdef_tdef_vty_config_root_test_SOURCES = tdef/tdef_vty_config_root_test.c
-tdef_tdef_vty_config_root_test_LDADD = $(LDADD) $(top_builddir)/src/vty/libosmovty.la
+tdef_tdef_vty_config_root_test_LDADD = $(top_builddir)/src/vty/libosmovty.la $(LDADD)
 
 tdef_tdef_vty_config_subnode_test_SOURCES = tdef/tdef_vty_config_subnode_test.c
-tdef_tdef_vty_config_subnode_test_LDADD = $(LDADD) $(top_builddir)/src/vty/libosmovty.la
+tdef_tdef_vty_config_subnode_test_LDADD = $(top_builddir)/src/vty/libosmovty.la $(LDADD)
 
 tdef_tdef_vty_dynamic_test_SOURCES = tdef/tdef_vty_dynamic_test.c
-tdef_tdef_vty_dynamic_test_LDADD = $(LDADD) $(top_builddir)/src/vty/libosmovty.la
+tdef_tdef_vty_dynamic_test_LDADD = $(top_builddir)/src/vty/libosmovty.la $(LDADD)
 
 sockaddr_str_sockaddr_str_test_SOURCES = sockaddr_str/sockaddr_str_test.c
 sockaddr_str_sockaddr_str_test_LDADD = $(LDADD)
@@ -312,19 +339,19 @@
 exec_exec_test_LDADD = $(LDADD)
 
 i460_mux_i460_mux_test_SOURCES = i460_mux/i460_mux_test.c
-i460_mux_i460_mux_test_LDADD = $(LDADD) $(top_builddir)/src/isdn/libosmoisdn.la
+i460_mux_i460_mux_test_LDADD = $(top_builddir)/src/isdn/libosmoisdn.la $(LDADD)
 
 bitgen_bitgen_test_SOURCES = bitgen/bitgen_test.c
 bitgen_bitgen_test_LDADD = $(LDADD)
 
 gad_gad_test_SOURCES = gad/gad_test.c
-gad_gad_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/libosmogsm.la
+gad_gad_test_LDADD = $(top_builddir)/src/gsm/libosmogsm.la $(LDADD)
 
 bsslap_bsslap_test_SOURCES = bsslap/bsslap_test.c
-bsslap_bsslap_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/libosmogsm.la
+bsslap_bsslap_test_LDADD = $(top_builddir)/src/gsm/libosmogsm.la $(LDADD)
 
 bssmap_le_bssmap_le_test_SOURCES = bssmap_le/bssmap_le_test.c
-bssmap_le_bssmap_le_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/libosmogsm.la
+bssmap_le_bssmap_le_test_LDADD = $(top_builddir)/src/gsm/libosmogsm.la $(LDADD)
 
 it_q_it_q_test_SOURCES = it_q/it_q_test.c
 it_q_it_q_test_LDADD = $(LDADD)
@@ -333,7 +360,21 @@
 time_cc_time_cc_test_LDADD = $(LDADD)
 
 iuup_iuup_test_SOURCES = iuup/iuup_test.c
-iuup_iuup_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/libosmogsm.la
+iuup_iuup_test_LDADD = $(top_builddir)/src/gsm/libosmogsm.la $(LDADD)
+
+v110_frame_test_SOURCES = v110/frame_test.c
+v110_frame_test_LDADD = $(top_builddir)/src/isdn/libosmoisdn.la $(LDADD)
+
+v110_ra1_test_SOURCES = v110/ra1_test.c
+v110_ra1_test_LDADD = $(top_builddir)/src/isdn/libosmoisdn.la $(LDADD)
+
+gsm44021_frame_csd_test_SOURCES = gsm44021/frame_csd_test.c
+gsm44021_frame_csd_test_LDADD = $(top_builddir)/src/isdn/libosmoisdn.la \
+				$(top_builddir)/src/gsm/libosmogsm.la \
+				$(LDADD)
+
+osmo_io_osmo_io_test_SOURCES = osmo_io/osmo_io_test.c
+
 
 # The `:;' works around a Bash 3.2 bug when the output is not writeable.
 $(srcdir)/package.m4: $(top_srcdir)/configure.ac
@@ -357,6 +398,8 @@
              timer/timer_test.ok sms/sms_test.ok ussd/ussd_test.ok	\
              bits/bitrev_test.ok a5/a5_test.ok				\
              conv/conv_test.ok auth/milenage_test.ok ctrl/ctrl_test.ok	\
+	     auth/tuak_test.ok					\
+             auth/xor2g_test.ok						\
              lapd/lapd_test.ok						\
              gsm0408/gsm0408_test.ok gsm0408/gsm0408_test.err		\
              gsm0808/gsm0808_test.ok gb/bssgp_fc_tests.err		\
@@ -432,6 +475,10 @@
 	     smscb/smscb_test.ok \
 	     smscb/gsm0341_test.ok \
 	     smscb/cbsp_test.ok \
+	     v110/frame_test.ok \
+	     v110/ra1_test.ok \
+	     gsm44021/frame_csd_test.ok \
+	     osmo_io/osmo_io_test.ok osmo_io/osmo_io_test.err \
 	     $(NULL)
 
 if ENABLE_LIBSCTP
@@ -494,6 +541,8 @@
 		>$(srcdir)/ussd/ussd_test.ok
 	auth/milenage_test \
 		>$(srcdir)/auth/milenage_test.ok
+	auth/tuak_test \
+		>$(srcdir)/auth/tuak_test.ok
 	comp128/comp128_test \
 		>$(srcdir)/comp128/comp128_test.ok
 	lapd/lapd_test \
@@ -635,6 +684,16 @@
 		>$(srcdir)/time_cc/time_cc_test.ok
 	iuup/iuup_test \
 		>$(srcdir)/iuup/iuup_test.ok
+	v110/frame_test \
+		>$(srcdir)/v110/frame_test.ok
+	v110/ra1_test \
+		>$(srcdir)/v110/ra1_test.ok
+	gsm44021/frame_csd_test \
+		>$(srcdir)/gsm44021/frame_csd_test.ok
+	osmo_io/osmo_io_test \
+		>$(srcdir)/osmo_io/osmo_io_test.ok \
+		2>$(srcdir)/osmo_io/osmo_io_test.err
+
 
 check-local: atconfig $(TESTSUITE)
 	 -e /proc/cpuinfo  && cat /proc/cpuinfo
@@ -673,7 +732,8 @@
 # pass -u to osmo_verify_transcript_vty.py by doing:
 #   make vty-test U=-u
 
-vty-test-ns2:
+if ENABLE_GB
+vty-test-ns2: $(top_builddir)/utils/osmo-ns-dummy
 	$(MAKE) -C $(top_builddir)/utils osmo-ns-dummy
 	osmo_verify_transcript_vty.py -v \
 		-p 42042 \
@@ -681,20 +741,26 @@
 		$(U) $(srcdir)/gb/gprs_ns2*.vty
 	osmotestvty.py -p $(abs_top_srcdir)/tests/gb -w $(abs_top_builddir)/tests/gb -v
 	osmotestconfig.py -p $(abs_top_srcdir)/tests/gb -w $(abs_top_builddir)/tests/gb -v
+else
+vty-test-ns2:
+	echo "Not running vty-test-ns2 because osmo-ns-dummy is not built (--disable-gb)"
+endif
 
-vty-test-logging:
+vty-test-logging: $(top_builddir)/tests/logging/logging_vty_test
 	osmo_verify_transcript_vty.py -v \
 		-p 42042 \
 		-r "$(top_builddir)/tests/logging/logging_vty_test" \
 		$(U) $(srcdir)/logging/*.vty
 
-vty-test-vty:
+vty-test-vty: $(top_builddir)/tests/vty/vty_transcript_test
 	osmo_verify_transcript_vty.py -v \
 		-p 42042 \
 		-r "$(top_builddir)/tests/vty/vty_transcript_test" \
 		$(U) $(srcdir)/vty/*.vty
 
-vty-test-tdef:
+vty-test-tdef: $(top_builddir)/tests/tdef/tdef_vty_config_root_test \
+	       $(top_builddir)/tests/tdef/tdef_vty_config_subnode_test \
+	       $(top_builddir)/tests/tdef/tdef_vty_dynamic_test
 	osmo_verify_transcript_vty.py -v \
 		-p 42042 \
 		-r "$(top_builddir)/tests/tdef/tdef_vty_config_root_test" \
@@ -708,7 +774,7 @@
 		-r "$(top_builddir)/tests/tdef/tdef_vty_dynamic_test" \
 		$(U) $(srcdir)/tdef/tdef_vty_dynamic_test.vty
 
-vty-test-stats:
+vty-test-stats: $(top_builddir)/tests/stats/stats_vty_test
 	osmo_verify_transcript_vty.py -v \
 		-p 42042 \
 		-r "$(top_builddir)/tests/stats/stats_vty_test" \

libosmocore_1.8.0.tar.xz/tests/abis/abis_test.c -> libosmocore_1.9.0.tar.xz/tests/abis/abis_test.c Changed

libosmocore_1.9.0.tar.xz/tests/auth/tuak_test.c Added

@@ -0,0 +1,309 @@
+
+#include <stdint.h>
+#include <osmocom/core/utils.h>
+#include "gsm/tuak/tuak.h"
+
+/* user-friendly test specification, uses hex-strings for all parameters for
+ * copy+pasting from the spec. */
+struct tuak_testspec {
+	const char *name;
+	struct {
+		const char *k;
+		const char *rand;
+		const char *sqn;
+		const char *amf;
+		const char *top;
+		unsigned int keccak_iterations;
+	} in;
+	struct {
+		const char *topc;
+		const char *f1;
+		const char *f1star;
+		const char *f2;
+		const char *f3;
+		const char *f4;
+		const char *f5;
+		const char *f5star;
+	} out;
+};
+
+static const struct tuak_testspec testspecs = {
+	{
+		.name = "TS 35.233 Section 6.3 Test Set 1",
+		.in = {
+			.k = "abababababababababababababababab",
+			.rand = "42424242424242424242424242424242",
+			.sqn = "111111111111",
+			.amf = "ffff",
+			.top = "5555555555555555555555555555555555555555555555555555555555555555",
+			.keccak_iterations = 1,
+		},
+		.out = {
+			.topc = "bd04d9530e87513c5d837ac2ad954623a8e2330c115305a73eb45d1f40cccbff",
+			.f1 = "f9a54e6aeaa8618d",
+			.f1star = "e94b4dc6c7297df3",
+			.f2 = "657acd64",
+			.f3 = "d71a1e5c6caffe986a26f783e5c78be1",
+			.f4 = "be849fa2564f869aecee6f62d4337e72",
+			.f5 = "719f1e9b9054",
+			.f5star = "e7af6b3d0e38",
+		},
+	}, {
+		.name = "TS 35.233 Section 6.4 Test Set 2",
+		.in = {
+			.k = "fffefdfcfbfaf9f8f7f6f5f4f3f2f1f0efeeedecebeae9e8e7e6e5e4e3e2e1e0",
+			.rand = "0123456789abcdef0123456789abcdef",
+			.sqn = "0123456789ab",
+			.amf = "abcd",
+			.top = "808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9f",
+			.keccak_iterations = 1,
+		},
+		.out = {
+			.topc = "305425427e18c503c8a4b294ea72c95d0c36c6c6b29d0c65de5974d5977f8524",
+			.f1 = "c0b8c2d4148ec7aa5f1d78a97e4d1d58",
+			.f1star = "ef81af7290f7842c6ceafa537fa0745b",
+			.f2 = "e9d749dc4eea0035",
+			.f3 = "a4cb6f6529ab17f8337f27baa8234d47",
+			.f4 = "2274155ccf4199d5e2abcbf621907f90",
+			.f5 = "480a9345cc1e",
+			.f5star = "f84eb338848c",
+		},
+	}, {
+		.name = "TS 35.233 Section 6.5 Test Set 3",
+		.in = {
+			.k = "fffefdfcfbfaf9f8f7f6f5f4f3f2f1f0efeeedecebeae9e8e7e6e5e4e3e2e1e0",
+			.rand = "0123456789abcdef0123456789abcdef",
+			.sqn = "0123456789ab",
+			.amf = "abcd",
+			.top = "808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9f",
+			.keccak_iterations = 1,
+		},
+		.out = {
+			.topc = "305425427e18c503c8a4b294ea72c95d0c36c6c6b29d0c65de5974d5977f8524",
+			.f1 = "d97b75a1776065271b1e212bc3b1bf173f438b21e6c64a55a96c372e085e5cc5",
+			.f1star = "427bbf07c6e3a86c54f8c5216499f3909a6fd4a164c9fe235b1550258111b821",
+			.f2 = "07021c73e7635c7d",
+			.f3 = "4d59ac796834eb85d11fa148a5058c3c",
+			.f4 = "126d47500136fdc5ddfd14f19ebf16749ce4b6435323fbb5715a3a796a6082bd",
+			.f5 = "1d6622c4e59a",
+			.f5star = "f84eb338848c",
+		},
+	}, {
+		.name = "TS 35.233 Section 6.6 Test Set 4",
+		.in = {
+			.k = "b8da837a50652d6ac7c97da14f6acc61",
+			.rand = "6887e55425a966bd86c9661a5fa72be8",
+			.sqn = "0dea2ee2c5af",
+			.amf = "df1e",
+			.top = "0952be13556c32ebc58195d9dd930493e12a9003669988ffde5fa1f0fe35cc01",
+			.keccak_iterations = 1,
+		},
+		.out = {
+			.topc = "2bc16eb657a68e1f446f08f57c0efb1d493527a2e652ce281eb6ca0e4487760a",
+			.f1 = "749214087958dd8f58bfcdf869d8ae3f",
+			.f1star = "619e865afe80e382aee13063f9dfb56d",
+			.f2 = "4041ce438e3e38e8aa96562eed83ac43",
+			.f3 = "3e3bc01bea0cd914c4c2c83ce2d92757",
+			.f4 = "666a8e6f577b1aa77b7fd53cebb8a3d6",
+			.f5 = "1f880d005119",
+			.f5star = "45e617d77fe5",
+		},
+	}, {
+		.name = "TS 35.233 Section 6.7 Test Set 5",
+		.in = {
+			.k = "1574ca56881d05c189c82880f789c9cd4244955f4426aa2b69c29f15770e5aa5",
+			.rand = "c570aac68cde651fb1e3088322498bef",
+			.sqn = "c89bb71f3a41",
+			.amf = "297d",
+			.top = "e59f6eb10ea406813f4991b0b9e02f181edf4c7e17b480f66d34da35ee88c95e",
+			.keccak_iterations = 1,
+		},
+		.out = {
+			.topc = "3c6052e41532a28a47aa3cbb89f223e8f3aaa976aecd48bc3e7d6165a55eff62",
+			.f1 = "d7340dad02b4cb01",
+			.f1star = "c6021e2e66accb15",
+			.f2 = "84d89b41db1867ffd4c7ba1d82163f4d526a20fbae5418fbb526940b1eeb905c",
+			.f3 = "d419676afe5ab58c1d8bee0d43523a4d2f52ef0b31a4676a0c334427a988fe65",
+			.f4 = "205533e505661b61d05cc0eac87818f4",
+			.f5 = "d7b3d2d4980a",
+			.f5star = "ca9655264986",
+		},
+	}, {
+		.name = "TS 35.233 Section 6.8 Test Set 6",
+		.in = {
+			.k = "1574ca56881d05c189c82880f789c9cd4244955f4426aa2b69c29f15770e5aa5",
+			.rand = "c570aac68cde651fb1e3088322498bef",
+			.sqn = "c89bb71f3a41",
+			.amf = "297d",
+			.top = "e59f6eb10ea406813f4991b0b9e02f181edf4c7e17b480f66d34da35ee88c95e",
+			.keccak_iterations = 2,
+		},
+		.out = {
+			.topc = "b04a66f26c62fcd6c82de22a179ab65506ecf47f56245cd149966cfa9cec7a51",
+			.f1 = "90d2289ed1ca1c3dbc2247bb480d431ac71d2e4a7677f6e997cfddb0cbad88b7",
+			.f1star = "427355dbac30e825063aba61b556e87583abac638e3ab01c4c884ad9d458dc2f",
+			.f2 = "d67e6e64590d22eecba7324afa4af4460c93f01b24506d6e12047d789a94c867",
+			.f3 = "ede57edfc57cdffe1aae75066a1b7479bbc3837438e88d37a801cccc9f972b89",
+			.f4 = "48ed9299126e5057402fe01f9201cf25249f9c5c0ed2afcf084755daff1d3999",
+			.f5 = "6aae8d18c448",
+			.f5star = "8c5f33b61f4e",
+		},
+	},
+};
+
+
+struct tuak_testset {
+	const char *name;
+	struct {
+		uint8_t k32;
+		uint8_t k_len_bytes;
+		uint8_t rand16;
+		uint8_t sqn6;
+		uint8_t amf2;
+		uint8_t top32;
+		unsigned int keccak_iterations;
+	} in;
+	struct {
+		uint8_t topc32;
+		uint8_t mac_a32;
+		uint8_t mac_s32;
+		uint8_t mac_len_bytes;
+
+		uint8_t res32;
+		uint8_t res_len_bytes;
+
+		uint8_t ck32;
+		uint8_t ck_len_bytes;
+		uint8_t ik32;
+		uint8_t ik_len_bytes;
+		uint8_t ak6;
+		uint8_t f5star6;
+	} out;
+};
+
+static void expect_equal(const char *name, const uint8_t *actual, const uint8_t *expected, size_t len)
+{
+	if (!memcmp(actual, expected, len)) {
+		printf("\t%s: %s\r\n", name, osmo_hexdump_nospc(actual, len));
+	} else {
+		char buflen*2+1;
+		printf("\t%s: %s != %s\r\n", name, osmo_hexdump_nospc(actual, len),
+			osmo_hexdump_buf(buf, sizeof(buf), expected, len, "", true));
+	}
+}
+
+static void execute_testset(const struct tuak_testset *tset)
+{
+	uint8_t topc32;
+
+	printf("==> %s\n", tset->name);
+
+	tuak_set_keccak_iterations(tset->in.keccak_iterations);
+	tuak_opc_gen(topc, tset->in.k, tset->in.k_len_bytes, tset->in.top);
+	expect_equal("TOPc", topc, tset->out.topc, sizeof(topc));
+
+	if (tset->out.mac_len_bytes) {
+		uint8_t mac_a32;
+		uint8_t mac_s32;
+
+		tuak_f1(topc, tset->in.k, tset->in.k_len_bytes, tset->in.rand, tset->in.sqn, tset->in.amf,
+			mac_a, tset->out.mac_len_bytes, tset->in.keccak_iterations);
+		expect_equal("MAC_A", mac_a, tset->out.mac_a, tset->out.mac_len_bytes);
+
+		tuak_f1star(topc, tset->in.k, tset->in.k_len_bytes, tset->in.rand, tset->in.sqn, tset->in.amf,
+			    mac_s, tset->out.mac_len_bytes, tset->in.keccak_iterations);
+		expect_equal("MAC_S", mac_s, tset->out.mac_s, tset->out.mac_len_bytes);
+	}
+
+	if (tset->out.ck_len_bytes || tset->out.ik_len_bytes || tset->out.res_len_bytes) {
+		uint8_t res32;
+		uint8_t ck32;
+		uint8_t ik32;
+		uint8_t ak6;
+
+		tuak_f2345(topc, tset->in.k, tset->in.k_len_bytes, tset->in.rand,
+			   tset->out.res_len_bytes ? res : NULL, tset->out.res_len_bytes,
+			   tset->out.ck_len_bytes ? ck : NULL, tset->out.ck_len_bytes,
+			   tset->out.ik_len_bytes ? ik : NULL, tset->out.ik_len_bytes,
+			   ak, tset->in.keccak_iterations);
+
+		if (tset->out.res_len_bytes)
+			expect_equal("RES", res, tset->out.res, tset->out.res_len_bytes);
+
+		if (tset->out.ck_len_bytes)
+			expect_equal("CK", ck, tset->out.ck, tset->out.ck_len_bytes);
+
+		if (tset->out.ik_len_bytes)
+			expect_equal("IK", ik, tset->out.ik, tset->out.ik_len_bytes);
+
+		expect_equal("AK", ak, tset->out.ak, 6);
+	}
+}
+
+/* convert string-testspec to binary-testset and execute it */
+static void execute_testspec(const struct tuak_testspec *tcase)
+{
+	struct tuak_testset _tset, *tset = &_tset;
+
+	tset->name = tcase->name;
+	tset->in.keccak_iterations = tcase->in.keccak_iterations;
+
+	osmo_hexparse(tcase->in.k, tset->in.k, sizeof(tset->in.k));
+	tset->in.k_len_bytes = strlen(tcase->in.k)/2;
+	OSMO_ASSERT(tset->in.k_len_bytes == 16 || tset->in.k_len_bytes == 32);
+
+	osmo_hexparse(tcase->in.rand, tset->in.rand, sizeof(tset->in.rand));
+	OSMO_ASSERT(strlen(tcase->in.rand)/2 == 16);
+
+	osmo_hexparse(tcase->in.sqn, tset->in.sqn, sizeof(tset->in.sqn));
+	OSMO_ASSERT(strlen(tcase->in.sqn)/2 == 6);
+
+	osmo_hexparse(tcase->in.amf, tset->in.amf, sizeof(tset->in.amf));
+	OSMO_ASSERT(strlen(tcase->in.amf)/2 == 2);
+
+	osmo_hexparse(tcase->in.top, tset->in.top, sizeof(tset->in.top));
+	OSMO_ASSERT(strlen(tcase->in.top)/2 == 32);
+
+	osmo_hexparse(tcase->out.topc, tset->out.topc, sizeof(tset->out.topc));
+	OSMO_ASSERT(strlen(tcase->out.topc)/2 == 32);
+
+	osmo_hexparse(tcase->out.f1, tset->out.mac_a, sizeof(tset->out.mac_a));
+	osmo_hexparse(tcase->out.f1star, tset->out.mac_s, sizeof(tset->out.mac_s));
+	OSMO_ASSERT(strlen(tcase->out.f1) == strlen(tcase->out.f1star));
+	tset->out.mac_len_bytes = strlen(tcase->out.f1)/2;
+	OSMO_ASSERT(tset->out.mac_len_bytes == 8 || tset->out.mac_len_bytes == 16 ||
+		    tset->out.mac_len_bytes == 32);
+
+	osmo_hexparse(tcase->out.f2, tset->out.res, sizeof(tset->out.res));
+	tset->out.res_len_bytes = strlen(tcase->out.f2)/2;
+	OSMO_ASSERT(tset->out.res_len_bytes == 4 || tset->out.res_len_bytes == 8 ||
+		    tset->out.res_len_bytes == 16 || tset->out.res_len_bytes == 32);
+
+	osmo_hexparse(tcase->out.f3, tset->out.ck, sizeof(tset->out.ck));
+	tset->out.ck_len_bytes = strlen(tcase->out.f3)/2;
+	OSMO_ASSERT(tset->out.ck_len_bytes == 16 || tset->out.ck_len_bytes == 32);
+
+	osmo_hexparse(tcase->out.f4, tset->out.ik, sizeof(tset->out.ik));
+	tset->out.ik_len_bytes = strlen(tcase->out.f4)/2;
+	OSMO_ASSERT(tset->out.ik_len_bytes == 16 || tset->out.ik_len_bytes == 32);
+
+	osmo_hexparse(tcase->out.f5, tset->out.ak, sizeof(tset->out.ak));
+	OSMO_ASSERT(strlen(tcase->out.f5)/2 == 6);
+
+	osmo_hexparse(tcase->out.f5star, tset->out.f5star, sizeof(tset->out.f5star));
+	OSMO_ASSERT(strlen(tcase->out.f5star)/2 == 6);
+
+	execute_testset(tset);
+}
+
+int main(int argc, char **argv)
+{
+#if 0
+	for (unsigned int i = 0; i < ARRAY_SIZE(testsets); i++)
+		execute_testset(&testsetsi);
+#endif
+
+	for (unsigned int i = 0; i < ARRAY_SIZE(testspecs); i++)
+		execute_testspec(&testspecsi);
+
+}

libosmocore_1.9.0.tar.xz/tests/auth/tuak_test.ok Added

@@ -0,0 +1,48 @@
+==> TS 35.233 Section 6.3 Test Set 1
+	TOPc: bd04d9530e87513c5d837ac2ad954623a8e2330c115305a73eb45d1f40cccbff
+	MAC_A: f9a54e6aeaa8618d
+	MAC_S: e94b4dc6c7297df3
+	RES: 657acd64
+	CK: d71a1e5c6caffe986a26f783e5c78be1
+	IK: be849fa2564f869aecee6f62d4337e72
+	AK: 719f1e9b9054
+==> TS 35.233 Section 6.4 Test Set 2
+	TOPc: 305425427e18c503c8a4b294ea72c95d0c36c6c6b29d0c65de5974d5977f8524
+	MAC_A: c0b8c2d4148ec7aa5f1d78a97e4d1d58
+	MAC_S: ef81af7290f7842c6ceafa537fa0745b
+	RES: e9d749dc4eea0035
+	CK: a4cb6f6529ab17f8337f27baa8234d47
+	IK: 2274155ccf4199d5e2abcbf621907f90
+	AK: 480a9345cc1e
+==> TS 35.233 Section 6.5 Test Set 3
+	TOPc: 305425427e18c503c8a4b294ea72c95d0c36c6c6b29d0c65de5974d5977f8524
+	MAC_A: d97b75a1776065271b1e212bc3b1bf173f438b21e6c64a55a96c372e085e5cc5
+	MAC_S: 427bbf07c6e3a86c54f8c5216499f3909a6fd4a164c9fe235b1550258111b821
+	RES: 07021c73e7635c7d
+	CK: 4d59ac796834eb85d11fa148a5058c3c
+	IK: 126d47500136fdc5ddfd14f19ebf16749ce4b6435323fbb5715a3a796a6082bd
+	AK: 1d6622c4e59a
+==> TS 35.233 Section 6.6 Test Set 4
+	TOPc: 2bc16eb657a68e1f446f08f57c0efb1d493527a2e652ce281eb6ca0e4487760a
+	MAC_A: 749214087958dd8f58bfcdf869d8ae3f
+	MAC_S: 619e865afe80e382aee13063f9dfb56d
+	RES: 4041ce438e3e38e8aa96562eed83ac43
+	CK: 3e3bc01bea0cd914c4c2c83ce2d92757
+	IK: 666a8e6f577b1aa77b7fd53cebb8a3d6
+	AK: 1f880d005119
+==> TS 35.233 Section 6.7 Test Set 5
+	TOPc: 3c6052e41532a28a47aa3cbb89f223e8f3aaa976aecd48bc3e7d6165a55eff62
+	MAC_A: d7340dad02b4cb01
+	MAC_S: c6021e2e66accb15
+	RES: 84d89b41db1867ffd4c7ba1d82163f4d526a20fbae5418fbb526940b1eeb905c
+	CK: d419676afe5ab58c1d8bee0d43523a4d2f52ef0b31a4676a0c334427a988fe65
+	IK: 205533e505661b61d05cc0eac87818f4
+	AK: d7b3d2d4980a
+==> TS 35.233 Section 6.8 Test Set 6
+	TOPc: b04a66f26c62fcd6c82de22a179ab65506ecf47f56245cd149966cfa9cec7a51
+	MAC_A: 90d2289ed1ca1c3dbc2247bb480d431ac71d2e4a7677f6e997cfddb0cbad88b7
+	MAC_S: 427355dbac30e825063aba61b556e87583abac638e3ab01c4c884ad9d458dc2f
+	RES: d67e6e64590d22eecba7324afa4af4460c93f01b24506d6e12047d789a94c867
+	CK: ede57edfc57cdffe1aae75066a1b7479bbc3837438e88d37a801cccc9f972b89
+	IK: 48ed9299126e5057402fe01f9201cf25249f9c5c0ed2afcf084755daff1d3999
+	AK: 6aae8d18c448

libosmocore_1.9.0.tar.xz/tests/auth/xor2g_test.c Added

@@ -0,0 +1,77 @@
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <errno.h>
+#include <string.h>
+#include <inttypes.h>
+
+#include <osmocom/crypt/auth.h>
+#include <osmocom/core/utils.h>
+
+static void dump_auth_vec(struct osmo_auth_vector *vec)
+{
+	printf("RAND:\t%s\n", osmo_hexdump(vec->rand, sizeof(vec->rand)));
+
+	if (vec->auth_types & OSMO_AUTH_TYPE_UMTS) {
+		printf("AUTN:\t%s\n", osmo_hexdump(vec->autn, sizeof(vec->autn)));
+		printf("IK:\t%s\n", osmo_hexdump(vec->ik, sizeof(vec->ik)));
+		printf("CK:\t%s\n", osmo_hexdump(vec->ck, sizeof(vec->ck)));
+		printf("RES:\t%s\n", osmo_hexdump(vec->res, vec->res_len));
+	}
+
+	if (vec->auth_types & OSMO_AUTH_TYPE_GSM) {
+		printf("SRES:\t%s\n", osmo_hexdump(vec->sres, sizeof(vec->sres)));
+		/* According to 3GPP TS 55.205 Sec. 4 the GSM-MILENAGE output is limited to 64 bits.
+		   According to 3GPP TS 33.102 Annex. B5 in UMTS security context Kc can be 128 bits.
+		   Here we test the former, so make sure we only print interesting Kc bits. */
+		printf("Kc:\t%s\n", osmo_hexdump(vec->kc, OSMO_A5_MAX_KEY_LEN_BYTES/2));
+	}
+}
+
+static struct osmo_sub_auth_data test_aud = {
+	.type = OSMO_AUTH_TYPE_GSM,
+	.algo = OSMO_AUTH_ALG_XOR_2G,
+	.u.gsm = {
+		.ki =  { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+			 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f },
+	},
+};
+
+int main(int argc, char **argv)
+{
+	struct osmo_auth_vector _vec;
+	struct osmo_auth_vector *vec = &_vec;
+	uint8_t _rand16;
+	int rc;
+
+#if 0
+	srand(time(NULL));
+	*(uint32_t *)&_rand0 = rand();
+	*(uint32_t *)(&_rand4) = rand();
+	*(uint32_t *)(&_rand8) = rand();
+	*(uint32_t *)(&_rand12) = rand();
+#else
+	memset(_rand, 0, sizeof(_rand));
+#endif
+	memset(vec, 0, sizeof(*vec));
+
+	rc = osmo_auth_gen_vec(vec, &test_aud, _rand);
+	if (rc < 0) {
+		fprintf(stderr, "error generating auth vector\n");
+		exit(1);
+	}
+	dump_auth_vec(vec);
+
+	/* test once more with non-zero RAND to see it show in result */
+	for (int i = 0; i < sizeof(_rand); i++)
+		_randi = i << 4;
+
+	rc = osmo_auth_gen_vec(vec, &test_aud, _rand);
+	if (rc < 0) {
+		fprintf(stderr, "error generating auth vector\n");
+		exit(1);
+	}
+	dump_auth_vec(vec);
+
+	exit(0);
+}

libosmocore_1.9.0.tar.xz/tests/auth/xor2g_test.ok Added

libosmocore_1.8.0.tar.xz/tests/codec/codec_ecu_fr_test.c -> libosmocore_1.9.0.tar.xz/tests/codec/codec_ecu_fr_test.c Changed

libosmocore_1.8.0.tar.xz/tests/codec/codec_ecu_fr_test.ok -> libosmocore_1.9.0.tar.xz/tests/codec/codec_ecu_fr_test.ok Changed

@@ -41,49 +41,49 @@
 conceal: 17, result: d00000000000000000000000000000000000000000000000000000000000000000 XMAXC: 0, 0, 0, 0
 conceal: 18, result: d00000000000000000000000000000000000000000000000000000000000000000 XMAXC: 0, 0, 0, 0
 conceal: 19, result: d00000000000000000000000000000000000000000000000000000000000000000 XMAXC: 0, 0, 0, 0
-=> Testing FR concealment (simple, consecutive bad frames)
+=> Testing FR concealment (simple, using ECU abstraction)
 Start with: d9ec9be212901f802335598c501f805bad3d4ba01f809b69df5a501f809cd1b4da, XMAXC: 3f, 3f, 3f, 3f
 conceal: 00, result: d9ec9be212901f802335598c501f805bad3d4ba01f809b69df5a501f809cd1b4da XMAXC: 3f, 3f, 3f, 3f
-conceal: 01, result: d9ec9be212901d802335598c501d805bad3d4ba01d809b69df5a501d809cd1b4da XMAXC: 3b, 3b, 3b, 3b
-conceal: 02, result: d9ec9be212901b802335598c501b805bad3d4ba01b809b69df5a501b809cd1b4da XMAXC: 37, 37, 37, 37
+conceal: 01, result: d9ec9be212905d802335598c501d805bad3d4ba01d809b69df5a501d809cd1b4da XMAXC: 3b, 3b, 3b, 3b
+conceal: 02, result: d9ec9be212901b802335598c501b805bad3d4ba01b809b69df5a507b809cd1b4da XMAXC: 37, 37, 37, 37
 conceal: 03, result: d9ec9be2129019802335598c5019805bad3d4ba019809b69df5a5019809cd1b4da XMAXC: 33, 33, 33, 33
-conceal: 04, result: d9ec9be2129017802335598c5017805bad3d4ba017809b69df5a5017809cd1b4da XMAXC: 2f, 2f, 2f, 2f
+conceal: 04, result: d9ec9be2129017802335598c5017805bad3d4ba057809b69df5a5057809cd1b4da XMAXC: 2f, 2f, 2f, 2f
 conceal: 05, result: d9ec9be2129015802335598c5015805bad3d4ba015809b69df5a5015809cd1b4da XMAXC: 2b, 2b, 2b, 2b
-conceal: 06, result: d9ec9be2129013802335598c5013805bad3d4ba013809b69df5a5013809cd1b4da XMAXC: 27, 27, 27, 27
+conceal: 06, result: d9ec9be2129013802335598c5073805bad3d4ba073809b69df5a5013809cd1b4da XMAXC: 27, 27, 27, 27
 conceal: 07, result: d9ec9be2129011802335598c5011805bad3d4ba011809b69df5a5011809cd1b4da XMAXC: 23, 23, 23, 23
-conceal: 08, result: d9ec9be212900f802335598c500f805bad3d4ba00f809b69df5a500f809cd1b4da XMAXC: 1f, 1f, 1f, 1f
-conceal: 09, result: d9ec9be212900d802335598c500d805bad3d4ba00d809b69df5a500d809cd1b4da XMAXC: 1b, 1b, 1b, 1b
-conceal: 10, result: d9ec9be212900b802335598c500b805bad3d4ba00b809b69df5a500b809cd1b4da XMAXC: 17, 17, 17, 17
-conceal: 11, result: d9ec9be2129009802335598c5009805bad3d4ba009809b69df5a5009809cd1b4da XMAXC: 13, 13, 13, 13
-conceal: 12, result: d9ec9be2129007802335598c5007805bad3d4ba007809b69df5a5007809cd1b4da XMAXC: f, f, f, f
-conceal: 13, result: d9ec9be2129005802335598c5005805bad3d4ba005809b69df5a5005809cd1b4da XMAXC: b, b, b, b
-conceal: 14, result: d9ec9be2129003802335598c5003805bad3d4ba003809b69df5a5003809cd1b4da XMAXC: 7, 7, 7, 7
-conceal: 15, result: d9ec9be2129001802335598c5001805bad3d4ba001809b69df5a5001809cd1b4da XMAXC: 3, 3, 3, 3
-conceal: 16, result: d00000000000000000000000000000000000000000000000000000000000000000 XMAXC: 0, 0, 0, 0
-conceal: 17, result: d00000000000000000000000000000000000000000000000000000000000000000 XMAXC: 0, 0, 0, 0
-conceal: 18, result: d00000000000000000000000000000000000000000000000000000000000000000 XMAXC: 0, 0, 0, 0
-conceal: 19, result: d00000000000000000000000000000000000000000000000000000000000000000 XMAXC: 0, 0, 0, 0
+conceal: 08, result: d9ec9be212904f802335598c500f805bad3d4ba04f809b69df5a500f809cd1b4da XMAXC: 1f, 1f, 1f, 1f
+conceal: 09, result: d9ec9be212900d802335598c500d805bad3d4ba00d809b69df5a506d809cd1b4da XMAXC: 1b, 1b, 1b, 1b
+conceal: 10, result: d9ec9be212900b802335598c506b805bad3d4ba00b809b69df5a500b809cd1b4da XMAXC: 17, 17, 17, 17
+conceal: 11, result: d9ec9be2129009802335598c5009805bad3d4ba049809b69df5a5049809cd1b4da XMAXC: 13, 13, 13, 13
+conceal: 12, result: d9ec9be2129047802335598c5047805bad3d4ba007809b69df5a5007809cd1b4da XMAXC: f, f, f, f
+conceal: 13, result: d9ec9be2129005802335598c5065805bad3d4ba065809b69df5a5065809cd1b4da XMAXC: b, b, b, b
+conceal: 14, result: d9ec9be2129063802335598c5003805bad3d4ba003809b69df5a5003809cd1b4da XMAXC: 7, 7, 7, 7
+conceal: 15, result: d9ec9be2129041802335598c5001805bad3d4ba001809b69df5a5001809cd1b4da XMAXC: 3, 3, 3, 3
+conceal: 16, result: d9ec9be2129040002335598c5000005bad3d4ba000009b69df5a5060009cd1b4da XMAXC: 0, 0, 0, 0
+conceal: 17, result: daa7aaa51a502038e46db91b502038e46db91b502038e46db91b502038e46db91b XMAXC: 0, 0, 0, 0
+conceal: 18, result: daa7aaa51a502038e46db91b502038e46db91b502038e46db91b502038e46db91b XMAXC: 0, 0, 0, 0
+conceal: 19, result: daa7aaa51a502038e46db91b502038e46db91b502038e46db91b502038e46db91b XMAXC: 0, 0, 0, 0
 Start with: d9ec9be212901d802335598c5013805bad3d4ba01f809b69df5a5019809cd1b4da, XMAXC: 3b, 27, 3f, 33
 conceal: 00, result: d9ec9be212901d802335598c5013805bad3d4ba01f809b69df5a5019809cd1b4da XMAXC: 3b, 27, 3f, 33
-conceal: 01, result: d9ec9be212901b802335598c5011805bad3d4ba01d809b69df5a5017809cd1b4da XMAXC: 37, 23, 3b, 2f
-conceal: 02, result: d9ec9be2129019802335598c500f805bad3d4ba01b809b69df5a5015809cd1b4da XMAXC: 33, 1f, 37, 2b
-conceal: 03, result: d9ec9be2129017802335598c500d805bad3d4ba019809b69df5a5013809cd1b4da XMAXC: 2f, 1b, 33, 27
-conceal: 04, result: d9ec9be2129015802335598c500b805bad3d4ba017809b69df5a5011809cd1b4da XMAXC: 2b, 17, 2f, 23
-conceal: 05, result: d9ec9be2129013802335598c5009805bad3d4ba015809b69df5a500f809cd1b4da XMAXC: 27, 13, 2b, 1f
-conceal: 06, result: d9ec9be2129011802335598c5007805bad3d4ba013809b69df5a500d809cd1b4da XMAXC: 23, f, 27, 1b
-conceal: 07, result: d9ec9be212900f802335598c5005805bad3d4ba011809b69df5a500b809cd1b4da XMAXC: 1f, b, 23, 17
-conceal: 08, result: d9ec9be212900d802335598c5003805bad3d4ba00f809b69df5a5009809cd1b4da XMAXC: 1b, 7, 1f, 13
-conceal: 09, result: d9ec9be212900b802335598c5001805bad3d4ba00d809b69df5a5007809cd1b4da XMAXC: 17, 3, 1b, f
-conceal: 10, result: d9ec9be2129009802335598c5000005bad3d4ba00b809b69df5a5005809cd1b4da XMAXC: 13, 0, 17, b
-conceal: 11, result: d9ec9be2129007802335598c5000005bad3d4ba009809b69df5a5003809cd1b4da XMAXC: f, 0, 13, 7
-conceal: 12, result: d9ec9be2129005802335598c5000005bad3d4ba007809b69df5a5001809cd1b4da XMAXC: b, 0, f, 3
-conceal: 13, result: d9ec9be2129003802335598c5000005bad3d4ba005809b69df5a5000009cd1b4da XMAXC: 7, 0, b, 0
-conceal: 14, result: d9ec9be2129001802335598c5000005bad3d4ba003809b69df5a5000009cd1b4da XMAXC: 3, 0, 7, 0
-conceal: 15, result: d9ec9be2129000002335598c5000005bad3d4ba001809b69df5a5000009cd1b4da XMAXC: 0, 0, 3, 0
-conceal: 16, result: d00000000000000000000000000000000000000000000000000000000000000000 XMAXC: 0, 0, 0, 0
-conceal: 17, result: d00000000000000000000000000000000000000000000000000000000000000000 XMAXC: 0, 0, 0, 0
-conceal: 18, result: d00000000000000000000000000000000000000000000000000000000000000000 XMAXC: 0, 0, 0, 0
-conceal: 19, result: d00000000000000000000000000000000000000000000000000000000000000000 XMAXC: 0, 0, 0, 0
+conceal: 01, result: d9ec9be212901b802335598c5011805bad3d4ba01d809b69df5a5077809cd1b4da XMAXC: 37, 23, 3b, 2f
+conceal: 02, result: d9ec9be2129019802335598c500f805bad3d4ba05b809b69df5a5055809cd1b4da XMAXC: 33, 1f, 37, 2b
+conceal: 03, result: d9ec9be2129017802335598c500d805bad3d4ba059809b69df5a5053809cd1b4da XMAXC: 2f, 1b, 33, 27
+conceal: 04, result: d9ec9be2129015802335598c506b805bad3d4ba077809b69df5a5011809cd1b4da XMAXC: 2b, 17, 2f, 23
+conceal: 05, result: d9ec9be2129013802335598c5069805bad3d4ba075809b69df5a500f809cd1b4da XMAXC: 27, 13, 2b, 1f
+conceal: 06, result: d9ec9be2129051802335598c5007805bad3d4ba053809b69df5a500d809cd1b4da XMAXC: 23, f, 27, 1b
+conceal: 07, result: d9ec9be212904f802335598c5005805bad3d4ba051809b69df5a506b809cd1b4da XMAXC: 1f, b, 23, 17
+conceal: 08, result: d9ec9be212900d802335598c5063805bad3d4ba00f809b69df5a5069809cd1b4da XMAXC: 1b, 7, 1f, 13
+conceal: 09, result: d9ec9be212900b802335598c5061805bad3d4ba04d809b69df5a5047809cd1b4da XMAXC: 17, 3, 1b, f
+conceal: 10, result: d9ec9be2129049802335598c5040005bad3d4ba04b809b69df5a5045809cd1b4da XMAXC: 13, 0, 17, b
+conceal: 11, result: d9ec9be2129047802335598c5020005bad3d4ba069809b69df5a5063809cd1b4da XMAXC: f, 0, 13, 7
+conceal: 12, result: d9ec9be2129065802335598c5060005bad3d4ba067809b69df5a5061809cd1b4da XMAXC: b, 0, f, 3
+conceal: 13, result: d9ec9be2129023802335598c5000005bad3d4ba005809b69df5a5000009cd1b4da XMAXC: 7, 0, b, 0
+conceal: 14, result: d9ec9be2129001802335598c5000005bad3d4ba003809b69df5a5060009cd1b4da XMAXC: 3, 0, 7, 0
+conceal: 15, result: d9ec9be2129040002335598c5000005bad3d4ba001809b69df5a5000009cd1b4da XMAXC: 0, 0, 3, 0
+conceal: 16, result: d9ec9be2129000002335598c5000005bad3d4ba040009b69df5a5020009cd1b4da XMAXC: 0, 0, 0, 0
+conceal: 17, result: daa7aaa51a502038e46db91b502038e46db91b502038e46db91b502038e46db91b XMAXC: 0, 0, 0, 0
+conceal: 18, result: daa7aaa51a502038e46db91b502038e46db91b502038e46db91b502038e46db91b XMAXC: 0, 0, 0, 0
+conceal: 19, result: daa7aaa51a502038e46db91b502038e46db91b502038e46db91b502038e46db91b XMAXC: 0, 0, 0, 0
 
 => Testing FR concealment (realistic, various bad frames)
 Frame No. 000:
@@ -318,7 +318,7 @@
  * output: d9689ba5e3d260491b516adb5e4027256e27227ee0351c8e549a5c60492471971b
 Frame No. 019:
  * input:  (bad)
- * output: d00000000000000000000000000000000000000000000000000000000000000000
+ * output: d9689ba5e3d240491b516adb5e0027256e27227e80351c8e549a5c00492471971b
 Frame No. 020:
  * input:  d8e6a2e1d3d2605b1376c8d35280392451391cbc80392a71b6db8aa049238dc8ab
  * output: d8e6a2e1d3d2605b1376c8d35280392451391cbc80392a71b6db8aa049238dc8ab
@@ -357,19 +357,19 @@
  * output: d9a99361a276403b1a6ad6dcd40026e489c8e3bc40371c4dc564e2c036e28eb963
 Frame No. 032:
  * input:  (bad)
- * output: d00000000000000000000000000000000000000000000000000000000000000000
+ * output: d9a99361a276003b1a6ad6dcd40026e489c8e3bc00371c4dc564e2e036e28eb963
 Frame No. 033:
  * input:  (bad)
- * output: d00000000000000000000000000000000000000000000000000000000000000000
+ * output: daa7aaa51a502038e46db91b502038e46db91b502038e46db91b502038e46db91b
 Frame No. 034:
  * input:  (bad)
- * output: d00000000000000000000000000000000000000000000000000000000000000000
+ * output: daa7aaa51a502038e46db91b502038e46db91b502038e46db91b502038e46db91b
 Frame No. 035:
  * input:  (bad)
- * output: d00000000000000000000000000000000000000000000000000000000000000000
+ * output: daa7aaa51a502038e46db91b502038e46db91b502038e46db91b502038e46db91b
 Frame No. 036:
  * input:  (bad)
- * output: d00000000000000000000000000000000000000000000000000000000000000000
+ * output: daa7aaa51a502038e46db91b502038e46db91b502038e46db91b502038e46db91b
 Frame No. 037:
  * input:  d92c8b6d5aee4034ebb22724862047145634a5c0a038e371b8e4a880485c89dd25
  * output: d92c8b6d5aee4034ebb22724862047145634a5c0a038e371b8e4a880485c89dd25

libosmocore_1.8.0.tar.xz/tests/coding/coding_test.c -> libosmocore_1.9.0.tar.xz/tests/coding/coding_test.c Changed

@@ -24,6 +24,7 @@
 #include <osmocom/core/bits.h>
 #include <osmocom/core/utils.h>
 
+#include <osmocom/gsm/protocol/gsm_04_08.h>
 #include <osmocom/coding/gsm0503_coding.h>
 
 #define DUMP_U_AT(b, x, u) do {						\
@@ -299,7 +300,7 @@
 	memset(bursts_s + 6, 0, 20);
 
 	/* Decode, correcting errors */
-	rc = gsm0503_tch_hr_decode(result, bursts_s, 0,
+	rc = gsm0503_tch_hr_decode2(result, bursts_s, 0,
 		&n_errors, &n_bits_total);
 	CHECK_RC_OR_RET(rc == len, "decoding");
 
@@ -312,6 +313,51 @@
 	printf("\n");
 }
 
+static void test_facch(const uint8_t *data, bool half_rate)
+{
+	ubit_t bursts_u116 * 8 * 2 = { 0 };
+	sbit_t bursts_s116 * 8 * 2 = { 0 };
+	int rc;
+
+	/* Encode the given FACCH message three times (at different offsets) */
+	printf("%s(FACCH/%c): encoding: %s\n",
+	       __func__, half_rate ? 'H' : 'F',
+	       osmo_hexdump(&data0, GSM_MACBLOCK_LEN));
+	for (unsigned int i = 0; i < 3; i++) {
+		ubit_t *pos = &bursts_u116 * 4 * i;
+
+		if (half_rate)
+			rc = gsm0503_tch_hr_facch_encode(pos, &data0);
+		else
+			rc = gsm0503_tch_fr_facch_encode(pos, &data0);
+		CHECK_RC_OR_RET(rc == 0, "encoding");
+	}
+
+	/* Prepare soft-bits */
+	osmo_ubit2sbit(bursts_s, bursts_u, sizeof(bursts_s));
+
+	/* Decode three FACCH messages (at different offsets) */
+	for (unsigned int i = 0; i < 3; i++) {
+		const sbit_t *pos = &bursts_s116 * 4 * i;
+		uint8_t resultGSM_MACBLOCK_LEN;
+		int n_errors, n_bits_total;
+
+		if (half_rate)
+			rc = gsm0503_tch_hr_facch_decode(&result0, pos,
+							 &n_errors, &n_bits_total);
+		else
+			rc = gsm0503_tch_fr_facch_decode(&result0, pos,
+							 &n_errors, &n_bits_total);
+		CHECK_RC_OR_RET(rc == GSM_MACBLOCK_LEN, "decoding");
+
+		printf("%s(FACCH/%c): decoded (BER=%d/%d): %s\n",
+		       __func__, half_rate ? 'H' : 'F', n_errors, n_bits_total,
+		       osmo_hexdump(result, GSM_MACBLOCK_LEN));
+	}
+
+	printf("\n");
+}
+
 struct test_macblock {
 	bool is_egprs;
 	uint16_t exp_burst_bits;
@@ -487,7 +533,128 @@
 
 uint8_t test_speech_fr33;
 uint8_t test_speech_efr31;
-uint8_t test_speech_hr15;
+uint8_t test_speech_hr14;
+
+struct csd_test_case {
+	const char *name;
+	unsigned int num_bits;
+	int (*enc_fn)(ubit_t *out, const ubit_t *in);
+	int (*dec_fn)(ubit_t *out, const sbit_t *in, int *ne, int *nb);
+	bool half_rate;
+};
+
+static const struct csd_test_case csd_tests = {
+	{
+		.name = "TCH/F9.6",
+		.num_bits = 4 * 60,
+		.enc_fn = &gsm0503_tch_fr96_encode,
+		.dec_fn = &gsm0503_tch_fr96_decode,
+	},
+	{
+		.name = "TCH/F4.8",
+		.num_bits = 2 * 60,
+		.enc_fn = &gsm0503_tch_fr48_encode,
+		.dec_fn = &gsm0503_tch_fr48_decode,
+	},
+	{
+		.name = "TCH/H4.8",
+		.num_bits = 4 * 60,
+		.enc_fn = &gsm0503_tch_hr48_encode,
+		.dec_fn = &gsm0503_tch_hr48_decode,
+		.half_rate = true,
+	},
+	{
+		.name = "TCH/F2.4",
+		.num_bits = 2 * 36,
+		.enc_fn = &gsm0503_tch_fr24_encode,
+		.dec_fn = &gsm0503_tch_fr24_decode,
+	},
+	{
+		.name = "TCH/H2.4",
+		.num_bits = 4 * 36,
+		.enc_fn = &gsm0503_tch_hr24_encode,
+		.dec_fn = &gsm0503_tch_hr24_decode,
+		.half_rate = true,
+	},
+	{
+		.name = "TCH/F14.4",
+		.num_bits = 290,
+		.enc_fn = &gsm0503_tch_fr144_encode,
+		.dec_fn = &gsm0503_tch_fr144_decode,
+	},
+};
+
+static void test_csd(const struct csd_test_case *tc, bool facch)
+{
+	const uint8_t patterns = { 0x00, 0xaa, 0xff };
+	ubit_t bursts_u116 * (22 + 8) = { 0 };
+	sbit_t bursts_s116 * (22 + 8) = { 0 };
+	ubit_t data512;
+	int rc;
+
+	/* Encode three data blocks, each block filled-in with a pattern */
+	for (unsigned int i = 0; i < ARRAY_SIZE(patterns); i++) {
+		for (unsigned int j = 0; j < tc->num_bits; j++)
+			dataj = (patternsi & (1 << (j % 8))) != 0;
+
+		rc = tc->enc_fn(&bursts_ui * 4 * 116, &data0);
+		CHECK_RC_OR_RET(rc == 0, "encoding");
+
+		/* Test FACCH bitstealing */
+		if (facch && i == 1) {
+			memset(&data, GSM_MACBLOCK_PADDING, GSM_MACBLOCK_LEN);
+			if (tc->half_rate)
+				rc = gsm0503_tch_hr_facch_encode(&bursts_u116 * 4, &data0);
+			else
+				rc = gsm0503_tch_fr_facch_encode(&bursts_u116 * 4, &data0);
+			CHECK_RC_OR_RET(rc == 0, "encoding FACCH");
+		}
+	}
+
+	/* Prepare soft-bits */
+	osmo_ubit2sbit(&bursts_s0, &bursts_u0, sizeof(bursts_s));
+
+	/* Decode the soft-bits, print decoded blocks */
+	for (unsigned int i = 0; i < ARRAY_SIZE(patterns); i++) {
+		int n_errors, n_bits_total;
+
+		rc = tc->dec_fn(&data0, &bursts_si * 4 * 116,
+				&n_errors, &n_bits_total);
+		CHECK_RC_OR_RET(rc == tc->num_bits, "decoding");
+
+		printf("%s(%s): block #%u (pattern 0x%02x): n_errors=%d / n_bits_total=%d\n",
+		       __func__, tc->name, i, patternsi, n_errors, n_bits_total);
+
+		for (unsigned int j = 0; j < tc->num_bits; j++) {
+			if (j && j % 64 == 0)
+				printf("\n");
+			else if (j && j % 8 == 0)
+				printf(" ");
+			printf("%c", dataj ? '1' : '0');
+		}
+		printf("\n");
+	}
+
+	/* Test FACCH bitstealing if requested */
+	if (facch) {
+		int n_errors = 0, n_bits_total = 0;
+
+		if (tc->half_rate) {
+			rc = gsm0503_tch_hr_facch_decode(&data0, &bursts_s116 * 4,
+							 &n_errors, &n_bits_total);
+		} else {
+			rc = gsm0503_tch_fr_facch_decode(&data0, &bursts_s116 * 4,
+							 &n_errors, &n_bits_total);
+		}
+		CHECK_RC_OR_RET(rc == GSM_MACBLOCK_LEN, "decoding FACCH");
+
+		printf("%s(%s): FACCH/%c (pattern 0x2b): n_errors=%d / n_bits_total=%d\n",
+		       __func__, tc->name, tc->half_rate ? 'H' : 'F', n_errors, n_bits_total);
+		printf("%s\n", osmo_hexdump(&data0, GSM_MACBLOCK_LEN));
+	}
+
+	printf("\n");
+}
 
 int main(int argc, char **argv)
 {
@@ -533,7 +700,6 @@
 
 	for (i = 0; i < sizeof(test_speech_hr); i++)
 		test_speech_hri = i * 17;
-	test_speech_hr0 = 0x00;
 	test_hr(test_speech_hr, sizeof(test_speech_hr));
 
 	for (i = 0; i < len_l2; i++)
@@ -550,6 +716,20 @@
 		}
 	}
 
+	printf("\nTesting FACCH/F codec:\n");
+	for (i = 0; i < ARRAY_SIZE(test_l2); i++)
+		test_facch(test_l2i, false);
+	printf("\nTesting FACCH/H codec:\n");
+	for (i = 0; i < ARRAY_SIZE(test_l2); i++)
+		test_facch(test_l2i, true);
+
+	printf("\nTesting CSD functions (no FACCH):\n");
+	for (i = 0; i < ARRAY_SIZE(csd_tests); i++)
+		test_csd(&csd_testsi, false);
+	printf("\nTesting CSD functions (with FACCH):\n");
+	for (i = 0; i < ARRAY_SIZE(csd_tests); i++)
+		test_csd(&csd_testsi, true);
+
 	printf("Success\n");
 
 	return 0;

libosmocore_1.8.0.tar.xz/tests/coding/coding_test.ok -> libosmocore_1.9.0.tar.xz/tests/coding/coding_test.ok Changed

@@ -172,22 +172,22 @@
 Decoded: 01 02 03 00 05 06 07 08 09 0a 0b 0c 0d 0e 0f 10 11 12 13 14 15 16 17 
 tch_fr_decode: n_errors=10 n_bits_total=456 ber=0.02
 
-Encoding: 00 11 22 33 44 55 66 77 88 99 aa bb cc dd ee 
+Encoding: 00 11 22 33 44 55 66 77 88 99 aa bb cc dd 
 U-Bits:
-0E1E0E0E1E0E0E1E1E0E1E0E0E0E0E0E0E0E0E1E1E0E0E1E1E1E1E1E1 23  00  E1E1E1E1E1E0E1E1E1E0E0E1E0E1E1E1E0E0E1E0E0E1E1E1E1E0E0E0E
-0E1E1E0E0E0E0E1E0E1E1E1E0E0E1E1E0E0E1E0E1E0E1E0E0E0E1E0E1 23  00  E0E0E0E1E1E1E1E1E0E1E1E1E0E0E0E0E1E1E1E0E0E1E1E0E1E1E1E0E
-E0E0E0E1E1E1E1E1E0E1E0E0E1E1E0E0E1E0E1E0E0E1E1E0E0E0E0E0E 00  23  0E0E0E1E0E1E0E1E0E0E1E1E0E1E0E0E0E1E1E1E0E0E0E0E1E0E1E0E1
-E1E0E0E1E1E1E1E1E1E0E0E1E1E1E0E0E0E1E1E1E1E1E1E1E1E0E1E1E 00  23  0E0E1E0E1E0E0E0E1E0E0E1E1E0E1E1E1E1E0E1E1E0E1E0E0E1E0E1E1
+0E0E0E0E1E0E0E0E0E0E0E1E1E0E1E0E0E0E1E1E1E0E1E0E0E0E1E1E1 23  00  E1E0E1E0E1E1E1E0E1E1E0E0E0E0E1E0E1E0E0E0E1E1E0E1E1E0E1E0E
+1E0E1E0E0E1E0E0E0E1E1E1E0E0E1E1E1E0E1E1E0E1E0E0E1E0E1E0E0 23  00  E1E1E1E1E1E1E0E1E1E0E0E1E1E0E0E0E0E0E0E0E1E1E1E1E0E0E1E1E
+E0E1E1E1E0E0E0E1E1E1E1E1E1E0E0E1E0E1E1E1E0E0E1E0E0E1E1E1E 00  23  0E1E0E0E1E1E0E1E1E1E1E1E1E1E1E1E0E1E0E0E1E1E1E0E0E0E0E1E1
+E0E0E0E1E0E0E0E1E1E0E1E0E0E0E1E0E1E0E1E0E0E0E0E0E1E0E1E0E 00  23  1E0E1E0E0E1E0E1E0E0E0E0E1E0E1E1E1E1E1E0E1E0E1E1E1E1E0E1E0
 EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE 23  23  EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
 EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE 23  23  EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
 S-Bits:
-7f 81 81 81 7f 81 7f 81 81 81 7f 81 7f 81 81 81 81 81 7f 81 81 81 7f 81 7f 81 7f 81 7f 81 7f 81 7f 81 7f 81 7f 81 81 81 81 81 7f 81 7f 81 81 81 81 81 81 81 81 81 81 81 81  81  7f  81 81 81 81 81 81 81 81 81 81 81 7f 81 81 81 81 81 81 81 7f 81 7f 81 81 81 7f 81 81 81 81 81 81 81 7f 81 7f 81 81 81 7f 81 7f 81 81 81 81 81 81 81 81 81 7f 81 7f 81 7f 81 
-7f 81 81 81 81 81 7f 81 7f 81 7f 81 7f 81 81 81 7f 81 81 81 81 81 81 81 7f 81 7f 81 81 81 81 81 7f 81 7f 81 81 81 7f 81 81 81 7f 81 81 81 7f 81 7f 81 7f 81 81 81 7f 81 81  81  7f  81 7f 81 7f 81 7f 81 81 81 81 81 81 81 81 81 81 81 7f 81 81 81 81 81 81 81 7f 81 7f 81 7f 81 7f 81 81 81 81 81 81 81 7f 81 7f 81 81 81 81 81 7f 81 81 81 81 81 81 81 7f 81 
-81 7f 81 7f 81 7f 81 81 81 81 81 81 81 81 81 81 81 7f 81 81 81 7f 81 7f 81 81 81 81 81 7f 81 7f 81 81 81 7f 81 81 81 7f 81 7f 81 81 81 81 81 7f 81 7f 81 7f 81 7f 81 7f 81  7f  81  7f 81 7f 81 7f 81 81 81 7f 81 81 81 7f 81 81 81 7f 81 7f 81 81 81 81 81 7f 81 81 81 7f 81 7f 81 7f 81 81 81 81 81 81 81 7f 81 7f 81 7f 81 7f 81 81 81 7f 81 81 81 7f 81 81 
-81 81 81 7f 81 7f 81 81 81 81 81 81 81 81 81 81 81 81 81 7f 81 7f 81 81 81 81 81 81 81 7f 81 7f 81 7f 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 7f 81 81 81 81 81  7f  81  7f 81 7f 81 81 81 7f 81 81 81 7f 81 7f 81 7f 81 81 81 7f 81 7f 81 81 81 81 81 7f 81 81 81 81 81 81 81 81 81 7f 81 81 81 81 81 7f 81 81 81 7f 81 7f 81 81 81 7f 81 81 81 81 
+7f 81 7f 81 7f 81 7f 81 81 81 7f 81 7f 81 7f 81 7f 81 7f 81 7f 81 81 81 81 81 7f 81 81 81 7f 81 7f 81 7f 81 81 81 81 81 81 81 7f 81 81 81 7f 81 7f 81 7f 81 81 81 81 81 81  81  7f  81 81 81 7f 81 81 81 7f 81 81 81 81 81 81 81 7f 81 81 81 81 81 7f 81 7f 81 7f 81 7f 81 81 81 7f 81 81 81 7f 81 7f 81 7f 81 81 81 81 81 7f 81 81 81 81 81 7f 81 81 81 7f 81 
+81 81 7f 81 81 81 7f 81 7f 81 81 81 7f 81 7f 81 7f 81 81 81 81 81 81 81 7f 81 7f 81 81 81 81 81 81 81 7f 81 81 81 81 81 7f 81 81 81 7f 81 7f 81 81 81 7f 81 81 81 7f 81 7f  81  7f  81 81 81 81 81 81 81 81 81 81 81 81 81 7f 81 81 81 81 81 7f 81 7f 81 81 81 81 81 7f 81 7f 81 7f 81 7f 81 7f 81 7f 81 7f 81 81 81 81 81 81 81 81 81 7f 81 7f 81 81 81 81 81 
+81 7f 81 81 81 81 81 81 81 7f 81 7f 81 7f 81 81 81 81 81 81 81 81 81 81 81 81 81 7f 81 7f 81 81 81 7f 81 81 81 81 81 81 81 7f 81 7f 81 81 81 7f 81 7f 81 81 81 81 81 81 81  7f  81  7f 81 81 81 7f 81 7f 81 81 81 81 81 7f 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 7f 81 81 81 7f 81 7f 81 81 81 81 81 81 81 7f 81 7f 81 7f 81 7f 81 81 81 81 
+81 7f 81 7f 81 7f 81 81 81 7f 81 7f 81 7f 81 81 81 81 81 7f 81 81 81 7f 81 7f 81 7f 81 81 81 7f 81 81 81 7f 81 81 81 7f 81 7f 81 7f 81 7f 81 7f 81 81 81 7f 81 81 81 7f 81  7f  81  81 81 7f 81 81 81 7f 81 7f 81 81 81 7f 81 81 81 7f 81 7f 81 7f 81 7f 81 81 81 7f 81 81 81 81 81 81 81 81 81 81 81 7f 81 81 81 7f 81 81 81 81 81 81 81 81 81 7f 81 81 81 7f 
 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81  81  81  81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 
 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81  81  81  81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 81 
-Decoded: 00 11 22 33 44 55 66 77 88 99 aa bb cc dd ee 
+Decoded: 00 11 22 33 44 55 66 77 88 99 aa bb cc dd 
 tch_hr_decode: n_errors=10 n_bits_total=211 ber=0.05
 
 Encoding: 03 03 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 
@@ -367,4 +367,222 @@
 81 7f 7f 7f 81 7f 7f 81 7f 7f 7f 7f 7f 7f 7f 7f 7f 7f 7f 7f 81 81 7f 81 7f 7f 81 81 81 81 81 81 7f 7f 81 7f 81 7f 7f 81 7f 7f 7f 7f 81 7f 7f 7f 81 7f 7f 81 81 81 7f 81 7f  7f  81  7f 7f 81 7f 7f 81 7f 81 7f 81 7f 81 81 7f 7f 7f 81 7f 81 81 81 7f 7f 7f 7f 7f 7f 7f 7f 7f 7f 81 7f 81 81 81 81 7f 7f 7f 81 81 81 7f 7f 7f 81 81 7f 81 7f 7f 7f 81 7f 7f 81 
 81 81 81 81 7f 7f 7f 7f 81 81 7f 81 7f 7f 81 7f 81 81 7f 81 7f 7f 7f 7f 81 81 7f 81 81 81 81 7f 7f 7f 7f 81 7f 7f 81 7f 7f 81 7f 7f 7f 7f 7f 81 7f 7f 7f 81 7f 7f 81 81 7f  7f  81  7f 7f 7f 7f 7f 7f 81 81 7f 81 81 7f 81 81 7f 81 7f 7f 7f 81 81 81 81 81 7f 81 81 81 81 7f 7f 81 81 7f 7f 81 81 7f 81 81 7f 7f 7f 7f 7f 81 81 81 81 7f 7f 7f 81 7f 7f 7f 81 
 7f 7f 81 7f 7f 7f 81 81 7f 7f 81 81 7f 81 7f 81 81 7f 7f 81 81 7f 81 81 7f 7f 81 7f 81 81 81 7f 7f 81 7f 7f 7f 81 7f 7f 7f 81 81 7f 81 81 7f 81 7f 81 81 81 7f 7f 7f 7f 7f  81  7f  7f 7f 7f 7f 81 7f 7f 7f 7f 7f 81 7f 7f 81 7f 81 81 7f 7f 7f 81 81 81 81 81 81 81 7f 7f 81 7f 81 81 81 7f 81 7f 81 81 7f 7f 7f 7f 7f 7f 7f 81 81 81 7f 81 81 7f 7f 7f 81 7f 
+
+Testing FACCH/F codec:
+test_facch(FACCH/F): encoding: 03 03 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 
+test_facch(FACCH/F): decoded (BER=0/456): 03 03 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 
+test_facch(FACCH/F): decoded (BER=0/456): 03 03 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 
+test_facch(FACCH/F): decoded (BER=0/456): 03 03 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 
+
+test_facch(FACCH/F): encoding: a3 af 5f 00 36 43 44 ab d9 6d 7d 62 24 c9 d2 92 fa 27 5d 71 7a 59 a8 
+test_facch(FACCH/F): decoded (BER=0/456): a3 af 5f 00 36 43 44 ab d9 6d 7d 62 24 c9 d2 92 fa 27 5d 71 7a 59 a8 
+test_facch(FACCH/F): decoded (BER=0/456): a3 af 5f 00 36 43 44 ab d9 6d 7d 62 24 c9 d2 92 fa 27 5d 71 7a 59 a8 
+test_facch(FACCH/F): decoded (BER=0/456): a3 af 5f 00 36 43 44 ab d9 6d 7d 62 24 c9 d2 92 fa 27 5d 71 7a 59 a8 
+
+test_facch(FACCH/F): encoding: 01 02 03 00 05 06 07 08 09 0a 0b 0c 0d 0e 0f 10 11 12 13 14 15 16 17 
+test_facch(FACCH/F): decoded (BER=0/456): 01 02 03 00 05 06 07 08 09 0a 0b 0c 0d 0e 0f 10 11 12 13 14 15 16 17 
+test_facch(FACCH/F): decoded (BER=0/456): 01 02 03 00 05 06 07 08 09 0a 0b 0c 0d 0e 0f 10 11 12 13 14 15 16 17 
+test_facch(FACCH/F): decoded (BER=0/456): 01 02 03 00 05 06 07 08 09 0a 0b 0c 0d 0e 0f 10 11 12 13 14 15 16 17 
+
+
+Testing FACCH/H codec:
+test_facch(FACCH/H): encoding: 03 03 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 
+test_facch(FACCH/H): decoded (BER=0/456): 03 03 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 
+test_facch(FACCH/H): decoded (BER=0/456): 03 03 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 
+test_facch(FACCH/H): decoded (BER=0/456): 03 03 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 
+
+test_facch(FACCH/H): encoding: a3 af 5f 00 36 43 44 ab d9 6d 7d 62 24 c9 d2 92 fa 27 5d 71 7a 59 a8 
+test_facch(FACCH/H): decoded (BER=0/456): a3 af 5f 00 36 43 44 ab d9 6d 7d 62 24 c9 d2 92 fa 27 5d 71 7a 59 a8 
+test_facch(FACCH/H): decoded (BER=0/456): a3 af 5f 00 36 43 44 ab d9 6d 7d 62 24 c9 d2 92 fa 27 5d 71 7a 59 a8 
+test_facch(FACCH/H): decoded (BER=0/456): a3 af 5f 00 36 43 44 ab d9 6d 7d 62 24 c9 d2 92 fa 27 5d 71 7a 59 a8 
+
+test_facch(FACCH/H): encoding: 01 02 03 00 05 06 07 08 09 0a 0b 0c 0d 0e 0f 10 11 12 13 14 15 16 17 
+test_facch(FACCH/H): decoded (BER=0/456): 01 02 03 00 05 06 07 08 09 0a 0b 0c 0d 0e 0f 10 11 12 13 14 15 16 17 
+test_facch(FACCH/H): decoded (BER=0/456): 01 02 03 00 05 06 07 08 09 0a 0b 0c 0d 0e 0f 10 11 12 13 14 15 16 17 
+test_facch(FACCH/H): decoded (BER=0/456): 01 02 03 00 05 06 07 08 09 0a 0b 0c 0d 0e 0f 10 11 12 13 14 15 16 17 
+
+
+Testing CSD functions (no FACCH):
+test_csd(TCH/F9.6): block #0 (pattern 0x00): n_errors=0 / n_bits_total=456
+00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+00000000 00000000 00000000 00000000 00000000 00000000
+test_csd(TCH/F9.6): block #1 (pattern 0xaa): n_errors=0 / n_bits_total=456
+01010101 01010101 01010101 01010101 01010101 01010101 01010101 01010101
+01010101 01010101 01010101 01010101 01010101 01010101 01010101 01010101
+01010101 01010101 01010101 01010101 01010101 01010101 01010101 01010101
+01010101 01010101 01010101 01010101 01010101 01010101
+test_csd(TCH/F9.6): block #2 (pattern 0xff): n_errors=0 / n_bits_total=456
+11111111 11111111 11111111 11111111 11111111 11111111 11111111 11111111
+11111111 11111111 11111111 11111111 11111111 11111111 11111111 11111111
+11111111 11111111 11111111 11111111 11111111 11111111 11111111 11111111
+11111111 11111111 11111111 11111111 11111111 11111111
+
+test_csd(TCH/F4.8): block #0 (pattern 0x00): n_errors=0 / n_bits_total=456
+00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+00000000 00000000 00000000 00000000 00000000 00000000 00000000
+test_csd(TCH/F4.8): block #1 (pattern 0xaa): n_errors=0 / n_bits_total=456
+01010101 01010101 01010101 01010101 01010101 01010101 01010101 01010101
+01010101 01010101 01010101 01010101 01010101 01010101 01010101
+test_csd(TCH/F4.8): block #2 (pattern 0xff): n_errors=0 / n_bits_total=456
+11111111 11111111 11111111 11111111 11111111 11111111 11111111 11111111
+11111111 11111111 11111111 11111111 11111111 11111111 11111111
+
+test_csd(TCH/H4.8): block #0 (pattern 0x00): n_errors=0 / n_bits_total=456
+00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+00000000 00000000 00000000 00000000 00000000 00000000
+test_csd(TCH/H4.8): block #1 (pattern 0xaa): n_errors=0 / n_bits_total=456
+01010101 01010101 01010101 01010101 01010101 01010101 01010101 01010101
+01010101 01010101 01010101 01010101 01010101 01010101 01010101 01010101
+01010101 01010101 01010101 01010101 01010101 01010101 01010101 01010101
+01010101 01010101 01010101 01010101 01010101 01010101
+test_csd(TCH/H4.8): block #2 (pattern 0xff): n_errors=0 / n_bits_total=456
+11111111 11111111 11111111 11111111 11111111 11111111 11111111 11111111
+11111111 11111111 11111111 11111111 11111111 11111111 11111111 11111111
+11111111 11111111 11111111 11111111 11111111 11111111 11111111 11111111
+11111111 11111111 11111111 11111111 11111111 11111111
+
+test_csd(TCH/F2.4): block #0 (pattern 0x00): n_errors=0 / n_bits_total=456
+00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+00000000
+test_csd(TCH/F2.4): block #1 (pattern 0xaa): n_errors=0 / n_bits_total=456
+01010101 01010101 01010101 01010101 01010101 01010101 01010101 01010101
+01010101
+test_csd(TCH/F2.4): block #2 (pattern 0xff): n_errors=0 / n_bits_total=456
+11111111 11111111 11111111 11111111 11111111 11111111 11111111 11111111
+11111111
+
+test_csd(TCH/H2.4): block #0 (pattern 0x00): n_errors=0 / n_bits_total=456
+00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+00000000 00000000
+test_csd(TCH/H2.4): block #1 (pattern 0xaa): n_errors=0 / n_bits_total=456
+01010101 01010101 01010101 01010101 01010101 01010101 01010101 01010101
+01010101 01010101 01010101 01010101 01010101 01010101 01010101 01010101
+01010101 01010101
+test_csd(TCH/H2.4): block #2 (pattern 0xff): n_errors=0 / n_bits_total=456
+11111111 11111111 11111111 11111111 11111111 11111111 11111111 11111111
+11111111 11111111 11111111 11111111 11111111 11111111 11111111 11111111
+11111111 11111111
+
+test_csd(TCH/F14.4): block #0 (pattern 0x00): n_errors=0 / n_bits_total=456
+00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+00000000 00000000 00000000 00000000 00
+test_csd(TCH/F14.4): block #1 (pattern 0xaa): n_errors=0 / n_bits_total=456
+01010101 01010101 01010101 01010101 01010101 01010101 01010101 01010101
+01010101 01010101 01010101 01010101 01010101 01010101 01010101 01010101
+01010101 01010101 01010101 01010101 01010101 01010101 01010101 01010101
+01010101 01010101 01010101 01010101 01010101 01010101 01010101 01010101
+01010101 01010101 01010101 01010101 01
+test_csd(TCH/F14.4): block #2 (pattern 0xff): n_errors=0 / n_bits_total=456
+11111111 11111111 11111111 11111111 11111111 11111111 11111111 11111111
+11111111 11111111 11111111 11111111 11111111 11111111 11111111 11111111
+11111111 11111111 11111111 11111111 11111111 11111111 11111111 11111111
+11111111 11111111 11111111 11111111 11111111 11111111 11111111 11111111
+11111111 11111111 11111111 11111111 11
+
+
+Testing CSD functions (with FACCH):
+test_csd(TCH/F9.6): block #0 (pattern 0x00): n_errors=34 / n_bits_total=456
+00000000 00000000 00000000 00000000 00010010 01100000 00000000 00000000
+00000000 00010011 01111000 00000000 00000000 00000000 00100100 10000000
+00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+00000000 00000000 00000000 00000000 00000000 00000000
+test_csd(TCH/F9.6): block #1 (pattern 0xaa): n_errors=34 / n_bits_total=456
+01010101 01010101 01010101 01010101 01010101 01010101 01010101 01010101
+01010101 01010101 01010101 01010101 01010101 01010101 00101011 01010101
+01010101 01010101 01010101 01010101 01010101 01010101 01010101 01010101
+01010101 01010101 01010101 01010101 01010101 01010101
+test_csd(TCH/F9.6): block #2 (pattern 0xff): n_errors=14 / n_bits_total=456
+11111111 11111111 11111111 11110111 11111111 11111111 11111111 11111111
+11111111 11111111 11111111 11111111 11111111 11111111 11111111 11111111
+11111111 11111111 11111111 11111111 11111111 11111111 11111111 11111111
+11111111 11111111 11111111 11111111 11111111 11111111
+test_csd(TCH/F9.6): FACCH/F (pattern 0x2b): n_errors=0 / n_bits_total=456
+2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 
+
+test_csd(TCH/F4.8): block #0 (pattern 0x00): n_errors=38 / n_bits_total=456
+00000000 00000000 01010000 00000000 00000000 00000000 00000000 00000000
+00000000 00000000 00000000 00000000 00000000 00000000 00000000
+test_csd(TCH/F4.8): block #1 (pattern 0xaa): n_errors=37 / n_bits_total=456
+01010101 01010101 01010101 01010101 01010101 01010101 01010101 01010101
+01010101 01010101 01010101 01010101 01010101 01010101 01010101
+test_csd(TCH/F4.8): block #2 (pattern 0xff): n_errors=13 / n_bits_total=456
+11111111 11111111 11111111 11111111 11111111 11111111 11111111 11111111
+11111111 11111111 11111111 11111111 11111111 11111111 11111111
+test_csd(TCH/F4.8): FACCH/F (pattern 0x2b): n_errors=0 / n_bits_total=456
+2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 
+
+test_csd(TCH/H4.8): block #0 (pattern 0x00): n_errors=35 / n_bits_total=456
+00000000 00000000 00000000 00000000 00111000 10000000 00000000 00000000
+00000001 00000000 00000000 00000000 00000000 00000000 00011000 10000000
+00000000 00000000 00000000 00000000 00000000 00001000 00000000 00000000
+00000000 00000000 00000000 00000000 00000000 00000000
+test_csd(TCH/H4.8): block #1 (pattern 0xaa): n_errors=38 / n_bits_total=456
+01010101 01010101 01010101 01010101 01010101 01010101 01010101 01010101
+01010101 01010101 01010101 01010101 01010101 01010101 00101011 01010101
+01010101 01010101 01010101 00111010 01010101 01010101 01010101 01010101
+01010101 01010101 01010101 01010101 01010101 01010101
+test_csd(TCH/H4.8): block #2 (pattern 0xff): n_errors=3 / n_bits_total=456
+11111111 11111111 11111111 11111111 11111111 11111111 11111111 11111111
+11111111 11111111 11111111 11111111 11111111 11111111 11111111 11111111
+11111111 11111111 11111111 11111111 11111111 11111111 11111111 11111111
+11111111 11111111 11111111 11111111 11111111 11111111
+test_csd(TCH/H4.8): FACCH/H (pattern 0x2b): n_errors=0 / n_bits_total=456
+2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 
+
+test_csd(TCH/F2.4): block #0 (pattern 0x00): n_errors=0 / n_bits_total=456
+00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+00000000
+test_csd(TCH/F2.4): block #1 (pattern 0xaa): n_errors=138 / n_bits_total=456
+11000010 10010010 10010010 10010010 10010010 10010010 10010101 00011000
+01001010
+test_csd(TCH/F2.4): block #2 (pattern 0xff): n_errors=0 / n_bits_total=456
+11111111 11111111 11111111 11111111 11111111 11111111 11111111 11111111
+11111111
+test_csd(TCH/F2.4): FACCH/F (pattern 0x2b): n_errors=0 / n_bits_total=456
+2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 
+
+test_csd(TCH/H2.4): block #0 (pattern 0x00): n_errors=38 / n_bits_total=456
+00000000 00000000 00000101 00000000 00000000 00000000 00000000 00000000
+00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000
+00000000 00000000
+test_csd(TCH/H2.4): block #1 (pattern 0xaa): n_errors=32 / n_bits_total=456
+01010101 01010101 01010101 01010101 01010101 01010101 01010101 01010101
+01010101 01010101 01010101 01010101 01010101 01010101 01010101 01010101
+01010101 01010101
+test_csd(TCH/H2.4): block #2 (pattern 0xff): n_errors=2 / n_bits_total=456
+11111111 11111111 11111111 11111111 11111111 11111111 11111111 11111111
+11111111 11111111 11111111 11111111 11111111 11111111 11111111 11111111
+11111111 11111111
+test_csd(TCH/H2.4): FACCH/H (pattern 0x2b): n_errors=0 / n_bits_total=456
+2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 
+
+test_csd(TCH/F14.4): block #0 (pattern 0x00): n_errors=27 / n_bits_total=456
+00000000 00000000 00000000 00000000 00000000 00111100 01000000 00000000
+00000000 00000000 00000000 00111000 10011000 00000000 10000000 00000000
+00000000 00000000 00001111 10001101 01110000 00000000 00000000 00000000
+00000000 00000000 00001001 11000000 00000000 00000000 00000000 00000000
+00000000 00000010 00100010 01000000 00
+test_csd(TCH/F14.4): block #1 (pattern 0xaa): n_errors=35 / n_bits_total=456
+01010101 01010100 10110111 01010101 01010101 00011000 10010001 11000110
+11011100 11011101 11000110 01010101 01010101 01010101 10100100 10010001
+11000110 00001010 01010101 01010101 11101101 11010101 01010100 01010101
+01010101 01010101 00101001 00100101 01010101 01010101 01010101 01010101
+01010101 01010101 01010101 01010101 01
+test_csd(TCH/F14.4): block #2 (pattern 0xff): n_errors=10 / n_bits_total=456
+11111111 11111111 11111111 11111111 11111111 11111111 11111111 11111111
+11111111 11111111 11111111 11111111 11111111 11111111 11111111 11111111
+11111111 11111111 11111111 11111111 11111111 11111111 11111111 11111111
+11111111 11111111 11111111 11111111 11111111 11111111 11111111 11111111
+11111111 11111111 11111111 11111111 11
+test_csd(TCH/F14.4): FACCH/F (pattern 0x2b): n_errors=0 / n_bits_total=456
+2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 
+
 Success

libosmocore_1.8.0.tar.xz/tests/conv/conv_gsm0503_test.ok -> libosmocore_1.9.0.tar.xz/tests/conv/conv_gsm0503_test.ok Changed

@@ -6,6 +6,46 @@
 .. Encoding / Decoding cycle : OK
 .. Encoding / Decoding cycle : OK
 
++ Testing: gsm0503_tch_f24
+. Input length  : ret =  72  exp =  72 -> OK
+. Output length : ret = 456  exp = 456 -> OK
+. Random vector checks:
+.. Encoding / Decoding cycle : OK
+.. Encoding / Decoding cycle : OK
+.. Encoding / Decoding cycle : OK
+
++ Testing: gsm0503_tch_h24
+. Input length  : ret =  72  exp =  72 -> OK
+. Output length : ret = 228  exp = 228 -> OK
+. Random vector checks:
+.. Encoding / Decoding cycle : OK
+.. Encoding / Decoding cycle : OK
+.. Encoding / Decoding cycle : OK
+
++ Testing: gsm0503_tch_f48
+. Input length  : ret = 148  exp = 148 -> OK
+. Output length : ret = 456  exp = 456 -> OK
+. Random vector checks:
+.. Encoding / Decoding cycle : OK
+.. Encoding / Decoding cycle : OK
+.. Encoding / Decoding cycle : OK
+
++ Testing: gsm0503_tch_f96
+. Input length  : ret = 240  exp = 240 -> OK
+. Output length : ret = 456  exp = 456 -> OK
+. Random vector checks:
+.. Encoding / Decoding cycle : OK
+.. Encoding / Decoding cycle : OK
+.. Encoding / Decoding cycle : OK
+
++ Testing: gsm0503_tch_f144
+. Input length  : ret = 290  exp = 290 -> OK
+. Output length : ret = 456  exp = 456 -> OK
+. Random vector checks:
+.. Encoding / Decoding cycle : OK
+.. Encoding / Decoding cycle : OK
+.. Encoding / Decoding cycle : OK
+
 + Testing: gsm0503_rach
 . Input length  : ret =  14  exp =  14 -> OK
 . Output length : ret =  36  exp =  36 -> OK

libosmocore_1.8.0.tar.xz/tests/gsm0408/gsm0408_test.c -> libosmocore_1.9.0.tar.xz/tests/gsm0408/gsm0408_test.c Changed

@@ -341,6 +341,171 @@
 	}
 }
 
+static struct osmo_routing_area_id test_osmo_routing_area_id_items = {
+	{
+		.lac = {
+			.plmn = {
+				.mcc = 77,
+				.mnc = 121,
+			},
+			.lac = 666,
+		},
+		.rac = 5,
+	},
+	{
+		.lac = {
+			.plmn = {
+				.mcc = 84,
+				.mnc = 98,
+			},
+			.lac = 11,
+		},
+		.rac = 89,
+	},
+	{
+		.lac = {
+			.plmn = {
+				.mcc = 0,
+				.mnc = 0,
+				.mnc_3_digits = false,
+				/* expecting 000-00, BCD = 00 f0 00 */
+			},
+			.lac = 0,
+		},
+		.rac = 0,
+	},
+	{
+		.lac = {
+			.plmn = {
+				.mcc = 0,
+				.mnc = 0,
+				.mnc_3_digits = true,
+				/* expecting 000-000, BCD = 00 00 00 */
+			},
+			.lac = 0,
+		},
+		.rac = 0,
+	},
+	{
+		.lac = {
+			.plmn = {
+				.mcc = 999,
+				.mnc = 999,
+			},
+			.lac = 65535,
+		},
+		.rac = 255,
+	},
+	{
+		.lac = {
+			.plmn = {
+				.mcc = 1,
+				.mnc = 2,
+				.mnc_3_digits = false,
+				/* expecting 001-02, BCD = 00 f1 20 */
+			},
+			.lac = 23,
+		},
+		.rac = 42,
+	},
+	{
+		.lac = {
+			.plmn = {
+				.mcc = 1,
+				.mnc = 2,
+				.mnc_3_digits = true,
+				/* expecting 001-002, BCD = 00 21 00 */
+			},
+			.lac = 23,
+		},
+		.rac = 42,
+	},
+	{
+		.lac = {
+			.plmn = {
+				.mcc = 12,
+				.mnc = 34,
+				.mnc_3_digits = false,
+				/* expecting 012-34, BCD = 10 f2 43 */
+			},
+			.lac = 56,
+		},
+		.rac = 78,
+	},
+	{
+		.lac = {
+			.plmn = {
+				.mcc = 12,
+				.mnc = 34,
+				.mnc_3_digits = true,
+				/* expecting 012-034, BCD = 10 42 30 */
+			},
+			.lac = 23,
+		},
+		.rac = 42,
+	},
+	{
+		.lac = {
+			.plmn = {
+				.mcc = 123,
+				.mnc = 456,
+				.mnc_3_digits = false,
+				/* expecting 123-456, BCD = 21 63 54 (false flag has no effect) */
+			},
+			.lac = 23,
+		},
+		.rac = 42,
+	},
+	{
+		.lac = {
+			.plmn = {
+				.mcc = 123,
+				.mnc = 456,
+				.mnc_3_digits = true,
+				/* expecting 123-456, BCD = 21 63 54 (same) */
+			},
+			.lac = 23,
+		},
+		.rac = 42,
+	},
+};
+
+static inline void dump_osmo_routing_area_id(const struct osmo_routing_area_id *raid)
+{
+	printf("%s%s", osmo_rai_name2(raid), raid->lac.plmn.mnc_3_digits ? " (3-digit MNC)" : "");
+}
+
+static inline void check_osmo_routing_area_id(const struct osmo_routing_area_id *raid)
+{
+	uint8_t bufsizeof(struct gsm48_ra_id) = {};
+	struct osmo_routing_area_id raid0 = {};
+	int rc;
+
+	printf("RA ID: ");
+	dump_osmo_routing_area_id(raid);
+
+	rc = osmo_routing_area_id_encode_buf(buf, sizeof(buf), raid);
+	printf("osmo_routing_area_id_encode_buf(): %src=%d\n", osmo_hexdump(buf, sizeof(buf)), rc);
+
+	rc = osmo_routing_area_id_decode(&raid0, buf, sizeof(buf));
+	printf("osmo_routing_area_id_decode(): ");
+	dump_osmo_routing_area_id(&raid0);
+	printf(" rc=%d\n", rc);
+
+	if (osmo_rai_cmp(raid, &raid0))
+		printf("FAIL\n");
+	else
+		printf("ok\n");
+}
+
+static void test_osmo_routing_area_id(void)
+{
+	int i;
+	printf("==%s()==\n", __func__);
+	for (i = 0; i < ARRAY_SIZE(test_osmo_routing_area_id_items); i++)
+		check_osmo_routing_area_id(&test_osmo_routing_area_id_itemsi);
+}
+
 static void dump_cm3(struct gsm48_classmark3 *cm3)
 {
 	printf("mult_band_supp=%02x\n", cm3->mult_band_supp);
@@ -1781,6 +1946,31 @@
 	}
 }
 
+static void test_gsm_rfn2fn(void)
+{
+	unsigned int i;
+	struct {
+		uint32_t curr_fn;
+		uint16_t rfn;
+		uint32_t exp_fn;
+	} input = {
+		{ .curr_fn = 0,		.rfn = 0,	.exp_fn = 0 },
+		{ .curr_fn = 0,		.rfn = 4,	.exp_fn = 4 },
+		{ .curr_fn = 2229729,	.rfn = 23322,	.exp_fn = 2229786 },
+		{ .curr_fn = 2229777,	.rfn = 23322,	.exp_fn = 2229786 },
+		{ .curr_fn = 1320458,	.rfn = 5070,	.exp_fn = 1320462 },
+	};
+
+	for (i = 0; i < ARRAY_SIZE(input); i++) {
+		uint32_t fn = gsm_rfn2fn(inputi.rfn, inputi.curr_fn);
+		if (fn != inputi.exp_fn) {
+			printf("Wrong frame number computed! curr_fn=%u, rfn=%u ==> fn=%u, expected fn=%u\n",
+			       inputi.curr_fn, inputi.rfn, fn, inputi.exp_fn);
+			OSMO_ASSERT(false);
+		}
+	}
+}
+
 int main(int argc, char **argv)
 {
 	test_bearer_cap();
@@ -1792,6 +1982,7 @@
 	test_bcd_number_encode_decode();
 	test_ra_cap();
 	test_lai_encode_decode();
+	test_osmo_routing_area_id();
 	test_decode_classmark3();
 
 	test_si_range_helpers();
@@ -1801,6 +1992,7 @@
 	test_power_ctrl();
 	test_rach_tx_integer_raw2val();
 	test_gsm_gsmtime2fn();
+	test_gsm_rfn2fn();
 
 	return EXIT_SUCCESS;
 }

libosmocore_1.8.0.tar.xz/tests/gsm0408/gsm0408_test.ok -> libosmocore_1.9.0.tar.xz/tests/gsm0408/gsm0408_test.ok Changed

@@ -386,6 +386,40 @@
   Encoded 21 63 54 00 17 
   gsm48_decode_lai2() gives  123-456-23 (3-digit MNC)
   passed
+==test_osmo_routing_area_id()==
+RA ID: 077-121-666-5osmo_routing_area_id_encode_buf(): 70 17 21 02 9a 05 rc=6
+osmo_routing_area_id_decode(): 077-121-666-5 (3-digit MNC) rc=6
+ok
+RA ID: 084-98-11-89osmo_routing_area_id_encode_buf(): 80 f4 89 00 0b 59 rc=6
+osmo_routing_area_id_decode(): 084-98-11-89 rc=6
+ok
+RA ID: 000-00-0-0osmo_routing_area_id_encode_buf(): 00 f0 00 00 00 00 rc=6
+osmo_routing_area_id_decode(): 000-00-0-0 rc=6
+ok
+RA ID: 000-000-0-0 (3-digit MNC)osmo_routing_area_id_encode_buf(): 00 00 00 00 00 00 rc=6
+osmo_routing_area_id_decode(): 000-000-0-0 (3-digit MNC) rc=6
+ok
+RA ID: 999-999-65535-255osmo_routing_area_id_encode_buf(): 99 99 99 ff ff ff rc=6
+osmo_routing_area_id_decode(): 999-999-65535-255 (3-digit MNC) rc=6
+ok
+RA ID: 001-02-23-42osmo_routing_area_id_encode_buf(): 00 f1 20 00 17 2a rc=6
+osmo_routing_area_id_decode(): 001-02-23-42 rc=6
+ok
+RA ID: 001-002-23-42 (3-digit MNC)osmo_routing_area_id_encode_buf(): 00 21 00 00 17 2a rc=6
+osmo_routing_area_id_decode(): 001-002-23-42 (3-digit MNC) rc=6
+ok
+RA ID: 012-34-56-78osmo_routing_area_id_encode_buf(): 10 f2 43 00 38 4e rc=6
+osmo_routing_area_id_decode(): 012-34-56-78 rc=6
+ok
+RA ID: 012-034-23-42 (3-digit MNC)osmo_routing_area_id_encode_buf(): 10 42 30 00 17 2a rc=6
+osmo_routing_area_id_decode(): 012-034-23-42 (3-digit MNC) rc=6
+ok
+RA ID: 123-456-23-42osmo_routing_area_id_encode_buf(): 21 63 54 00 17 2a rc=6
+osmo_routing_area_id_decode(): 123-456-23-42 (3-digit MNC) rc=6
+ok
+RA ID: 123-456-23-42 (3-digit MNC)osmo_routing_area_id_encode_buf(): 21 63 54 00 17 2a rc=6
+osmo_routing_area_id_decode(): 123-456-23-42 (3-digit MNC) rc=6
+ok
 =====cm3_1=====
 mult_band_supp=06
 a5_bits=00

libosmocore_1.8.0.tar.xz/tests/gsm0808/gsm0808_test.c -> libosmocore_1.9.0.tar.xz/tests/gsm0808/gsm0808_test.c Changed

@@ -1086,7 +1086,89 @@
 	msgb_free(msg);
 }
 
-static void test_gsm0808_enc_dec_channel_type(void)
+static void test_gsm0808_enc_dec_channel_type_data(void)
+{
+	struct gsm0808_channel_type enc_ct = {
+		.ch_indctr = GSM0808_CHAN_DATA,
+		.ch_rate_type = GSM0808_DATA_HALF_PREF,
+
+		.data_transparent = true,
+		.data_rate = GSM0808_DATA_RATE_TRANSP_4k8,
+	};
+	struct gsm0808_channel_type dec_ct = {};
+	struct msgb *msg;
+	uint8_t ct_enc_expected = { GSM0808_IE_CHANNEL_TYPE,
+		0x03, 0x02, 0x0b, 0x11,
+	};
+	uint8_t rc_enc;
+	int rc_dec;
+
+	msg = msgb_alloc(1024, "output buffer");
+	rc_enc = gsm0808_enc_channel_type(msg, &enc_ct);
+	OSMO_ASSERT(rc_enc == 5);
+	if (memcmp(ct_enc_expected, msg->data, msg->len)) {
+		printf("   got: %s\n", osmo_hexdump(msg->data, msg->len));
+		printf("expect: %s\n", osmo_hexdump(ct_enc_expected, sizeof(ct_enc_expected)));
+		OSMO_ASSERT(false);
+	}
+
+	rc_dec = gsm0808_dec_channel_type(&dec_ct, msg->data + 2, msg->len - 2);
+	OSMO_ASSERT(rc_dec == 3);
+	OSMO_ASSERT(dec_ct.ch_indctr == enc_ct.ch_indctr);
+	OSMO_ASSERT(dec_ct.ch_rate_type == enc_ct.ch_rate_type);
+	OSMO_ASSERT(dec_ct.data_transparent == enc_ct.data_transparent);
+	OSMO_ASSERT(dec_ct.data_rate == enc_ct.data_rate);
+	OSMO_ASSERT(dec_ct.data_rate_allowed_is_set == enc_ct.data_rate_allowed_is_set);
+	OSMO_ASSERT(dec_ct.data_asym_pref_is_set == enc_ct.data_asym_pref_is_set);
+
+	msgb_free(msg);
+}
+
+static void test_gsm0808_enc_dec_channel_type_data_asym_pref(void)
+{
+	struct gsm0808_channel_type enc_ct = {
+		.ch_indctr = GSM0808_CHAN_DATA,
+		.ch_rate_type = GSM0808_DATA_HALF_PREF,
+
+		.data_transparent = false,
+		.data_rate = GSM0808_DATA_RATE_NON_TRANSP_6k0,
+		.data_rate_allowed_is_set = true,
+		.data_rate_allowed = GSM0808_DATA_RATE_NON_TRANSP_ALLOWED_6k0
+				     | GSM0808_DATA_RATE_NON_TRANSP_ALLOWED_12k0
+				     | GSM0808_DATA_RATE_NON_TRANSP_ALLOWED_14k5,
+		.data_asym_pref_is_set = true,
+		.data_asym_pref = GSM0808_CT_ASYM_PREF_UL,
+	};
+	struct gsm0808_channel_type dec_ct = {};
+	struct msgb *msg;
+	uint8_t ct_enc_expected = { GSM0808_IE_CHANNEL_TYPE,
+		0x05, 0x02, 0x0b, 0xd1, 0x8b, 0x20,
+	};
+	uint8_t rc_enc;
+	int rc_dec;
+
+	msg = msgb_alloc(1024, "output buffer");
+	rc_enc = gsm0808_enc_channel_type(msg, &enc_ct);
+	OSMO_ASSERT(rc_enc == 7);
+	if (memcmp(ct_enc_expected, msg->data, msg->len)) {
+		printf("   got: %s\n", osmo_hexdump(msg->data, msg->len));
+		printf("expect: %s\n", osmo_hexdump(ct_enc_expected, sizeof(ct_enc_expected)));
+		OSMO_ASSERT(false);
+	}
+
+	rc_dec = gsm0808_dec_channel_type(&dec_ct, msg->data + 2, msg->len - 2);
+	OSMO_ASSERT(rc_dec == 5);
+	OSMO_ASSERT(dec_ct.ch_indctr == enc_ct.ch_indctr);
+	OSMO_ASSERT(dec_ct.ch_rate_type == enc_ct.ch_rate_type);
+	OSMO_ASSERT(dec_ct.data_transparent == enc_ct.data_transparent);
+	OSMO_ASSERT(dec_ct.data_rate == enc_ct.data_rate);
+	OSMO_ASSERT(dec_ct.data_rate_allowed_is_set == enc_ct.data_rate_allowed_is_set);
+	OSMO_ASSERT(dec_ct.data_asym_pref_is_set == enc_ct.data_asym_pref_is_set);
+
+	msgb_free(msg);
+}
+
+static void test_gsm0808_enc_dec_channel_type_speech(void)
 {
 	struct gsm0808_channel_type enc_ct = {
 		.ch_indctr = GSM0808_CHAN_SPEECH,
@@ -1117,6 +1199,64 @@
 	msgb_free(msg);
 }
 
+static void test_gsm0808_enc_dec_channel_type_sign(void)
+{
+	struct gsm0808_channel_type enc_ct = {
+		.ch_indctr = GSM0808_CHAN_SIGN,
+		.ch_rate_type = GSM0808_SIGN_FULL_PREF_NO_CHANGE,
+	};
+	struct gsm0808_channel_type dec_ct = {};
+	struct msgb *msg;
+	uint8_t ct_enc_expected = { GSM0808_IE_CHANNEL_TYPE,
+		0x03, 0x03, 0x1a, 0x00
+	};
+	uint8_t rc_enc;
+	int rc_dec;
+
+	msg = msgb_alloc(1024, "output buffer");
+	rc_enc = gsm0808_enc_channel_type(msg, &enc_ct);
+	OSMO_ASSERT(rc_enc == 5);
+	OSMO_ASSERT(memcmp(ct_enc_expected, msg->data, msg->len) == 0);
+
+	rc_dec = gsm0808_dec_channel_type(&dec_ct, msg->data + 2, msg->len - 2);
+	OSMO_ASSERT(rc_dec == 2);
+	OSMO_ASSERT(enc_ct.ch_indctr == dec_ct.ch_indctr);
+	OSMO_ASSERT(enc_ct.ch_rate_type == dec_ct.ch_rate_type);
+
+	msgb_free(msg);
+}
+
+static void test_gsm0808_dec_channel_type_err(void)
+{
+	struct gsm0808_channel_type ct;
+	int rc;
+
+	/* Unknown channel indicator */
+	const uint8_t hex1 = { 0x05, 0x0b, 0xa1, 0x25 };
+	rc = gsm0808_dec_channel_type(&ct, hex1, sizeof(hex1));
+	OSMO_ASSERT(rc == -ENOTSUP);
+
+	/* Data: ext in Octet 5 with transparent service */
+	const uint8_t hex2 = { 0x02, 0x0b, 0x80, 0x00 };
+	rc = gsm0808_dec_channel_type(&ct, hex2, sizeof(hex2));
+	OSMO_ASSERT(rc == -EINVAL);
+
+	/* Data: ext in Octet 5, but too short */
+	const uint8_t hex3 = { 0x02, 0x0b, 0xc0 };
+	rc = gsm0808_dec_channel_type(&ct, hex3, sizeof(hex3));
+	OSMO_ASSERT(rc == -EOVERFLOW);
+
+	/* Data: ext in Octet 5a, but too short */
+	const uint8_t hex4 = { 0x02, 0x0b, 0xc0, 0x80 };
+	rc = gsm0808_dec_channel_type(&ct, hex4, sizeof(hex4));
+	OSMO_ASSERT(rc == -EOVERFLOW);
+
+	/* Speech: extension bit is set in last byte */
+	const uint8_t hex5 = { 0x01, 0x0b, 0xa1, 0xa5 };
+	rc = gsm0808_dec_channel_type(&ct, hex5, sizeof(hex5));
+	OSMO_ASSERT(rc == -EOVERFLOW);
+}
+
 static void test_gsm0808_enc_dec_encrypt_info(void)
 {
 	struct gsm0808_encrypt_info enc_ei = {
@@ -1886,29 +2026,81 @@
 	msgb_free(msg_cgi_ps);
 }
 
+static void print_s15_s0(uint16_t s15_s0, bool full_rate)
+{
+	int i;
+	printf(" S15-S0 = 0x%04x = 0b" OSMO_BIN_SPEC OSMO_BIN_SPEC "\n", s15_s0,
+	       OSMO_BIN_PRINT(s15_s0 >> 8), OSMO_BIN_PRINT(s15_s0));
+	for (i = 0; i < 16; i++) {
+		uint8_t modes;
+		int m;
+		int space;
+
+		if (!(s15_s0 & (1 << i)))
+			continue;
+
+		space = 6;
+		if (i < 10)
+			space++;
+
+		printf(" S%d", i);
+
+		modes = gsm0808_amr_modes_from_cfgfull_rate ? 1 : 0i;
+		if (!modes) {
+			printf(" (empty)\n");
+			continue;
+		}
+
+		for (m = 0; m < 8; m++) {
+			if (!(modes & (1 << m))) {
+				/* avoid whitespace at line ends -- accumulate whitespace width until there is
+				 * non-whitespace to actually be printed.*/
+				space += 8;
+				continue;
+			}
+			printf("%*s", space, gsm0808_amr_mode_name(m));
+			space = 8;
+		}
+		printf("\n");
+	}
+}
+
+static void print_mr_cfg(const struct gsm48_multi_rate_conf *cfg)
+{
+	printf(" cfg.smod=%u spare=%u icmi=%u nscb=%u ver=%u\n",
+	       cfg->smod, cfg->spare, cfg->icmi, cfg->nscb, cfg->ver);
+	printf("    ");
+#define PRINT_MODE_BIT(NAME) do { \
+		if (cfg->NAME) \
+			printf(" " #NAME "=1"); \
+		else \
+			printf(" -------"); \
+	} while (0)
+	PRINT_MODE_BIT(m4_75);
+	PRINT_MODE_BIT(m5_15);
+	PRINT_MODE_BIT(m5_90);
+	PRINT_MODE_BIT(m6_70);
+	PRINT_MODE_BIT(m7_40);
+	PRINT_MODE_BIT(m7_95);
+	PRINT_MODE_BIT(m10_2);
+	PRINT_MODE_BIT(m12_2);
+	printf("\n");
+}
+
 static void test_gsm0808_sc_cfg_from_gsm48_mr_cfg_single(struct gsm48_multi_rate_conf *cfg)
 {
 	uint16_t s15_s0;
 
 	printf("Input:\n");
-	printf(" m4_75= %u   smod=  %u\n", cfg->m4_75, cfg->smod);
-	printf(" m5_15= %u   spare= %u\n", cfg->m5_15, cfg->spare);
-	printf(" m5_90= %u   icmi=  %u\n", cfg->m5_90, cfg->icmi);
-	printf(" m6_70= %u   nscb=  %u\n", cfg->m6_70, cfg->nscb);
-	printf(" m7_40= %u   ver=   %u\n", cfg->m7_40, cfg->ver);
-	printf(" m7_95= %u\n", cfg->m7_95);
-	printf(" m10_2= %u\n", cfg->m10_2);
-	printf(" m12_2= %u\n", cfg->m12_2);
+	print_mr_cfg(cfg);
 
 	s15_s0 = gsm0808_sc_cfg_from_gsm48_mr_cfg(cfg, true);
 	printf("Result (fr):\n");
-	printf(" S15-S0 = %04x = 0b" OSMO_BIN_SPEC OSMO_BIN_SPEC "\n", s15_s0,
-	       OSMO_BIN_PRINT(s15_s0 >> 8), OSMO_BIN_PRINT(s15_s0));
+	print_s15_s0(s15_s0, true);
 
 	s15_s0 = gsm0808_sc_cfg_from_gsm48_mr_cfg(cfg, false);
 	printf("Result (hr):\n");
-	printf(" S15-S0 = %04x = 0b" OSMO_BIN_SPEC OSMO_BIN_SPEC "\n", s15_s0,
-	       OSMO_BIN_PRINT(s15_s0 >> 8), OSMO_BIN_PRINT(s15_s0));
+	print_s15_s0(s15_s0, false);
 
 	printf("\n");
 }
@@ -2109,20 +2301,12 @@
 	int rc;
 
 	printf("Input:\n");
-	printf(" S15-S0 = %04x = 0b" OSMO_BIN_SPEC OSMO_BIN_SPEC "\n", s15_s0,
-	       OSMO_BIN_PRINT(s15_s0 >> 8), OSMO_BIN_PRINT(s15_s0));
+	print_s15_s0(s15_s0, true);
 
 	rc = gsm48_mr_cfg_from_gsm0808_sc_cfg(&cfg, s15_s0);
 
 	printf("Output:\n");
-	printf(" m4_75= %u   smod=  %u\n", cfg.m4_75, cfg.smod);
-	printf(" m5_15= %u   spare= %u\n", cfg.m5_15, cfg.spare);
-	printf(" m5_90= %u   icmi=  %u\n", cfg.m5_90, cfg.icmi);
-	printf(" m6_70= %u   nscb=  %u\n", cfg.m6_70, cfg.nscb);
-	printf(" m7_40= %u   ver=   %u\n", cfg.m7_40, cfg.ver);
-	printf(" m7_95= %u\n", cfg.m7_95);
-	printf(" m10_2= %u\n", cfg.m10_2);
-	printf(" m12_2= %u\n", cfg.m12_2);
+	print_mr_cfg(&cfg);
 
 	if (rc != 0)
 		printf(" Result invalid!\n");
@@ -2568,7 +2752,11 @@
 	test_gsm0808_enc_dec_speech_codec_with_cfg();
 	test_gsm0808_enc_dec_speech_codec_list();
 	test_gsm0808_enc_dec_empty_speech_codec_list();
-	test_gsm0808_enc_dec_channel_type();
+	test_gsm0808_enc_dec_channel_type_data();
+	test_gsm0808_enc_dec_channel_type_data_asym_pref();
+	test_gsm0808_enc_dec_channel_type_speech();
+	test_gsm0808_enc_dec_channel_type_sign();
+	test_gsm0808_dec_channel_type_err();
 	test_gsm0808_enc_dec_encrypt_info();
 
 	test_gsm0808_enc_dec_cell_id_list_lac();

libosmocore_1.8.0.tar.xz/tests/gsm0808/gsm0808_test.ok -> libosmocore_1.9.0.tar.xz/tests/gsm0808/gsm0808_test.ok Changed

@@ -87,549 +87,549 @@
 test_gsm0808_enc_dec_cell_id_global: encoded: 05 08 00 21 63 54 23 42 04 23 (rc = 10)
 Testing gsm0808_sc_cfg_from_gsm48_mr_cfg():
 Input:
- m4_75= 0   smod=  0
- m5_15= 0   spare= 0
- m5_90= 0   icmi=  0
- m6_70= 0   nscb=  0
- m7_40= 0   ver=   0
- m7_95= 0
- m10_2= 0
- m12_2= 0
+ cfg.smod=0 spare=0 icmi=0 nscb=0 ver=0
+     ------- ------- ------- ------- ------- ------- ------- -------
 Result (fr):
- S15-S0 = 0000 = 0b0000000000000000
+ S15-S0 = 0x0000 = 0b0000000000000000
 Result (hr):
- S15-S0 = 0000 = 0b0000000000000000
+ S15-S0 = 0x0000 = 0b0000000000000000
 
 Input:
- m4_75= 1   smod=  0
- m5_15= 0   spare= 0
- m5_90= 0   icmi=  0
- m6_70= 0   nscb=  0
- m7_40= 0   ver=   0
- m7_95= 0
- m10_2= 0
- m12_2= 0
-Result (fr):
- S15-S0 = 5701 = 0b0101011100000001
-Result (hr):
- S15-S0 = 0701 = 0b0000011100000001
+ cfg.smod=0 spare=0 icmi=0 nscb=0 ver=0
+     m4_75=1 ------- ------- ------- ------- ------- ------- -------
+Result (fr):
+ S15-S0 = 0x5701 = 0b0101011100000001
+ S0   4.75
+ S8   4.75            5.90
+ S9   4.75            5.90    6.70
+ S10  4.75            5.90    6.70    7.40
+ S12  4.75            5.90    6.70                    10.2
+ S14  4.75            5.90                    7.95            12.2
+Result (hr):
+ S15-S0 = 0x0701 = 0b0000011100000001
+ S0   4.75
+ S8   4.75            5.90
+ S9   4.75            5.90    6.70
+ S10  4.75            5.90    6.70    7.40
+
+Input:
+ cfg.smod=0 spare=0 icmi=0 nscb=0 ver=0
+     ------- m5_15=1 ------- ------- ------- ------- ------- -------
+Result (fr):
+ S15-S0 = 0x0000 = 0b0000000000000000
+Result (hr):
+ S15-S0 = 0x0000 = 0b0000000000000000
+
+Input:
+ cfg.smod=0 spare=0 icmi=0 nscb=0 ver=0
+     ------- ------- m5_90=1 ------- ------- ------- ------- -------
+Result (fr):
+ S15-S0 = 0x5704 = 0b0101011100000100
+ S2                   5.90
+ S8   4.75            5.90
+ S9   4.75            5.90    6.70
+ S10  4.75            5.90    6.70    7.40
+ S12  4.75            5.90    6.70                    10.2
+ S14  4.75            5.90                    7.95            12.2
+Result (hr):
+ S15-S0 = 0x0704 = 0b0000011100000100
+ S2                   5.90
+ S8   4.75            5.90
+ S9   4.75            5.90    6.70
+ S10  4.75            5.90    6.70    7.40
+
+Input:
+ cfg.smod=0 spare=0 icmi=0 nscb=0 ver=0
+     ------- ------- ------- m6_70=1 ------- ------- ------- -------
+Result (fr):
+ S15-S0 = 0x1608 = 0b0001011000001000
+ S3                           6.70
+ S9   4.75            5.90    6.70
+ S10  4.75            5.90    6.70    7.40
+ S12  4.75            5.90    6.70                    10.2
+Result (hr):
+ S15-S0 = 0x0608 = 0b0000011000001000
+ S3                           6.70
+ S9   4.75            5.90    6.70
+ S10  4.75            5.90    6.70    7.40
+
+Input:
+ cfg.smod=0 spare=0 icmi=0 nscb=0 ver=0
+     ------- ------- ------- ------- m7_40=1 ------- ------- -------
+Result (fr):
+ S15-S0 = 0x0410 = 0b0000010000010000
+ S4                                   7.40
+ S10  4.75            5.90    6.70    7.40
+Result (hr):
+ S15-S0 = 0x0410 = 0b0000010000010000
+ S4                                   7.40
+ S10  4.75            5.90    6.70    7.40
+
+Input:
+ cfg.smod=0 spare=0 icmi=0 nscb=0 ver=0
+     ------- ------- ------- ------- ------- m7_95=1 ------- -------
+Result (fr):
+ S15-S0 = 0x4020 = 0b0100000000100000
+ S5                                           7.95
+ S14  4.75            5.90                    7.95            12.2
+Result (hr):
+ S15-S0 = 0x0020 = 0b0000000000100000
+ S5                                           7.95
+
+Input:
+ cfg.smod=0 spare=0 icmi=0 nscb=0 ver=0
+     ------- ------- ------- ------- ------- ------- m10_2=1 -------
+Result (fr):
+ S15-S0 = 0x1040 = 0b0001000001000000
+ S6                                                   10.2
+ S12  4.75            5.90    6.70                    10.2
+Result (hr):
+ S15-S0 = 0x0000 = 0b0000000000000000
+
+Input:
+ cfg.smod=0 spare=0 icmi=0 nscb=0 ver=0
+     ------- ------- ------- ------- ------- ------- ------- m12_2=1
+Result (fr):
+ S15-S0 = 0x4080 = 0b0100000010000000
+ S7                                                           12.2
+ S14  4.75            5.90                    7.95            12.2
+Result (hr):
+ S15-S0 = 0x0000 = 0b0000000000000000
+
+Input:
+ cfg.smod=0 spare=0 icmi=0 nscb=0 ver=0
+     m4_75=1 m5_15=1 m5_90=1 m6_70=1 ------- ------- ------- -------
+Result (fr):
+ S15-S0 = 0x570d = 0b0101011100001101
+ S0   4.75
+ S2                   5.90
+ S3                           6.70
+ S8   4.75            5.90
+ S9   4.75            5.90    6.70
+ S10  4.75            5.90    6.70    7.40
+ S12  4.75            5.90    6.70                    10.2
+ S14  4.75            5.90                    7.95            12.2
+Result (hr):
+ S15-S0 = 0x070d = 0b0000011100001101
+ S0   4.75
+ S2                   5.90
+ S3                           6.70
+ S8   4.75            5.90
+ S9   4.75            5.90    6.70
+ S10  4.75            5.90    6.70    7.40
+
+Input:
+ cfg.smod=0 spare=0 icmi=0 nscb=0 ver=0
+     ------- ------- ------- ------- m7_40=1 m7_95=1 m10_2=1 m12_2=1
+Result (fr):
+ S15-S0 = 0x54f0 = 0b0101010011110000
+ S4                                   7.40
+ S5                                           7.95
+ S6                                                   10.2
+ S7                                                           12.2
+ S10  4.75            5.90    6.70    7.40
+ S12  4.75            5.90    6.70                    10.2
+ S14  4.75            5.90                    7.95            12.2
+Result (hr):
+ S15-S0 = 0x0430 = 0b0000010000110000
+ S4                                   7.40
+ S5                                           7.95
+ S10  4.75            5.90    6.70    7.40
+
+Input:
+ cfg.smod=0 spare=0 icmi=0 nscb=0 ver=0
+     ------- ------- m5_90=1 m6_70=1 ------- ------- m10_2=1 m12_2=1
+Result (fr):
+ S15-S0 = 0x57cc = 0b0101011111001100
+ S2                   5.90
+ S3                           6.70
+ S6                                                   10.2
+ S7                                                           12.2
+ S8   4.75            5.90
+ S9   4.75            5.90    6.70
+ S10  4.75            5.90    6.70    7.40
+ S12  4.75            5.90    6.70                    10.2
+ S14  4.75            5.90                    7.95            12.2
+Result (hr):
+ S15-S0 = 0x070c = 0b0000011100001100
+ S2                   5.90
+ S3                           6.70
+ S8   4.75            5.90
+ S9   4.75            5.90    6.70
+ S10  4.75            5.90    6.70    7.40
+
+Input:
+ cfg.smod=0 spare=0 icmi=0 nscb=0 ver=0
+     m4_75=1 m5_15=1 ------- ------- m7_40=1 m7_95=1 ------- -------
+Result (fr):
+ S15-S0 = 0x5731 = 0b0101011100110001
+ S0   4.75
+ S4                                   7.40
+ S5                                           7.95
+ S8   4.75            5.90
+ S9   4.75            5.90    6.70
+ S10  4.75            5.90    6.70    7.40
+ S12  4.75            5.90    6.70                    10.2
+ S14  4.75            5.90                    7.95            12.2
+Result (hr):
+ S15-S0 = 0x0731 = 0b0000011100110001
+ S0   4.75
+ S4                                   7.40
+ S5                                           7.95
+ S8   4.75            5.90
+ S9   4.75            5.90    6.70
+ S10  4.75            5.90    6.70    7.40
+
+Input:
+ cfg.smod=0 spare=0 icmi=0 nscb=0 ver=0
+     ------- m5_15=1 ------- m6_70=1 ------- m7_95=1 ------- m12_2=1
+Result (fr):
+ S15-S0 = 0x56a8 = 0b0101011010101000
+ S3                           6.70
+ S5                                           7.95
+ S7                                                           12.2
+ S9   4.75            5.90    6.70
+ S10  4.75            5.90    6.70    7.40
+ S12  4.75            5.90    6.70                    10.2
+ S14  4.75            5.90                    7.95            12.2
+Result (hr):
+ S15-S0 = 0x0628 = 0b0000011000101000
+ S3                           6.70
+ S5                                           7.95
+ S9   4.75            5.90    6.70
+ S10  4.75            5.90    6.70    7.40
+
+Input:
+ cfg.smod=0 spare=0 icmi=0 nscb=0 ver=0
+     m4_75=1 ------- m5_90=1 ------- m7_40=1 ------- m10_2=1 -------
+Result (fr):
+ S15-S0 = 0x5755 = 0b0101011101010101
+ S0   4.75
+ S2                   5.90
+ S4                                   7.40
+ S6                                                   10.2
+ S8   4.75            5.90
+ S9   4.75            5.90    6.70
+ S10  4.75            5.90    6.70    7.40
+ S12  4.75            5.90    6.70                    10.2
+ S14  4.75            5.90                    7.95            12.2
+Result (hr):
+ S15-S0 = 0x0717 = 0b0000011100010111
+ S0   4.75
+ S1   4.75            5.90            7.40
+ S2                   5.90
+ S4                                   7.40
+ S8   4.75            5.90
+ S9   4.75            5.90    6.70
+ S10  4.75            5.90    6.70    7.40
+
+Input:
+ cfg.smod=0 spare=0 icmi=0 nscb=0 ver=0
+     m4_75=1 m5_15=1 m5_90=1 m6_70=1 m7_40=1 m7_95=1 m10_2=1 m12_2=1
+Result (fr):
+ S15-S0 = 0x57ff = 0b0101011111111111
+ S0   4.75
+ S1   4.75            5.90            7.40                    12.2
+ S2                   5.90
+ S3                           6.70
+ S4                                   7.40
+ S5                                           7.95
+ S6                                                   10.2
+ S7                                                           12.2
+ S8   4.75            5.90
+ S9   4.75            5.90    6.70
+ S10  4.75            5.90    6.70    7.40
+ S12  4.75            5.90    6.70                    10.2
+ S14  4.75            5.90                    7.95            12.2
+Result (hr):
+ S15-S0 = 0x073f = 0b0000011100111111
+ S0   4.75
+ S1   4.75            5.90            7.40
+ S2                   5.90
+ S3                           6.70
+ S4                                   7.40
+ S5                                           7.95
+ S8   4.75            5.90
+ S9   4.75            5.90    6.70
+ S10  4.75            5.90    6.70    7.40
+
+Input:
+ cfg.smod=0 spare=0 icmi=0 nscb=0 ver=0
+     m4_75=1 ------- m5_90=1 ------- m7_40=1 ------- ------- m12_2=1
+Result (fr):
+ S15-S0 = 0x5797 = 0b0101011110010111
+ S0   4.75
+ S1   4.75            5.90            7.40                    12.2
+ S2                   5.90
+ S4                                   7.40
+ S7                                                           12.2
+ S8   4.75            5.90
+ S9   4.75            5.90    6.70
+ S10  4.75            5.90    6.70    7.40
+ S12  4.75            5.90    6.70                    10.2
+ S14  4.75            5.90                    7.95            12.2
+Result (hr):
+ S15-S0 = 0x0717 = 0b0000011100010111
+ S0   4.75
+ S1   4.75            5.90            7.40
+ S2                   5.90
+ S4                                   7.40
+ S8   4.75            5.90
+ S9   4.75            5.90    6.70
+ S10  4.75            5.90    6.70    7.40
+
+Input:
+ cfg.smod=0 spare=0 icmi=0 nscb=0 ver=0
+     m4_75=1 ------- m5_90=1 ------- m7_40=1 ------- ------- -------
+Result (fr):
+ S15-S0 = 0x5715 = 0b0101011100010101
+ S0   4.75
+ S2                   5.90
+ S4                                   7.40
+ S8   4.75            5.90
+ S9   4.75            5.90    6.70
+ S10  4.75            5.90    6.70    7.40
+ S12  4.75            5.90    6.70                    10.2
+ S14  4.75            5.90                    7.95            12.2
+Result (hr):
+ S15-S0 = 0x0717 = 0b0000011100010111
+ S0   4.75
+ S1   4.75            5.90            7.40
+ S2                   5.90
+ S4                                   7.40
+ S8   4.75            5.90
+ S9   4.75            5.90    6.70
+ S10  4.75            5.90    6.70    7.40
 
+Testing gsm48_mr_cfg_from_gsm0808_sc_cfg():
 Input:
- m4_75= 0   smod=  0
- m5_15= 1   spare= 0
- m5_90= 0   icmi=  0
- m6_70= 0   nscb=  0
- m7_40= 0   ver=   0
- m7_95= 0
- m10_2= 0
- m12_2= 0
-Result (fr):
- S15-S0 = 0000 = 0b0000000000000000
-Result (hr):
- S15-S0 = 0000 = 0b0000000000000000
+ S15-S0 = 0xff03 = 0b1111111100000011
+ S0   4.75
+ S1   4.75            5.90            7.40                    12.2
+ S8   4.75            5.90
+ S9   4.75            5.90    6.70
+ S10  4.75            5.90    6.70    7.40
+ S11 (empty)
+ S12  4.75            5.90    6.70                    10.2
+ S13 (empty)
+ S14  4.75            5.90                    7.95            12.2
+ S15 (empty)
+Output:
+ cfg.smod=0 spare=0 icmi=1 nscb=0 ver=1
+     m4_75=1 ------- m5_90=1 ------- m7_40=1 ------- ------- m12_2=1
 
 Input:
- m4_75= 0   smod=  0
- m5_15= 0   spare= 0
- m5_90= 1   icmi=  0
- m6_70= 0   nscb=  0
- m7_40= 0   ver=   0
- m7_95= 0
- m10_2= 0
- m12_2= 0
-Result (fr):
- S15-S0 = 5704 = 0b0101011100000100
-Result (hr):
- S15-S0 = 0704 = 0b0000011100000100
+ S15-S0 = 0x0000 = 0b0000000000000000
+Output:
+ cfg.smod=0 spare=0 icmi=1 nscb=0 ver=1
+     ------- ------- ------- ------- ------- ------- ------- -------
+ Result invalid!
 
 Input:
- m4_75= 0   smod=  0
- m5_15= 0   spare= 0
- m5_90= 0   icmi=  0
- m6_70= 1   nscb=  0
- m7_40= 0   ver=   0
- m7_95= 0
- m10_2= 0
- m12_2= 0
-Result (fr):
- S15-S0 = 1608 = 0b0001011000001000
-Result (hr):
- S15-S0 = 0608 = 0b0000011000001000
+ S15-S0 = 0xff06 = 0b1111111100000110
+ S1   4.75            5.90            7.40                    12.2
+ S2                   5.90
+ S8   4.75            5.90
+ S9   4.75            5.90    6.70
+ S10  4.75            5.90    6.70    7.40
+ S11 (empty)
+ S12  4.75            5.90    6.70                    10.2
+ S13 (empty)
+ S14  4.75            5.90                    7.95            12.2
+ S15 (empty)
+Output:
+ cfg.smod=0 spare=0 icmi=1 nscb=0 ver=1
+     m4_75=1 ------- m5_90=1 ------- m7_40=1 ------- ------- m12_2=1
 
 Input:
- m4_75= 0   smod=  0
- m5_15= 0   spare= 0
- m5_90= 0   icmi=  0
- m6_70= 0   nscb=  0
- m7_40= 1   ver=   0
- m7_95= 0
- m10_2= 0
- m12_2= 0
-Result (fr):
- S15-S0 = 0410 = 0b0000010000010000
-Result (hr):
- S15-S0 = 0410 = 0b0000010000010000
+ S15-S0 = 0x3e08 = 0b0011111000001000
+ S3                           6.70
+ S9   4.75            5.90    6.70
+ S10  4.75            5.90    6.70    7.40
+ S11 (empty)
+ S12  4.75            5.90    6.70                    10.2
+ S13 (empty)
+Output:
+ cfg.smod=0 spare=0 icmi=1 nscb=0 ver=1
+     ------- ------- ------- m6_70=1 ------- ------- ------- -------
 
 Input:
- m4_75= 0   smod=  0
- m5_15= 0   spare= 0
- m5_90= 0   icmi=  0
- m6_70= 0   nscb=  0
- m7_40= 0   ver=   0
- m7_95= 1
- m10_2= 0
- m12_2= 0
-Result (fr):
- S15-S0 = 4020 = 0b0100000000100000
-Result (hr):
- S15-S0 = 0020 = 0b0000000000100000
+ S15-S0 = 0x0c12 = 0b0000110000010010
+ S1   4.75            5.90            7.40                    12.2
+ S4                                   7.40
+ S10  4.75            5.90    6.70    7.40
+ S11 (empty)
+Output:
+ cfg.smod=0 spare=0 icmi=1 nscb=0 ver=1
+     m4_75=1 ------- m5_90=1 ------- m7_40=1 ------- ------- m12_2=1
 
 Input:
- m4_75= 0   smod=  0
- m5_15= 0   spare= 0
- m5_90= 0   icmi=  0
- m6_70= 0   nscb=  0
- m7_40= 0   ver=   0
- m7_95= 0
- m10_2= 1
- m12_2= 0
-Result (fr):
- S15-S0 = 1040 = 0b0001000001000000
-Result (hr):
- S15-S0 = 0000 = 0b0000000000000000
+ S15-S0 = 0xc020 = 0b1100000000100000
+ S5                                           7.95
+ S14  4.75            5.90                    7.95            12.2
+ S15 (empty)
+Output:
+ cfg.smod=0 spare=0 icmi=1 nscb=0 ver=1
+     ------- ------- ------- ------- ------- m7_95=1 ------- -------
 
 Input:
- m4_75= 0   smod=  0
- m5_15= 0   spare= 0
- m5_90= 0   icmi=  0
- m6_70= 0   nscb=  0
- m7_40= 0   ver=   0
- m7_95= 0
- m10_2= 0
- m12_2= 1
-Result (fr):
- S15-S0 = 4080 = 0b0100000010000000
-Result (hr):
- S15-S0 = 0000 = 0b0000000000000000
+ S15-S0 = 0x3040 = 0b0011000001000000
+ S6                                                   10.2
+ S12  4.75            5.90    6.70                    10.2
+ S13 (empty)
+Output:
+ cfg.smod=0 spare=0 icmi=1 nscb=0 ver=1
+     ------- ------- ------- ------- ------- ------- m10_2=1 -------
 
 Input:
- m4_75= 1   smod=  0
- m5_15= 1   spare= 0
- m5_90= 1   icmi=  0
- m6_70= 1   nscb=  0
- m7_40= 0   ver=   0
- m7_95= 0
- m10_2= 0
- m12_2= 0
-Result (fr):
- S15-S0 = 570d = 0b0101011100001101
-Result (hr):
- S15-S0 = 070d = 0b0000011100001101
+ S15-S0 = 0xc082 = 0b1100000010000010
+ S1   4.75            5.90            7.40                    12.2
+ S7                                                           12.2
+ S14  4.75            5.90                    7.95            12.2
+ S15 (empty)
+Output:
+ cfg.smod=0 spare=0 icmi=1 nscb=0 ver=1
+     m4_75=1 ------- m5_90=1 ------- m7_40=1 ------- ------- m12_2=1
 
 Input:
- m4_75= 0   smod=  0
- m5_15= 0   spare= 0
- m5_90= 0   icmi=  0
- m6_70= 0   nscb=  0
- m7_40= 1   ver=   0
- m7_95= 1
- m10_2= 1
- m12_2= 1
-Result (fr):
- S15-S0 = 54f0 = 0b0101010011110000
-Result (hr):
- S15-S0 = 0430 = 0b0000010000110000
+ S15-S0 = 0x0001 = 0b0000000000000001
+ S0   4.75
+Output:
+ cfg.smod=0 spare=0 icmi=1 nscb=0 ver=1
+     m4_75=1 ------- ------- ------- ------- ------- ------- -------
 
 Input:
- m4_75= 0   smod=  0
- m5_15= 0   spare= 0
- m5_90= 1   icmi=  0
- m6_70= 1   nscb=  0
- m7_40= 0   ver=   0
- m7_95= 0
- m10_2= 1
- m12_2= 1
-Result (fr):
- S15-S0 = 57cc = 0b0101011111001100
-Result (hr):
- S15-S0 = 070c = 0b0000011100001100
+ S15-S0 = 0x0002 = 0b0000000000000010
+ S1   4.75            5.90            7.40                    12.2
+Output:
+ cfg.smod=0 spare=0 icmi=1 nscb=0 ver=1
+     m4_75=1 ------- m5_90=1 ------- m7_40=1 ------- ------- m12_2=1
 
 Input:
- m4_75= 1   smod=  0
- m5_15= 1   spare= 0
- m5_90= 0   icmi=  0
- m6_70= 0   nscb=  0
- m7_40= 1   ver=   0
- m7_95= 1
- m10_2= 0
- m12_2= 0
-Result (fr):
- S15-S0 = 5731 = 0b0101011100110001
-Result (hr):
- S15-S0 = 0731 = 0b0000011100110001
+ S15-S0 = 0x0004 = 0b0000000000000100
+ S2                   5.90
+Output:
+ cfg.smod=0 spare=0 icmi=1 nscb=0 ver=1
+     ------- ------- m5_90=1 ------- ------- ------- ------- -------
 
 Input:
- m4_75= 0   smod=  0
- m5_15= 1   spare= 0
- m5_90= 0   icmi=  0
- m6_70= 1   nscb=  0
- m7_40= 0   ver=   0
- m7_95= 1
- m10_2= 0
- m12_2= 1
-Result (fr):
- S15-S0 = 56a8 = 0b0101011010101000
-Result (hr):
- S15-S0 = 0628 = 0b0000011000101000
+ S15-S0 = 0x0008 = 0b0000000000001000
+ S3                           6.70
+Output:
+ cfg.smod=0 spare=0 icmi=1 nscb=0 ver=1
+     ------- ------- ------- m6_70=1 ------- ------- ------- -------
 
 Input:
- m4_75= 1   smod=  0
- m5_15= 0   spare= 0
- m5_90= 1   icmi=  0
- m6_70= 0   nscb=  0
- m7_40= 1   ver=   0
- m7_95= 0
- m10_2= 1
- m12_2= 0
-Result (fr):
- S15-S0 = 5755 = 0b0101011101010101
-Result (hr):
- S15-S0 = 0717 = 0b0000011100010111
+ S15-S0 = 0x0010 = 0b0000000000010000
+ S4                                   7.40
+Output:
+ cfg.smod=0 spare=0 icmi=1 nscb=0 ver=1
+     ------- ------- ------- ------- m7_40=1 ------- ------- -------
 
 Input:
- m4_75= 1   smod=  0
- m5_15= 1   spare= 0
- m5_90= 1   icmi=  0
- m6_70= 1   nscb=  0
- m7_40= 1   ver=   0
- m7_95= 1
- m10_2= 1
- m12_2= 1
-Result (fr):
- S15-S0 = 57ff = 0b0101011111111111
-Result (hr):
- S15-S0 = 073f = 0b0000011100111111
+ S15-S0 = 0x0020 = 0b0000000000100000
+ S5                                           7.95
+Output:
+ cfg.smod=0 spare=0 icmi=1 nscb=0 ver=1
+     ------- ------- ------- ------- ------- m7_95=1 ------- -------
 
 Input:
- m4_75= 1   smod=  0
- m5_15= 0   spare= 0
- m5_90= 1   icmi=  0
- m6_70= 0   nscb=  0
- m7_40= 1   ver=   0
- m7_95= 0
- m10_2= 0
- m12_2= 1
-Result (fr):
- S15-S0 = 5797 = 0b0101011110010111
-Result (hr):
- S15-S0 = 0717 = 0b0000011100010111
+ S15-S0 = 0x0040 = 0b0000000001000000
+ S6                                                   10.2
+Output:
+ cfg.smod=0 spare=0 icmi=1 nscb=0 ver=1
+     ------- ------- ------- ------- ------- ------- m10_2=1 -------
 
 Input:
- m4_75= 1   smod=  0
- m5_15= 0   spare= 0
- m5_90= 1   icmi=  0
- m6_70= 0   nscb=  0
- m7_40= 1   ver=   0
- m7_95= 0
- m10_2= 0
- m12_2= 0
-Result (fr):
- S15-S0 = 5715 = 0b0101011100010101
-Result (hr):
- S15-S0 = 0717 = 0b0000011100010111
+ S15-S0 = 0x0080 = 0b0000000010000000
+ S7                                                           12.2
+Output:
+ cfg.smod=0 spare=0 icmi=1 nscb=0 ver=1
+     ------- ------- ------- ------- ------- ------- ------- m12_2=1
 
-Testing gsm48_mr_cfg_from_gsm0808_sc_cfg():
 Input:
- S15-S0 = ff03 = 0b1111111100000011
+ S15-S0 = 0x0058 = 0b0000000001011000
+ S3                           6.70
+ S4                                   7.40
+ S6                                                   10.2
 Output:
- m4_75= 1   smod=  0
- m5_15= 0   spare= 0
- m5_90= 1   icmi=  1
- m6_70= 0   nscb=  0
- m7_40= 1   ver=   1
- m7_95= 0
- m10_2= 0
- m12_2= 1
-
-Input:
- S15-S0 = 0000 = 0b0000000000000000
-Output:
- m4_75= 0   smod=  0
- m5_15= 0   spare= 0
- m5_90= 0   icmi=  1
- m6_70= 0   nscb=  0
- m7_40= 0   ver=   1
- m7_95= 0
- m10_2= 0
- m12_2= 0
- Result invalid!
+ cfg.smod=0 spare=0 icmi=1 nscb=0 ver=1
+     ------- ------- ------- m6_70=1 m7_40=1 ------- m10_2=1 -------
+
+Input:
+ S15-S0 = 0x0021 = 0b0000000000100001
+ S0   4.75
+ S5                                           7.95
+Output:
+ cfg.smod=0 spare=0 icmi=1 nscb=0 ver=1
+     m4_75=1 ------- ------- ------- ------- m7_95=1 ------- -------
+
+Input:
+ S15-S0 = 0x0084 = 0b0000000010000100
+ S2                   5.90
+ S7                                                           12.2
+Output:
+ cfg.smod=0 spare=0 icmi=1 nscb=0 ver=1
+     ------- ------- m5_90=1 ------- ------- ------- ------- m12_2=1
+
+Input:
+ S15-S0 = 0x0086 = 0b0000000010000110
+ S1   4.75            5.90            7.40                    12.2
+ S2                   5.90
+ S7                                                           12.2
+Output:
+ cfg.smod=0 spare=0 icmi=1 nscb=0 ver=1
+     m4_75=1 ------- m5_90=1 ------- m7_40=1 ------- ------- m12_2=1
 
 Input:
- S15-S0 = ff06 = 0b1111111100000110
+ S15-S0 = 0x000a = 0b0000000000001010
+ S1   4.75            5.90            7.40                    12.2
+ S3                           6.70
 Output:
- m4_75= 1   smod=  0
- m5_15= 0   spare= 0
- m5_90= 1   icmi=  1
- m6_70= 0   nscb=  0
- m7_40= 1   ver=   1
- m7_95= 0
- m10_2= 0
- m12_2= 1
-
-Input:
- S15-S0 = 3e08 = 0b0011111000001000
-Output:
- m4_75= 0   smod=  0
- m5_15= 0   spare= 0
- m5_90= 0   icmi=  1
- m6_70= 1   nscb=  0
- m7_40= 0   ver=   1
- m7_95= 0
- m10_2= 0
- m12_2= 0
-
-Input:
- S15-S0 = 0c12 = 0b0000110000010010
-Output:
- m4_75= 1   smod=  0
- m5_15= 0   spare= 0
- m5_90= 1   icmi=  1
- m6_70= 0   nscb=  0
- m7_40= 1   ver=   1
- m7_95= 0
- m10_2= 0
- m12_2= 1
-
-Input:
- S15-S0 = c020 = 0b1100000000100000
-Output:
- m4_75= 0   smod=  0
- m5_15= 0   spare= 0
- m5_90= 0   icmi=  1
- m6_70= 0   nscb=  0
- m7_40= 0   ver=   1
- m7_95= 1
- m10_2= 0
- m12_2= 0
-
-Input:
- S15-S0 = 3040 = 0b0011000001000000
-Output:
- m4_75= 0   smod=  0
- m5_15= 0   spare= 0
- m5_90= 0   icmi=  1
- m6_70= 0   nscb=  0
- m7_40= 0   ver=   1
- m7_95= 0
- m10_2= 1
- m12_2= 0
-
-Input:
- S15-S0 = c082 = 0b1100000010000010
-Output:
- m4_75= 1   smod=  0
- m5_15= 0   spare= 0
- m5_90= 1   icmi=  1
- m6_70= 0   nscb=  0
- m7_40= 1   ver=   1
- m7_95= 0
- m10_2= 0
- m12_2= 1
-
-Input:
- S15-S0 = 0001 = 0b0000000000000001
-Output:
- m4_75= 1   smod=  0
- m5_15= 0   spare= 0
- m5_90= 0   icmi=  1
- m6_70= 0   nscb=  0
- m7_40= 0   ver=   1
- m7_95= 0
- m10_2= 0
- m12_2= 0
-
-Input:
- S15-S0 = 0002 = 0b0000000000000010
-Output:
- m4_75= 1   smod=  0
- m5_15= 0   spare= 0
- m5_90= 1   icmi=  1
- m6_70= 0   nscb=  0
- m7_40= 1   ver=   1
- m7_95= 0
- m10_2= 0
- m12_2= 1
-
-Input:
- S15-S0 = 0004 = 0b0000000000000100
-Output:
- m4_75= 0   smod=  0
- m5_15= 0   spare= 0
- m5_90= 1   icmi=  1
- m6_70= 0   nscb=  0
- m7_40= 0   ver=   1
- m7_95= 0
- m10_2= 0
- m12_2= 0
-
-Input:
- S15-S0 = 0008 = 0b0000000000001000
-Output:
- m4_75= 0   smod=  0
- m5_15= 0   spare= 0
- m5_90= 0   icmi=  1
- m6_70= 1   nscb=  0
- m7_40= 0   ver=   1
- m7_95= 0
- m10_2= 0
- m12_2= 0
-
-Input:
- S15-S0 = 0010 = 0b0000000000010000
-Output:
- m4_75= 0   smod=  0
- m5_15= 0   spare= 0
- m5_90= 0   icmi=  1
- m6_70= 0   nscb=  0
- m7_40= 1   ver=   1
- m7_95= 0
- m10_2= 0
- m12_2= 0
-
-Input:
- S15-S0 = 0020 = 0b0000000000100000
-Output:
- m4_75= 0   smod=  0
- m5_15= 0   spare= 0
- m5_90= 0   icmi=  1
- m6_70= 0   nscb=  0
- m7_40= 0   ver=   1
- m7_95= 1
- m10_2= 0
- m12_2= 0
-
-Input:
- S15-S0 = 0040 = 0b0000000001000000
-Output:
- m4_75= 0   smod=  0
- m5_15= 0   spare= 0
- m5_90= 0   icmi=  1
- m6_70= 0   nscb=  0
- m7_40= 0   ver=   1
- m7_95= 0
- m10_2= 1
- m12_2= 0
-
-Input:
- S15-S0 = 0080 = 0b0000000010000000
-Output:
- m4_75= 0   smod=  0
- m5_15= 0   spare= 0
- m5_90= 0   icmi=  1
- m6_70= 0   nscb=  0
- m7_40= 0   ver=   1
- m7_95= 0
- m10_2= 0
- m12_2= 1
-
-Input:
- S15-S0 = 0058 = 0b0000000001011000
-Output:
- m4_75= 0   smod=  0
- m5_15= 0   spare= 0
- m5_90= 0   icmi=  1
- m6_70= 1   nscb=  0
- m7_40= 1   ver=   1
- m7_95= 0
- m10_2= 1
- m12_2= 0
-
-Input:
- S15-S0 = 0021 = 0b0000000000100001
-Output:
- m4_75= 1   smod=  0
- m5_15= 0   spare= 0
- m5_90= 0   icmi=  1
- m6_70= 0   nscb=  0
- m7_40= 0   ver=   1
- m7_95= 1
- m10_2= 0
- m12_2= 0
-
-Input:
- S15-S0 = 0084 = 0b0000000010000100
-Output:
- m4_75= 0   smod=  0
- m5_15= 0   spare= 0
- m5_90= 1   icmi=  1
- m6_70= 0   nscb=  0
- m7_40= 0   ver=   1
- m7_95= 0
- m10_2= 0
- m12_2= 1
-
-Input:
- S15-S0 = 0086 = 0b0000000010000110
-Output:
- m4_75= 1   smod=  0
- m5_15= 0   spare= 0
- m5_90= 1   icmi=  1
- m6_70= 0   nscb=  0
- m7_40= 1   ver=   1
- m7_95= 0
- m10_2= 0
- m12_2= 1
-
-Input:
- S15-S0 = 000a = 0b0000000000001010
-Output:
- m4_75= 1   smod=  0
- m5_15= 0   spare= 0
- m5_90= 1   icmi=  1
- m6_70= 0   nscb=  0
- m7_40= 1   ver=   1
- m7_95= 0
- m10_2= 0
- m12_2= 1
+ cfg.smod=0 spare=0 icmi=1 nscb=0 ver=1
+     m4_75=1 ------- m5_90=1 ------- m7_40=1 ------- ------- m12_2=1
  Result invalid!
 
 Input:
- S15-S0 = 0079 = 0b0000000001111001
+ S15-S0 = 0x0079 = 0b0000000001111001
+ S0   4.75
+ S3                           6.70
+ S4                                   7.40
+ S5                                           7.95
+ S6                                                   10.2
 Output:
- m4_75= 1   smod=  0
- m5_15= 0   spare= 0
- m5_90= 0   icmi=  1
- m6_70= 1   nscb=  0
- m7_40= 1   ver=   1
- m7_95= 1
- m10_2= 0
- m12_2= 0
+ cfg.smod=0 spare=0 icmi=1 nscb=0 ver=1
+     m4_75=1 ------- ------- m6_70=1 m7_40=1 m7_95=1 ------- -------
  Result invalid!
 
 Input:
- S15-S0 = 0000 = 0b0000000000000000
+ S15-S0 = 0x0000 = 0b0000000000000000
 Output:
- m4_75= 0   smod=  0
- m5_15= 0   spare= 0
- m5_90= 0   icmi=  1
- m6_70= 0   nscb=  0
- m7_40= 0   ver=   1
- m7_95= 0
- m10_2= 0
- m12_2= 0
+ cfg.smod=0 spare=0 icmi=1 nscb=0 ver=1
+     ------- ------- ------- ------- ------- ------- ------- -------
  Result invalid!
 
 Input:
- S15-S0 = ffff = 0b1111111111111111
+ S15-S0 = 0xffff = 0b1111111111111111
+ S0   4.75
+ S1   4.75            5.90            7.40                    12.2
+ S2                   5.90
+ S3                           6.70
+ S4                                   7.40
+ S5                                           7.95
+ S6                                                   10.2
+ S7                                                           12.2
+ S8   4.75            5.90
+ S9   4.75            5.90    6.70
+ S10  4.75            5.90    6.70    7.40
+ S11 (empty)
+ S12  4.75            5.90    6.70                    10.2
+ S13 (empty)
+ S14  4.75            5.90                    7.95            12.2
+ S15 (empty)
 Output:
- m4_75= 1   smod=  0
- m5_15= 0   spare= 0
- m5_90= 1   icmi=  1
- m6_70= 0   nscb=  0
- m7_40= 1   ver=   1
- m7_95= 0
- m10_2= 0
- m12_2= 1
+ cfg.smod=0 spare=0 icmi=1 nscb=0 ver=1
+     m4_75=1 ------- m5_90=1 ------- m7_40=1 ------- ------- m12_2=1
  Result invalid!

libosmocore_1.9.0.tar.xz/tests/gsm44021 Added

libosmocore_1.9.0.tar.xz/tests/gsm44021/frame_csd_test.c Added

@@ -0,0 +1,93 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <unistd.h>
+
+#include <osmocom/core/bits.h>
+#include <osmocom/isdn/v110.h>
+#include <osmocom/gsm/gsm44021.h>
+
+
+static void fill_v110_frame(struct osmo_v110_decoded_frame *fr)
+{
+	unsigned int i;
+
+	memset(fr, 0, sizeof(*fr));
+
+	/* we abuse the fact that ubit_t is 8bit so we can actually
+	 * store integer values to clearly identify which bit ends up where */
+
+	/* D1..D48: 101..148 */
+	for (i = 0; i < ARRAY_SIZE(fr->d_bits); i++)
+		fr->d_bitsi = 101 + i;
+	/* E1..E7: 201..207 */
+	for (i = 0; i < ARRAY_SIZE(fr->e_bits); i++)
+		fr->e_bitsi = 201 + i;
+	/* S1..S9: 211..219 */
+	for (i = 0; i < ARRAY_SIZE(fr->s_bits); i++)
+		fr->s_bitsi = 211 + i;
+	/* X1..X2: 221..222 */
+	for (i = 0; i < ARRAY_SIZE(fr->x_bits); i++)
+		fr->x_bitsi = 221 + i;
+}
+
+
+static void test_frame_enc_12k_6k(void)
+{
+	struct osmo_v110_decoded_frame fr;
+	ubit_t bits60;
+
+	printf("Testing Frame Encoding for 12k/6k radio interface rate\n");
+
+	fill_v110_frame(&fr);
+
+	/* run encoder and dump to stdout */
+	memset(bits, 0xff, sizeof(bits));
+	osmo_csd_12k_6k_encode_frame(bits, sizeof(bits), &fr);
+	osmo_csd_ubit_dump(stdout, bits, sizeof(bits));
+
+	/* run decoder on what we just encoded */
+	memset(&fr, 0, sizeof(fr));
+	osmo_csd_12k_6k_decode_frame(&fr, bits, sizeof(bits));
+
+	/* re-encode and dump again 'expout' will match it. */
+	memset(bits, 0xff, sizeof(bits));
+	osmo_csd_12k_6k_encode_frame(bits, sizeof(bits), &fr);
+	osmo_csd_ubit_dump(stdout, bits, sizeof(bits));
+}
+
+static void test_frame_enc_3k6(void)
+{
+	struct osmo_v110_decoded_frame fr;
+	ubit_t bits36;
+
+	printf("Testing Frame Encoding for 3.6k radio interface rate\n");
+
+	fill_v110_frame(&fr);
+	/* different D-bit numbering for 3k6, see TS 44.021 Section 8.1.4 */
+	for (unsigned int i = 0; i < ARRAY_SIZE(fr.d_bits); i++)
+		fr.d_bitsi = 101 + i/2;
+
+	/* run encoder and dump to stdout */
+	memset(bits, 0xff, sizeof(bits));
+	osmo_csd_3k6_encode_frame(bits, sizeof(bits), &fr);
+	osmo_csd_ubit_dump(stdout, bits, sizeof(bits));
+
+	/* run decoder on what we just encoded */
+	memset(&fr, 0, sizeof(fr));
+	osmo_csd_3k6_decode_frame(&fr, bits, sizeof(bits));
+
+	/* re-encode and dump again 'expout' will match it. */
+	memset(bits, 0xff, sizeof(bits));
+	osmo_csd_3k6_encode_frame(bits, sizeof(bits), &fr);
+	osmo_csd_ubit_dump(stdout, bits, sizeof(bits));
+}
+
+
+int main(int argc, char **argv)
+{
+	test_frame_enc_12k_6k();
+	printf("\n");
+	test_frame_enc_3k6();
+}
+

libosmocore_1.9.0.tar.xz/tests/gsm44021/frame_csd_test.ok Added

libosmocore_1.8.0.tar.xz/tests/gsm48/rest_octets_test.c -> libosmocore_1.9.0.tar.xz/tests/gsm48/rest_octets_test.c Changed

libosmocore_1.8.0.tar.xz/tests/lapd/lapd_test.c -> libosmocore_1.9.0.tar.xz/tests/lapd/lapd_test.c Changed

libosmocore_1.8.0.tar.xz/tests/logging/logging_vty_test.c -> libosmocore_1.9.0.tar.xz/tests/logging/logging_vty_test.c Changed

libosmocore_1.8.0.tar.xz/tests/logging/logging_vty_test.vty -> libosmocore_1.9.0.tar.xz/tests/logging/logging_vty_test.vty Changed

libosmocore_1.8.0.tar.xz/tests/osmo-auc-gen/osmo-auc-gen_test.ok -> libosmocore_1.9.0.tar.xz/tests/osmo-auc-gen/osmo-auc-gen_test.ok Changed

@@ -1,7 +1,7 @@
 
 
 > osmo-auc-gen -3 -a milenage -r 6a61050765caa32c90371370e5d6dc2d -k 1dc4f974325cce611e54f516dc1fec56 -o 2a48162ff3edca4adf0b7b5e527d6c16 -s 0
-osmo-auc-gen (C) 2011-2012 by Harald Welte
+osmo-auc-gen (C) 2011-2023 by Harald Welte
 This is FREE SOFTWARE with ABSOLUTELY NO WARRANTY
 
 RAND:	6a61050765caa32c90371370e5d6dc2d
@@ -18,7 +18,7 @@
 
 
 > osmo-auc-gen -3 -a milenage -r 6a61050765caa32c90371370e5d6dc2d -k 1dc4f974325cce611e54f516dc1fec56 -o 2a48162ff3edca4adf0b7b5e527d6c16 -s 1
-osmo-auc-gen (C) 2011-2012 by Harald Welte
+osmo-auc-gen (C) 2011-2023 by Harald Welte
 This is FREE SOFTWARE with ABSOLUTELY NO WARRANTY
 
 RAND:	6a61050765caa32c90371370e5d6dc2d
@@ -35,7 +35,7 @@
 
 
 > osmo-auc-gen -3 -a milenage -r 6a61050765caa32c90371370e5d6dc2d -k 1dc4f974325cce611e54f516dc1fec56 -o 2a48162ff3edca4adf0b7b5e527d6c16 -s 23
-osmo-auc-gen (C) 2011-2012 by Harald Welte
+osmo-auc-gen (C) 2011-2023 by Harald Welte
 This is FREE SOFTWARE with ABSOLUTELY NO WARRANTY
 
 RAND:	6a61050765caa32c90371370e5d6dc2d
@@ -52,7 +52,7 @@
 
 
 > osmo-auc-gen -3 -a milenage -r 1dc4f974325cce611e54f516dc1fec56 -k 2a48162ff3edca4adf0b7b5e527d6c16 -o 6a61050765caa32c90371370e5d6dc2d -s 42
-osmo-auc-gen (C) 2011-2012 by Harald Welte
+osmo-auc-gen (C) 2011-2023 by Harald Welte
 This is FREE SOFTWARE with ABSOLUTELY NO WARRANTY
 
 RAND:	1dc4f974325cce611e54f516dc1fec56
@@ -69,7 +69,7 @@
 
 
 > osmo-auc-gen -3 -a milenage -r 2a48162ff3edca4adf0b7b5e527d6c16 -k 6a61050765caa32c90371370e5d6dc2d -o 1dc4f974325cce611e54f516dc1fec56 -s 99
-osmo-auc-gen (C) 2011-2012 by Harald Welte
+osmo-auc-gen (C) 2011-2023 by Harald Welte
 This is FREE SOFTWARE with ABSOLUTELY NO WARRANTY
 
 RAND:	2a48162ff3edca4adf0b7b5e527d6c16
@@ -86,7 +86,7 @@
 
 
 > osmo-auc-gen -3 -a milenage -r 6a61050765caa32c90371370e5d6dc2d -k 2a48162ff3edca4adf0b7b5e527d6c16 -o 1dc4f974325cce611e54f516dc1fec56 -s 281474976710655
-osmo-auc-gen (C) 2011-2012 by Harald Welte
+osmo-auc-gen (C) 2011-2023 by Harald Welte
 This is FREE SOFTWARE with ABSOLUTELY NO WARRANTY
 
 RAND:	6a61050765caa32c90371370e5d6dc2d
@@ -103,7 +103,7 @@
 
 
 > osmo-auc-gen -3 -a milenage -r 39fa2f4e3d523d8619a73b4f65c3e14d -k EB215756028D60E3275E613320AEC880 -o FB2A3D1B360F599ABAB99DB8669F8308 -A 979498b1f72d3e28c59fa2e72f9c
-osmo-auc-gen (C) 2011-2012 by Harald Welte
+osmo-auc-gen (C) 2011-2023 by Harald Welte
 This is FREE SOFTWARE with ABSOLUTELY NO WARRANTY
 
 RAND:	39fa2f4e3d523d8619a73b4f65c3e14d
@@ -121,7 +121,7 @@
 
 
 > osmo-auc-gen -3 -a milenage -r 39fa2f4e3d523d8619a73b4f65c3e14d -k EB215756028D60E3275E613320AEC880 -o FB2A3D1B360F599ABAB99DB8669F8308 -A 979498b1f72d3e28c59fa2e72f9c --ind 5
-osmo-auc-gen (C) 2011-2012 by Harald Welte
+osmo-auc-gen (C) 2011-2023 by Harald Welte
 This is FREE SOFTWARE with ABSOLUTELY NO WARRANTY
 
 RAND:	39fa2f4e3d523d8619a73b4f65c3e14d
@@ -139,7 +139,7 @@
 
 
 > osmo-auc-gen -3 -a milenage -r 39fa2f4e3d523d8619a73b4f65c3e14d -k EB215756028D60E3275E613320AEC880 -o FB2A3D1B360F599ABAB99DB8669F8308 -A 979498b1f72d3e28c59fa2e72f9c --ind 23
-osmo-auc-gen (C) 2011-2012 by Harald Welte
+osmo-auc-gen (C) 2011-2023 by Harald Welte
 This is FREE SOFTWARE with ABSOLUTELY NO WARRANTY
 
 RAND:	39fa2f4e3d523d8619a73b4f65c3e14d
@@ -157,7 +157,7 @@
 
 
 > osmo-auc-gen -3 -a milenage -r 39fa2f4e3d523d8619a73b4f65c3e14d -k EB215756028D60E3275E613320AEC880 -o FB2A3D1B360F599ABAB99DB8669F8308 -A 979498b1f72d3e28c59fa2e72f9c --ind 31
-osmo-auc-gen (C) 2011-2012 by Harald Welte
+osmo-auc-gen (C) 2011-2023 by Harald Welte
 This is FREE SOFTWARE with ABSOLUTELY NO WARRANTY
 
 RAND:	39fa2f4e3d523d8619a73b4f65c3e14d
@@ -175,7 +175,7 @@
 
 
 > osmo-auc-gen -3 -a milenage -r 39fa2f4e3d523d8619a73b4f65c3e14d -k EB215756028D60E3275E613320AEC880 -o FB2A3D1B360F599ABAB99DB8669F8308 -A 979498b1f72d3e28c59fa2e72f9c --ind-len 0
-osmo-auc-gen (C) 2011-2012 by Harald Welte
+osmo-auc-gen (C) 2011-2023 by Harald Welte
 This is FREE SOFTWARE with ABSOLUTELY NO WARRANTY
 
 RAND:	39fa2f4e3d523d8619a73b4f65c3e14d
@@ -193,7 +193,7 @@
 
 
 > osmo-auc-gen -3 -a milenage -r 39fa2f4e3d523d8619a73b4f65c3e14d -k EB215756028D60E3275E613320AEC880 -o FB2A3D1B360F599ABAB99DB8669F8308 -A 979498b1f72d3e28c59fa2e72f9c --ind-len 1
-osmo-auc-gen (C) 2011-2012 by Harald Welte
+osmo-auc-gen (C) 2011-2023 by Harald Welte
 This is FREE SOFTWARE with ABSOLUTELY NO WARRANTY
 
 RAND:	39fa2f4e3d523d8619a73b4f65c3e14d
@@ -211,7 +211,7 @@
 
 
 > osmo-auc-gen -3 -a milenage -r 39fa2f4e3d523d8619a73b4f65c3e14d -k EB215756028D60E3275E613320AEC880 -o FB2A3D1B360F599ABAB99DB8669F8308 -A 979498b1f72d3e28c59fa2e72f9c --ind-len 1 --ind 1
-osmo-auc-gen (C) 2011-2012 by Harald Welte
+osmo-auc-gen (C) 2011-2023 by Harald Welte
 This is FREE SOFTWARE with ABSOLUTELY NO WARRANTY
 
 RAND:	39fa2f4e3d523d8619a73b4f65c3e14d
@@ -229,7 +229,7 @@
 
 
 > osmo-auc-gen -3 -a milenage -r 39fa2f4e3d523d8619a73b4f65c3e14d -k EB215756028D60E3275E613320AEC880 -o FB2A3D1B360F599ABAB99DB8669F8308 -A 979498b1f72d3e28c59fa2e72f9c --ind-len 8
-osmo-auc-gen (C) 2011-2012 by Harald Welte
+osmo-auc-gen (C) 2011-2023 by Harald Welte
 This is FREE SOFTWARE with ABSOLUTELY NO WARRANTY
 
 RAND:	39fa2f4e3d523d8619a73b4f65c3e14d
@@ -247,7 +247,7 @@
 
 
 > osmo-auc-gen -3 -a milenage -r 39fa2f4e3d523d8619a73b4f65c3e14d -k EB215756028D60E3275E613320AEC880 -o FB2A3D1B360F599ABAB99DB8669F8308 -A 979498b1f72d3e28c59fa2e72f9c --ind-len 8 --ind 1
-osmo-auc-gen (C) 2011-2012 by Harald Welte
+osmo-auc-gen (C) 2011-2023 by Harald Welte
 This is FREE SOFTWARE with ABSOLUTELY NO WARRANTY
 
 RAND:	39fa2f4e3d523d8619a73b4f65c3e14d
@@ -266,27 +266,27 @@
 
 expecting error:
 > osmo-auc-gen -3 -a milenage -r 39fa2f4e3d523d8619a73b4f65c3e14d -k EB215756028D60E3275E613320AEC880 -o FB2A3D1B360F599ABAB99DB8669F8308 -A 979498b1f72d3e28c59fa2e72f9c --ind -1
-osmo-auc-gen (C) 2011-2012 by Harald Welte
+osmo-auc-gen (C) 2011-2023 by Harald Welte
 This is FREE SOFTWARE with ABSOLUTELY NO WARRANTY
 
 
 
 expecting error:
 > osmo-auc-gen -3 -a milenage -r 39fa2f4e3d523d8619a73b4f65c3e14d -k EB215756028D60E3275E613320AEC880 -o FB2A3D1B360F599ABAB99DB8669F8308 -A 979498b1f72d3e28c59fa2e72f9c --ind 32
-osmo-auc-gen (C) 2011-2012 by Harald Welte
+osmo-auc-gen (C) 2011-2023 by Harald Welte
 This is FREE SOFTWARE with ABSOLUTELY NO WARRANTY
 
 
 
 expecting error:
 > osmo-auc-gen -3 -a milenage -r 39fa2f4e3d523d8619a73b4f65c3e14d -k EB215756028D60E3275E613320AEC880 -o FB2A3D1B360F599ABAB99DB8669F8308 -A 979498b1f72d3e28c59fa2e72f9c --ind 42
-osmo-auc-gen (C) 2011-2012 by Harald Welte
+osmo-auc-gen (C) 2011-2023 by Harald Welte
 This is FREE SOFTWARE with ABSOLUTELY NO WARRANTY
 
 
 
 expecting error:
 > osmo-auc-gen -3 -a milenage -r 39fa2f4e3d523d8619a73b4f65c3e14d -k EB215756028D60E3275E613320AEC880 -o FB2A3D1B360F599ABAB99DB8669F8308 -A 979498b1f72d3e28c59fa2e72f9c --ind-len 0 --ind 1
-osmo-auc-gen (C) 2011-2012 by Harald Welte
+osmo-auc-gen (C) 2011-2023 by Harald Welte
 This is FREE SOFTWARE with ABSOLUTELY NO WARRANTY

libosmocore_1.9.0.tar.xz/tests/osmo_io Added

libosmocore_1.9.0.tar.xz/tests/osmo_io/osmo_io_test.c Added

@@ -0,0 +1,178 @@
+/*
+ * (C) 2023 by sysmocom s.f.m.c
+ * Author: Daniel Willmann <daniel@sysmocom.de>
+ *
+ * All Rights Reserved
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ */
+
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <sys/socket.h>
+#include <errno.h>
+
+#include <osmocom/core/application.h>
+#include <osmocom/core/bits.h>
+#include <osmocom/core/logging.h>
+#include <osmocom/core/msgb.h>
+#include <osmocom/core/osmo_io.h>
+#include <osmocom/core/select.h>
+#include <osmocom/core/utils.h>
+
+#include "config.h"
+
+#define TEST_START() printf("Running %s\n", __func__)
+
+static uint8_t TESTDATA = {
+	1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16
+};
+
+
+static void *ctx = NULL;
+
+static void read_cb(struct osmo_io_fd *iofd, int rc, struct msgb *msg)
+{
+	printf("%s: read() msg with len=%d\n", osmo_iofd_get_name(iofd), rc);
+	if (msg)
+		printf("%s\n", osmo_hexdump(msgb_data(msg), msgb_length(msg)));
+
+	talloc_free(msg);
+}
+
+static void write_cb(struct osmo_io_fd *iofd, int rc, struct msgb *msg)
+{
+	uint8_t *buf;
+	printf("%s: write() returned rc=%d\n", osmo_iofd_get_name(iofd), rc);
+	if (rc == 0) {
+		msg = msgb_alloc(1024, "Test data");
+		buf = msgb_put(msg, sizeof(TESTDATA));
+		memcpy(buf, TESTDATA, sizeof(TESTDATA));
+
+		osmo_iofd_write_msgb(iofd, msg);
+	}
+}
+
+struct osmo_io_ops ioops_conn_read_write = {
+	.read_cb = read_cb,
+	.write_cb = write_cb,
+};
+
+static void test_connected(void)
+{
+	int fds2 = {0, 0}, rc;
+	struct osmo_io_fd *iofd1, *iofd2;
+
+	TEST_START();
+
+	rc = socketpair(AF_UNIX, SOCK_STREAM, 0, fds);
+	OSMO_ASSERT(rc == 0);
+
+	iofd1 = osmo_iofd_setup(ctx, fds0, "ep1", OSMO_IO_FD_MODE_READ_WRITE, &ioops_conn_read_write, NULL);
+	osmo_iofd_register(iofd1, fds0);
+	iofd2 = osmo_iofd_setup(ctx, fds1, "ep2", OSMO_IO_FD_MODE_READ_WRITE, &ioops_conn_read_write, NULL);
+	osmo_iofd_register(iofd2, fds1);
+	// Explicitly check if ep1 is connected through write_cb
+	osmo_iofd_notify_connected(iofd1);
+
+	/* Allow enough cycles to handle the messages */
+	for (int i = 0; i < 128; i++)
+		osmo_select_main(1);
+
+	osmo_iofd_free(iofd1);
+	osmo_iofd_free(iofd2);
+
+	for (int i = 0; i < 128; i++)
+		osmo_select_main(1);
+}
+
+static void recvfrom_cb(struct osmo_io_fd *iofd, int rc, struct msgb *msg,
+			const struct osmo_sockaddr *saddr)
+{
+	printf("%s: recvfrom() msg with len=%d\n", osmo_iofd_get_name(iofd), rc);
+	if (msg)
+		printf("%s\n", osmo_hexdump(msgb_data(msg), msgb_length(msg)));
+
+	talloc_free(msg);
+}
+
+static void sendto_cb(struct osmo_io_fd *iofd, int rc, struct msgb *msg,
+		      const struct osmo_sockaddr *daddr)
+{
+	printf("%s: sendto() returned rc=%d\n", osmo_iofd_get_name(iofd), rc);
+}
+
+struct osmo_io_ops ioops_conn_recvfrom_sendto = {
+	.sendto_cb = sendto_cb,
+	.recvfrom_cb = recvfrom_cb,
+};
+
+static void test_unconnected(void)
+{
+	int fds2 = {0, 0}, rc;
+	struct osmo_io_fd *iofd1, *iofd2;
+	struct msgb *msg;
+	uint8_t *buf;
+
+	TEST_START();
+
+	rc = socketpair(AF_UNIX, SOCK_DGRAM, 0, fds);
+	OSMO_ASSERT(rc == 0);
+
+	iofd1 = osmo_iofd_setup(ctx, fds0, "ep1", OSMO_IO_FD_MODE_RECVFROM_SENDTO, &ioops_conn_recvfrom_sendto, NULL);
+	osmo_iofd_register(iofd1, fds0);
+	iofd2 = osmo_iofd_setup(ctx, fds1, "ep2", OSMO_IO_FD_MODE_RECVFROM_SENDTO, &ioops_conn_recvfrom_sendto, NULL);
+	osmo_iofd_register(iofd2, fds1);
+
+	msg = msgb_alloc(1024, "Test data");
+	buf = msgb_put(msg, sizeof(TESTDATA));
+	memcpy(buf, TESTDATA, sizeof(TESTDATA));
+
+	osmo_iofd_sendto_msgb(iofd1, msg, 0, NULL);
+
+	/* Allow enough cycles to handle the messages */
+	for (int i = 0; i < 128; i++)
+		osmo_select_main(1);
+
+	osmo_iofd_free(iofd1);
+	osmo_iofd_free(iofd2);
+
+	for (int i = 0; i < 128; i++)
+		osmo_select_main(1);
+}
+static const struct log_info_cat default_categories = {
+};
+
+static struct log_info info = {
+	.cat = default_categories,
+	.num_cat = ARRAY_SIZE(default_categories),
+};
+
+int main(int argc, char *argv)
+{
+	ctx = talloc_named_const(NULL, 0, "osmo_io_test");
+	osmo_init_logging2(ctx, &info);
+	log_set_use_color(osmo_stderr_target, 0);
+	log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE);
+	log_set_print_category(osmo_stderr_target, 0);
+	log_set_print_category_hex(osmo_stderr_target, 0);
+
+	test_connected();
+	test_unconnected();
+
+	return EXIT_SUCCESS;
+}

libosmocore_1.9.0.tar.xz/tests/osmo_io/osmo_io_test.err Changed

libosmocore_1.9.0.tar.xz/tests/osmo_io/osmo_io_test.ok Added

libosmocore_1.8.0.tar.xz/tests/socket/socket_sctp_test.err -> libosmocore_1.9.0.tar.xz/tests/socket/socket_sctp_test.err Changed

libosmocore_1.8.0.tar.xz/tests/stats/stats_test.c -> libosmocore_1.9.0.tar.xz/tests/stats/stats_test.c Changed

libosmocore_1.8.0.tar.xz/tests/testsuite.at -> libosmocore_1.9.0.tar.xz/tests/testsuite.at Changed

@@ -126,6 +126,12 @@
 AT_CHECK($abs_top_builddir/tests/auth/milenage_test, 0, expout, ignore)
 AT_CLEANUP
 
+AT_SETUP(auth_xor2g)
+AT_KEYWORDS(auth_xor2g)
+cat $abs_srcdir/auth/xor2g_test.ok > expout
+AT_CHECK($abs_top_builddir/tests/auth/xor2g_test, 0, expout, ignore)
+AT_CLEANUP
+
 AT_SETUP(comp128)
 AT_KEYWORDS(comp128)
 cat $abs_srcdir/comp128/comp128_test.ok > expout
@@ -484,3 +490,29 @@
 cat $abs_srcdir/iuup/iuup_test.ok > expout
 AT_CHECK($abs_top_builddir/tests/iuup/iuup_test, 0, expout, ignore)
 AT_CLEANUP
+
+AT_SETUP(v110_frame_test)
+AT_KEYWORDS(v110_frame_test)
+cat $abs_srcdir/v110/frame_test.ok > expout
+AT_CHECK($abs_top_builddir/tests/v110/frame_test, , expout,)
+AT_CLEANUP
+
+AT_SETUP(v110_ra1_test)
+AT_KEYWORDS(v110_ra1_test)
+cat $abs_srcdir/v110/ra1_test.ok > expout
+AT_CHECK($abs_top_builddir/tests/v110/ra1_test, , expout,)
+AT_CLEANUP
+
+AT_SETUP(gsm44021_frame_csd_test)
+AT_KEYWORDS(gsm44021_frame_csd_test)
+cat $abs_srcdir/gsm44021/frame_csd_test.ok > expout
+AT_CHECK($abs_top_builddir/tests/gsm44021/frame_csd_test, , expout,)
+AT_CLEANUP
+
+AT_SETUP(osmo_io)
+AT_KEYWORDS(osmo_io)
+cat $abs_srcdir/osmo_io/osmo_io_test.ok > expout
+cat $abs_srcdir/osmo_io/osmo_io_test.err > experr
+touch experr
+AT_CHECK($abs_top_builddir/tests/osmo_io/osmo_io_test, 0, expout, experr)
+AT_CLEANUP

libosmocore_1.8.0.tar.xz/tests/tlv/tlv_test.c -> libosmocore_1.9.0.tar.xz/tests/tlv/tlv_test.c Changed

libosmocore_1.9.0.tar.xz/tests/v110 Added

libosmocore_1.9.0.tar.xz/tests/v110/frame_test.c Added

@@ -0,0 +1,54 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <unistd.h>
+
+#include <osmocom/core/bits.h>
+#include <osmocom/isdn/v110.h>
+
+
+static void test_frame_enc(void)
+{
+	struct osmo_v110_decoded_frame fr;
+	ubit_t bits80;
+	unsigned int i;
+
+	memset(&fr, 0, sizeof(fr));
+
+	/* we abuse the fact that ubit_t is 8bit so we can actually
+	 * store integer values to clearly identify which bit ends up where */
+
+	/* D1..D48: 101..148 */
+	for (i = 0; i < ARRAY_SIZE(fr.d_bits); i++)
+		fr.d_bitsi = 101 + i;
+	/* E1..E7: 201..207 */
+	for (i = 0; i < ARRAY_SIZE(fr.e_bits); i++)
+		fr.e_bitsi = 201 + i;
+	/* S1..S9: 211..219 */
+	for (i = 0; i < ARRAY_SIZE(fr.s_bits); i++)
+		fr.s_bitsi = 211 + i;
+	/* X1..X2: 221..222 */
+	for (i = 0; i < ARRAY_SIZE(fr.x_bits); i++)
+		fr.x_bitsi = 221 + i;
+
+	/* run encoder and dump to stdout */
+	memset(bits, 0xff, sizeof(bits));
+	osmo_v110_encode_frame(bits, sizeof(bits), &fr);
+	osmo_v110_ubit_dump(stdout, bits, sizeof(bits));
+
+	/* run decoder on what we just encoded */
+	memset(&fr, 0, sizeof(fr));
+	osmo_v110_decode_frame(&fr, bits, sizeof(bits));
+
+	/* re-encode and dump again 'expout' will match it. */
+	memset(bits, 0xff, sizeof(bits));
+	osmo_v110_encode_frame(bits, sizeof(bits), &fr);
+	osmo_v110_ubit_dump(stdout, bits, sizeof(bits));
+}
+
+
+int main(int argc, char **argv)
+{
+	test_frame_enc();
+}
+

libosmocore_1.9.0.tar.xz/tests/v110/frame_test.ok Added

libosmocore_1.9.0.tar.xz/tests/v110/ra1_test.c Added

@@ -0,0 +1,74 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <unistd.h>
+
+#include <osmocom/core/bits.h>
+#include <osmocom/isdn/v110.h>
+
+
+static void test_ra1(enum osmo_v100_sync_ra1_rate rate)
+{
+	int user_rate = osmo_v110_sync_ra1_get_user_data_rate(rate);
+	int user_data_chunk_bits;
+	struct osmo_v110_decoded_frame fr;
+	ubit_t user_bits48;
+	ubit_t bits80;
+	unsigned int i;
+	int rc;
+
+	printf("\n======= User data rate %u\n", user_rate);
+
+	user_data_chunk_bits = osmo_v110_sync_ra1_get_user_data_chunk_bitlen(rate);
+	OSMO_ASSERT(user_data_chunk_bits >= 0);
+
+	/* we abuse the fact that ubit_t is 8bit so we can actually
+	 * store integer values to clearly identify which bit ends up where */
+	memset(user_bits, 0xFE, sizeof(user_bits));
+	for (i = 0; i < user_data_chunk_bits; i++)
+		user_bitsi = 101 + i;
+
+	printf("user_bits: ");
+	for (i = 0; i < user_data_chunk_bits; i++)
+		printf("%03d ", user_bitsi);
+	printf("\n");
+
+	/* generate the decoded v.110 frame */
+	memset(&fr, 0, sizeof(fr));
+	rc = osmo_v110_sync_ra1_user_to_ir(rate, &fr, user_bits, user_data_chunk_bits);
+	OSMO_ASSERT(rc == 0);
+
+	/* run encoder and dump to stdout */
+	memset(bits, 0xff, sizeof(bits));
+	osmo_v110_encode_frame(bits, sizeof(bits), &fr);
+	printf("dumping %u encoded bits in V.110 frame:\n", user_data_chunk_bits);
+	osmo_v110_ubit_dump(stdout, bits, sizeof(bits));
+
+	/* run decoder on what we just encoded */
+	memset(&fr, 0, sizeof(fr));
+	osmo_v110_decode_frame(&fr, bits, sizeof(bits));
+	printf("dumping re-decoded V.110 frame:\n");
+	printf("E-bits: %s\n", osmo_hexdump(fr.e_bits, sizeof(fr.e_bits)));
+	printf("S-bits: %s\n", osmo_hexdump(fr.s_bits, sizeof(fr.s_bits)));
+
+	/* re-encode and dump again 'expout' will match it. */
+	memset(user_bits, 0xff, sizeof(user_bits));
+	rc = osmo_v110_sync_ra1_ir_to_user(rate, user_bits, sizeof(user_bits), &fr);
+	if (rc != user_data_chunk_bits) {
+		fprintf(stderr, "ERROR: adapt_ir_to_user() returned %d, expected %u\n", rc,
+			user_data_chunk_bits);
+		exit(23);
+	}
+	fprintf(stdout, "re-decoded user bits: ");
+	for (i = 0; i < user_data_chunk_bits; i++)
+		printf("%03d ", user_bitsi);
+	printf("\n");
+}
+
+
+int main(int argc, char **argv)
+{
+	for (int i = 0; i < _NUM_OSMO_V110_SYNC_RA1; i++)
+		test_ra1(i);
+}
+

libosmocore_1.9.0.tar.xz/tests/v110/ra1_test.ok Added

@@ -0,0 +1,216 @@
+
+======= User data rate 600
+user_bits: 101 102 103 104 105 106 
+dumping 6 encoded bits in V.110 frame:
+0	0	0	0	0	0	0	0
+1	101	101	101	101	101	101	0
+1	101	101	102	102	102	102	0
+1	102	102	102	102	103	103	0
+1	103	103	103	103	103	103	0
+1	1	0	0	0	0	0	0
+1	104	104	104	104	104	104	0
+1	104	104	105	105	105	105	0
+1	105	105	105	105	106	106	0
+1	106	106	106	106	106	106	0
+dumping re-decoded V.110 frame:
+E-bits: 01 00 00 00 00 00 00 
+S-bits: 00 00 00 00 00 00 00 00 00 
+re-decoded user bits: 101 102 103 104 105 106 
+
+======= User data rate 1200
+user_bits: 101 102 103 104 105 106 107 108 109 110 111 112 
+dumping 12 encoded bits in V.110 frame:
+0	0	0	0	0	0	0	0
+1	101	101	101	101	102	102	0
+1	102	102	103	103	103	103	0
+1	104	104	104	104	105	105	0
+1	105	105	106	106	106	106	0
+1	0	1	0	0	0	0	0
+1	107	107	107	107	108	108	0
+1	108	108	109	109	109	109	0
+1	110	110	110	110	111	111	0
+1	111	111	112	112	112	112	0
+dumping re-decoded V.110 frame:
+E-bits: 00 01 00 00 00 00 00 
+S-bits: 00 00 00 00 00 00 00 00 00 
+re-decoded user bits: 101 102 103 104 105 106 107 108 109 110 111 112 
+
+======= User data rate 2400
+user_bits: 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 
+dumping 24 encoded bits in V.110 frame:
+0	0	0	0	0	0	0	0
+1	101	101	102	102	103	103	0
+1	104	104	105	105	106	106	0
+1	107	107	108	108	109	109	0
+1	110	110	111	111	112	112	0
+1	1	1	0	0	0	0	0
+1	113	113	114	114	115	115	0
+1	116	116	117	117	118	118	0
+1	119	119	120	120	121	121	0
+1	122	122	123	123	124	124	0
+dumping re-decoded V.110 frame:
+E-bits: 01 01 00 00 00 00 00 
+S-bits: 00 00 00 00 00 00 00 00 00 
+re-decoded user bits: 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 
+
+======= User data rate 4800
+user_bits: 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 
+dumping 48 encoded bits in V.110 frame:
+0	0	0	0	0	0	0	0
+1	101	102	103	104	105	106	0
+1	107	108	109	110	111	112	0
+1	113	114	115	116	117	118	0
+1	119	120	121	122	123	124	0
+1	0	1	1	0	0	0	0
+1	125	126	127	128	129	130	0
+1	131	132	133	134	135	136	0
+1	137	138	139	140	141	142	0
+1	143	144	145	146	147	148	0
+dumping re-decoded V.110 frame:
+E-bits: 00 01 01 00 00 00 00 
+S-bits: 00 00 00 00 00 00 00 00 00 
+re-decoded user bits: 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 
+
+======= User data rate 7200
+user_bits: 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 
+dumping 36 encoded bits in V.110 frame:
+0	0	0	0	0	0	0	0
+1	101	102	103	104	105	106	0
+1	107	108	109	110	1	1	0
+1	111	112	1	1	113	114	0
+1	1	1	115	116	117	118	0
+1	1	0	1	0	0	0	0
+1	119	120	121	122	123	124	0
+1	125	126	127	128	1	1	0
+1	129	130	1	1	131	132	0
+1	1	1	133	134	135	136	0
+dumping re-decoded V.110 frame:
+E-bits: 01 00 01 00 00 00 00 
+S-bits: 00 00 00 00 00 00 00 00 00 
+re-decoded user bits: 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 
+
+======= User data rate 9600
+user_bits: 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 
+dumping 48 encoded bits in V.110 frame:
+0	0	0	0	0	0	0	0
+1	101	102	103	104	105	106	0
+1	107	108	109	110	111	112	0
+1	113	114	115	116	117	118	0
+1	119	120	121	122	123	124	0
+1	0	1	1	0	0	0	0
+1	125	126	127	128	129	130	0
+1	131	132	133	134	135	136	0
+1	137	138	139	140	141	142	0
+1	143	144	145	146	147	148	0
+dumping re-decoded V.110 frame:
+E-bits: 00 01 01 00 00 00 00 
+S-bits: 00 00 00 00 00 00 00 00 00 
+re-decoded user bits: 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 
+
+======= User data rate 12000
+user_bits: 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 
+dumping 30 encoded bits in V.110 frame:
+0	0	0	0	0	0	0	0
+1	101	102	103	104	105	106	0
+1	107	108	109	110	1	1	0
+1	111	112	1	1	113	114	0
+1	1	1	115	1	1	1	0
+1	0	0	1	0	0	0	0
+1	116	117	118	119	120	121	0
+1	122	123	124	125	1	1	0
+1	126	127	1	1	128	129	0
+1	1	1	130	1	1	1	0
+dumping re-decoded V.110 frame:
+E-bits: 00 00 01 00 00 00 00 
+S-bits: 00 00 00 00 00 00 00 00 00 
+re-decoded user bits: 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 
+
+======= User data rate 14400
+user_bits: 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 
+dumping 36 encoded bits in V.110 frame:
+0	0	0	0	0	0	0	0
+1	101	102	103	104	105	106	0
+1	107	108	109	110	1	1	0
+1	111	112	1	1	113	114	0
+1	1	1	115	116	117	118	0
+1	1	0	1	0	0	0	0
+1	119	120	121	122	123	124	0
+1	125	126	127	128	1	1	0
+1	129	130	1	1	131	132	0
+1	1	1	133	134	135	136	0
+dumping re-decoded V.110 frame:
+E-bits: 01 00 01 00 00 00 00 
+S-bits: 00 00 00 00 00 00 00 00 00 
+re-decoded user bits: 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 
+
+======= User data rate 19200
+user_bits: 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 
+dumping 48 encoded bits in V.110 frame:
+0	0	0	0	0	0	0	0
+1	101	102	103	104	105	106	0
+1	107	108	109	110	111	112	0
+1	113	114	115	116	117	118	0
+1	119	120	121	122	123	124	0
+1	0	1	1	0	0	0	0
+1	125	126	127	128	129	130	0
+1	131	132	133	134	135	136	0
+1	137	138	139	140	141	142	0
+1	143	144	145	146	147	148	0
+dumping re-decoded V.110 frame:
+E-bits: 00 01 01 00 00 00 00 
+S-bits: 00 00 00 00 00 00 00 00 00 
+re-decoded user bits: 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 
+
+======= User data rate 24000
+user_bits: 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 
+dumping 30 encoded bits in V.110 frame:
+0	0	0	0	0	0	0	0
+1	101	102	103	104	105	106	0
+1	107	108	109	110	1	1	0
+1	111	112	1	1	113	114	0
+1	1	1	115	1	1	1	0
+1	0	0	1	0	0	0	0
+1	116	117	118	119	120	121	0
+1	122	123	124	125	1	1	0
+1	126	127	1	1	128	129	0
+1	1	1	130	1	1	1	0
+dumping re-decoded V.110 frame:
+E-bits: 00 00 01 00 00 00 00 
+S-bits: 00 00 00 00 00 00 00 00 00 
+re-decoded user bits: 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 
+
+======= User data rate 28800
+user_bits: 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 
+dumping 36 encoded bits in V.110 frame:
+0	0	0	0	0	0	0	0
+1	101	102	103	104	105	106	0
+1	107	108	109	110	1	1	0
+1	111	112	1	1	113	114	0
+1	1	1	115	116	117	118	0
+1	1	0	1	0	0	0	0
+1	119	120	121	122	123	124	0
+1	125	126	127	128	1	1	0
+1	129	130	1	1	131	132	0
+1	1	1	133	134	135	136	0
+dumping re-decoded V.110 frame:
+E-bits: 01 00 01 00 00 00 00 
+S-bits: 00 00 00 00 00 00 00 00 00 
+re-decoded user bits: 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 
+
+======= User data rate 38400
+user_bits: 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 
+dumping 48 encoded bits in V.110 frame:
+0	0	0	0	0	0	0	0
+1	101	102	103	104	105	106	0
+1	107	108	109	110	111	112	0
+1	113	114	115	116	117	118	0
+1	119	120	121	122	123	124	0
+1	0	1	1	0	0	0	0
+1	125	126	127	128	129	130	0
+1	131	132	133	134	135	136	0
+1	137	138	139	140	141	142	0
+1	143	144	145	146	147	148	0
+dumping re-decoded V.110 frame:
+E-bits: 00 01 01 00 00 00 00 
+S-bits: 00 00 00 00 00 00 00 00 00 
+re-decoded user bits: 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148

libosmocore_1.8.0.tar.xz/tests/vty/vty_transcript_test.c -> libosmocore_1.9.0.tar.xz/tests/vty/vty_transcript_test.c Changed

@@ -211,6 +211,9 @@
 
 enum {
 	ATTR_TEST_NODE = _LAST_OSMOVTY_NODE + 1,
+	NEST_A_NODE,
+	NEST_B_NODE,
+	NEST_C_NODE,
 };
 
 static struct cmd_node attr_test_node = {
@@ -315,6 +318,62 @@
 	return CMD_SUCCESS;
 }
 
+static struct cmd_node nest_a_node = {
+	NEST_A_NODE,
+	"%s(config-a)# ",
+	1
+};
+
+static struct cmd_node nest_b_node = {
+	NEST_B_NODE,
+	"%s(config-b)# ",
+	1
+};
+
+static struct cmd_node nest_c_node = {
+	NEST_C_NODE,
+	"%s(config-c)# ",
+	1
+};
+
+DEFUN(cfg_nest_a, cfg_nest_a_cmd,
+      "nest NAME",
+      "Enter nest level a\n"
+      "Set a name to mark the node's state\n")
+{
+	vty->index = talloc_strdup(root_ctx, argv0);
+	vty->node = NEST_A_NODE;
+	return CMD_SUCCESS;
+}
+
+DEFUN(cfg_nest_b, cfg_nest_b_cmd,
+      "nest NAME",
+      "Enter nest level b\n"
+      "Set a name to mark the node's state\n")
+{
+	vty->index = talloc_strdup(root_ctx, argv0);
+	vty->node = NEST_B_NODE;
+	return CMD_SUCCESS;
+}
+
+DEFUN(cfg_nest_c, cfg_nest_c_cmd,
+      "nest NAME",
+      "Enter nest level c\n"
+      "Set a name to mark the node's state\n")
+{
+	vty->index = talloc_strdup(root_ctx, argv0);
+	vty->node = NEST_C_NODE;
+	return CMD_SUCCESS;
+}
+
+DEFUN(cfg_nest_state, cfg_nest_state_cmd,
+      "state",
+      "Show this node's mark\n")
+{
+	vty_out(vty, "%s%s", (const char *)vty->index, VTY_NEWLINE);
+	return CMD_SUCCESS;
+}
+
 static void init_vty_cmds(void)
 {
 	install_element_ve(&single0_cmd);
@@ -336,6 +395,17 @@
 	install_element(ATTR_TEST_NODE, &cfg_app_attr_unbelievable_magnificent_cmd);
 	install_element(ATTR_TEST_NODE, &cfg_app_attr_unbelievable_wonderful_cmd);
 	install_element(ATTR_TEST_NODE, &cfg_attr_hidden_app_attr_unbelievable_cmd);
+
+	install_element(CONFIG_NODE, &cfg_nest_a_cmd);
+	install_node(&nest_a_node, NULL);
+	install_element(NEST_A_NODE, &cfg_nest_b_cmd);
+	install_node(&nest_b_node, NULL);
+	install_element(NEST_B_NODE, &cfg_nest_c_cmd);
+	install_node(&nest_c_node, NULL);
+
+	install_element(NEST_A_NODE, &cfg_nest_state_cmd);
+	install_element(NEST_B_NODE, &cfg_nest_state_cmd);
+	install_element(NEST_C_NODE, &cfg_nest_state_cmd);
 }
 
 int main(int argc, char **argv)

libosmocore_1.8.0.tar.xz/tests/vty/vty_transcript_test.vty -> libosmocore_1.9.0.tar.xz/tests/vty/vty_transcript_test.vty Changed

libosmocore_1.8.0.tar.xz/utils/Makefile.am -> libosmocore_1.9.0.tar.xz/utils/Makefile.am Changed

@@ -8,7 +8,7 @@
 if ENABLE_UTILITIES
 EXTRA_DIST = conv_gen.py conv_codes_gsm.py
 
-bin_PROGRAMS += osmo-arfcn osmo-auc-gen osmo-config-merge osmo-aka-verify
+bin_PROGRAMS += osmo-arfcn osmo-auc-gen osmo-config-merge osmo-aka-verify osmo-gsmtap-logsend
 
 osmo_arfcn_SOURCES = osmo-arfcn.c
 
@@ -16,15 +16,16 @@
 
 osmo_aka_verify_SOURCES = osmo-aka-verify.c
 
+osmo_gsmtap_logsend_SOURCES = gsmtap-logsend.c
+
 osmo_config_merge_SOURCES = osmo-config-merge.c
 osmo_config_merge_LDADD = $(LDADD) $(TALLOC_LIBS)
-osmo_config_merge_CFLAGS = $(TALLOC_CFLAGS)
 
 if ENABLE_PCSC
 noinst_PROGRAMS += osmo-sim-test
 osmo_sim_test_SOURCES = osmo-sim-test.c
 osmo_sim_test_LDADD = $(LDADD) $(top_builddir)/src/sim/libosmosim.la $(PCSC_LIBS)
-osmo_sim_test_CFLAGS = $(PCSC_CFLAGS)
+osmo_sim_test_CFLAGS = $(AM_CFLAGS) $(PCSC_CFLAGS)
 endif
 endif
 
@@ -32,6 +33,7 @@
 SUBDIRS = \
 	osmo-stat-dummy \
 	$(NULL)
+endif
 
 if ENABLE_GB
 noinst_PROGRAMS += osmo-ns-dummy
@@ -40,7 +42,5 @@
 			$(top_builddir)/src/gb/libosmogb.la \
 			$(top_builddir)/src/vty/libosmovty.la \
 			$(top_builddir)/src/ctrl/libosmoctrl.la \
-			$(top_builddir)/src/gsm/libosmogsm.la
-osmo_ns_dummy_CFLAGS = $(TALLOC_CFLAGS)
-endif
+			$(NULL)
 endif

libosmocore_1.8.0.tar.xz/utils/conv_codes_gsm.py -> libosmocore_1.9.0.tar.xz/utils/conv_codes_gsm.py Changed

@@ -42,6 +42,111 @@
 		
 	),
 
+	# TCH/F2.4 definition
+	ConvolutionalCode(
+		72,
+		
+		    (G1, 1),
+		    (G2, 1),
+		    (G3, 1),
+		    (G1, 1),
+		    (G2, 1),
+		    (G3, 1),
+		,
+		name = "tch_f24",
+		description = 
+			"TCH/F2.4 convolutional code:",
+			"72 bits blocks, rate 1/6, k = 5",
+			"G1 = 1 + D + D3 + D4",
+			"G2 = 1 + D2 + D4",
+			"G3 = 1 + D + D2 + D3 + D4",
+			"G1 = 1 + D + D3 + D4",
+			"G2 = 1 + D2 + D4",
+			"G3 = 1 + D + D2 + D3 + D4",
+		
+	),
+
+	# TCH/H2.4 definition
+	ConvolutionalCode(
+		72,
+		
+		    (G1, 1),
+		    (G2, 1),
+		    (G3, 1),
+		,
+		name = "tch_h24",
+		description = 
+			"TCH/H2.4 convolutional code:",
+			"72 bits blocks, rate 1/3, k = 5",
+			"G1 = 1 + D + D3 + D4",
+			"G2 = 1 + D2 + D4",
+			"G3 = 1 + D + D2 + D3 + D4",
+		
+	),
+
+	# TCH/F4.8 definition
+	ConvolutionalCode(
+		148,
+		
+		    (G1, 1),
+		    (G2, 1),
+		    (G3, 1),
+		,
+		name = "tch_f48",
+		description = 
+			"TCH/F4.8 convolutional code:",
+			"148 bits blocks, rate 1/3, k = 5",
+			"G1 = 1 + D + D3 + D4",
+			"G2 = 1 + D2 + D4",
+			"G3 = 1 + D + D2 + D3 + D4",
+		
+	),
+
+	# TCH/F9.6 definition
+	ConvolutionalCode(
+		240,
+		shared_polys"xcch",
+		puncture = 
+			 11,  26,  41,  56,  71,  86, 101, 116, 131, 146, 161, 176,
+			191, 206, 221, 236, 251, 266, 281, 296, 311, 326, 341, 356,
+			371, 386, 401, 416, 431, 446, 461, 476, -1
+		,
+		name = "tch_f96",
+		description = 
+			"TCH/F9.6 convolutional code:",
+			"240 bits blocks, rate 1/2, k = 5",
+			"G0 = 1 + D3 + D4",
+			"G1 = 1 + D + D3 + D4",
+		
+	),
+
+	# TCH/F14.4 definition
+	ConvolutionalCode(
+		290,
+		shared_polys"xcch",
+		puncture = 
+			  1,   6,  11,  15,  19,  24,  29,  33,  37,  42,  47,  51,
+			 55,  60,  65,  69,  73,  78,  83,  87,  91,  96, 101, 105,
+			109, 114, 119, 123, 127, 132, 137, 141, 145, 150, 155, 159,
+			163, 168, 173, 177, 181, 186, 191, 195, 199, 204, 209, 213,
+			217, 222, 227, 231, 235, 240, 245, 249, 253, 258, 263, 267,
+			271, 276, 281, 285, 289, 294, 299, 303, 307, 312, 317, 321,
+			325, 330, 335, 339, 343, 348, 353, 357, 361, 366, 371, 375,
+			379, 384, 389, 393, 397, 402, 407, 411, 415, 420, 425, 429,
+			433, 438, 443, 447, 451, 456, 461, 465, 469, 474, 479, 483,
+			487, 492, 497, 501, 505, 510, 515, 519, 523, 528, 533, 537,
+			541, 546, 551, 555, 559, 564, 569, 573, 577, 582, 584, 587,
+			 -1
+		,
+		name = "tch_f144",
+		description = 
+			"TCH/F14.4 convolutional code:",
+			"290 bits blocks, rate 1/2, k = 5",
+			"G0 = 1 + D3 + D4",
+			"G1 = 1 + D + D3 + D4",
+		
+	),
+
 	# RACH definition
 	ConvolutionalCode(
 		14,

libosmocore_1.9.0.tar.xz/utils/gsmtap-logsend.c Added

@@ -0,0 +1,139 @@
+/* Small program to read an input file / stdin and send each line via GSMTAP logging */
+/* (C) 2023 by Harald Welte <laforge@osmocom.org>
+ *
+ * All Rights Reserved
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <stdio.h>
+#include <errno.h>
+#include <sys/uio.h>
+#include <getopt.h>
+
+#include <osmocom/core/byteswap.h>
+#include <osmocom/core/logging.h>
+#include <osmocom/core/timer.h>
+#include <osmocom/core/gsmtap.h>
+#include <osmocom/core/gsmtap_util.h>
+
+static char *proc_name = "gsmtap-logsend";
+static char *subsys_name = "unknown";
+static char *dest_host = "localhost";
+static int dest_port = GSMTAP_UDP_PORT;
+
+static void help(void)
+{
+	printf("osmo-gsmtap-logsend Usage:\n"
+	       "\t -r DESTADDR   -p PORTNR   -n PROC_NAME   -s SUBSYS   INFILE \n"
+	       "\n"
+	       " -a  --remote-address HOSTNAME     Destination IP destination address (default: localhost)\n"
+	       " -p  --remote-port PORTNR          Destination UDP Port number (default: 4729)\n"
+	       " -n  --process-name PROC_NAME      Process name to include in GSMTAP LOG header\n"
+	       " -s  --subsys-name SUBSYS          Subsystem name to include in GSMTAP LOG header\n"
+	       " -h  --help                        This help message\n"
+	      );
+}
+
+int main(int argc, char **argv)
+{
+	char buf1024;
+	int gsmtap_fd;
+	FILE *infile;
+	char *line;
+	int rc;
+
+	while (1) {
+		static const struct option long_options = {
+			{ "remote-address", 1, 0, 'a' },
+			{ "remote-port", 1, 0, 'p' },
+			{ "process-name", 1, 0, 'n' },
+			{ "subsys-name", 1, 0, 's' },
+			{ "help", 0, 0, 'h' },
+			{ 0, 0, 0, 0 }
+		};
+		int c, option_index;
+
+		c = getopt_long(argc, argv, "a:p:n:s:h", long_options, &option_index);
+		if (c == -1)
+			break;
+
+		switch (c) {
+		case 'a':
+			dest_host = optarg;
+			break;
+		case 'p':
+			dest_port = atoi(optarg);
+			break;
+		case 'n':
+			proc_name = optarg;
+			break;
+		case 's':
+			subsys_name = optarg;
+			break;
+		case 'h':
+			help();
+			exit(0);
+			break;
+		default:
+			help();
+			exit(1);
+		}
+	}
+
+	if (argc <= optind) {
+		infile = stdin;
+	} else {
+		infile = fopen(argvoptind, "r");
+		if (!infile) {
+			fprintf(stderr, "Unable to open %s: %s\n", argvoptind, strerror(errno));
+			exit(2);
+		}
+	}
+
+	gsmtap_fd = gsmtap_source_init_fd(dest_host, dest_port);
+	if (gsmtap_fd < 0) {
+		fprintf(stderr, "Unable to create GSMTAP soicket: %s\n", strerror(errno));
+		exit(2);
+	}
+
+	/* prepare all the data structures that don't change for each line */
+	struct {
+		struct gsmtap_hdr gsmtap;
+		struct gsmtap_osmocore_log_hdr log;
+	} __attribute__ ((packed)) hdr;
+	struct timeval tv;
+
+	memset(&hdr, 0, sizeof(hdr));
+	hdr.gsmtap.version = GSMTAP_VERSION;
+	hdr.gsmtap.hdr_len = sizeof(hdr.gsmtap)/4;
+	hdr.gsmtap.type = GSMTAP_TYPE_OSMOCORE_LOG;
+
+	OSMO_STRLCPY_ARRAY(hdr.log.proc_name, proc_name);
+	OSMO_STRLCPY_ARRAY(hdr.log.subsys, subsys_name);
+	hdr.log.level = LOGL_INFO;
+
+	while ((line = fgets(buf, sizeof(buf), infile))) {
+		struct iovec iov2 = {
+			{ .iov_base = &hdr, .iov_len = sizeof(hdr) },
+			{ .iov_base = buf, .iov_len = strlen(line) + 1 },
+		};
+		osmo_gettimeofday(&tv, NULL);
+		hdr.log.ts.sec = osmo_htonl(tv.tv_sec);
+		hdr.log.ts.usec = osmo_htonl(tv.tv_usec);
+
+		rc = writev(gsmtap_fd, iov, ARRAY_SIZE(iov));
+		if (rc <= 0) {
+			fprintf(stderr, "Short write on GSMTAP socket: %d (%s)\n", rc, strerror(errno));
+			exit(1);
+		}
+	}
+}

libosmocore_1.8.0.tar.xz/utils/osmo-auc-gen.c -> libosmocore_1.9.0.tar.xz/utils/osmo-auc-gen.c Changed

@@ -1,7 +1,7 @@
 /*! \file osmo-auc-gen.c
  * GSM/GPRS/3G authentication testing tool. */
 /*
- * (C) 2010-2021 by Harald Welte <laforge@gnumonks.org>
+ * (C) 2010-2023 by Harald Welte <laforge@gnumonks.org>
  *
  * All Rights Reserved
  *
@@ -80,7 +80,7 @@
 	}
 }
 
-static struct osmo_sub_auth_data test_aud = {
+static struct osmo_sub_auth_data2 test_aud = {
 	.type = OSMO_AUTH_TYPE_NONE,
 	.algo = OSMO_AUTH_ALG_NONE,
 };
@@ -98,6 +98,7 @@
 		"-s  --sqn\tSpecify SQN (only for 3G)\n"
 		"-i  --ind\tSpecify IND slot for new SQN after AUTS (only for 3G)\n"
 		"-l  --ind-len\tSpecify IND bit length (default=5) (only for 3G)\n"
+		"-L  --res-len\tSpecify RES byte length (default=8) (only for 3G)\n"
 		"-A  --auts\tSpecify AUTS (only for 3G)\n"
 		"-r  --rand\tSpecify random value\n"
 		"-I  --ipsec\tOutput in triplets.dat format for strongswan\n");
@@ -123,10 +124,12 @@
 	int fmt_triplets_dat = 0;
 	uint64_t ind_mask = 0;
 
-	printf("osmo-auc-gen (C) 2011-2012 by Harald Welte\n");
+	printf("osmo-auc-gen (C) 2011-2023 by Harald Welte\n");
 	printf("This is FREE SOFTWARE with ABSOLUTELY NO WARRANTY\n\n");
 
 	memset(_auts, 0, sizeof(_auts));
+	memset(vec, 0, sizeof(*vec));
+	vec->res_len = 8; /* default */
 
 	while (1) {
 		int c;
@@ -141,6 +144,7 @@
 			{ "sqn", 1, 0, 's' },
 			{ "ind", 1, 0, 'i' },
 			{ "ind-len", 1, 0, 'l' },
+			{ "res-len", 1, 0, 'L' },
 			{ "rand", 1, 0, 'r' },
 			{ "auts", 1, 0, 'A' },
 			{ "help", 0, 0, 'h' },
@@ -149,7 +153,7 @@
 
 		rc = 0;
 
-		c = getopt_long(argc, argv, "23a:k:o:f:s:i:l:r:hO:A:I", long_options,
+		c = getopt_long(argc, argv, "23a:k:o:f:s:i:l:L:r:hO:A:I", long_options,
 				&option_index);
 
 		if (c == -1)
@@ -174,10 +178,21 @@
 			case OSMO_AUTH_TYPE_GSM:
 				rc = osmo_hexparse(optarg, test_aud.u.gsm.ki,
 						   sizeof(test_aud.u.gsm.ki));
+				if (rc != sizeof(test_aud.u.gsm.ki)) {
+					fprintf(stderr, "Invalid Ki length %d\n", rc);
+					exit(2);
+				}
 				break;
 			case OSMO_AUTH_TYPE_UMTS:
 				rc = osmo_hexparse(optarg, test_aud.u.umts.k,
 						   sizeof(test_aud.u.umts.k));
+				/* 3GPP TS 33.102 6.3.7: "The authentication key (K) shall have a length of
+				 * 128 bits or 256 bits." */
+				if (rc != 16 && rc != 32) {
+					fprintf(stderr, "Invalid K length %d\n", rc);
+					exit(2);
+				}
+				test_aud.u.umts.k_len = rc;
 				break;
 			default:
 				fprintf(stderr, "please specify 2g/3g first!\n");
@@ -190,6 +205,11 @@
 			}
 			rc = osmo_hexparse(optarg, test_aud.u.umts.opc,
 					   sizeof(test_aud.u.umts.opc));
+			if (rc != 16 && rc != 32) {
+				fprintf(stderr, "Invalid OPC length %d\n", rc);
+				exit(2);
+			}
+			test_aud.u.umts.opc_len = rc;
 			test_aud.u.umts.opc_is_op = 0;
 			break;
 		case 'O':
@@ -199,6 +219,11 @@
 			}
 			rc = osmo_hexparse(optarg, test_aud.u.umts.opc,
 					   sizeof(test_aud.u.umts.opc));
+			if (rc != 16 && rc != 32) {
+				fprintf(stderr, "Invalid OP length %d\n", rc);
+				exit(2);
+			}
+			test_aud.u.umts.opc_len = rc;
 			test_aud.u.umts.opc_is_op = 1;
 			break;
 		case 'A':
@@ -216,6 +241,10 @@
 			}
 			rc = osmo_hexparse(optarg, test_aud.u.umts.amf,
 					   sizeof(test_aud.u.umts.amf));
+			if (rc != 2) {
+				fprintf(stderr, "Invalid AMF length %d\n", rc);
+				exit(2);
+			}
 			break;
 		case 's':
 			if (test_aud.type != OSMO_AUTH_TYPE_UMTS) {
@@ -240,8 +269,20 @@
 			}
 			test_aud.u.umts.ind_bitlen = atoi(optarg);
 			break;
+		case 'L':
+			rc = atoi(optarg);
+			if (rc != 4 && rc != 8 && rc != 16) {
+				fprintf(stderr, "Invalid RES length %u\n", rc);
+				exit(2);
+			}
+			vec->res_len = rc;
+			break;
 		case 'r':
 			rc = osmo_hexparse(optarg, _rand, sizeof(_rand));
+			if (rc != sizeof(_rand)) {
+				fprintf(stderr, "Invalid RAND length %d\n", rc);
+				exit(2);
+			}
 			rand_is_set = 1;
 			break;
 		case 'I':
@@ -284,8 +325,6 @@
 		exit(2);
 	}
 
-	memset(vec, 0, sizeof(*vec));
-
 	if (test_aud.type == OSMO_AUTH_TYPE_UMTS) {
 		uint64_t seq_1 = 1LL << test_aud.u.umts.ind_bitlen;
 		ind_mask = seq_1 - 1;
@@ -316,9 +355,9 @@
 	}
 
 	if (!auts_is_set)
-		rc = osmo_auth_gen_vec(vec, &test_aud, _rand);
+		rc = osmo_auth_gen_vec2(vec, &test_aud, _rand);
 	else
-		rc = osmo_auth_gen_vec_auts(vec, &test_aud, _auts, _rand, _rand);
+		rc = osmo_auth_gen_vec_auts2(vec, &test_aud, _auts, _rand, _rand);
 	if (rc < 0) {
 		if (!auts_is_set)
 			fprintf(stderr, "error generating auth vector\n");

libosmocore_1.8.0.tar.xz/utils/osmo-stat-dummy/Makefile.am -> libosmocore_1.9.0.tar.xz/utils/osmo-stat-dummy/Makefile.am Changed