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

[S] Change in osmo-dev[master]: net/templates/osmo-msc.conf: modernize
by osmith 26 Jun '23

26 Jun '23

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/33459 ) Change subject: net/templates/osmo-msc.conf: modernize ...................................................................... net/templates/osmo-msc.conf: modernize * Write explicit role & sctp-role fields in ASP * Use new mgw node Change-Id: Id77a579ff9315f2c6bf9d7f6d80b4b022e8d4963 --- M net/templates/osmo-msc.cfg 1 file changed, 18 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/59/33459/1 diff --git a/net/templates/osmo-msc.cfg b/net/templates/osmo-msc.cfg index c018c78..166d408 100644 --- a/net/templates/osmo-msc.cfg +++ b/net/templates/osmo-msc.cfg @@ -3,6 +3,8 @@ point-code ${MSC_PC} asp asp-clnt-msc-0 2905 0 m3ua remote-ip ${STP_CN_IP} + role asp + sctp-role client network network country code ${MCC} mobile network code ${MNC} @@ -11,11 +13,12 @@ short name 35c3 long name 35c3 mm info 1 + mgw 0 + remote-ip ${MGW4MSC_IP} + remote-port ${MGW4MSC_PORT} + endpoint-domain msc msc mncc ${MSC_MNCC} - mgw remote-ip ${MGW4MSC_IP} - mgw remote-port ${MGW4MSC_PORT} - mgw endpoint-domain msc check-imei-rqd 1 # For nano3G: iu rab-assign-addr-enc x213 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/33459 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: Id77a579ff9315f2c6bf9d7f6d80b4b022e8d4963 Gerrit-Change-Number: 33459 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-dev[master]: net/config_2g3g: set a valid BTS1_ARFCN
by osmith 26 Jun '23

26 Jun '23

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/33461 ) Change subject: net/config_2g3g: set a valid BTS1_ARFCN ...................................................................... net/config_2g3g: set a valid BTS1_ARFCN Even if only one BTS is used, both ARFCNs are written to the osmo-bsc config and osmo-bsc refuses to start up if there is an invalid ARFCN. Change-Id: I569b407736713cefd46a1c927d9ee85f91332553 --- M net/config_2g3g 1 file changed, 13 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/61/33461/1 diff --git a/net/config_2g3g b/net/config_2g3g index 8cf642d..21a2772 100644 --- a/net/config_2g3g +++ b/net/config_2g3g @@ -46,7 +46,7 @@ BTS1_DESCRIPTION="my test BTS 1" BTS1_IPA_UNIT="1 0" -BTS1_ARFCN=125 +BTS1_ARFCN=512 BTS1_CI=${BTSn} BTS1_BSIC=${BTSn} BTS1_GPRS_MODE=gprs -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/33461 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I569b407736713cefd46a1c927d9ee85f91332553 Gerrit-Change-Number: 33461 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-dev[master]: net/templates/run: fix prompts not working
by osmith 26 Jun '23

26 Jun '23

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/33458 ) Change subject: net/templates/run: fix prompts not working ...................................................................... net/templates/run: fix prompts not working Reset the terminal after tmux new-window and after killing programs during shutdown. Otherwise with tmux 3.2a the input prompts do not work. Change-Id: I7f14c364637f82699a5b935637222d5da977d67d --- M net/templates/run.sh 1 file changed, 13 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/58/33458/1 diff --git a/net/templates/run.sh b/net/templates/run.sh index 6b8a324..1954cfb 100755 --- a/net/templates/run.sh +++ b/net/templates/run.sh @@ -141,6 +141,7 @@ case "$terminal" in tmux) tmux new-window -d -n "$title" "$launcher &; echo \$! > $pidfile_term; wait" + stty sane ;; *) sleep .2 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/33458 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I7f14c364637f82699a5b935637222d5da977d67d Gerrit-Change-Number: 33458 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-dev[master]: net/templates/osmo-bsc: modernize
by osmith 26 Jun '23

26 Jun '23

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/33462 ) Change subject: net/templates/osmo-bsc: modernize ...................................................................... net/templates/osmo-bsc: modernize * Write explicit role & sctp-role fields in ASP * Use new mgw node Change-Id: I0051ba7f8116ea29380d3f438fd3a0af15d9d12f --- M net/templates/osmo-bsc-0.cfg M net/templates/osmo-bsc-1.cfg 2 files changed, 26 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/62/33462/1 diff --git a/net/templates/osmo-bsc-0.cfg b/net/templates/osmo-bsc-0.cfg index 8150307..7f0d6d6 100644 --- a/net/templates/osmo-bsc-0.cfg +++ b/net/templates/osmo-bsc-0.cfg @@ -8,9 +8,14 @@ point-code ${BSC0_PC} asp asp-clnt-bsc-0 2905 0 m3ua remote-ip ${STP_RAN_IP} + role asp + sctp-role client msc 0 - mgw remote-ip ${MGW4BSC0_IP} - mgw remote-port ${MGW4BSC0_PORT} - mgw endpoint-domain bsc0 codec-list ${BSC0_CODEC_LIST} + +network + mgw 0 + remote-ip ${MGW4BSC0_IP} + remote-port ${MGW4BSC0_PORT} + endpoint-domain bsc0 diff --git a/net/templates/osmo-bsc-1.cfg b/net/templates/osmo-bsc-1.cfg index d559571..2ee1c6e 100644 --- a/net/templates/osmo-bsc-1.cfg +++ b/net/templates/osmo-bsc-1.cfg @@ -8,16 +8,19 @@ point-code ${BSC1_PC} asp asp-clnt-bsc-1 2905 0 m3ua remote-ip ${STP_RAN_IP} + role asp + sctp-role client msc 0 - mgw remote-ip ${MGW4BSC1_IP} - mgw remote-port ${MGW4BSC1_PORT} - mgw endpoint-domain bsc1 codec-list ${BSC1_CODEC_LIST} network bts 1 gprs mode none + mgw 0 + remote-ip ${MGW4BSC1_IP} + remote-port ${MGW4BSC1_PORT} + endpoint-domain bsc1 ctrl bind ${BSC1_IP} -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/33462 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I0051ba7f8116ea29380d3f438fd3a0af15d9d12f Gerrit-Change-Number: 33462 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-bts[master]: osmo-bts-sysmo: trx_mute_on_init_cb: call bts_update_status
by osmith 26 Jun '23

26 Jun '23

Attention is currently required from: osmith, laforge. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/33413 ) Change subject: osmo-bts-sysmo: trx_mute_on_init_cb: call bts_update_status ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/33413 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ib73a33a82fbb86ead3569a6bb22fb001c55354d4 Gerrit-Change-Number: 33413 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Mon, 26 Jun 2023 13:35:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in osmo-bts[master]: osmo-bts-sysmo: mute PHY until OML is ready
by osmith 26 Jun '23

26 Jun '23

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/33457 ) Change subject: osmo-bts-sysmo: mute PHY until OML is ready ...................................................................... osmo-bts-sysmo: mute PHY until OML is ready Connecting to OML and PHY is done in parallel. Mute PHY if it is connected first and the connection to OML is not established yet. I've verified that if no OML connection can be established, the LED only turns on briefly, and then switches to off until OML succeeds. Fixes: SYS#6496 Change-Id: Ia1769f952fa787202a442a33db5ed4a1f7cbe9c3 --- M src/osmo-bts-sysmo/l1_if.c M src/osmo-bts-sysmo/oml.c 2 files changed, 23 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/57/33457/1 diff --git a/src/osmo-bts-sysmo/l1_if.c b/src/osmo-bts-sysmo/l1_if.c index 0a1bbf3..6ad4aed 100644 --- a/src/osmo-bts-sysmo/l1_if.c +++ b/src/osmo-bts-sysmo/l1_if.c @@ -1228,6 +1228,8 @@ return l1if_handle_ind(fl1h, msg); } +int trx_rf_lock(struct gsm_bts_trx *trx, int locked, l1if_compl_cb *cb); + static int activate_rf_compl_cb(struct gsm_bts_trx *trx, struct msgb *resp, void *data) { @@ -1258,6 +1260,9 @@ /* signal availability */ osmo_fsm_inst_dispatch(trx->mo.fi, NM_EV_SW_ACT, NULL); osmo_fsm_inst_dispatch(trx->bb_transc.mo.fi, NM_EV_SW_ACT, NULL); + + if (!trx->mo.opstart_success) + trx_rf_lock(trx, 1, NULL); } } else { bts_update_status(BTS_STATUS_RF_ACTIVE, 0); diff --git a/src/osmo-bts-sysmo/oml.c b/src/osmo-bts-sysmo/oml.c index 3ee1094..5ac72f2 100644 --- a/src/osmo-bts-sysmo/oml.c +++ b/src/osmo-bts-sysmo/oml.c @@ -98,7 +98,7 @@ */ }; -static int trx_rf_lock(struct gsm_bts_trx *trx, int locked, l1if_compl_cb *cb); +int trx_rf_lock(struct gsm_bts_trx *trx, int locked, l1if_compl_cb *cb); static void *prim_init(GsmL1_Prim_t *prim, GsmL1_PrimId_t id, struct femtol1_hdl *gl1, HANDLE hLayer3) @@ -483,7 +483,7 @@ bts_model_trx_close_cb(trx, rc); } -static int trx_rf_lock(struct gsm_bts_trx *trx, int locked, l1if_compl_cb *cb) +int trx_rf_lock(struct gsm_bts_trx *trx, int locked, l1if_compl_cb *cb) { struct femtol1_hdl *fl1h = trx_femtol1_hdl(trx); uint8_t mute[8]; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/33457 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ia1769f952fa787202a442a33db5ed4a1f7cbe9c3 Gerrit-Change-Number: 33457 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-bts[master]: osmo-bts-sysmo: activate_rf: no dispatch on fail
by osmith 26 Jun '23

26 Jun '23

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/33456 ) Change subject: osmo-bts-sysmo: activate_rf: no dispatch on fail ...................................................................... osmo-bts-sysmo: activate_rf: no dispatch on fail Do not dispatch NM_EV_SW_ACT to trx->mo.fi and trx->bb_transc.mo.fi when RF-ACT.conf was not successful. Running this code path anyway looks like a leftover from when bts_shutdown used to exit osmo-bts. Change-Id: I342187604f4c72303e393ce6925b94d610bfa8fa --- M src/osmo-bts-sysmo/l1_if.c 1 file changed, 18 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/56/33456/1 diff --git a/src/osmo-bts-sysmo/l1_if.c b/src/osmo-bts-sysmo/l1_if.c index 9a0b19f..0a1bbf3 100644 --- a/src/osmo-bts-sysmo/l1_if.c +++ b/src/osmo-bts-sysmo/l1_if.c @@ -1252,12 +1252,13 @@ LOGP(DL1C, LOGL_FATAL, "RF-ACT.conf with status %s\n", get_value_string(femtobts_l1status_names, status)); bts_shutdown(trx->bts, "RF-ACT failure"); - } else + } else { bts_update_status(BTS_STATUS_RF_ACTIVE, 1); - /* signal availability */ - osmo_fsm_inst_dispatch(trx->mo.fi, NM_EV_SW_ACT, NULL); - osmo_fsm_inst_dispatch(trx->bb_transc.mo.fi, NM_EV_SW_ACT, NULL); + /* signal availability */ + osmo_fsm_inst_dispatch(trx->mo.fi, NM_EV_SW_ACT, NULL); + osmo_fsm_inst_dispatch(trx->bb_transc.mo.fi, NM_EV_SW_ACT, NULL); + } } else { bts_update_status(BTS_STATUS_RF_ACTIVE, 0); osmo_fsm_inst_dispatch(trx->mo.fi, NM_EV_DISABLE, NULL); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/33456 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I342187604f4c72303e393ce6925b94d610bfa8fa Gerrit-Change-Number: 33456 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in libosmo-netif[master]: stream: Fix endless loop on server on client disconnect
by pespin 26 Jun '23

26 Jun '23

Attention is currently required from: arehbein. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33196 ) Change subject: stream: Fix endless loop on server on client disconnect ...................................................................... Patch Set 3: (1 comment) File src/stream.c: https://gerrit.osmocom.org/c/libosmo-netif/+/33196/comment/22f18be2_b0682271 PS3, Line 1349: osmo_stream_srv_set_flush_and_destroy(conn); why aren't you simply disabling READ poll flag here if res == 0? Another issue I see is that probably if res < 0, we should destroy the stream even if the tx queue len is not 0, since anyway (checking at the errno) the socket is already dead. -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33196 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I012ddf14ae17642a52d34026d85ab6958cf488a1 Gerrit-Change-Number: 33196 Gerrit-PatchSet: 3 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: daniel <dwillmann(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Comment-Date: Mon, 26 Jun 2023 12:48:32 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in libosmo-netif[master]: ipa: Add helper osmo_ipa_ext_msg_alloc()
by Jenkins Builder 26 Jun '23

26 Jun '23

Attention is currently required from: arehbein. Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33423 ) Change subject: ipa: Add helper osmo_ipa_ext_msg_alloc() ...................................................................... Patch Set 3: (1 comment) File src/ipa.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-8583): https://gerrit.osmocom.org/c/libosmo-netif/+/33423/comment/6ad62c3c_f9258e3a PS3, Line 102: return osmo_ipa_msg_alloc(sizeof (struct ipa_head_ext) + headroom); space prohibited between function name and open parenthesis '(' -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33423 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I231026442503e6d7f720fd100f38c01916235d63 Gerrit-Change-Number: 33423 Gerrit-PatchSet: 3 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Comment-Date: Mon, 26 Jun 2023 12:44:34 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[M] Change in libosmo-netif[master]: stream: Add IPA send function/IPA-mode read to srv
by Jenkins Builder 26 Jun '23

26 Jun '23

Attention is currently required from: arehbein. Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33201 ) Change subject: stream: Add IPA send function/IPA-mode read to srv ...................................................................... Patch Set 4: (2 comments) File include/osmocom/netif/stream.h: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-8582): https://gerrit.osmocom.org/c/libosmo-netif/+/33201/comment/5e720663_f3def052 PS4, Line 77: enum ipaccess_proto_ext pe, struct msgb *msg); code indent should use tabs where possible Robot Comment from checkpatch (run ID jenkins-gerrit-lint-8582): https://gerrit.osmocom.org/c/libosmo-netif/+/33201/comment/ae58fb55_c07f3caf PS4, Line 77: enum ipaccess_proto_ext pe, struct msgb *msg); please, no spaces at the start of a line -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33201 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I61e1fe59166c46595efe8c1f32b8f2607cb6c529 Gerrit-Change-Number: 33201 Gerrit-PatchSet: 4 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Comment-Date: Mon, 26 Jun 2023 12:44:30 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0