OpenBSC March 2016

openbsc@lists.osmocom.org

15 participants
89 discussions

[PATCH 0/7] v3 of: Introduce MM Auth test suite and fix two issues

by Neels Hofmeyr

v2 was an accidental re-post of the same patches, this time for real: Changes to first version: * Use struct value_string[] instead of switch{} for auth_action_str(). * Tweak first and last patch's log message. Neels Hofmeyr (7): Add MM Auth test; add auth_action_str() function MM Auth test: add two tests for AUTH_THEN_CIPH MM Auth test: add test to re-use existing auth MM Auth: introduce AUTH_ERROR constant. MM Auth: return AUTH_NOT_AVAIL instead of hardcoded zero Fix MM Auth: disallow key_seq mismatch Fix MM Auth: zero-initialize auth tuple before first use openbsc/.gitignore | 1 + openbsc/configure.ac | 1 + openbsc/include/openbsc/auth.h | 9 + openbsc/src/libmsc/auth.c | 33 +++- openbsc/tests/Makefile.am | 2 +- openbsc/tests/mm_auth/Makefile.am | 21 +++ openbsc/tests/mm_auth/mm_auth_test.c | 340 ++++++++++++++++++++++++++++++++++ openbsc/tests/mm_auth/mm_auth_test.ok | 40 ++++ openbsc/tests/testsuite.at | 7 + 9 files changed, 446 insertions(+), 8 deletions(-) create mode 100644 openbsc/tests/mm_auth/Makefile.am create mode 100644 openbsc/tests/mm_auth/mm_auth_test.c create mode 100644 openbsc/tests/mm_auth/mm_auth_test.ok -- 2.1.4

9 years, 2 months

Re: [PATCH] move to hex TMSI representation

by Вадим Яницкий

I just fixed some things (gsm_subscriber.c, VTY tmsi parsing) and did some tests. It works! Location Update Request with TMSI from previous network: <0002> gsm_04_08.c:1127 LOCATION UPDATING REQUEST: MI(TMSI)=0x68044a6c type=NORMAL <0001> gsm_04_08.c:144 (bts 0 trx 0 ts 0 pd 05) Sending 0x18 to MS. <0001> gsm_04_08.c:144 (bts 0 trx 0 ts 0 pd 05) Sending 0x18 to MS. Outgoing SMS from OpenBSC VTY: OpenBSC> subscriber tmsi 0xb7f861b6 sms sender tmsi 0xb7f861b6 send TEST <0002> gsm_subscriber.c:175 Subscriber <IMSI> not paged yet. <0004> abis_rsl.c:1465 (bts=0,trx=0,ts=0,ss=0) Activating ARFCN(***) SS(0) lctype SDCCH r=OTHER ra=0x1a ta=1 <0004> abis_rsl.c:1199 (bts=0,trx=0,ts=0,ss=0) CHANNEL ACTIVATE ACK <0000> abis_rsl.c:1653 (bts=0,trx=0,ts=0,ss=0) SAPI=0 ESTABLISH INDICATION <0000> gsm_04_08.c:3573 Dispatching 04.08 message, pdisc=6 <0003> gsm_04_08.c:1180 PAGING RESPONSE: MI(TMSI)=0xb7f861b6 <0003> gsm_04_08.c:1198 <- Channel was requested by <IMSI> <0003> gsm_04_08.c:1259 TX APPLICATION INFO id=0x00, len=4 <0001> gsm_04_08.c:144 (bts 0 trx 0 ts 0 pd 06) Sending 0x38 to MS. <0001> transaction.c:71 subscr=0x2363f00, net=0x2333e90 USSD request also works: <0002> gsm_04_08.c:956 <- CM SERVICE REQUEST serv_type=0x08 MI(TMSI)=0xb7f861b6 <0002> gsm_04_08_utils.c:692 -> CM SERVICE ACK As you can see, now TMSI displays in hex. I'll provide a new patch soon. С наилучшими пожеланиями, Яницкий Вадим. 2016-03-22 18:58 GMT+06:00 Вадим Яницкий <axilirator(a)gmail.com>: > Hello, Harald! Good day, Holger! > > It looks like SQLite3 doesn't have support of unsigned 64-bit integers. :( > Of course, we can write some custom functions, which can emulate it, > but it isn't good solution, I think. > > My suggestion is to keep the TMSI column type in string format: 0xffffffff. > I need to know your opinions before starting to write a new patch. > > > С наилучшими пожеланиями, > Яницкий Вадим. > > 2016-03-17 22:34 GMT+06:00 Holger Freyther <holger(a)freyther.de>: > >> >> > On 17 Mar 2016, at 17:21, Вадим Яницкий <axilirator(a)gmail.com> wrote: >> > >> > Hi Guys! >> > >> > > If you have time, please check if there are other occurrences in >> OpenBSC >> > > or OsmocomBB where the TMSI is printed as integer. Thanks! >> > >> > No problem! :) >> > >> > > I think it was a bit too quick. I foresee one problem. Let's assume >> someone >> > > is using TMSIs and now upgrade the sourcecode. All CM Service Requests >> > > will fail because the TMSI is not known. What is the >> migration/mitigation plan? >> > >> > I absolutely agree with Holger. Maybe we can add some code that will >> check >> > if database still stores TMSIs in old representation style and convert >> them to >> > uint32_t? We can change the libmsc/db.c:db_prepare() for this purpose. >> >> >> yes, we have a schema version and can just increase it. E.g. have a look >> at how we migrate SMS. >> >> >> >> > >> > > tmsi_from_string will not work for this anymore. >> > >> > Yes, I forgot to change the gsm_subscriber.c ... Sorry. >> >> >> it happens. thanks for contributing >> >> >> >> > >> > > there is no length check but that doesn't seem to be a big issue >> right now. >> > >> > We can just write a function that will do this check instead of using >> #define. >> >> I think you will not need to touch this define at all. We might want to >> change the name to _from_mi_string. >> >> >> > >> > > * a DB schema upgrade and store the TMSI as uint32_t >> > > * Use hex presentation in VTY >> > >> > +1 >> >> >> looking forward for the follow up. >> >> >> holger > > >

9 years, 2 months

[PATCH] Export names for gsm_chan_t and gsm48_chan_mode

by suraev＠alumni.ntnu.no

From: Max <msuraev(a)sysmocom.de> This can be used with get_value_string() to improve debugging output. --- include/osmocom/gsm/gsm_utils.h | 3 +++ include/osmocom/gsm/protocol/gsm_04_08.h | 4 ++++ src/gsm/gsm48.c | 26 +++++++++++++++++++++++++- src/gsm/libosmogsm.map | 2 ++ 4 files changed, 34 insertions(+), 1 deletion(-) diff --git a/include/osmocom/gsm/gsm_utils.h b/include/osmocom/gsm/gsm_utils.h index 6458447..99aae65 100644 --- a/include/osmocom/gsm/gsm_utils.h +++ b/include/osmocom/gsm/gsm_utils.h @@ -28,6 +28,7 @@ #include <stdint.h> #include <osmocom/core/defs.h> +#include <osmocom/core/utils.h> #define ADD_MODULO(sum, delta, modulo) do { \ if ((sum += delta) >= modulo) \ @@ -199,6 +200,8 @@ enum gsm_chan_t { _GSM_LCHAN_MAX }; +extern const struct value_string gsm_chan_t_names[]; + /* Deprectated functions */ /* Limit encoding and decoding to use no more than this amount of buffer bytes */ #define GSM_7BIT_LEGACY_MAX_BUFFER_SIZE 0x10000 diff --git a/include/osmocom/gsm/protocol/gsm_04_08.h b/include/osmocom/gsm/protocol/gsm_04_08.h index d49b77f..3282bc1 100644 --- a/include/osmocom/gsm/protocol/gsm_04_08.h +++ b/include/osmocom/gsm/protocol/gsm_04_08.h @@ -2,6 +2,8 @@ #include <stdint.h> +#include <osmocom/core/utils.h> + /* GSM TS 04.08 definitions */ struct gsm_lchan; @@ -347,6 +349,8 @@ enum gsm48_chan_mode { GSM48_CMODE_DATA_3k6 = 0x13, }; +extern const struct value_string gsm48_chan_mode_names[]; + /* Chapter 9.1.2 */ struct gsm48_ass_cmd { /* Semantic is from 10.5.2.5a */ diff --git a/src/gsm/gsm48.c b/src/gsm/gsm48.c index d0a2286..ab62605 100644 --- a/src/gsm/gsm48.c +++ b/src/gsm/gsm48.c @@ -32,7 +32,7 @@ #include <osmocom/gsm/tlv.h> #include <osmocom/gsm/gsm48.h> #include <osmocom/gsm/gsm0502.h> - +#include <osmocom/gsm/gsm_utils.h> #include <osmocom/gsm/protocol/gsm_04_08.h> #include <osmocom/gsm/protocol/gsm_08_58.h> @@ -254,6 +254,30 @@ const char *rr_cause_name(uint8_t cause) return get_value_string(rr_cause_names, cause); } +const struct value_string gsm48_chan_mode_names[] = { + { GSM48_CMODE_SIGN, "SIGNALLING" }, + { GSM48_CMODE_SPEECH_V1, "SPEECH_V1" }, + { GSM48_CMODE_SPEECH_EFR, "SPEECH_EFR" }, + { GSM48_CMODE_SPEECH_AMR, "SPEECH_AMR" }, + { GSM48_CMODE_DATA_14k5, "DATA_14k5" }, + { GSM48_CMODE_DATA_12k0, "DATA_12k0" }, + { GSM48_CMODE_DATA_6k0, "DATA_6k0" }, + { GSM48_CMODE_DATA_3k6, "DATA_3k6" }, + { 0, NULL }, +}; + +const struct value_string gsm_chan_t_names[] = { + { GSM_LCHAN_NONE, "NONE" }, + { GSM_LCHAN_SDCCH, "SDCCH" }, + { GSM_LCHAN_TCH_F, "TCH_F" }, + { GSM_LCHAN_TCH_H, "TCH_H" }, + { GSM_LCHAN_UNKNOWN, "UNKNOWN" }, + { GSM_LCHAN_CCCH, "CCCH" }, + { GSM_LCHAN_PDTCH, "PDTCH" }, + { GSM_LCHAN_CBCH, "CBCH" }, + { 0, NULL }, +}; + static const struct value_string mi_type_names[] = { { GSM_MI_TYPE_NONE, "NONE" }, { GSM_MI_TYPE_IMSI, "IMSI" }, diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index a6908a2..a3e4e14 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -144,6 +144,8 @@ gsm48_rr_att_tlvdef; gsm48_mi_type_name; gsm48_mcc_mnc_to_bcd; gsm48_mcc_mnc_from_bcd; +gsm48_chan_mode_names; +gsm_chan_t_names; gsm_7bit_decode; gsm_7bit_decode_ussd; -- 2.5.0

9 years, 2 months

[PATCH 0/7] v2 of: Introduce MM Auth test suite and fix two issues

by Neels Hofmeyr

Changes to previous version: * Use struct value_string[] instead of switch{} for auth_action_str(). * Tweak first and last patch's log message. Neels Hofmeyr (7): Add MM Auth test; add auth_action_str() function MM Auth test: add two tests for AUTH_THEN_CIPH MM Auth test: add test to re-use existing auth MM Auth: introduce AUTH_ERROR constant. MM Auth: return AUTH_NOT_AVAIL instead of hardcoded zero Fix MM Auth: disallow key_seq mismatch Fix MM Auth: zero-initialize auth tuple before first use openbsc/.gitignore | 1 + openbsc/configure.ac | 1 + openbsc/include/openbsc/auth.h | 18 ++ openbsc/src/libmsc/auth.c | 24 ++- openbsc/tests/Makefile.am | 2 +- openbsc/tests/mm_auth/Makefile.am | 21 +++ openbsc/tests/mm_auth/mm_auth_test.c | 340 ++++++++++++++++++++++++++++++++++ openbsc/tests/mm_auth/mm_auth_test.ok | 40 ++++ openbsc/tests/testsuite.at | 7 + 9 files changed, 446 insertions(+), 8 deletions(-) create mode 100644 openbsc/tests/mm_auth/Makefile.am create mode 100644 openbsc/tests/mm_auth/mm_auth_test.c create mode 100644 openbsc/tests/mm_auth/mm_auth_test.ok -- 2.1.4

9 years, 2 months

[PATCH] Export names for gsm_chan_t and gsm48_chan_mode

by msuraev＠sysmocom.de

From: Max <msuraev(a)sysmocom.de> This can be used with get_value_string() to improve debugging output. --- include/osmocom/gsm/gsm_utils.h | 13 +++++++++++++ include/osmocom/gsm/protocol/gsm_04_08.h | 14 ++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/include/osmocom/gsm/gsm_utils.h b/include/osmocom/gsm/gsm_utils.h index 6458447..dcbee36 100644 --- a/include/osmocom/gsm/gsm_utils.h +++ b/include/osmocom/gsm/gsm_utils.h @@ -28,6 +28,7 @@ #include <stdint.h> #include <osmocom/core/defs.h> +#include <osmocom/core/utils.h> #define ADD_MODULO(sum, delta, modulo) do { \ if ((sum += delta) >= modulo) \ @@ -199,6 +200,18 @@ enum gsm_chan_t { _GSM_LCHAN_MAX }; +static const struct value_string gsm_chan_t_names[] = { + { GSM_LCHAN_NONE, "NONE" }, + { GSM_LCHAN_SDCCH, "SDCCH" }, + { GSM_LCHAN_TCH_F, "TCH_F" }, + { GSM_LCHAN_TCH_H, "TCH_H" }, + { GSM_LCHAN_UNKNOWN, "UNKNOWN" }, + { GSM_LCHAN_CCCH, "CCCH" }, + { GSM_LCHAN_PDTCH, "PDTCH" }, + { GSM_LCHAN_CBCH, "CBCH" }, + { 0, NULL }, +}; + /* Deprectated functions */ /* Limit encoding and decoding to use no more than this amount of buffer bytes */ #define GSM_7BIT_LEGACY_MAX_BUFFER_SIZE 0x10000 diff --git a/include/osmocom/gsm/protocol/gsm_04_08.h b/include/osmocom/gsm/protocol/gsm_04_08.h index d49b77f..604c86d 100644 --- a/include/osmocom/gsm/protocol/gsm_04_08.h +++ b/include/osmocom/gsm/protocol/gsm_04_08.h @@ -2,6 +2,8 @@ #include <stdint.h> +#include <osmocom/core/utils.h> + /* GSM TS 04.08 definitions */ struct gsm_lchan; @@ -347,6 +349,18 @@ enum gsm48_chan_mode { GSM48_CMODE_DATA_3k6 = 0x13, }; +static const struct value_string gsm48_chan_mode_names[] = { + { GSM48_CMODE_SIGN, "SIGNALLING" }, + { GSM48_CMODE_SPEECH_V1, "SPEECH_V1" }, + { GSM48_CMODE_SPEECH_EFR, "SPEECH_EFR" }, + { GSM48_CMODE_SPEECH_AMR, "SPEECH_AMR" }, + { GSM48_CMODE_DATA_14k5, "DATA_14k5" }, + { GSM48_CMODE_DATA_12k0, "DATA_12k0" }, + { GSM48_CMODE_DATA_6k0, "DATA_6k0" }, + { GSM48_CMODE_DATA_3k6, "DATA_3k6" }, + { 0, NULL }, +}; + /* Chapter 9.1.2 */ struct gsm48_ass_cmd { /* Semantic is from 10.5.2.5a */ -- 2.7.4

9 years, 2 months

[PATCH 0/7] Introduce MM Auth test suite and fix two issues

by Neels Hofmeyr

Though MM Auth might be tested implicitly, it is acutely lacking a dedicated test suite. I found two problems in the MM Auth logic, and to have regression tests for those, I need an actual test suite. So, at first I add a bread-and-butter test suite for MM Auth. Then, I cosmetically improve use of constants in return values. Finally, I fix the two issues with reflection in the new tests. Neels Hofmeyr (7): Add MM Auth test; add auth_action_str() function MM Auth test: add two tests for AUTH_THEN_CIPH MM Auth test: add test to re-use existing auth MM Auth: introduce AUTH_ERROR constant. MM Auth: return AUTH_NOT_AVAIL instead of hardcoded zero Fix MM Auth: disallow key_seq mismatch Fix MM Auth: zero-initialize auth tuple before first use openbsc/.gitignore | 1 + openbsc/configure.ac | 1 + openbsc/include/openbsc/auth.h | 18 ++ openbsc/src/libmsc/auth.c | 24 ++- openbsc/tests/Makefile.am | 2 +- openbsc/tests/mm_auth/Makefile.am | 21 +++ openbsc/tests/mm_auth/mm_auth_test.c | 340 ++++++++++++++++++++++++++++++++++ openbsc/tests/mm_auth/mm_auth_test.ok | 40 ++++ openbsc/tests/testsuite.at | 7 + 9 files changed, 446 insertions(+), 8 deletions(-) create mode 100644 openbsc/tests/mm_auth/Makefile.am create mode 100644 openbsc/tests/mm_auth/mm_auth_test.c create mode 100644 openbsc/tests/mm_auth/mm_auth_test.ok -- 2.1.4

9 years, 2 months

Re: Time to rename projects.osmocom.org to osmocom.org

by Вадим Яницкий

> I added: > proxy_set_header X-Forwarded-Ssl on; I think if nginx is used as main back-end (without Apache), this header means nothing. In this case just refer this guide: https://scotthelme.co.uk/setting-up-hsts-in-nginx/ If I'm not right, and there is also Apache server, follow: http://stackoverflow.com/questions/16042647/whats-the-de-facto-standard-for… С наилучшими пожеланиями, Яницкий Вадим.

9 years, 2 months

[PATCH] osmo-bsc: fix compiler warning: store struct in vty->index

by Neels Hofmeyr

Don't store an MSC index number in the vty->index void* value. Instead, store the osmo_msc_data struct directly. Thus avoid warnings about differences in int vs void* sizes, and save some index lookups. --- openbsc/src/osmo-bsc/osmo_bsc_vty.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openbsc/src/osmo-bsc/osmo_bsc_vty.c b/openbsc/src/osmo-bsc/osmo_bsc_vty.c index d871f01..e623c9c 100644 --- a/openbsc/src/osmo-bsc/osmo_bsc_vty.c +++ b/openbsc/src/osmo-bsc/osmo_bsc_vty.c @@ -43,7 +43,7 @@ static struct osmo_bsc_data *osmo_bsc_data(struct vty *vty) static struct osmo_msc_data *osmo_msc_data(struct vty *vty) { - return osmo_msc_data_find(bsc_gsmnet, (int) vty->index); + return vty->index; } static struct cmd_node bsc_node = { @@ -70,7 +70,7 @@ DEFUN(cfg_net_msc, cfg_net_msc_cmd, return CMD_WARNING; } - vty->index = (void *) index; + vty->index = msc; vty->node = MSC_NODE; return CMD_SUCCESS; } -- 2.1.4

9 years, 2 months

[PATCH 1/5] LC15: ignore build byproducts

by msuraev＠sysmocom.de

From: Max <msuraev(a)sysmocom.de> --- .gitignore | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.gitignore b/.gitignore index f11bc4d..349cfb0 100644 --- a/.gitignore +++ b/.gitignore @@ -30,6 +30,11 @@ src/osmo-bts-sysmo/osmo-bts-sysmo-remote src/osmo-bts-sysmo/sysmobts-mgr src/osmo-bts-sysmo/sysmobts-util +src/osmo-bts-litecell15/lc15bts-mgr +src/osmo-bts-litecell15/lc15bts-util +src/osmo-bts-litecell15/misc/.dirstamp +src/osmo-bts-litecell15/osmo-bts-lc15 + src/osmo-bts-trx/osmo-bts-trx src/osmo-bts-octphy/osmo-bts-octphy -- 2.7.4

9 years, 2 months

[PATCH] Disconnect calls with incompatible channel types

by msuraev＠sysmocom.de

From: Max <msuraev(a)sysmocom.de> In case both TCH/H and TCH/F are configured and internal MNCC handler is used we might end up in a situation where call legs with incompatible channel types would be connected resulting in a broken audio. Disconnect such calls with appropriate error message. Fixes: OS#1663 --- openbsc/src/libmsc/gsm_04_08.c | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/openbsc/src/libmsc/gsm_04_08.c b/openbsc/src/libmsc/gsm_04_08.c index 7b78d48..2507d74 100644 --- a/openbsc/src/libmsc/gsm_04_08.c +++ b/openbsc/src/libmsc/gsm_04_08.c @@ -1614,6 +1614,14 @@ static int tch_map(struct gsm_lchan *lchan, struct gsm_lchan *remote_lchan) return -EINVAL; } + if (lt != rt) { + LOGP(DCC, LOGL_ERROR, "Cannot patch through call with different" + " channel types: local = %s, remote = %s\n", + get_value_string(gsm_chan_t_names, lt), + get_value_string(gsm_chan_t_names, rt)); + return -EBADSLT; + } + // todo: map between different bts types switch (bts->type) { case GSM_BTS_TYPE_NANOBTS: @@ -1851,6 +1859,30 @@ static void gsm48_cc_timeout(void *arg) } +/* disconnect both calls from the bridge */ +static inline void disconnect_bridge(struct gsm_network *net, + struct gsm_mncc_bridge *bridge, int err) +{ + struct gsm_trans *trans0 = trans_find_by_callref(net, bridge->callref[0]); + struct gsm_trans *trans1 = trans_find_by_callref(net, bridge->callref[1]); + struct gsm_mncc mx_rel; + if (!trans0 || !trans1) + return; + + DEBUGP(DCC, "Failed to bridge TCH for calls %x <-> %x :: %s \n", + trans0->callref, trans1->callref, strerror(err)); + + memset(&mx_rel, 0, sizeof(struct gsm_mncc)); + mncc_set_cause(&mx_rel, GSM48_CAUSE_LOC_INN_NET, + GSM48_CC_CAUSE_CHAN_UNACCEPT); + + mx_rel.callref = trans0->callref; + gsm48_cc_tx_disconnect(trans0, &mx_rel); + + mx_rel.callref = trans1->callref; + gsm48_cc_tx_disconnect(trans1, &mx_rel); +} + static void gsm48_start_cc_timer(struct gsm_trans *trans, int current, int sec, int micro) { @@ -3221,7 +3253,10 @@ int mncc_tx_to_cc(struct gsm_network *net, int msg_type, void *arg) /* handle special messages */ switch(msg_type) { case MNCC_BRIDGE: - return tch_bridge(net, arg); + rc = tch_bridge(net, arg); + if (rc < 0) + disconnect_bridge(net, arg, -rc); + return rc; case MNCC_FRAME_DROP: return tch_recv_mncc(net, data->callref, 0); case MNCC_FRAME_RECV: -- 2.7.4

9 years, 2 months

← Newer
1
2
3
4
5
6
7
8
9
Older →

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

OpenBSC March 2016