- gerrit-log - lists.osmocom.org

Change in osmo-mgw[master]: Make osmo_mgcpc_ep_fsm_pre_term() static
by laforge 16 Sep '22

16 Sep '22

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29320 ) Change subject: Make osmo_mgcpc_ep_fsm_pre_term() static ...................................................................... Make osmo_mgcpc_ep_fsm_pre_term() static This is a call-back for FSM pre-termination and it should not be publicly exported. Change-Id: Iaa44906baa201571f6bc3192bd3caacb272fec0b --- M src/libosmo-mgcp-client/mgcp_client_endpoint_fsm.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve dexter: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libosmo-mgcp-client/mgcp_client_endpoint_fsm.c b/src/libosmo-mgcp-client/mgcp_client_endpoint_fsm.c index ea4c378..b8f09d5 100644 --- a/src/libosmo-mgcp-client/mgcp_client_endpoint_fsm.c +++ b/src/libosmo-mgcp-client/mgcp_client_endpoint_fsm.c @@ -997,7 +997,7 @@ return 0; } -void osmo_mgcpc_ep_fsm_pre_term(struct osmo_fsm_inst *fi, enum osmo_fsm_term_cause cause) +static void osmo_mgcpc_ep_fsm_pre_term(struct osmo_fsm_inst *fi, enum osmo_fsm_term_cause cause) { int i; struct osmo_mgcpc_ep *ep = osmo_mgcpc_ep_fi_mgwep(fi); -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29320 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Iaa44906baa201571f6bc3192bd3caacb272fec0b Gerrit-Change-Number: 29320 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

Change in osmo-mgw[master]: Make osmo_mgcpc_ep_fsm_pre_term() static
by laforge 16 Sep '22

16 Sep '22

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29320 ) Change subject: Make osmo_mgcpc_ep_fsm_pre_term() static ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29320 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Iaa44906baa201571f6bc3192bd3caacb272fec0b Gerrit-Change-Number: 29320 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 16 Sep 2022 10:37:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmo-hnbgw[master]: Change log level about conn becoming closed to NOTICE
by laforge 16 Sep '22

16 Sep '22

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/29347 ) Change subject: Change log level about conn becoming closed to NOTICE ...................................................................... Change log level about conn becoming closed to NOTICE Change-Id: I8973990e2cc435422e62dd2a38192e7a6da4a716 --- M src/osmo-hnbgw/hnbgw.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmo-hnbgw/hnbgw.c b/src/osmo-hnbgw/hnbgw.c index a9fec10..8c2dc64 100644 --- a/src/osmo-hnbgw/hnbgw.c +++ b/src/osmo-hnbgw/hnbgw.c @@ -261,7 +261,7 @@ osmo_stream_srv_destroy(conn); goto out; } else if (rc == 0) { - LOGHNB(hnb, DMAIN, LOGL_ERROR, "Connection closed sctp_recvmsg(%s) = 0\n", + LOGHNB(hnb, DMAIN, LOGL_NOTICE, "Connection closed sctp_recvmsg(%s) = 0\n", osmo_sock_get_name2(osmo_stream_srv_get_ofd(conn)->fd)); osmo_stream_srv_destroy(conn); rc = -1; -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/29347 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I8973990e2cc435422e62dd2a38192e7a6da4a716 Gerrit-Change-Number: 29347 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: merged

1 0

Change in osmo-hnbgw[master]: Change log level about conn becoming closed to NOTICE
by laforge 16 Sep '22

16 Sep '22

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/29347 ) Change subject: Change log level about conn becoming closed to NOTICE ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/29347 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I8973990e2cc435422e62dd2a38192e7a6da4a716 Gerrit-Change-Number: 29347 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 16 Sep 2022 10:36:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmo-bsc[master]: oml: Integrate signal S_NM_IPACC_SET_ATTR_ACK inside S_NM_IPACC_ACK
by laforge 16 Sep '22

16 Sep '22

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/29363 ) Change subject: oml: Integrate signal S_NM_IPACC_SET_ATTR_ACK inside S_NM_IPACC_ACK ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/29363 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I18ae3d320d00077fc13bb9903903de2a17767302 Gerrit-Change-Number: 29363 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 16 Sep 2022 10:36:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmo-gsm-manuals[master]: Document osmux use in Abis interface
by laforge 16 Sep '22

16 Sep '22

Attention is currently required from: neels, pespin, fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/29354 ) Change subject: Document osmux use in Abis interface ...................................................................... Patch Set 2: Code-Review+1 (1 comment) File common/chapters/osmux/osmux.adoc: https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/29354/comment/e089933c_e58a… PS2, Line 22: volume-critical I've never heard that term. "limited bandwidth" or "bandwidth-limited" or "link with expensive traffic" are better alternatives, IMHO. But this is really not all that critical. -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/29354 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: Ic02d379f35f29f633d0fb14da3597481a0b8b8ba Gerrit-Change-Number: 29354 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 16 Sep 2022 10:35:08 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmo-gsm-manuals[master]: osmux: Use local/remote CID terminology
by laforge 16 Sep '22

16 Sep '22

Attention is currently required from: neels, pespin, fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/29353 ) Change subject: osmux: Use local/remote CID terminology ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/29353 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: Ia5eb833c296c504555f273a7fc3af5d746af19c0 Gerrit-Change-Number: 29353 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 16 Sep 2022 10:32:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmo-gsm-manuals[master]: osmux: Use local/remote CID terminology
by osmith 16 Sep '22

16 Sep '22

Attention is currently required from: neels, pespin, fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/29353 ) Change subject: osmux: Use local/remote CID terminology ...................................................................... Patch Set 2: Code-Review+1 (1 comment) File common/chapters/osmux/osmux.adoc: https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/29353/comment/041e74f6_46e2… PS1, Line 55: send Osmux frames the > I think it is resolved but you looked at the old version? Ack -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/29353 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: Ia5eb833c296c504555f273a7fc3af5d746af19c0 Gerrit-Change-Number: 29353 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 16 Sep 2022 08:46:40 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 0

Change in osmo-bts[master]: Document realtime options in .service units
by msuraev 16 Sep '22

16 Sep '22

msuraev has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/29306 ) Change subject: Document realtime options in .service units ...................................................................... Document realtime options in .service units It's not immediately obvious what numeric values mean for CPU scheduling policy. Let's document this and add doc reference. Related: OS#4107 Change-Id: Ib047762a336851e6205d77c83068a99d8a868e8b --- M contrib/systemd/osmo-bts-lc15.service M contrib/systemd/osmo-bts-oc2g.service M contrib/systemd/osmo-bts-sysmo.service M contrib/systemd/osmo-bts-trx.service M contrib/systemd/osmo-bts-virtual.service 5 files changed, 15 insertions(+), 5 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve dexter: Looks good to me, approved Jenkins Builder: Verified diff --git a/contrib/systemd/osmo-bts-lc15.service b/contrib/systemd/osmo-bts-lc15.service index 0266c9a..1fe2758 100644 --- a/contrib/systemd/osmo-bts-lc15.service +++ b/contrib/systemd/osmo-bts-lc15.service @@ -11,9 +11,11 @@ RestartSec=2 RestartPreventExitStatus=1 -# The msg queues must be read fast enough +# CPU scheduling policy: CPUSchedulingPolicy=rr +# For real-time scheduling policies an integer between 1 (lowest priority) and 99 (highest priority): CPUSchedulingPriority=1 +# See sched(7) for further details on real-time policies and priorities [Install] WantedBy=multi-user.target diff --git a/contrib/systemd/osmo-bts-oc2g.service b/contrib/systemd/osmo-bts-oc2g.service index b0b1f7e..fbf2608 100644 --- a/contrib/systemd/osmo-bts-oc2g.service +++ b/contrib/systemd/osmo-bts-oc2g.service @@ -11,9 +11,11 @@ RestartSec=2 RestartPreventExitStatus=1 -# The msg queues must be read fast enough +# CPU scheduling policy: CPUSchedulingPolicy=rr +# For real-time scheduling policies an integer between 1 (lowest priority) and 99 (highest priority): CPUSchedulingPriority=1 +# See sched(7) for further details on real-time policies and priorities [Install] WantedBy=multi-user.target diff --git a/contrib/systemd/osmo-bts-sysmo.service b/contrib/systemd/osmo-bts-sysmo.service index f297cfc..2a6f711 100644 --- a/contrib/systemd/osmo-bts-sysmo.service +++ b/contrib/systemd/osmo-bts-sysmo.service @@ -13,9 +13,11 @@ RestartSec=2 RestartPreventExitStatus=1 -# The msg queues must be read fast enough +# CPU scheduling policy: CPUSchedulingPolicy=rr +# For real-time scheduling policies an integer between 1 (lowest priority) and 99 (highest priority): CPUSchedulingPriority=1 +# See sched(7) for further details on real-time policies and priorities [Install] WantedBy=multi-user.target diff --git a/contrib/systemd/osmo-bts-trx.service b/contrib/systemd/osmo-bts-trx.service index e73e793..bbfa99c 100644 --- a/contrib/systemd/osmo-bts-trx.service +++ b/contrib/systemd/osmo-bts-trx.service @@ -9,9 +9,11 @@ Restart=always RestartSec=2 -# Let it process messages quickly enough +# CPU scheduling policy: CPUSchedulingPolicy=rr +# For real-time scheduling policies an integer between 1 (lowest priority) and 99 (highest priority): CPUSchedulingPriority=1 +# See sched(7) for further details on real-time policies and priorities [Install] WantedBy=multi-user.target diff --git a/contrib/systemd/osmo-bts-virtual.service b/contrib/systemd/osmo-bts-virtual.service index 877181b..54d0eb1 100644 --- a/contrib/systemd/osmo-bts-virtual.service +++ b/contrib/systemd/osmo-bts-virtual.service @@ -9,9 +9,11 @@ Restart=always RestartSec=2 -# Let it process messages quickly enough +# CPU scheduling policy: CPUSchedulingPolicy=rr +# For real-time scheduling policies an integer between 1 (lowest priority) and 99 (highest priority): CPUSchedulingPriority=1 +# See sched(7) for further details on real-time policies and priorities [Install] WantedBy=multi-user.target -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/29306 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ib047762a336851e6205d77c83068a99d8a868e8b Gerrit-Change-Number: 29306 Gerrit-PatchSet: 2 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: msuraev <msuraev(a)sysmocom.de> Gerrit-MessageType: merged

1 0

Change in osmo-bsc[master]: oml: Integrate signal S_NM_IPACC_SET_ATTR_ACK inside S_NM_IPACC_ACK
by pespin 16 Sep '22

16 Sep '22

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/29363 ) Change subject: oml: Integrate signal S_NM_IPACC_SET_ATTR_ACK inside S_NM_IPACC_ACK ...................................................................... oml: Integrate signal S_NM_IPACC_SET_ATTR_ACK inside S_NM_IPACC_ACK It makes no sense to have duplicate signals. Let's simply clean up S_NM_IPACC_ACK and pass the required info for higher layers to do whatever is needed based on the information. This allows reusing same signal infrastructure for different types of messages instead of having to implement new signals for each message (which can be done at a higher point in the stack). Change-Id: I18ae3d320d00077fc13bb9903903de2a17767302 --- M include/osmocom/bsc/signal.h M src/ipaccess/ipaccess-config.c M src/osmo-bsc/abis_nm.c M src/osmo-bsc/bts_ipaccess_nanobts.c 4 files changed, 53 insertions(+), 29 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/63/29363/1 diff --git a/include/osmocom/bsc/signal.h b/include/osmocom/bsc/signal.h index 300bd55..4d5080d 100644 --- a/include/osmocom/bsc/signal.h +++ b/include/osmocom/bsc/signal.h @@ -65,7 +65,6 @@ S_NM_NACK, /* GSM 12.21 various NM_MT_*_NACK happened */ S_NM_IPACC_NACK, /* GSM 12.21 nanoBTS extensions NM_MT_IPACC_*_*_NACK happened */ S_NM_IPACC_ACK, /* GSM 12.21 nanoBTS extensions NM_MT_IPACC_*_*_ACK happened */ - S_NM_IPACC_SET_ATTR_ACK,/* GSM 12.21 nanoBTS extensions NM_MT_IPACC_SET_ATTR_ACK happened */ S_NM_IPACC_RESTART_ACK, /* nanoBTS has send a restart ack */ S_NM_IPACC_RESTART_NACK,/* nanoBTS has send a restart ack */ S_NM_TEST_REP, /* GSM 12.21 Test Report */ @@ -121,8 +120,10 @@ }; struct ipacc_ack_signal_data { - struct gsm_bts_trx *trx; - uint8_t msg_type; + /* The BTS which sent the ACK/NACK to us: */ + struct gsm_bts *bts; + /* messge header containing msg_type, obj_class, obj_inst: */ + struct abis_om_fom_hdr *foh; }; struct abis_om2k_mo; diff --git a/src/ipaccess/ipaccess-config.c b/src/ipaccess/ipaccess-config.c index 1d8675e..7c8d486 100644 --- a/src/ipaccess/ipaccess-config.c +++ b/src/ipaccess/ipaccess-config.c @@ -191,6 +191,9 @@ static int ipacc_msg_ack(uint8_t mt, struct gsm_bts_trx *trx) { + if (mt != NM_MT_IPACC_SET_NVATTR_ACK && mt != NM_MT_IPACC_SET_ATTR_ACK) + return 0; + if (sw_load_state == 1) { fprintf(stderr, "The new software is activated.\n"); check_restart_or_exit(trx); @@ -352,14 +355,23 @@ struct ipacc_ack_signal_data *ipacc_data; struct nm_statechg_signal_data *nsd; struct msgb *oml_msg; + struct gsm_bts_trx *trx; switch (signal) { case S_NM_IPACC_NACK: ipacc_data = signal_data; - return ipacc_msg_nack(ipacc_data->msg_type); + return ipacc_msg_nack(ipacc_data->foh->msg_type); case S_NM_IPACC_ACK: ipacc_data = signal_data; - return ipacc_msg_ack(ipacc_data->msg_type, ipacc_data->trx); + switch (ipacc_data->foh->obj_class) { + case NM_OC_BASEB_TRANSC: + case NM_OC_RADIO_CARRIER: + trx = gsm_bts_trx_num(ipacc_data->bts, + ipacc_data->foh->obj_inst.trx_nr); + return ipacc_msg_ack(ipacc_data->foh->msg_type, trx); + default: + return 0; + } case S_NM_IPACC_RESTART_ACK: if (!quiet) printf("The BTS has acked the restart. Exiting.\n"); diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c index 8eeba89..b151f36 100644 --- a/src/osmo-bsc/abis_nm.c +++ b/src/osmo-bsc/abis_nm.c @@ -2865,6 +2865,7 @@ struct tlv_parsed tp; struct ipacc_ack_signal_data signal; struct e1inp_sign_link *sign_link = msg->dst; + struct gsm_bts *bts = sign_link->trx->bts; struct gsm_bts_trx *trx; foh = (struct abis_om_fom_hdr *) (oh->data + 1 + idstrlen); @@ -2874,14 +2875,14 @@ return -EINVAL; } - if (abis_nm_tlv_parse(&tp, sign_link->trx->bts, foh->data, oh->length - sizeof(*foh)) < 0) { + if (abis_nm_tlv_parse(&tp, bts, foh->data, oh->length - sizeof(*foh)) < 0) { LOGPFOH(DNM, LOGL_ERROR, foh, "%s(): tlv_parse failed\n", __func__); return -EINVAL; } /* The message might be received over the main OML link, so we cannot * just use sign_link->trx. Resolve it by number from the FOM header. */ - trx = gsm_bts_trx_num(sign_link->trx->bts, foh->obj_inst.trx_nr); + trx = gsm_bts_trx_num(bts, foh->obj_inst.trx_nr); DEBUGPFOH(DNM, foh, "Rx IPACCESS(0x%02x): %s\n", foh->msg_type, osmo_hexdump(foh->data, oh->length - sizeof(*foh))); @@ -2961,21 +2962,15 @@ case NM_MT_IPACC_RSL_CONNECT_NACK: case NM_MT_IPACC_SET_NVATTR_NACK: case NM_MT_IPACC_GET_NVATTR_NACK: - if (!trx) - goto obj_inst_error; - signal.trx = trx; - signal.msg_type = foh->msg_type; + signal.bts = bts; + signal.foh = foh; osmo_signal_dispatch(SS_NM, S_NM_IPACC_NACK, &signal); break; case NM_MT_IPACC_SET_NVATTR_ACK: - if (!trx) - goto obj_inst_error; - signal.trx = trx; - signal.msg_type = foh->msg_type; - osmo_signal_dispatch(SS_NM, S_NM_IPACC_ACK, &signal); - break; case NM_MT_IPACC_SET_ATTR_ACK: - osmo_signal_dispatch(SS_NM, S_NM_IPACC_SET_ATTR_ACK, msg); + signal.bts = bts; + signal.foh = foh; + osmo_signal_dispatch(SS_NM, S_NM_IPACC_ACK, &signal); break; default: break; @@ -3041,8 +3036,17 @@ LOG_TRX(trx, DRSL, LOGL_NOTICE, "RSL connection request timed out\n"); /* Fake an RSL CONNECT NACK message from the BTS. */ - signal.trx = trx; - signal.msg_type = NM_MT_IPACC_RSL_CONNECT_NACK; + struct abis_om_fom_hdr foh = { + .msg_type = NM_MT_IPACC_RSL_CONNECT_NACK, + .obj_class = NM_OC_BASEB_TRANSC, + .obj_inst = { + .bts_nr = trx->bts->bts_nr, + .trx_nr = trx->nr, + .ts_nr = 0xff, + }, + }; + signal.foh = &foh; + signal.bts = trx->bts; osmo_signal_dispatch(SS_NM, S_NM_IPACC_NACK, &signal); } diff --git a/src/osmo-bsc/bts_ipaccess_nanobts.c b/src/osmo-bsc/bts_ipaccess_nanobts.c index 8a63e16..0af5a28 100644 --- a/src/osmo-bsc/bts_ipaccess_nanobts.c +++ b/src/osmo-bsc/bts_ipaccess_nanobts.c @@ -413,19 +413,15 @@ osmo_fsm_inst_dispatch(ts->mo.fi, NM_EV_SET_ATTR_ACK, NULL); } -static void nm_rx_ipacc_set_attr_ack(struct msgb *oml_msg) +static void nm_rx_ipacc_set_attr_ack(struct ipacc_ack_signal_data *sig_data) { - struct e1inp_sign_link *sign_link = oml_msg->dst; - struct gsm_bts *bts = sign_link->trx->bts; - struct abis_om_hdr *oh = msgb_l2(oml_msg); - uint8_t idstrlen = oh->data[0]; - struct abis_om_fom_hdr *foh; + struct gsm_bts *bts = sig_data->bts; + struct abis_om_fom_hdr *foh = sig_data->foh; void *obj; struct gsm_gprs_nse *nse; struct gsm_gprs_cell *cell; struct gsm_gprs_nsvc *nsvc; - foh = (struct abis_om_fom_hdr *) (oh->data + 1 + idstrlen); obj = gsm_objclass2obj(bts, foh->obj_class, &foh->obj_inst); switch (foh->obj_class) { @@ -447,6 +443,17 @@ } } +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; + default: + break; + } +} + /* Callback function to be called every time we receive a signal from NM */ static int bts_ipa_nm_sig_cb(unsigned int subsys, unsigned int signal, void *handler_data, void *signal_data) @@ -477,8 +484,8 @@ case S_NM_SET_CHAN_ATTR_ACK: nm_rx_set_chan_attr_ack(signal_data); return 0; - case S_NM_IPACC_SET_ATTR_ACK: - nm_rx_ipacc_set_attr_ack(signal_data); + case S_NM_IPACC_ACK: + nm_rx_ipacc_ack(signal_data); return 0; default: break; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/29363 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I18ae3d320d00077fc13bb9903903de2a17767302 Gerrit-Change-Number: 29363 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

2026

2025

2024

2023

2022

gerrit-log