OpenBSC August 2014

openbsc@lists.osmocom.org

10 participants
19 discussions

libosmocore/libosmo-abis changes + fallout

by Harald Welte

In preparation of the libctrl move to libosmocore[*], I had to move some IPA related functionality from libosmo-abis to libosmocore. This is required as libctrl needs IPA functions, but we cannot make a cyclic library (build) dependency between libosmocore and libosmo-abis. I took the decision to rename some of the sysmbols for consistency. This is always ugly and creates fall-out, so there never is a good time for it. I thought now it makes sense as things are undergoing modifications anyway. I was able to do 'make check / make distcheck' of libosmocore / libosmo-abis / osmo-pcu / osmo-bts and openbsc master branches with the recent commits. If I missed something, please let me know by private mail and I'm happy o clean up further. Regards, Harald [*] required to add a control interface to osmo-bts, which is required for things like managing/triggering clock recalibration on sysmobts from external programs. -- - 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)

10 years, 10 months

Request for the Network Measurement Report info

by Ravi Shankar

Dear Sir Is it possible to get the Network Measurement Reports (NMRs) (This report comprises of Serving and neighboring cell-id , received signal strengths, timing advance, time of arrival values etc) of a particular Number/IMSI using OpenBSC. I am aware that we get these fields from the normal BSC. Regards. Ravi

10 years, 10 months

[PATCH 1/5] libctrl: Remove reference to 'DNAT' in favor of 'DCTRL'

by Harald Welte

--- src/ctrl/control_if.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ctrl/control_if.c b/src/ctrl/control_if.c index ca59d8c..156a24f 100644 --- a/src/ctrl/control_if.c +++ b/src/ctrl/control_if.c @@ -248,7 +248,7 @@ static int listen_fd_cb(struct osmo_fd *listen_bfd, unsigned int what) on = 1; ret = setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &on, sizeof(on)); if (ret != 0) { - LOGP(DNAT, LOGL_ERROR, "Failed to set TCP_NODELAY: %s\n", strerror(errno)); + LOGP(DCTRL, LOGL_ERROR, "Failed to set TCP_NODELAY: %s\n", strerror(errno)); close(fd); return ret; } -- 2.1.0.rc1

10 years, 10 months

Moving libctrl to libosmocore

by Harald Welte

Hi Daniel, I am currently working on moving the control interface to libosmocore, you can find the status in the 'laforge/libctrl' branch. The reason behind this is that I will be adding a control interface to osmo-bts soon. The first dozens of commits is basically a filtered list of commits from the openbsc repository. The last few commits are towards making it build outside libosmocore. Most of the commits are pretty simple and uninteresting. However, there is one change that I would like to ask you to review: adf2530fc3c9d45dd1d528cd6d92d462702e3f19 where I'm trying to avoid using the openbsc-global 'tall_bsc_ctx' and introduce a more hierarchical inheritance of allocations. As this is the first time I've looked at the control interface, I might have made some wrong decisions there. The remaining steps are: * remove 'struct gsm_network' as reference and replace with a 'void * data' or 'void *priv' field * possibly rename/prefix the function names, so we end up with osmoctrl_* for the symbol names. 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)

10 years, 10 months

[PATCH] gbproxy: Add gbprox_clear_patch_filter() (Coverity)

by Jacob Erlbeck

Add a separate function to clear the IMSI filter to be used instead of gbprox_set_patch_filter(cfg, NULL, ...). Albeit it fixes a Coverity issue (Unchecked return value), it is a false positive, since the return value is always 0 in these cases. Nevertheless it is more obvious what happens when an explicit clear function is called. Using NULL as filter argument of gbprox_set_patch_filter still clears the filter. Fixes: Coverity CID 1231255 Sponsored-by: On-Waves ehf --- openbsc/include/openbsc/gb_proxy.h | 1 + openbsc/src/gprs/gb_proxy.c | 13 +++++++++---- openbsc/src/gprs/gb_proxy_vty.c | 4 ++-- openbsc/tests/gbproxy/gbproxy_test.c | 6 ++++++ 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/openbsc/include/openbsc/gb_proxy.h b/openbsc/include/openbsc/gb_proxy.h index 039a9a1..d6dde10 100644 --- a/openbsc/include/openbsc/gb_proxy.h +++ b/openbsc/include/openbsc/gb_proxy.h @@ -115,6 +115,7 @@ void gbprox_reset(struct gbproxy_config *cfg); int gbprox_set_patch_filter(struct gbproxy_config *cfg, const char *filter, const char **err_msg); +void gbprox_clear_patch_filter(struct gbproxy_config *cfg); void gbprox_delete_tlli(struct gbproxy_peer *peer, struct gbproxy_tlli_info *tlli_info); diff --git a/openbsc/src/gprs/gb_proxy.c b/openbsc/src/gprs/gb_proxy.c index a8ce3cc..64fb55b 100644 --- a/openbsc/src/gprs/gb_proxy.c +++ b/openbsc/src/gprs/gb_proxy.c @@ -481,16 +481,21 @@ static void gbprox_delete_tllis(struct gbproxy_peer *peer) OSMO_ASSERT(llist_empty(&state->enabled_tllis)); } +void gbprox_clear_patch_filter(struct gbproxy_config *cfg) +{ + if (cfg->check_imsi) { + regfree(&cfg->imsi_re_comp); + cfg->check_imsi = 0; + } +} + int gbprox_set_patch_filter(struct gbproxy_config *cfg, const char *filter, const char **err_msg) { static char err_buf[300]; int rc; - if (cfg->check_imsi) { - regfree(&cfg->imsi_re_comp); - cfg->check_imsi = 0; - } + gbprox_clear_patch_filter(cfg); if (!filter) return 0; diff --git a/openbsc/src/gprs/gb_proxy_vty.c b/openbsc/src/gprs/gb_proxy_vty.c index ec73ae6..9574a45 100644 --- a/openbsc/src/gprs/gb_proxy_vty.c +++ b/openbsc/src/gprs/gb_proxy_vty.c @@ -193,7 +193,7 @@ static int set_core_apn(struct vty *vty, const char *apn, const char *filter) talloc_free(g_cfg->core_apn); g_cfg->core_apn = NULL; g_cfg->core_apn_size = 0; - gbprox_set_patch_filter(g_cfg, NULL, NULL); + gbprox_clear_patch_filter(g_cfg); return CMD_SUCCESS; } @@ -206,7 +206,7 @@ static int set_core_apn(struct vty *vty, const char *apn, const char *filter) } if (!filter) { - gbprox_set_patch_filter(g_cfg, NULL, NULL); + gbprox_clear_patch_filter(g_cfg); } else if (gbprox_set_patch_filter(g_cfg, filter, &err_msg) != 0) { vty_out(vty, "Match expression invalid: %s%s", err_msg, VTY_NEWLINE); diff --git a/openbsc/tests/gbproxy/gbproxy_test.c b/openbsc/tests/gbproxy/gbproxy_test.c index 964c6da..5363749 100644 --- a/openbsc/tests/gbproxy/gbproxy_test.c +++ b/openbsc/tests/gbproxy/gbproxy_test.c @@ -1571,6 +1571,12 @@ static void test_gbproxy_imsi_matching(void) OSMO_ASSERT(gbprox_set_patch_filter(&cfg, NULL, &err_msg) == 0); OSMO_ASSERT(cfg.check_imsi == 0); + OSMO_ASSERT(gbprox_set_patch_filter(&cfg, filter_re2, &err_msg) == 0); + OSMO_ASSERT(cfg.check_imsi == 1); + + gbprox_clear_patch_filter(&cfg); + OSMO_ASSERT(cfg.check_imsi == 0); + peer = gbproxy_peer_alloc(&cfg, 20); OSMO_ASSERT(gbprox_set_patch_filter(&cfg, filter_re2, &err_msg) == 0); -- 1.9.1

10 years, 10 months

Re: [PATCH] sysmobts: Deal with ciphering when we have a transport clash

by Harald Welte

Hi Holger, the patches look fine to me, although it hurts that such a hack and layering violations is actually needed. I'm wondering if the spec designers didn't come up with a more elegant method. In OpenBSC we could of course disable early classmark sending, but we cannot exclude osmo-bts / sysmobts from being used with other implementations either. What about OpenBSC waiting for the classmark change to arrive _if_ early classmark sending is enabled? At least, if A5/4 is ever used, this is the only way to support it anyway, as A5/4 is indicated only in CM3, and CM3 is only part of CLASSMARK CHANGE, but not part of the CM SERVICE REQUEST or PAGING RESPONSE. However, as we are probably all quite sure that the GSM industry is not capable of rolling out a 'new' cipher in less than 10 years, I'm not sure if we should worry about this here. -- - 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)

10 years, 10 months

[osmo-pcu 1/5] bts: Ensure tbf direction with OSMO_ASSERT()

by Daniel Willmann

In the lookup functions make sure that we are actually returning tbfs with the expected direction. Ticket: SYS#389 Sponsored-by: On-Waves ehf --- src/bts.cpp | 22 ++++++++++++++++------ src/bts.h | 3 ++- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/src/bts.cpp b/src/bts.cpp index 08baee0..f614dab 100644 --- a/src/bts.cpp +++ b/src/bts.cpp @@ -234,12 +234,14 @@ gprs_rlcmac_tbf *BTS::tbf_by_tlli(uint32_t tlli, enum gprs_rlcmac_tbf_direction struct gprs_rlcmac_tbf *tbf; if (dir == GPRS_RLCMAC_UL_TBF) { llist_for_each_entry(tbf, &m_bts.ul_tbfs, list) { + OSMO_ASSERT(tbf->direction == dir); if (tbf->state_is_not(GPRS_RLCMAC_RELEASING) && tbf->tlli() == tlli && tbf->is_tlli_valid()) return tbf; } } else { llist_for_each_entry(tbf, &m_bts.dl_tbfs, list) { + OSMO_ASSERT(tbf->direction == dir); if (tbf->state_is_not(GPRS_RLCMAC_RELEASING) && tbf->tlli() == tlli) return tbf; @@ -258,8 +260,10 @@ gprs_rlcmac_tbf *BTS::dl_tbf_by_poll_fn(uint32_t fn, uint8_t trx, uint8_t ts) if (tbf->state_is_not(GPRS_RLCMAC_RELEASING) && tbf->poll_state == GPRS_RLCMAC_POLL_SCHED && tbf->poll_fn == fn && tbf->trx->trx_no == trx - && tbf->control_ts == ts) + && tbf->control_ts == ts) { + OSMO_ASSERT(tbf->direction == GPRS_RLCMAC_DL_TBF); return tbf; + } } return NULL; } @@ -273,8 +277,10 @@ gprs_rlcmac_tbf *BTS::ul_tbf_by_poll_fn(uint32_t fn, uint8_t trx, uint8_t ts) if (tbf->state_is_not(GPRS_RLCMAC_RELEASING) && tbf->poll_state == GPRS_RLCMAC_POLL_SCHED && tbf->poll_fn == fn && tbf->trx->trx_no == trx - && tbf->control_ts == ts) + && tbf->control_ts == ts) { + OSMO_ASSERT(tbf->direction == GPRS_RLCMAC_UL_TBF); return tbf; + } } return NULL; } @@ -307,8 +313,10 @@ gprs_rlcmac_tbf *BTS::tbf_by_tfi(uint8_t tfi, uint8_t trx, if (!tbf) return NULL; - if (tbf->state_is_not(GPRS_RLCMAC_RELEASING)) + if (tbf->state_is_not(GPRS_RLCMAC_RELEASING)) { + OSMO_ASSERT(tbf->direction == dir); return tbf; + } return NULL; } @@ -1023,11 +1031,13 @@ int gprs_rlcmac_pdch::rcv_block(uint8_t *data, uint8_t len, uint32_t fn, int8_t return rc; } -gprs_rlcmac_tbf *gprs_rlcmac_pdch::tbf_from_list_by_tfi(struct llist_head *tbf_list, uint8_t tfi) +gprs_rlcmac_tbf *gprs_rlcmac_pdch::tbf_from_list_by_tfi(struct llist_head *tbf_list, uint8_t tfi, + enum gprs_rlcmac_tbf_direction dir) { gprs_rlcmac_tbf *tbf; llist_for_each_entry(tbf, tbf_list, list) { + OSMO_ASSERT(tbf->direction == dir); if (tbf->tfi() != tfi) continue; if (!tbf->pdch[ts_no]) @@ -1039,10 +1049,10 @@ gprs_rlcmac_tbf *gprs_rlcmac_pdch::tbf_from_list_by_tfi(struct llist_head *tbf_l gprs_rlcmac_tbf *gprs_rlcmac_pdch::ul_tbf_by_tfi(uint8_t tfi) { - return tbf_from_list_by_tfi(&bts_data()->ul_tbfs, tfi); + return tbf_from_list_by_tfi(&bts_data()->ul_tbfs, tfi, GPRS_RLCMAC_UL_TBF); } gprs_rlcmac_tbf *gprs_rlcmac_pdch::dl_tbf_by_tfi(uint8_t tfi) { - return tbf_from_list_by_tfi(&bts_data()->dl_tbfs, tfi); + return tbf_from_list_by_tfi(&bts_data()->dl_tbfs, tfi, GPRS_RLCMAC_DL_TBF); } diff --git a/src/bts.h b/src/bts.h index 621bcba..a0b808e 100644 --- a/src/bts.h +++ b/src/bts.h @@ -87,7 +87,8 @@ private: void rcv_control_dl_ack_nack(Packet_Downlink_Ack_Nack_t *, uint32_t fn); void rcv_resource_request(Packet_Resource_Request_t *t, uint32_t fn); void rcv_measurement_report(Packet_Measurement_Report_t *t, uint32_t fn); - gprs_rlcmac_tbf *tbf_from_list_by_tfi(struct llist_head *tbf_list, uint8_t tfi); + gprs_rlcmac_tbf *tbf_from_list_by_tfi(struct llist_head *tbf_list, uint8_t tfi, + enum gprs_rlcmac_tbf_direction dir); #endif }; -- 1.8.4.2

10 years, 10 months

[PATCH] Fix some packaging mistakes detected by lintian.

by Max Suraev

Signed-off-by: Max Suraev <max.suraev(a)fairwaves.co> --- debian/changelog | 2 +- debian/control | 9 ++++++++- debian/copyright | 5 +---- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 815d30b..bd2c2b6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -62,6 +62,6 @@ openbsc (0.9.13.115.eb113-1) natty; urgency=low openbsc (0.9.4-1) unstable; urgency=low - * Initial release (Closes: #nnnn) <nnnn is the bug number of your ITP> + * Initial release -- Harald Welte <laforge(a)gnumonks.org> Tue, 24 Aug 2010 13:34:24 +0200 diff --git a/debian/control b/debian/control index 7576455..fc7c8ba 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: net Priority: optional Maintainer: Harald Welte <laforge(a)gnumonks.org> Build-Depends: debhelper (>= 7.0.0~), autotools-dev, pkg-config, libgtp-dev, libosmocore-dev, libosmo-sccp-dev, libdbi0-dev, dh-autoreconf, libosmo-abis-dev, libdbd-sqlite3 -Standards-Version: 3.8.4 +Standards-Version: 3.9.5 Homepage: http://openbsc.osmocom.org/ Vcs-Git: git://bs11-abis.gnumonks.org/openbsc.git Vcs-Browser: http://openbsc.osmocom.org/trac/browser @@ -12,36 +12,43 @@ Package: osmocom-bsc Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libosmocore, libosmo-sccp Description: GSM Base Station Controller; BSC-only version of OpenBSC. Needs a real MSC! + Classical BSC which requires MSC to operate. Package: osmocom-nitb Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libosmocore, libdbd-sqlite3, libdbi1 Description: GSM Network-in-a-Box, implements BSC, MSC, SMSC, HLR, VLR + All the GSM network components bundled together. Package: osmocom-ipaccess-utils Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libosmocore Description: Command line utilities for ip.access nanoBTS + Utilities specific for ip.access unit. Package: osmocom-bs11-utils Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libosmocore Description: Command line utilities for Siemens BS-11 BTS + Utilities specific for BS-11 unit. Package: osmocom-sgsn Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libosmocore, libgtp Description: Osmocom Serving GPRS Support Node + SGSN implementation. Package: osmocom-gbproxy Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libosmocore Description: Osmocom GPRS Gb Interface Proxy + Proxy for Gb interface. Package: osmocom-bsc-nat Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libosmocore Description: Osmocom Base Station Controller Network Address Translation + Network address translation for BSC. Package: osmocom-bsc-dbg Architecture: any diff --git a/debian/copyright b/debian/copyright index 09693c9..fbac90c 100644 --- a/debian/copyright +++ b/debian/copyright @@ -6,7 +6,7 @@ It was downloaded from: git://bs11-abis.gnumonks.org/openbsc.git -Upstream Author(s): +Upstream Authors: Harald Welte <laforge(a)gnumonks.org> Dieter Spaar <spaar(a)mirider.augusta.de> @@ -45,6 +45,3 @@ The Debian packaging is: and is licensed under the GPL version 3, see "/usr/share/common-licenses/GPL-3". - -# Please also look if there are files or directories which have a -# different copyright/license attached and list them here. -- 1.9.1

10 years, 10 months

OsmoSGSN [PATCH], Network Service

by Michal Grznár

Hi, I am using OsmoSGSN in topology with OpenGGSN and proprietary simulator of BSS. There was a problem with an implementation of Network service, cause Network Service implementation in the simulator of BSS is based on different release of 3GPP standard (3GPP TS 48. 016 v7. 4. 0 (2008-04)/Network service (Release 7))...and the problem is that in IP-subnetwork, which I am using there is no use for RESET or UNBLOCK procedure, so I had to do a PATCH in gprs_ns.c, which was needed to complete succesful connection between sim-bss and OsmoSGSN: switch (nsh->pdu_type) { case NS_PDUT_ALIVE: +++ LOGP(DNS, LOGL_INFO, "Rx NS ALIVE\n"); +++ /*mark NS-VC as alive*/ +++ (*nsvc)->state = NSE_S_ALIVE; +++ (*nsvc)->remote_state = NSE_S_ALIVE; +++ /*initiate TEST procedure: Send ALIVE_ACK and start timer*/ +++ rc = gprs_ns_tx_simple((*nsvc), NS_PDUT_ALIVE_ACK); +++ nsvc_start_timer((*nsvc), NSVC_TIMER_TNS_TEST); +++ break; . . . } another PATCH I needed to do was to change a little bit procedure for allocation of P-TMSI in procedure uint32_t sgsn_alloc_ptmsi(void) in gprs_sgsn.c uint32_t sgsn_alloc_ptmsi(void) { struct sgsn_mm_ctx *mm; uint32_t ptmsi; restart: +++ ptmsi = rand() | 0xc0000000; /*because of GPRS IMSI ATTACH*/ llist_for_each_entry(mm, &sgsn_mm_ctxts, list) { if (mm->p_tmsi == ptmsi) goto restart; } return ptmsi; } because in GPRS IMSI ATTACH in message ATTACH COMPLETE (3GPP 24.008, 23.003, 48.018) there is new TLLI==new allocated P-TMSI and I need local TLLI, so I had to do it this way regards Michal

10 years, 10 months

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

OpenBSC August 2014