- OpenBSC - lists.osmocom.org

[PATCH] Export names for gsm_chan_t and gsm48_chan_mode
by msuraev＠sysmocom.de 24 Mar '16

24 Mar '16

From: Max <msuraev(a)sysmocom.de> This can be used with get_value_string() to improve debugging output. --- include/osmocom/gsm/gsm_utils.h | 12 ++++++++++++ include/osmocom/gsm/protocol/gsm_04_08.h | 12 ++++++++++++ 2 files changed, 24 insertions(+) diff --git a/include/osmocom/gsm/gsm_utils.h b/include/osmocom/gsm/gsm_utils.h index 6458447..fbe0ba0 100644 --- a/include/osmocom/gsm/gsm_utils.h +++ b/include/osmocom/gsm/gsm_utils.h @@ -199,6 +199,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..87748d3 100644 --- a/include/osmocom/gsm/protocol/gsm_04_08.h +++ b/include/osmocom/gsm/protocol/gsm_04_08.h @@ -347,6 +347,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

1 0

[PATCH] Add helper function to convert enums to string
by msuraev＠sysmocom.de 23 Mar '16

23 Mar '16

From: Max <msuraev(a)sysmocom.de> Add convertors for gsm48_chan_mode and gsm_chan_t types which are useful for debugging. --- include/osmocom/gsm/gsm_utils.h | 2 ++ include/osmocom/gsm/protocol/gsm_04_08.h | 2 ++ src/gsm/gsm48.c | 17 +++++++++++++++++ src/gsm/gsm_utils.c | 17 +++++++++++++++++ src/gsm/libosmogsm.map | 2 ++ 5 files changed, 40 insertions(+) diff --git a/include/osmocom/gsm/gsm_utils.h b/include/osmocom/gsm/gsm_utils.h index 6458447..c9c565e 100644 --- a/include/osmocom/gsm/gsm_utils.h +++ b/include/osmocom/gsm/gsm_utils.h @@ -199,6 +199,8 @@ enum gsm_chan_t { _GSM_LCHAN_MAX }; +const char * osmo_gsm48_chan_type2str(enum gsm_chan_t type); + /* 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..78aaef2 100644 --- a/include/osmocom/gsm/protocol/gsm_04_08.h +++ b/include/osmocom/gsm/protocol/gsm_04_08.h @@ -347,6 +347,8 @@ enum gsm48_chan_mode { GSM48_CMODE_DATA_3k6 = 0x13, }; +const char * osmo_gsm48_chan_mode2str(enum gsm48_chan_mode); + /* 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..494c013 100644 --- a/src/gsm/gsm48.c +++ b/src/gsm/gsm48.c @@ -197,6 +197,23 @@ static const char *cc_state_names[32] = { "illegal state 31", }; +static const struct value_string gsm48_chan_modes[] = { + {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 char * osmo_gsm48_chan_mode2str(enum gsm48_chan_mode mode) +{ + return get_value_string(gsm48_chan_modes, mode); +} + const char *gsm48_cc_state_name(uint8_t state) { if (state < ARRAY_SIZE(cc_state_names)) diff --git a/src/gsm/gsm_utils.c b/src/gsm/gsm_utils.c index e8e452f..16a4117 100644 --- a/src/gsm/gsm_utils.c +++ b/src/gsm/gsm_utils.c @@ -691,6 +691,23 @@ uint32_t gprs_tmsi2tlli(uint32_t p_tmsi, enum gprs_tlli_type type) return tlli; } +static const struct value_string gsm48_chan_types[] = { + { 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 }, +}; + +const char * osmo_gsm48_chan_type2str(enum gsm_chan_t type) +{ + return get_value_string(gsm48_chan_types, type); +} + /* Wrappers for deprecated functions: */ int gsm_7bit_decode(char *text, const uint8_t *user_data, uint8_t septet_l) diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index a6908a2..411daf2 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -25,6 +25,8 @@ abis_nm_osmo_magic; abis_nm_ipa_magic; osmo_sitype_strs; +osmo_gsm48_chan_type2str; +osmo_gsm48_chan_mode2str; comp128; dbm2rxlev; -- 2.7.4

1 0

3G update: stable IuCS Location Update
by Neels Hofmeyr 22 Mar '16

22 Mar '16

Dear 3G Folks, after various problems with obtaining a stable Location Update of a 3G subscriber on our hNodeB femto-cell, we've finally succeeded today! Basically, after both MM Authentication and Integrity Protection were in place today, the phone finally started to reply to the Location Updating Accept with the expected TMSI Reallocation Complete message. After that, the phone was still cycling new Location Update Requests every half minute or so, because we were replying with the wrong LAC id = 0; Osmo-CSCN (Circuit-Switched Core Network) needs to know which RNC (like a BSC in 2G) has which Location Area Code. The RNC tells us its global RNC ID when it first connects, and the CSCN needs to match the LAC properly from prior knowledge (aka config). Now that both Integrity Protection and the matching LAC are in place during the Location Updating Accept message from the CSCN, the UE happily stays subscribed to the CSCN! It's about time, too. The reasons why it took this long to reach this admittedly meagre sounding milestone were mostly: - The fact that Osmocom did not feature a standalone MSC, which first had to be surgically separated from the BSC part (used to be the NITB). I introduced and then eradicated a few build problems in the process. - Osmocom's libmsc previously was not able to do mere MM Authentication without also enabling Ciphering, so to test MM Authentication on its own I needed a new path in the auth and ciph code. - Osmocom's libmsc so far expected to have precisely one BSC, as part of the NITB, so it simply telepathically knew "the" LAC. Now, libmsc has to figure out the LAC from a table instead. (VTY configuration to match RNCs with LACs is in the making, as well as the RNC and BSC registry itself.) So, in fact, this milestone has much more under the hood than the layman would expect. Now that we have all of these fleas numbered and in the same matchbox, the long overdue stable 3G Location Update on IuCS using the new osmo-cscn finally arrived this afternoon. As soon as this code is configurable and peer reviewed, I will move on to implement 3G paging. I do hope to shift up a gear on that, with new confidence and by now much firmer knowledge of 3G and the "Osmoverse". Lively greetings from sysmocom's open 3G lab in Berlin! Stay tuned for more Updates, soon at this Location. ~Neels -- - Neels Hofmeyr <nhofmeyr(a)sysmocom.de> http://www.sysmocom.de/ ======================================================================= * sysmocom - systems for mobile communications GmbH * Alt-Moabit 93 * 10559 Berlin, Germany * Sitz / Registered office: Berlin, HRB 134158 B * Geschäftsführer / Managing Directors: Holger Freyther, Harald Welte

1 0

[PATCH] Add helper function to convert enums to string
by msuraev＠sysmocom.de 22 Mar '16

22 Mar '16

From: Max <msuraev(a)sysmocom.de> Add convertors for gsm48_chan_mode and gsm_chan_t types which are useful for debugging. --- include/osmocom/gsm/gsm_utils.h | 2 ++ include/osmocom/gsm/protocol/gsm_04_08.h | 2 ++ src/gsm/gsm48.c | 17 +++++++++++++++++ src/gsm/gsm_utils.c | 17 +++++++++++++++++ 4 files changed, 38 insertions(+) diff --git a/include/osmocom/gsm/gsm_utils.h b/include/osmocom/gsm/gsm_utils.h index 6458447..c9c565e 100644 --- a/include/osmocom/gsm/gsm_utils.h +++ b/include/osmocom/gsm/gsm_utils.h @@ -199,6 +199,8 @@ enum gsm_chan_t { _GSM_LCHAN_MAX }; +const char * osmo_gsm48_chan_type2str(enum gsm_chan_t type); + /* 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..78aaef2 100644 --- a/include/osmocom/gsm/protocol/gsm_04_08.h +++ b/include/osmocom/gsm/protocol/gsm_04_08.h @@ -347,6 +347,8 @@ enum gsm48_chan_mode { GSM48_CMODE_DATA_3k6 = 0x13, }; +const char * osmo_gsm48_chan_mode2str(enum gsm48_chan_mode); + /* 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..494c013 100644 --- a/src/gsm/gsm48.c +++ b/src/gsm/gsm48.c @@ -197,6 +197,23 @@ static const char *cc_state_names[32] = { "illegal state 31", }; +static const struct value_string gsm48_chan_modes[] = { + {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 char * osmo_gsm48_chan_mode2str(enum gsm48_chan_mode mode) +{ + return get_value_string(gsm48_chan_modes, mode); +} + const char *gsm48_cc_state_name(uint8_t state) { if (state < ARRAY_SIZE(cc_state_names)) diff --git a/src/gsm/gsm_utils.c b/src/gsm/gsm_utils.c index e8e452f..16a4117 100644 --- a/src/gsm/gsm_utils.c +++ b/src/gsm/gsm_utils.c @@ -691,6 +691,23 @@ uint32_t gprs_tmsi2tlli(uint32_t p_tmsi, enum gprs_tlli_type type) return tlli; } +static const struct value_string gsm48_chan_types[] = { + { 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 }, +}; + +const char * osmo_gsm48_chan_type2str(enum gsm_chan_t type) +{ + return get_value_string(gsm48_chan_types, type); +} + /* Wrappers for deprecated functions: */ int gsm_7bit_decode(char *text, const uint8_t *user_data, uint8_t septet_l) -- 2.7.4

1 0

[PATCH] octphy: fix for multiple trx with more than 1 dsp
by msuraev＠sysmocom.de 21 Mar '16

21 Mar '16

From: Max <msuraev(a)sysmocom.de> Explicitly store and use "center" arfcn used by each dsp (1 dsp corresponds to 1 phy link). --- include/osmo-bts/phy_link.h | 3 ++- src/osmo-bts-octphy/l1_oml.c | 9 ++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/include/osmo-bts/phy_link.h b/include/osmo-bts/phy_link.h index e31971e..a559aa3 100644 --- a/include/osmo-bts/phy_link.h +++ b/include/osmo-bts/phy_link.h @@ -62,7 +62,8 @@ struct phy_link { uint32_t rf_port_index; uint32_t rx_gain_db; uint32_t tx_atten_db; - + /* arfcn used by TRX with id 0 */ + uint16_t center_arfcn; struct octphy_hdl *hdl; } octphy; } u; diff --git a/src/osmo-bts-octphy/l1_oml.c b/src/osmo-bts-octphy/l1_oml.c index bdf39bf..14181dc 100644 --- a/src/osmo-bts-octphy/l1_oml.c +++ b/src/osmo-bts-octphy/l1_oml.c @@ -1304,7 +1304,14 @@ int l1if_trx_open(struct gsm_bts_trx *trx) oc->TrxId.byTrxId = pinst->u.octphy.trx_id; oc->Config.ulBand = osmocom_to_octphy_band(trx->bts->band, trx->arfcn); oc->Config.usArfcn = trx->arfcn; - oc->Config.usCentreArfcn = trx->bts->c0->arfcn; + + if (pinst->u.octphy.trx_id) + oc->Config.usCentreArfcn = plink->u.octphy.center_arfcn; + else { + oc->Config.usCentreArfcn = trx->arfcn; + plink->u.octphy.center_arfcn = trx->arfcn; + } + oc->Config.usTsc = trx->bts->bsic & 0x7; oc->Config.usBcchArfcn = trx->bts->c0->arfcn; oc->RfConfig.ulRxGainDb = plink->u.octphy.rx_gain_db; -- 2.7.4

2 1

[PATCH] debian: Add packaging to master taken from fairwaves/master
by Holger Hans Peter Freyther 21 Mar '16

21 Mar '16

From: Holger Hans Peter Freyther <holger(a)moiji-mobile.com> There doesn't seem to be a reason why this shouldn't be in master. The fairwaves/master branch is removing --march=native as well that looks like a good idea as well. --- debian/changelog | 11 +++++++++++ debian/compat | 1 + debian/control | 24 ++++++++++++++++++++++++ debian/copyright | 25 +++++++++++++++++++++++++ debian/osmo-trx.install | 1 + debian/rules | 15 +++++++++++++++ debian/source/format | 1 + 7 files changed, 78 insertions(+) create mode 100644 debian/changelog create mode 100644 debian/compat create mode 100644 debian/control create mode 100644 debian/copyright create mode 100644 debian/osmo-trx.install create mode 100755 debian/rules create mode 100644 debian/source/format diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..511fcb7 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,11 @@ +osmo-trx (0.1.9) trusty; urgency=medium + + * Ask Ivan, really + + -- Kirill Zakharenko <earwin(a)gmail.com> Thu, 16 Jul 2015 12:13:46 +0000 + +osmo-trx (0.1.8) precise; urgency=low + + * Initial release (Closes: #nnnn) <nnnn is the bug number of your ITP + + -- Ivan Klyuchnikov <Ivan.Kluchnikov(a)fairwaves.ru> Sun, 9 Mar 2014 14:10:10 +0400 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..ec63514 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..0aef88e --- /dev/null +++ b/debian/control @@ -0,0 +1,24 @@ +Source: osmo-trx +Maintainer: Ivan Klyuchnikov <ivan.kluchnikov(a)fairwaves.ru> +Section: net +Priority: optional +Standards-Version: 3.9.3 +Build-Depends: debhelper (>= 9), autotools-dev, libdbd-sqlite3, pkg-config, dh-autoreconf, libuhd-dev, libusb-1.0-0-dev, libboost-all-dev, hardening-wrapper +Homepage: http://openbsc.osmocom.org/trac/wiki/OsmoTRX +Vcs-Git: git://git.osmocom.org/osmo-trx +Vcs-Browser: http://cgit.osmocom.org/osmo-trx + +Package: osmo-trx +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, libdbd-sqlite3 +Description: OsmoTRX is a software-defined radio transceiver that implements the Layer 1 physical layer of a BTS + +Package: osmo-trx-dbg +Architecture: any +Section: debug +Priority: extra +Depends: osmo-trx (= ${binary:Version}), ${misc:Depends} +Description: Debug symbols for the osmo-trx + Make debugging possible + + diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..5f8836d --- /dev/null +++ b/debian/copyright @@ -0,0 +1,25 @@ +The Debian packaging is: + + Copyright (C) 2014 Max <max.suraev(a)fairwaves.ru> + +It was downloaded from: + + git://git.osmocom.org/osmo-trx + +Upstream Authors: + + Thomas Tsou <tom(a)tsou.cc> + David A. Burgess <dburgess(a)kestrelsp.com> + Harvind S. Samra <hssamra(a)kestrelsp.com> + Raffi Sevlian <raffisev(a)gmail.com> + +Copyright: + + Copyright (C) 2012-2013 Thomas Tsou <tom(a)tsou.cc> + Copyright (C) 2011 Range Networks, Inc. + Copyright (C) 2008-2011 Free Software Foundation, Inc. + +License: + + GNU Affero General Public License, Version 3 + diff --git a/debian/osmo-trx.install b/debian/osmo-trx.install new file mode 100644 index 0000000..574e915 --- /dev/null +++ b/debian/osmo-trx.install @@ -0,0 +1 @@ +/usr/bin/osmo-trx diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..4f7cf6c --- /dev/null +++ b/debian/rules @@ -0,0 +1,15 @@ +#!/usr/bin/make -f + +DEB_BUILD_HARDENING=1 + +%: + dh $@ --with autoreconf + +override_dh_auto_configure: + dh_auto_configure -- --without-sse CFLAGS="-DHAVE_SSE3 -march=atom -mtune=atom -O2" CXXFLAGS="-DHAVE_SSE3 -march=atom -mtune=atom -O2" + +override_dh_shlibdeps: + dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info + +override_dh_strip: + dh_strip --dbg-package=osmo-trx-dbg diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..9f67427 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (native) \ No newline at end of file -- 2.6.3

5 6

[PATCH v2] select: Externalize fd_set filling and dispatch
by Holger hans Peter Freyther 21 Mar '16

21 Mar '16

From: Holger Hans Peter Freyther <holger(a)moiji-mobile.com> To integrate with an external event loop (in this case glib) we need to allow an application to get a filled out fd_set and then dispatch it. osmo_fds and maxfds is static and I decided to keep it that way and instead create two routines to fill the fdset and then one to dispatch the result. The public header file does not include sys/select.h and we can compile the library without select so I didn't want to require having to include this file and used void * for the parameter. Mark the routines as inline to avoid a call from the select function. Confirmed that inlining has an effect on x86 using Debian's gcc-4.9.2-10 compiler --- include/osmocom/core/select.h | 6 ++++ src/select.c | 83 ++++++++++++++++++++++++++----------------- 2 files changed, 57 insertions(+), 32 deletions(-) diff --git a/include/osmocom/core/select.h b/include/osmocom/core/select.h index b6b9e82..d71e903 100644 --- a/include/osmocom/core/select.h +++ b/include/osmocom/core/select.h @@ -39,4 +39,10 @@ int osmo_fd_register(struct osmo_fd *fd); void osmo_fd_unregister(struct osmo_fd *fd); int osmo_select_main(int polling); +/* + * foreign event loop integration + */ +int osmo_fd_fill_fds(void *readset, void *writeset, void *exceptset); +int osmo_fd_disp_fds(void *readset, void *writeset, void *exceptset); + /*! @} */ diff --git a/src/select.c b/src/select.c index 5421c77..5826a4d 100644 --- a/src/select.c +++ b/src/select.c @@ -98,62 +98,49 @@ void osmo_fd_unregister(struct osmo_fd *fd) llist_del(&fd->list); } -/*! \brief select main loop integration - * \param[in] polling should we pollonly (1) or block on select (0) - */ -int osmo_select_main(int polling) +inline int osmo_fd_fill_fds(void *_rset, void *_wset, void *_eset) { - struct osmo_fd *ufd, *tmp; - fd_set readset, writeset, exceptset; - int work = 0, rc; - struct timeval no_time = {0, 0}; + fd_set *readset = _rset, *writeset = _wset, *exceptset = _eset; + struct osmo_fd *ufd; - FD_ZERO(&readset); - FD_ZERO(&writeset); - FD_ZERO(&exceptset); - - /* prepare read and write fdsets */ llist_for_each_entry(ufd, &osmo_fds, list) { if (ufd->when & BSC_FD_READ) - FD_SET(ufd->fd, &readset); + FD_SET(ufd->fd, readset); if (ufd->when & BSC_FD_WRITE) - FD_SET(ufd->fd, &writeset); + FD_SET(ufd->fd, writeset); if (ufd->when & BSC_FD_EXCEPT) - FD_SET(ufd->fd, &exceptset); + FD_SET(ufd->fd, exceptset); } - osmo_timers_check(); - - if (!polling) - osmo_timers_prepare(); - rc = select(maxfd+1, &readset, &writeset, &exceptset, polling ? &no_time : osmo_timers_nearest()); - if (rc < 0) - return 0; + return maxfd; +} - /* fire timers */ - osmo_timers_update(); +inline int osmo_fd_disp_fds(void *_rset, void *_wset, void *_eset) +{ + struct osmo_fd *ufd, *tmp; + int work = 0; + fd_set *readset = _rset, *writeset = _wset, *exceptset = _eset; - /* call registered callback functions */ restart: unregistered_count = 0; llist_for_each_entry_safe(ufd, tmp, &osmo_fds, list) { int flags = 0; - if (FD_ISSET(ufd->fd, &readset)) { + if (FD_ISSET(ufd->fd, readset)) { flags |= BSC_FD_READ; - FD_CLR(ufd->fd, &readset); + FD_CLR(ufd->fd, readset); } - if (FD_ISSET(ufd->fd, &writeset)) { + if (FD_ISSET(ufd->fd, writeset)) { flags |= BSC_FD_WRITE; - FD_CLR(ufd->fd, &writeset); + FD_CLR(ufd->fd, writeset); } - if (FD_ISSET(ufd->fd, &exceptset)) { + if (FD_ISSET(ufd->fd, exceptset)) { flags |= BSC_FD_EXCEPT; - FD_CLR(ufd->fd, &exceptset); + FD_CLR(ufd->fd, exceptset); } if (flags) { @@ -167,9 +154,41 @@ restart: if (unregistered_count >= 1) goto restart; } + return work; } +/*! \brief select main loop integration + * \param[in] polling should we pollonly (1) or block on select (0) + */ +int osmo_select_main(int polling) +{ + fd_set readset, writeset, exceptset; + int rc; + struct timeval no_time = {0, 0}; + + FD_ZERO(&readset); + FD_ZERO(&writeset); + FD_ZERO(&exceptset); + + /* prepare read and write fdsets */ + osmo_fd_fill_fds(&readset, &writeset, &exceptset); + + osmo_timers_check(); + + if (!polling) + osmo_timers_prepare(); + rc = select(maxfd+1, &readset, &writeset, &exceptset, polling ? &no_time : osmo_timers_nearest()); + if (rc < 0) + return 0; + + /* fire timers */ + osmo_timers_update(); + + /* call registered callback functions */ + return osmo_fd_disp_fds(&readset, &writeset, &exceptset); +} + /*! @} */ #endif /* _HAVE_SYS_SELECT_H */ -- 2.6.3

1 0

[PATCH] select: Externalize fd_set filling and dispatch
by Holger hans Peter Freyther 21 Mar '16

21 Mar '16

From: Holger Hans Peter Freyther <holger(a)moiji-mobile.com> To integrate with an external event loop (in this case glib) we need to allow an application to get a filled out fd_set and then dispatch it. osmo_fds and maxfds is static and I decided to keep it that way and instead create two routines to fill the fdset and then one to dispatch the result. The public header file does not include sys/select.h and we can compile the library without select so I didn't want to require having to include this file and used void * for the parameter. --- include/osmocom/core/select.h | 6 ++++ src/select.c | 83 ++++++++++++++++++++++++++----------------- 2 files changed, 57 insertions(+), 32 deletions(-) diff --git a/include/osmocom/core/select.h b/include/osmocom/core/select.h index b6b9e82..d71e903 100644 --- a/include/osmocom/core/select.h +++ b/include/osmocom/core/select.h @@ -39,4 +39,10 @@ int osmo_fd_register(struct osmo_fd *fd); void osmo_fd_unregister(struct osmo_fd *fd); int osmo_select_main(int polling); +/* + * foreign event loop integration + */ +int osmo_fd_fill_fds(void *readset, void *writeset, void *exceptset); +int osmo_fd_disp_fds(void *readset, void *writeset, void *exceptset); + /*! @} */ diff --git a/src/select.c b/src/select.c index 5421c77..c3bac2f 100644 --- a/src/select.c +++ b/src/select.c @@ -98,62 +98,49 @@ void osmo_fd_unregister(struct osmo_fd *fd) llist_del(&fd->list); } -/*! \brief select main loop integration - * \param[in] polling should we pollonly (1) or block on select (0) - */ -int osmo_select_main(int polling) +int osmo_fd_fill_fds(void *_rset, void *_wset, void *_eset) { - struct osmo_fd *ufd, *tmp; - fd_set readset, writeset, exceptset; - int work = 0, rc; - struct timeval no_time = {0, 0}; + fd_set *readset = _rset, *writeset = _wset, *exceptset = _eset; + struct osmo_fd *ufd; - FD_ZERO(&readset); - FD_ZERO(&writeset); - FD_ZERO(&exceptset); - - /* prepare read and write fdsets */ llist_for_each_entry(ufd, &osmo_fds, list) { if (ufd->when & BSC_FD_READ) - FD_SET(ufd->fd, &readset); + FD_SET(ufd->fd, readset); if (ufd->when & BSC_FD_WRITE) - FD_SET(ufd->fd, &writeset); + FD_SET(ufd->fd, writeset); if (ufd->when & BSC_FD_EXCEPT) - FD_SET(ufd->fd, &exceptset); + FD_SET(ufd->fd, exceptset); } - osmo_timers_check(); - - if (!polling) - osmo_timers_prepare(); - rc = select(maxfd+1, &readset, &writeset, &exceptset, polling ? &no_time : osmo_timers_nearest()); - if (rc < 0) - return 0; + return maxfd; +} - /* fire timers */ - osmo_timers_update(); +int osmo_fd_disp_fds(void *_rset, void *_wset, void *_eset) +{ + struct osmo_fd *ufd, *tmp; + int work = 0; + fd_set *readset = _rset, *writeset = _wset, *exceptset = _eset; - /* call registered callback functions */ restart: unregistered_count = 0; llist_for_each_entry_safe(ufd, tmp, &osmo_fds, list) { int flags = 0; - if (FD_ISSET(ufd->fd, &readset)) { + if (FD_ISSET(ufd->fd, readset)) { flags |= BSC_FD_READ; - FD_CLR(ufd->fd, &readset); + FD_CLR(ufd->fd, readset); } - if (FD_ISSET(ufd->fd, &writeset)) { + if (FD_ISSET(ufd->fd, writeset)) { flags |= BSC_FD_WRITE; - FD_CLR(ufd->fd, &writeset); + FD_CLR(ufd->fd, writeset); } - if (FD_ISSET(ufd->fd, &exceptset)) { + if (FD_ISSET(ufd->fd, exceptset)) { flags |= BSC_FD_EXCEPT; - FD_CLR(ufd->fd, &exceptset); + FD_CLR(ufd->fd, exceptset); } if (flags) { @@ -167,9 +154,41 @@ restart: if (unregistered_count >= 1) goto restart; } + return work; } +/*! \brief select main loop integration + * \param[in] polling should we pollonly (1) or block on select (0) + */ +int osmo_select_main(int polling) +{ + fd_set readset, writeset, exceptset; + int rc; + struct timeval no_time = {0, 0}; + + FD_ZERO(&readset); + FD_ZERO(&writeset); + FD_ZERO(&exceptset); + + /* prepare read and write fdsets */ + osmo_fd_fill_fds(&readset, &writeset, &exceptset); + + osmo_timers_check(); + + if (!polling) + osmo_timers_prepare(); + rc = select(maxfd+1, &readset, &writeset, &exceptset, polling ? &no_time : osmo_timers_nearest()); + if (rc < 0) + return 0; + + /* fire timers */ + osmo_timers_update(); + + /* call registered callback functions */ + return osmo_fd_disp_fds(&readset, &writeset, &exceptset); +} + /*! @} */ #endif /* _HAVE_SYS_SELECT_H */ -- 2.6.3

1 0

Time to rename projects.osmocom.org to osmocom.org
by Holger Freyther 21 Mar '16

21 Mar '16

Hi, I think we all liked tnt's proposal to just call it osmocom.org. Are we ready to make the redmine available as osmocom.org (and redirect www.osmocom.org, projects.osmocom.org to it)? As first step of redirects I propose: http://bb.osmocom.org/ -> http://osmocom.org/projects/baseband http://openbsc.osmocom.org/ -> http://osmocom.org/projects/openbsc http://tetra.osmocom.org/ -> http://osmocom.org/projects/tetra http://simtrace.osmocom.org/ -> http://osmocom.org/projects/simtrace http://security.osmocom.org/ -> http://osmocom.org/projects/security http://gmr.osmocom.org/ -> http://osmocom.org/projects/gmr http://sdr.osmocom.org/ -> http://osmocom.org/projects/sdr any objections or corrections to that? kind regards holger

4 6

[PATCH] debian: Add packaging to master taken from fairwaves/master
by Holger Hans Peter Freyther 18 Mar '16

18 Mar '16

From: Holger Hans Peter Freyther <holger(a)moiji-mobile.com> There doesn't seem to be a reason why this shouldn't be in master. The fairwaves/master branch is removing --march=native as well that looks like a good idea as well. --- debian/changelog | 11 +++++++++++ debian/compat | 1 + debian/control | 24 ++++++++++++++++++++++++ debian/copyright | 25 +++++++++++++++++++++++++ debian/osmo-trx.install | 1 + debian/rules | 12 ++++++++++++ debian/source/format | 1 + 7 files changed, 75 insertions(+) create mode 100644 debian/changelog create mode 100644 debian/compat create mode 100644 debian/control create mode 100644 debian/copyright create mode 100644 debian/osmo-trx.install create mode 100755 debian/rules create mode 100644 debian/source/format diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..511fcb7 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,11 @@ +osmo-trx (0.1.9) trusty; urgency=medium + + * Ask Ivan, really + + -- Kirill Zakharenko <earwin(a)gmail.com> Thu, 16 Jul 2015 12:13:46 +0000 + +osmo-trx (0.1.8) precise; urgency=low + + * Initial release (Closes: #nnnn) <nnnn is the bug number of your ITP + + -- Ivan Klyuchnikov <Ivan.Kluchnikov(a)fairwaves.ru> Sun, 9 Mar 2014 14:10:10 +0400 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..ec63514 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..0aef88e --- /dev/null +++ b/debian/control @@ -0,0 +1,24 @@ +Source: osmo-trx +Maintainer: Ivan Klyuchnikov <ivan.kluchnikov(a)fairwaves.ru> +Section: net +Priority: optional +Standards-Version: 3.9.3 +Build-Depends: debhelper (>= 9), autotools-dev, libdbd-sqlite3, pkg-config, dh-autoreconf, libuhd-dev, libusb-1.0-0-dev, libboost-all-dev, hardening-wrapper +Homepage: http://openbsc.osmocom.org/trac/wiki/OsmoTRX +Vcs-Git: git://git.osmocom.org/osmo-trx +Vcs-Browser: http://cgit.osmocom.org/osmo-trx + +Package: osmo-trx +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, libdbd-sqlite3 +Description: OsmoTRX is a software-defined radio transceiver that implements the Layer 1 physical layer of a BTS + +Package: osmo-trx-dbg +Architecture: any +Section: debug +Priority: extra +Depends: osmo-trx (= ${binary:Version}), ${misc:Depends} +Description: Debug symbols for the osmo-trx + Make debugging possible + + diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..5f8836d --- /dev/null +++ b/debian/copyright @@ -0,0 +1,25 @@ +The Debian packaging is: + + Copyright (C) 2014 Max <max.suraev(a)fairwaves.ru> + +It was downloaded from: + + git://git.osmocom.org/osmo-trx + +Upstream Authors: + + Thomas Tsou <tom(a)tsou.cc> + David A. Burgess <dburgess(a)kestrelsp.com> + Harvind S. Samra <hssamra(a)kestrelsp.com> + Raffi Sevlian <raffisev(a)gmail.com> + +Copyright: + + Copyright (C) 2012-2013 Thomas Tsou <tom(a)tsou.cc> + Copyright (C) 2011 Range Networks, Inc. + Copyright (C) 2008-2011 Free Software Foundation, Inc. + +License: + + GNU Affero General Public License, Version 3 + diff --git a/debian/osmo-trx.install b/debian/osmo-trx.install new file mode 100644 index 0000000..574e915 --- /dev/null +++ b/debian/osmo-trx.install @@ -0,0 +1 @@ +/usr/bin/osmo-trx diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..9ec67e5 --- /dev/null +++ b/debian/rules @@ -0,0 +1,12 @@ +#!/usr/bin/make -f + +DEB_BUILD_HARDENING=1 + +%: + dh $@ --with autoreconf + +override_dh_shlibdeps: + dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info + +override_dh_strip: + dh_strip --dbg-package=osmo-trx-dbg diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..9f67427 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (native) \ No newline at end of file -- 2.6.3

1 0