September 2022 - gerrit-log - lists.osmocom.org

Change in osmo-mgw[master]: osmux: set log level of expected code path to INFO

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29416 ) Change subject: osmux: set log level of expected code path to INFO ...................................................................... osmux: set log level of expected code path to INFO Change-Id: I5caf850b7bb19c66716139512f16568d4f8459eb --- M src/libosmo-mgcp/mgcp_osmux.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/16/29416/1 diff --git a/src/libosmo-mgcp/mgcp_osmux.c b/src/libosmo-mgcp/mgcp_osmux.c index 51a4b9c..98f2639 100644 --- a/src/libosmo-mgcp/mgcp_osmux.c +++ b/src/libosmo-mgcp/mgcp_osmux.c @@ -303,7 +303,7 @@ mgcp_conn_dump(conn->conn)); return -1; } - LOGPCONN(conn->conn, DOSMUX, LOGL_ERROR, + LOGPCONN(conn->conn, DOSMUX, LOGL_INFO, "Osmux %s CID %u towards %s is now enabled\n", sending ? "sent" : "received", conn->osmux.cid, osmo_sockaddr_to_str(&rem_addr)); -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29416 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I5caf850b7bb19c66716139512f16568d4f8459eb Gerrit-Change-Number: 29416 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 9 months

1
0
0 0

Change in osmo-hlr[master]: Debian: install osmo-hlr-dgsm.cfg as example config

by msuraev

msuraev has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/29391 ) Change subject: Debian: install osmo-hlr-dgsm.cfg as example config ...................................................................... Debian: install osmo-hlr-dgsm.cfg as example config Related: OS#4107 Change-Id: Ia64f14ada006acb31c5f725dfa0d52f482d3e8b4 --- M debian/osmo-hlr.install 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: fixeria: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/debian/osmo-hlr.install b/debian/osmo-hlr.install index 8b4039f..7c8c398 100644 --- a/debian/osmo-hlr.install +++ b/debian/osmo-hlr.install @@ -5,4 +5,5 @@ /usr/share/doc/osmo-hlr/sql/hlr.sql /usr/share/doc/osmo-hlr/sql/hlr_data.sql /usr/share/doc/osmo-hlr/examples/osmo-hlr.cfg +/usr/share/doc/osmo-hlr/examples/osmo-hlr-dgsm.cfg /usr/share/osmocom/osmo-hlr-post-upgrade.sh -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/29391 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Ia64f14ada006acb31c5f725dfa0d52f482d3e8b4 Gerrit-Change-Number: 29391 Gerrit-PatchSet: 1 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 9 months

1
0
0 0

Change in osmo-msc[master]: Make esme struct shared

by msuraev

Attention is currently required from: neels, dexter. msuraev has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28846 ) Change subject: Make esme struct shared ...................................................................... Patch Set 22: (1 comment) File include/osmocom/smpp/smpp.h: https://gerrit.osmocom.org/c/osmo-msc/+/28846/comment/e4293bb8_f4d84882 PS21, Line 14: esme > The comment with responce is literally right above this one - how come you're not seeing it? See Patchset 21 | 15. Sept 20:48 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28846 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I8f7ac2c00d16660925dd0b03aa1a0973edf9eb70 Gerrit-Change-Number: 28846 Gerrit-PatchSet: 22 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 19 Sep 2022 14:26:10 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Comment-In-Reply-To: msuraev <msuraev(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 9 months

1
0
0 0

Change in osmo-msc[master]: Make esme struct shared

by msuraev

Attention is currently required from: neels, dexter. msuraev has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28846 ) Change subject: Make esme struct shared ...................................................................... Patch Set 22: (1 comment) File include/osmocom/smpp/smpp.h: https://gerrit.osmocom.org/c/osmo-msc/+/28846/comment/5572a835_845ae638 PS21, Line 14: esme > what is happening here? I ask a question, you mark as Done without responding; i ask your feedback a […] The comment with responce is literally right above this one - how come you're not seeing it? -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28846 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I8f7ac2c00d16660925dd0b03aa1a0973edf9eb70 Gerrit-Change-Number: 28846 Gerrit-PatchSet: 22 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 19 Sep 2022 14:23:31 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Comment-In-Reply-To: msuraev <msuraev(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 9 months

1
0
0 0

Change in osmo-bsc[master]: ipacces-config: override gsm_bts_check_cfg() to void checking unset b...

by pespin

Attention is currently required from: neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/29376 ) Change subject: ipacces-config: override gsm_bts_check_cfg() to void checking unset bts configuration ...................................................................... Patch Set 1: (2 comments) Commit Message: https://gerrit.osmocom.org/c/osmo-bsc/+/29376/comment/a1d49dd5_d297b071 PS1, Line 7: ipacces-config: override gsm_bts_check_cfg() to void checking unset bts configuration > i fail to understand this sentence ipaccess-config uses some shared code with osmo-bsc but doesn't really use some of the fields in there, because it's basically not really acting as a full bsc. Hence, those values are really unset and checking against them make no sense. For instance, arfcn of the BTS. Patchset: PS1: > so, by setting 'weak' in libbsc, ipaccess-config can override? […] Yes, by setting weak ipaccess-config overrides it. As mentioned in an earlier patch, the main problem here is ipaccess-config implementing some lowest layer ipa parts on its own (faking stuff) then pluggin in some shared middle-layer shared code. But rewriting this is totally out of the scope of this patchset. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/29376 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I22ff0d22d6dcf9b0f715bfa4e0daeb52c4028308 Gerrit-Change-Number: 29376 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Mon, 19 Sep 2022 14:10:06 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 9 months

1
0
0 0

Change in osmo-bsc[master]: ipaccess-config: Initialize RSL ts driver fd to proper value

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/29373 ) Change subject: ipaccess-config: Initialize RSL ts driver fd to proper value ...................................................................... ipaccess-config: Initialize RSL ts driver fd to proper value ipaccess-config sets up the entire line in a fake way. That requires also setting the fd of each TS used to -1 in order to avoid library code interacting with it during tear down if an error occurs. Change-Id: I19eb23a46f89b96dd8d63742ca2078ecd5c9ab6b --- M src/ipaccess/ipaccess-config.c 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: neels: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/ipaccess/ipaccess-config.c b/src/ipaccess/ipaccess-config.c index a214d28..4d5e8b1 100644 --- a/src/ipaccess/ipaccess-config.c +++ b/src/ipaccess/ipaccess-config.c @@ -148,6 +148,7 @@ /* create E1 timeslots for signalling and TRAU frames */ e1inp_ts_config_sign(sign_ts, line); e1inp_ts_config_sign(rsl_ts, line); + rsl_ts->driver.ipaccess.fd.fd = -1; /* create signalling links for TRX0 */ oml_link = e1inp_sign_link_create(sign_ts, E1INP_SIGN_OML, -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/29373 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I19eb23a46f89b96dd8d63742ca2078ecd5c9ab6b Gerrit-Change-Number: 29373 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 9 months

1
0
0 0

Change in osmo-bsc[master]: ipaccess-config: use available API to set e1inp_line_ops

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/29374 ) Change subject: ipaccess-config: use available API to set e1inp_line_ops ...................................................................... ipaccess-config: use available API to set e1inp_line_ops Change-Id: Ic0d248fc5d1481ad96f7af20a1a80144137c626a --- M src/ipaccess/ipaccess-config.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: neels: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/ipaccess/ipaccess-config.c b/src/ipaccess/ipaccess-config.c index 4d5e8b1..d1fbed7 100644 --- a/src/ipaccess/ipaccess-config.c +++ b/src/ipaccess/ipaccess-config.c @@ -140,7 +140,7 @@ fprintf(stderr, "cannot `ipa' driver, giving up.\n"); return -EINVAL; } - line->ops = &ipaccess_e1inp_line_ops; + e1inp_line_bind_ops(line, &ipaccess_e1inp_line_ops); sign_ts = e1inp_line_ipa_oml_ts(line); rsl_ts = e1inp_line_ipa_rsl_ts(line, 0); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/29374 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ic0d248fc5d1481ad96f7af20a1a80144137c626a Gerrit-Change-Number: 29374 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 9 months

1
0
0 0

Change in osmo-bsc[master]: ipaccess-config: Exit program with error if OML link is dropped

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/29375 ) Change subject: ipaccess-config: Exit program with error if OML link is dropped ...................................................................... ipaccess-config: Exit program with error if OML link is dropped Change-Id: Ic96635f618f2efbe29ca6c59eedd1dc1f90c1a1d --- M src/ipaccess/ipaccess-config.c 1 file changed, 27 insertions(+), 0 deletions(-) Approvals: neels: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/ipaccess/ipaccess-config.c b/src/ipaccess/ipaccess-config.c index d1fbed7..a22d311 100644 --- a/src/ipaccess/ipaccess-config.c +++ b/src/ipaccess/ipaccess-config.c @@ -403,6 +403,32 @@ return 0; } +/* Callback function to be called every time we receive a signal from INPUT */ +static int inp_sig_cb(unsigned int subsys, unsigned int signal, + void *handler_data, void *signal_data) +{ + struct input_signal_data *isd = signal_data; + + if (subsys != SS_L_INPUT) + return -EINVAL; + + fprintf(stderr, "%s(): Input signal '%s' received\n", __func__, + get_value_string(e1inp_signal_names, signal)); + + switch (signal) { + case S_L_INP_TEI_UP: + break; + case S_L_INP_TEI_DN: + fprintf(stderr, "Lost E1 %s link\n", e1inp_signtype_name(isd->link_type)); + exit(1); + break; + default: + break; + } + + return 0; +} + /* callback function passed to the ABIS OML code */ static int percent; static int percent_old; @@ -1168,6 +1194,7 @@ bts->oml_tei = stream_id; osmo_signal_register_handler(SS_NM, nm_sig_cb, NULL); + osmo_signal_register_handler(SS_L_INPUT, inp_sig_cb, NULL); osmo_signal_register_handler(SS_IPAC_NWL, nwl_sig_cb, NULL); ipac_nwl_init(); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/29375 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ic96635f618f2efbe29ca6c59eedd1dc1f90c1a1d Gerrit-Change-Number: 29375 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 9 months

1
0
0 0

Change in osmo-bsc[master]: ipaccess-config: Initiate missing IPA osmo_link

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/29372 ) Change subject: ipaccess-config: Initiate missing IPA osmo_link ...................................................................... ipaccess-config: Initiate missing IPA osmo_link Since this is created by osmo-bsc, it is also expected to be there by ipaccess_drop_oml() in the shared libbsc code. But ipaccess-config was not creating it, so let's do so. Let's explicitly assert this condition in the code path expecting the pointer to be instantiated in shared code, to easily track related issues in the future. Change-Id: I3f63f6827f7c5d7a21ac125b7ca6b35244efbb65 --- M src/ipaccess/ipaccess-config.c M src/osmo-bsc/bts_ipaccess_nanobts.c 2 files changed, 5 insertions(+), 1 deletion(-) Approvals: neels: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/ipaccess/ipaccess-config.c b/src/ipaccess/ipaccess-config.c index 7c8d486..a214d28 100644 --- a/src/ipaccess/ipaccess-config.c +++ b/src/ipaccess/ipaccess-config.c @@ -129,7 +129,7 @@ { struct e1inp_line *line; struct e1inp_ts *sign_ts, *rsl_ts; - struct e1inp_sign_link *oml_link, *rsl_link; + struct e1inp_sign_link *oml_link, *osmo_link, *rsl_link; line = talloc_zero(tall_bsc_ctx, struct e1inp_line); if (!line) @@ -152,11 +152,14 @@ /* create signalling links for TRX0 */ oml_link = e1inp_sign_link_create(sign_ts, E1INP_SIGN_OML, bts->c0, IPAC_PROTO_OML, 0); + osmo_link = e1inp_sign_link_create(sign_ts, E1INP_SIGN_OSMO, + bts->c0, IPAC_PROTO_OSMO, 0); rsl_link = e1inp_sign_link_create(rsl_ts, E1INP_SIGN_RSL, bts->c0, IPAC_PROTO_RSL, 0); /* create back-links from bts/trx */ bts->oml_link = oml_link; + bts->osmo_link = osmo_link; bts->c0->rsl_link_primary = rsl_link; /* default port at BTS for incoming connections is 3006 */ diff --git a/src/osmo-bsc/bts_ipaccess_nanobts.c b/src/osmo-bsc/bts_ipaccess_nanobts.c index 3165944..c4df29e 100644 --- a/src/osmo-bsc/bts_ipaccess_nanobts.c +++ b/src/osmo-bsc/bts_ipaccess_nanobts.c @@ -616,6 +616,7 @@ gsm_bts_stats_reset(bts); /* Also drop the associated OSMO link */ + OSMO_ASSERT(bts->osmo_link); e1inp_sign_link_destroy(bts->osmo_link); bts->osmo_link = NULL; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/29372 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I3f63f6827f7c5d7a21ac125b7ca6b35244efbb65 Gerrit-Change-Number: 29372 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 9 months

1
0
0 0

Change in osmo-bsc[master]: oml: Delay Tx of OPSTART(BBTRANSC) after rx of RSL CONNECT ACK

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/29364 ) Change subject: oml: Delay Tx of OPSTART(BBTRANSC) after rx of RSL CONNECT ACK ...................................................................... oml: Delay Tx of OPSTART(BBTRANSC) after rx of RSL CONNECT ACK nanoBTS waits until receiving OPSTART in order to establish the RSL connection socket against BSC, hence we cannot wait until the socket is established at the BSC in order to send the OPSTART. Still this way we make sure the RSL CONNECT is acked before attempting an OPSTART at the BSC. Change-Id: Ief46bad5075b656c13d1f09a0724e33283148236 --- M include/osmocom/bsc/gsm_data.h M include/osmocom/bsc/nm_common_fsm.h M src/osmo-bsc/abis_nm.c M src/osmo-bsc/bts_ipaccess_nanobts.c M src/osmo-bsc/nm_bb_transc_fsm.c M src/osmo-bsc/nm_common_fsm.c 6 files changed, 95 insertions(+), 7 deletions(-) Approvals: neels: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index cb64c4c..52b20a8 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -447,6 +447,8 @@ bool get_attr_rep_received; bool set_attr_sent; bool set_attr_ack_received; + bool rsl_connect_sent; + bool rsl_connect_ack_received; bool force_rf_lock; }; diff --git a/include/osmocom/bsc/nm_common_fsm.h b/include/osmocom/bsc/nm_common_fsm.h index 1d56220..b41d24a 100644 --- a/include/osmocom/bsc/nm_common_fsm.h +++ b/include/osmocom/bsc/nm_common_fsm.h @@ -40,6 +40,8 @@ NM_EV_OML_DOWN, NM_EV_FORCE_LOCK, /* Only supported by RadioCarrier so far */ NM_EV_FEATURE_NEGOTIATED, /* Sent by BTS to NSVC MO */ + NM_EV_RSL_CONNECT_ACK, /* Sent by BTS to BBTRANSC MO */ + NM_EV_RSL_CONNECT_NACK, /* Sent by BTS to BBTRANSC MO */ }; extern const struct value_string nm_fsm_event_names[]; diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c index b151f36..938f45d 100644 --- a/src/osmo-bsc/abis_nm.c +++ b/src/osmo-bsc/abis_nm.c @@ -2966,6 +2966,7 @@ signal.foh = foh; osmo_signal_dispatch(SS_NM, S_NM_IPACC_NACK, &signal); break; + case NM_MT_IPACC_RSL_CONNECT_ACK: case NM_MT_IPACC_SET_NVATTR_ACK: case NM_MT_IPACC_SET_ATTR_ACK: signal.bts = bts; diff --git a/src/osmo-bsc/bts_ipaccess_nanobts.c b/src/osmo-bsc/bts_ipaccess_nanobts.c index 0af5a28..3165944 100644 --- a/src/osmo-bsc/bts_ipaccess_nanobts.c +++ b/src/osmo-bsc/bts_ipaccess_nanobts.c @@ -443,12 +443,56 @@ } } +static void nm_rx_ipacc_rsl_connect_ack(struct ipacc_ack_signal_data *sig_data) +{ + struct gsm_bts *bts = sig_data->bts; + struct abis_om_fom_hdr *foh = sig_data->foh; + struct gsm_bts_trx *trx; + + if (foh->obj_class != NM_OC_BASEB_TRANSC) { + LOGPFOH(DNM, LOGL_ERROR, foh, "IPACC RSL Connect ACK received on incorrect object class %d!\n", foh->obj_class); + return; + } + + trx = gsm_bts_trx_num(bts, foh->obj_inst.trx_nr); + osmo_fsm_inst_dispatch(trx->bb_transc.mo.fi, NM_EV_RSL_CONNECT_ACK, NULL); +} + static void nm_rx_ipacc_ack(struct ipacc_ack_signal_data *sig_data) { switch (sig_data->foh->msg_type) { case NM_MT_IPACC_SET_ATTR_ACK: nm_rx_ipacc_set_attr_ack(sig_data); break; + case NM_MT_IPACC_RSL_CONNECT_ACK: + nm_rx_ipacc_rsl_connect_ack(sig_data); + break; + default: + break; + } +} + +static void nm_rx_ipacc_rsl_connect_nack(struct ipacc_ack_signal_data *sig_data) +{ + struct gsm_bts *bts = sig_data->bts; + struct abis_om_fom_hdr *foh = sig_data->foh; + struct gsm_bts_trx *trx; + + if (foh->obj_class != NM_OC_BASEB_TRANSC) { + LOGPFOH(DNM, LOGL_ERROR, foh, "IPACC RSL Connect NACK received on incorrect object class %d!\n", foh->obj_class); + return; + } + + trx = gsm_bts_trx_num(bts, foh->obj_inst.trx_nr); + osmo_fsm_inst_dispatch(trx->bb_transc.mo.fi, NM_EV_RSL_CONNECT_NACK, NULL); +} + +static void nm_rx_ipacc_nack(struct ipacc_ack_signal_data *sig_data) +{ + switch (sig_data->foh->msg_type) { + case NM_MT_IPACC_RSL_CONNECT_ACK: + nm_rx_ipacc_rsl_connect_nack(sig_data); + break; default: break; } @@ -487,6 +531,9 @@ case S_NM_IPACC_ACK: nm_rx_ipacc_ack(signal_data); return 0; + case S_NM_IPACC_NACK: + nm_rx_ipacc_nack(signal_data); + return 0; default: break; } diff --git a/src/osmo-bsc/nm_bb_transc_fsm.c b/src/osmo-bsc/nm_bb_transc_fsm.c index bf24691..3a8786b 100644 --- a/src/osmo-bsc/nm_bb_transc_fsm.c +++ b/src/osmo-bsc/nm_bb_transc_fsm.c @@ -32,6 +32,7 @@ #include <osmocom/bsc/signal.h> #include <osmocom/bsc/abis_nm.h> #include <osmocom/bsc/bts_ipaccess_nanobts_omlattr.h> +#include <osmocom/bsc/ipaccess.h> #include <osmocom/bsc/nm_common_fsm.h> #include <osmocom/bsc/debug.h> @@ -63,6 +64,8 @@ bb_transc->mo.get_attr_sent = false; bb_transc->mo.get_attr_rep_received = false; bb_transc->mo.adm_unlock_sent = false; + bb_transc->mo.rsl_connect_sent = false; + bb_transc->mo.rsl_connect_ack_received = false; bb_transc->mo.opstart_sent = false; } @@ -125,14 +128,22 @@ NM_STATE_UNLOCKED); } + /* Provision BTS with RSL IP addr & port to connect to: */ if (allow_opstart && state->administrative == NM_STATE_UNLOCKED && - !bb_transc->mo.opstart_sent) { - bb_transc->mo.opstart_sent = true; - abis_nm_opstart(trx->bts, NM_OC_BASEB_TRANSC, trx->bts->bts_nr, trx->nr, 0xff); - /* TRX software is active, tell it to initiate RSL Link */ + !bb_transc->mo.rsl_connect_sent && !bb_transc->mo.rsl_connect_ack_received) { + bb_transc->mo.rsl_connect_sent = true; abis_nm_ipaccess_rsl_connect(trx, trx->bts->ip_access.rsl_ip, 3003, trx->rsl_tei_primary); } + + /* OPSTART after receiving RSL CONNECT ACK. We cannot delay until the + * RSL/IPA socket is connected to us because nanoBTS only attempts + * connection after receiving an OPSTART: */ + if (allow_opstart && state->administrative == NM_STATE_UNLOCKED && + bb_transc->mo.rsl_connect_ack_received && !bb_transc->mo.opstart_sent) { + bb_transc->mo.opstart_sent = true; + abis_nm_opstart(trx->bts, NM_OC_BASEB_TRANSC, trx->bts->bts_nr, trx->nr, 0xff); + } } static void st_op_disabled_dependency_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state) @@ -150,6 +161,7 @@ static void st_op_disabled_dependency(struct osmo_fsm_inst *fi, uint32_t event, void *data) { struct gsm_bts_bb_trx *bb_transc = (struct gsm_bts_bb_trx *)fi->priv; + struct gsm_bts_trx *trx = gsm_bts_bb_trx_get_trx(bb_transc); struct nm_statechg_signal_data *nsd; const struct gsm_nm_state *new_state; @@ -159,6 +171,14 @@ bb_transc->mo.get_attr_sent = false; configure_loop(bb_transc, &bb_transc->mo.nm_state, false); return; + case NM_EV_RSL_CONNECT_ACK: + bb_transc->mo.rsl_connect_ack_received = true; + bb_transc->mo.rsl_connect_sent = false; + configure_loop(bb_transc, &bb_transc->mo.nm_state, false); + break; + case NM_EV_RSL_CONNECT_NACK: + ipaccess_drop_oml_deferred(trx->bts); + break; case NM_EV_STATE_CHG_REP: nsd = (struct nm_statechg_signal_data *)data; new_state = &nsd->new_state; @@ -207,6 +227,14 @@ bb_transc->mo.get_attr_sent = false; configure_loop(bb_transc, &bb_transc->mo.nm_state, true); return; + case NM_EV_RSL_CONNECT_ACK: + bb_transc->mo.rsl_connect_ack_received = true; + bb_transc->mo.rsl_connect_sent = false; + configure_loop(bb_transc, &bb_transc->mo.nm_state, true); + break; + case NM_EV_RSL_CONNECT_NACK: + ipaccess_drop_oml_deferred(trx->bts); + break; case NM_EV_STATE_CHG_REP: nsd = (struct nm_statechg_signal_data *)data; new_state = &nsd->new_state; @@ -251,8 +279,10 @@ reused as soon as we move back to Disabled */ bb_transc->mo.get_attr_sent = false; bb_transc->mo.get_attr_rep_received = false; - bb_transc->mo.opstart_sent = false; bb_transc->mo.adm_unlock_sent = false; + bb_transc->mo.rsl_connect_ack_received = false; + bb_transc->mo.rsl_connect_sent = false; + bb_transc->mo.opstart_sent = false; nm_bb_transc_fsm_becomes_enabled(bb_transc); } @@ -330,7 +360,9 @@ [NM_BB_TRANSC_ST_OP_DISABLED_DEPENDENCY] = { .in_event_mask = X(NM_EV_STATE_CHG_REP) | - X(NM_EV_GET_ATTR_REP), + X(NM_EV_GET_ATTR_REP) | + X(NM_EV_RSL_CONNECT_ACK) | + X(NM_EV_RSL_CONNECT_NACK), .out_state_mask = X(NM_BB_TRANSC_ST_OP_DISABLED_NOTINSTALLED) | X(NM_BB_TRANSC_ST_OP_DISABLED_OFFLINE) | @@ -342,7 +374,9 @@ [NM_BB_TRANSC_ST_OP_DISABLED_OFFLINE] = { .in_event_mask = X(NM_EV_STATE_CHG_REP) | - X(NM_EV_GET_ATTR_REP), + X(NM_EV_GET_ATTR_REP) | + X(NM_EV_RSL_CONNECT_ACK) | + X(NM_EV_RSL_CONNECT_NACK), .out_state_mask = X(NM_BB_TRANSC_ST_OP_DISABLED_NOTINSTALLED) | X(NM_BB_TRANSC_ST_OP_DISABLED_DEPENDENCY) | diff --git a/src/osmo-bsc/nm_common_fsm.c b/src/osmo-bsc/nm_common_fsm.c index b0902b1..2bf38ac 100644 --- a/src/osmo-bsc/nm_common_fsm.c +++ b/src/osmo-bsc/nm_common_fsm.c @@ -33,6 +33,8 @@ { NM_EV_OML_DOWN, "OML_DOWN" }, { NM_EV_FORCE_LOCK, "FORCE_LOCK_CHG" }, { NM_EV_FEATURE_NEGOTIATED, "FEATURE_NEGOTIATED" }, + { NM_EV_RSL_CONNECT_ACK, "RSL_CONNECT_ACK" }, + { NM_EV_RSL_CONNECT_NACK, "RSL_CONNECT_NACK" }, { 0, NULL } }; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/29364 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ief46bad5075b656c13d1f09a0724e33283148236 Gerrit-Change-Number: 29364 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 9 months

1
0
0 0

2025

2024

2023

2022

gerrit-log September 2022