OpenBSC October 2014

openbsc@lists.osmocom.org

10 participants
22 discussions

by Jacob Erlbeck

This patch adds a test suite for the BSSGP protocol. The first (and only) test checks the handling of BSSGP SUSPEND/RESUME. Sponsored-by: On-Waves ehf --- tests/Makefile.am | 8 ++- tests/gb/gprs_bssgp_test.c | 151 ++++++++++++++++++++++++++++++++++++++++++++ tests/gb/gprs_bssgp_test.ok | 5 ++ tests/testsuite.at | 6 ++ 4 files changed, 168 insertions(+), 2 deletions(-) create mode 100644 tests/gb/gprs_bssgp_test.c create mode 100644 tests/gb/gprs_bssgp_test.ok diff --git a/tests/Makefile.am b/tests/Makefile.am index 3f7db1f..b7ae607 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -5,8 +5,8 @@ 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 gsm0408/gsm0408_test \ - gb/bssgp_fc_test gb/gprs_ns_test kasumi/kasumi_test \ - logging/logging_test fr/fr_test \ + gb/bssgp_fc_test gb/gprs_bssgp_test gb/gprs_ns_test \ + kasumi/kasumi_test logging/logging_test fr/fr_test \ loggingrb/loggingrb_test strrb/strrb_test \ vty/vty_test comp128/comp128_test utils/utils_test @@ -62,6 +62,9 @@ ussd_ussd_test_LDADD = $(top_builddir)/src/libosmocore.la $(top_builddir)/src/gs gb_bssgp_fc_test_SOURCES = gb/bssgp_fc_test.c gb_bssgp_fc_test_LDADD = $(top_builddir)/src/libosmocore.la $(top_builddir)/src/gb/libosmogb.la +gb_gprs_bssgp_test_SOURCES = gb/gprs_bssgp_test.c +gb_gprs_bssgp_test_LDADD = $(top_builddir)/src/libosmocore.la $(top_builddir)/src/gb/libosmogb.la $(LIBRARY_DL) + gb_gprs_ns_test_SOURCES = gb/gprs_ns_test.c gb_gprs_ns_test_LDADD = $(top_builddir)/src/libosmocore.la $(top_builddir)/src/gb/libosmogb.la $(LIBRARY_DL) @@ -106,6 +109,7 @@ EXTRA_DIST = testsuite.at $(srcdir)/package.m4 $(TESTSUITE) \ lapd/lapd_test.ok gsm0408/gsm0408_test.ok \ gsm0808/gsm0808_test.ok gb/bssgp_fc_tests.err \ gb/bssgp_fc_tests.ok gb/bssgp_fc_tests.sh \ + gb/gprs_bssgp_test.ok \ gb/gprs_ns_test.ok kasumi/kasumi_test.ok \ msgfile/msgfile_test.ok msgfile/msgconfig.cfg \ logging/logging_test.ok logging/logging_test.err \ diff --git a/tests/gb/gprs_bssgp_test.c b/tests/gb/gprs_bssgp_test.c new file mode 100644 index 0000000..a2a4068 --- /dev/null +++ b/tests/gb/gprs_bssgp_test.c @@ -0,0 +1,151 @@ +/* Test routines for the BSSGP implementation in libosmogb + * + * (C) 2014 by sysmocom s.f.m.c. GmbH + * Author: Jacob Erlbeck <jerlbeck(a)sysmocom.de> + * + * Skeleton based on bssgp_fc_test.c + * (C) 2012 by Harald Welte <laforge(a)gnumonks.org> + */ + +#undef _GNU_SOURCE +#define _GNU_SOURCE + +#include <osmocom/core/application.h> +#include <osmocom/core/utils.h> +#include <osmocom/core/logging.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/prim.h> +#include <osmocom/gprs/gprs_bssgp.h> +#include <osmocom/gprs/gprs_ns.h> + +#include <stdio.h> +#include <stdlib.h> +#include <stdint.h> +#include <string.h> +#include <getopt.h> +#include <unistd.h> +#include <netinet/ip.h> +#include <dlfcn.h> + +#define BSS_NSEI 0x0b55 + +static struct osmo_prim_hdr last_oph = {0}; + +/* override */ +ssize_t sendto(int sockfd, const void *buf, size_t len, int flags, + const struct sockaddr *dest_addr, socklen_t addrlen) +{ + typedef ssize_t (*sendto_t)(int, const void *, size_t, int, + const struct sockaddr *, socklen_t); + static sendto_t real_sendto = NULL; + uint32_t dest_host = htonl(((struct sockaddr_in *)dest_addr)->sin_addr.s_addr); + + if (!real_sendto) + real_sendto = dlsym(RTLD_NEXT, "sendto"); + + fprintf(stderr, "MESSAGE to 0x%08x, msg length %d\n%s\n", + dest_host, len, osmo_hexdump(buf, len)); + + return len; +} + +/* override */ +int gprs_ns_callback(enum gprs_ns_evt event, struct gprs_nsvc *nsvc, + struct msgb *msg, uint16_t bvci) +{ + fprintf(stderr, "CALLBACK, event %d, msg length %d, bvci 0x%04x\n%s\n\n", + event, msgb_bssgp_len(msg), bvci, + osmo_hexdump(msgb_bssgph(msg), msgb_bssgp_len(msg))); + return 0; +} + +int bssgp_prim_cb(struct osmo_prim_hdr *oph, void *ctx) +{ + printf("BSSGP primitive, SAP %d, prim = %d, op = %d, msg = %s\n", + oph->sap, oph->primitive, oph->operation, msgb_hexdump(oph->msg)); + + last_oph.sap = oph->sap; + last_oph.primitive = oph->primitive; + last_oph.operation = oph->operation; + last_oph.msg = NULL; + return -1; +} + +static void msgb_bssgp_send_and_free(struct msgb *msg) +{ + msgb_nsei(msg) = BSS_NSEI; + + bssgp_rcvmsg(msg); + + msgb_free(msg); +} + +static void send_bssgp_supend(enum bssgp_pdu_type pdu_type, uint32_t tlli) +{ + struct msgb *msg = bssgp_msgb_alloc(); + uint32_t tlli_be = htonl(tlli); + uint8_t rai[] = {0x0f, 0xf1, 0x80, 0x20, 0x37, 0x00}; + + msgb_v_put(msg, pdu_type); + msgb_tvlv_put(msg, BSSGP_IE_TLLI, sizeof(tlli_be), (uint8_t *)&tlli_be); + msgb_tvlv_put(msg, BSSGP_IE_ROUTEING_AREA, sizeof(rai), &rai[0]); + + msgb_bssgp_send_and_free(msg); +} + +static void send_bssgp_resume(enum bssgp_pdu_type pdu_type, uint32_t tlli) +{ + struct msgb *msg = bssgp_msgb_alloc(); + uint32_t tlli_be = htonl(tlli); + uint8_t rai[] = {0x0f, 0xf1, 0x80, 0x20, 0x37, 0x00}; + uint8_t suspend_ref = 1; + + msgb_v_put(msg, pdu_type); + msgb_tvlv_put(msg, BSSGP_IE_TLLI, sizeof(tlli_be), (uint8_t *)&tlli_be); + msgb_tvlv_put(msg, BSSGP_IE_ROUTEING_AREA, sizeof(rai), &rai[0]); + msgb_tvlv_put(msg, BSSGP_IE_SUSPEND_REF_NR, 1, &suspend_ref); + + msgb_bssgp_send_and_free(msg); +} + +static void test_bssgp_suspend_resume(void) +{ + const uint32_t tlli = 0xf0123456; + + printf("----- %s START\n", __func__); + memset(&last_oph, 0, sizeof(last_oph)); + + send_bssgp_supend(BSSGP_PDUT_SUSPEND, tlli); + /* OSMO_ASSERT(last_oph.primitive == PRIM_BSSGP_GMM_SUSPEND); */ + + send_bssgp_resume(BSSGP_PDUT_RESUME, tlli); + /* OSMO_ASSERT(last_oph.primitive == PRIM_BSSGP_GMM_RESUME); */ + + printf("----- %s END\n", __func__); +} + +static struct log_info info = {}; + +int main(int argc, char **argv) +{ + struct sockaddr_in bss_peer= {0}; + + osmo_init_logging(&info); + log_set_use_color(osmo_stderr_target, 0); + log_set_print_filename(osmo_stderr_target, 0); + + bssgp_nsi = gprs_ns_instantiate(gprs_ns_callback, NULL); + + bss_peer.sin_family = AF_INET; + bss_peer.sin_port = htons(32000); + bss_peer.sin_addr.s_addr = htonl(0x7f0000ff); + + gprs_ns_nsip_connect(bssgp_nsi, &bss_peer, BSS_NSEI, BSS_NSEI+1); + + + printf("===== BSSGP test START\n"); + test_bssgp_suspend_resume(); + printf("===== BSSGP test END\n\n"); + + exit(EXIT_SUCCESS); +} diff --git a/tests/gb/gprs_bssgp_test.ok b/tests/gb/gprs_bssgp_test.ok new file mode 100644 index 0000000..9c7b4c0 --- /dev/null +++ b/tests/gb/gprs_bssgp_test.ok @@ -0,0 +1,5 @@ +===== BSSGP test START +----- test_bssgp_suspend_resume START +----- test_bssgp_suspend_resume END +===== BSSGP test END + diff --git a/tests/testsuite.at b/tests/testsuite.at index 7ce2ee8..fe30363 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -118,6 +118,12 @@ cat $abs_srcdir/vty/vty_test.ok > expout AT_CHECK([$abs_top_builddir/tests/vty/vty_test], [0], [expout], [ignore]) AT_CLEANUP +AT_SETUP([gprs-bssgp]) +AT_KEYWORDS([gprs-bssgp]) +cat $abs_srcdir/gb/gprs_bssgp_test.ok > expout +AT_CHECK([$abs_top_builddir/tests/gb/gprs_bssgp_test], [0], [expout], [ignore]) +AT_CLEANUP + AT_SETUP([gprs-ns]) AT_KEYWORDS([gprs-ns]) cat $abs_srcdir/gb/gprs_ns_test.ok > expout -- 1.9.1

10 years, 8 months

Re: [PATCH 1/2] Ignore build byproducts

by ttsou

Hi Max, On Mon, Oct 13, 2014 at 09:01:50PM +0200, ☎ wrote: > Attached is a 2nd patch - it completely disables sqlite, all the configuration for > osmo-trx is supplied through command-line options. This makes troubleshooting easier > because now we have single source of truth: all the defaults are in one place. Thanks for looking into this. I agree that the sqlite configuration should be removed because it only causes confusion at this point. The original intention was to have backwards compatibility with OpenBTS-style sqlite options, but the number of users of that approach is approximately -1. Logging is the other concern. Have you tried removing the configuration table entirely? The existing queries are rarely, if ever, used. Without sqlite, the table shouldn't exist at all. Some general comments. Please remove code when you intend to remove it - committing commented out lines makes code and the patch difficult to read. Git will track the changes. Pull requests work well for large commits, such as sqlite3.c removal. > diff --git a/Transceiver52M/osmo-trx.cpp b/Transceiver52M/osmo-trx.cpp > index 9215fa5..16ac7b9 100644 > --- a/Transceiver52M/osmo-trx.cpp > +++ b/Transceiver52M/osmo-trx.cpp > - > +volatile bool gshutdown = false; // FIXME: what the ... is that for? The shutdown variable is a relic from OpenBTS, and exists because of the mess involving threads and shutdown. That issue is unrelated to logging or sqlite. > - refstr = config->extref ? "Enabled" : "Disabled"; > - fillstr = config->filler ? "Enabled" : "Disabled"; > - divstr = config->diversity ? "Enabled" : "Disabled"; > - > std::ostringstream ost(""); > ost << "Config Settings" << std::endl; > ost << " Log Level............... " << config->log_level << std::endl; > @@ -176,9 +96,9 @@ bool trx_setup_config(struct trx_config *config) > ost << " TRX Address............. " << config->addr << std::endl; > ost << " Channels................ " << config->chans << std::endl; > ost << " Samples-per-Symbol...... " << config->sps << std::endl; > - ost << " External Reference...... " << refstr << std::endl; > - ost << " C0 Filler Table......... " << fillstr << std::endl; > - ost << " Diversity............... " << divstr << std::endl; > + ost << " External Reference...... " << (config->extref ? "Enabled" : "Disabled") << std::endl; > + ost << " C0 Filler Table......... " << (config->filler ? "Enabled" : "Disabled") << std::endl; > + ost << " Diversity............... " << (config->diversity ? "Enabled" : "Disabled") << std::endl; > ost << " Tuning offset........... " << config->offset << std::endl; > std::cout << ost << std::endl; Please put whitespace / formatting changes in a separate patch. Osmocom projects generally use kernel style, which becomes somewhat odd and less strict in the context of C++. In this case, the code change is fine, but don't add it to an already massive patch. -TT

10 years, 8 months

[PATCH] Use normal talloc instead of libosmocore copy

by Max Suraev

Signed-off-by: Max Suraev <max.suraev(a)fairwaves.co> --- configure.ac | 1 + src/Makefile.am | 2 ++ src/bitvector.cpp | 4 +--- src/bts.cpp | 2 +- src/gprs_bssgp_pcu.h | 2 +- src/gprs_debug.cpp | 2 +- src/openbts_sock.cpp | 2 +- src/pcu_l1_if.cpp | 3 ++- src/sba.cpp | 5 +---- src/sysmo_l1_fwd.c | 2 +- src/sysmo_l1_hw.c | 2 +- src/sysmo_l1_if.c | 2 +- src/sysmo_sock.cpp | 3 ++- src/ta.cpp | 5 +---- src/tbf.cpp | 2 +- src/tbf_dl.cpp | 2 +- src/tbf_ul.cpp | 2 +- tests/Makefile.am | 13 +++++++++---- tests/alloc/AllocTest.cpp | 2 +- tests/emu/pcu_emu.cpp | 2 +- tests/rlcmac/RLCMACTest.cpp | 2 ++ tests/tbf/TbfTest.cpp | 2 +- tests/types/TypesTest.cpp | 3 ++- 23 files changed, 36 insertions(+), 31 deletions(-) diff --git a/configure.ac b/configure.ac index 3b2f380..c72cb4b 100644 --- a/configure.ac +++ b/configure.ac @@ -26,6 +26,7 @@ PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.3.9) PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty) PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.3.3) PKG_CHECK_MODULES(LIBOSMOGB, libosmogb >= 0.5.1.4) +PKG_CHECK_MODULES(LIBTALLOC, talloc >= 2.0.1) AC_MSG_CHECKING([whether to enable sysmocom-bts hardware support]) AC_ARG_ENABLE(sysmocom-bts, diff --git a/src/Makefile.am b/src/Makefile.am index d1ed701..8c625ed 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -112,6 +112,7 @@ osmo_pcu_LDADD = \ $(LIBOSMOGB_LIBS) \ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOGSM_LIBS) \ + $(LIBTALLOC_LIBS) \ $(COMMON_LA) if ENABLE_SYSMODSP @@ -120,6 +121,7 @@ osmo_pcu_remote_LDADD = \ $(LIBOSMOGB_LIBS) \ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOGSM_LIBS) \ + $(LIBTALLOC_LIBS) \ $(COMMON_LA) endif diff --git a/src/bitvector.cpp b/src/bitvector.cpp index 43feebc..05a0781 100644 --- a/src/bitvector.cpp +++ b/src/bitvector.cpp @@ -26,9 +26,7 @@ */ #include <bitvector.h> -extern "C" { -#include <osmocom/core/talloc.h> -} +#include <talloc.h> void *bv_tall_ctx; diff --git a/src/bts.cpp b/src/bts.cpp index b660014..ac41384 100644 --- a/src/bts.cpp +++ b/src/bts.cpp @@ -30,11 +30,11 @@ #include <gprs_debug.h> extern "C" { - #include <osmocom/core/talloc.h> #include <osmocom/core/msgb.h> } #include <arpa/inet.h> +#include <talloc.h> #include <errno.h> #include <string.h> diff --git a/src/gprs_bssgp_pcu.h b/src/gprs_bssgp_pcu.h index 32b6728..cbe6ef8 100644 --- a/src/gprs_bssgp_pcu.h +++ b/src/gprs_bssgp_pcu.h @@ -23,7 +23,6 @@ extern "C" { -#include <osmocom/core/talloc.h> #include <osmocom/core/rate_ctr.h> #include <osmocom/core/logging.h> #include <osmocom/core/signal.h> @@ -36,6 +35,7 @@ extern "C" { struct bssgp_bvc_ctx *btsctx_alloc(uint16_t bvci, uint16_t nsei); } #include <gprs_debug.h> +#include <talloc.h> #define QOS_PROFILE 4 #define BSSGP_HDR_LEN 53 diff --git a/src/gprs_debug.cpp b/src/gprs_debug.cpp index 6f9e310..aa8864e 100644 --- a/src/gprs_debug.cpp +++ b/src/gprs_debug.cpp @@ -25,7 +25,7 @@ #include <time.h> #include <errno.h> -#include <osmocom/core/talloc.h> +#include <talloc.h> #include <osmocom/core/utils.h> #include <osmocom/core/logging.h> #include <gprs_debug.h> diff --git a/src/openbts_sock.cpp b/src/openbts_sock.cpp index 2d9cae4..a19097b 100644 --- a/src/openbts_sock.cpp +++ b/src/openbts_sock.cpp @@ -26,8 +26,8 @@ #include <bitvector.h> #include <sys/socket.h> #include <arpa/inet.h> +#include <talloc.h> extern "C" { -#include <osmocom/core/talloc.h> #include <osmocom/core/write_queue.h> #include <osmocom/core/socket.h> #include <osmocom/core/timer.h> diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp index 0cb79eb..de6549b 100644 --- a/src/pcu_l1_if.cpp +++ b/src/pcu_l1_if.cpp @@ -26,8 +26,9 @@ #include <sys/socket.h> #include <sys/un.h> #include <arpa/inet.h> +#include <talloc.h> + extern "C" { -#include <osmocom/core/talloc.h> #include <osmocom/core/select.h> #include <osmocom/core/msgb.h> } diff --git a/src/sba.cpp b/src/sba.cpp index 6eec235..b09b5cb 100644 --- a/src/sba.cpp +++ b/src/sba.cpp @@ -24,10 +24,7 @@ #include <gprs_debug.h> #include <bts.h> -extern "C" { -#include <osmocom/core/talloc.h> -} - +#include <talloc.h> #include <errno.h> extern void *tall_pcu_ctx; diff --git a/src/sysmo_l1_fwd.c b/src/sysmo_l1_fwd.c index 535a7f0..0336889 100644 --- a/src/sysmo_l1_fwd.c +++ b/src/sysmo_l1_fwd.c @@ -32,7 +32,7 @@ #include <netinet/in.h> #include <arpa/inet.h> -#include <osmocom/core/talloc.h> +#include <talloc.h> #include <osmocom/core/utils.h> #include <osmocom/core/select.h> #include <osmocom/core/write_queue.h> diff --git a/src/sysmo_l1_hw.c b/src/sysmo_l1_hw.c index 8351d68..9190a51 100644 --- a/src/sysmo_l1_hw.c +++ b/src/sysmo_l1_hw.c @@ -29,7 +29,7 @@ #include <sys/types.h> #include <sys/stat.h> -#include <osmocom/core/talloc.h> +#include <talloc.h> #include <osmocom/core/utils.h> #include <osmocom/core/select.h> #include <osmocom/core/write_queue.h> diff --git a/src/sysmo_l1_if.c b/src/sysmo_l1_if.c index 4274e77..fa3a983 100644 --- a/src/sysmo_l1_if.c +++ b/src/sysmo_l1_if.c @@ -1,6 +1,7 @@ #include <string.h> #include <errno.h> +#include <talloc.h> #include <sysmocom/femtobts/superfemto.h> #include <sysmocom/femtobts/gsml1prim.h> @@ -8,7 +9,6 @@ #include <sysmocom/femtobts/gsml1types.h> #include <osmocom/core/gsmtap.h> -#include <osmocom/core/talloc.h> #include <osmocom/core/timer.h> #include <sysmo_l1_if.h> #include <gprs_debug.h> diff --git a/src/sysmo_sock.cpp b/src/sysmo_sock.cpp index 951653e..10eb2d7 100644 --- a/src/sysmo_sock.cpp +++ b/src/sysmo_sock.cpp @@ -25,8 +25,9 @@ #include <assert.h> #include <sys/socket.h> #include <sys/un.h> +#include <talloc.h> + extern "C" { -#include <osmocom/core/talloc.h> #include <osmocom/core/select.h> #include <osmocom/core/msgb.h> } diff --git a/src/ta.cpp b/src/ta.cpp index 0bc1d66..5b0bcd8 100644 --- a/src/ta.cpp +++ b/src/ta.cpp @@ -22,10 +22,7 @@ #include <ta.h> #include <gprs_rlcmac.h> -extern "C" { - #include <osmocom/core/talloc.h> -} - +#include <talloc.h> #include <errno.h> extern void *tall_pcu_ctx; diff --git a/src/tbf.cpp b/src/tbf.cpp index 2afe257..4d95f15 100644 --- a/src/tbf.cpp +++ b/src/tbf.cpp @@ -30,9 +30,9 @@ extern "C" { #include <osmocom/core/msgb.h> -#include <osmocom/core/talloc.h> } +#include <talloc.h> #include <errno.h> #include <string.h> diff --git a/src/tbf_dl.cpp b/src/tbf_dl.cpp index 8de3b2b..8113e49 100644 --- a/src/tbf_dl.cpp +++ b/src/tbf_dl.cpp @@ -29,9 +29,9 @@ extern "C" { #include <osmocom/core/msgb.h> -#include <osmocom/core/talloc.h> } +#include <talloc.h> #include <errno.h> #include <string.h> diff --git a/src/tbf_ul.cpp b/src/tbf_ul.cpp index 3ab71f0..35581ac 100644 --- a/src/tbf_ul.cpp +++ b/src/tbf_ul.cpp @@ -30,9 +30,9 @@ extern "C" { #include <osmocom/core/msgb.h> -#include <osmocom/core/talloc.h> } +#include <talloc.h> #include <errno.h> #include <string.h> diff --git a/tests/Makefile.am b/tests/Makefile.am index e84f17d..84039a2 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -7,6 +7,7 @@ rlcmac_RLCMACTest_SOURCES = rlcmac/RLCMACTest.cpp rlcmac_RLCMACTest_LDADD = \ $(top_builddir)/src/libgprs.la \ $(LIBOSMOCORE_LIBS) \ + $(LIBTALLOC_LIBS) \ $(COMMON_LA) alloc_AllocTest_SOURCES = alloc/AllocTest.cpp @@ -15,15 +16,17 @@ alloc_AllocTest_LDADD = \ $(LIBOSMOGB_LIBS) \ $(LIBOSMOGSM_LIBS) \ $(LIBOSMOCORE_LIBS) \ + $(LIBTALLOC_LIBS) \ $(COMMON_LA) tbf_TbfTest_SOURCES = tbf/TbfTest.cpp tbf_TbfTest_LDADD = \ + $(top_builddir)/src/libgprs.la \ $(LIBOSMOGB_LIBS) \ $(LIBOSMOGSM_LIBS) \ $(LIBOSMOCORE_LIBS) \ - $(COMMON_LA) \ - $(top_builddir)/src/libgprs.la + $(LIBTALLOC_LIBS) \ + $(COMMON_LA) emu_pcu_emu_SOURCES = emu/pcu_emu.cpp emu/test_replay_gprs_attach.cpp \ emu/openbsc_clone.c emu/openbsc_clone.h emu/gprs_tests.h \ @@ -33,15 +36,17 @@ emu_pcu_emu_LDADD = \ $(LIBOSMOGB_LIBS) \ $(LIBOSMOGSM_LIBS) \ $(LIBOSMOCORE_LIBS) \ + $(LIBTALLOC_LIBS) \ $(COMMON_LA) types_TypesTest_SOURCES = types/TypesTest.cpp types_TypesTest_LDADD = \ + $(top_builddir)/src/libgprs.la \ $(LIBOSMOGB_LIBS) \ $(LIBOSMOGSM_LIBS) \ $(LIBOSMOCORE_LIBS) \ - $(COMMON_LA) \ - $(top_builddir)/src/libgprs.la + $(LIBTALLOC_LIBS) \ + $(COMMON_LA) # The `:;' works around a Bash 3.2 bug when the output is not writeable. diff --git a/tests/alloc/AllocTest.cpp b/tests/alloc/AllocTest.cpp index d711ad8..be57f18 100644 --- a/tests/alloc/AllocTest.cpp +++ b/tests/alloc/AllocTest.cpp @@ -24,11 +24,11 @@ #include <string.h> #include <stdio.h> +#include <talloc.h> extern "C" { #include <osmocom/core/application.h> #include <osmocom/core/msgb.h> -#include <osmocom/core/talloc.h> #include <osmocom/core/utils.h> } diff --git a/tests/emu/pcu_emu.cpp b/tests/emu/pcu_emu.cpp index ed0abbe..45e49ee 100644 --- a/tests/emu/pcu_emu.cpp +++ b/tests/emu/pcu_emu.cpp @@ -20,7 +20,6 @@ */ extern "C" { -#include <osmocom/core/talloc.h> #include <pcu_vty.h> } @@ -31,6 +30,7 @@ extern "C" { #include <gprs_rlcmac.h> #include <bts.h> +#include <talloc.h> #include <stdlib.h> #include <sys/types.h> #include <sys/socket.h> diff --git a/tests/rlcmac/RLCMACTest.cpp b/tests/rlcmac/RLCMACTest.cpp index 66bc53c..30a38a7 100644 --- a/tests/rlcmac/RLCMACTest.cpp +++ b/tests/rlcmac/RLCMACTest.cpp @@ -23,6 +23,8 @@ #include <iostream> #include <cstdlib> #include <cstring> +#include <talloc.h> + #include "csn1.h" #include "gsm_rlcmac.h" extern "C" { diff --git a/tests/tbf/TbfTest.cpp b/tests/tbf/TbfTest.cpp index 0811520..662be73 100644 --- a/tests/tbf/TbfTest.cpp +++ b/tests/tbf/TbfTest.cpp @@ -19,6 +19,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ +#include <talloc.h> #include "bts.h" #include "tbf.h" @@ -27,7 +28,6 @@ extern "C" { #include <osmocom/core/application.h> #include <osmocom/core/msgb.h> -#include <osmocom/core/talloc.h> #include <osmocom/core/utils.h> } diff --git a/tests/types/TypesTest.cpp b/tests/types/TypesTest.cpp index 8a464b1..eb6824a 100644 --- a/tests/types/TypesTest.cpp +++ b/tests/types/TypesTest.cpp @@ -19,6 +19,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ +#include <talloc.h> + #include "bts.h" #include "tbf.h" #include "gprs_debug.h" @@ -28,7 +30,6 @@ extern "C" { #include <osmocom/core/application.h> #include <osmocom/core/msgb.h> -#include <osmocom/core/talloc.h> #include <osmocom/core/utils.h> } -- 1.9.1

10 years, 8 months

[PATCH] Use normal talloc instead of libosmocore copy

by Max Suraev

Signed-off-by: Max Suraev <max.suraev(a)fairwaves.co> --- configure.ac | 1 + src/Makefile.am | 2 ++ src/bitvector.cpp | 2 +- src/bts.cpp | 2 +- src/gprs_bssgp_pcu.h | 2 +- src/gprs_debug.cpp | 2 +- src/openbts_sock.cpp | 2 +- src/pcu_l1_if.cpp | 2 +- src/sba.cpp | 2 +- src/sysmo_l1_fwd.c | 2 +- src/sysmo_l1_hw.c | 2 +- src/sysmo_l1_if.c | 2 +- src/sysmo_sock.cpp | 2 +- src/ta.cpp | 2 +- src/tbf.cpp | 2 +- src/tbf_dl.cpp | 2 +- src/tbf_ul.cpp | 2 +- tests/Makefile.am | 13 +++++++++---- tests/alloc/AllocTest.cpp | 2 +- tests/emu/pcu_emu.cpp | 2 +- tests/rlcmac/RLCMACTest.cpp | 1 + tests/tbf/TbfTest.cpp | 2 +- tests/types/TypesTest.cpp | 2 +- 23 files changed, 32 insertions(+), 23 deletions(-) diff --git a/configure.ac b/configure.ac index 3b2f380..c72cb4b 100644 --- a/configure.ac +++ b/configure.ac @@ -26,6 +26,7 @@ PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.3.9) PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty) PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.3.3) PKG_CHECK_MODULES(LIBOSMOGB, libosmogb >= 0.5.1.4) +PKG_CHECK_MODULES(LIBTALLOC, talloc >= 2.0.1) AC_MSG_CHECKING([whether to enable sysmocom-bts hardware support]) AC_ARG_ENABLE(sysmocom-bts, diff --git a/src/Makefile.am b/src/Makefile.am index d1ed701..8c625ed 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -112,6 +112,7 @@ osmo_pcu_LDADD = \ $(LIBOSMOGB_LIBS) \ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOGSM_LIBS) \ + $(LIBTALLOC_LIBS) \ $(COMMON_LA) if ENABLE_SYSMODSP @@ -120,6 +121,7 @@ osmo_pcu_remote_LDADD = \ $(LIBOSMOGB_LIBS) \ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOGSM_LIBS) \ + $(LIBTALLOC_LIBS) \ $(COMMON_LA) endif diff --git a/src/bitvector.cpp b/src/bitvector.cpp index 43feebc..bc1bcb0 100644 --- a/src/bitvector.cpp +++ b/src/bitvector.cpp @@ -27,7 +27,7 @@ #include <bitvector.h> extern "C" { -#include <osmocom/core/talloc.h> +#include <talloc.h> } void *bv_tall_ctx; diff --git a/src/bts.cpp b/src/bts.cpp index b660014..d18361e 100644 --- a/src/bts.cpp +++ b/src/bts.cpp @@ -30,7 +30,7 @@ #include <gprs_debug.h> extern "C" { - #include <osmocom/core/talloc.h> + #include <talloc.h> #include <osmocom/core/msgb.h> } diff --git a/src/gprs_bssgp_pcu.h b/src/gprs_bssgp_pcu.h index 32b6728..a05ef75 100644 --- a/src/gprs_bssgp_pcu.h +++ b/src/gprs_bssgp_pcu.h @@ -23,7 +23,7 @@ extern "C" { -#include <osmocom/core/talloc.h> +#include <talloc.h> #include <osmocom/core/rate_ctr.h> #include <osmocom/core/logging.h> #include <osmocom/core/signal.h> diff --git a/src/gprs_debug.cpp b/src/gprs_debug.cpp index 6f9e310..aa8864e 100644 --- a/src/gprs_debug.cpp +++ b/src/gprs_debug.cpp @@ -25,7 +25,7 @@ #include <time.h> #include <errno.h> -#include <osmocom/core/talloc.h> +#include <talloc.h> #include <osmocom/core/utils.h> #include <osmocom/core/logging.h> #include <gprs_debug.h> diff --git a/src/openbts_sock.cpp b/src/openbts_sock.cpp index 2d9cae4..50880f3 100644 --- a/src/openbts_sock.cpp +++ b/src/openbts_sock.cpp @@ -27,7 +27,7 @@ #include <sys/socket.h> #include <arpa/inet.h> extern "C" { -#include <osmocom/core/talloc.h> +#include <talloc.h> #include <osmocom/core/write_queue.h> #include <osmocom/core/socket.h> #include <osmocom/core/timer.h> diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp index 0cb79eb..2a81584 100644 --- a/src/pcu_l1_if.cpp +++ b/src/pcu_l1_if.cpp @@ -27,7 +27,7 @@ #include <sys/un.h> #include <arpa/inet.h> extern "C" { -#include <osmocom/core/talloc.h> +#include <talloc.h> #include <osmocom/core/select.h> #include <osmocom/core/msgb.h> } diff --git a/src/sba.cpp b/src/sba.cpp index 6eec235..a0e1506 100644 --- a/src/sba.cpp +++ b/src/sba.cpp @@ -25,7 +25,7 @@ #include <bts.h> extern "C" { -#include <osmocom/core/talloc.h> +#include <talloc.h> } #include <errno.h> diff --git a/src/sysmo_l1_fwd.c b/src/sysmo_l1_fwd.c index 535a7f0..0336889 100644 --- a/src/sysmo_l1_fwd.c +++ b/src/sysmo_l1_fwd.c @@ -32,7 +32,7 @@ #include <netinet/in.h> #include <arpa/inet.h> -#include <osmocom/core/talloc.h> +#include <talloc.h> #include <osmocom/core/utils.h> #include <osmocom/core/select.h> #include <osmocom/core/write_queue.h> diff --git a/src/sysmo_l1_hw.c b/src/sysmo_l1_hw.c index 8351d68..9190a51 100644 --- a/src/sysmo_l1_hw.c +++ b/src/sysmo_l1_hw.c @@ -29,7 +29,7 @@ #include <sys/types.h> #include <sys/stat.h> -#include <osmocom/core/talloc.h> +#include <talloc.h> #include <osmocom/core/utils.h> #include <osmocom/core/select.h> #include <osmocom/core/write_queue.h> diff --git a/src/sysmo_l1_if.c b/src/sysmo_l1_if.c index 4274e77..fa3a983 100644 --- a/src/sysmo_l1_if.c +++ b/src/sysmo_l1_if.c @@ -1,6 +1,7 @@ #include <string.h> #include <errno.h> +#include <talloc.h> #include <sysmocom/femtobts/superfemto.h> #include <sysmocom/femtobts/gsml1prim.h> @@ -8,7 +9,6 @@ #include <sysmocom/femtobts/gsml1types.h> #include <osmocom/core/gsmtap.h> -#include <osmocom/core/talloc.h> #include <osmocom/core/timer.h> #include <sysmo_l1_if.h> #include <gprs_debug.h> diff --git a/src/sysmo_sock.cpp b/src/sysmo_sock.cpp index 951653e..9b97190 100644 --- a/src/sysmo_sock.cpp +++ b/src/sysmo_sock.cpp @@ -26,7 +26,7 @@ #include <sys/socket.h> #include <sys/un.h> extern "C" { -#include <osmocom/core/talloc.h> +#include <talloc.h> #include <osmocom/core/select.h> #include <osmocom/core/msgb.h> } diff --git a/src/ta.cpp b/src/ta.cpp index 0bc1d66..428f084 100644 --- a/src/ta.cpp +++ b/src/ta.cpp @@ -23,7 +23,7 @@ #include <gprs_rlcmac.h> extern "C" { - #include <osmocom/core/talloc.h> + #include <talloc.h> } #include <errno.h> diff --git a/src/tbf.cpp b/src/tbf.cpp index 2afe257..a688421 100644 --- a/src/tbf.cpp +++ b/src/tbf.cpp @@ -30,7 +30,7 @@ extern "C" { #include <osmocom/core/msgb.h> -#include <osmocom/core/talloc.h> +#include <talloc.h> } #include <errno.h> diff --git a/src/tbf_dl.cpp b/src/tbf_dl.cpp index 8de3b2b..369a5cb 100644 --- a/src/tbf_dl.cpp +++ b/src/tbf_dl.cpp @@ -29,7 +29,7 @@ extern "C" { #include <osmocom/core/msgb.h> -#include <osmocom/core/talloc.h> +#include <talloc.h> } #include <errno.h> diff --git a/src/tbf_ul.cpp b/src/tbf_ul.cpp index 3ab71f0..a5a0d2f 100644 --- a/src/tbf_ul.cpp +++ b/src/tbf_ul.cpp @@ -30,7 +30,7 @@ extern "C" { #include <osmocom/core/msgb.h> -#include <osmocom/core/talloc.h> +#include <talloc.h> } #include <errno.h> diff --git a/tests/Makefile.am b/tests/Makefile.am index e84f17d..84039a2 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -7,6 +7,7 @@ rlcmac_RLCMACTest_SOURCES = rlcmac/RLCMACTest.cpp rlcmac_RLCMACTest_LDADD = \ $(top_builddir)/src/libgprs.la \ $(LIBOSMOCORE_LIBS) \ + $(LIBTALLOC_LIBS) \ $(COMMON_LA) alloc_AllocTest_SOURCES = alloc/AllocTest.cpp @@ -15,15 +16,17 @@ alloc_AllocTest_LDADD = \ $(LIBOSMOGB_LIBS) \ $(LIBOSMOGSM_LIBS) \ $(LIBOSMOCORE_LIBS) \ + $(LIBTALLOC_LIBS) \ $(COMMON_LA) tbf_TbfTest_SOURCES = tbf/TbfTest.cpp tbf_TbfTest_LDADD = \ + $(top_builddir)/src/libgprs.la \ $(LIBOSMOGB_LIBS) \ $(LIBOSMOGSM_LIBS) \ $(LIBOSMOCORE_LIBS) \ - $(COMMON_LA) \ - $(top_builddir)/src/libgprs.la + $(LIBTALLOC_LIBS) \ + $(COMMON_LA) emu_pcu_emu_SOURCES = emu/pcu_emu.cpp emu/test_replay_gprs_attach.cpp \ emu/openbsc_clone.c emu/openbsc_clone.h emu/gprs_tests.h \ @@ -33,15 +36,17 @@ emu_pcu_emu_LDADD = \ $(LIBOSMOGB_LIBS) \ $(LIBOSMOGSM_LIBS) \ $(LIBOSMOCORE_LIBS) \ + $(LIBTALLOC_LIBS) \ $(COMMON_LA) types_TypesTest_SOURCES = types/TypesTest.cpp types_TypesTest_LDADD = \ + $(top_builddir)/src/libgprs.la \ $(LIBOSMOGB_LIBS) \ $(LIBOSMOGSM_LIBS) \ $(LIBOSMOCORE_LIBS) \ - $(COMMON_LA) \ - $(top_builddir)/src/libgprs.la + $(LIBTALLOC_LIBS) \ + $(COMMON_LA) # The `:;' works around a Bash 3.2 bug when the output is not writeable. diff --git a/tests/alloc/AllocTest.cpp b/tests/alloc/AllocTest.cpp index d711ad8..012bb47 100644 --- a/tests/alloc/AllocTest.cpp +++ b/tests/alloc/AllocTest.cpp @@ -28,8 +28,8 @@ extern "C" { #include <osmocom/core/application.h> #include <osmocom/core/msgb.h> -#include <osmocom/core/talloc.h> #include <osmocom/core/utils.h> +#include <talloc.h> } /* globals used by the code */ diff --git a/tests/emu/pcu_emu.cpp b/tests/emu/pcu_emu.cpp index ed0abbe..0a9ecbd 100644 --- a/tests/emu/pcu_emu.cpp +++ b/tests/emu/pcu_emu.cpp @@ -20,7 +20,7 @@ */ extern "C" { -#include <osmocom/core/talloc.h> +#include <talloc.h> #include <pcu_vty.h> } diff --git a/tests/rlcmac/RLCMACTest.cpp b/tests/rlcmac/RLCMACTest.cpp index 66bc53c..987d3e9 100644 --- a/tests/rlcmac/RLCMACTest.cpp +++ b/tests/rlcmac/RLCMACTest.cpp @@ -28,6 +28,7 @@ extern "C" { extern const struct log_info gprs_log_info; #include "pcu_vty.h" +#include <talloc.h> #include <osmocom/vty/telnet_interface.h> #include <osmocom/vty/logging.h> #include <osmocom/core/application.h> diff --git a/tests/tbf/TbfTest.cpp b/tests/tbf/TbfTest.cpp index 0811520..c62a74c 100644 --- a/tests/tbf/TbfTest.cpp +++ b/tests/tbf/TbfTest.cpp @@ -27,8 +27,8 @@ extern "C" { #include <osmocom/core/application.h> #include <osmocom/core/msgb.h> -#include <osmocom/core/talloc.h> #include <osmocom/core/utils.h> +#include <talloc.h> } void *tall_pcu_ctx; diff --git a/tests/types/TypesTest.cpp b/tests/types/TypesTest.cpp index 8a464b1..9ceae77 100644 --- a/tests/types/TypesTest.cpp +++ b/tests/types/TypesTest.cpp @@ -28,8 +28,8 @@ extern "C" { #include <osmocom/core/application.h> #include <osmocom/core/msgb.h> -#include <osmocom/core/talloc.h> #include <osmocom/core/utils.h> +#include <talloc.h> } #define OSMO_ASSERT_STR_EQ(a, b) \ -- 1.9.1

10 years, 8 months

[PATCH 1/2] Ignore build byproducts

by Max

Signed-off-by: Max <max.suraev(a)fairwaves.co> --- .gitignore | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..0e0e704 --- /dev/null +++ b/.gitignore @@ -0,0 +1,29 @@ +.deps/ +.libs/ +*.lo +*.la +*.o +osmo-trx +CommonLibs/*Test +Transceiver52M/osmo-trx-options.c +Transceiver52M/osmo-trx-options.h +Transceiver52M/osmo-trx.ggo~ +aclocal.m4 +autom4te.cache/ +missing +ltmain.sh +install-sh +depcomp +configure +config/ +compile +libtool +stamp-h1 +config.guess +config.h.in +config.status +config.log +config.h +config.sub +Makefile +Makefile.in -- 1.9.1

10 years, 8 months

nanoBTS 139U1800 for sale

by Rabbit Maque

Hello, Sorry for the intrusion but I have two 139U 1800 for sale. Please email me if interested. Kind regards, Rabbit

10 years, 8 months

[PATCH 1/2] gprs-ns/test: Re-add return value check for gprs_nsvc_reset

by Jacob Erlbeck

The return value check has been removed in the commit 'Use gprs_nsvc_reset instead of gprs_ns_tx_reset', because gprs_nsvc_reset had no return value then. Since a compatible return value has been added by 'Let gprs_nsvc_reset return a value', the former patch is partly reverted by this commit. Sponsored-by: On-Waves ehf --- tests/gb/gprs_ns_test.c | 9 ++++++++- tests/gb/gprs_ns_test.ok | 2 ++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/tests/gb/gprs_ns_test.c b/tests/gb/gprs_ns_test.c index 2185ff8..eab71e7 100644 --- a/tests/gb/gprs_ns_test.c +++ b/tests/gb/gprs_ns_test.c @@ -592,6 +592,7 @@ static void test_bss_reset_ack() struct sockaddr_in peer[4] = {{0},}; struct gprs_nsvc *nsvc; struct sockaddr_in *nse[4]; + int rc; peer[0].sin_family = AF_INET; peer[0].sin_port = htons(1111); @@ -641,7 +642,13 @@ static void test_bss_reset_ack() printf("--- Setup VC 2 SGSN -> BSS (hits NSEI 2) ---\n\n"); nsvc = gprs_nsvc_by_nsvci(nsi, 0x2001); - gprs_nsvc_reset(nsvc, NS_CAUSE_OM_INTERVENTION); + rc = gprs_nsvc_reset(nsvc, NS_CAUSE_OM_INTERVENTION); + if (rc < 0) + printf("Failed to send RESET to %s\n\n", gprs_ns_ll_str(nsvc)); + else { + send_ns_reset_ack(nsi, nse[1], 0x2001, 0x2000); + gprs_dump_nsi(nsi); + } printf("--- Setup VC 1 SGSN -> BSS (hits NSEI 1) ---\n\n"); diff --git a/tests/gb/gprs_ns_test.ok b/tests/gb/gprs_ns_test.ok index 1e0bf7f..d6be1a9 100644 --- a/tests/gb/gprs_ns_test.ok +++ b/tests/gb/gprs_ns_test.ok @@ -375,6 +375,8 @@ Current NS-VCIs: --- Setup VC 2 SGSN -> BSS (hits NSEI 2) --- +Failed to send RESET to 0.0.0.0:0 + --- Setup VC 1 SGSN -> BSS (hits NSEI 1) --- MESSAGE to BSS, msg length 12 -- 1.9.1

10 years, 8 months

[PATCH 1/6] gprs-ns/test: Use gprs_nsvc_reset instead of gprs_ns_tx_reset

by Jacob Erlbeck

Currently gprs_ns_tx_reset is used to let the NS stack generate NS_RESET message. This is not adjusting the nsvc state properly. This patch uses gprs_nsvc_reset instead which starts the full reset procedure. Sponsored-by: On-Waves ehf --- tests/gb/gprs_ns_test.c | 23 ++++++++--------------- tests/gb/gprs_ns_test.ok | 12 +++++------- 2 files changed, 13 insertions(+), 22 deletions(-) diff --git a/tests/gb/gprs_ns_test.c b/tests/gb/gprs_ns_test.c index c90d752..15e36ba 100644 --- a/tests/gb/gprs_ns_test.c +++ b/tests/gb/gprs_ns_test.c @@ -573,7 +573,6 @@ static void test_bss_reset_ack() struct sockaddr_in peer[4] = {{0},}; struct gprs_nsvc *nsvc; struct sockaddr_in *nse[4]; - int rc; peer[0].sin_family = AF_INET; peer[0].sin_port = htons(1111); @@ -604,7 +603,7 @@ static void test_bss_reset_ack() printf("--- Setup VC 1 SGSN -> BSS ---\n\n"); nsvc = gprs_nsvc_by_nsvci(nsi, 0x1001); - gprs_ns_tx_reset(nsvc, NS_CAUSE_OM_INTERVENTION); + gprs_nsvc_reset(nsvc, NS_CAUSE_OM_INTERVENTION); send_ns_reset_ack(nsi, nse[0], 0x1001, 0x1000); gprs_dump_nsi(nsi); @@ -616,25 +615,19 @@ static void test_bss_reset_ack() printf("--- Setup VC 2 SGSN -> BSS (hits NSEI 1) ---\n\n"); nsvc = gprs_nsvc_by_nsvci(nsi, 0x2001); - gprs_ns_tx_reset(nsvc, NS_CAUSE_OM_INTERVENTION); + gprs_nsvc_reset(nsvc, NS_CAUSE_OM_INTERVENTION); send_ns_reset_ack(nsi, nse[0], 0x1001, 0x1000); gprs_dump_nsi(nsi); printf("--- Setup VC 2 SGSN -> BSS (hits NSEI 2) ---\n\n"); nsvc = gprs_nsvc_by_nsvci(nsi, 0x2001); - rc = gprs_ns_tx_reset(nsvc, NS_CAUSE_OM_INTERVENTION); - if (rc < 0) - printf("Failed to send RESET to %s\n\n", gprs_ns_ll_str(nsvc)); - else { - send_ns_reset_ack(nsi, nse[1], 0x2001, 0x2000); - gprs_dump_nsi(nsi); - } + gprs_nsvc_reset(nsvc, NS_CAUSE_OM_INTERVENTION); printf("--- Setup VC 1 SGSN -> BSS (hits NSEI 1) ---\n\n"); nsvc = gprs_nsvc_by_nsvci(nsi, 0x1001); - gprs_ns_tx_reset(nsvc, NS_CAUSE_OM_INTERVENTION); + gprs_nsvc_reset(nsvc, NS_CAUSE_OM_INTERVENTION); send_ns_reset_ack(nsi, nse[0], 0x1001, 0x1000); gprs_dump_nsi(nsi); @@ -683,7 +676,7 @@ static void test_bss_reset_ack() printf("--- RESET_ACK with invalid NSEI, BSS -> SGSN ---\n\n"); nsvc = gprs_nsvc_by_nsvci(nsi, 0x1001); - gprs_ns_tx_reset(nsvc, NS_CAUSE_OM_INTERVENTION); + gprs_nsvc_reset(nsvc, NS_CAUSE_OM_INTERVENTION); send_ns_reset_ack(nsi, nse[0], 0x1001, 0xf000); gprs_dump_nsi(nsi); @@ -692,7 +685,7 @@ static void test_bss_reset_ack() printf("--- RESET_ACK with invalid NSVCI, BSS -> SGSN ---\n\n"); nsvc = gprs_nsvc_by_nsvci(nsi, 0x1001); - gprs_ns_tx_reset(nsvc, NS_CAUSE_OM_INTERVENTION); + gprs_nsvc_reset(nsvc, NS_CAUSE_OM_INTERVENTION); send_ns_reset_ack(nsi, nse[0], 0xf001, 0x1000); gprs_dump_nsi(nsi); @@ -761,7 +754,7 @@ static void test_sgsn_reset() printf("--- RESET_ACK with invalid NSEI, BSS -> SGSN ---\n\n"); nsvc = gprs_nsvc_by_nsvci(nsi, SGSN_NSEI+1); - gprs_ns_tx_reset(nsvc, NS_CAUSE_OM_INTERVENTION); + gprs_nsvc_reset(nsvc, NS_CAUSE_OM_INTERVENTION); send_ns_reset_ack(nsi, &sgsn_peer, SGSN_NSEI+1, 0xe000); gprs_dump_nsi(nsi); @@ -770,7 +763,7 @@ static void test_sgsn_reset() printf("--- RESET_ACK with invalid NSVCI, BSS -> SGSN ---\n\n"); nsvc = gprs_nsvc_by_nsvci(nsi, SGSN_NSEI+1); - gprs_ns_tx_reset(nsvc, NS_CAUSE_OM_INTERVENTION); + gprs_nsvc_reset(nsvc, NS_CAUSE_OM_INTERVENTION); send_ns_reset_ack(nsi, &sgsn_peer, 0xe001, SGSN_NSEI); gprs_dump_nsi(nsi); diff --git a/tests/gb/gprs_ns_test.ok b/tests/gb/gprs_ns_test.ok index 13d5f36..0d4b7fb 100644 --- a/tests/gb/gprs_ns_test.ok +++ b/tests/gb/gprs_ns_test.ok @@ -368,15 +368,13 @@ MESSAGE to BSS, msg length 1 result (RESET_ACK) = 1 Current NS-VCIs: - VCI 0x2001, NSEI 0x2000, peer 0x00000000:0 + VCI 0x2001, NSEI 0x2000, peer 0x00000000:0, blocked, dead VCI 0x1001, NSEI 0x1000, peer 0x01020304:2222, blocked NS-VC Block count : 2 NS-VC replaced other count: 1 --- Setup VC 2 SGSN -> BSS (hits NSEI 2) --- -Failed to send RESET to 0.0.0.0:0 - --- Setup VC 1 SGSN -> BSS (hits NSEI 1) --- MESSAGE to BSS, msg length 12 @@ -391,7 +389,7 @@ MESSAGE to BSS, msg length 1 result (RESET_ACK) = 1 Current NS-VCIs: - VCI 0x2001, NSEI 0x2000, peer 0x00000000:0 + VCI 0x2001, NSEI 0x2000, peer 0x00000000:0, blocked, dead VCI 0x1001, NSEI 0x1000, peer 0x01020304:2222, blocked NS-VC Block count : 3 NS-VC replaced other count: 1 @@ -566,7 +564,7 @@ Current NS-VCIs: NS-VC Block count : 1 NS-VC replaced other count: 2 VCI 0x2001, NSEI 0x2000, peer 0x01020304:1111 - VCI 0x1001, NSEI 0xf000, peer 0x00000000:0, blocked + VCI 0x1001, NSEI 0xf000, peer 0x00000000:0, blocked, dead NS-VC Block count : 4 NS-VC replaced other count: 2 NS-VC changed NSEI count : 3 @@ -700,7 +698,7 @@ PROCESSING RESET_ACK from 0x05060708:32000 result (RESET_ACK) = -22 Current NS-VCIs: - VCI 0x0101, NSEI 0x0100, peer 0x05060708:32000, blocked + VCI 0x0101, NSEI 0x0100, peer 0x05060708:32000, blocked, dead NS-VC Block count : 1 NS-VCI was invalid count : 1 NSEI was invalid count : 2 @@ -717,7 +715,7 @@ PROCESSING RESET_ACK from 0x05060708:32000 result (RESET_ACK) = -22 Current NS-VCIs: - VCI 0x0101, NSEI 0x0100, peer 0x05060708:32000, blocked + VCI 0x0101, NSEI 0x0100, peer 0x05060708:32000, blocked, dead NS-VC Block count : 1 NS-VCI was invalid count : 2 NSEI was invalid count : 2 -- 1.9.1

10 years, 8 months

libosmocore: to talloc or not to talloc

by Jan Engelhardt

Changes to previous submission: - split out the implicit declaration patch (p3 -> p3,p1) - edit libosmocore.pc to include Requires: pkgconfig. (in p3) - add (p5) as an optional commit to completely remove the bundled copy The antisymmetry of osmo_config_list_parse is a matter for a subsequent submission. === The following changes since commit c60de4f35f3f73f3d79b4ff61d0a20b92f818702: build: fix linker error with kasumi_test (2014-10-03 08:48:31 +0200) are available in the git repository at: git://git.inai.de/libosmocore HEAD for you to fetch changes up to a962cd7b62b92a0acc49591d9b3af2b46e023850: build: remove bundled copy of talloc (2014-10-04 11:06:44 +0200) ---------------------------------------------------------------- Jan Engelhardt (5): build: resolve compiler warning about implicit delcaration build: resolve link failure in libosmogsm when --disable-talloc is used build: allow using a system-provided talloc properly build: default to system-provided talloc build: remove bundled copy of talloc Makefile.am | 2 + configure.ac | 9 +- include/Makefile.am | 4 - include/osmocom/core/strrb.h | 2 +- include/osmocom/core/talloc.h | 189 ------------------------------------- include/osmocom/core/utils.h | 2 +- include/osmocom/ctrl/control_cmd.h | 2 +- libosmocore.pc.in | 2 +- src/Makefile.am | 10 +- src/ctrl/control_cmd.c | 2 +- src/ctrl/control_if.c | 2 +- src/gb/common_vty.c | 2 +- src/gb/gprs_bssgp.c | 2 +- src/gb/gprs_bssgp_bss.c | 2 +- src/gb/gprs_bssgp_util.c | 2 +- src/gb/gprs_bssgp_vty.c | 2 +- src/gb/gprs_ns.c | 2 +- src/gb/gprs_ns_frgre.c | 2 +- src/gb/gprs_ns_vty.c | 2 +- src/gsm/Makefile.am | 5 +- src/gsm/ipa.c | 2 +- src/gsm/lapd_core.c | 2 +- src/gsmtap_util.c | 2 +- src/logging.c | 2 +- src/logging_syslog.c | 2 +- src/msgb.c | 2 +- src/msgfile.c | 2 +- src/rate_ctr.c | 2 +- src/signal.c | 2 +- src/statistics.c | 2 +- src/talloc.c | 2 +- src/vty/buffer.c | 2 +- src/vty/command.c | 2 +- src/vty/logging_vty.c | 2 +- src/vty/telnet_interface.c | 2 +- src/vty/utils.c | 2 +- src/vty/vector.c | 2 +- src/vty/vty.c | 2 +- tests/Makefile.am | 12 +-- tests/gb/bssgp_fc_test.c | 2 +- tests/gb/gprs_ns_test.c | 2 +- tests/msgfile/msgfile_test.c | 1 + tests/strrb/strrb_test.c | 2 +- tests/timer/timer_test.c | 2 +- tests/vty/vty_test.c | 2 +- 45 files changed, 53 insertions(+), 253 deletions(-) delete mode 100644 include/osmocom/core/talloc.h

10 years, 8 months

libosmocore: system-talloc+bundled-talloc support

by Jan Engelhardt

"--disable-talloc" had the effect of a "--enable-system-talloc". So the first patch fixes up all the link failures by adding -ltalloc where needed, _for the case that one decides to use disable-talloc_. Second patch will use pkg-config to determine the parameters for a system talloc. These will be used unconditionally, because the variables TALLOC_CFLAGS/TALLOC_LIBS will be empty when using the bundled talloc. === The following changes since commit c60de4f35f3f73f3d79b4ff61d0a20b92f818702: build: fix linker error with kasumi_test (2014-10-03 08:48:31 +0200) are available in the git repository at: git://git.inai.de/libosmocore HEAD for you to fetch changes up to d6c1607a724a07416c7d39f9b43f7af7349de666: build: default to system-provided talloc (2014-10-03 12:43:25 +0200) ---------------------------------------------------------------- Jan Engelhardt (3): build: resolve link failure in libosmogsm when --disable-talloc is used build: allow using a system-provided talloc properly build: default to system-provided talloc .gitignore | 1 + configure.ac | 26 +++++++++++++++++++------ include/Makefile.am | 5 +++-- include/osmocom/core/talloc.h.in | 6 ++++++ include/osmocom/core/{talloc.h => talloc_int.h} | 0 src/Makefile.am | 7 ++++--- src/gsm/Makefile.am | 5 +++-- tests/Makefile.am | 12 ++++++------ tests/msgfile/msgfile_test.c | 1 + 9 files changed, 44 insertions(+), 19 deletions(-) create mode 100644 include/osmocom/core/talloc.h.in rename include/osmocom/core/{talloc.h => talloc_int.h} (100%)

10 years, 8 months

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

OpenBSC October 2014