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

[S] Change in osmo-ttcn3-hacks[master]: bts: Proper tear down
by pespin 11 Apr '23

11 Apr '23

Attention is currently required from: pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32266 to look at the new patch set (#2). Change subject: bts: Proper tear down ...................................................................... bts: Proper tear down This way we stop vc_IPA_OML before stopping the main component. If we don't do this, the vc_IPA_OML is potentially receiving tons of OML messages during BTS bringup which it tries to forward to the main component. If the main component has stopped at that point, port IPA_OML_PORT is no longer active and hence vc_IPA_OML fails with a dynamic test error. Change-Id: I761ae94aa698a74bb30b8a6b1860358545f222b5 --- M bts/BTS_Tests_OML.ttcn 1 file changed, 41 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/66/32266/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32266 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I761ae94aa698a74bb30b8a6b1860358545f222b5 Gerrit-Change-Number: 32266 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[M] Change in osmo-bts[master]: oml: Fix potential null ptr access on trx object
by pespin 11 Apr '23

11 Apr '23

Attention is currently required from: pespin. Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/32268 to look at the new patch set (#2). Change subject: oml: Fix potential null ptr access on trx object ...................................................................... oml: Fix potential null ptr access on trx object If the TRX_NR had no matching TRX it would access a NULL pointer trx after failing to resolve it. This commit refactors the code path to only require the trx pointer at the very end, and NACKs the message if TRX fails to be resolved. Change-Id: If27639ae1727fc5232e1a964a1b29f50c8805d80 --- M src/common/oml.c 1 file changed, 38 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/68/32268/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32268 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: If27639ae1727fc5232e1a964a1b29f50c8805d80 Gerrit-Change-Number: 32268 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[S] Change in osmo-ttcn3-hacks[master]: cosmetic: gbproxy: fix missing closing parenthesis in log line
by fixeria 11 Apr '23

11 Apr '23

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32233 ) Change subject: cosmetic: gbproxy: fix missing closing parenthesis in log line ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32233 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I4f2b5ef048ccd03d5ac2f448ef14691ece3200d2 Gerrit-Change-Number: 32233 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 11 Apr 2023 13:30:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-ttcn3-hacks[master]: bts/oml: Ignore SW Activated Reports
by fixeria 11 Apr '23

11 Apr '23

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32267 ) Change subject: bts/oml: Ignore SW Activated Reports ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32267 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I054dc74f60edee027923f03f8e73e56b1dc11a83 Gerrit-Change-Number: 32267 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 11 Apr 2023 13:29:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-ttcn3-hacks[master]: bts: Proper tear down
by fixeria 11 Apr '23

11 Apr '23

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32266 ) Change subject: bts: Proper tear down ...................................................................... Patch Set 1: (2 comments) File bts/BTS_Tests_OML.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32266/comment/47979a12_daf9… PS1, Line 155: friend I think you want `private` instead of `friend` here, since this function is not used anywhere outside of this module - no need to expose it. https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32266/comment/ad279ddf_2a20… PS1, Line 155: f_shutdown_helper We already have `f_shutdown()` in `library/Misc_Helpers.ttcn`, can we re-use it here? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32266 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I761ae94aa698a74bb30b8a6b1860358545f222b5 Gerrit-Change-Number: 32266 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 11 Apr 2023 13:29:14 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[M] Change in osmo-bts[master]: oml: Fix potential null ptr access on trx object
by fixeria 11 Apr '23

11 Apr '23

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/32268 ) Change subject: oml: Fix potential null ptr access on trx object ...................................................................... Patch Set 1: Code-Review+1 (1 comment) File src/common/oml.c: https://gerrit.osmocom.org/c/osmo-bts/+/32268/comment/2d8fdee2_05d23900 PS1, Line 1528: struct abis_om_fom_hdr *foh const -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32268 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: If27639ae1727fc5232e1a964a1b29f50c8805d80 Gerrit-Change-Number: 32268 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 11 Apr 2023 13:24:39 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmo-bts[master]: oml: Fix potential null ptr access on trx object
by pespin 11 Apr '23

11 Apr '23

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/32268 ) Change subject: oml: Fix potential null ptr access on trx object ...................................................................... oml: Fix potential null ptr access on trx object If the TRX_NR had no matching TRX it would access a NULL pointer trx after failing to resolve it. This commit refactors the code path to only require the trx pointer at the very end, and NACKs the message if TRX fails to be resolved. Change-Id: If27639ae1727fc5232e1a964a1b29f50c8805d80 --- M src/common/oml.c 1 file changed, 38 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/68/32268/1 diff --git a/src/common/oml.c b/src/common/oml.c index 2d6694a..1f347e7 100644 --- a/src/common/oml.c +++ b/src/common/oml.c @@ -1521,16 +1521,17 @@ return rc; } -static int rx_oml_ipa_rsl_connect(struct gsm_bts_trx *trx, struct msgb *msg, +static int rx_oml_ipa_rsl_connect(struct gsm_bts *bts, struct msgb *msg, const struct tlv_parsed *tp) { - struct e1inp_sign_link *oml_link = trx->bts->oml_link; - uint16_t port = IPA_TCP_PORT_RSL; - const char *trx_name = gsm_trx_name(trx); + struct e1inp_sign_link *oml_link = bts->oml_link; + struct abis_om_fom_hdr *foh = msgb_l3(msg); + struct gsm_bts_trx *trx = gsm_bts_trx_num(bts, foh->obj_inst.trx_nr); + const char *trx_name; struct in_addr in; - int rc; - + uint16_t port = IPA_TCP_PORT_RSL; uint8_t stream_id = 0; + int rc; if (TLVP_PRESENT(tp, NM_ATT_IPACC_DST_IP)) in.s_addr = tlvp_val32_unal(tp, NM_ATT_IPACC_DST_IP); @@ -1542,17 +1543,31 @@ if (TLVP_PRESENT(tp, NM_ATT_IPACC_STREAM_ID)) stream_id = *TLVP_VAL(tp, NM_ATT_IPACC_STREAM_ID); + if (!trx) { + LOGP(DOML, LOGL_ERROR, "Rx IPA RSL CONNECT IP=%s PORT=%u STREAM=0x%02x for unknown TRX_NR=%u\n", + inet_ntoa(in), port, stream_id, foh->obj_inst.trx_nr); + rc = NM_NACK_TRXNR_UNKN; + goto tx_ack_nack; + } + + 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); - if (trx->bts->variant == BTS_OSMO_OMLDUMMY) { + 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); + if (rc < 0) { + LOGP(DOML, LOGL_NOTICE, "%s: Error connecting IPA RSL: %d\n", trx_name, rc); + rc = NM_NACK_CANT_PERFORM; + } } +tx_ack_nack: /* The ACK/NACK is expected to contain all IEs */ if (!TLVP_PRESENT(tp, NM_ATT_IPACC_DST_IP)) /* TV32 */ msgb_tv_fixed_put(msg, NM_ATT_IPACC_DST_IP, sizeof(in), @@ -1562,12 +1577,7 @@ if (!TLVP_PRESENT(tp, NM_ATT_IPACC_STREAM_ID)) /* TV */ msgb_tv_put(msg, NM_ATT_IPACC_STREAM_ID, stream_id); - if (rc < 0) { - LOGP(DOML, LOGL_ERROR, "%s: Error in abis_open(RSL): %d\n", trx_name, rc); - return oml_fom_ack_nack(msg, NM_NACK_CANT_PERFORM); - } - - return oml_fom_ack_nack(msg, 0); + return oml_fom_ack_nack(msg, rc); } static int down_mom(struct gsm_bts *bts, struct msgb *msg) @@ -1616,8 +1626,7 @@ switch (foh->msg_type) { case NM_MT_IPACC_RSL_CONNECT: - trx = gsm_bts_trx_num(bts, foh->obj_inst.trx_nr); - ret = rx_oml_ipa_rsl_connect(trx, msg, &tp); + ret = rx_oml_ipa_rsl_connect(bts, msg, &tp); break; case NM_MT_IPACC_SET_ATTR: ret = oml_ipa_set_attr(bts, msg); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32268 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: If27639ae1727fc5232e1a964a1b29f50c8805d80 Gerrit-Change-Number: 32268 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-ttcn3-hacks[master]: bts/oml: Ignore SW Activated Reports
by pespin 11 Apr '23

11 Apr '23

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32267 ) Change subject: bts/oml: Ignore SW Activated Reports ...................................................................... bts/oml: Ignore SW Activated Reports Some components directly report being activated. Let's allow it. This fixes TC_initial_state_reports. Change-Id: I054dc74f60edee027923f03f8e73e56b1dc11a83 --- M bts/BTS_Tests_OML.ttcn 1 file changed, 13 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/67/32267/1 diff --git a/bts/BTS_Tests_OML.ttcn b/bts/BTS_Tests_OML.ttcn index 837ed50d..f912357 100644 --- a/bts/BTS_Tests_OML.ttcn +++ b/bts/BTS_Tests_OML.ttcn @@ -86,6 +86,7 @@ private altstep as_SwAct() runs on BSC_OML_CT { var OML_PDU rx; + [] OML.receive(tr_OML_SwActivatedRep(?, ?)); [] OML.receive(tr_OML_SwActReq(?, ?, ?, ?)) -> value rx { var OML_FOM_ObjectClass obj_class := rx.u.fom.hdr.obj_class; var OML_FOM_ObjectInstance obj_inst := rx.u.fom.hdr.obj_inst; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32267 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I054dc74f60edee027923f03f8e73e56b1dc11a83 Gerrit-Change-Number: 32267 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-ttcn3-hacks[master]: bts: Proper tear down
by pespin 11 Apr '23

11 Apr '23

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32266 ) Change subject: bts: Proper tear down ...................................................................... bts: Proper tear down This way we stop vc_IPA_OML before stopping the main component. If we don't do this, the vc_IPA_OML is potentially receiving tons of OML messages during BTS bringup which it tries to forward to the main component. If the main component has stopped at that point, port IPA_OML_PORT is no longer active and hence vc_IPA_OML fails with a dynamic test error. Change-Id: I761ae94aa698a74bb30b8a6b1860358545f222b5 --- M bts/BTS_Tests_OML.ttcn 1 file changed, 43 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/66/32266/1 diff --git a/bts/BTS_Tests_OML.ttcn b/bts/BTS_Tests_OML.ttcn index ac66c02..837ed50d 100644 --- a/bts/BTS_Tests_OML.ttcn +++ b/bts/BTS_Tests_OML.ttcn @@ -152,6 +152,13 @@ pt.send(t_SD_PCUIF(pcu_conn_id, ts_PCUIF_TXT_IND(0, PCU_VERSION, testcasename()))); } +friend function f_shutdown_helper() runs on BSC_OML_CT +{ + all component.stop; + setverdict(pass); + mtc.stop; +} + /* Perform an "OPSTART" procedure with the speciifed MO" */ private function f_oml_opstart(template (value) OML_FOM_ObjectClass obj_class, template (value) OML_FOM_ObjectInstance obj_inst, @@ -431,6 +438,7 @@ testcase TC_oml_nothing() runs on BSC_OML_CT { f_init_oml(testcasename()); f_sleep(100.0); + f_shutdown_helper(); } /* test behavior for unsupported message discriminator */ @@ -447,6 +455,7 @@ }; f_oml_send_exp_fail_rep(mmi_pdu, "Unexpected response to MMI message"); + f_shutdown_helper(); } /* send a message of unknown/unsupported type */ @@ -455,6 +464,7 @@ var OML_PDU tx := valueof(ts_OML_MsgType(NM_MT_ESTABLISH_TEI, NM_OC_BTS, ts_OML_ObjectInstance(0, 255, 255), omit)); f_oml_send_exp_fail_rep(tx, "ESTABLISH_TEI"); + f_shutdown_helper(); } /* send message shorter than OML header length indicates */ @@ -468,6 +478,7 @@ ts_OML_ObjectInstance(0, 255, 255), ?, ?, ?); f_oml_exp_rx(exp_fail, "Failure Event Report"); + f_shutdown_helper(); } /* send message longer than OML header length indicates */ @@ -480,6 +491,7 @@ tr_OML_ChangeAdmStateACK(NM_OC_BTS, ts_OML_ObjectInstance(0, 255, 255), NM_STATE_LOCKED); f_oml_exp_rx(exp, "Change ADM State ACK"); + f_shutdown_helper(); } /* test behavior for unsupported placement (!= ONLY) */ @@ -499,6 +511,7 @@ pdu.placement := ABIS_OM_PLACEMENT_LAST; f_oml_send_exp_fail_rep(pdu, "Unexpected response to PLACEMENT_LAST"); + f_shutdown_helper(); } /* test behavior for sequence != 0 (invalid if mdisc == ONLY) */ @@ -513,6 +526,7 @@ pdu.sequence := 23; f_oml_send_exp_fail_rep(pdu, "Unexpected response to sequence != 0"); + f_shutdown_helper(); } /* test behavior for unsupported obj_class */ @@ -526,6 +540,7 @@ /* NM_NACK_OBJCLASS_INVAL */ f_oml_send_exp_nack(pdu, NM_NACK_OBJCLASS_NOTSUPP); + f_shutdown_helper(); } /* test behavior for wrong BTS number in object instance */ @@ -537,6 +552,7 @@ var OML_PDU pdu := valueof(ts_OML_ChangeAdmState(obj_class, obj_inst, NM_STATE_LOCKED)); f_oml_send_exp_nack(pdu, NM_NACK_BTSNR_UNKN); + f_shutdown_helper(); } /* test behavior for wrong TRX number in object instance */ @@ -548,6 +564,7 @@ var OML_PDU pdu := valueof(ts_OML_ChangeAdmState(obj_class, obj_inst, NM_STATE_LOCKED)); f_oml_send_exp_nack(pdu, NM_NACK_TRXNR_UNKN); + f_shutdown_helper(); } /* test behavior for wrong TS number in object instance */ @@ -559,6 +576,7 @@ var OML_PDU pdu := valueof(ts_OML_ChangeAdmState(obj_class, obj_inst, NM_STATE_LOCKED)); f_oml_send_exp_nack(pdu, NM_NACK_OBJINST_UNKN); + f_shutdown_helper(); } /* RADIO CARRIER: Test OPSTART with SET BTS ATTRIBUTES; expect ACK */ @@ -570,6 +588,7 @@ f_oml_radio_attr(0); f_oml_opstart(obj_class, obj_inst); + f_shutdown_helper(); } /* RADIO CARRIER: Test OPSTART without SET BTS ATTRIBUTES; expect NACK */ @@ -581,6 +600,7 @@ /* we are *not* setting any attributes here */ f_oml_opstart(obj_class, obj_inst, exp_fail := true); + f_shutdown_helper(); } @@ -600,6 +620,7 @@ f_oml_bts_setattr(); f_oml_opstart(obj_class, obj_inst, false, NM_OPSTATE_ENABLED); + f_shutdown_helper(); } @@ -612,6 +633,7 @@ /* we are *not* setting any attributes here */ f_oml_opstart(obj_class, obj_inst, exp_fail := true); + f_shutdown_helper(); } /* CHANNEL: Test OPSTART after SET CHANNEL ATTRIBUTES; expect ACK */ @@ -623,6 +645,7 @@ f_oml_ts_attr(trx_nr := 0, ts_nr := 1); f_oml_opstart(obj_class, obj_inst); + f_shutdown_helper(); } @@ -635,6 +658,7 @@ /* we are *not* setting any attributes here */ f_oml_opstart(obj_class, obj_inst, exp_fail := true); + f_shutdown_helper(); } /* Ensure the initial Event State Change Reports after OML connect match our expectation */ @@ -649,6 +673,7 @@ [] OML.receive(tr_OML_StateChgEvtRep(NM_OC_BTS, ts_OML_ObjectInstance(0, 255, 255), NM_OPSTATE_DISABLED, NM_AVSTATE_DEPENDENCY)); } + f_shutdown_helper(); } /* Make sure that the IUT sends RSL Connect NACK when the remote is not reachable. */ @@ -673,6 +698,7 @@ setverdict(fail, "Timeout waiting for RSL Connect NACK"); } } + f_shutdown_helper(); } /* Make sure that the IUT forwards Container PCUIF messages between BSC and PCU */ @@ -766,7 +792,7 @@ } [] T.timeout { setverdict(fail, "Timeout waiting for ANR request on BSC inteface"); } } - setverdict(pass); + f_shutdown_helper(); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32266 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I761ae94aa698a74bb30b8a6b1860358545f222b5 Gerrit-Change-Number: 32266 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-bts[master]: pcu_sock: Drop bts_sm pointer
by pespin 11 Apr '23

11 Apr '23

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/32265 ) Change subject: pcu_sock: Drop bts_sm pointer ...................................................................... pcu_sock: Drop bts_sm pointer It is not really needed since the object is global. Change-Id: I17f7c42dc9f38485dbcc8595a3a3dbf5a80a7961 --- M src/common/pcu_sock.c 1 file changed, 12 insertions(+), 3 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c index 7d0c796..daa1a57 100644 --- a/src/common/pcu_sock.c +++ b/src/common/pcu_sock.c @@ -947,7 +947,6 @@ */ struct pcu_sock_state { - struct gsm_bts_sm *bts_sm; struct osmo_fd listen_bfd; /* fd for listen socket */ struct osmo_fd conn_bfd; /* fd for connection to lcr */ struct llist_head upqueue; /* queue for sending messages */ @@ -990,7 +989,7 @@ unsigned int tn; /* FIXME: allow multiple BTS */ - bts = llist_entry(state->bts_sm->bts_list.next, struct gsm_bts, list); + bts = llist_entry(g_bts_sm->bts_list.next, struct gsm_bts, list); LOGP(DPCU, LOGL_NOTICE, "PCU socket has LOST connection\n"); oml_tx_failure_event_rep(&bts->gprs.cell.mo, NM_SEVER_MAJOR, OSMO_EVT_PCU_VERS, @@ -1183,7 +1182,6 @@ return -ENOMEM; INIT_LLIST_HEAD(&state->upqueue); - state->bts_sm = g_bts_sm; state->conn_bfd.fd = -1; bfd = &state->listen_bfd; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32265 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I17f7c42dc9f38485dbcc8595a3a3dbf5a80a7961 Gerrit-Change-Number: 32265 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0