OpenBSC May 2014

openbsc@lists.osmocom.org

19 participants
43 discussions

[PATCH] misc: Address style issues pointed out by the cppcheck application

by Holger Freyther

From: Holger Hans Peter Freyther <holger(a)moiji-mobile.com> Use the variable only in the scope it is actually used. This could reduce the used stack space but that does not really matter to us right now. [src/gprs/gb_proxy.c:739]: (style) The scope of the variable 'peer' can be reduced. [src/libbsc/abis_nm.c:281]: (style) The scope of the variable 'p_text' can be reduced. [src/libbsc/abis_nm.c:547]: (style) The scope of the variable 'msg' can be reduced. [src/libbsc/abis_nm.c:1069]: (style) The scope of the variable 'rc' can be reduced. [src/libbsc/abis_nm.c:2741]: (style) The scope of the variable 'msg' can be reduced. [src/libbsc/abis_rsl.c:1092]: (style) The scope of the variable 'rc' can be reduced. [src/libbsc/arfcn_range_encode.c:57]: (style) The scope of the variable 'n' can be reduced. [src/libbsc/bsc_api.c:642]: (style) The scope of the variable 'rc' can be reduced. [src/ipaccess/ipaccess-find.c:176]: (style) The scope of the variable 'rc' can be reduced. [src/libbsc/bsc_vty.c:1040]: (style) The scope of the variable 'lchan' can be reduced. [src/libbsc/bsc_vty.c:1041]: (style) The scope of the variable 'trx_nr' can be reduced. [src/libbsc/bsc_vty.c:1041]: (style) The scope of the variable 'ts_nr' can be reduced. [src/libbsc/bsc_vty.c:1041]: (style) The scope of the variable 'lchan_nr' can be reduced. [src/libbsc/bts_nokia_site.c:1167]: (style) The scope of the variable 'noh' can be reduced. [src/libbsc/bts_nokia_site.c:1426]: (style) The scope of the variable 'msg' can be reduced. [src/libbsc/bts_nokia_site.c:1310]: (style) The scope of the variable 'constructed' can be reduced. [src/libbsc/bts_nokia_site.c:1368]: (style) The scope of the variable 'constructed' can be reduced. [src/libbsc/chan_alloc.c:435]: (style) The scope of the variable 'lchan' can be reduced. [src/libbsc/system_information.c:337]: (style) The scope of the variable 'cur_bts' can be reduced. [src/libcommon/gsm_data.c:234]: (style) The scope of the variable 'bts' can be reduced. [src/libtrau/rtp_proxy.c:114]: (style) The scope of the variable 'rtpxh' can be reduced. [src/libtrau/rtp_proxy.c:118]: (style) The scope of the variable 'x_len' can be reduced. [src/libmsc/transaction.c:128]: (style) The scope of the variable 'j' can be reduced. [src/libtrau/trau_mux.c:158]: (style) The scope of the variable 'me2' can be reduced. [src/osmo-bsc/osmo_bsc_filter.c:320]: (style) The scope of the variable 'lai' can be reduced. [src/osmo-bsc/osmo_bsc_msc.c:410]: (style) The scope of the variable 'msg' can be reduced. [src/osmo-bsc/osmo_bsc_sccp.c:44]: (style) The scope of the variable 'msg' can be reduced. [src/osmo-bsc/osmo_bsc_sccp.c:57]: (style) The scope of the variable 'msg' can be reduced. [src/osmo-bsc_mgcp/mgcp_main.c:146]: (style) The scope of the variable 'i' can be reduced. [src/osmo-bsc_nat/bsc_nat.c:444]: (style) The scope of the variable 'udt' can be reduced. [src/osmo-bsc_nat/bsc_nat_vty.c:544]: (style) The scope of the variable 'rewr' can be reduced. [src/osmo-bsc_nat/bsc_ussd.c:375]: (style) The scope of the variable 'lst' can be reduced. [src/libmsc/gsm_04_08.c:683]: (style) The scope of the variable 'local_time' can be reduced. [src/libmsc/gsm_04_08.c:1638]: (style) The scope of the variable 'rc' can be reduced. [src/libmsc/gsm_04_08.c:2938]: (style) The scope of the variable 'transt' can be reduced. [src/libtrau/trau_mux.c:332]: (style) The scope of the variable 'ue' can be reduced. --- openbsc/src/gprs/gb_proxy.c | 2 +- openbsc/src/ipaccess/ipaccess-find.c | 2 +- openbsc/src/libbsc/abis_nm.c | 11 +++++------ openbsc/src/libbsc/abis_rsl.c | 2 +- openbsc/src/libbsc/arfcn_range_encode.c | 4 ++-- openbsc/src/libbsc/bsc_api.c | 2 +- openbsc/src/libbsc/bsc_vty.c | 9 +++++---- openbsc/src/libbsc/bts_nokia_site.c | 8 ++++---- openbsc/src/libbsc/chan_alloc.c | 2 +- openbsc/src/libbsc/system_information.c | 3 ++- openbsc/src/libcommon/gsm_data.c | 2 +- openbsc/src/libmsc/gsm_04_08.c | 10 ++++++---- openbsc/src/libmsc/transaction.c | 4 ++-- openbsc/src/libtrau/rtp_proxy.c | 5 +++-- openbsc/src/libtrau/trau_mux.c | 9 ++++++--- openbsc/src/osmo-bsc/osmo_bsc_filter.c | 2 +- openbsc/src/osmo-bsc/osmo_bsc_msc.c | 3 +-- openbsc/src/osmo-bsc/osmo_bsc_sccp.c | 8 ++++---- openbsc/src/osmo-bsc_mgcp/mgcp_main.c | 2 +- openbsc/src/osmo-bsc_nat/bsc_nat.c | 3 ++- openbsc/src/osmo-bsc_nat/bsc_nat_vty.c | 3 +-- openbsc/src/osmo-bsc_nat/bsc_ussd.c | 2 +- 22 files changed, 52 insertions(+), 46 deletions(-) diff --git a/openbsc/src/gprs/gb_proxy.c b/openbsc/src/gprs/gb_proxy.c index 3c41529..3639650 100644 --- a/openbsc/src/gprs/gb_proxy.c +++ b/openbsc/src/gprs/gb_proxy.c @@ -736,7 +736,6 @@ int gbprox_signal(unsigned int subsys, unsigned int signal, { struct ns_signal_data *nssd = signal_data; struct gprs_nsvc *nsvc = nssd->nsvc; - struct gbprox_peer *peer; if (subsys != SS_L_NS) return 0; @@ -759,6 +758,7 @@ int gbprox_signal(unsigned int subsys, unsigned int signal, } if (!nsvc->remote_end_is_sgsn) { + struct gbprox_peer *peer; /* from BSS to SGSN */ peer = peer_by_nsei(nsvc->nsei); if (!peer) { diff --git a/openbsc/src/ipaccess/ipaccess-find.c b/openbsc/src/ipaccess/ipaccess-find.c index c8de157..19acf26 100644 --- a/openbsc/src/ipaccess/ipaccess-find.c +++ b/openbsc/src/ipaccess/ipaccess-find.c @@ -173,7 +173,6 @@ int main(int argc, char **argv) { struct osmo_fd bfd; char *ifname = NULL; - int rc; printf("ipaccess-find (C) 2009 by Harald Welte\n"); printf("This is FREE SOFTWARE with ABSOLUTELY NO WARRANTY\n\n"); @@ -203,6 +202,7 @@ int main(int argc, char **argv) printf("Trying to find ip.access BTS by broadcast UDP...\n"); while (1) { + int rc; rc = osmo_select_main(0); if (rc < 0) exit(3); diff --git a/openbsc/src/libbsc/abis_nm.c b/openbsc/src/libbsc/abis_nm.c index 3bf55ec..00fd479 100644 --- a/openbsc/src/libbsc/abis_nm.c +++ b/openbsc/src/libbsc/abis_nm.c @@ -278,7 +278,6 @@ static int rx_fail_evt_rep(struct msgb *mb) struct e1inp_sign_link *sign_link = mb->dst; struct tlv_parsed tp; const uint8_t *p_val; - char *p_text; LOGPC(DNM, LOGL_ERROR, "Failure Event Report "); @@ -295,6 +294,7 @@ static int rx_fail_evt_rep(struct msgb *mb) LOGPC(DNM, LOGL_ERROR, "Probable cause= %02X %02X %02X ", p_val[0], p_val[1], p_val[2]); } if (TLVP_PRESENT(&tp, NM_ATT_ADD_TEXT)) { + char *p_text; p_val = TLVP_VAL(&tp, NM_ATT_ADD_TEXT); p_text = talloc_strndup(tall_bsc_ctx, (const char *) p_val, TLVP_LEN(&tp, NM_ATT_ADD_TEXT)); if (p_text) { @@ -544,9 +544,10 @@ static int abis_nm_rx_lmt_event(struct msgb *mb) void abis_nm_queue_send_next(struct gsm_bts *bts) { int wait = 0; - struct msgb *msg; + /* the queue is empty */ while (!llist_empty(&bts->abis_queue)) { + struct msgb *msg; msg = msgb_dequeue(&bts->abis_queue); wait = OBSC_NM_W_ACK_CB(msg); _abis_nm_sendmsg(msg); @@ -1066,9 +1067,8 @@ static void sw_close_file(struct abis_nm_sw *sw) /* Fill the window */ static int sw_fill_window(struct abis_nm_sw *sw) { - int rc; - while (sw->seg_in_window < sw->window_size) { + int rc; rc = sw_load_segment(sw); if (rc < 0) return rc; @@ -2738,9 +2738,8 @@ int ipac_parse_bcch_info(struct ipac_bcch_info *binf, uint8_t *buf) void abis_nm_clear_queue(struct gsm_bts *bts) { - struct msgb *msg; - while (!llist_empty(&bts->abis_queue)) { + struct msgb *msg; msg = msgb_dequeue(&bts->abis_queue); msgb_free(msg); } diff --git a/openbsc/src/libbsc/abis_rsl.c b/openbsc/src/libbsc/abis_rsl.c index 425dd8d..398f243 100644 --- a/openbsc/src/libbsc/abis_rsl.c +++ b/openbsc/src/libbsc/abis_rsl.c @@ -1089,7 +1089,6 @@ static int rsl_rx_meas_res(struct msgb *msg) struct gsm_meas_rep *mr = lchan_next_meas_rep(msg->lchan); uint8_t len; const uint8_t *val; - int rc; /* check if this channel is actually active */ /* FIXME: maybe this check should be way more generic/centralized */ @@ -1145,6 +1144,7 @@ static int rsl_rx_meas_res(struct msgb *msg) mr->ms_l1.ta >>= 2; } if (TLVP_PRESENT(&tp, RSL_IE_L3_INFO)) { + int rc; msg->l3h = (uint8_t *) TLVP_VAL(&tp, RSL_IE_L3_INFO); rc = gsm48_parse_meas_rep(mr, msg); if (rc < 0) diff --git a/openbsc/src/libbsc/arfcn_range_encode.c b/openbsc/src/libbsc/arfcn_range_encode.c index e67bf0a..d2230a6 100644 --- a/openbsc/src/libbsc/arfcn_range_encode.c +++ b/openbsc/src/libbsc/arfcn_range_encode.c @@ -54,12 +54,12 @@ static inline int mod(int data, int range) */ int range_enc_find_index(const int range, const int *freqs, const int size) { - int i, j, n; + int i, j; const int RANGE_DELTA = (range - 1) / 2; for (i = 0; i < size; ++i) { - n = 0; + int n = 0; for (j = 0; j < size; ++j) { if (mod(freqs[j] - freqs[i], range) <= RANGE_DELTA) n += 1; diff --git a/openbsc/src/libbsc/bsc_api.c b/openbsc/src/libbsc/bsc_api.c index e567038..0a8a2a8 100644 --- a/openbsc/src/libbsc/bsc_api.c +++ b/openbsc/src/libbsc/bsc_api.c @@ -639,7 +639,6 @@ static void dispatch_dtap(struct gsm_subscriber_connection *conn, /*! \brief RSL has received a DATA INDICATION with L3 from MS */ int gsm0408_rcvmsg(struct msgb *msg, uint8_t link_id) { - int rc; struct bsc_api *api = msg->lchan->ts->trx->bts->network->bsc_api; struct gsm_lchan *lchan; @@ -657,6 +656,7 @@ int gsm0408_rcvmsg(struct msgb *msg, uint8_t link_id) dispatch_dtap(lchan->conn, link_id, msg); } else { /* allocate a new connection */ + int rc; rc = BSC_API_CONN_POL_REJECT; lchan->conn = subscr_con_allocate(msg->lchan); if (!lchan->conn) { diff --git a/openbsc/src/libbsc/bsc_vty.c b/openbsc/src/libbsc/bsc_vty.c index 9129059..d1ef244 100644 --- a/openbsc/src/libbsc/bsc_vty.c +++ b/openbsc/src/libbsc/bsc_vty.c @@ -1037,8 +1037,7 @@ static int lchan_summary(struct vty *vty, int argc, const char **argv, struct gsm_bts *bts; struct gsm_bts_trx *trx; struct gsm_bts_trx_ts *ts; - struct gsm_lchan *lchan; - int bts_nr, trx_nr, ts_nr, lchan_nr; + int bts_nr; if (argc >= 1) { /* use the BTS number that the user has specified */ @@ -1054,7 +1053,7 @@ static int lchan_summary(struct vty *vty, int argc, const char **argv, return dump_lchan_bts(bts, vty, dump_cb); } if (argc >= 2) { - trx_nr = atoi(argv[1]); + int trx_nr = atoi(argv[1]); if (trx_nr >= bts->num_trx) { vty_out(vty, "%% can't find TRX %s%s", argv[1], VTY_NEWLINE); @@ -1066,7 +1065,7 @@ static int lchan_summary(struct vty *vty, int argc, const char **argv, return dump_lchan_trx(trx, vty, dump_cb); } if (argc >= 3) { - ts_nr = atoi(argv[2]); + int ts_nr = atoi(argv[2]); if (ts_nr >= TRX_NR_TS) { vty_out(vty, "%% can't find TS %s%s", argv[2], VTY_NEWLINE); @@ -1078,6 +1077,8 @@ static int lchan_summary(struct vty *vty, int argc, const char **argv, return dump_lchan_trx_ts(ts, vty, dump_cb); } if (argc >= 4) { + struct gsm_lchan *lchan; + int lchan_nr; lchan_nr = atoi(argv[3]); if (lchan_nr >= TS_MAX_LCHAN) { vty_out(vty, "%% can't find LCHAN %s%s", argv[3], diff --git a/openbsc/src/libbsc/bts_nokia_site.c b/openbsc/src/libbsc/bts_nokia_site.c index 376a048..ae13335 100644 --- a/openbsc/src/libbsc/bts_nokia_site.c +++ b/openbsc/src/libbsc/bts_nokia_site.c @@ -1164,7 +1164,6 @@ static int abis_nm_send_multi_segments(struct gsm_bts *bts, uint8_t msg_type, while (len_remain) { struct abis_om_hdr *oh; - struct abis_om_nokia_hdr *noh; struct msgb *msg = nm_msgb_alloc(); if (seq == 0) @@ -1176,6 +1175,7 @@ static int abis_nm_send_multi_segments(struct gsm_bts *bts, uint8_t msg_type, len_to_send = max_send; if (seq == 0) { + struct abis_om_nokia_hdr *noh; /* first segment */ oh = (struct abis_om_hdr *)msgb_put(msg, ABIS_OM_NOKIA_HDR_SIZE @@ -1307,10 +1307,10 @@ static int find_element(uint8_t * data, int len, uint16_t id, uint8_t * value, uint8_t ub; int idx = 0; int found = 0; - int constructed __attribute__((unused)); uint16_t id_value; for (;;) { + int constructed __attribute__((unused)); GET_NEXT_BYTE; @@ -1365,11 +1365,11 @@ static int dump_elements(uint8_t * data, int len) { uint8_t ub; int idx = 0; - int constructed; uint16_t id_value; static char indent[100] = ""; /* TODO: move static to BTS context */ for (;;) { + int constructed; GET_NEXT_BYTE; @@ -1423,9 +1423,9 @@ static int dump_elements(uint8_t * data, int len) static void nokia_abis_nm_queue_send_next(struct gsm_bts *bts) { int wait = 0; - struct msgb *msg; /* the queue is empty */ while (!llist_empty(&bts->abis_queue)) { + struct msgb *msg; msg = msgb_dequeue(&bts->abis_queue); wait = OBSC_NM_W_ACK_CB(msg); abis_sendmsg(msg); diff --git a/openbsc/src/libbsc/chan_alloc.c b/openbsc/src/libbsc/chan_alloc.c index 9b74329..255c79d 100644 --- a/openbsc/src/libbsc/chan_alloc.c +++ b/openbsc/src/libbsc/chan_alloc.c @@ -432,9 +432,9 @@ struct gsm_subscriber_connection *connection_for_subscr(struct gsm_subscriber *s { struct gsm_bts *bts; struct gsm_network *net = subscr->net; - struct gsm_lchan *lchan; llist_for_each_entry(bts, &net->bts_list, list) { + struct gsm_lchan *lchan; lchan = lchan_find(bts, subscr); if (lchan) return lchan->conn; diff --git a/openbsc/src/libbsc/system_information.c b/openbsc/src/libbsc/system_information.c index a3deefc..7b7b3d7 100644 --- a/openbsc/src/libbsc/system_information.c +++ b/openbsc/src/libbsc/system_information.c @@ -334,7 +334,6 @@ static int bitvec2freq_list(uint8_t *chan_list, struct bitvec *bv, static int generate_bcch_chan_list(uint8_t *chan_list, struct gsm_bts *bts, int si5, int bis, int ter) { - struct gsm_bts *cur_bts; struct bitvec *bv; if (si5 && bts->neigh_list_manual_mode == NL_MODE_MANUAL_SI5SEP) @@ -344,6 +343,8 @@ static int generate_bcch_chan_list(uint8_t *chan_list, struct gsm_bts *bts, /* Generate list of neighbor cells if we are in automatic mode */ if (bts->neigh_list_manual_mode == NL_MODE_AUTOMATIC) { + struct gsm_bts *cur_bts; + /* Zero-initialize the bit-vector */ memset(bv->data, 0, bv->data_len); diff --git a/openbsc/src/libcommon/gsm_data.c b/openbsc/src/libcommon/gsm_data.c index 5f7e32e..5b42269 100644 --- a/openbsc/src/libcommon/gsm_data.c +++ b/openbsc/src/libcommon/gsm_data.c @@ -231,13 +231,13 @@ struct gsm_bts *gsm_bts_by_lac(struct gsm_network *net, unsigned int lac, struct gsm_bts *start_bts) { int i; - struct gsm_bts *bts; int skip = 0; if (start_bts) skip = 1; for (i = 0; i < net->num_bts; i++) { + struct gsm_bts *bts; bts = gsm_bts_num(net, i); if (skip) { diff --git a/openbsc/src/libmsc/gsm_04_08.c b/openbsc/src/libmsc/gsm_04_08.c index df93433..0f77a86 100644 --- a/openbsc/src/libmsc/gsm_04_08.c +++ b/openbsc/src/libmsc/gsm_04_08.c @@ -680,7 +680,6 @@ int gsm48_tx_mm_info(struct gsm_subscriber_connection *conn) time_t cur_t; struct tm* gmt_time; - struct tm* local_time; int tzunits; int dst = 0; @@ -781,6 +780,8 @@ int gsm48_tx_mm_info(struct gsm_subscriber_connection *conn) dst = bts->tz.dst; } else { + struct tm* local_time; + /* Need to get GSM offset and convert into 15 min units */ /* This probably breaks if gmtoff returns a value not evenly divisible by 15? */ local_time = localtime(&cur_t); @@ -1635,7 +1636,6 @@ static int tch_recv_mncc(struct gsm_network *net, uint32_t callref, int enable) struct gsm_trans *trans; struct gsm_lchan *lchan; struct gsm_bts *bts; - int rc; /* Find callref */ trans = trans_find_by_callref(net, callref); @@ -1669,7 +1669,7 @@ static int tch_recv_mncc(struct gsm_network *net, uint32_t callref, int enable) } if (enable) { /* connect the TCH's to our RTP proxy */ - rc = rsl_ipacc_mdcx_to_rtpsock(lchan); + int rc = rsl_ipacc_mdcx_to_rtpsock(lchan); if (rc < 0) return rc; /* assign socket to application interface */ @@ -2935,7 +2935,7 @@ static struct downstate { int mncc_tx_to_cc(struct gsm_network *net, int msg_type, void *arg) { int i, rc = 0; - struct gsm_trans *trans = NULL, *transt; + struct gsm_trans *trans = NULL; struct gsm_subscriber_connection *conn = NULL; struct gsm_bts *bts = NULL; struct gsm_mncc *data = arg, rel; @@ -3069,6 +3069,8 @@ int mncc_tx_to_cc(struct gsm_network *net, int msg_type, void *arg) /* If subscriber has no lchan */ if (!conn) { + struct gsm_trans *transt; + /* find transaction with this subscriber already paging */ llist_for_each_entry(transt, &net->trans_list, entry) { /* Transaction of our lchan? */ diff --git a/openbsc/src/libmsc/transaction.c b/openbsc/src/libmsc/transaction.c index e425e67..cde303f 100644 --- a/openbsc/src/libmsc/transaction.c +++ b/openbsc/src/libmsc/transaction.c @@ -125,7 +125,7 @@ int trans_assign_trans_id(struct gsm_subscriber *subscr, struct gsm_network *net = subscr->net; struct gsm_trans *trans; unsigned int used_tid_bitmask = 0; - int i, j, h; + int i, h; if (ti_flag) ti_flag = 0x8; @@ -144,7 +144,7 @@ int trans_assign_trans_id(struct gsm_subscriber *subscr, if (used_tid_bitmask & (1 << (h | ti_flag))) break; for (i = 0; i < 7; i++) { - j = ((h + i) % 7) | ti_flag; + int j = ((h + i) % 7) | ti_flag; if ((used_tid_bitmask & (1 << j)) == 0) return j; } diff --git a/openbsc/src/libtrau/rtp_proxy.c b/openbsc/src/libtrau/rtp_proxy.c index 143bfa0..0b42b8d 100644 --- a/openbsc/src/libtrau/rtp_proxy.c +++ b/openbsc/src/libtrau/rtp_proxy.c @@ -111,11 +111,9 @@ static int rtp_decode(struct msgb *msg, uint32_t callref, struct msgb **data) struct msgb *new_msg; struct gsm_data_frame *frame; struct rtp_hdr *rtph = (struct rtp_hdr *)msg->data; - struct rtp_x_hdr *rtpxh; uint8_t *payload; int payload_len; int msg_type; - int x_len; if (msg->len < 12) { DEBUGPC(DLMUX, "received RTP frame too short (len = %d)\n", @@ -135,6 +133,9 @@ static int rtp_decode(struct msgb *msg, uint32_t callref, struct msgb **data) return -EINVAL; } if (rtph->extension) { + struct rtp_x_hdr *rtpxh; + int x_len; + if (payload_len < sizeof(struct rtp_x_hdr)) { DEBUGPC(DLMUX, "received RTP frame too short for " "extension header\n"); diff --git a/openbsc/src/libtrau/trau_mux.c b/openbsc/src/libtrau/trau_mux.c index fd1895f..8ad045b 100644 --- a/openbsc/src/libtrau/trau_mux.c +++ b/openbsc/src/libtrau/trau_mux.c @@ -155,10 +155,10 @@ int trau_mux_map_lchan(const struct gsm_lchan *src, /* unmap one particular subslot from another subslot */ int trau_mux_unmap(const struct gsm_e1_subslot *ss, uint32_t callref) { - struct map_entry *me, *me2; struct upqueue_entry *ue, *ue2; - if (ss) + if (ss) { + struct map_entry *me, *me2; llist_for_each_entry_safe(me, me2, &ss_map, list) { if (!memcmp(&me->src, ss, sizeof(*ss)) || !memcmp(&me->dst, ss, sizeof(*ss))) { @@ -166,6 +166,8 @@ int trau_mux_unmap(const struct gsm_e1_subslot *ss, uint32_t callref) return 0; } } + } + llist_for_each_entry_safe(ue, ue2, &ss_upqueue, list) { if (ue->callref == callref) { llist_del(&ue->list); @@ -327,7 +329,6 @@ int trau_mux_input(struct gsm_e1_subslot *src_e1_ss, uint8_t trau_bits_out[TRAU_FRAME_BITS]; struct gsm_e1_subslot *dst_e1_ss = lookup_trau_mux_map(src_e1_ss); struct subch_mux *mx; - struct upqueue_entry *ue; int rc; /* decode TRAU, change it to downlink, re-encode */ @@ -337,6 +338,8 @@ int trau_mux_input(struct gsm_e1_subslot *src_e1_ss, if (!dst_e1_ss) { struct msgb *msg = NULL; + struct upqueue_entry *ue; + /* frame shall be sent to upqueue */ if (!(ue = lookup_trau_upqueue(src_e1_ss))) return -EINVAL; diff --git a/openbsc/src/osmo-bsc/osmo_bsc_filter.c b/openbsc/src/osmo-bsc/osmo_bsc_filter.c index 608f525..229a59d 100644 --- a/openbsc/src/osmo-bsc/osmo_bsc_filter.c +++ b/openbsc/src/osmo-bsc/osmo_bsc_filter.c @@ -317,7 +317,6 @@ int bsc_scan_msc_msg(struct gsm_subscriber_connection *conn, struct msgb *msg) { struct osmo_msc_data *msc; struct gsm_network *net; - struct gsm48_loc_area_id *lai; struct gsm48_hdr *gh; uint8_t mtype; int length = msgb_l3len(msg); @@ -336,6 +335,7 @@ int bsc_scan_msc_msg(struct gsm_subscriber_connection *conn, struct msgb *msg) if (mtype == GSM48_MT_MM_LOC_UPD_ACCEPT) { if (msc->core_ncc != -1 || msc->core_mcc != -1) { + struct gsm48_loc_area_id *lai; if (msgb_l3len(msg) >= sizeof(*gh) + sizeof(*lai)) { lai = (struct gsm48_loc_area_id *) &gh->data[0]; gsm48_generate_lai(lai, net->country_code, diff --git a/openbsc/src/osmo-bsc/osmo_bsc_msc.c b/openbsc/src/osmo-bsc/osmo_bsc_msc.c index 0acc290..064977f 100644 --- a/openbsc/src/osmo-bsc/osmo_bsc_msc.c +++ b/openbsc/src/osmo-bsc/osmo_bsc_msc.c @@ -407,9 +407,8 @@ static void send_lacs(struct gsm_network *net, struct bsc_msc_connection *conn) static void initialize_if_needed(struct bsc_msc_connection *conn) { - struct msgb *msg; - if (!conn->is_authenticated) { + struct msgb *msg; /* send a gsm 08.08 reset message from here */ msg = gsm0808_create_reset(); if (!msg) { diff --git a/openbsc/src/osmo-bsc/osmo_bsc_sccp.c b/openbsc/src/osmo-bsc/osmo_bsc_sccp.c index 3dd0a52..bc7a314 100644 --- a/openbsc/src/osmo-bsc/osmo_bsc_sccp.c +++ b/openbsc/src/osmo-bsc/osmo_bsc_sccp.c @@ -41,9 +41,9 @@ static LLIST_HEAD(active_connections); static void free_queued(struct osmo_bsc_sccp_con *conn) { - struct msgb *msg; - while (!llist_empty(&conn->sccp_queue)) { + struct msgb *msg; + /* this is not allowed to fail */ msg = msgb_dequeue(&conn->sccp_queue); msgb_free(msg); @@ -54,9 +54,9 @@ static void free_queued(struct osmo_bsc_sccp_con *conn) static void send_queued(struct osmo_bsc_sccp_con *conn) { - struct msgb *msg; - while (!llist_empty(&conn->sccp_queue)) { + struct msgb *msg; + /* this is not allowed to fail */ msg = msgb_dequeue(&conn->sccp_queue); sccp_connection_write(conn->sccp, msg); diff --git a/openbsc/src/osmo-bsc_mgcp/mgcp_main.c b/openbsc/src/osmo-bsc_mgcp/mgcp_main.c index 14ec221..deda5cc 100644 --- a/openbsc/src/osmo-bsc_mgcp/mgcp_main.c +++ b/openbsc/src/osmo-bsc_mgcp/mgcp_main.c @@ -143,7 +143,6 @@ static int read_call_agent(struct osmo_fd *fd, unsigned int what) socklen_t slen = sizeof(addr); struct msgb *msg; struct msgb *resp; - int i; msg = (struct msgb *) fd->data; @@ -170,6 +169,7 @@ static int read_call_agent(struct osmo_fd *fd, unsigned int what) } if (reset_endpoints) { + int i; LOGP(DMGCP, LOGL_NOTICE, "Asked to reset endpoints: %d/%d\n", reset_trunk->trunk_nr, reset_trunk->trunk_type); diff --git a/openbsc/src/osmo-bsc_nat/bsc_nat.c b/openbsc/src/osmo-bsc_nat/bsc_nat.c index 1aef27e..dd9d25a 100644 --- a/openbsc/src/osmo-bsc_nat/bsc_nat.c +++ b/openbsc/src/osmo-bsc_nat/bsc_nat.c @@ -441,10 +441,11 @@ static void bsc_send_con_release(struct bsc_connection *bsc, /* 2. release the BSC side */ if (con->con_type == NAT_CON_TYPE_LU) { - struct msgb *payload, *udt; + struct msgb *payload; payload = gsm48_create_loc_upd_rej(cause->lu_reject_cause); if (payload) { + struct msgb *udt; gsm0808_prepend_dtap_header(payload, 0); udt = sccp_create_dt1(&con->real_ref, payload->data, payload->len); if (udt) diff --git a/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c b/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c index 261a194..672ba40 100644 --- a/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c +++ b/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c @@ -541,10 +541,9 @@ DEFUN(cfg_nat_no_imsi_black_list_fn, static int replace_rules(struct bsc_nat *nat, char **name, struct llist_head *head, const char *file) { - struct osmo_config_list *rewr = NULL; - bsc_replace_string(nat, name, file); if (*name) { + struct osmo_config_list *rewr; rewr = osmo_config_list_parse(nat, *name); bsc_nat_num_rewr_entry_adapt(nat, head, rewr); talloc_free(rewr); diff --git a/openbsc/src/osmo-bsc_nat/bsc_ussd.c b/openbsc/src/osmo-bsc_nat/bsc_ussd.c index 5f073bf..66d863e 100644 --- a/openbsc/src/osmo-bsc_nat/bsc_ussd.c +++ b/openbsc/src/osmo-bsc_nat/bsc_ussd.c @@ -372,7 +372,6 @@ int bsc_ussd_check(struct nat_sccp_connection *con, struct bsc_nat_parsed *parse uint8_t proto; uint8_t ti; struct gsm48_hdr *hdr48; - struct bsc_nat_acc_lst *lst; struct ussd_request req; /* @@ -412,6 +411,7 @@ int bsc_ussd_check(struct nat_sccp_connection *con, struct bsc_nat_parsed *parse return 0; if (msg_type == GSM0480_MTYPE_REGISTER) { + struct bsc_nat_acc_lst *lst; /* now check if it is a IMSI we care about */ lst = bsc_nat_acc_lst_find(con->bsc->nat, -- 1.9.1

11 years, 1 month

[osmo-bts PATCH] src/osmo-bts-sysmo/l1_if.c: Forgot add utils header

by Alvaro Neira Ayuso

From: Álvaro Neira Ayuso <anayuso(a)sysmocom.de> In the case that we use sysmobts_get_nominal_power inside the l1_if we receive a warning for forgive include that header. Signed-off-by: Alvaro Neira Ayuso <anayuso(a)sysmocom.de> --- src/osmo-bts-sysmo/l1_if.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/osmo-bts-sysmo/l1_if.c b/src/osmo-bts-sysmo/l1_if.c index 79d506a..6834240 100644 --- a/src/osmo-bts-sysmo/l1_if.c +++ b/src/osmo-bts-sysmo/l1_if.c @@ -60,6 +60,7 @@ #include "hw_misc.h" #include "misc/sysmobts_par.h" #include "eeprom.h" +#include "utils.h" extern int pcu_direct; -- 1.7.10.4

11 years, 1 month

[PATCH 1/4] core/conv: Add optimized Viterbi decoding

by Thomas Tsou

Add a separate, faster convolution decoding implementation for rates up to N=4 and constraint lengths of K=5 and K=7, which covers the most GSM code uses. The decoding algorithm exploits the symmetric structure of the Viterbi add-compare-select (ACS) operation - commonly known as the ACS butterfly. This shift-register optimization can be found in the well-known text by Dave Forney. Forney, G.D., "The Viterbi Algorithm," Proc. of the IEEE, March 1973. Implementation is non-architecture specific and improves performance on x86 as well as ARM processors. Existing API is unchanged with optimized code being called internally for supported codes. Signed-off-by: Thomas Tsou <tom(a)tsou.cc> --- src/Makefile.am | 3 +- src/conv.c | 9 + src/viterbi.c | 603 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/viterbi_gen.c | 182 ++++++++++++++++ 4 files changed, 796 insertions(+), 1 deletion(-) create mode 100644 src/viterbi.c create mode 100644 src/viterbi_gen.c diff --git a/src/Makefile.am b/src/Makefile.am index e68c29a..262a4e6 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -13,7 +13,8 @@ libosmocore_la_SOURCES = timer.c select.c signal.c msgb.c bits.c \ logging.c logging_syslog.c rate_ctr.c \ gsmtap_util.c crc16.c panic.c backtrace.c \ conv.c application.c rbtree.c strrb.c \ - loggingrb.c crc8gen.c crc16gen.c crc32gen.c crc64gen.c + loggingrb.c crc8gen.c crc16gen.c crc32gen.c crc64gen.c \ + viterbi.c viterbi_gen.c BUILT_SOURCES = crc8gen.c crc16gen.c crc32gen.c crc64gen.c diff --git a/src/conv.c b/src/conv.c index f13deef..79b3a7c 100644 --- a/src/conv.c +++ b/src/conv.c @@ -238,6 +238,11 @@ osmo_conv_encode(const struct osmo_conv_code *code, #define MAX_AE 0x00ffffff +/* Forward declaration for accerlated decoding with certain codes */ +int +osmo_conv_decode_acc(const struct osmo_conv_code *code, + const sbit_t *input, ubit_t *output); + void osmo_conv_decode_init(struct osmo_conv_decoder *decoder, const struct osmo_conv_code *code, int len, int start_state) @@ -606,6 +611,10 @@ osmo_conv_decode(const struct osmo_conv_code *code, struct osmo_conv_decoder decoder; int rv, l; + /* Use accelerated implementation for supported codes */ + if ((code->N <= 4) && ((code->K == 5) || (code->K == 7))) + return osmo_conv_decode_acc(code, input, output); + osmo_conv_decode_init(&decoder, code, 0, 0); if (code->term == CONV_TERM_TAIL_BITING) { diff --git a/src/viterbi.c b/src/viterbi.c new file mode 100644 index 0000000..db8d5c8 --- /dev/null +++ b/src/viterbi.c @@ -0,0 +1,603 @@ +/* + * Viterbi decoder + * Copyright (C) 2013, 2014 Thomas Tsou <tom(a)tsou.cc> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "config.h" + +#include <stdlib.h> +#include <malloc.h> +#include <string.h> +#include <errno.h> +#include <osmocom/core/conv.h> + +/* Forward Metric Units */ +void gen_metrics_k5_n2(const int8_t *seq, const int16_t *out, + int16_t *sums, int16_t *paths, int norm); +void gen_metrics_k5_n3(const int8_t *seq, const int16_t *out, + int16_t *sums, int16_t *paths, int norm); +void gen_metrics_k5_n4(const int8_t *seq, const int16_t *out, + int16_t *sums, int16_t *paths, int norm); +void gen_metrics_k7_n2(const int8_t *seq, const int16_t *out, + int16_t *sums, int16_t *paths, int norm); +void gen_metrics_k7_n3(const int8_t *seq, const int16_t *out, + int16_t *sums, int16_t *paths, int norm); +void gen_metrics_k7_n4(const int8_t *seq, const int16_t *out, + int16_t *sums, int16_t *paths, int norm); +/* Trellis State + * state - Internal lshift register value + * prev - Register values of previous 0 and 1 states + */ +struct vstate { + unsigned state; + unsigned prev[2]; +}; + +/* Trellis Object + * num_states - Number of states in the trellis + * sums - Accumulated path metrics + * outputs - Trellis ouput values + * vals - Input value that led to each state + */ +struct vtrellis { + int num_states; + int16_t *sums; + int16_t *outputs; + uint8_t *vals; +}; + +/* Viterbi Decoder + * n - Code order + * k - Constraint length + * len - Horizontal length of trellis + * recursive - Set to '1' if the code is recursive + * intrvl - Normalization interval + * trellis - Trellis object + * punc - Puncturing sequence + * paths - Trellis paths + */ +struct vdecoder { + int n; + int k; + int len; + int recursive; + int intrvl; + struct vtrellis *trellis; + int *punc; + int16_t **paths; + + void (*metric_func)(const int8_t *, const int16_t *, + int16_t *, int16_t *, int); +}; + +/* Aligned Memory Allocator + * SSE requires 16-byte memory alignment. We store relevant trellis values + * (accumulated sums, outputs, and path decisions) as 16 bit signed integers + * so the allocated memory is casted as such. + */ +#define SSE_ALIGN 16 + +static int16_t *vdec_malloc(size_t n) +{ +#ifdef HAVE_SSE3 + return (int16_t *) memalign(SSE_ALIGN, sizeof(int16_t) * n); +#else + return (int16_t *) malloc(sizeof(int16_t) * n); +#endif +} + +/* Accessor calls */ +inline int conv_code_recursive(const struct osmo_conv_code *code) +{ + return code->next_term_output ? 1 : 0; +} + +/* Left shift and mask for finding the previous state */ +static unsigned vstate_lshift(unsigned reg, int k, int val) +{ + unsigned mask; + + if (k == 5) + mask = 0x0e; + else if (k == 7) + mask = 0x3e; + else + mask = 0; + + return ((reg << 1) & mask) | val; +} + +/* Bit endian manipulators */ +inline unsigned bitswap2(unsigned v) +{ + return ((v & 0x02) >> 1) | ((v & 0x01) << 1); +} + +inline unsigned bitswap3(unsigned v) +{ + return ((v & 0x04) >> 2) | ((v & 0x02) >> 0) | + ((v & 0x01) << 2); +} + +inline unsigned bitswap4(unsigned v) +{ + return ((v & 0x08) >> 3) | ((v & 0x04) >> 1) | + ((v & 0x02) << 1) | ((v & 0x01) << 3); +} + +inline unsigned bitswap5(unsigned v) +{ + return ((v & 0x10) >> 4) | ((v & 0x08) >> 2) | ((v & 0x04) >> 0) | + ((v & 0x02) << 2) | ((v & 0x01) << 4); +} + +inline unsigned bitswap6(unsigned v) +{ + return ((v & 0x20) >> 5) | ((v & 0x10) >> 3) | ((v & 0x08) >> 1) | + ((v & 0x04) << 1) | ((v & 0x02) << 3) | ((v & 0x01) << 5); +} + +static unsigned bitswap(unsigned v, unsigned n) +{ + switch (n) { + case 1: + return v; + case 2: + return bitswap2(v); + case 3: + return bitswap3(v); + case 4: + return bitswap4(v); + case 5: + return bitswap5(v); + case 6: + return bitswap6(v); + default: + break; + } + + return 0; +} + +/* Generate non-recursive state output from generator state table + * Note that the shift register moves right (i.e. the most recent bit is + * shifted into the register at k-1 bit of the register), which is typical + * textbook representation. The API transition table expects the most recent + * bit in the low order bit, or left shift. A bitswap operation is required + * to accommodate the difference. + */ +static unsigned gen_output(struct vstate *state, int val, + const struct osmo_conv_code *code) +{ + unsigned out, prev; + + prev = bitswap(state->prev[0], code->K - 1); + out = code->next_output[prev][val]; + out = bitswap(out, code->N); + + return out; +} + +#define BIT2NRZ(REG,N) (((REG >> N) & 0x01) * 2 - 1) * -1 + +/* Populate non-recursive trellis state + * For a given state defined by the k-1 length shift register, find the + * value of the input bit that drove the trellis to that state. Also + * generate the N outputs of the generator polynomial at that state. + */ +static int gen_state_info(uint8_t *val, unsigned reg, + int16_t *output, const struct osmo_conv_code *code) +{ + int i; + unsigned out; + struct vstate state; + + /* Previous '0' state */ + state.state = reg; + state.prev[0] = vstate_lshift(reg, code->K, 0); + state.prev[1] = vstate_lshift(reg, code->K, 1); + + *val = (reg >> (code->K - 2)) & 0x01; + + /* Transition output */ + out = gen_output(&state, *val, code); + + /* Unpack to NRZ */ + for (i = 0; i < code->N; i++) + output[i] = BIT2NRZ(out, i); + + return 0; +} + +/* Generate recursive state output from generator state table */ +static unsigned gen_recursive_output(struct vstate *state, + uint8_t *val, unsigned reg, + const struct osmo_conv_code *code, int pos) +{ + int val0, val1; + unsigned out, prev; + + /* Previous '0' state */ + prev = vstate_lshift(reg, code->K, 0); + prev = bitswap(prev, code->K - 1); + + /* Input value */ + val0 = (reg >> (code->K - 2)) & 0x01; + val1 = (code->next_term_output[prev] >> pos) & 0x01; + *val = val0 == val1 ? 0 : 1; + + /* Wrapper for osmocom state access */ + prev = bitswap(state->prev[0], code->K - 1); + + /* Compute the transition output */ + out = code->next_output[prev][*val]; + out = bitswap(out, code->N); + + return out; +} + +#define NUM_STATES(K) (K == 7 ? 64 : 16) + +/* Populate recursive trellis state + * The bit position of the systematic bit is not explicitly marked by the + * API, so it must be extracted from the generator table. Otherwise, + * populate the trellis similar to the non-recursive version. + * Non-systematic recursive codes are not supported. + */ +static int gen_recursive_state_info(uint8_t *val, + unsigned reg, + int16_t *output, + const struct osmo_conv_code *code) +{ + int i, j, pos = -1; + int ns = NUM_STATES(code->K); + unsigned out; + struct vstate state; + + /* Previous '0' and '1' states */ + state.state = reg; + state.prev[0] = vstate_lshift(reg, code->K, 0); + state.prev[1] = vstate_lshift(reg, code->K, 1); + + /* Find recursive bit location */ + for (i = 0; i < code->N; i++) { + for (j = 0; j < ns; j++) { + if ((code->next_output[j][0] >> i) & 0x01) + break; + } + if (j == ns) { + pos = i; + break; + } + } + + /* Non-systematic recursive code not supported */ + if (pos < 0) + return -EPROTO; + + /* Transition output */ + out = gen_recursive_output(&state, val, reg, code, pos); + + /* Unpack to NRZ */ + for (i = 0; i < code->N; i++) + output[i] = BIT2NRZ(out, i); + + return 0; +} + +/* Release the trellis */ +static void free_trellis(struct vtrellis *trellis) +{ + if (!trellis) + return; + + free(trellis->vals); + free(trellis->outputs); + free(trellis->sums); + free(trellis); +} + +/* Allocate and initialize the trellis object + * Initialization consists of generating the outputs and output value of a + * given state. Due to trellis symmetry and anti-symmetry, only one of the + * transition paths is utilized by the butterfly operation in the forward + * recursion, so only one set of N outputs is required per state variable. + */ +static struct vtrellis *generate_trellis(const struct osmo_conv_code *code) +{ + int i, rc = -1; + struct vtrellis *trellis; + int16_t *outputs; + + int ns = NUM_STATES(code->K); + int recursive = conv_code_recursive(code); + int olen = (code->N == 2) ? 2 : 4; + + trellis = (struct vtrellis *) calloc(1, sizeof(struct vtrellis)); + trellis->num_states = ns; + trellis->sums = vdec_malloc(ns); + trellis->outputs = vdec_malloc(ns * olen); + trellis->vals = (uint8_t *) malloc(ns * sizeof(uint8_t)); + + if (!trellis->sums || !trellis->outputs) + goto fail; + + /* Populate the trellis state objects */ + for (i = 0; i < ns; i++) { + outputs = &trellis->outputs[olen * i]; + + if (recursive) + rc = gen_recursive_state_info(&trellis->vals[i], + i, outputs, code); + else + rc = gen_state_info(&trellis->vals[i], + i, outputs, code); + } + + if (rc < 0) + goto fail; + + return trellis; +fail: + free_trellis(trellis); + return NULL; +} + +/* Reset decoder + * Set accumulated path metrics to zero. For termination other than + * tail-biting, initialize the zero state as the encoder starting state. + * Intialize with the maximum accumulated sum at length equal to the + * constraint length. + */ +static void reset_decoder(struct vdecoder *dec, int term) +{ + int ns = dec->trellis->num_states; + + memset(dec->trellis->sums, 0, sizeof(int16_t) * ns); + + if (term != CONV_TERM_TAIL_BITING) + dec->trellis->sums[0] = INT8_MAX * dec->n * dec->k; +} + +static void _traceback(struct vdecoder *dec, + unsigned state, uint8_t *out, int len) +{ + int i; + unsigned path; + + for (i = len - 1; i >= 0; i--) { + path = dec->paths[i][state] + 1; + out[i] = dec->trellis->vals[state]; + state = vstate_lshift(state, dec->k, path); + } +} + +static void _traceback_rec(struct vdecoder *dec, + unsigned state, uint8_t *out, int len) +{ + int i; + unsigned path; + + for (i = len - 1; i >= 0; i--) { + path = dec->paths[i][state] + 1; + out[i] = path ^ dec->trellis->vals[state]; + state = vstate_lshift(state, dec->k, path); + } +} + +/* Traceback and generate decoded output + * Find the largest accumulated path metric at the final state except for + * the zero terminated case, where we assume the final state is always zero. + */ +static int traceback(struct vdecoder *dec, uint8_t *out, int term, int len) +{ + int i, sum, max = -1; + unsigned path, state = 0; + + if (term != CONV_TERM_FLUSH) { + for (i = 0; i < dec->trellis->num_states; i++) { + sum = dec->trellis->sums[i]; + if (sum > max) { + max = sum; + state = i; + } + } + + if (max < 0) + return -EPROTO; + } + + for (i = dec->len - 1; i >= len; i--) { + path = dec->paths[i][state] + 1; + state = vstate_lshift(state, dec->k, path); + } + + if (dec->recursive) + _traceback_rec(dec, state, out, len); + else + _traceback(dec, state, out, len); + + return 0; +} + +/* Release decoder object */ +static void free_vdec(struct vdecoder *dec) +{ + if (!dec) + return; + + free(dec->paths[0]); + free(dec->paths); + free_trellis(dec->trellis); + free(dec); +} + +/* Allocate decoder object + * Subtract the constraint length K on the normalization interval to + * accommodate the initialization path metric at state zero. + */ +static struct vdecoder *alloc_vdec(const struct osmo_conv_code *code) +{ + int i, ns; + struct vdecoder *dec; + + ns = NUM_STATES(code->K); + + dec = (struct vdecoder *) calloc(1, sizeof(struct vdecoder)); + dec->n = code->N; + dec->k = code->K; + dec->recursive = conv_code_recursive(code); + dec->intrvl = INT16_MAX / (dec->n * INT8_MAX) - dec->k; + + if (dec->k == 5) { + switch (dec->n) { + case 2: + dec->metric_func = gen_metrics_k5_n2; + break; + case 3: + dec->metric_func = gen_metrics_k5_n3; + break; + case 4: + dec->metric_func = gen_metrics_k5_n4; + break; + default: + goto fail; + } + } else if (dec->k == 7) { + switch (dec->n) { + case 2: + dec->metric_func = gen_metrics_k7_n2; + break; + case 3: + dec->metric_func = gen_metrics_k7_n3; + break; + case 4: + dec->metric_func = gen_metrics_k7_n4; + break; + default: + goto fail; + } + } else { + goto fail; + } + + if (code->term == CONV_TERM_FLUSH) + dec->len = code->len + code->K - 1; + else + dec->len = code->len; + + dec->trellis = generate_trellis(code); + if (!dec->trellis) + goto fail; + + dec->paths = (int16_t **) malloc(sizeof(int16_t *) * dec->len); + dec->paths[0] = vdec_malloc(ns * dec->len); + for (i = 1; i < dec->len; i++) + dec->paths[i] = &dec->paths[0][i * ns]; + + return dec; +fail: + free_vdec(dec); + return NULL; +} + +/* Depuncture sequence with nagative value terminated puncturing matrix */ +static int depuncture(const int8_t *in, const int *punc, int8_t *out, int len) +{ + int i, n = 0, m = 0; + + for (i = 0; i < len; i++) { + if (i == punc[n]) { + out[i] = 0; + n++; + continue; + } + + out[i] = in[m++]; + } + + return 0; +} + +/* Forward trellis recursion + * Generate branch metrics and path metrics with a combined function. Only + * accumulated path metric sums and path selections are stored. Normalize on + * the interval specified by the decoder. + */ +static void _conv_decode(struct vdecoder *dec, const int8_t *seq, int _cnt) +{ + int i, len = dec->len; + struct vtrellis *trellis = dec->trellis; + + for (i = 0; i < len; i++) { + dec->metric_func(&seq[dec->n * i], + trellis->outputs, + trellis->sums, + dec->paths[i], + !(i % dec->intrvl)); + } +} + +/* Convolutional decode with a decoder object + * Initial puncturing run if necessary followed by the forward recursion. + * For tail-biting perform a second pass before running the backward + * traceback operation. + */ +static int conv_decode(struct vdecoder *dec, const int8_t *seq, + const int *punc, uint8_t *out, int len, int term) +{ + int cnt = 0; + int8_t depunc[dec->len * dec->n]; + + reset_decoder(dec, term); + + if (punc) { + depuncture(seq, punc, depunc, dec->len * dec->n); + seq = depunc; + } + + /* Propagate through the trellis with interval normalization */ + _conv_decode(dec, seq, cnt); + + if (term == CONV_TERM_TAIL_BITING) + _conv_decode(dec, seq, cnt); + + return traceback(dec, out, term, len); +} + +/* All-in-one viterbi decoding */ +int osmo_conv_decode_acc(const struct osmo_conv_code *code, + const sbit_t *input, ubit_t *output) +{ + int rc; + struct vdecoder *vdec; + + if ((code->N < 2) || (code->N > 4) || (code->len < 1) || + ((code->K != 5) && (code->K != 7))) + return -EINVAL; + + vdec = alloc_vdec(code); + if (!vdec) + return -EFAULT; + + rc = conv_decode(vdec, input, code->puncture, + output, code->len, code->term); + + free_vdec(vdec); + + return rc; +} diff --git a/src/viterbi_gen.c b/src/viterbi_gen.c new file mode 100644 index 0000000..894d5ae --- /dev/null +++ b/src/viterbi_gen.c @@ -0,0 +1,182 @@ +/* + * Viterbi decoder + * Copyright (C) 2013, 2014 Thomas Tsou <tom(a)tsou.cc> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include <stdint.h> +#include <string.h> + +/* Add-Compare-Select (ACS-Butterfly) + * Compute 4 accumulated path metrics and 4 path selections. Note that path + * selections are store as -1 and 0 rather than 0 and 1. This is to match + * the output format of the SSE packed compare instruction 'pmaxuw'. + */ +void acs_butterfly(int state, int num_states, + int16_t metric, int16_t *sum, + int16_t *new_sum, int16_t *path) +{ + int state0, state1; + int sum0, sum1, sum2, sum3; + + state0 = *(sum + (2 * state + 0)); + state1 = *(sum + (2 * state + 1)); + + sum0 = state0 + metric; + sum1 = state1 - metric; + sum2 = state0 - metric; + sum3 = state1 + metric; + + if (sum0 > sum1) { + *new_sum = sum0; + *path = -1; + } else { + *new_sum = sum1; + *path = 0; + } + + if (sum2 > sum3) { + *(new_sum + num_states / 2) = sum2; + *(path + num_states / 2) = -1; + } else { + *(new_sum + num_states / 2) = sum3; + *(path + num_states / 2) = 0; + } +} + +/* Branch metrics unit N=2 */ +void _gen_branch_metrics_n2(int num_states, const int8_t *seq, + const int16_t *out, int16_t *metrics) +{ + int i; + + for (i = 0; i < num_states / 2; i++) { + metrics[i] = seq[0] * out[2 * i + 0] + + seq[1] * out[2 * i + 1]; + } +} + +/* Branch metrics unit N=3 */ +void _gen_branch_metrics_n3(int num_states, const int8_t *seq, + const int16_t *out, int16_t *metrics) +{ + int i; + + for (i = 0; i < num_states / 2; i++) + metrics[i] = seq[0] * out[4 * i + 0] + + seq[1] * out[4 * i + 1] + + seq[2] * out[4 * i + 2]; +} + +/* Branch metrics unit N=4 */ +void _gen_branch_metrics_n4(int num_states, const int8_t *seq, + const int16_t *out, int16_t *metrics) +{ + int i; + + for (i = 0; i < num_states / 2; i++) + metrics[i] = seq[0] * out[4 * i + 0] + + seq[1] * out[4 * i + 1] + + seq[2] * out[4 * i + 2] + + seq[3] * out[4 * i + 3]; +} + +/* Path metric unit */ +void _gen_path_metrics(int num_states, int16_t *sums, + int16_t *metrics, int16_t *paths, int norm) +{ + int i; + int16_t min; + int16_t new_sums[num_states]; + + for (i = 0; i < num_states / 2; i++) { + acs_butterfly(i, num_states, metrics[i], + sums, &new_sums[i], &paths[i]); + } + + if (norm) { + min = new_sums[0]; + for (i = 1; i < num_states; i++) { + if (new_sums[i] < min) + min = new_sums[i]; + } + + for (i = 0; i < num_states; i++) + new_sums[i] -= min; + } + + memcpy(sums, new_sums, num_states * sizeof(int16_t)); +} + +/* 16-state branch-path metrics units (K=5) */ +void gen_metrics_k5_n2(const int8_t *seq, const int16_t *out, + int16_t *sums, int16_t *paths, int norm) +{ + int16_t metrics[8]; + + _gen_branch_metrics_n2(16, seq, out, metrics); + _gen_path_metrics(16, sums, metrics, paths, norm); +} + +void gen_metrics_k5_n3(const int8_t *seq, const int16_t *out, + int16_t *sums, int16_t *paths, int norm) +{ + int16_t metrics[8]; + + _gen_branch_metrics_n3(16, seq, out, metrics); + _gen_path_metrics(16, sums, metrics, paths, norm); + +} + +void gen_metrics_k5_n4(const int8_t *seq, const int16_t *out, + int16_t *sums, int16_t *paths, int norm) +{ + int16_t metrics[8]; + + _gen_branch_metrics_n4(16, seq, out, metrics); + _gen_path_metrics(16, sums, metrics, paths, norm); + +} + +/* 64-state branch-path metrics units (K=7) */ +void gen_metrics_k7_n2(const int8_t *seq, const int16_t *out, + int16_t *sums, int16_t *paths, int norm) +{ + int16_t metrics[32]; + + _gen_branch_metrics_n2(64, seq, out, metrics); + _gen_path_metrics(64, sums, metrics, paths, norm); + +} + +void gen_metrics_k7_n3(const int8_t *seq, const int16_t *out, + int16_t *sums, int16_t *paths, int norm) +{ + int16_t metrics[32]; + + _gen_branch_metrics_n3(64, seq, out, metrics); + _gen_path_metrics(64, sums, metrics, paths, norm); + +} + +void gen_metrics_k7_n4(const int8_t *seq, const int16_t *out, + int16_t *sums, int16_t *paths, int norm) +{ + int16_t metrics[32]; + + _gen_branch_metrics_n4(64, seq, out, metrics); + _gen_path_metrics(64, sums, metrics, paths, norm); +} -- 1.9.0

11 years, 1 month

PDP deactivation on a particular cell phone--can anybody reply please

by ottawa ottawa

Hi Gurus I am using OpenBSC/GPRS with nanoBTS. Thanks everybody for the great work. GPRS works well with many cell phone, but for particular cell phone its not working. I saw Olaf Schulz posting (subject: GPRS problems with Nokia Handsets dated 4th May 2012). Saw his pcap file and mine is similar too. Frank Mass suggested a patch to overcome this problem in his posting (subject gprs_llc.c foreighn TLLI is stored but not searched, dated 30 April 2012). I have implemented that patch but still not working. Can any body suggest something. Please find the osmo-sgsn trace <0011> gprs_bssgp.c:376 BSSGP TLLI=0xabfafd41 Rx UPLINK-UNITDATA <0012> gprs_llc.c:551 LLC SAPI=1 C FCS=0x76d7d9CMD=UI DATA <0012> gprs_llc.c:95 TLLI 0xabfafd41 is foreign, converting to local TLLI 0xebfafd41 <0012> gprs_llc.c:245 LLC RX: unknown TLLI 0xabfafd41, creating LLME on the fly <0011> gprs_bssgp.c:753 BSSGP BVCI=2 Rx Flow Control BVC <0011> gprs_bssgp.c:376 BSSGP TLLI=0xabfafd41 Rx UPLINK-UNITDATA <0012> gprs_llc.c:551 LLC SAPI=1 R FCS=0x57768eCMD=XID DATA <0011> gprs_bssgp.c:376 BSSGP TLLI=0xabfafd41 Rx UPLINK-UNITDATA <0012> gprs_llc.c:551 LLC SAPI=1 C FCS=0x9ab10aCMD=UI DATA <0012> gprs_llc.c:598 TLLI=abfafd41 dropping UI, N(U=0) not in window V(URV(UR:3). <0011> gprs_bssgp.c:753 BSSGP BVCI=2 Rx Flow Control BVC <0011> gprs_bssgp.c:753 BSSGP BVCI=2 Rx Flow Control BVC <0011> gprs_bssgp.c:376 BSSGP TLLI=0x7d3b00c1 Rx UPLINK-UNITDATA <0012> gprs_llc.c:551 LLC SAPI=1 C FCS=0xfd5011CMD=UI DATA <0012> gprs_llc.c:245 LLC RX: unknown TLLI 0x7d3b00c1, creating LLME on the fly <0011> gprs_bssgp.c:753 BSSGP BVCI=2 Rx Flow Control BVC <0011> gprs_bssgp.c:376 BSSGP TLLI=0x7d3b00c1 Rx UPLINK-UNITDATA <0012> gprs_llc.c:551 LLC SAPI=1 C FCS=0x11fb2fCMD=UI DATA <0011> gprs_bssgp.c:376 BSSGP TLLI=0x7d3b00c1 Rx UPLINK-UNITDATA <0012> gprs_llc.c:551 LLC SAPI=1 C FCS=0xea1c55CMD=UI DATA <0011> gprs_bssgp.c:753 BSSGP BVCI=2 Rx Flow Control BVC <0011> gprs_bssgp.c:753 BSSGP BVCI=2 Rx Flow Control BVC <0011> gprs_bssgp.c:376 BSSGP TLLI=0xe23c0990 Rx UPLINK-UNITDATA <0012> gprs_llc.c:551 LLC SAPI=1 C FCS=0x2a6a81CMD=UI DATA <000f> sgsn_libgtp.c:126 Create PDP Context <000f> sgsn_libgtp.c:379 libgtp cb_conf(type=16, cause=128, pdp=0x7feafc152320, cbp=0x6bcf50) <000f> sgsn_libgtp.c:265 Received CREATE PDP CTX CONF, cause=128(Request accepted) <0013> gprs_sndcp.c:297 SNSM-ACTIVATE.ind (lle=0x6bbe60 TLLI=e23c0990, SAPI=3, NSAPI=5) <0011> gprs_bssgp.c:753 BSSGP BVCI=2 Rx Flow Control BVC <0011> gprs_bssgp.c:753 BSSGP BVCI=2 Rx Flow Control BVC <0011> gprs_bssgp.c:753 BSSGP BVCI=2 Rx Flow Control BVC <0011> gprs_bssgp.c:376 BSSGP TLLI=0xe23c0990 Rx UPLINK-UNITDATA <0012> gprs_llc.c:551 LLC SAPI=1 C FCS=0x819789CMD=UI DATA <000f> sgsn_libgtp.c:212 Delete PDP Context <000f> sgsn_libgtp.c:402 PDP Context was deleted <000f> sgsn_libgtp.c:379 libgtp cb_conf(type=20, cause=128, pdp=(nil), cbp=0x6bcf50) <000f> sgsn_libgtp.c:321 Received DELETE PDP CTX CONF, cause=128(Request accepted) <0013> gprs_sndcp.c:320 SNSM-DEACTIVATE.ind (lle=0x6bbe60, TLLI=e23c0990, SAPI=3, NSAPI=5) John

11 years, 1 month

[osmo-bts PATCH] TRX: Remove extra TCH/HS puncturing value

by Thomas Tsou

3GPP TS 05.03 "Channel coding" specifies the puncturing matrix (1,0,1) for class 1 information bits and tail bits valued u(0) to u(103) for a maximum puncturing index of 311. The puncturing index 313 exceeds the maximum index and causes osmo_conv_get_output_length() to output the improper length of 210 instead of 211. Signed-off-by: Thomas Tsou <tom(a)tsou.cc> --- src/osmo-bts-trx/gsm0503_conv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/osmo-bts-trx/gsm0503_conv.c b/src/osmo-bts-trx/gsm0503_conv.c index 2a814ca..dc50e6c 100644 --- a/src/osmo-bts-trx/gsm0503_conv.c +++ b/src/osmo-bts-trx/gsm0503_conv.c @@ -139,7 +139,7 @@ static const int conv_tch_hr_puncture[] = { 253, 256, 259, 262, 265, 268, 271, 274, 277, 280, 283, /* Tail bits */ - 295, 298, 301, 304, 307, 310, 313, + 295, 298, 301, 304, 307, 310, /* End */ -1, -- 1.9.0

11 years, 1 month

[PATCH 2/2] In BSD IP_RECVIF can be used as analogue of the Linux socket option SO_BINDTODEVICE.

by Nikola Kolev

--- openbsc/src/ipaccess/ipaccess-find.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/openbsc/src/ipaccess/ipaccess-find.c b/openbsc/src/ipaccess/ipaccess-find.c index bb9819e..c8de157 100644 --- a/openbsc/src/ipaccess/ipaccess-find.c +++ b/openbsc/src/ipaccess/ipaccess-find.c @@ -41,8 +41,13 @@ static int udp_sock(const char *ifname) return fd; if (ifname) { +#ifdef __FreeBSD__ + rc = setsockopt(fd, SOL_SOCKET, IP_RECVIF, ifname, + strlen(ifname)); +#else rc = setsockopt(fd, SOL_SOCKET, SO_BINDTODEVICE, ifname, strlen(ifname)); +#endif if (rc < 0) goto err; } -- 1.9.2

11 years, 1 month

[PATCH 1/2] FreeBSD uses POSIX netinet/in.h for representing socket addresses data types.

by Nikola Kolev

--- openbsc/include/openbsc/bsc_msc.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/openbsc/include/openbsc/bsc_msc.h b/openbsc/include/openbsc/bsc_msc.h index 0adbd26..ee867af 100644 --- a/openbsc/include/openbsc/bsc_msc.h +++ b/openbsc/include/openbsc/bsc_msc.h @@ -22,6 +22,10 @@ #ifndef BSC_MSC_H #define BSC_MSC_H +#ifdef __FreeBSD__ +#include <netinet/in.h> +#endif + #include <osmocom/core/write_queue.h> #include <osmocom/core/timer.h> -- 1.9.2

11 years, 1 month

[PATCH] openbsc: Fix for FreeBSD

by Nikola Kolev

Fix for FreeBSD. -- Nikola

11 years, 1 month

[PATCH] openbsc/src/ipaccess/ipaccess-find.c: FreeBSD uses IP_SENDIF as analog of the Linux socket option SO_BINDTODEVICE

by Nikola Kolev

IP_SENDIF is broadly an analogue of the Linux socket option SO_BINDTODEVICE. It is used to bypass the traditional BSD source interface selection logic. It is a sledgehammer hack used to output datagrams on a specific interface which may not yet have an address, e.g. for DHCP. -- Nikola

11 years, 1 month

[PATCH] openbsc/include/openbsc/bsc_msc.h: FreeBSD uses POSIX netinet/in.h for representing socket addresses data types

by Nikola Kolev

FreeBSD uses POSIX netinet/in.h for representing socket addresses data types. The header file is available on Linux also. -- Nikola

11 years, 1 month

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

OpenBSC May 2014