OpenBSC

openbsc@lists.osmocom.org

4 participants
4156 discussions

[PATCH 1/7] Remove obsolete osmo-bts-bb code

by Andreas Eversberg

--- configure.ac | 1 - src/Makefile.am | 2 +- src/osmo-bts-bb/Makefile.am | 8 -- src/osmo-bts-bb/l1ctl.c | 304 -------------------------------------------- src/osmo-bts-bb/main.c | 215 ------------------------------- 5 files changed, 1 insertion(+), 529 deletions(-) delete mode 100644 src/osmo-bts-bb/Makefile.am delete mode 100644 src/osmo-bts-bb/l1ctl.c delete mode 100644 src/osmo-bts-bb/main.c diff --git a/configure.ac b/configure.ac index 5abed70..1ca0dbe 100644 --- a/configure.ac +++ b/configure.ac @@ -54,7 +54,6 @@ AC_OUTPUT( src/Makefile src/common/Makefile src/osmo-bts-sysmo/Makefile -dnl src/osmo-bts-bb/Makefile include/Makefile include/osmo-bts/Makefile tests/Makefile diff --git a/src/Makefile.am b/src/Makefile.am index 92bbed9..e2eab0d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = common #osmo-bts-bb +SUBDIRS = common if ENABLE_SYSMOBTS SUBDIRS += osmo-bts-sysmo diff --git a/src/osmo-bts-bb/Makefile.am b/src/osmo-bts-bb/Makefile.am deleted file mode 100644 index 022931a..0000000 --- a/src/osmo-bts-bb/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) -LDADD = $(LIBOSMOCORE_LIBS) - -bin_PROGRAMS = osmo-bts-bb - -osmo_bts_bb_SOURCES = main.c -osmo_bts_bb_LDADD = $(top_builddir)/src/common/libbts.a $(LDADD) diff --git a/src/osmo-bts-bb/l1ctl.c b/src/osmo-bts-bb/l1ctl.c deleted file mode 100644 index ccba37b..0000000 --- a/src/osmo-bts-bb/l1ctl.c +++ /dev/null @@ -1,304 +0,0 @@ -/* Layer1 control code, talking L1CTL protocol with L1 on the phone */ - -/* (C) 2010 by Holger Hans Peter Freyther <zecke(a)selfish.org> - * (C) 2010 by Harald Welte <laforge(a)gnumonks.org> - * (C) 2011 by Andreas Eversberg <jolly(a)eversberg.eu> - * - * All Rights Reserved - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - */ - -#include <stdio.h> -#include <stdint.h> -#include <string.h> -#include <errno.h> - -#include <arpa/inet.h> - -#include <l1ctl_proto.h> - -#include <osmocom/core/signal.h> -#include <osmocom/core/timer.h> -#include <osmocom/core/msgb.h> -#include <osmocom/gsm/tlv.h> -#include <osmocom/gsm/gsm_utils.h> -#include <osmocom/gsm/gsmtap_util.h> -#include <osmocom/gsm/protocol/gsm_04_08.h> -#include <osmocom/gsm/protocol/gsm_08_58.h> -#include <osmocom/gsm/rsl.h> - -#include <osmocom/bb/common/l1ctl.h> -#include <osmocom/bb/common/osmocom_data.h> -#include <osmocom/bb/common/l1l2_interface.h> -#include <osmocom/bb/common/lapdm.h> -#include <osmo-bts/logging.h> -#include <osmo-bts/abis.h> -#include <osmo-bts/rtp.h> -#include <osmo-bts/bts.h> - -static struct msgb *osmo_l1_alloc(uint8_t msg_type) -{ - struct l1ctl_hdr *l1h; - struct msgb *msg = msgb_alloc_headroom(256, 4, "osmo_l1"); - - if (!msg) { - LOGP(DL1C, LOGL_ERROR, "Failed to allocate memory.\n"); - return NULL; - } - - msg->l1h = msgb_put(msg, sizeof(*l1h)); - l1h = (struct l1ctl_hdr *) msg->l1h; - l1h->msg_type = msg_type; - - return msg; -} - - -static int osmo_make_band_arfcn(struct osmocom_ms *ms, uint16_t arfcn) -{ - /* TODO: Include the band */ - return arfcn; -} - -/* Receive L1CTL_DATA_IND (Data Indication from L1) */ -int rx_ph_data_ind(struct osmocom_ms *ms, struct msgb *msg) -{ - struct l1ctl_info_dl *dl, dl_cpy; - struct l1ctl_data_ind *ccch; - struct lapdm_entity *le; - struct rx_meas_stat *meas = &ms->meas; - uint8_t chan_type, chan_ts, chan_ss; - uint8_t gsmtap_chan_type; - struct gsm_time tm; - struct osmobts_ms *bts_ms = container_of(ms, struct osmobts_ms, ms); - struct osmobts_lchan *lchan; - - if (msgb_l3len(msg) < sizeof(*ccch)) { - LOGP(DL1C, LOGL_ERROR, "MSG too short Data Ind: %u\n", - msgb_l3len(msg)); - msgb_free(msg); - return -1; - } - - dl = (struct l1ctl_info_dl *) msg->l1h; - msg->l2h = dl->payload; - ccch = (struct l1ctl_data_ind *) msg->l2h; - - gsm_fn2gsmtime(&tm, ntohl(dl->frame_nr)); - rsl_dec_chan_nr(dl->chan_nr, &chan_type, &chan_ss, &chan_ts); - lchan = bts_ms->trx->slot[chan_ts].lchan[chan_ss]; - if (!lchan) { - LOGP(DL1C, LOGL_ERROR, "Data IND for non existing lchan\n"); - msgb_free(msg); - return -1; - } - LOGP(DL1C, LOGL_NOTICE, "RX: %s | %s(%.4u/%.2u/%.2u) %d dBm\n", - rsl_chan_nr_str(dl->chan_nr), - hexdump(ccch->data, sizeof(ccch->data)), - tm.t1, tm.t2, tm.t3, (int)dl->rx_level-110); - - meas->last_fn = ntohl(dl->frame_nr); - meas->frames++; - meas->snr += dl->snr; - meas->berr += dl->num_biterr; - meas->rxlev += dl->rx_level; - - if (dl->fire_crc >= 2) { - LOGP(DL1C, LOGL_NOTICE, "Dropping frame with %u bit errors\n", - dl->num_biterr); - msgb_free(msg); - return 0; - } - - /* send CCCH data via GSMTAP */ - gsmtap_chan_type = chantype_rsl2gsmtap(chan_type, dl->link_id); - gsmtap_sendmsg(ntohs(dl->band_arfcn), chan_ts, gsmtap_chan_type, chan_ss, - tm.fn, dl->rx_level-110, dl->snr, ccch->data, - sizeof(ccch->data)); - - /* determine LAPDm entity based on SACCH or not */ - if (dl->link_id & 0x40) - le = &lchan->l2_entity.lapdm_acch; - else - le = &lchan->l2_entity.lapdm_dcch; - /* make local stack copy of l1ctl_info_dl, as LAPDm will - * overwrite skb hdr */ - memcpy(&dl_cpy, dl, sizeof(dl_cpy)); - - /* pull the L1 header from the msgb */ - msgb_pull(msg, msg->l2h - (msg->l1h-sizeof(struct l1ctl_hdr))); - msg->l1h = NULL; - - /* send it up into LAPDm */ - l2_ph_data_ind(msg, le, &dl_cpy); - - return 0; -} - -/* Receive L1CTL_DATA_CONF (Data Confirm from L1) */ -static int rx_ph_data_conf(struct osmocom_ms *ms, struct msgb *msg) -{ - struct l1ctl_info_dl *dl; - struct lapdm_entity *le; - uint8_t chan_type, chan_ts, chan_ss; - struct osmobts_ms *bts_ms = container_of(ms, struct osmobts_ms, ms); - struct osmobts_lchan *lchan; - - dl = (struct l1ctl_info_dl *) msg->l1h; - - rsl_dec_chan_nr(dl->chan_nr, &chan_type, &chan_ss, &chan_ts); - lchan = bts_ms->trx->slot[chan_ts].lchan[chan_ss]; - if (!lchan) { - LOGP(DL1C, LOGL_ERROR, "Data IND for non existing lchan\n"); - msgb_free(msg); - return -1; - } - - /* determine LAPDm entity based on SACCH or not */ - if (dl->link_id & 0x40) - le = &lchan->l2_entity.lapdm_acch; - else - le = &lchan->l2_entity.lapdm_dcch; - - /* send it up into LAPDm */ - l2_ph_data_conf(msg, le); - - return 0; -} - -/* Transmit L1CTL_DATA_REQ */ -int l1ctl_tx_data_req(struct osmocom_ms *ms, struct msgb *msg, - uint8_t chan_nr, uint8_t link_id) -{ - struct l1ctl_hdr *l1h; - struct l1ctl_info_ul *l1i_ul; - uint8_t chan_type, chan_ts, chan_ss; - uint8_t gsmtap_chan_type; - - if (msgb_l2len(msg) > GSM_MACBLOCK_LEN) { - LOGP(DL1C, LOGL_ERROR, "L1 cannot handle message length " - "> 23 (%u)\n", msgb_l2len(msg)); - msgb_free(msg); - return -EINVAL; - } else if (msgb_l2len(msg) < GSM_MACBLOCK_LEN) - LOGP(DL1C, LOGL_ERROR, "L1 message length < 23 (%u) " - "doesn't seem right!\n", msgb_l2len(msg)); - - /* send copy via GSMTAP */ - rsl_dec_chan_nr(chan_nr, &chan_type, &chan_ss, &chan_ts); - gsmtap_chan_type = chantype_rsl2gsmtap(chan_type, link_id); - gsmtap_sendmsg(0|0x4000, chan_ts, gsmtap_chan_type, chan_ss, - 0, 127, 255, msg->l2h, msgb_l2len(msg)); - - LOGP(DL1C, LOGL_NOTICE, "TX: %s | %s\n", rsl_chan_nr_str(chan_nr), - hexdump(msg->l2h, msgb_l2len(msg))); - - /* prepend uplink info header */ - l1i_ul = (struct l1ctl_info_ul *) msgb_push(msg, sizeof(*l1i_ul)); - - l1i_ul->chan_nr = chan_nr; - l1i_ul->link_id = link_id; - - /* prepend l1 header */ - msg->l1h = msgb_push(msg, sizeof(*l1h)); - l1h = (struct l1ctl_hdr *) msg->l1h; - l1h->msg_type = L1CTL_DATA_REQ; - - printf("todo: transcode message\n"); - - return osmo_send_l1(ms, msg); -} - -/* Transmit L1CTL_RESET_REQ */ -int l1ctl_tx_reset_req(struct osmocom_ms *ms, uint8_t type) -{ - struct msgb *msg; - struct l1ctl_reset *res; - - msg = osmo_l1_alloc(L1CTL_RESET_REQ); - if (!msg) - return -1; - - LOGP(DL1C, LOGL_INFO, "Tx Reset Req (%u)\n", type); - res = (struct l1ctl_reset *) msgb_put(msg, sizeof(*res)); - res->type = type; - - return osmo_send_l1(ms, msg); -} - -/* Receive L1CTL_RESET_IND */ -static int rx_l1_reset(struct osmocom_ms *ms) -{ - LOGP(DL1C, LOGL_INFO, "Layer1 Reset indication\n"); - dispatch_signal(SS_L1CTL, S_L1CTL_RESET, ms); - - return 0; -} - -/* Receive incoming data from L1 using L1CTL format */ -int l1ctl_recv(struct osmocom_ms *ms, struct msgb *msg) -{ - int rc = 0; - struct l1ctl_hdr *l1h; - struct l1ctl_info_dl *dl; - - if (msgb_l2len(msg) < sizeof(*dl)) { - LOGP(DL1C, LOGL_ERROR, "Short Layer2 message: %u\n", - msgb_l2len(msg)); - msgb_free(msg); - return -1; - } - - l1h = (struct l1ctl_hdr *) msg->l1h; - - /* move the l1 header pointer to point _BEHIND_ l1ctl_hdr, - as the l1ctl header is of no interest to subsequent code */ - msg->l1h = l1h->data; - - switch (l1h->msg_type) { - case L1CTL_DATA_IND: - rc = rx_ph_data_ind(ms, msg); - break; - case L1CTL_DATA_CONF: - rc = rx_ph_data_conf(ms, msg); - break; - case L1CTL_RESET_IND: - case L1CTL_RESET_CONF: - rc = rx_l1_reset(ms); - msgb_free(msg); - break; - default: - LOGP(DL1C, LOGL_ERROR, "Unknown MSG: %u\n", l1h->msg_type); - msgb_free(msg); - break; - } - - return rc; -} - -int l1ctl_tx_param_req(struct osmocom_ms *ms, uint8_t ta, uint8_t tx_power) -{ - return -ENOTSUP; -} - -int l1ctl_tx_rach_req(struct osmocom_ms *ms, uint8_t ra, uint16_t offset, - uint8_t combined) -{ - return -ENOTSUP; -} - - diff --git a/src/osmo-bts-bb/main.c b/src/osmo-bts-bb/main.c deleted file mode 100644 index 7300b68..0000000 --- a/src/osmo-bts-bb/main.c +++ /dev/null @@ -1,215 +0,0 @@ -/* (C) 2011 by Andreas Eversberg <jolly(a)eversberg.eu> - * - * All Rights Reserved - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - */ - -#include <netinet/in.h> -#include <osmocom/core/talloc.h> -#include <osmocom/core/signal.h> -#include <osmocom/core/timer.h> -#include <osmocom/core/select.h> -#include <osmo-bts/logging.h> -//#include <osmocom/bb/common/osmocom_data.h> -#include <osmo-bts/support.h> -#include <osmo-bts/abis.h> -#include <osmo-bts/rtp.h> -#include <osmo-bts/bts.h> - -#include <net/if.h> - -#define _GNU_SOURCE -#include <getopt.h> -#include <stdlib.h> -#include <signal.h> -#include <sys/types.h> -#include <sys/ioctl.h> -#include <netdb.h> -#include <string.h> -#include <time.h> - -struct log_target *stderr_target; -char *debugs = "DL1C:DLAPDM:DABIS:DOML:DRSL:DSUM"; - -void *l23_ctx = NULL; -static struct osmocom_bts *bts; -int debug_set = 0; -char *software_version = "0.0"; -uint8_t abis_mac[6] = { 0, 1, 2, 3, 4, 5 }; -char *bsc_host = "localhost"; -char *bts_id = "1801/0"; -int quit = 0; - -// FIXME this is a hack -static void get_mac(void) -{ - struct if_nameindex *ifn = if_nameindex(); - struct ifreq ifr; - int sock; - int ret; - - sock = socket(AF_INET, SOCK_STREAM, 0); - if (sock < 0) - return; - - memset(&ifr, 0, sizeof(ifr)); - if (!ifn) - return; - while (ifn->if_name) { - strncpy(ifr.ifr_name, ifn->if_name, sizeof(ifr.ifr_name)-1); - ret = ioctl(sock, SIOCGIFHWADDR, &ifr); - if (ret == 0 && !!memcmp(ifr.ifr_hwaddr.sa_data, - "\0\0\0\0\0\0", 6)) { - memcpy(abis_mac, ifr.ifr_hwaddr.sa_data, 6); - printf("Using MAC address of %s: " - "'%02x:%02x:%02x:%02x:%02x:%02x'\n", - ifn->if_name, - abis_mac[0], abis_mac[1], abis_mac[2], - abis_mac[3], abis_mac[4], abis_mac[5]); - break; - } - ifn++; - } -// if_freenameindex(ifn); -} - -static void print_usage(const char *app) -{ - printf("Usage: %s [option]\n", app); - printf(" -h --help this text\n"); - printf(" -d --debug Change debug flags. (-d %s)\n", debugs); - printf(" -i --bsc-ip IP address of the BSC\n"); -} - -static void handle_options(int argc, char **argv) -{ - while (1) { - int option_index = 0, c; - static struct option long_options[] = { - {"help", 0, 0, 'h'}, - {"debug", 1, 0, 'd'}, - {"bsc-ip", 1, 0, 'i'}, - {0, 0, 0, 0}, - }; - - c = getopt_long(argc, argv, "hd:i:", - long_options, &option_index); - if (c == -1) - break; - - switch (c) { - case 'h': - print_usage(argv[0]); - exit(0); - case 'd': - log_parse_category_mask(stderr_target, optarg); - debug_set = 1; - break; - case 'i': - bsc_host = strdup(optarg); - break; - default: - break; - } - } -} - -void sighandler(int sigset) -{ - if (sigset == SIGHUP || sigset == SIGPIPE) - return; - - fprintf(stderr, "Signal %d recevied.\n", sigset); - - /* in case there is a lockup during exit */ - signal(SIGINT, SIG_DFL); - signal(SIGHUP, SIG_DFL); - signal(SIGTERM, SIG_DFL); - signal(SIGPIPE, SIG_DFL); - - quit = 1; -// dispatch_signal(SS_GLOBAL, S_GLOBAL_SHUTDOWN, NULL); -} - -int main(int argc, char **argv) -{ - int ret; - struct hostent *hostent; - struct in_addr *ina; - uint32_t bsc_ip; - uint8_t maskv_tx[2], maskv_rx[2]; - - printf("((*))\n"); - printf(" |\n"); - printf(" / \\ OsmoBTS\n"); - - get_mac(); - bts_support_init(); - - srand(time(NULL)); - - log_init(&log_info); - stderr_target = log_target_create_stderr(); - log_add_target(stderr_target); - log_set_all_filter(stderr_target, 1); - - l23_ctx = talloc_named_const(NULL, 1, "layer2 context"); - - handle_options(argc, argv); - - if (!debug_set) - log_parse_category_mask(stderr_target, debugs); - log_set_log_level(stderr_target, LOGL_INFO); - - hostent = gethostbyname(bsc_host); - if (!hostent) { - fprintf(stderr, "Failed to resolve BSC hostname '%s'.\n", - bsc_host); - } - ina = (struct in_addr *) hostent->h_addr; - bsc_ip = ntohl(ina->s_addr); - printf("Using BSC at IP: '%d.%d.%d.%d'\n", bsc_ip >> 24, - (bsc_ip >> 16) & 0xff, (bsc_ip >> 8) & 0xff, bsc_ip & 0xff); - - printf("Using BTS ID: '%s'\n", bts_id); - bts = create_bts(1, bts_id); - if (!bts) - exit(-1); - maskv_tx[0] = 0x55; - maskv_rx[0] = 0x55; - ret = create_ms(bts->trx[0], 1, maskv_tx, maskv_rx); - if (ret < 0) - goto fail; - ret = abis_open(&bts->link, bsc_ip); - if (ret < 0) - goto fail; - - signal(SIGINT, sighandler); - signal(SIGHUP, sighandler); - signal(SIGTERM, sighandler); - signal(SIGPIPE, sighandler); - - while (!quit) { - work_bts(bts); - osmo_select_main(0); - } - -fail: - destroy_bts(bts); - - return 0; -} -- 1.8.1.5

11 years, 12 months

[PATCH] oml: Add a missing break switch for NM_OC_BS11

by Holger Hans Peter Freyther

It appears to me that for NM_OC_BS11 mo was either NULL or the one mo value from NM_OC_BS11_RACK. The break inside the nested switch case didn't break from the outer one. Fixes Coverity: CID 1040728 --- openbsc/src/libcommon/gsm_data_shared.c | 1 + 1 file changed, 1 insertion(+) diff --git a/openbsc/src/libcommon/gsm_data_shared.c b/openbsc/src/libcommon/gsm_data_shared.c index 9a50f6b..1b0814c 100644 --- a/openbsc/src/libcommon/gsm_data_shared.c +++ b/openbsc/src/libcommon/gsm_data_shared.c @@ -390,6 +390,7 @@ gsm_objclass2mo(struct gsm_bts *bts, uint8_t obj_class, default: return NULL; } + break; case NM_OC_BS11_RACK: mo = &bts->bs11.rack.mo; break; -- 1.8.3.2

11 years, 12 months

Fwd: DSP optimization

by Alexander Chemeris

Hi all, I'm moving this conversation from private to public. I think Sylvain and Andreas might be interested in participating. ---------- Forwarded message ---------- From: Thomas Tsou <tom(a)tsou.cc> Date: Tue, Jul 9, 2013 at 2:51 AM Subject: Re: DSP optimization To: Alexander Chemeris <alexander.chemeris(a)gmail.com> On Mon, Jul 8, 2013 at 6:52 AM, Alexander Chemeris <alexander.chemeris(a)gmail.com> wrote: > Wow, optimization of 5-16x for Viterbi is huge indeed. I wonder what > would be results for our Atoms. Without SSE, just C only butterfly, the improvement is around 4x. SSE 3 (Atom) forces a small change on the normalization (not separated out yet), but the results weren't very far off from SSE 4.1 when I tested on Core 2 Duo. I might try to manipulate the interface to read in the state tables instead of the generator polynomials. That would really help with testing and integration, but I'm not sure yet. There are many ways to go here. > What is problematic with the runtime detection? CPU autodetection on > Linux should be as easy as reading /proc/cpuinfo. But I see an issue > is with correctly setting up build system to generate all version on > the same run. I think we could leave CPU autodetection for the > "everything else" milestone, using compile time selection for now. I think compile time detection is more appropriate. For GSM / LTE we're almost always dealing with fixed sized vectors and not odd calculations (e.g. 1023 size FFT), so it's unlikely that the results will change on repeated runs. /proc/cpuinfo parsing scripts I've seen have been prone to breakage. If you have a really good one, let me know. I usually prefer to run configure checks against the actual instruction, but that can get messy with a lot of checks. Anyhow, I'm not worrying about this now. > What repository will you push at? We need to have at least master > branch and dual-channel branch working with the optimizations. And I > believe everyone would be happy to see optimizations in the > libosmocore for the benefit of other projects as well. I don't foresee > any issues with a slight change in the API of libosmocore if it is > justified - just send an RFC/patch to the OpenBSC mailing list and it > will be reviewed. Non-Viterbi changes are sigProc.cpp changes only, so they are not branch-specific - they will probably merge into the oldest available OpenBTS releases. The Viterbi changes merge into Andreas's branch, which is a very large change. For now, somebody needs to write it, which is why I'm considering making the interfaces match. Attached are the standalone unit test cases for SSE 4.2. As previously mentioned, Atom needs SSE3 only. I'll add the ifdefs for those shortly. I don't know if there's an appropriate repository for these right now - linking libosmocore from the transceiver for comparison purposes only seems silly. I just generated a temporary tarball for the time being. Thomas -- Regards, Alexander Chemeris. CEO, Fairwaves LLC / ООО УмРадио http://fairwaves.ru

11 years, 12 months

osmo-trx peculiarities in dual-channel mode

by Alexander Chemeris

Hi Thomas, What is the reason you disabled setting power attenuation an receive gain for the second trx? Since both channels in UmTRX are independent, it should be possible to control tx power and rx gain independently. In the "SETPOWER" command handler: if (mPrimary) mRadioInterface->setPowerAttenuation(dbPwr); In the "SETRXGAIN" it's even stranger, as it's set twice in case of primary trx: newGain = mRadioInterface->setRxGain(newGain); mEnergyThreshold = INIT_ENERGY_THRSHD; if (mPrimary) newGain = mRadioInterface->setRxGain(newGain); -- Regards, Alexander Chemeris. CEO, Fairwaves LLC / ООО УмРадио http://fairwaves.ru

11 years, 12 months

[PATCH] smpp: Move the coding/mode detection into a utils file

by Holger Hans Peter Freyther

From: Holger Hans Peter Freyther <holger(a)moiji-mobile.com> Make sure to not ever have issues with this code again, move the utility code to a new file and create a basic testcase. The method currently has 100% line and branch coverage. --- openbsc/.gitignore | 1 + openbsc/configure.ac | 1 + openbsc/src/libmsc/Makefile.am | 2 +- openbsc/src/libmsc/smpp_openbsc.c | 36 +------------------ openbsc/src/libmsc/smpp_smsc.h | 5 +++ openbsc/tests/Makefile.am | 4 +++ openbsc/tests/smpp/Makefile.am | 12 +++++++ openbsc/tests/smpp/smpp_test.c | 73 +++++++++++++++++++++++++++++++++++++++ openbsc/tests/smpp/smpp_test.err | 2 ++ openbsc/tests/smpp/smpp_test.ok | 1 + openbsc/tests/testsuite.at | 8 +++++ 11 files changed, 109 insertions(+), 36 deletions(-) create mode 100644 openbsc/tests/smpp/Makefile.am create mode 100644 openbsc/tests/smpp/smpp_test.c create mode 100644 openbsc/tests/smpp/smpp_test.err create mode 100644 openbsc/tests/smpp/smpp_test.ok diff --git a/openbsc/.gitignore b/openbsc/.gitignore index 53c8a4a..3743f69 100644 --- a/openbsc/.gitignore +++ b/openbsc/.gitignore @@ -61,6 +61,7 @@ tests/timer/timer_test tests/gprs/gprs_test tests/abis/abis_test tests/si/si_test +tests/smpp/smpp_test tests/atconfig tests/atlocal diff --git a/openbsc/configure.ac b/openbsc/configure.ac index 3dd2212..8997e2e 100644 --- a/openbsc/configure.ac +++ b/openbsc/configure.ac @@ -160,6 +160,7 @@ AC_OUTPUT( tests/gprs/Makefile tests/si/Makefile tests/abis/Makefile + tests/smpp/Makefile doc/Makefile doc/examples/Makefile Makefile) diff --git a/openbsc/src/libmsc/Makefile.am b/openbsc/src/libmsc/Makefile.am index 7faee43..c36ba92 100644 --- a/openbsc/src/libmsc/Makefile.am +++ b/openbsc/src/libmsc/Makefile.am @@ -19,5 +19,5 @@ libmsc_a_SOURCES = auth.c \ osmo_msc.c if BUILD_SMPP -libmsc_a_SOURCES += smpp_smsc.c smpp_openbsc.c smpp_vty.c +libmsc_a_SOURCES += smpp_smsc.c smpp_openbsc.c smpp_vty.c smpp_utils.c endif diff --git a/openbsc/src/libmsc/smpp_openbsc.c b/openbsc/src/libmsc/smpp_openbsc.c index 1744b0e..a3d2487 100644 --- a/openbsc/src/libmsc/smpp_openbsc.c +++ b/openbsc/src/libmsc/smpp_openbsc.c @@ -78,9 +78,6 @@ static struct tlv_t *find_tlv(struct tlv_t *head, uint16_t tag) return NULL; } -#define MODE_7BIT 7 -#define MODE_8BIT 8 - /*! \brief convert from submit_sm_t to gsm_sms */ static int submit_to_sms(struct gsm_sms **psms, struct gsm_network *net, const struct submit_sm_t *submit) @@ -468,39 +465,8 @@ static int deliver_to_esme(struct osmo_esme *esme, struct gsm_sms *sms, /* Figure out SMPP DCS from TP-DCS */ dcs = sms->data_coding_scheme; - if ((dcs & 0xF0) == 0xF0) { - if (dcs & 0x04) { - /* bit 2 == 1: 8bit data */ - deliver.data_coding = 0x02; - mode = MODE_8BIT; - } else { - /* bit 2 == 0: default alphabet */ - deliver.data_coding = 0x01; - mode = MODE_7BIT; - } - } else if ((dcs & 0xE0) == 0) { - switch (dcs & 0xC) { - case 0: - deliver.data_coding = 0x01; - mode = MODE_7BIT; - break; - case 4: - deliver.data_coding = 0x02; - mode = MODE_8BIT; - break; - case 8: - deliver.data_coding = 0x08; /* UCS-2 */ - mode = MODE_8BIT; - break; - default: - goto unknown_mo; - } - } else { -unknown_mo: - LOGP(DLSMS, LOGL_ERROR, "SMPP MO Unknown Data Coding 0x%02x\n", - dcs); + if (smpp_determine_scheme(dcs, &deliver.data_coding, &mode) == -1) return -1; - } /* Transparently pass on DCS via SMPP if requested */ if (esme->acl->dcs_transparent) diff --git a/openbsc/src/libmsc/smpp_smsc.h b/openbsc/src/libmsc/smpp_smsc.h index 86fbeb5..028e572 100644 --- a/openbsc/src/libmsc/smpp_smsc.h +++ b/openbsc/src/libmsc/smpp_smsc.h @@ -15,6 +15,9 @@ #define SMPP_SYS_ID_LEN 16 #define SMPP_PASSWD_LEN 16 +#define MODE_7BIT 7 +#define MODE_8BIT 8 + enum esme_read_state { READ_ST_IN_LEN = 0, READ_ST_IN_MSG = 1, @@ -124,4 +127,6 @@ int smpp_route_pfx_add(struct osmo_smpp_acl *acl, const struct osmo_smpp_addr *pfx); int smpp_route_pfx_del(struct osmo_smpp_acl *acl, const struct osmo_smpp_addr *pfx); + +int smpp_determine_scheme(uint8_t dcs, uint8_t *data_coding, int *mode); #endif diff --git a/openbsc/tests/Makefile.am b/openbsc/tests/Makefile.am index c0e48df..c9afeed 100644 --- a/openbsc/tests/Makefile.am +++ b/openbsc/tests/Makefile.am @@ -4,6 +4,10 @@ if BUILD_NAT SUBDIRS += bsc-nat endif +if BUILD_SMPP +SUBDIRS += smpp +endif + # The `:;' works around a Bash 3.2 bug when the output is not writeable. $(srcdir)/package.m4: $(top_srcdir)/configure.ac diff --git a/openbsc/tests/smpp/Makefile.am b/openbsc/tests/smpp/Makefile.am new file mode 100644 index 0000000..eb25965 --- /dev/null +++ b/openbsc/tests/smpp/Makefile.am @@ -0,0 +1,12 @@ +AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_srcdir)/src/libmsc +AM_CFLAGS=-Wall -ggdb3 $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOSCCP_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS) +AM_LDFLAGS = $(COVERAGE_LDFLAGS) + +EXTRA_DIST = smpp_test.ok smpp_test.err + +noinst_PROGRAMS = smpp_test + +smpp_test_SOURCES = smpp_test.c \ + $(top_srcdir)/src/libmsc/smpp_utils.c +smpp_test_LDADD = $(LIBOSMOCORE_LIBS) \ + $(top_srcdir)/src/libcommon/libcommon.a diff --git a/openbsc/tests/smpp/smpp_test.c b/openbsc/tests/smpp/smpp_test.c new file mode 100644 index 0000000..62fa9d2 --- /dev/null +++ b/openbsc/tests/smpp/smpp_test.c @@ -0,0 +1,73 @@ +/* + * (C) 2013 by Holger Hans Peter Freyther + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ + +#include <stdlib.h> +#include <stdio.h> + +#include <openbsc/debug.h> + +#include <osmocom/core/application.h> +#include <osmocom/core/backtrace.h> + +#include "smpp_smsc.h" + +struct coding_test { + uint8_t dcs; + uint8_t coding; + int mode; + int res; +}; + +static struct coding_test codecs[] = { + { .dcs = 0xf6 , .coding = 0x02, .mode = MODE_8BIT, .res = 0 }, + { .dcs = 0xf2 , .coding = 0x01, .mode = MODE_7BIT, .res = 0 }, + { .dcs = 0x02 , .coding = 0x01, .mode = MODE_7BIT, .res = 0 }, + { .dcs = 0x06 , .coding = 0x02, .mode = MODE_8BIT, .res = 0 }, + { .dcs = 0x0A , .coding = 0x08, .mode = MODE_8BIT, .res = 0 }, + { .dcs = 0x0E , .coding = 0xFF, .mode = 0xFF, .res = -1 }, + { .dcs = 0xE0 , .coding = 0xFF, .mode = 0xFF, .res = -1 }, +}; + +static void test_coding_scheme(void) +{ + int i; + printf("Testing coding scheme support\n"); + + for (i = 0; i < ARRAY_SIZE(codecs); ++i) { + uint8_t coding; + int mode, res; + + res = smpp_determine_scheme(codecs[i].dcs, &coding, &mode); + OSMO_ASSERT(res == codecs[i].res); + if (res != -1) { + OSMO_ASSERT(mode == codecs[i].mode); + OSMO_ASSERT(coding == codecs[i].coding); + } + } +} + +int main(int argc, char **argv) +{ + osmo_init_logging(&log_info); + log_set_use_color(osmo_stderr_target, 0); + log_set_print_filename(osmo_stderr_target, 0); + + test_coding_scheme(); + return EXIT_SUCCESS; +} diff --git a/openbsc/tests/smpp/smpp_test.err b/openbsc/tests/smpp/smpp_test.err new file mode 100644 index 0000000..ec966ba --- /dev/null +++ b/openbsc/tests/smpp/smpp_test.err @@ -0,0 +1,2 @@ +SMPP MO Unknown Data Coding 0x0e +SMPP MO Unknown Data Coding 0xe0 diff --git a/openbsc/tests/smpp/smpp_test.ok b/openbsc/tests/smpp/smpp_test.ok new file mode 100644 index 0000000..fd44804 --- /dev/null +++ b/openbsc/tests/smpp/smpp_test.ok @@ -0,0 +1 @@ +Testing coding scheme support diff --git a/openbsc/tests/testsuite.at b/openbsc/tests/testsuite.at index e649f03..ea3fa1c 100644 --- a/openbsc/tests/testsuite.at +++ b/openbsc/tests/testsuite.at @@ -40,6 +40,14 @@ cat $abs_srcdir/bsc-nat/bsc_nat_test.ok > expout AT_CHECK([$abs_top_builddir/tests/bsc-nat/bsc_nat_test], [], [expout], [ignore]) AT_CLEANUP +AT_SETUP([smpp]) +AT_KEYWORDS([smpp]) +AT_CHECK([test "$enable_smpp_test" != no || exit 77]) +cat $abs_srcdir/smpp/smpp_test.ok > expout +cat $abs_srcdir/smpp/smpp_test.err > experr +AT_CHECK([$abs_top_builddir/tests/smpp/smpp_test], [], [expout], [experr]) +AT_CLEANUP + AT_SETUP([si]) AT_KEYWORDS([si]) cat $abs_srcdir/si/si_test.ok > expout -- 1.8.3.2

11 years, 12 months

7bit changes to libosmocore

by Holger Hans Peter Freyther

Dear LaF0rge, Andreas, I am really disappointed about the used process for this change. As an absolute minimum run "make check" after bigger changes. The run takes about 20 seconds (and that is probably 15s in the timer test), I have to spend way more time fixing the fall-out from that and it creates the impression that you do not value my time! I think Andreas should have posted this kind of change to the mailing list and ask for review. The way it was done is really unacceptable and the build is still broken. And to make it worse I think the change is wrong in several ways: 1.) The issue of the last '7bit' being 'empty' only applies to USSD/CB: "If the total number of characters to be sent equals (8n-1) where n=1,2,3 etc. then there are 7 spare bits at the end of the message. To avoid the situation where the receiving entity confuses 7 binary zero pad bits as the @ character, the carriage return or <CR> character (defined in subclause 7.1.1) shall be used for padding in this situation, just as for Cell Broadcast." In SMS one has both the octet length and the character length inside the messages. In USSD this information is not present. 2.) The semantic of the change is bad. + octet_len = response_len*7/8; + if (response_len*7%8 != 0) + octet_len++; + /* Warning, response_len indicates the amount of septets + * (characters), we need amount of octets occupied */ Every caller of gsm_7bit_encode now needs to consider adding this change, it is better to move this into gsm_utils.c. E.g. take a look at my branch called zecke/features/alpha-numeric for a gsm_7bit_encode_oct. Which comes with a testcase... and moves this responsibility into libosmocore and is based on the real octets written (instead of trying to figure it our afterwards). We all make money by working on Osmocom sub-projects and I really can't stand such amateurish work. Can we force reset master to before the merge and try again? cheers holger

12 years

[PATCH] Set the clock calibration to the value read from the eeprom by default.

by Nicolas J. Bouliane

From: "Nicolas J. Bouliane" <nicolas.bouliane(a)nutaq.com> Signed-off-by: Nicolas J. Bouliane <nicolas.bouliane(a)nutaq.com> --- src/osmo-bts-sysmo/l1_if.c | 1 + src/osmo-bts-sysmo/l1_if.h | 1 + src/osmo-bts-sysmo/main.c | 24 ++++++++++++++++++++++++ src/osmo-bts-sysmo/sysmobts_vty.c | 21 ++++++++++++++++++++- 4 files changed, 46 insertions(+), 1 deletion(-) diff --git a/src/osmo-bts-sysmo/l1_if.c b/src/osmo-bts-sysmo/l1_if.c index 16f1523..e16bb49 100644 --- a/src/osmo-bts-sysmo/l1_if.c +++ b/src/osmo-bts-sysmo/l1_if.c @@ -1267,6 +1267,7 @@ struct femtol1_hdl *l1if_open(void *priv) fl1h->priv = priv; fl1h->clk_cal = 0; + fl1h->clk_use_eeprom = 1; fl1h->ul_power_target = -75; /* dBm default */ fl1h->min_qual_rach = MIN_QUAL_RACH; fl1h->min_qual_norm = MIN_QUAL_NORM; diff --git a/src/osmo-bts-sysmo/l1_if.h b/src/osmo-bts-sysmo/l1_if.h index 7947ea2..cf8af7b 100644 --- a/src/osmo-bts-sysmo/l1_if.h +++ b/src/osmo-bts-sysmo/l1_if.h @@ -42,6 +42,7 @@ struct femtol1_hdl { struct gsm_time gsm_time; uint32_t hLayer1; /* handle to the L1 instance in the DSP */ uint32_t dsp_trace_f; + uint8_t clk_use_eeprom; int clk_cal; int ul_power_target; uint8_t clk_src; diff --git a/src/osmo-bts-sysmo/main.c b/src/osmo-bts-sysmo/main.c index 595a6eb..d535ac8 100644 --- a/src/osmo-bts-sysmo/main.c +++ b/src/osmo-bts-sysmo/main.c @@ -48,6 +48,7 @@ #define SYSMOBTS_RF_LOCK_PATH "/var/lock/bts_rf_lock" +#include "eeprom.h" #include "l1_if.h" /* FIXME: read from real hardware */ @@ -80,6 +81,27 @@ int bts_model_init(struct gsm_bts *bts) return 0; } +/* Set the clock calibration to the value + * read from the eeprom. + */ +void clk_cal_use_eeprom(struct gsm_bts *bts) +{ + int rc; + struct femtol1_hdl *hdl; + eeprom_RfClockCal_t rf_clk; + + hdl = bts->c0->role_bts.l1h; + + if (!hdl || !hdl->clk_use_eeprom) + return; + + rc = eeprom_ReadRfClockCal(&rf_clk); + if (rc != EEPROM_SUCCESS) + return; + else + hdl->clk_cal = rf_clk.iClkCor; +} + struct ipabis_link *link_init(struct gsm_bts *bts, const char *ip) { struct ipabis_link *link = talloc_zero(bts, struct ipabis_link); @@ -286,6 +308,8 @@ int main(int argc, char **argv) exit(1); } + clk_cal_use_eeprom(bts); + if (stat(SYSMOBTS_RF_LOCK_PATH, &st) == 0) { LOGP(DL1C, LOGL_NOTICE, "Not starting BTS due to RF_LOCK file present\n"); exit(23); diff --git a/src/osmo-bts-sysmo/sysmobts_vty.c b/src/osmo-bts-sysmo/sysmobts_vty.c index 5bc948e..21b7f89 100644 --- a/src/osmo-bts-sysmo/sysmobts_vty.c +++ b/src/osmo-bts-sysmo/sysmobts_vty.c @@ -111,6 +111,18 @@ DEFUN(cfg_trx_no_gsmtap_sapi, cfg_trx_no_gsmtap_sapi_cmd, return CMD_SUCCESS; } +DEFUN(cfg_trx_clkcal_eeprom, cfg_trx_clkcal_eeprom_cmd, + "clock-calibration eeprom", + "Use the eeprom clock calibration value\n") +{ + struct gsm_bts_trx *trx = vty->index; + struct femtol1_hdl *fl1h = trx_femtol1_hdl(trx); + + fl1h->clk_use_eeprom = 1; + + return CMD_SUCCESS; +} + DEFUN(cfg_trx_clkcal_def, cfg_trx_clkcal_def_cmd, "clock-calibration default", "Set the clock calibration value\n" "Default Clock DAC value\n") @@ -118,6 +130,7 @@ DEFUN(cfg_trx_clkcal_def, cfg_trx_clkcal_def_cmd, struct gsm_bts_trx *trx = vty->index; struct femtol1_hdl *fl1h = trx_femtol1_hdl(trx); + fl1h->clk_use_eeprom = 0; fl1h->clk_cal = 0xffff; return CMD_SUCCESS; @@ -132,6 +145,7 @@ DEFUN(cfg_trx_clkcal, cfg_trx_clkcal_cmd, struct gsm_bts_trx *trx = vty->index; struct femtol1_hdl *fl1h = trx_femtol1_hdl(trx); + fl1h->clk_use_eeprom = 0; fl1h->clk_cal = clkcal & 0xfff; return CMD_SUCCESS; @@ -145,6 +159,7 @@ DEFUN(cfg_trx_clkcal, cfg_trx_clkcal_cmd, struct gsm_bts_trx *trx = vty->index; struct femtol1_hdl *fl1h = trx_femtol1_hdl(trx); + fl1h->clk_use_eeprom = 0; fl1h->clk_cal = clkcal; return CMD_SUCCESS; @@ -476,7 +491,10 @@ void bts_model_config_write_trx(struct vty *vty, struct gsm_bts_trx *trx) struct femtol1_hdl *fl1h = trx_femtol1_hdl(trx); int i; - vty_out(vty, " clock-calibration %d%s", fl1h->clk_cal, + if (fl1h->clk_use_eeprom) + vty_out(vty, " clock-calibration eeprom%s", VTY_NEWLINE); + else + vty_out(vty, " clock-calibration %d%s", fl1h->clk_cal, VTY_NEWLINE); if (fl1h->calib_path) vty_out(vty, " trx-calibration-path %s%s", @@ -549,6 +567,7 @@ int bts_model_vty_init(struct gsm_bts *bts) install_element(BTS_NODE, &cfg_bts_no_auto_band_cmd); install_element(TRX_NODE, &cfg_trx_clkcal_cmd); + install_element(TRX_NODE, &cfg_trx_clkcal_eeprom_cmd); install_element(TRX_NODE, &cfg_trx_clkcal_def_cmd); install_element(TRX_NODE, &cfg_trx_clksrc_cmd); install_element(TRX_NODE, &cfg_trx_cal_path_cmd); -- 1.7.10.4

12 years

patch for gsm0808.c

by Dmitri Soloviev

Hi in order to decode Cipher Mode Command from Alcatel S-12, please accept a patch to gsm0808.c Without it OpenBSC rejects ciphering, and procedures are broken from MSC side @@ -305,6 +305,7 @@ [GSM0808_IE_CELL_IDENTIFIER] = { TLV_TYPE_TLV }, [GSM0808_IE_CHOSEN_CHANNEL] = { TLV_TYPE_TV }, [GSM0808_IE_LAYER_3_INFORMATION] = { TLV_TYPE_TLV }, + [GSM0808_IE_LAYER_3_HEADER_INFORMATION] = { TLV_TYPE_TLV }, [GSM0808_IE_SPEECH_VERSION] = { TLV_TYPE_TV }, [GSM0808_IE_CHOSEN_ENCR_ALG] = { TLV_TYPE_TV }, }, Right now there is a pilot with MNO, and Telscale SS7 Card runs code for A-interface gateway, converting BSSAP/SS7 to SCCPoverIP + rtp. It seems that such a gateway also has to adapt OpenBSC to each particular MSC. As an example, DTAP portion of Cipher Mode Complete must be removed for proper operation with S12. Code will published as soon as pilot succeeds. Best Regards, Dmitri

12 years

Second call on encrypted connection

by Andreas Eversberg

hi, while trying to do a second call (hold the first, dial another number), i found out that there is no acknowledge for a CM service request, when encyption is enabled. the attached patch will fix it. regards, andreas

12 years

Complete setup with just simulation

by Priyanka Behl

Hi everyone, I have to setup a complete call with voice support and also a complete working GPRS network with just simulation and no physical base station, is it achievable? It would be great if someone could enlighten me on this. Thanks and regards, Priyanka

12 years

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

OpenBSC