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

[S] Change in osmo-hnbgw[master]: hnbgw_cn: Remove assert hit due to wrong assumption

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/34458?usp=email ) Change subject: hnbgw_cn: Remove assert hit due to wrong assumption ...................................................................... hnbgw_cn: Remove assert hit due to wrong assumption The HNBGW in correctly assumes that no ss7->sccp instance is allocated until the same function calls osmo_sccp_simple_client_on_ss7_id(). This assumption is wrong, since ss7 may create its own ss7->sccp instance internally as a result of vty configuration, eg. when "sccp max-optional-data 124" is placed in osmo-hnbgw.cfg file. In this scenario, simply removing the assert is enough, since osmo_sccp_simple_client_on_ss7_id() just calls osmo_ss7_ensure_sccp(), the same that the libmoso-sccp code called to allocate the pointer. Related: SYS#6566 Fixes: f3caea850bc892551cd09bbaf49f798c172590c4 Change-Id: I1221c165156e9625324cf0080836a8ed2bad4e9c --- M src/osmo-hnbgw/hnbgw_cn.c 1 file changed, 22 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/58/34458/1 diff --git a/src/osmo-hnbgw/hnbgw_cn.c b/src/osmo-hnbgw/hnbgw_cn.c index b95cf28..31bf192 100644 --- a/src/osmo-hnbgw/hnbgw_cn.c +++ b/src/osmo-hnbgw/hnbgw_cn.c @@ -849,11 +849,7 @@ return 0; } /* else cnlink->hnbgw_sccp_user stays NULL and is set up below. */ - LOG_CNLINK(cnlink, DCN, LOGL_DEBUG, "cs7 instance %u has no SCCP instance yet\n", ss7->cfg.id); - - /* All SCCP instances should originate from this function. So if there is no hnbgw_sccp_user for the cs7 - * instance, then the cs7 instance should not have an SCCP instance yet. */ - OSMO_ASSERT(!ss7->sccp); + LOG_CNLINK(cnlink, DCN, LOGL_DEBUG, "cs7 instance %u has no configured SCCP instance yet\n", ss7->cfg.id); } /* No SCCP instance yet for this ss7. Create it. If no address name is given that resolves to a -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/34458?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I1221c165156e9625324cf0080836a8ed2bad4e9c Gerrit-Change-Number: 34458 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 9 months

1
0
0 0

[S] Change in libosmo-netif[master]: ipa: Don't break strict aliasing rule

by laforge

Attention is currently required from: daniel, dexter, fixeria, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/34445?usp=email ) Change subject: ipa: Don't break strict aliasing rule ...................................................................... Patch Set 7: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/34445?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ibed543cdfcdda8c0256ce7d8818ff96d6d46e9b0 Gerrit-Change-Number: 34445 Gerrit-PatchSet: 7 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> 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-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 19 Sep 2023 10:37:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

[S] Change in osmo-bts[master]: ASCI: Ignore LAPD frames from MS, while the uplink is not active

by jolly

Attention is currently required from: jolly. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/34423?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: ASCI: Ignore LAPD frames from MS, while the uplink is not active ...................................................................... ASCI: Ignore LAPD frames from MS, while the uplink is not active Do not forward any message from the MS to LAPD while the uplink is not active. If the MS did not recognize (fast enough) that the uplink is free, it may continue to transmit LAPD frames. A reaction of LAPD is to these frames is not desired and not required. If we react on them, we will transmit LAPD response frames to the MS and this stops us from sending UPLINK FREE messages. Note: UPLINK FREE messages are repeated automatically until a different message is transmitted. Related: OS#5781 Change-Id: I5075115123055b2997481f56ddf473430a1dc9e3 --- M src/common/l1sap.c 1 file changed, 33 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/23/34423/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34423?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I5075115123055b2997481f56ddf473430a1dc9e3 Gerrit-Change-Number: 34423 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-MessageType: newpatchset

1 year, 9 months

1
0
0 0

[S] Change in libosmocore[master]: gsmtap.h: Add definitions for ISDN PPP sub-type

by laforge

Attention is currently required from: manawyrm. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34457?usp=email ) Change subject: gsmtap.h: Add definitions for ISDN PPP sub-type ...................................................................... Patch Set 2: Code-Review+1 (1 comment) Patchset: PS2: as there is both synchronous PPP over ISDN (the one you're describing here, where the HDLC around the PPP is directly in the B channel) as well as asynchronous PPP over ISDN (e.g. inside X.75), it might be best to indicate which is being talked about here. Maybe even reference https://www.rfc-editor.org/rfc/rfc1618.html ? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34457?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I17137167b2c74b6c5e53459743b6e140fc1a4386 Gerrit-Change-Number: 34457 Gerrit-PatchSet: 2 Gerrit-Owner: manawyrm <osmocom.account(a)tbspace.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: manawyrm <osmocom.account(a)tbspace.de> Gerrit-Comment-Date: Tue, 19 Sep 2023 10:34:41 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

[S] Change in libosmo-netif[master]: ipa: Don't break strict aliasing rule

by arehbein

Attention is currently required from: daniel, dexter, fixeria, laforge, pespin. arehbein has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/34445?usp=email ) Change subject: ipa: Don't break strict aliasing rule ...................................................................... Patch Set 7: (1 comment) File include/osmocom/netif/ipa.h: https://gerrit.osmocom.org/c/libosmo-netif/+/34445/comment/2b941b13_bef9707e PS5, Line 35: struct > #define OSMO_IPA_MSGB_CB(__msg) (&( \ […] Done -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/34445?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ibed543cdfcdda8c0256ce7d8818ff96d6d46e9b0 Gerrit-Change-Number: 34445 Gerrit-PatchSet: 7 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> 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-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 19 Sep 2023 10:33:09 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: arehbein <arehbein(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

[S] Change in libosmo-netif[master]: ipa: Don't break strict aliasing rule

by arehbein

Attention is currently required from: arehbein, daniel, dexter, fixeria, laforge. Hello Jenkins Builder, daniel, dexter, fixeria, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-netif/+/34445?usp=email to look at the new patch set (#7). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: ipa: Don't break strict aliasing rule ...................................................................... ipa: Don't break strict aliasing rule Somehow gcc doesn't always warn about this rule being broken. We are breaking the strict aliasing rule here and libosmo-netif currently does not make use of the '-fno-strict-aliasing' flag. It's possible that this has also been causing nondeterministic timestamps in libosmo-netif stream tests every once in a while. Related: OS#6164, OS#5753 Change-Id: Ibed543cdfcdda8c0256ce7d8818ff96d6d46e9b0 --- M include/osmocom/netif/ipa.h 1 file changed, 30 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/45/34445/7 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/34445?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ibed543cdfcdda8c0256ce7d8818ff96d6d46e9b0 Gerrit-Change-Number: 34445 Gerrit-PatchSet: 7 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> 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-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 9 months

1
0
0 0

[S] Change in libosmo-netif[master]: ipa: Don't break strict aliasing rule

by arehbein

Attention is currently required from: arehbein, daniel, dexter, fixeria, laforge. Hello Jenkins Builder, daniel, dexter, fixeria, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-netif/+/34445?usp=email to look at the new patch set (#6). The following approvals got outdated and were removed: Code-Review+1 by fixeria, Verified+1 by Jenkins Builder Change subject: ipa: Don't break strict aliasing rule ...................................................................... ipa: Don't break strict aliasing rule Somehow gcc doesn't always warn about this rule being broken. We are breaking the strict aliasing rule here and libosmo-netif currently does not make use of the '-fno-strict-aliasing' flag. It's possible that this has also been causing nondeterministic timestamps in libosmo-netif stream tests every once in a while. Related: OS#6164, OS#5753 Change-Id: Ibed543cdfcdda8c0256ce7d8818ff96d6d46e9b0 --- M include/osmocom/netif/ipa.h 1 file changed, 32 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/45/34445/6 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/34445?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ibed543cdfcdda8c0256ce7d8818ff96d6d46e9b0 Gerrit-Change-Number: 34445 Gerrit-PatchSet: 6 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> 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-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 9 months

1
0
0 0

[S] Change in osmo-bts[master]: oml: Store RSL connect related fields in bb_transc

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34440?usp=email ) Change subject: oml: Store RSL connect related fields in bb_transc ...................................................................... oml: Store RSL connect related fields in bb_transc This is a preparation commit towards delaying connection of RSL tcp socket until the BBTRANSC object is OPSTARTed, as it is the case already in nanoBTS. Related: OS#5253 Change-Id: Ia571ec19e9e8f8a6d7c2554642aab0afe1b4b917 --- M include/osmo-bts/bts_trx.h M src/common/abis.c M src/common/oml.c M src/common/vty.c 4 files changed, 32 insertions(+), 7 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/include/osmo-bts/bts_trx.h b/include/osmo-bts/bts_trx.h index 72522eb..3ea017e 100644 --- a/include/osmo-bts/bts_trx.h +++ b/include/osmo-bts/bts_trx.h @@ -1,9 +1,15 @@ #pragma once +#include <osmocom/core/sockaddr_str.h> #include <osmo-bts/gsm_data.h> struct gsm_bts_bb_trx { struct gsm_abis_mo mo; + /* how do we talk RSL with this TRX? */ + struct { + struct osmo_sockaddr_str rem_addrstr; + uint8_t tei; + } rsl; }; /* One TRX in a BTS */ @@ -17,7 +23,6 @@ /* human readable name / description */ char *description; /* how do we talk RSL with this TRX? */ - uint8_t rsl_tei; struct e1inp_sign_link *rsl_link; /* NM Radio Carrier and Baseband Transciever */ diff --git a/src/common/abis.c b/src/common/abis.c index 10eeaff..9677c1f 100644 --- a/src/common/abis.c +++ b/src/common/abis.c @@ -405,7 +405,7 @@ } e1inp_ts_config_sign(sign_ts, line); trx->rsl_link = e1inp_sign_link_create(sign_ts, E1INP_SIGN_RSL, - trx, trx->rsl_tei, 0); + trx, trx->bb_transc.rsl.tei, 0); trx_link_estab(trx); return trx->rsl_link; } diff --git a/src/common/oml.c b/src/common/oml.c index 85ec5d7..f78790a 100644 --- a/src/common/oml.c +++ b/src/common/oml.c @@ -1478,6 +1478,7 @@ struct e1inp_sign_link *oml_link = bts->oml_link; const struct abis_om_fom_hdr *foh = msgb_l3(msg); struct gsm_bts_trx *trx = gsm_bts_trx_num(bts, foh->obj_inst.trx_nr); + struct gsm_bts_bb_trx *bb_transc; const char *trx_name; struct in_addr in; uint16_t port = IPA_TCP_PORT_RSL; @@ -1491,6 +1492,7 @@ if (TLVP_PRESENT(tp, NM_ATT_IPACC_DST_IP_PORT)) port = ntohs(tlvp_val16_unal(tp, NM_ATT_IPACC_DST_IP_PORT)); + if (TLVP_PRESENT(tp, NM_ATT_IPACC_STREAM_ID)) stream_id = *TLVP_VAL(tp, NM_ATT_IPACC_STREAM_ID); @@ -1501,17 +1503,21 @@ goto tx_ack_nack; } - trx_name = gsm_trx_name(trx); + bb_transc = &trx->bb_transc; + osmo_sockaddr_str_from_in_addr(&bb_transc->rsl.rem_addrstr, &in, port); + bb_transc->rsl.tei = stream_id; + trx_name = gsm_trx_name(trx); LOGP(DOML, LOGL_INFO, "%s: Rx IPA RSL CONNECT IP=%s PORT=%u STREAM=0x%02x\n", - trx_name, inet_ntoa(in), port, stream_id); + trx_name, bb_transc->rsl.rem_addrstr.ip, bb_transc->rsl.rem_addrstr.port, + bb_transc->rsl.tei); if (bts->variant == BTS_OSMO_OMLDUMMY) { rc = 0; LOGP(DOML, LOGL_NOTICE, "%s: Not connecting RSL in OML-DUMMY!\n", trx_name); } else { - trx->rsl_tei = stream_id; - rc = e1inp_ipa_bts_rsl_connect_n(oml_link->ts->line, inet_ntoa(in), port, trx->nr); + rc = e1inp_ipa_bts_rsl_connect_n(oml_link->ts->line, bb_transc->rsl.rem_addrstr.ip, + bb_transc->rsl.rem_addrstr.port, trx->nr); if (rc < 0) { LOGP(DOML, LOGL_NOTICE, "%s: Error connecting IPA RSL: %d\n", trx_name, rc); rc = NM_NACK_CANT_PERFORM; diff --git a/src/common/vty.c b/src/common/vty.c index 31104c2..47e0ecd 100644 --- a/src/common/vty.c +++ b/src/common/vty.c @@ -1662,7 +1662,7 @@ vty_out(vty, " RSL State: %s%s", trx->rsl_link? "connected" : "disconnected", VTY_NEWLINE); vty_out(vty, " Baseband Transceiver NM State: "); net_dump_nmstate(vty, &trx->bb_transc.mo.nm_state); - vty_out(vty, " IPA stream ID: 0x%02x%s", trx->rsl_tei, VTY_NEWLINE); + vty_out(vty, " IPA stream ID: 0x%02x%s", trx->bb_transc.rsl.tei, VTY_NEWLINE); } static inline void print_all_trx(struct vty *vty, const struct gsm_bts *bts) -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34440?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ia571ec19e9e8f8a6d7c2554642aab0afe1b4b917 Gerrit-Change-Number: 34440 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-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 9 months

1
0
0 0

[S] Change in osmo-bts[master]: nm: delay RSL connect until BBTRANSC object is OPSTARTed

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34442?usp=email ) Change subject: nm: delay RSL connect until BBTRANSC object is OPSTARTed ...................................................................... nm: delay RSL connect until BBTRANSC object is OPSTARTed Have same behavior as nanoBTS. Related: OS#5253 Change-Id: Idefc65a8812abd49fb5f0cd7b0bef423536b86e0 --- M src/common/nm_bb_transc_fsm.c M src/common/oml.c 2 files changed, 28 insertions(+), 12 deletions(-) Approvals: pespin: Verified fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/src/common/nm_bb_transc_fsm.c b/src/common/nm_bb_transc_fsm.c index 12493e4..c668eff 100644 --- a/src/common/nm_bb_transc_fsm.c +++ b/src/common/nm_bb_transc_fsm.c @@ -119,6 +119,7 @@ { 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 gsm_bts *bts = trx->bts; struct nm_fsm_ev_setattr_data *setattr_data; bool phy_state_connected; bool rsl_link_connected; @@ -145,6 +146,19 @@ return; } #endif + /* Connect RSL link: */ + if (bts->variant == BTS_OSMO_OMLDUMMY) { + LOGPFSML(fi, LOGL_NOTICE, "Not connecting RSL in OML-DUMMY!\n"); + } else { + rc = e1inp_ipa_bts_rsl_connect_n(bts->oml_link->ts->line, + bb_transc->rsl.rem_addrstr.ip, + bb_transc->rsl.rem_addrstr.port, trx->nr); + if (rc < 0) { + LOGPFSML(fi, LOGL_NOTICE, "Error connecting IPA RSL: %d\n", rc); + oml_mo_opstart_nack(&bb_transc->mo, NM_NACK_CANT_PERFORM); + return; + } + } bts_model_opstart(trx->bts, &bb_transc->mo, bb_transc); return; case NM_EV_OPSTART_ACK: @@ -170,7 +184,7 @@ } - if (trx->bts->variant != BTS_OSMO_OMLDUMMY) { /* In OMLDUMMY, phy=NULL */ + if (bts->variant != BTS_OSMO_OMLDUMMY) { /* In OMLDUMMY, phy=NULL */ struct phy_instance *pinst = trx_phy_instance(trx); phy_state_connected = phy_link_state_get(pinst->phy_link) == PHY_LINK_CONNECTED; rsl_link_connected = !!trx->bb_transc.rsl.link; diff --git a/src/common/oml.c b/src/common/oml.c index f78790a..4565e9a 100644 --- a/src/common/oml.c +++ b/src/common/oml.c @@ -1512,17 +1512,7 @@ trx_name, bb_transc->rsl.rem_addrstr.ip, bb_transc->rsl.rem_addrstr.port, bb_transc->rsl.tei); - if (bts->variant == BTS_OSMO_OMLDUMMY) { - rc = 0; - LOGP(DOML, LOGL_NOTICE, "%s: Not connecting RSL in OML-DUMMY!\n", trx_name); - } else { - rc = e1inp_ipa_bts_rsl_connect_n(oml_link->ts->line, bb_transc->rsl.rem_addrstr.ip, - bb_transc->rsl.rem_addrstr.port, trx->nr); - if (rc < 0) { - LOGP(DOML, LOGL_NOTICE, "%s: Error connecting IPA RSL: %d\n", trx_name, rc); - rc = NM_NACK_CANT_PERFORM; - } - } + rc = 0; tx_ack_nack: /* The ACK/NACK is expected to contain all IEs */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34442?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Idefc65a8812abd49fb5f0cd7b0bef423536b86e0 Gerrit-Change-Number: 34442 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-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 9 months

1
0
0 0

[M] Change in osmo-bts[master]: Move trx->rsl_link to trx->bb_transc.rsl.link

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34441?usp=email ) Change subject: Move trx->rsl_link to trx->bb_transc.rsl.link ...................................................................... Move trx->rsl_link to trx->bb_transc.rsl.link The RSL link is configured/set up by the BBTRANSC NM object, hence move it to the appropiate substruct. Related: OS#5253 Change-Id: I62937cbd81c27274b9f5f70d454d5319a6898c7b --- M include/osmo-bts/bts_trx.h M src/common/abis.c M src/common/nm_bb_transc_fsm.c M src/common/nm_radio_carrier_fsm.c M src/common/rsl.c M src/common/vty.c M src/osmo-bts-trx/trx_vty.c M tests/handover/handover_test.c 8 files changed, 40 insertions(+), 28 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/include/osmo-bts/bts_trx.h b/include/osmo-bts/bts_trx.h index 3ea017e..a098c3e 100644 --- a/include/osmo-bts/bts_trx.h +++ b/include/osmo-bts/bts_trx.h @@ -9,6 +9,7 @@ struct { struct osmo_sockaddr_str rem_addrstr; uint8_t tei; + struct e1inp_sign_link *link; } rsl; }; @@ -22,8 +23,6 @@ uint8_t nr; /* human readable name / description */ char *description; - /* how do we talk RSL with this TRX? */ - struct e1inp_sign_link *rsl_link; /* NM Radio Carrier and Baseband Transciever */ struct gsm_abis_mo mo; diff --git a/src/common/abis.c b/src/common/abis.c index 9677c1f..18e6c63 100644 --- a/src/common/abis.c +++ b/src/common/abis.c @@ -225,9 +225,9 @@ /* Then iterate over the RSL signalling links */ llist_for_each_entry(trx, &bts->trx_list, list) { - if (trx->rsl_link) { - e1inp_sign_link_destroy(trx->rsl_link); - trx->rsl_link = NULL; + if (trx->bb_transc.rsl.link) { + e1inp_sign_link_destroy(trx->bb_transc.rsl.link); + trx->bb_transc.rsl.link = NULL; if (trx == trx->bts->c0) load_timer_stop(trx->bts); } else { @@ -364,7 +364,7 @@ /* osmo-bts uses msg->trx internally, but libosmo-abis uses * the signalling link at msg->dst */ - msg->dst = msg->trx->rsl_link; + msg->dst = msg->trx->bb_transc.rsl.link; return abis_sendmsg(msg); } @@ -404,10 +404,10 @@ break; } e1inp_ts_config_sign(sign_ts, line); - trx->rsl_link = e1inp_sign_link_create(sign_ts, E1INP_SIGN_RSL, - trx, trx->bb_transc.rsl.tei, 0); + trx->bb_transc.rsl.link = e1inp_sign_link_create(sign_ts, E1INP_SIGN_RSL, + trx, trx->bb_transc.rsl.tei, 0); trx_link_estab(trx); - return trx->rsl_link; + return trx->bb_transc.rsl.link; } return NULL; } diff --git a/src/common/nm_bb_transc_fsm.c b/src/common/nm_bb_transc_fsm.c index 1dd2c85..12493e4 100644 --- a/src/common/nm_bb_transc_fsm.c +++ b/src/common/nm_bb_transc_fsm.c @@ -173,7 +173,7 @@ if (trx->bts->variant != BTS_OSMO_OMLDUMMY) { /* In OMLDUMMY, phy=NULL */ struct phy_instance *pinst = trx_phy_instance(trx); phy_state_connected = phy_link_state_get(pinst->phy_link) == PHY_LINK_CONNECTED; - rsl_link_connected = !!trx->rsl_link; + rsl_link_connected = !!trx->bb_transc.rsl.link; } else { phy_state_connected = true; rsl_link_connected = true; diff --git a/src/common/nm_radio_carrier_fsm.c b/src/common/nm_radio_carrier_fsm.c index 4431eb5..0e37c87 100644 --- a/src/common/nm_radio_carrier_fsm.c +++ b/src/common/nm_radio_carrier_fsm.c @@ -153,7 +153,7 @@ if (trx->bts->variant != BTS_OSMO_OMLDUMMY) { /* In OMLDUMMY, phy=NULL */ struct phy_instance *pinst = trx_phy_instance(trx); phy_state_connected = phy_link_state_get(pinst->phy_link) == PHY_LINK_CONNECTED; - rsl_link_connected = !!trx->rsl_link; + rsl_link_connected = !!trx->bb_transc.rsl.link; } else { phy_state_connected = true; rsl_link_connected = true; diff --git a/src/common/rsl.c b/src/common/rsl.c index 5231765..f11ec0e 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -2911,7 +2911,7 @@ static char *get_rsl_local_ip(struct gsm_bts_trx *trx) { - struct e1inp_ts *ts = trx->rsl_link->ts; + struct e1inp_ts *ts = trx->bb_transc.rsl.link->ts; struct sockaddr_storage ss; socklen_t sa_len = sizeof(ss); static char hostbuf[256]; @@ -3054,7 +3054,7 @@ * address */ if (connect_ip == 0) { struct e1inp_sign_link *sign_link = - lchan->ts->trx->rsl_link; + lchan->ts->trx->bb_transc.rsl.link; ia.s_addr = htonl(get_signlink_remote_ip(sign_link)); } else diff --git a/src/common/vty.c b/src/common/vty.c index 47e0ecd..f14cc92 100644 --- a/src/common/vty.c +++ b/src/common/vty.c @@ -1659,7 +1659,7 @@ vty_out(vty, " NM State: "); net_dump_nmstate(vty, &trx->mo.nm_state); - vty_out(vty, " RSL State: %s%s", trx->rsl_link? "connected" : "disconnected", VTY_NEWLINE); + vty_out(vty, " RSL State: %s%s", trx->bb_transc.rsl.link ? "connected" : "disconnected", VTY_NEWLINE); vty_out(vty, " Baseband Transceiver NM State: "); net_dump_nmstate(vty, &trx->bb_transc.mo.nm_state); vty_out(vty, " IPA stream ID: 0x%02x%s", trx->bb_transc.rsl.tei, VTY_NEWLINE); diff --git a/src/osmo-bts-trx/trx_vty.c b/src/osmo-bts-trx/trx_vty.c index 9cc9805..998e9cb 100644 --- a/src/osmo-bts-trx/trx_vty.c +++ b/src/osmo-bts-trx/trx_vty.c @@ -90,7 +90,7 @@ vty_out(vty, " bsic : undefined%s", VTY_NEWLINE); /* trx->ts[tn].priv is NULL in absence of the A-bis connection */ - if (trx->rsl_link == NULL) + if (trx->bb_transc.rsl.link == NULL) continue; for (tn = 0; tn < ARRAY_SIZE(trx->ts); tn++) { diff --git a/tests/handover/handover_test.c b/tests/handover/handover_test.c index 3c46971..f1235f5 100644 --- a/tests/handover/handover_test.c +++ b/tests/handover/handover_test.c @@ -99,9 +99,9 @@ OSMO_ASSERT(line); sign_ts = e1inp_line_ipa_rsl_ts(line, 0); e1inp_ts_config_sign(sign_ts, line); - trx->rsl_link = e1inp_sign_link_create(sign_ts, E1INP_SIGN_RSL, NULL, 0, 0); - OSMO_ASSERT(trx->rsl_link); - trx->rsl_link->trx = trx; + trx->bb_transc.rsl.link = e1inp_sign_link_create(sign_ts, E1INP_SIGN_RSL, NULL, 0, 0); + OSMO_ASSERT(trx->bb_transc.rsl.link); + trx->bb_transc.rsl.link->trx = trx; fprintf(stderr, "test 1: without timeout\n"); @@ -114,9 +114,9 @@ lchan->ho.active = HANDOVER_ENABLED; lchan->ho.ref = 23; l1sap_chan_act(lchan->ts->trx, 0x0a); - OSMO_ASSERT(msgb_dequeue(&trx->rsl_link->tx_list)); - OSMO_ASSERT(msgb_dequeue(&trx->rsl_link->tx_list)); - OSMO_ASSERT(!msgb_dequeue(&trx->rsl_link->tx_list)); + OSMO_ASSERT(msgb_dequeue(&trx->bb_transc.rsl.link->tx_list)); + OSMO_ASSERT(msgb_dequeue(&trx->bb_transc.rsl.link->tx_list)); + OSMO_ASSERT(!msgb_dequeue(&trx->bb_transc.rsl.link->tx_list)); /* send access burst with wrong ref */ memset(&nl1sap, 0, sizeof(nl1sap)); @@ -129,7 +129,7 @@ /* expect no action */ OSMO_ASSERT(modify_count == 0); - OSMO_ASSERT(!msgb_dequeue(&trx->rsl_link->tx_list)); + OSMO_ASSERT(!msgb_dequeue(&trx->bb_transc.rsl.link->tx_list)); /* send access burst with correct ref */ nl1sap.u.rach_ind.ra = 23; @@ -140,10 +140,10 @@ expect_phys_info(&trx->ts[2].lchan[0].lapdm_ch.lapdm_dcch); /* expect exactly one HO.DET */ - OSMO_ASSERT(msg = msgb_dequeue(&trx->rsl_link->tx_list)); + OSMO_ASSERT(msg = msgb_dequeue(&trx->bb_transc.rsl.link->tx_list)); rslh = msgb_l2(msg); OSMO_ASSERT(rslh->c.msg_type == RSL_MT_HANDO_DET); - OSMO_ASSERT(!msgb_dequeue(&trx->rsl_link->tx_list)); + OSMO_ASSERT(!msgb_dequeue(&trx->bb_transc.rsl.link->tx_list)); /* expect T3105 running */ OSMO_ASSERT(osmo_timer_pending(&trx->ts[2].lchan[0].ho.t3105)) @@ -171,10 +171,10 @@ expect_phys_info(&trx->ts[2].lchan[0].lapdm_ch.lapdm_dcch); /* expect exactly one HO.DET */ - OSMO_ASSERT(msg = msgb_dequeue(&trx->rsl_link->tx_list)); + OSMO_ASSERT(msg = msgb_dequeue(&trx->bb_transc.rsl.link->tx_list)); rslh = msgb_l2(msg); OSMO_ASSERT(rslh->c.msg_type == RSL_MT_HANDO_DET); - OSMO_ASSERT(!msgb_dequeue(&trx->rsl_link->tx_list)); + OSMO_ASSERT(!msgb_dequeue(&trx->bb_transc.rsl.link->tx_list)); for (i = 0; i < bts->ny1 - 1; i++) { /* expect T3105 running */ @@ -196,10 +196,10 @@ OSMO_ASSERT(!osmo_timer_pending(&trx->ts[2].lchan[0].ho.t3105)) /* expect exactly one CONN.FAIL */ - OSMO_ASSERT(msg = msgb_dequeue(&trx->rsl_link->tx_list)); + OSMO_ASSERT(msg = msgb_dequeue(&trx->bb_transc.rsl.link->tx_list)); rslh = msgb_l2(msg); OSMO_ASSERT(rslh->c.msg_type == RSL_MT_CONN_FAIL); - OSMO_ASSERT(!msgb_dequeue(&trx->rsl_link->tx_list)); + OSMO_ASSERT(!msgb_dequeue(&trx->bb_transc.rsl.link->tx_list)); #if 0 while (!quit) { -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34441?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I62937cbd81c27274b9f5f70d454d5319a6898c7b Gerrit-Change-Number: 34441 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-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 9 months

1
0
0 0

2025

2024

2023

2022

gerrit-log September 2023