Projects
osmocom:master
osmo-bts
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 74
View file
osmo-bts.spec
Changed
@@ -14,13 +14,13 @@ Name: osmo-bts Requires: osmocom-master -Version: 1.6.0.64.c12b +Version: 1.6.0.65.c4a1 Release: 0 Summary: Osmocom BTS-Side code (Abis, scheduling) License: AGPL-3.0-or-later AND GPL-2.0-only Group: Productivity/Telephony/Servers URL: https://osmocom.org/projects/osmobts -Source: osmo-bts_1.6.0.64.c12b.tar.xz +Source: osmo-bts_1.6.0.65.c4a1.tar.xz Source1: rpmlintrc BuildRequires: autoconf BuildRequires: automake
View file
commit_c12bc93db8c968700c18a25d6a85a23f77fbf555.txt
Deleted
View file
commit_c4a17d35ecea72c0b50bc1ac030a6693f8be8262.txt
Added
View file
osmo-bts_1.6.0.64.c12b.dsc
Deleted
@@ -1,24 +0,0 @@ -Format: 3.0 (native) -Source: osmo-bts -Binary: osmo-bts, osmo-bts-trx, osmo-bts-trx-dbg, osmo-bts-virtual, osmo-bts-virtual-dbg, osmo-bts-doc -Architecture: any all -Version: 1.6.0.64.c12b -Maintainer: Osmocom team <openbsc@lists.osmocom.org> -Homepage: https://projects.osmocom.org/projects/osmobts -Standards-Version: 3.9.8 -Vcs-Browser: https://gitea.osmocom.org/cellular-infrastructure/osmo-bts -Vcs-Git: https://gitea.osmocom.org/cellular-infrastructure/osmo-bts -Build-Depends: debhelper (>= 9), pkg-config, dh-autoreconf, autotools-dev, libosmocore-dev (>= 1.8.0), libosmo-abis-dev (>= 1.4.0), libosmo-netif-dev (>= 1.3.0), libgps-dev, txt2man, osmo-gsm-manuals-dev (>= 1.4.0) -Package-List: - osmo-bts deb net optional arch=any - osmo-bts-doc deb doc optional arch=all - osmo-bts-trx deb net optional arch=any - osmo-bts-trx-dbg deb debug extra arch=any - osmo-bts-virtual deb net optional arch=any - osmo-bts-virtual-dbg deb debug extra arch=any -Checksums-Sha1: - 6ea7946e2a9de0003fcfe26bb37fb43b61188603 467604 osmo-bts_1.6.0.64.c12b.tar.xz -Checksums-Sha256: - 925fb7faa5c663f37f0c78329963ffcbb985d088c30477684d3702fee4f6b2a2 467604 osmo-bts_1.6.0.64.c12b.tar.xz -Files: - a2fe4dfa3ba39e4b2d75177f115df39a 467604 osmo-bts_1.6.0.64.c12b.tar.xz
View file
osmo-bts_1.6.0.65.c4a1.dsc
Added
@@ -0,0 +1,24 @@ +Format: 3.0 (native) +Source: osmo-bts +Binary: osmo-bts, osmo-bts-trx, osmo-bts-trx-dbg, osmo-bts-virtual, osmo-bts-virtual-dbg, osmo-bts-doc +Architecture: any all +Version: 1.6.0.65.c4a1 +Maintainer: Osmocom team <openbsc@lists.osmocom.org> +Homepage: https://projects.osmocom.org/projects/osmobts +Standards-Version: 3.9.8 +Vcs-Browser: https://gitea.osmocom.org/cellular-infrastructure/osmo-bts +Vcs-Git: https://gitea.osmocom.org/cellular-infrastructure/osmo-bts +Build-Depends: debhelper (>= 9), pkg-config, dh-autoreconf, autotools-dev, libosmocore-dev (>= 1.8.0), libosmo-abis-dev (>= 1.4.0), libosmo-netif-dev (>= 1.3.0), libgps-dev, txt2man, osmo-gsm-manuals-dev (>= 1.4.0) +Package-List: + osmo-bts deb net optional arch=any + osmo-bts-doc deb doc optional arch=all + osmo-bts-trx deb net optional arch=any + osmo-bts-trx-dbg deb debug extra arch=any + osmo-bts-virtual deb net optional arch=any + osmo-bts-virtual-dbg deb debug extra arch=any +Checksums-Sha1: + dd4bddbc8449f476caee93a708eea8b11b0ad9af 468280 osmo-bts_1.6.0.65.c4a1.tar.xz +Checksums-Sha256: + b811788b471122ccf3df999b470c44382c0117ae8e6c2d555139a28b5d02dc9c 468280 osmo-bts_1.6.0.65.c4a1.tar.xz +Files: + e5c89fb6b6fea12256cdf1ebe6980ba6 468280 osmo-bts_1.6.0.65.c4a1.tar.xz
View file
osmo-bts_1.6.0.64.c12b.tar.xz/.tarball-version -> osmo-bts_1.6.0.65.c4a1.tar.xz/.tarball-version
Changed
@@ -1 +1 @@ -1.6.0.64-c12b +1.6.0.65-c4a1
View file
osmo-bts_1.6.0.64.c12b.tar.xz/debian/changelog -> osmo-bts_1.6.0.65.c4a1.tar.xz/debian/changelog
Changed
@@ -1,8 +1,8 @@ -osmo-bts (1.6.0.64.c12b) unstable; urgency=medium +osmo-bts (1.6.0.65.c4a1) unstable; urgency=medium * Automatically generated changelog entry for building the Osmocom master feed - -- Osmocom OBS scripts <info@osmocom.org> Wed, 05 Apr 2023 12:22:40 +0000 + -- Osmocom OBS scripts <info@osmocom.org> Wed, 05 Apr 2023 17:09:47 +0000 osmo-bts (1.6.0) unstable; urgency=medium
View file
osmo-bts_1.6.0.64.c12b.tar.xz/include/osmo-bts/nm_common_fsm.h -> osmo-bts_1.6.0.65.c4a1.tar.xz/include/osmo-bts/nm_common_fsm.h
Changed
@@ -30,6 +30,7 @@ /* Common */ enum nm_fsm_events { NM_EV_SW_ACT, + NM_EV_RX_SETATTR, /* data: struct nm_fsm_ev_setattr_data */ NM_EV_SETATTR_ACK, /* data: struct nm_fsm_ev_setattr_data */ NM_EV_SETATTR_NACK, /* data: struct nm_fsm_ev_setattr_data */ NM_EV_OPSTART_ACK, @@ -50,8 +51,9 @@ extern const struct value_string nm_fsm_event_names; struct nm_fsm_ev_setattr_data { - struct msgb *msg; /* msgb ownership is transferred to FSM */ - int cause; + struct msgb *msg; + struct tlv_parsed *tp; + int cause; /* set in NM_EV_SETATTR_(N)ACK */ };
View file
osmo-bts_1.6.0.64.c12b.tar.xz/include/osmo-bts/oml.h -> osmo-bts_1.6.0.65.c4a1.tar.xz/include/osmo-bts/oml.h
Changed
@@ -63,6 +63,7 @@ int oml_mo_tx_sw_act_rep(const struct gsm_abis_mo *mo); int oml_fom_ack_nack(struct msgb *old_msg, uint8_t cause); +int oml_fom_ack_nack_copy_msg(const struct msgb *old_msg, uint8_t cause); int oml_mo_fom_ack_nack(const struct gsm_abis_mo *mo, uint8_t orig_msg_type, uint8_t cause);
View file
osmo-bts_1.6.0.64.c12b.tar.xz/src/common/nm_bb_transc_fsm.c -> osmo-bts_1.6.0.65.c4a1.tar.xz/src/common/nm_bb_transc_fsm.c
Changed
@@ -128,7 +128,7 @@ case NM_EV_SETATTR_NACK: setattr_data = (struct nm_fsm_ev_setattr_data *)data; bb_transc->mo.setattr_success = setattr_data->cause == 0; - oml_fom_ack_nack(setattr_data->msg, setattr_data->cause); + oml_fom_ack_nack_copy_msg(setattr_data->msg, setattr_data->cause); break; case NM_EV_OPSTART_ACK: bb_transc->mo.opstart_success = true;
View file
osmo-bts_1.6.0.64.c12b.tar.xz/src/common/nm_bts_fsm.c -> osmo-bts_1.6.0.65.c4a1.tar.xz/src/common/nm_bts_fsm.c
Changed
@@ -111,13 +111,20 @@ { struct gsm_bts *bts = (struct gsm_bts *)fi->priv; struct nm_fsm_ev_setattr_data *setattr_data; + int rc; switch (event) { + case NM_EV_RX_SETATTR: + setattr_data = (struct nm_fsm_ev_setattr_data *)data; + rc = bts_model_apply_oml(bts, setattr_data->msg, setattr_data->tp, + NM_OC_BTS, bts); + (void)rc; + break; case NM_EV_SETATTR_ACK: case NM_EV_SETATTR_NACK: setattr_data = (struct nm_fsm_ev_setattr_data *)data; bts->mo.setattr_success = setattr_data->cause == 0; - oml_fom_ack_nack(setattr_data->msg, setattr_data->cause); + oml_fom_ack_nack_copy_msg(setattr_data->msg, setattr_data->cause); break; case NM_EV_OPSTART_ACK: bts->mo.opstart_success = true; @@ -178,6 +185,7 @@ }, NM_BTS_ST_OP_DISABLED_OFFLINE = { .in_event_mask = + X(NM_EV_RX_SETATTR) | X(NM_EV_SETATTR_ACK) | X(NM_EV_SETATTR_NACK) | X(NM_EV_OPSTART_ACK) |
View file
osmo-bts_1.6.0.64.c12b.tar.xz/src/common/nm_bts_sm_fsm.c -> osmo-bts_1.6.0.65.c4a1.tar.xz/src/common/nm_bts_sm_fsm.c
Changed
@@ -92,7 +92,7 @@ case NM_EV_SETATTR_NACK: setattr_data = (struct nm_fsm_ev_setattr_data *)data; site_mgr->mo.setattr_success = setattr_data->cause == 0; - oml_fom_ack_nack(setattr_data->msg, setattr_data->cause); + oml_fom_ack_nack_copy_msg(setattr_data->msg, setattr_data->cause); break; case NM_EV_OPSTART_ACK: site_mgr->mo.opstart_success = true;
View file
osmo-bts_1.6.0.64.c12b.tar.xz/src/common/nm_channel_fsm.c -> osmo-bts_1.6.0.65.c4a1.tar.xz/src/common/nm_channel_fsm.c
Changed
@@ -94,13 +94,20 @@ { struct gsm_bts_trx_ts *ts = (struct gsm_bts_trx_ts *)fi->priv; struct nm_fsm_ev_setattr_data *setattr_data; + int rc; switch (event) { + case NM_EV_RX_SETATTR: + setattr_data = (struct nm_fsm_ev_setattr_data *)data; + rc = bts_model_apply_oml(ts->trx->bts, setattr_data->msg, setattr_data->tp, + NM_OC_CHANNEL, ts); + (void)rc; + break; case NM_EV_SETATTR_ACK: case NM_EV_SETATTR_NACK: setattr_data = (struct nm_fsm_ev_setattr_data *)data; ts->mo.setattr_success = setattr_data->cause == 0; - oml_fom_ack_nack(setattr_data->msg, setattr_data->cause); + oml_fom_ack_nack_copy_msg(setattr_data->msg, setattr_data->cause); break; case NM_EV_OPSTART_ACK: LOGPFSML(fi, LOGL_NOTICE, "BSC trying to activate TS while still in avail=dependency. " @@ -138,13 +145,20 @@ { struct gsm_bts_trx_ts *ts = (struct gsm_bts_trx_ts *)fi->priv; struct nm_fsm_ev_setattr_data *setattr_data; + int rc; switch (event) { + case NM_EV_RX_SETATTR: + setattr_data = (struct nm_fsm_ev_setattr_data *)data; + rc = bts_model_apply_oml(ts->trx->bts, setattr_data->msg, setattr_data->tp, + NM_OC_CHANNEL, ts); + (void)rc; + break; case NM_EV_SETATTR_ACK: case NM_EV_SETATTR_NACK: setattr_data = (struct nm_fsm_ev_setattr_data *)data; ts->mo.setattr_success = setattr_data->cause == 0; - oml_fom_ack_nack(setattr_data->msg, setattr_data->cause); + oml_fom_ack_nack_copy_msg(setattr_data->msg, setattr_data->cause); break; case NM_EV_OPSTART_ACK: ts->mo.opstart_success = true; @@ -220,6 +234,7 @@ }, NM_CHAN_ST_OP_DISABLED_DEPENDENCY = { .in_event_mask = + X(NM_EV_RX_SETATTR) | X(NM_EV_SETATTR_ACK) | X(NM_EV_SETATTR_NACK) | X(NM_EV_OPSTART_ACK) | /* backward compatibility, buggy BSC */ @@ -238,6 +253,7 @@ }, NM_CHAN_ST_OP_DISABLED_OFFLINE = { .in_event_mask = + X(NM_EV_RX_SETATTR) | X(NM_EV_SETATTR_ACK) | X(NM_EV_SETATTR_NACK) | X(NM_EV_OPSTART_ACK) |
View file
osmo-bts_1.6.0.64.c12b.tar.xz/src/common/nm_common_fsm.c -> osmo-bts_1.6.0.65.c4a1.tar.xz/src/common/nm_common_fsm.c
Changed
@@ -25,6 +25,7 @@ const struct value_string nm_fsm_event_names = { { NM_EV_SW_ACT, "SW_ACT" }, + { NM_EV_SETATTR_ACK, "RX_SETATTR" }, { NM_EV_SETATTR_ACK, "SETATTR_ACK" }, { NM_EV_SETATTR_NACK, "SETATTR_NACK" }, { NM_EV_OPSTART_ACK, "OPSTART_ACK" },
View file
osmo-bts_1.6.0.64.c12b.tar.xz/src/common/nm_radio_carrier_fsm.c -> osmo-bts_1.6.0.65.c4a1.tar.xz/src/common/nm_radio_carrier_fsm.c
Changed
@@ -103,13 +103,20 @@ struct nm_fsm_ev_setattr_data *setattr_data; bool phy_state_connected; bool rsl_link_connected; + int rc; switch (event) { + case NM_EV_RX_SETATTR: + setattr_data = (struct nm_fsm_ev_setattr_data *)data; + rc = bts_model_apply_oml(trx->bts, setattr_data->msg, setattr_data->tp, + NM_OC_RADIO_CARRIER, trx); + (void)rc; + break; case NM_EV_SETATTR_ACK: case NM_EV_SETATTR_NACK: setattr_data = (struct nm_fsm_ev_setattr_data *)data; trx->mo.setattr_success = setattr_data->cause == 0; - oml_fom_ack_nack(setattr_data->msg, setattr_data->cause); + oml_fom_ack_nack_copy_msg(setattr_data->msg, setattr_data->cause); break; case NM_EV_OPSTART_ACK: trx->mo.opstart_success = true; @@ -219,6 +226,7 @@ }, NM_RCARRIER_ST_OP_DISABLED_OFFLINE = { .in_event_mask = + X(NM_EV_RX_SETATTR) | X(NM_EV_SETATTR_ACK) | X(NM_EV_SETATTR_NACK) | X(NM_EV_OPSTART_ACK) |
View file
osmo-bts_1.6.0.64.c12b.tar.xz/src/common/oml.c -> osmo-bts_1.6.0.65.c4a1.tar.xz/src/common/oml.c
Changed
@@ -48,6 +48,7 @@ #include <osmo-bts/bts.h> #include <osmo-bts/signal.h> #include <osmo-bts/phy_link.h> +#include <osmo-bts/nm_common_fsm.h> #define LOGPFOH(ss, lvl, foh, fmt, args ...) LOGP(ss, lvl, "%s: " fmt, abis_nm_dump_foh(foh), ## args) #define DEBUGPFOH(ss, foh, fmt, args ...) LOGPFOH(ss, LOGL_DEBUG, foh, fmt, ## args) @@ -472,6 +473,15 @@ return 1; } +/* Copy msg before calling oml_fom_ack_nack(), which takes its ownership */ +int oml_fom_ack_nack_copy_msg(const struct msgb *old_msg, uint8_t cause) +{ + struct msgb *msg = msgb_copy(old_msg, "OML-ack_nack"); + msg->trx = old_msg->trx; + oml_fom_ack_nack(msg, cause); + return 0; +} + /* * Formatted O&M messages */ @@ -549,6 +559,7 @@ struct tlv_parsed tp, *tp_merged; int rc, i; const uint8_t *payload; + struct nm_fsm_ev_setattr_data ev_data; DEBUGPFOH(DOML, foh, "Rx SET BTS ATTR\n"); @@ -742,8 +753,15 @@ } } - /* call into BTS driver to apply new attributes to hardware */ - return bts_model_apply_oml(bts, msg, tp_merged, NM_OC_BTS, bts); + ev_data = (struct nm_fsm_ev_setattr_data){ + .msg = msg, + .tp = tp_merged, + }; + + rc = osmo_fsm_inst_dispatch(bts->mo.fi, NM_EV_RX_SETATTR, &ev_data); + if (rc < 0) + return oml_fom_ack_nack(msg, NM_NACK_CANT_PERFORM); + return rc; } /* 8.6.2 Set Radio Attributes has been received */ @@ -752,6 +770,7 @@ struct abis_om_fom_hdr *foh = msgb_l3(msg); struct tlv_parsed tp, *tp_merged; int rc; + struct nm_fsm_ev_setattr_data ev_data; DEBUGPFOH(DOML, foh, "Rx SET RADIO CARRIER ATTR\n"); @@ -830,8 +849,17 @@ trx->arfcn = arfcn; } #endif - /* call into BTS driver to apply new attributes to hardware */ - return bts_model_apply_oml(trx->bts, msg, tp_merged, NM_OC_RADIO_CARRIER, trx); + + ev_data = (struct nm_fsm_ev_setattr_data){ + .msg = msg, + .tp = tp_merged, + }; + + rc = osmo_fsm_inst_dispatch(trx->mo.fi, NM_EV_RX_SETATTR, &ev_data); + if (rc < 0) + return oml_fom_ack_nack(msg, NM_NACK_CANT_PERFORM); + return rc; + } static int handle_chan_comb(struct gsm_bts_trx_ts *ts, const uint8_t comb) @@ -927,6 +955,7 @@ struct gsm_bts *bts = ts->trx->bts; struct tlv_parsed tp, *tp_merged; int rc, i; + struct nm_fsm_ev_setattr_data ev_data; DEBUGPFOH(DOML, foh, "Rx SET CHAN ATTR\n"); @@ -1035,8 +1064,15 @@ ts->hopping.hsn, ts->hopping.maio, ts->hopping.arfcn_num); LOGPC(DOML, LOGL_INFO, ")\n"); - /* call into BTS driver to apply new attributes to hardware */ - return bts_model_apply_oml(bts, msg, tp_merged, NM_OC_CHANNEL, ts); + ev_data = (struct nm_fsm_ev_setattr_data){ + .msg = msg, + .tp = tp_merged, + }; + + rc = osmo_fsm_inst_dispatch(ts->mo.fi, NM_EV_RX_SETATTR, &ev_data); + if (rc < 0) + return oml_fom_ack_nack(msg, NM_NACK_CANT_PERFORM); + return rc; } /* 8.9.2 Opstart has been received */
View file
osmo-bts_1.6.0.64.c12b.tar.xz/src/osmo-bts-lc15/oml.c -> osmo-bts_1.6.0.65.c4a1.tar.xz/src/osmo-bts-lc15/oml.c
Changed
@@ -1859,8 +1859,7 @@ rc = osmo_fsm_inst_dispatch(mo->fi, ev_data.cause == 0 ? NM_EV_SETATTR_ACK : NM_EV_SETATTR_NACK, &ev_data); - /* msgb ownership is transferred to FSM if it received ev: */ - return rc == 0 ? 1 : 0; + return rc; } /* callback from OML */
View file
osmo-bts_1.6.0.64.c12b.tar.xz/src/osmo-bts-oc2g/oml.c -> osmo-bts_1.6.0.65.c4a1.tar.xz/src/osmo-bts-oc2g/oml.c
Changed
@@ -1864,8 +1864,7 @@ rc = osmo_fsm_inst_dispatch(mo->fi, ev_data.cause == 0 ? NM_EV_SETATTR_ACK : NM_EV_SETATTR_NACK, &ev_data); - /* msgb ownsership is transferred to FSM if it received ev: */ - return rc == 0 ? 1 : 0; + return rc; } /* callback from OML */
View file
osmo-bts_1.6.0.64.c12b.tar.xz/src/osmo-bts-octphy/l1_oml.c -> osmo-bts_1.6.0.65.c4a1.tar.xz/src/osmo-bts-octphy/l1_oml.c
Changed
@@ -1765,8 +1765,7 @@ rc = osmo_fsm_inst_dispatch(mo->fi, ev_data.cause == 0 ? NM_EV_SETATTR_ACK : NM_EV_SETATTR_NACK, &ev_data); - /* msgb ownsership is transferred to FSM if it received ev: */ - return rc == 0 ? 1 : 0; + return rc; }
View file
osmo-bts_1.6.0.64.c12b.tar.xz/src/osmo-bts-omldummy/bts_model.c -> osmo-bts_1.6.0.65.c4a1.tar.xz/src/osmo-bts-omldummy/bts_model.c
Changed
@@ -119,8 +119,7 @@ rc = osmo_fsm_inst_dispatch(mo->fi, ev_data.cause == 0 ? NM_EV_SETATTR_ACK : NM_EV_SETATTR_NACK, &ev_data); - /* msgb ownsership is transferred to FSM if it received ev: */ - return rc == 0 ? 1 : 0; + return rc; } /* MO: TS 12.21 Managed Object */
View file
osmo-bts_1.6.0.64.c12b.tar.xz/src/osmo-bts-sysmo/oml.c -> osmo-bts_1.6.0.65.c4a1.tar.xz/src/osmo-bts-sysmo/oml.c
Changed
@@ -1741,8 +1741,7 @@ rc = osmo_fsm_inst_dispatch(mo->fi, ev_data.cause == 0 ? NM_EV_SETATTR_ACK : NM_EV_SETATTR_NACK, &ev_data); - /* msgb ownsership is transferred to FSM if it received ev: */ - return rc == 0 ? 1 : 0; + return rc; } /* callback from OML */
View file
osmo-bts_1.6.0.64.c12b.tar.xz/src/osmo-bts-trx/l1_if.c -> osmo-bts_1.6.0.65.c4a1.tar.xz/src/osmo-bts-trx/l1_if.c
Changed
@@ -574,8 +574,7 @@ rc = osmo_fsm_inst_dispatch(mo->fi, ev_data.cause == 0 ? NM_EV_SETATTR_ACK : NM_EV_SETATTR_NACK, &ev_data); - /* msgb ownsership is transferred to FSM if it received ev: */ - return rc == 0 ? 1 : 0; + return rc; } /* callback from OML */
View file
osmo-bts_1.6.0.64.c12b.tar.xz/src/osmo-bts-virtual/bts_model.c -> osmo-bts_1.6.0.65.c4a1.tar.xz/src/osmo-bts-virtual/bts_model.c
Changed
@@ -154,8 +154,7 @@ rc = osmo_fsm_inst_dispatch(mo->fi, ev_data.cause == 0 ? NM_EV_SETATTR_ACK : NM_EV_SETATTR_NACK, &ev_data); - /* msgb ownsership is transferred to FSM if it received ev: */ - return rc == 0 ? 1 : 0; + return rc; } /* MO: TS 12.21 Managed Object */
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.