Osmocom Open Build Service

osmo-bsc.spec Changed

commit_4454350b4278e8a471aa93de2c1146c70a491bbf.txt Added

commit_c3446ef49e90c1a9e8aad3b888e37f58ddcd968d.txt Deleted

osmo-bsc_1.11.0.6.c3446.dsc -> osmo-bsc_1.11.0.9.44543.dsc Changed

@@ -2,7 +2,7 @@
 Source: osmo-bsc
 Binary: osmo-bsc, osmo-bsc-dbg, abisip-find, osmo-bsc-ipaccess-utils, osmo-bsc-bs11-utils, osmo-bsc-meas-utils, osmo-bsc-doc
 Architecture: any all
-Version: 1.11.0.6.c3446
+Version: 1.11.0.9.44543
 Maintainer: Osmocom team <openbsc@lists.osmocom.org>
 Homepage: https://projects.osmocom.org/projects/osmo-bsc
 Standards-Version: 3.9.8
@@ -18,8 +18,8 @@
  osmo-bsc-ipaccess-utils deb net extra arch=any
  osmo-bsc-meas-utils deb net extra arch=any
 Checksums-Sha1:
- 12a4ae64262619d6cfd5a391c4044871f3ca3079 617416 osmo-bsc_1.11.0.6.c3446.tar.xz
+ a807cba2032ac4e71e778916644ea4bf6fcbfb6a 617392 osmo-bsc_1.11.0.9.44543.tar.xz
 Checksums-Sha256:
- 806e3b2f20075d06a95b6eddf1af2c4c29cb1597f20724818b66f87b804ddc93 617416 osmo-bsc_1.11.0.6.c3446.tar.xz
+ 305032f1d1e8a7c2f9c650672c7b4291ad74381c5ae440e76e8512871a87960b 617392 osmo-bsc_1.11.0.9.44543.tar.xz
 Files:
- 05082e15a7bb01ff2c14367ae2822c81 617416 osmo-bsc_1.11.0.6.c3446.tar.xz
+ 2d741ee41ea1fd13e5d448bceca06b0c 617392 osmo-bsc_1.11.0.9.44543.tar.xz

osmo-bsc_1.11.0.6.c3446.tar.xz/.tarball-version -> osmo-bsc_1.11.0.9.44543.tar.xz/.tarball-version Changed

osmo-bsc_1.11.0.6.c3446.tar.xz/debian/changelog -> osmo-bsc_1.11.0.9.44543.tar.xz/debian/changelog Changed

osmo-bsc_1.11.0.6.c3446.tar.xz/include/osmocom/bsc/gsm_data.h -> osmo-bsc_1.11.0.9.44543.tar.xz/include/osmocom/bsc/gsm_data.h Changed

osmo-bsc_1.11.0.6.c3446.tar.xz/src/osmo-bsc/bts_ipaccess_nanobts.c -> osmo-bsc_1.11.0.9.44543.tar.xz/src/osmo-bsc/bts_ipaccess_nanobts.c Changed

@@ -195,156 +195,65 @@
 /* Callback function to be called every time we receive a 12.21 SW activated report */
 static int sw_activ_rep(struct msgb *mb)
 {
-	struct abis_om_fom_hdr *foh = msgb_l3(mb);
+	const struct abis_om_fom_hdr *foh = msgb_l3(mb);
 	struct e1inp_sign_link *sign_link = mb->dst;
 	struct gsm_bts *bts = sign_link->trx->bts;
-	struct gsm_bts_trx *trx;
-	struct gsm_gprs_nsvc *nsvc;
-	struct gsm_bts_trx_ts *ts;
+	struct gsm_abis_mo *mo;
+	struct tlv_parsed tp;
 
 	if (!is_ipa_abisip_bts(bts))
 		return 0;
 
-	switch (foh->obj_class) {
-	case NM_OC_SITE_MANAGER:
-		osmo_fsm_inst_dispatch(bts->site_mgr->mo.fi, NM_EV_SW_ACT_REP, NULL);
-		break;
-	case NM_OC_BTS:
-		osmo_fsm_inst_dispatch(bts->mo.fi, NM_EV_SW_ACT_REP, NULL);
-		break;
-	case NM_OC_BASEB_TRANSC:
-		if (!(trx = gsm_bts_trx_num(bts, foh->obj_inst.trx_nr)))
-			return -EINVAL;
-		osmo_fsm_inst_dispatch(trx->bb_transc.mo.fi, NM_EV_SW_ACT_REP, NULL);
-		break;
-	case NM_OC_RADIO_CARRIER:
-		if (!(trx = gsm_bts_trx_num(bts, foh->obj_inst.trx_nr)))
-			return -EINVAL;
-		osmo_fsm_inst_dispatch(trx->mo.fi, NM_EV_SW_ACT_REP, NULL);
-		break;
-	case NM_OC_CHANNEL:
-		if (!(ts = abis_nm_get_ts(mb)))
-			return -EINVAL;
-		osmo_fsm_inst_dispatch(ts->mo.fi, NM_EV_SW_ACT_REP, NULL);
-		break;
-	case NM_OC_GPRS_NSE:
-		osmo_fsm_inst_dispatch(bts->site_mgr->gprs.nse.mo.fi, NM_EV_SW_ACT_REP, NULL);
-		break;
-	case NM_OC_GPRS_CELL:
-		osmo_fsm_inst_dispatch(bts->gprs.cell.mo.fi, NM_EV_SW_ACT_REP, NULL);
-		break;
-	case NM_OC_GPRS_NSVC:
-		if (!(nsvc = gsm_bts_sm_nsvc_num(bts->site_mgr, foh->obj_inst.trx_nr)))
-			return -EINVAL;
-		osmo_fsm_inst_dispatch(nsvc->mo.fi, NM_EV_SW_ACT_REP, NULL);
-		break;
+	mo = gsm_objclass2mo(bts, foh->obj_class, &foh->obj_inst);
+	if (mo == NULL) {
+		LOGPFOH(DNM, LOGL_ERROR, foh, "Rx SW activated report for non-existent MO\n");
+		return -ENOENT;
 	}
-	return 0;
-}
 
-static void nm_rx_opstart_ack_chan(struct msgb *oml_msg)
-{
-	struct gsm_bts_trx_ts *ts;
-	ts = abis_nm_get_ts(oml_msg);
-	if (!ts)
-		/* error already logged in abis_nm_get_ts() */
-		return;
-	if (!ts->fi) {
-		LOG_TS(ts, LOGL_ERROR, "Channel OPSTART ACK for uninitialized TS\n");
-		return;
+	if (abis_nm_tlv_parse(&tp, bts, &foh->data0, msgb_l3len(mb) - sizeof(*foh)) < 0) {
+		LOGPFOH(DNM, LOGL_ERROR, foh, "%s(): tlv_parse failed\n", __func__);
+		return -EINVAL;
 	}
-	osmo_fsm_inst_dispatch(ts->mo.fi, NM_EV_OPSTART_ACK, NULL);
+
+	mo->ipaccess.obj_version = 0; /* implicit default */
+	if (TLVP_PRES_LEN(&tp, NM_ATT_IPACC_OBJ_VERSION, 1)) {
+		/* nanoBTS may report several Object Versions;  the first one will
+		 * be used by default unless requested explicitly before OPSTARTing. */
+		mo->ipaccess.obj_version = *TLVP_VAL(&tp, NM_ATT_IPACC_OBJ_VERSION);
+		LOGPFOH(DNM, LOGL_INFO, foh, "IPA Object Version is %u (default)\n",
+			mo->ipaccess.obj_version);
+	}
+
+	osmo_fsm_inst_dispatch(mo->fi, NM_EV_SW_ACT_REP, NULL);
+	return 0;
 }
 
 static void nm_rx_opstart_ack(struct msgb *oml_msg)
 {
-	struct abis_om_fom_hdr *foh = msgb_l3(oml_msg);
+	const struct abis_om_fom_hdr *foh = msgb_l3(oml_msg);
 	struct e1inp_sign_link *sign_link = oml_msg->dst;
 	struct gsm_bts *bts = sign_link->trx->bts;
-	struct gsm_bts_trx *trx;
-	struct gsm_gprs_nsvc *nsvc;
+	struct gsm_abis_mo *mo;
 
-	switch (foh->obj_class) {
-	case NM_OC_SITE_MANAGER:
-		osmo_fsm_inst_dispatch(bts->site_mgr->mo.fi, NM_EV_OPSTART_ACK, NULL);
-		break;
-	case NM_OC_BTS:
-		osmo_fsm_inst_dispatch(bts->mo.fi, NM_EV_OPSTART_ACK, NULL);
-		break;
-	case NM_OC_RADIO_CARRIER:
-		if (!(trx = gsm_bts_trx_num(bts, foh->obj_inst.trx_nr)))
-			return;
-		osmo_fsm_inst_dispatch(trx->mo.fi, NM_EV_OPSTART_ACK, NULL);
-		break;
-	case NM_OC_BASEB_TRANSC:
-		if (!(trx = gsm_bts_trx_num(bts, foh->obj_inst.trx_nr)))
-			return;
-		osmo_fsm_inst_dispatch(trx->bb_transc.mo.fi, NM_EV_OPSTART_ACK, NULL);
-		break;
-	case NM_OC_CHANNEL:
-		nm_rx_opstart_ack_chan(oml_msg);
-		break;
-	case NM_OC_GPRS_NSE:
-		osmo_fsm_inst_dispatch(bts->site_mgr->gprs.nse.mo.fi, NM_EV_OPSTART_ACK, NULL);
-		break;
-	case NM_OC_GPRS_CELL:
-		osmo_fsm_inst_dispatch(bts->gprs.cell.mo.fi, NM_EV_OPSTART_ACK, NULL);
-		break;
-	case NM_OC_GPRS_NSVC:
-		if (!(nsvc = gsm_bts_sm_nsvc_num(bts->site_mgr, foh->obj_inst.trx_nr)))
-			return;
-		osmo_fsm_inst_dispatch(nsvc->mo.fi, NM_EV_OPSTART_ACK, NULL);
-		break;
-	default:
-		break;
-	}
+	mo = gsm_objclass2mo(bts, foh->obj_class, &foh->obj_inst);
+	if (mo == NULL)
+		LOGPFOH(DNM, LOGL_ERROR, foh, "Rx OPSTART ACK for non-existent MO\n");
+	else
+		osmo_fsm_inst_dispatch(mo->fi, NM_EV_OPSTART_ACK, NULL);
 }
 
 static void nm_rx_opstart_nack(struct msgb *oml_msg)
 {
-	struct abis_om_fom_hdr *foh = msgb_l3(oml_msg);
+	const struct abis_om_fom_hdr *foh = msgb_l3(oml_msg);
 	struct e1inp_sign_link *sign_link = oml_msg->dst;
 	struct gsm_bts *bts = sign_link->trx->bts;
-	struct gsm_bts_trx *trx;
-	struct gsm_bts_trx_ts *ts;
-	struct gsm_gprs_nsvc *nsvc;
-
-	switch (foh->obj_class) {
-	case NM_OC_SITE_MANAGER:
-		osmo_fsm_inst_dispatch(bts->site_mgr->mo.fi, NM_EV_OPSTART_NACK, NULL);
-		break;
-	case NM_OC_BTS:
-		osmo_fsm_inst_dispatch(bts->mo.fi, NM_EV_OPSTART_ACK, NULL);
-		break;
-	case NM_OC_RADIO_CARRIER:
-		if (!(trx = gsm_bts_trx_num(bts, foh->obj_inst.trx_nr)))
-			return;
-		osmo_fsm_inst_dispatch(trx->mo.fi, NM_EV_OPSTART_NACK, NULL);
-		break;
-	case NM_OC_BASEB_TRANSC:
-		if (!(trx = gsm_bts_trx_num(bts, foh->obj_inst.trx_nr)))
-			return;
-		osmo_fsm_inst_dispatch(trx->bb_transc.mo.fi, NM_EV_OPSTART_NACK, NULL);
-		break;
-	case NM_OC_CHANNEL:
-		if (!(ts = abis_nm_get_ts(oml_msg)))
-			return;
-		osmo_fsm_inst_dispatch(ts->mo.fi, NM_EV_OPSTART_NACK, NULL);
-		break;
-	case NM_OC_GPRS_NSE:
-		osmo_fsm_inst_dispatch(bts->site_mgr->gprs.nse.mo.fi, NM_EV_OPSTART_NACK, NULL);
-		break;
-	case NM_OC_GPRS_CELL:
-		osmo_fsm_inst_dispatch(bts->gprs.cell.mo.fi, NM_EV_OPSTART_NACK, NULL);
-		break;
-	case NM_OC_GPRS_NSVC:
-		if (!(nsvc = gsm_bts_sm_nsvc_num(bts->site_mgr, foh->obj_inst.trx_nr)))
-			return;
-		osmo_fsm_inst_dispatch(nsvc->mo.fi, NM_EV_OPSTART_NACK, NULL);
-		break;
-	default:
-		break;
-	}
+	struct gsm_abis_mo *mo;
+
+	mo = gsm_objclass2mo(bts, foh->obj_class, &foh->obj_inst);
+	if (mo == NULL)
+		LOGPFOH(DNM, LOGL_ERROR, foh, "Rx OPSTART NACK for non-existent MO\n");
+	else
+		osmo_fsm_inst_dispatch(mo->fi, NM_EV_OPSTART_NACK, NULL);
 }
 
 static void nm_rx_get_attr_rep(struct msgb *oml_msg)
@@ -352,20 +261,13 @@
 	struct abis_om_fom_hdr *foh = msgb_l3(oml_msg);
 	struct e1inp_sign_link *sign_link = oml_msg->dst;
 	struct gsm_bts *bts = sign_link->trx->bts;
-	struct gsm_bts_trx *trx;
+	struct gsm_abis_mo *mo;

osmo-bsc_1.11.0.6.c3446.tar.xz/src/osmo-bsc/gsm_data.c -> osmo-bsc_1.11.0.9.44543.tar.xz/src/osmo-bsc/gsm_data.c Changed

@@ -327,85 +327,56 @@
 }
 
 /* obtain the MO structure for a given object instance */
-static inline struct gsm_abis_mo *
-gsm_objclass2mo(struct gsm_bts *bts, uint8_t obj_class,
-	    const struct abis_om_obj_inst *obj_inst)
+struct gsm_abis_mo *gsm_objclass2mo(struct gsm_bts *bts, uint8_t obj_class,
+				    const struct abis_om_obj_inst *obj_inst)
 {
 	struct gsm_bts_trx *trx;
-	struct gsm_abis_mo *mo = NULL;
 
 	switch (obj_class) {
 	case NM_OC_BTS:
-		mo = &bts->mo;
-		break;
+		return &bts->mo;
 	case NM_OC_RADIO_CARRIER:
-		if (obj_inst->trx_nr >= bts->num_trx) {
-			return NULL;
-		}
 		trx = gsm_bts_trx_num(bts, obj_inst->trx_nr);
-		mo = &trx->mo;
-		break;
+		return trx != NULL ? &trx->mo : NULL;
 	case NM_OC_BASEB_TRANSC:
-		if (obj_inst->trx_nr >= bts->num_trx) {
-			return NULL;
-		}
 		trx = gsm_bts_trx_num(bts, obj_inst->trx_nr);
-		mo = &trx->bb_transc.mo;
-		break;
+		return trx != NULL ? &trx->bb_transc.mo : NULL;
 	case NM_OC_CHANNEL:
-		if (obj_inst->trx_nr >= bts->num_trx) {
-			return NULL;
-		}
-		trx = gsm_bts_trx_num(bts, obj_inst->trx_nr);
 		if (obj_inst->ts_nr >= TRX_NR_TS)
 			return NULL;
-		mo = &trx->tsobj_inst->ts_nr.mo;
-		break;
+		trx = gsm_bts_trx_num(bts, obj_inst->trx_nr);
+		return trx != NULL ? &trx->tsobj_inst->ts_nr.mo : NULL;
 	case NM_OC_SITE_MANAGER:
-		mo = &bts->site_mgr->mo;
-		break;
+		return &bts->site_mgr->mo;
 	case NM_OC_BS11:
 		switch (obj_inst->bts_nr) {
 		case BS11_OBJ_CCLK:
-			mo = &bts->bs11.cclk.mo;
-			break;
+			return &bts->bs11.cclk.mo;
 		case BS11_OBJ_BBSIG:
-			if (obj_inst->ts_nr > bts->num_trx)
-				return NULL;
 			trx = gsm_bts_trx_num(bts, obj_inst->trx_nr);
-			mo = &trx->bs11.bbsig.mo;
-			break;
+			return trx != NULL ? &trx->bs11.bbsig.mo : NULL;
 		case BS11_OBJ_PA:
-			if (obj_inst->ts_nr > bts->num_trx)
-				return NULL;
 			trx = gsm_bts_trx_num(bts, obj_inst->trx_nr);
-			mo = &trx->bs11.pa.mo;
-			break;
-		default:
-			return NULL;
+			return trx != NULL ? &trx->bs11.pa.mo : NULL;
 		}
 		break;
 	case NM_OC_BS11_RACK:
-		mo = &bts->bs11.rack.mo;
-		break;
+		return &bts->bs11.rack.mo;
 	case NM_OC_BS11_ENVABTSE:
 		if (obj_inst->trx_nr >= ARRAY_SIZE(bts->bs11.envabtse))
 			return NULL;
-		mo = &bts->bs11.envabtseobj_inst->trx_nr.mo;
-		break;
+		return &bts->bs11.envabtseobj_inst->trx_nr.mo;
 	case NM_OC_GPRS_NSE:
-		mo = &bts->site_mgr->gprs.nse.mo;
-		break;
+		return &bts->site_mgr->gprs.nse.mo;
 	case NM_OC_GPRS_CELL:
-		mo = &bts->gprs.cell.mo;
-		break;
+		return &bts->gprs.cell.mo;
 	case NM_OC_GPRS_NSVC:
 		if (obj_inst->trx_nr >= ARRAY_SIZE(bts->site_mgr->gprs.nsvc))
 			return NULL;
-		mo = &bts->site_mgr->gprs.nsvcobj_inst->trx_nr.mo;
-		break;
+		return &bts->site_mgr->gprs.nsvcobj_inst->trx_nr.mo;
 	}
-	return mo;
+
+	return NULL;
 }
 
 /* obtain the gsm_nm_state data structure for a given object instance */

Changes of Revision 185