- OpenBSC - lists.osmocom.org

Build system patches for libosmo-sccp
by Andreas Rottmann 25 May '15

25 May '15

These are two buildsystem tweaks, in the same vein as the ones I posted recently for libosmocore, plus a gitignore update thrown in for good measure.

1 3

[PATCH] Fix "make distcheck"
by mail＠rotty.xx.vu 19 May '15

19 May '15

From: Andreas Rottmann <a.rottmann(a)gmx.at> Running "make distcheck" failed trying to generate ".version" into the read-only unpacked source directory. Actually shipping ".version" in the tarball fixes that. --- Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile.am b/Makefile.am index 9c82f09..fdcddb9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,6 +6,7 @@ SUBDIRS = include src tests pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libosmoabis.pc libosmotrau.pc +EXTRA_DIST = .version BUILT_SOURCES = $(top_srcdir)/.version $(top_srcdir)/.version: echo $(VERSION) > $@-t && mv $@-t $@ -- 1.9.1

3 6

A build system patch for libosmo-netif
by mail＠rotty.xx.vu 17 May '15

17 May '15

This patch series fixes some build issues in libosmo-abis. The failures occurred on a Debian jessie amd64 system, with libosmo* build dependencies installed into distinct prefixes.

1 2

Some build system patches for libosmocore
by mail＠rotty.xx.vu 17 May '15

17 May '15

The first patch fixes the build-system wrt. out-of-tree builds, while the second future-proofs the build system by enabling the subdir-objects automake option (see commit message for details).

3 5

talloc vs ASAN and other tools (Was: [PATCH] bssgp: Fix call to llist_entry in fc_queue_timer_cfg)
by Mike McTernan (wavemobile) 08 May '15

08 May '15

Hi, On 30.04.2015 20:33, Jacob Erlbeck wrote: > On 30.04.2015 20:01, Holger Freyther wrote: > > Did ASAN help? > No, since the data seems to be taken from then fc struct, so the memory area is > valid. ASAN was enabled and didn't complain. It wouldn't have helped here, but since ASAN is discussed in the context of memory errors, I'd like to check that it's been considered that ASAN's ability to detect and report memory errors may be being impaired by the use of talloc - particularly use after free bugs. I took a very quick look at the talloc code, and it looks like the Valgrind memory poisoning macros are added, but not in a way that I can see as being active (missing #include of the Valgrind API headers + DEVELOPER needs to be defined). The 2.1.2 version of talloc looks to be perhaps more complete in this respect. I'm not sure if ASAN can utilise the Valgrind macros though - perhaps something like Mozilla's approach to cover poisoning is needed: https://dxr.mozilla.org/mozilla-central/source/mfbt/MemoryChecking.h Also I noticed that there is a --disable-talloc option to configure. I hoped this would fall back to libc malloc/free, but it actually disables use of the packaged talloc.c, and links with -ltalloc instead i.e. talloc isn't actually disabled: if ENABLE_TALLOC libosmocore_la_SOURCES += talloc.c else libosmocore_la_LIBADD += -ltalloc endif It may be better named --disable-builtin-talloc. Kind Regards, Mike

3 2

Help - Dual channel on UmTRX‏
by Amber and Sarosh 07 May '15

07 May '15

Hi We have configured OsmoNITB, OsmoBTS and OsmoTRX to run two transceivers using UmTRX. But somehow when the spectrum is monitored, the only frequency that is detected is the one TRX0 is tuned to. ARFCN set for TRX1 is not detected i.e. TRX1 does not seem to be transmitting on the specified frequency. Can anyone please tell what possibly could be the issue? Thanks & Regards, Amber & Sarosh

2 1

[PATCH 1/5] sgsn: Make the free function internal
by Holger Freyther 06 May '15

06 May '15

From: Holger Hans Peter Freyther <holger(a)moiji-mobile.com> All calls should and do go through the sgsn_mm_ctx_cleanup_free function. --- openbsc/include/openbsc/gprs_sgsn.h | 1 - openbsc/src/gprs/gprs_sgsn.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/openbsc/include/openbsc/gprs_sgsn.h b/openbsc/include/openbsc/gprs_sgsn.h index 7a429cd..9e855f8 100644 --- a/openbsc/include/openbsc/gprs_sgsn.h +++ b/openbsc/include/openbsc/gprs_sgsn.h @@ -152,7 +152,6 @@ struct sgsn_mm_ctx *sgsn_mm_ctx_by_imsi(const char *imsi); /* Allocate a new SGSN MM context */ struct sgsn_mm_ctx *sgsn_mm_ctx_alloc(uint32_t tlli, const struct gprs_ra_id *raid); -void sgsn_mm_ctx_free(struct sgsn_mm_ctx *mm); void sgsn_mm_ctx_cleanup_free(struct sgsn_mm_ctx *ctx); struct sgsn_ggsn_ctx *sgsn_mm_ctx_find_ggsn_ctx(struct sgsn_mm_ctx *mmctx, diff --git a/openbsc/src/gprs/gprs_sgsn.c b/openbsc/src/gprs/gprs_sgsn.c index 711540e..2f5d39e 100644 --- a/openbsc/src/gprs/gprs_sgsn.c +++ b/openbsc/src/gprs/gprs_sgsn.c @@ -183,7 +183,7 @@ struct sgsn_mm_ctx *sgsn_mm_ctx_alloc(uint32_t tlli, /* this is a hard _free_ function, it doesn't clean up the PDP contexts * in libgtp! */ -void sgsn_mm_ctx_free(struct sgsn_mm_ctx *mm) +static void sgsn_mm_ctx_free(struct sgsn_mm_ctx *mm) { struct sgsn_pdp_ctx *pdp, *pdp2; -- 2.3.5

1 4

[PATCH] bssgp: Fix bssgp_tx_fc_bvc parameter type
by Jacob Erlbeck 06 May '15

06 May '15

Currently large values for Bmax default MS get sliced since a uint16_t is used as the type of the corresponding parameter of bssgp_tx_fc_bvc. GSM 48.018, 11.3.2 which in turn refers to 11.3.5 specifies a maximum of 6MB (0xffff * 100). This commit changes the type to uint32_t to cover the full value range. Sponsored-by: On-Waves ehf --- TODO-RELEASE | 1 + include/osmocom/gprs/gprs_bssgp_bss.h | 2 +- src/gb/gprs_bssgp_bss.c | 2 +- tests/gb/gprs_bssgp_test.c | 75 +++++++++++++++++++++++++++++++++++ tests/gb/gprs_bssgp_test.ok | 4 ++ 5 files changed, 82 insertions(+), 2 deletions(-) diff --git a/TODO-RELEASE b/TODO-RELEASE index 43b1e8e..322dfb0 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -1 +1,2 @@ #library what description / commit summary line +libosmocore abi-change bssgp: Fix bssgp_tx_fc_bvc parameter type diff --git a/include/osmocom/gprs/gprs_bssgp_bss.h b/include/osmocom/gprs/gprs_bssgp_bss.h index e426698..d79b210 100644 --- a/include/osmocom/gprs/gprs_bssgp_bss.h +++ b/include/osmocom/gprs/gprs_bssgp_bss.h @@ -65,7 +65,7 @@ int bssgp_rx_paging(struct bssgp_paging_info *pinfo, int bssgp_tx_fc_bvc(struct bssgp_bvc_ctx *bctx, uint8_t tag, uint32_t bucket_size, uint32_t bucket_leak_rate, - uint16_t bmax_default_ms, uint32_t r_default_ms, + uint32_t bmax_default_ms, uint32_t r_default_ms, uint8_t *bucket_full_ratio, uint32_t *queue_delay_ms); int bssgp_tx_fc_ms(struct bssgp_bvc_ctx *bctx, uint32_t tlli, uint8_t tag, diff --git a/src/gb/gprs_bssgp_bss.c b/src/gb/gprs_bssgp_bss.c index 5731959..962bf2e 100644 --- a/src/gb/gprs_bssgp_bss.c +++ b/src/gb/gprs_bssgp_bss.c @@ -315,7 +315,7 @@ int bssgp_tx_bvc_reset(struct bssgp_bvc_ctx *bctx, uint16_t bvci, uint8_t cause) */ int bssgp_tx_fc_bvc(struct bssgp_bvc_ctx *bctx, uint8_t tag, uint32_t bucket_size, uint32_t bucket_leak_rate, - uint16_t bmax_default_ms, uint32_t r_default_ms, + uint32_t bmax_default_ms, uint32_t r_default_ms, uint8_t *bucket_full_ratio, uint32_t *queue_delay_ms) { struct msgb *msg; diff --git a/tests/gb/gprs_bssgp_test.c b/tests/gb/gprs_bssgp_test.c index b454430..63abf8b 100644 --- a/tests/gb/gprs_bssgp_test.c +++ b/tests/gb/gprs_bssgp_test.c @@ -17,6 +17,7 @@ #include <osmocom/core/prim.h> #include <osmocom/gprs/gprs_bssgp.h> #include <osmocom/gprs/gprs_ns.h> +#include <osmocom/gprs/gprs_bssgp_bss.h> #include <stdio.h> #include <stdlib.h> @@ -60,6 +61,17 @@ int gprs_ns_callback(enum gprs_ns_evt event, struct gprs_nsvc *nsvc, return 0; } +struct msgb *last_ns_tx_msg = NULL; + +/* override */ +int gprs_ns_sendmsg(struct gprs_ns_inst *nsi, struct msgb *msg) +{ + msgb_free(last_ns_tx_msg); + last_ns_tx_msg = msg; + + return msgb_length(msg); +} + int bssgp_prim_cb(struct osmo_prim_hdr *oph, void *ctx) { printf("BSSGP primitive, SAP %d, prim = %d, op = %d, msg = %s\n", @@ -174,6 +186,68 @@ static void test_bssgp_bad_reset() msgb_bssgp_send_and_free(msg); } +static void test_bssgp_flow_control_bvc(void) +{ + struct bssgp_bvc_ctx bctx = { + .nsei = 0x1234, + .bvci = 0x5678, + }; + const uint8_t tag = 42; + const uint32_t bmax = 0x1022 * 100; + const uint32_t rate = 0xc040 / 8 * 100; + const uint32_t bmax_ms = bmax / 2; + const uint32_t rate_ms = rate / 2; + uint8_t ratio = 0x78; + uint32_t qdelay = 0x1144 * 10; + int rc; + + static uint8_t expected_simple_msg[] = { + 0x26, + 0x1e, 0x81, 0x2a, /* tag */ + 0x05, 0x82, 0x10, 0x22, /* Bmax */ + 0x03, 0x82, 0xc0, 0x40, /* R */ + 0x01, 0x82, 0x08, 0x11, /* Bmax_MS */ + 0x1c, 0x82, 0x60, 0x20, /* R_MS */ + }; + + static uint8_t expected_ext_msg[] = { + 0x26, + 0x1e, 0x81, 0x2a, /* tag */ + 0x05, 0x82, 0x10, 0x22, /* Bmax */ + 0x03, 0x82, 0xc0, 0x40, /* R */ + 0x01, 0x82, 0x08, 0x11, /* Bmax_MS */ + 0x1c, 0x82, 0x60, 0x20, /* R_MS */ + 0x3c, 0x81, 0x78, /* ratio */ + 0x06, 0x82, 0x11, 0x44, /* Qdelay */ + }; + + printf("----- %s START\n", __func__); + + rc = bssgp_tx_fc_bvc(&bctx, tag, bmax, rate, bmax_ms, rate_ms, + NULL, NULL); + + OSMO_ASSERT(rc >= 0); + OSMO_ASSERT(last_ns_tx_msg != NULL); + printf("Got message: %s\n", msgb_hexdump(last_ns_tx_msg)); + OSMO_ASSERT(msgb_length(last_ns_tx_msg) == sizeof(expected_simple_msg)); + OSMO_ASSERT(0 == memcmp(msgb_data(last_ns_tx_msg), + expected_simple_msg, sizeof(expected_simple_msg))); + + rc = bssgp_tx_fc_bvc(&bctx, tag, bmax, rate, bmax_ms, rate_ms, + &ratio, &qdelay); + + OSMO_ASSERT(rc >= 0); + OSMO_ASSERT(last_ns_tx_msg != NULL); + printf("Got message: %s\n", msgb_hexdump(last_ns_tx_msg)); + OSMO_ASSERT(msgb_length(last_ns_tx_msg) == sizeof(expected_ext_msg)); + OSMO_ASSERT(0 == memcmp(msgb_data(last_ns_tx_msg), + expected_ext_msg, sizeof(expected_ext_msg))); + + msgb_free(last_ns_tx_msg); + last_ns_tx_msg = NULL; + + printf("----- %s END\n", __func__); +} static struct log_info info = {}; @@ -198,6 +272,7 @@ int main(int argc, char **argv) test_bssgp_suspend_resume(); test_bssgp_status(); test_bssgp_bad_reset(); + test_bssgp_flow_control_bvc(); 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 index 0392e6a..a011bee 100644 --- a/tests/gb/gprs_bssgp_test.ok +++ b/tests/gb/gprs_bssgp_test.ok @@ -7,5 +7,9 @@ BSSGP primitive, SAP 16777219, prim = 4, op = 0, msg = 0e 1f 84 f0 12 34 56 1b 8 BSSGP primitive, SAP 16777221, prim = 11, op = 2, msg = 41 07 81 27 BSSGP primitive, SAP 16777221, prim = 11, op = 2, msg = 41 07 81 05 04 82 04 d2 ----- test_bssgp_status END +----- test_bssgp_flow_control_bvc START +Got message: 26 1e 81 2a 05 82 10 22 03 82 c0 40 01 82 08 11 1c 82 60 20 +Got message: 26 1e 81 2a 05 82 10 22 03 82 c0 40 01 82 08 11 1c 82 60 20 3c 81 78 06 82 11 44 +----- test_bssgp_flow_control_bvc END ===== BSSGP test END -- 1.9.1

1 0

[PATCH] bssgp: Fix call to llist_entry in fc_queue_timer_cfg
by Jacob Erlbeck 05 May '15

05 May '15

Currently the DL sometimes hangs and sometimes a lot of messages (still not able to send PDU) are logged. This is caused by an invalid timer delay computation, setting msecs either to 0 or to some big value. This is due to an '&' operator at the wrong place, accessing some parts in fc instead of the first element of the list. This commit fixes that issue. Sponsored-by: On-Waves ehf --- src/gb/gprs_bssgp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gb/gprs_bssgp.c b/src/gb/gprs_bssgp.c index 4c93b69..fe4fcca 100644 --- a/src/gb/gprs_bssgp.c +++ b/src/gb/gprs_bssgp.c @@ -628,7 +628,7 @@ static int fc_queue_timer_cfg(struct bssgp_flow_control *fc) if (llist_empty(&fc->queue)) return 0; - fcqe = llist_entry(&fc->queue.next, struct bssgp_fc_queue_element, + fcqe = llist_entry(fc->queue.next, struct bssgp_fc_queue_element, list); if (fc->bucket_leak_rate != 0) { -- 1.9.1

3 10

[PATCH] opensgsn: Replace some TODOs with error paths and fix compiler warning
by Mike McTernan (wavemobile) 01 May '15

01 May '15

openggsn: Check return codes and take error paths on failure. Return early when socket() returns -1, and check return codes where indicated by some TODOs. This removes 2 TODOs and fixes a compiler warning about assignment to a variable which then isn't used. Signed-off-by: Michael McTernan <mike.mcternan(a)wavemobile.com> Index: osmobss/openggsn/lib/tun.c =================================================================== --- osmobss.orig/openggsn/lib/tun.c 2015-04-28 10:51:37.960449539 +0100 +++ osmobss/openggsn/lib/tun.c 2015-04-28 10:54:40.301130739 +0100 @@ -117,6 +117,7 @@ int tun_sifflags(struct tun_t *this, int ifr.ifr_name[IFNAMSIZ - 1] = 0; /* Make sure to terminate */ if ((fd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) { SYS_ERR(DTUN, LOGL_ERROR, errno, "socket() failed"); + return -1; } if (ioctl(fd, SIOCSIFFLAGS, &ifr)) { SYS_ERR(DTUN, LOGL_ERROR, errno, @@ -318,9 +319,19 @@ int tun_addaddr(struct tun_t *this, req.n.nlmsg_seq = 0; req.n.nlmsg_flags |= NLM_F_ACK; - status = sendmsg(fd, &msg, 0); /* TODO Error check */ + status = sendmsg(fd, &msg, 0); + if (status == -1) { + SYS_ERR(DTUN, LOGL_ERROR, errno, "sendmsg() failed"); + close(fd); + return -1; + } + + status = tun_sifflags(this, IFF_UP | IFF_RUNNING); + if (status == -1) { + close(fd); + return -1; + } - tun_sifflags(this, IFF_UP | IFF_RUNNING); /* TODO */ close(fd); this->addrs++; return 0;

2 4