OpenBSC July 2012

openbsc@lists.osmocom.org

16 participants
22 discussions

[libosmocore PATCH 01/12] build: simplify test handling and speed up build.
by Diego Elio Pettenò 11 Jul '12

11 Jul '12

Instead of using a ./configure parameter to decide whehter to build tests or not, use the check_PROGRAMS variable so that the tests are only built when running `make check`. To avoid slowing down the test phase itself, collapse the declaration of the test targets in the tests/Makefile.am file, this way they can be built and linked in parallel before the testsuite is executed. Signed-off-by: Diego Elio Pettenò <flameeyes(a)flameeyes.eu> --- .gitignore | 1 + configure.ac | 20 -------------- tests/Makefile.am | 61 ++++++++++++++++++++++++++++++++++++-------- tests/a5/Makefile.am | 6 ---- tests/auth/Makefile.am | 8 ------ tests/bits/Makefile.am | 7 ----- tests/conv/Makefile.am | 6 ---- tests/gsm0808/Makefile.am | 6 ---- tests/lapd/Makefile.am | 9 ------ tests/msgfile/Makefile.am | 6 ---- tests/sms/Makefile.am | 6 ---- tests/smscb/Makefile.am | 6 ---- tests/timer/Makefile.am | 7 ----- tests/ussd/Makefile.am | 6 ---- 14 files changed, 51 insertions(+), 104 deletions(-) delete mode 100644 tests/a5/Makefile.am delete mode 100644 tests/auth/Makefile.am delete mode 100644 tests/bits/Makefile.am delete mode 100644 tests/conv/Makefile.am delete mode 100644 tests/gsm0808/Makefile.am delete mode 100644 tests/lapd/Makefile.am delete mode 100644 tests/msgfile/Makefile.am delete mode 100644 tests/sms/Makefile.am delete mode 100644 tests/smscb/Makefile.am delete mode 100644 tests/timer/Makefile.am delete mode 100644 tests/ussd/Makefile.am diff --git a/.gitignore b/.gitignore index 82e43e3..3c8afd9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ Makefile Makefile.in .deps +.dirstamp .libs *.o *.lo diff --git a/configure.ac b/configure.ac index 484a7dd..7c62f8f 100644 --- a/configure.ac +++ b/configure.ac @@ -59,14 +59,6 @@ AC_ARG_ENABLE(plugin, [enable_plugin=$enableval], [enable_plugin="yes"]) AM_CONDITIONAL(ENABLE_PLUGIN, test x"$enable_plugin" = x"yes") -AC_ARG_ENABLE(tests, - [AS_HELP_STRING( - [--disable-tests], - [Disable building test programs] - )], - [enable_tests=$enableval], [enable_tests="yes"]) -AM_CONDITIONAL(ENABLE_TESTS, test x"$enable_tests" = x"yes") - AC_ARG_ENABLE(vty, [AS_HELP_STRING( [--disable-vty], @@ -130,7 +122,6 @@ AC_ARG_ENABLE(embedded, if test x"$embedded" = x"yes" then AC_DEFINE([EMBEDDED],[1],[Select building for embedded use]) - AM_CONDITIONAL(ENABLE_TESTS, false) AM_CONDITIONAL(ENABLE_PLUGIN, false) AM_CONDITIONAL(ENABLE_MSGFILE, false) AM_CONDITIONAL(ENABLE_SERIAL, false) @@ -163,17 +154,6 @@ AC_OUTPUT( src/gsm/Makefile src/gb/Makefile tests/Makefile - tests/timer/Makefile - tests/sms/Makefile - tests/msgfile/Makefile - tests/ussd/Makefile - tests/smscb/Makefile - tests/bits/Makefile - tests/a5/Makefile - tests/auth/Makefile - tests/conv/Makefile - tests/lapd/Makefile - tests/gsm0808/Makefile utils/Makefile Doxyfile.core Doxyfile.gsm diff --git a/tests/Makefile.am b/tests/Makefile.am index eff1ac4..308c691 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,9 +1,45 @@ -if ENABLE_TESTS -SUBDIRS = timer sms ussd smscb bits a5 conv auth lapd gsm0808 +INCLUDES = $(all_includes) -I$(top_srcdir)/include + +check_PROGRAMS = timer/timer_test sms/sms_test ussd/ussd_test \ + smscb/smscb_test bits/bitrev_test a5/a5_test \ + conv/conv_test auth/milenage_test lapd/lapd_test \ + gsm0808/gsm0808_test if ENABLE_MSGFILE -SUBDIRS += msgfile +check_PROGRAMS += msgfile/msgfile_test endif +a5_a5_test_SOURCES = a5/a5_test.c +a5_a5_test_LDADD = $(top_builddir)/src/libosmocore.la $(top_builddir)/src/gsm/libosmogsm.la + +auth_milenage_test_SOURCES = auth/milenage_test.c +auth_milenage_test_LDADD = $(top_builddir)/src/libosmocore.la $(top_builddir)/src/gsm/libosmogsm.la + +bits_bitrev_test_SOURCES = bits/bitrev_test.c +bits_bitrev_test_LDADD = $(top_builddir)/src/libosmocore.la + +conv_conv_test_SOURCES = conv/conv_test.c +conv_conv_test_LDADD = $(top_builddir)/src/libosmocore.la + +gsm0808_gsm0808_test_SOURCES = gsm0808/gsm0808_test.c +gsm0808_gsm0808_test_LDADD = $(top_builddir)/src/libosmocore.la $(top_builddir)/src/gsm/libosmogsm.la + +lapd_lapd_test_SOURCES = lapd/lapd_test.c +lapd_lapd_test_LDADD = $(top_builddir)/src/libosmocore.la $(top_builddir)/src/gsm/libosmogsm.la + +msgfile_msgfile_test_SOURCES = msgfile/msgfile_test.c +msgfile_msgfile_test_LDADD = $(top_builddir)/src/libosmocore.la + +smscb_smscb_test_SOURCES = smscb/smscb_test.c +smscb_smscb_test_LDADD = $(top_builddir)/src/libosmocore.la $(top_builddir)/src/gsm/libosmogsm.la + +sms_sms_test_SOURCES = sms/sms_test.c +sms_sms_test_LDADD = $(top_builddir)/src/libosmocore.la $(top_builddir)/src/gsm/libosmogsm.la + +timer_timer_test_SOURCES = timer/timer_test.c +timer_timer_test_LDADD = $(top_builddir)/src/libosmocore.la + +ussd_ussd_test_SOURCES = ussd/ussd_test.c +ussd_ussd_test_LDADD = $(top_builddir)/src/libosmocore.la $(top_builddir)/src/gsm/libosmogsm.la # The `:;' works around a Bash 3.2 bug when the output is not writeable. $(srcdir)/package.m4: $(top_srcdir)/configure.ac @@ -22,26 +58,29 @@ $(srcdir)/package.m4: $(top_srcdir)/configure.ac echo 'm4_define([AT_PACKAGE_URL],' && \ echo ' [$(PACKAGE_URL)])'; \ } >'$(srcdir)/package.m4' - -EXTRA_DIST = testsuite.at $(srcdir)/package.m4 $(TESTSUITE) + +EXTRA_DIST = testsuite.at $(srcdir)/package.m4 $(TESTSUITE) \ + timer/timer_test.ok sms/sms_test.ok ussd/ussd_test.ok \ + smscb/smscb_test.ok bits/bitrev_test.ok a5/a5_test.ok \ + conv/conv_test.ok auth/milenage_test.ok \ + lapd/lapd_test.ok gsm0808/gsm0808_test.ok \ + msgfile/msgfile_test.ok msgfile/msgconfig.cfg TESTSUITE = $(srcdir)/testsuite - + check-local: atconfig $(TESTSUITE) $(SHELL) '$(TESTSUITE)' $(TESTSUITEFLAGS) - + installcheck-local: atconfig $(TESTSUITE) $(SHELL) '$(TESTSUITE)' AUTOTEST_PATH='$(bindir)' \ $(TESTSUITEFLAGS) - + clean-local: test ! -f '$(TESTSUITE)' || \ $(SHELL) '$(TESTSUITE)' --clean $(RM) -f atconfig - + AUTOM4TE = $(SHELL) $(top_srcdir)/missing --run autom4te AUTOTEST = $(AUTOM4TE) --language=autotest $(TESTSUITE): $(srcdir)/testsuite.at $(srcdir)/package.m4 $(AUTOTEST) -I '$(srcdir)' -o $@.tmp $@.at mv $@.tmp $@ - -endif diff --git a/tests/a5/Makefile.am b/tests/a5/Makefile.am deleted file mode 100644 index 3c6e6ba..0000000 --- a/tests/a5/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -INCLUDES = $(all_includes) -I$(top_srcdir)/include -noinst_PROGRAMS = a5_test -EXTRA_DIST = a5_test.ok - -a5_test_SOURCES = a5_test.c -a5_test_LDADD = $(top_builddir)/src/libosmocore.la $(top_builddir)/src/gsm/libosmogsm.la diff --git a/tests/auth/Makefile.am b/tests/auth/Makefile.am deleted file mode 100644 index 52976d0..0000000 --- a/tests/auth/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -INCLUDES = $(all_includes) -I$(top_srcdir)/include -noinst_PROGRAMS = milenage_test -EXTRA_DIST = milenage_test.ok - -milenage_test_SOURCES = milenage_test.c -milenage_test_LDADD = $(top_builddir)/src/libosmocore.la \ - $(top_builddir)/src/gsm/libosmogsm.la - diff --git a/tests/bits/Makefile.am b/tests/bits/Makefile.am deleted file mode 100644 index d6fb2f2..0000000 --- a/tests/bits/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -INCLUDES = $(all_includes) -I$(top_srcdir)/include -noinst_PROGRAMS = bitrev_test -EXTRA_DIST = bitrev_test.ok - -bitrev_test_SOURCES = bitrev_test.c -bitrev_test_LDADD = $(top_builddir)/src/libosmocore.la - diff --git a/tests/conv/Makefile.am b/tests/conv/Makefile.am deleted file mode 100644 index 75cfec8..0000000 --- a/tests/conv/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -INCLUDES = $(all_includes) -I$(top_srcdir)/include -noinst_PROGRAMS = conv_test -EXTRA_DIST = conv_test.ok - -conv_test_SOURCES = conv_test.c -conv_test_LDADD = $(top_builddir)/src/libosmocore.la diff --git a/tests/gsm0808/Makefile.am b/tests/gsm0808/Makefile.am deleted file mode 100644 index a238e7f..0000000 --- a/tests/gsm0808/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -INCLUDES = $(all_includes) -I$(top_srcdir)/include -noinst_PROGRAMS = gsm0808_test -EXTRA_DIST = gsm0808_test.ok - -gsm0808_test_SOURCES = gsm0808_test.c -gsm0808_test_LDADD = $(top_builddir)/src/libosmocore.la $(top_builddir)/src/gsm/libosmogsm.la diff --git a/tests/lapd/Makefile.am b/tests/lapd/Makefile.am deleted file mode 100644 index f7e2ab0..0000000 --- a/tests/lapd/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -INCLUDES = $(all_includes) -I$(top_srcdir)/include -AM_FLAGS = -Wall -O0 -noinst_PROGRAMS = lapd_test -EXTRA_DIST = lapd_test.ok - -lapd_test_SOURCES = lapd_test.c -lapd_test_LDADD = \ - $(top_builddir)/src/libosmocore.la \ - $(top_builddir)/src/gsm/libosmogsm.la diff --git a/tests/msgfile/Makefile.am b/tests/msgfile/Makefile.am deleted file mode 100644 index 88c355d..0000000 --- a/tests/msgfile/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -INCLUDES = $(all_includes) -I$(top_srcdir)/include -noinst_PROGRAMS = msgfile_test -EXTRA_DIST = msgfile_test.ok msgconfig.cfg - -msgfile_test_SOURCES = msgfile_test.c -msgfile_test_LDADD = $(top_builddir)/src/libosmocore.la diff --git a/tests/sms/Makefile.am b/tests/sms/Makefile.am deleted file mode 100644 index 02860af..0000000 --- a/tests/sms/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -INCLUDES = $(all_includes) -I$(top_srcdir)/include -noinst_PROGRAMS = sms_test -EXTRA_DIST = sms_test.ok - -sms_test_SOURCES = sms_test.c -sms_test_LDADD = $(top_builddir)/src/libosmocore.la $(top_builddir)/src/gsm/libosmogsm.la diff --git a/tests/smscb/Makefile.am b/tests/smscb/Makefile.am deleted file mode 100644 index 7045ea7..0000000 --- a/tests/smscb/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -INCLUDES = $(all_includes) -I$(top_srcdir)/include -noinst_PROGRAMS = smscb_test -EXTRA_DIST = smscb_test.ok - -smscb_test_SOURCES = smscb_test.c -smscb_test_LDADD = $(top_builddir)/src/libosmocore.la $(top_builddir)/src/gsm/libosmogsm.la diff --git a/tests/timer/Makefile.am b/tests/timer/Makefile.am deleted file mode 100644 index 062d81b..0000000 --- a/tests/timer/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -INCLUDES = $(all_includes) -I$(top_srcdir)/include -noinst_PROGRAMS = timer_test -EXTRA_DIST = timer_test.ok - -timer_test_SOURCES = timer_test.c -timer_test_LDADD = $(top_builddir)/src/libosmocore.la - diff --git a/tests/ussd/Makefile.am b/tests/ussd/Makefile.am deleted file mode 100644 index de9ff89..0000000 --- a/tests/ussd/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -INCLUDES = $(all_includes) -I$(top_srcdir)/include -noinst_PROGRAMS = ussd_test -EXTRA_DIST = ussd_test.ok - -ussd_test_SOURCES = ussd_test.c -ussd_test_LDADD = $(top_builddir)/src/libosmocore.la $(top_builddir)/src/gsm/libosmogsm.la -- 1.7.8.6

5 21

TODAY: Jul 11, 8pm / Osmocom meeting in Berlin
by Harald Welte 11 Jul '12

11 Jul '12

Hi all! This is the announcement for the next Osmocom Berlin meeting. Jul 11, 8pm @ CCC Berlin, Marienstr. 11, 10113 Berlin There is no formal presentation scheduled for this meeting. However, updates will be provided on various current developments, such as * Progress in development of GPRS PCU * Status of Osmocom UMA/GAN controller development * Planning phase of custom calypso board * OsmoSDR roadmap If you are interested to show up, feel free to do so. There is no registration required. The meeting is free as in "free beer", despite no actual free beer being around. Updates and the blog post can be found here: http://openbsc.osmocom.org/trac/blog/osmug-20120711 Regards, Harald -- - Harald Welte <laforge(a)gnumonks.org> http://laforge.gnumonks.org/ ============================================================================ "Privacy in residential applications is a desirable marketing option." (ETSI EN 300 175-7 Ch. A6)

1 0

Re: Nokia TETRA device configuration ?
by Dieter Spaar 10 Jul '12

10 Jul '12

Hallo Harald, On Tue, 10 Jul 2012 09:49:22 +0200, "Harald Welte" <laforge(a)gnumonks.org> wrote: > > ich habs auch mal unter meinem namen auf finetopix.com gepostet, mal > sehen ob eine antwort kommt. Danke. Es gibt doch ein paar Leute aus dem Osmo-Umfeld die so ein Geraet haben. Steve und Dimitri habe sich eines auf meinen Vorschlag hin gekauft und Alexander Huemer hat wohl ebenfalls ein aelteres Nokia TETRA Geraet. BTW, der Dolphin TETRA Handset von Africar kann eventuell mit einer Standard Motorola Firmware umgeflasht werden. Damit soll es dann DMO koennen. Es gibt unterschiedliche Aussagen dazu, man muesste es wohl ausprobieren. Africar hat laut ebay vier Stueck davon (neu) und will EUR 98 bzw. Preisvorschlag. Es wuerde sich daher wohl lohnen, vielleicht hat Africar ja noch mehr davon. Viele Gruesse, Dieter -- Dieter Spaar, Germany spaar(a)mirider.augusta.de

1 0

OpenBSC -> only BTS+RNC+MSC+HLR without BSC possible?
by Ellen Apolinar 10 Jul '12

10 Jul '12

Hello, the purpose is to test several BTS. There are a few solutions to realise this, one of this is with OpenBSC. 1st idea: Implement OpenBSC for several BTS, also for UMTS. In this case we have a GLJ to read the traces between BSC and BTS and want to analyse them so we could build libraries for using OpenBSC with these BTS. It isn't my job to programm it because we have a few programmers here which can handle with it und which have a few months time to realise that. We already have the traces - now comes the part how to analyse these and how to build libs to implement the BTS to the OpenBSC-project. I don't know if it is possible and how long it takes. We will see it. 2nd idea: Have a BTS - RNC - MSC - HLR - connection with parts of OpenBSC. BTS and RNC are hardware, MSC and HLR should be software. Perhaps it is better to use OpenMSC for it but first I want to know if it could be possible with OpenBSC. I know that OpenBSC is not programmed for only using the MSC and the HLR part but perhaps someone know how the MSC is implemented. If some of you also worked with OpenMSC it would be great of you could write me your experiences. I don't want to steal your time so if you are interested and have some infos I really appreciate it. :-) I have already written to the mailing list so perhaps some of you remember me. Best regads Ellen

3 5

[sam7-util PATCH 1/2] build: update autotools to modern standards.
by Diego Elio Pettenò 08 Jul '12

08 Jul '12

This includes removing AC_CANONICAL_BUILD/AC_CANONICAL_TARGET (weren't used), renaming configure.in to configure.ac (required for automake 1.13 coming up), moving automake options to configure.ac (removes use of AM_INIT_AUTOMAKE with two parameters, which is also gone with automake 1.13). Also remove empty files and declare the system foreign, not gnu (NEWS and AUTHORS are not used), avoid re-declaring in the distributed files the conditional sources (automake takes care of that), and don't use -Werror (as it would fail to build with GCC 4.6 and 4.7). Signed-off-by: Diego Elio Pettenò <flameeyes(a)flameeyes.eu> --- Makefile.am | 7 ++----- configure.ac | 43 +++++++++++++++++++++++++++++++++++++++++++ configure.in | 46 ---------------------------------------------- 3 files changed, 45 insertions(+), 51 deletions(-) delete mode 100644 AUTHORS delete mode 100644 NEWS create mode 100644 configure.ac delete mode 100644 configure.in diff --git a/AUTHORS b/AUTHORS deleted file mode 100644 index e69de29..0000000 diff --git a/Makefile.am b/Makefile.am index ae59bd6..7d6aaf8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,4 @@ -AM_CFLAGS = -Wall -Werror - -AUTOMAKE_OPTIONS = gnu +AM_CFLAGS = -Wall bin_PROGRAMS = sam7 @@ -22,6 +20,5 @@ endif noinst_HEADERS = io.h samba.h cmd.h loader128_data.h loader256_data.h EXTRA_DIST = driver/Makefile driver/at91.c \ - io_win32.c io_posix.c io_iokit.c io_libusb.c\ loader/Makefile loader/at91.h loader/bin2c.c loader/crt0.S \ - loader/loader.c loader/loader.lds \ No newline at end of file + loader/loader.c loader/loader.lds diff --git a/NEWS b/NEWS deleted file mode 100644 index e69de29..0000000 diff --git a/configure.ac b/configure.ac new file mode 100644 index 0000000..e16b1ed --- /dev/null +++ b/configure.ac @@ -0,0 +1,43 @@ +AC_INIT([sam7utils], [0.2.1], [konkers(a)konkers.net]) + +AC_CANONICAL_HOST + +AM_INIT_AUTOMAKE(foreign) +AM_CONFIG_HEADER(config.h) + +AC_PROG_CC +AC_PROG_INSTALL +AC_PROG_MAKE_SET + +case "${host}" in + *-*-darwin* ) + LIBS="$LIBS -framework IOKIT -framework CoreFoundation" + have_iokit="true" + ;; + *-*-cygwin* ) + LIBS="$LIBS -lsetupapi" + have_win32="true" + ;; + * ) + have_posix="true" + AC_CHECK_LIB(usb,usb_init,have_libusb="true";LIBS="$LIBS -lusb") + + ;; +esac + + +AC_HEADER_STDC + +AC_CHECK_LIB(readline, readline,,AC_MSG_ERROR(readline not found)) +AC_CHECK_LIB(curses, tgoto,,AC_MSG_ERROR(curses not found)) +AC_CHECK_HEADERS(stdint.h,,AC_MSG_WARN(can't find stdint.h)) +AC_CHECK_HEADERS(ctype.h,,) +AC_CHECK_HEADERS(endian.h,,) + + +AM_CONDITIONAL([HAVE_IOKIT], [test x$have_iokit = xtrue]) +AM_CONDITIONAL([HAVE_WIN32], [test x$have_win32 = xtrue]) +AM_CONDITIONAL([HAVE_POSIX], [test x$have_posix = xtrue]) +AM_CONDITIONAL([HAVE_LIBUSB],[test x$have_libusb = xtrue]) + +AC_OUTPUT(Makefile) diff --git a/configure.in b/configure.in deleted file mode 100644 index 4a5a8b3..0000000 --- a/configure.in +++ /dev/null @@ -1,46 +0,0 @@ -AC_INIT([sam7utils], [0.2.1], [konkers(a)konkers.net]) - -AC_CANONICAL_BUILD -AC_CANONICAL_HOST -AC_CANONICAL_TARGET - -AM_INIT_AUTOMAKE(sam7utils,0.2.1) -AM_CONFIG_HEADER(config.h) - - -AC_PROG_CC -AC_PROG_INSTALL -AC_PROG_MAKE_SET - -case "${host}" in - *-*-darwin* ) - LIBS="$LIBS -framework IOKIT -framework CoreFoundation" - have_iokit="true" - ;; - *-*-cygwin* ) - LIBS="$LIBS -lsetupapi" - have_win32="true" - ;; - * ) - have_posix="true" - AC_CHECK_LIB(usb,usb_init,have_libusb="true";LIBS="$LIBS -lusb") - - ;; -esac - - -AC_HEADER_STDC - -AC_CHECK_LIB(readline, readline,,AC_MSG_ERROR(readline not found)) -AC_CHECK_LIB(curses, tgoto,,AC_MSG_ERROR(curses not found)) -AC_CHECK_HEADERS(stdint.h,,AC_MSG_WARN(can't find stdint.h)) -AC_CHECK_HEADERS(ctype.h,,) -AC_CHECK_HEADERS(endian.h,,) - - -AM_CONDITIONAL([HAVE_IOKIT], [test x$have_iokit = xtrue]) -AM_CONDITIONAL([HAVE_WIN32], [test x$have_win32 = xtrue]) -AM_CONDITIONAL([HAVE_POSIX], [test x$have_posix = xtrue]) -AM_CONDITIONAL([HAVE_LIBUSB],[test x$have_libusb = xtrue]) - -AC_OUTPUT(Makefile) -- 1.7.8.6

2 2

[libasn1c PATCH] src: avoid pointer casting warnings.
by Diego Elio Pettenò 05 Jul '12

05 Jul '12

These easily cause safety checks to go off as they can represent 64-bit-unsafe code, but in this case they are minor changes required. Signed-off-by: Diego Elio Pettenò <flameeyes(a)flameeyes.eu> --- src/constr_SET_OF.c | 2 +- src/per_support.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/constr_SET_OF.c b/src/constr_SET_OF.c index 11eac57..8e376e6 100644 --- a/src/constr_SET_OF.c +++ b/src/constr_SET_OF.c @@ -915,7 +915,7 @@ SET_OF_decode_uper(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td, nelems = uper_get_length(pd, ct ? ct->effective_bits : -1, &repeat); ASN_DEBUG("Got to decode %d elements (eff %d)", - (int)nelems, (int)ct ? ct->effective_bits : -1); + (int)nelems, ct != NULL ? ct->effective_bits : -1); if(nelems < 0) _ASN_DECODE_STARVED; } diff --git a/src/per_support.c b/src/per_support.c index 173e696..e891a0e 100644 --- a/src/per_support.c +++ b/src/per_support.c @@ -13,9 +13,9 @@ per_data_string(asn_per_data_t *pd) { static int n; n = (n+1) % 2; snprintf(buf[n], sizeof(buf), - "{m=%d span %+d[%d..%d] (%d)}", + "{m=%zu span %+d[%zu..%zu] (%zu)}", pd->moved, - (((int)pd->buffer) & 0xf), + (int)(((ptrdiff_t)pd->buffer) & 0xf), pd->nboff, pd->nbits, pd->nbits - pd->nboff); return buf[n]; @@ -106,7 +106,7 @@ per_get_few_bits(asn_per_data_t *pd, int nbits) { ASN_DEBUG(" [PER got %2d<=%2d bits => span %d %+d[%d..%d]:%02x (%d) => 0x%x]", nbits, nleft, pd->moved, - (((int)pd->buffer) & 0xf), + (((ptrdiff_t)pd->buffer) & 0xf), pd->nboff, pd->nbits, pd->buffer[0], pd->nbits - pd->nboff, -- 1.7.8.6

1 0

[osmo-gmr PATCH 1/7] build: avoid recursing into include/ for non-installed headers.
by Diego Elio Pettenò 05 Jul '12

05 Jul '12

Instead of using recursive Makefile.am, declare all the headers on the top-level Makefile.am, which will take care of all of them. Signed-off-by: Diego Elio Pettenò <flameeyes(a)flameeyes.eu> --- Makefile.am | 21 ++++++++++++++++++++- configure.ac | 5 ----- include/Makefile.am | 1 - include/osmocom/Makefile.am | 1 - include/osmocom/gmr1/Makefile.am | 3 --- include/osmocom/gmr1/l1/Makefile.am | 3 --- include/osmocom/gmr1/sdr/Makefile.am | 1 - 7 files changed, 20 insertions(+), 15 deletions(-) delete mode 100644 include/Makefile.am delete mode 100644 include/osmocom/Makefile.am delete mode 100644 include/osmocom/gmr1/Makefile.am delete mode 100644 include/osmocom/gmr1/l1/Makefile.am delete mode 100644 include/osmocom/gmr1/sdr/Makefile.am diff --git a/Makefile.am b/Makefile.am index c866969..5167991 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,7 +2,26 @@ AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6 ACLOCAL_AMFLAGS = -I m4 INCLUDES = $(all_includes) -I$(top_srcdir)/include -SUBDIRS = include src +SUBDIRS = src + +noinst_HEADERS = include/osmocom/gmr1/gsmtap.h \ + include/osmocom/gmr1/l1/a5.h \ + include/osmocom/gmr1/l1/bcch.h \ + include/osmocom/gmr1/l1/ccch.h \ + include/osmocom/gmr1/l1/conv.h \ + include/osmocom/gmr1/l1/crc.h \ + include/osmocom/gmr1/l1/defs.h \ + include/osmocom/gmr1/l1/facch3.h \ + include/osmocom/gmr1/l1/interleave.h \ + include/osmocom/gmr1/l1/punct.h \ + include/osmocom/gmr1/l1/rach.h \ + include/osmocom/gmr1/l1/scramb.h \ + include/osmocom/gmr1/l1/tch3.h \ + include/osmocom/gmr1/sdr/defs.h \ + include/osmocom/gmr1/sdr/dkab.h \ + include/osmocom/gmr1/sdr/fcch.h \ + include/osmocom/gmr1/sdr/nb.h \ + include/osmocom/gmr1/sdr/pi4cxpsk.h BUILT_SOURCES = $(top_srcdir)/.version $(top_srcdir)/.version: diff --git a/configure.ac b/configure.ac index 60c850b..a4f3952 100644 --- a/configure.ac +++ b/configure.ac @@ -42,11 +42,6 @@ dnl Generate the output AM_CONFIG_HEADER(config.h) AC_OUTPUT( - include/Makefile - include/osmocom/Makefile - include/osmocom/gmr1/Makefile - include/osmocom/gmr1/l1/Makefile - include/osmocom/gmr1/sdr/Makefile src/Makefile src/l1/Makefile src/sdr/Makefile diff --git a/include/Makefile.am b/include/Makefile.am deleted file mode 100644 index 3578a80..0000000 --- a/include/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = osmocom diff --git a/include/osmocom/Makefile.am b/include/osmocom/Makefile.am deleted file mode 100644 index 950eae8..0000000 --- a/include/osmocom/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = gmr1 diff --git a/include/osmocom/gmr1/Makefile.am b/include/osmocom/gmr1/Makefile.am deleted file mode 100644 index 91c5c44..0000000 --- a/include/osmocom/gmr1/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -SUBDIRS = l1 sdr - -noinst_HEADERS = gsmtap.h diff --git a/include/osmocom/gmr1/l1/Makefile.am b/include/osmocom/gmr1/l1/Makefile.am deleted file mode 100644 index 40f2bd2..0000000 --- a/include/osmocom/gmr1/l1/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -noinst_HEADERS = \ - conv.h crc.h interleave.h punct.h scramb.h \ - a5.h bcch.h ccch.h rach.h facch3.h tch3.h diff --git a/include/osmocom/gmr1/sdr/Makefile.am b/include/osmocom/gmr1/sdr/Makefile.am deleted file mode 100644 index 03c9769..0000000 --- a/include/osmocom/gmr1/sdr/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -noinst_HEADERS = defs.h dkab.h fcch.h nb.h pi4cxpsk.h -- 1.7.8.6

3 8

[libosmocore PATCH] logging: accept a constant log_info_cat structure in log_info.
by Diego Elio Pettenò 04 Jul '12

04 Jul '12

This allows to use a statically-defined category (found in libosmo-sccp's tests). Signed-off-by: Diego Elio Pettenò <flameeyes(a)flameeyes.eu> --- include/osmocom/core/logging.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/osmocom/core/logging.h b/include/osmocom/core/logging.h index 76be100..ff456c2 100644 --- a/include/osmocom/core/logging.h +++ b/include/osmocom/core/logging.h @@ -101,7 +101,7 @@ struct log_info { log_filter *filter_fn; /*! \brief per-category information */ - struct log_info_cat *cat; + const struct log_info_cat *cat; /*! \brief total number of categories */ unsigned int num_cat; /*! \brief total number of user categories (not library) */ -- 1.7.8.6

1 0

[libosmo-sccp PATCH 1/7] mtp_pcap: mark structure as constant as well as static.
by Diego Elio Pettenò 04 Jul '12

04 Jul '12

Signed-off-by: Diego Elio Pettenò <flameeyes(a)flameeyes.eu> --- src/mtp_pcap.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/mtp_pcap.c b/src/mtp_pcap.c index 052813f..9b6de81 100644 --- a/src/mtp_pcap.c +++ b/src/mtp_pcap.c @@ -51,7 +51,7 @@ struct pcaprec_hdr { int mtp_pcap_write_header(int fd) { - static struct pcap_hdr hdr = { + static const struct pcap_hdr hdr = { .magic_number = 0xa1b2c3d4, .version_major = 2, .version_minor = 4, -- 1.7.8.6

2 9

OpenBSC + * + LCR -> Problems with LCR (--with-gsm-bs)
by Ellen Apolinar 04 Jul '12

04 Jul '12

Hey folks, OpenBSC seems to work without errors but to connect it with asterisk I need mISDN, mISDNuser and LCR. LCR doesn't seem to work. Here what I get as I searched for the problems: lcradmin state > Failed to connect to socket "/var/tmp/LCR.socket". > Is LCR running? > lcr query > ** LCR Version 1.7 > -> Using 'misdn_info' > Found 1 port > Port 0 'hfc-e1.1': TE/NT-mode PRI E1 (for phone lines & E1 > devices) > 30 B-channels: 1-15 17-31 > B-protocols: RAW HDLC X75slp L2:DSP > L2:DSPHDLC > lcr fork > ** LCR Version 1.7 > 000000 DEBUG (in getrulesetbyname() line 1871): ruleset main found. > root@ctdi-HP-Compaq-dc7100-CMT-PE219ET:~# > LCR: Starting daemon. > *GSM is enabled, but not compiled. Use --with-gsm-bs or --with-gsm-ms > while configure!* > I installed LCR in the following way: > ./configure --prefix=/usr/src/lcr --with-gsm-bs > make > make install > There were no errors after configure but <make> and <make install> showed following errors: make > chan_lcr.po > chan_lcr.c: In function ‘send_setup_to_lcr’: > chan_lcr.c:644:12: error: ‘struct ast_channel’ has no member named ‘cid’ > chan_lcr.c:655:12: error: ‘struct ast_channel’ has no member named ‘cid’ > chan_lcr.c: In function ‘lcr_in_setup’: > chan_lcr.c:858:2: warning: passing argument 9 of ‘__ast_channel_alloc’ > makes integer from pointer without a cast [enabled by default] > /usr/include/asterisk/channel.h:1118:2: note: expected ‘int’ but argument > is of type ‘char *’ > chan_lcr.c:883:6: error: ‘struct ast_channel’ has no member named ‘cid’ > chan_lcr.c:885:6: error: ‘struct ast_channel’ has no member named ‘cid’ > chan_lcr.c:887:6: error: ‘struct ast_channel’ has no member named ‘cid’ > chan_lcr.c:890:7: error: ‘struct ast_channel’ has no member named ‘cid’ > chan_lcr.c:893:7: error: ‘struct ast_channel’ has no member named ‘cid’ > chan_lcr.c:896:7: error: ‘struct ast_channel’ has no member named ‘cid’ > chan_lcr.c:900:7: error: ‘struct ast_channel’ has no member named ‘cid’ > chan_lcr.c:903:7: error: ‘struct ast_channel’ has no member named ‘cid’ > chan_lcr.c:906:7: error: ‘struct ast_channel’ has no member named ‘cid’ > chan_lcr.c:909:7: error: ‘struct ast_channel’ has no member named ‘cid’ > chan_lcr.c: In function ‘handle_queue’: > chan_lcr.c:1707:18: error: incompatible types when assigning to type > ‘union ast_frame_subclass’ from type ‘char’ > chan_lcr.c: In function ‘lcr_request’: > chan_lcr.c:1820:2: warning: passing argument 9 of ‘__ast_channel_alloc’ > makes integer from pointer without a cast [enabled by default] > /usr/include/asterisk/channel.h:1118:2: note: expected ‘int’ but argument > is of type ‘char *’ > chan_lcr.c: In function ‘lcr_call’: > chan_lcr.c:1927:9: error: ‘struct ast_channel’ has no member named ‘cid’ > chan_lcr.c:1927:31: error: ‘struct ast_channel’ has no member named ‘cid’ > chan_lcr.c:1928:29: error: ‘struct ast_channel’ has no member named ‘cid’ > chan_lcr.c:1931:9: error: ‘struct ast_channel’ has no member named ‘cid’ > chan_lcr.c:1931:32: error: ‘struct ast_channel’ has no member named ‘cid’ > chan_lcr.c:1932:30: error: ‘struct ast_channel’ has no member named ‘cid’ > chan_lcr.c:1934:9: error: ‘struct ast_channel’ has no member named ‘cid’ > chan_lcr.c:1934:33: error: ‘struct ast_channel’ has no member named ‘cid’ > chan_lcr.c:1935:31: error: ‘struct ast_channel’ has no member named ‘cid’ > chan_lcr.c: In function ‘lcr_write’: > chan_lcr.c:2164:6: error: wrong type argument to unary exclamation mark > chan_lcr.c:2166:20: error: invalid operands to binary & (have ‘union > ast_frame_subclass’ and ‘format_t’) > chan_lcr.c: In function ‘lcr_read’: > chan_lcr.c:2229:25: error: incompatible types when assigning to type > ‘union ast_frame_subclass’ from type ‘format_t’ > chan_lcr.c: In function ‘lcr_indicate’: > chan_lcr.c:2274:8: warning: assignment from incompatible pointer type > [enabled by default] > chan_lcr.c:2289:8: warning: assignment from incompatible pointer type > [enabled by default] > chan_lcr.c:2316:8: warning: assignment from incompatible pointer type > [enabled by default] > chan_lcr.c:2381:14: error: dereferencing pointer to incomplete type > chan_lcr.c:2382:33: error: dereferencing pointer to incomplete type > chan_lcr.c: At top level: > chan_lcr.c:2602:2: warning: initialization from incompatible pointer type > [enabled by default] > chan_lcr.c:2602:2: warning: (near initialization for ‘lcr_tech.requester’) > [enabled by default] > chan_lcr.c: In function ‘load_module’: > chan_lcr.c:2818:2: warning: passing argument 2 of > ‘ast_register_application2’ from incompatible pointer type [enabled by > default] > /usr/include/asterisk/module.h:458:5: note: expected ‘int (*)(struct > ast_channel *, const char *)’ but argument is of type ‘int (*)(struct > ast_channel *, void *)’ > make[1]: *** [chan_lcr.po] Error 1 > make[1]: Leaving directory `/usr/src/lcr' > make: *** [all] Error 2 > make install > gcc -DWITH_GSM_BS -I./openbsc/include -I./libosmocore/include > -I./openbsc -Wall -DCONFIG_DATA="\"/usr/local/lcr\"" > -DSHARE_DATA="\"/usr/local/lcr\"" -DLOG_DIR="\"/usr/local/lcr\"" > -DEXTENSION_DATA="\"/usr/local/lcr/extensions\"" -D_GNU_SOURCE -fPIC -c > chan_lcr.c -o chan_lcr.po > chan_lcr.c: In function ‘send_setup_to_lcr’: > chan_lcr.c:644:12: error: ‘struct ast_channel’ has no member named ‘cid’ > chan_lcr.c:655:12: error: ‘struct ast_channel’ has no member named ‘cid’ > chan_lcr.c: In function ‘lcr_in_setup’: > chan_lcr.c:858:2: warning: passing argument 9 of ‘__ast_channel_alloc’ > makes integer from pointer without a cast [enabled by default] > /usr/include/asterisk/channel.h:1118:2: note: expected ‘int’ but argument > is of type ‘char *’ > chan_lcr.c:883:6: error: ‘struct ast_channel’ has no member named ‘cid’ > chan_lcr.c:885:6: error: ‘struct ast_channel’ has no member named ‘cid’ > chan_lcr.c:887:6: error: ‘struct ast_channel’ has no member named ‘cid’ > chan_lcr.c:890:7: error: ‘struct ast_channel’ has no member named ‘cid’ > chan_lcr.c:893:7: error: ‘struct ast_channel’ has no member named ‘cid’ > chan_lcr.c:896:7: error: ‘struct ast_channel’ has no member named ‘cid’ > chan_lcr.c:900:7: error: ‘struct ast_channel’ has no member named ‘cid’ > chan_lcr.c:903:7: error: ‘struct ast_channel’ has no member named ‘cid’ > chan_lcr.c:906:7: error: ‘struct ast_channel’ has no member named ‘cid’ > chan_lcr.c:909:7: error: ‘struct ast_channel’ has no member named ‘cid’ > chan_lcr.c: In function ‘handle_queue’: > chan_lcr.c:1707:18: error: incompatible types when assigning to type > ‘union ast_frame_subclass’ from type ‘char’ > chan_lcr.c: In function ‘lcr_request’: > chan_lcr.c:1820:2: warning: passing argument 9 of ‘__ast_channel_alloc’ > makes integer from pointer without a cast [enabled by default] > /usr/include/asterisk/channel.h:1118:2: note: expected ‘int’ but argument > is of type ‘char *’ > chan_lcr.c: In function ‘lcr_call’: > chan_lcr.c:1927:9: error: ‘struct ast_channel’ has no member named ‘cid’ > chan_lcr.c:1927:31: error: ‘struct ast_channel’ has no member named ‘cid’ > chan_lcr.c:1928:29: error: ‘struct ast_channel’ has no member named ‘cid’ > chan_lcr.c:1931:9: error: ‘struct ast_channel’ has no member named ‘cid’ > chan_lcr.c:1931:32: error: ‘struct ast_channel’ has no member named ‘cid’ > chan_lcr.c:1932:30: error: ‘struct ast_channel’ has no member named ‘cid’ > chan_lcr.c:1934:9: error: ‘struct ast_channel’ has no member named ‘cid’ > chan_lcr.c:1934:33: error: ‘struct ast_channel’ has no member named ‘cid’ > chan_lcr.c:1935:31: error: ‘struct ast_channel’ has no member named ‘cid’ > chan_lcr.c: In function ‘lcr_write’: > chan_lcr.c:2164:6: error: wrong type argument to unary exclamation mark > chan_lcr.c:2166:20: error: invalid operands to binary & (have ‘union > ast_frame_subclass’ and ‘format_t’) > chan_lcr.c: In function ‘lcr_read’: > chan_lcr.c:2229:25: error: incompatible types when assigning to type > ‘union ast_frame_subclass’ from type ‘format_t’ > chan_lcr.c: In function ‘lcr_indicate’: > chan_lcr.c:2274:8: warning: assignment from incompatible pointer type > [enabled by default] > chan_lcr.c:2289:8: warning: assignment from incompatible pointer type > [enabled by default] > chan_lcr.c:2316:8: warning: assignment from incompatible pointer type > [enabled by default] > chan_lcr.c:2381:14: error: dereferencing pointer to incomplete type > chan_lcr.c:2382:33: error: dereferencing pointer to incomplete type > chan_lcr.c: At top level: > chan_lcr.c:2602:2: warning: initialization from incompatible pointer type > [enabled by default] > chan_lcr.c:2602:2: warning: (near initialization for ‘lcr_tech.requester’) > [enabled by default] > chan_lcr.c: In function ‘load_module’: > chan_lcr.c:2818:2: warning: passing argument 2 of > ‘ast_register_application2’ from incompatible pointer type [enabled by > default] > /usr/include/asterisk/module.h:458:5: note: expected ‘int (*)(struct > ast_channel *, const char *)’ but argument is of type ‘int (*)(struct > ast_channel *, void *)’ > make: *** [chan_lcr.po] Error 1 > I have read that with Asterisk 1.8 and LCR 1.7 and the new OpenBSC chan_lcr isn't used and there is no gsm.conf-file needed. But I'm not sure and the most manuals and HotTo's I've found in the internet are old. (I am working with Ubuntu 11.10 and Kernel 3.0.22, mISDN is integrated with Kernel, mISDN_info works, mISDNuser is installed, OpenBSC gives no errors, Asterisk works with Twinkle since a few months without errors, I use a Cologne Chip HFC-E1 card which works with hfcmulti driver.) It would be appreciate if someone of you can help me in this case. I also searched for a solution in this german forum: http://www.ip-phone-forum.de (I also tried to work with Dahdi/zaphfc and Dahdi/cwain but they aren't recommended for using an HFC-E1 evalutaion board which is noch from Junghanns.) Best regards Ellen

6 16

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

OpenBSC July 2012