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

[S] Change in libosmo-gprs[master]: rlcmac: fix wrong MSGT_PACKET_{RESOURCE_REQUEST->DOWNLINK_ACK_NACK}
by fixeria 25 Mar '23

25 Mar '23

fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/32059 ) Change subject: rlcmac: fix wrong MSGT_PACKET_{RESOURCE_REQUEST->DOWNLINK_ACK_NACK} ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/32059 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I3c475afc3f7cca42dcf9b1d90c2ac425d3158708 Gerrit-Change-Number: 32059 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sat, 25 Mar 2023 09:55:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in libosmo-gprs[master]: rlcmac: fix wrong MSGT_PACKET_{RESOURCE_REQUEST->DOWNLINK_ACK_NACK}
by fixeria 25 Mar '23

25 Mar '23

Attention is currently required from: fixeria. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-gprs/+/32059 to look at the new patch set (#2). Change subject: rlcmac: fix wrong MSGT_PACKET_{RESOURCE_REQUEST->DOWNLINK_ACK_NACK} ...................................................................... rlcmac: fix wrong MSGT_PACKET_{RESOURCE_REQUEST->DOWNLINK_ACK_NACK} Change-Id: I3c475afc3f7cca42dcf9b1d90c2ac425d3158708 Related: OS#5500 --- M src/rlcmac/rlcmac_enc.c M tests/rlcmac/rlcmac_prim_test.ok 2 files changed, 13 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/59/32059/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/32059 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I3c475afc3f7cca42dcf9b1d90c2ac425d3158708 Gerrit-Change-Number: 32059 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[S] Change in osmocom-bb[master]: trxcon: add GSMTAP logging target if '-g' is given
by fixeria 25 Mar '23

25 Mar '23

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/32056 ) Change subject: trxcon: add GSMTAP logging target if '-g' is given ...................................................................... trxcon: add GSMTAP logging target if '-g' is given Unlike the other more mature Osmocom projects, trxcon does not have its own VTY interface and thus does not support the config file parsing, so currently it's impossible to configure additional logging targets. There is a command line option '-g', which enables GSMTAP Um logging. Let's also add a GSMTAP logging target if it's given. This is a quick hack, but good enough for occasional debugging. Change-Id: I2c5e630dd508dff12d0116bdc0a4cc1276cac5ed Related: OS#5500 --- M src/host/trxcon/src/trxcon_main.c 1 file changed, 31 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/host/trxcon/src/trxcon_main.c b/src/host/trxcon/src/trxcon_main.c index 26a5742..d30c98e 100644 --- a/src/host/trxcon/src/trxcon_main.c +++ b/src/host/trxcon/src/trxcon_main.c @@ -348,11 +348,23 @@ /* Optional GSMTAP */ if (app_data.gsmtap_ip != NULL) { + struct log_target *lt; + app_data.gsmtap = gsmtap_source_init(app_data.gsmtap_ip, GSMTAP_UDP_PORT, 1); if (!app_data.gsmtap) { - LOGP(DAPP, LOGL_ERROR, "Failed to init GSMTAP\n"); + LOGP(DAPP, LOGL_ERROR, "Failed to init GSMTAP Um logging\n"); goto exit; } + + lt = log_target_create_gsmtap(app_data.gsmtap_ip, GSMTAP_UDP_PORT, + "trxcon", false, false); + if (lt == NULL) { + LOGP(DAPP, LOGL_ERROR, "Failed to init GSMTAP logging target\n"); + goto exit; + } else { + log_add_target(lt); + } + /* Suppress ICMP "destination unreachable" errors */ gsmtap_source_add_sink(app_data.gsmtap); } -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32056 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I2c5e630dd508dff12d0116bdc0a4cc1276cac5ed Gerrit-Change-Number: 32056 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder 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

[S] Change in osmocom-bb[master]: trxcon: l1sched_prim_dequeue(): check TDMA Fn in PDCH prims
by fixeria 25 Mar '23

25 Mar '23

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/32057 ) Change subject: trxcon: l1sched_prim_dequeue(): check TDMA Fn in PDCH prims ...................................................................... trxcon: l1sched_prim_dequeue(): check TDMA Fn in PDCH prims We shall never be transmitting Uplink PDCH blocks if the current TDMA Fn does not match the requested TDMA Fn, because Tx timing is critical for PDCH timeslots. Drop and log an error message. Change-Id: I6b2d9cc93ce266524f56a1b6a97beecfc0ad042d Related: OS#5500 --- M src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h M src/host/trxcon/src/sched_prim.c M src/host/trxcon/src/trxcon_fsm.c 3 files changed, 34 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h b/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h index 84695fe..350294d 100644 --- a/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h +++ b/src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h @@ -354,6 +354,8 @@ enum l1sched_ts_prim_type type; /*! Logical channel type */ enum l1sched_lchan_type chan; + /*! TDMA Fn for L1SCHED_{PDTCH,PTCCH} */ + uint32_t fn; /*! Payload length */ size_t payload_len; /*! Payload */ diff --git a/src/host/trxcon/src/sched_prim.c b/src/host/trxcon/src/sched_prim.c index f97e505..99c4d82 100644 --- a/src/host/trxcon/src/sched_prim.c +++ b/src/host/trxcon/src/sched_prim.c @@ -421,6 +421,8 @@ struct l1sched_ts_prim *l1sched_prim_dequeue(struct llist_head *queue, uint32_t fn, struct l1sched_lchan_state *lchan) { + struct l1sched_ts_prim *prim; + /* SACCH is unorthodox, see 3GPP TS 04.08, section 3.4.1 */ if (L1SCHED_CHAN_IS_SACCH(lchan->type)) return prim_dequeue_sacch(queue, lchan); @@ -439,6 +441,20 @@ case L1SCHED_TCHH_1: return prim_dequeue_tch_h(queue, fn, lchan->type); + /* PDCH is timing critical, we need to check TDMA Fn */ + case L1SCHED_PDTCH: + case L1SCHED_PTCCH: + prim = prim_dequeue_one(queue, lchan->type); + if (prim == NULL) + return NULL; + if (OSMO_LIKELY(prim->fn == fn)) + return prim; + LOGP_LCHAND(lchan, LOGL_ERROR, + "%s(): dropping Tx primitive (current Fn=%u, prim Fn=%u)\n", + __func__, fn, prim->fn); + talloc_free(prim); + return NULL; + /* Other kinds of logical channels */ default: return prim_dequeue_one(queue, lchan->type); diff --git a/src/host/trxcon/src/trxcon_fsm.c b/src/host/trxcon/src/trxcon_fsm.c index 053ca2f..91c807a 100644 --- a/src/host/trxcon/src/trxcon_fsm.c +++ b/src/host/trxcon/src/trxcon_fsm.c @@ -560,6 +560,8 @@ LOGPFSML(fi, LOGL_ERROR, "Failed to enqueue a prim\n"); return; } + + prim->fn = block_req.hdr.fn; break; } case TRXCON_EV_RX_DATA_IND: -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32057 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I6b2d9cc93ce266524f56a1b6a97beecfc0ad042d Gerrit-Change-Number: 32057 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder 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

[S] Change in osmocom-bb[master]: trxcon: add GSMTAP logging target if '-g' is given
by fixeria 25 Mar '23

25 Mar '23

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/32056 ) Change subject: trxcon: add GSMTAP logging target if '-g' is given ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32056 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I2c5e630dd508dff12d0116bdc0a4cc1276cac5ed Gerrit-Change-Number: 32056 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder 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-Comment-Date: Sat, 25 Mar 2023 09:46:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmocom-bb[master]: trxcon: add GSMTAP logging target if '-g' is given
by fixeria 25 Mar '23

25 Mar '23

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/32056 ) Change subject: trxcon: add GSMTAP logging target if '-g' is given ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > I think we should start thinking about adding a VTY there, in order to avoid adding this kind of stu […] Well, I was thinking about that (https://osmocom.org/issues/3666) But I really can't see how the VTY can be useful other than for general stuff like logging and cpusched stuff... It already does support multiple trxcon instances on the same socket, automatically creating TRXC/TRXD connections. But still, we can make it optional. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32056 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I2c5e630dd508dff12d0116bdc0a4cc1276cac5ed Gerrit-Change-Number: 32056 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sat, 25 Mar 2023 09:46:16 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in osmo-ci[master]: ansible.cfg: set default remote_user = root
by laforge 25 Mar '23

25 Mar '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/30920 ) ( 3 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: ansible.cfg: set default remote_user = root ...................................................................... ansible.cfg: set default remote_user = root Change-Id: Iccd7dce77ac408d1a0d5782b4563a5dfcf112030 --- M ansible/ansible.cfg 1 file changed, 11 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/ansible/ansible.cfg b/ansible/ansible.cfg index 93e5840..6c361a3 100644 --- a/ansible/ansible.cfg +++ b/ansible/ansible.cfg @@ -1,6 +1,8 @@ [defaults] stdout_callback=debug +remote_user = root + [ssh_connection] ssh_args = -F util/ssh_config -o ControlMaster=auto -o ControlPersist=60s -o StrictHostKeyChecking=accept-new -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30920 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Iccd7dce77ac408d1a0d5782b4563a5dfcf112030 Gerrit-Change-Number: 30920 Gerrit-PatchSet: 5 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-ci[master]: ansible: add ssh configuration
by laforge 25 Mar '23

25 Mar '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/30919 ) Change subject: ansible: add ssh configuration ...................................................................... ansible: add ssh configuration Change-Id: Idbc7a51c20125182b1e484ae516e8d72239c1e00 --- M ansible/ansible.cfg A ansible/util/ssh_config 2 files changed, 16 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/ansible/ansible.cfg b/ansible/ansible.cfg index 11169e6..93e5840 100644 --- a/ansible/ansible.cfg +++ b/ansible/ansible.cfg @@ -1,2 +1,6 @@ [defaults] stdout_callback=debug + +[ssh_connection] +ssh_args = -F util/ssh_config -o ControlMaster=auto -o ControlPersist=60s -o StrictHostKeyChecking=accept-new + diff --git a/ansible/util/ssh_config b/ansible/util/ssh_config new file mode 100644 index 0000000..9738e83 --- /dev/null +++ b/ansible/util/ssh_config @@ -0,0 +1,3 @@ + UserKnownHostsFile=util/known_hosts + HashKnownHosts=no + -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30919 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Idbc7a51c20125182b1e484ae516e8d72239c1e00 Gerrit-Change-Number: 30919 Gerrit-PatchSet: 6 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-ci[master]: ansible: add ssh configuration
by laforge 25 Mar '23

25 Mar '23

Attention is currently required from: lynxis lazus. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/30919 ) Change subject: ansible: add ssh configuration ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30919 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Idbc7a51c20125182b1e484ae516e8d72239c1e00 Gerrit-Change-Number: 30919 Gerrit-PatchSet: 5 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Sat, 25 Mar 2023 08:07:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-sip-connector[master]: sip: tweak log for release caused by status >= 300
by laforge 25 Mar '23

25 Mar '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/32018 ) Change subject: sip: tweak log for release caused by status >= 300 ...................................................................... sip: tweak log for release caused by status >= 300 Make it easier to spot when the sip server answers an invite with anything that would cause osmo-sip-connector to release the call. Related: SYS#6386 Change-Id: I64889d6ce174dc17d44d85aac12e7ee6e6b06164 --- M src/sip.c 1 file changed, 19 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/sip.c b/src/sip.c index 9124752..ca8f4ba 100644 --- a/src/sip.c +++ b/src/sip.c @@ -380,7 +380,12 @@ else if (status >= 300) { struct call_leg *other = call_leg_other(&leg->base); - LOGP(DSIP, LOGL_INFO, "INVITE got status(%d), releasing leg(%p).\n", status, leg); + if (status < 400) + LOGP(DSIP, LOGL_NOTICE, "INVITE got status(%d), releasing leg(%p) as redirect is not" + " implemented\n", status, leg); + else + LOGP(DSIP, LOGL_ERROR, "INVITE got status(%d), releasing leg(%p)\n", status, leg); + nua_cancel(leg->nua_handle, TAG_END()); nua_handle_destroy(leg->nua_handle); call_leg_release(&leg->base); -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/32018 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I64889d6ce174dc17d44d85aac12e7ee6e6b06164 Gerrit-Change-Number: 32018 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0