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

[S] Change in libosmo-netif[master]: stream_srv: Make osmo_stream_srv_clear_tx_queue() aware of osmo_io

by pespin

Attention is currently required from: daniel. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/34576?usp=email ) Change subject: stream_srv: Make osmo_stream_srv_clear_tx_queue() aware of osmo_io ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/34576?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: I818fe4e3792ed88ae4d6fd6afb677b39264ab662 Gerrit-Change-Number: 34576 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Sep 2023 15:51:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

7 months, 2 weeks

1
0
0 0

[S] Change in libosmo-netif[master]: stream_srv: Make osmo_stream_srv_clear_tx_queue() aware of osmo_io

by daniel

daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/34576?usp=email ) Change subject: stream_srv: Make osmo_stream_srv_clear_tx_queue() aware of osmo_io ...................................................................... stream_srv: Make osmo_stream_srv_clear_tx_queue() aware of osmo_io Change-Id: I818fe4e3792ed88ae4d6fd6afb677b39264ab662 --- M src/stream_srv.c 1 file changed, 22 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/76/34576/1 diff --git a/src/stream_srv.c b/src/stream_srv.c index ca22e1b..dea6f3e 100644 --- a/src/stream_srv.c +++ b/src/stream_srv.c @@ -957,8 +957,19 @@ void osmo_stream_srv_clear_tx_queue(struct osmo_stream_srv *conn) { - msgb_queue_free(&conn->tx_queue); - osmo_fd_write_disable(&conn->ofd); + switch (conn->mode) { + case OSMO_STREAM_MODE_OSMO_FD: + msgb_queue_free(&conn->tx_queue); + osmo_fd_write_disable(&conn->ofd); + break; + case OSMO_STREAM_MODE_OSMO_IO: + osmo_iofd_txqueue_clear(conn->iofd); + break; + case OSMO_STREAM_MODE_UNKNOWN: + default: + break; + } + if (conn->flags & OSMO_STREAM_SRV_F_FLUSH_DESTROY) osmo_stream_srv_destroy(conn); } -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/34576?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: I818fe4e3792ed88ae4d6fd6afb677b39264ab662 Gerrit-Change-Number: 34576 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: newchange

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-pcu[master]: gprs_rlcmac_sched: check if we really use direct phy

by pespin

Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/34575?usp=email ) Change subject: gprs_rlcmac_sched: check if we really use direct phy ...................................................................... Patch Set 2: (1 comment) Patchset: PS1: > I am not sure if I understand the question correctly. […] Ah I see it now, in common code: #ifdef ENABLE_DIRECT_PHY bts->trx[trx_nr].fl1h = l1if_open_trx( ... #endif This is called though based on this condition: if ((info_ind->flags & PCU_IF_FLAG_SYSMO) && info_ind->trx[trx_nr].hlayer1) { Are you passing PCUIF_FLAG_SYSMO when using an RBS from within osmo-bsc? this looks wrong imho, that flag is SYSMO specific and doesn't relate to RBS? Or maybe we don't need anything SYSMO specific and we can rename it? I envision at some point the PCU needs to know the type of BTS, so it knows how to hook to it on the l1if. And knowing if it's SYSMO or not is not enough imho. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34575?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I0808950b1154bbb9a789c3f706ad9fb6618764ec Gerrit-Change-Number: 34575 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Sep 2023 15:37:27 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: comment

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-pcu[master]: gprs_rlcmac_sched: check if we really use direct phy

by dexter

dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/34575?usp=email ) Change subject: gprs_rlcmac_sched: check if we really use direct phy ...................................................................... Patch Set 2: (1 comment) Patchset: PS1: > idk, I'm just asking if that field is also used in the sysmobts l1if lower layers of osmo-pcu, as in […] I am not sure if I understand the question correctly. The field is populated by l1if_open_trx() in pcu_l1_if.cpp:pcu_rx_info_ind() and it is basically holds the context that is needed to access the hardware. When the socket closed it is passed to l1if_close_trx(), see also: src/pcuif_sock.c. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34575?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I0808950b1154bbb9a789c3f706ad9fb6618764ec Gerrit-Change-Number: 34575 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Sep 2023 15:31:29 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: comment

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-pcu[master]: gprs_rlcmac_sched: check if we really use direct phy

by osmith

Attention is currently required from: dexter. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/34575?usp=email ) Change subject: gprs_rlcmac_sched: check if we really use direct phy ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34575?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I0808950b1154bbb9a789c3f706ad9fb6618764ec Gerrit-Change-Number: 34575 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Sep 2023 15:25:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-pcu[master]: gprs_rlcmac_sched: check if we really use direct phy

by pespin

Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/34575?usp=email ) Change subject: gprs_rlcmac_sched: check if we really use direct phy ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34575?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I0808950b1154bbb9a789c3f706ad9fb6618764ec Gerrit-Change-Number: 34575 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Sep 2023 15:20:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-pcu[master]: gprs_rlcmac_sched: check if we really use direct phy

by dexter

Attention is currently required from: dexter, pespin. Hello pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/34575?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+1 by pespin Change subject: gprs_rlcmac_sched: check if we really use direct phy ...................................................................... gprs_rlcmac_sched: check if we really use direct phy In gprs_rlcmac_sched we have a flag to skip idle frames in case we do not use the so called "direct phy access". A similar mechanism also exists in pcu_l1_if.cpp in function pcu_rx_rts_req_ptcch(). Unfortunately the check is not done correctly. The flag gets set when the ENABLE_DIRECT_PHY define constant is set. However, this does not say much about whether we access a PHY directly or not. The define constant is intended to be used to disable direct phy related code in on platforms where no direct phy code is used or cannot be used. In order to know if we actually accessing a PHY directly we must check the presence of fl1h on the related TRX. (see also pcu_l1_if.cpp, function pcu_l1if_tx_pdtch) Related: OS#6191 Change-Id: I0808950b1154bbb9a789c3f706ad9fb6618764ec --- M src/gprs_rlcmac_sched.cpp M src/pcu_l1_if.cpp 2 files changed, 34 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/75/34575/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34575?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I0808950b1154bbb9a789c3f706ad9fb6618764ec Gerrit-Change-Number: 34575 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newpatchset

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-pcu[master]: gprs_rlcmac_sched: check if we really use direct phy

by pespin

Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/34575?usp=email ) Change subject: gprs_rlcmac_sched: check if we really use direct phy ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > I didn't try this on real hardware or in the TTCN3 testsuite yet. […] idk, I'm just asking if that field is also used in the sysmobts l1if lower layers of osmo-pcu, as in whether it makes sense to check that also for those builds. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34575?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I0808950b1154bbb9a789c3f706ad9fb6618764ec Gerrit-Change-Number: 34575 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Sep 2023 15:14:23 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: comment

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-pcu[master]: gprs_rlcmac_sched: check if we really use direct phy

by dexter

Attention is currently required from: pespin. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/34575?usp=email ) Change subject: gprs_rlcmac_sched: check if we really use direct phy ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > did you check this is also valid for sysmo,lc15,oc2g? is that field set there? I didn't try this on real hardware or in the TTCN3 testsuite yet. I would expect that it should be fine with all BTSs that use direct phy access. Or do you think we still might run into a problem in case we use a sysmo-bts, but in non-direct-phy mode? -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34575?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I0808950b1154bbb9a789c3f706ad9fb6618764ec Gerrit-Change-Number: 34575 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Sep 2023 15:11:51 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

7 months, 2 weeks

1
0
0 0

[M] Change in osmo-bsc[master]: vty: make NCC Permitted (SI2) configurable

by osmith

Attention is currently required from: fixeria, pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34543?usp=email ) Change subject: vty: make NCC Permitted (SI2) configurable ...................................................................... Patch Set 4: (1 comment) File src/osmo-bsc/bts_vty.c: https://gerrit.osmocom.org/c/osmo-bsc/+/34543/comment/e7329303_fd764512 PS3, Line 4401: static void config_write_bts_ncc_permitted(struct vty *vty, const struct gsm_bts *bts) > we usually pass a const char *prefix here so that the prefix whistepace is all together in the funct […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34543?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I71bb855c35378f8f0598bc11a42bd274b7232a5e Gerrit-Change-Number: 34543 Gerrit-PatchSet: 4 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Sep 2023 15:11:31 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

7 months, 2 weeks

1
0
0 0

[M] Change in osmo-bsc[master]: vty: make NCC Permitted (SI2) configurable

by osmith

Attention is currently required from: fixeria, osmith, pespin. Hello Jenkins Builder, fixeria, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/34543?usp=email to look at the new patch set (#4). The following approvals got outdated and were removed: Code-Review+1 by pespin, Code-Review+2 by fixeria, Verified+1 by Jenkins Builder The change is no longer submittable: Code-Review and Verified are unsatisfied now. Change subject: vty: make NCC Permitted (SI2) configurable ...................................................................... vty: make NCC Permitted (SI2) configurable Related: SYS#6579 Change-Id: I71bb855c35378f8f0598bc11a42bd274b7232a5e --- M src/osmo-bsc/bts_vty.c M tests/bts_features.vty 2 files changed, 118 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/43/34543/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34543?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I71bb855c35378f8f0598bc11a42bd274b7232a5e Gerrit-Change-Number: 34543 Gerrit-PatchSet: 4 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

7 months, 2 weeks

1
0
0 0

[M] Change in osmo-bsc[master]: vty: make NCC Permitted (SI2) configurable

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34543?usp=email ) Change subject: vty: make NCC Permitted (SI2) configurable ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34543?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I71bb855c35378f8f0598bc11a42bd274b7232a5e Gerrit-Change-Number: 34543 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Sep 2023 15:11:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-pcu[master]: gprs_rlcmac_sched: check if we really use direct phy

by pespin

Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/34575?usp=email ) Change subject: gprs_rlcmac_sched: check if we really use direct phy ...................................................................... Patch Set 1: Code-Review+1 (1 comment) Patchset: PS1: did you check this is also valid for sysmo,lc15,oc2g? is that field set there? -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34575?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I0808950b1154bbb9a789c3f706ad9fb6618764ec Gerrit-Change-Number: 34575 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Sep 2023 15:08:14 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: pcu: Fail immediately in TC_n3105_max_t3195

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34536?usp=email ) Change subject: pcu: Fail immediately in TC_n3105_max_t3195 ...................................................................... pcu: Fail immediately in TC_n3105_max_t3195 Change-Id: I55b97037c014478451790e1943c617a634fe2457 --- M pcu/PCU_Tests.ttcn 1 file changed, 19 insertions(+), 4 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index 012a0be..ffad7e6 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -1955,7 +1955,6 @@ var integer N3105 := 0; timer T_3195 := 1.0; var integer num_poll_recv := 0; - var template RlcmacDlBlock dl_block_exp; /* Initialize NS/BSSGP side */ f_init_bssgp(); @@ -2041,10 +2040,17 @@ log("T_3195 timeout"); /* Done in alt, wait for pending RTS initiated previously in * above case before continuing (expect empty block): */ - dl_block_exp := omit; - BTS.receive(tr_PCUIF_DATA_PDTCH(nr.bts_nr, + alt { + [] BTS.receive(tr_PCUIF_DATA_PDTCH(nr.bts_nr, tr_PCUIF_DATA(nr.trx_nr, nr.ts_nr, sapi := PCU_IF_SAPI_PDTCH), - dl_block_exp)); + omit)); /* DONE, continue after altstep. */ + [] BTS.receive(tr_PCUIF_DATA_PDTCH(nr.bts_nr, + tr_PCUIF_DATA(nr.trx_nr, nr.ts_nr, sapi := PCU_IF_SAPI_PDTCH), + tr_RLCMAC_DL_DUMMY_CTRL)) { + setverdict(fail, "Rx unexpected DUMMY message, expected empty data block"); + f_shutdown(__BFILE__, __LINE__); + } + } } [] BTS.receive { setverdict(fail, "Unexpected BTS message"); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34536?usp=email 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: I55b97037c014478451790e1943c617a634fe2457 Gerrit-Change-Number: 34536 Gerrit-PatchSet: 3 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: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

7 months, 2 weeks

1
0
0 0

[M] Change in osmo-bsc[master]: vty: make NCC Permitted (SI2) configurable

by pespin

Attention is currently required from: fixeria, osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34543?usp=email ) Change subject: vty: make NCC Permitted (SI2) configurable ...................................................................... Patch Set 3: Code-Review+1 (1 comment) File src/osmo-bsc/bts_vty.c: https://gerrit.osmocom.org/c/osmo-bsc/+/34543/comment/7ecf3897_3a66b5a6 PS3, Line 4401: static void config_write_bts_ncc_permitted(struct vty *vty, const struct gsm_bts *bts) we usually pass a const char *prefix here so that the prefix whistepace is all together in the function of the node, but not critical. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34543?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I71bb855c35378f8f0598bc11a42bd274b7232a5e Gerrit-Change-Number: 34543 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Sep 2023 15:06:10 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-pcu[master]: gprs_rlcmac_sched: check if we really use direct phy

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/34575?usp=email ) Change subject: gprs_rlcmac_sched: check if we really use direct phy ...................................................................... gprs_rlcmac_sched: check if we really use direct phy In gprs_rlcmac_sched we have a flag to skip idle frames in case do not use the so called "direct phy access". Unfortunately the check is not done correctly. The flag gets set when the ENABLE_DIRECT_PHY define constant is set. However, this does not say much about whether we access a PHY directly or not. The define constant is intended to be used to disable direct phy related code in on platforms where no direct phy code is used or cannot be used. In order to know if we actually accessing a PHY directly we must check the presence of fl1h on the related TRX. (see also pcu_l1_if.cpp, function pcu_l1if_tx_pdtch) Related: OS#6191 Change-Id: I0808950b1154bbb9a789c3f706ad9fb6618764ec --- M src/gprs_rlcmac_sched.cpp 1 file changed, 28 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/75/34575/1 diff --git a/src/gprs_rlcmac_sched.cpp b/src/gprs_rlcmac_sched.cpp index 314fd58..214ea45 100644 --- a/src/gprs_rlcmac_sched.cpp +++ b/src/gprs_rlcmac_sched.cpp @@ -488,9 +488,11 @@ + pdch->num_tbfs(GPRS_RLCMAC_UL_TBF); bool skip_idle = (num_tbfs == 0); #ifdef ENABLE_DIRECT_PHY - /* In DIRECT_PHY mode we want to always submit something to L1 in - * TRX0, since BTS is not preparing dummy bursts on idle TS for us */ - skip_idle = skip_idle && trx != 0; + if (bts->trx[trx].fl1h) { + /* In DIRECT_PHY mode we want to always submit something to L1 in + * TRX0, since BTS is not preparing dummy bursts on idle TS for us */ + skip_idle = skip_idle && trx != 0; + } #endif if (!skip_idle && (msg = sched_dummy())) { /* increase counter */ -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34575?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I0808950b1154bbb9a789c3f706ad9fb6618764ec Gerrit-Change-Number: 34575 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: pcu: Fail immediately in TC_n3105_max_t3195

by fixeria

Attention is currently required from: dexter, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34536?usp=email ) Change subject: pcu: Fail immediately in TC_n3105_max_t3195 ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34536?usp=email 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: I55b97037c014478451790e1943c617a634fe2457 Gerrit-Change-Number: 34536 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: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Sep 2023 15:04:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

7 months, 2 weeks

1
0
0 0

[M] Change in osmo-bsc[master]: vty: make NCC Permitted (SI2) configurable

by osmith

Attention is currently required from: fixeria, pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34543?usp=email ) Change subject: vty: make NCC Permitted (SI2) configurable ...................................................................... Patch Set 3: (1 comment) File src/osmo-bsc/bts_vty.c: https://gerrit.osmocom.org/c/osmo-bsc/+/34543/comment/16194472_77b45501 PS2, Line 1445: ncc = atoi(argv[i]); > cosmetic: `ncc` can be declared here (scoped) Done -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34543?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I71bb855c35378f8f0598bc11a42bd274b7232a5e Gerrit-Change-Number: 34543 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Sep 2023 15:03:03 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

7 months, 2 weeks

1
0
0 0

[M] Change in osmo-bsc[master]: vty: make NCC Permitted (SI2) configurable

by osmith

Attention is currently required from: fixeria, osmith, pespin. Hello Jenkins Builder, fixeria, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/34543?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Code-Review+1 by fixeria, Verified+1 by Jenkins Builder Change subject: vty: make NCC Permitted (SI2) configurable ...................................................................... vty: make NCC Permitted (SI2) configurable Related: SYS#6579 Change-Id: I71bb855c35378f8f0598bc11a42bd274b7232a5e --- M src/osmo-bsc/bts_vty.c M tests/bts_features.vty 2 files changed, 118 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/43/34543/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34543?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I71bb855c35378f8f0598bc11a42bd274b7232a5e Gerrit-Change-Number: 34543 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

7 months, 2 weeks

1
0
0 0

[M] Change in osmo-bsc[master]: vty: make NCC Permitted (SI2) configurable

by fixeria

Attention is currently required from: osmith, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34543?usp=email ) Change subject: vty: make NCC Permitted (SI2) configurable ...................................................................... Patch Set 2: Code-Review+1 (1 comment) File src/osmo-bsc/bts_vty.c: https://gerrit.osmocom.org/c/osmo-bsc/+/34543/comment/d0de7d56_ac53b937 PS2, Line 1445: ncc = atoi(argv[i]); cosmetic: `ncc` can be declared here (scoped) -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34543?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I71bb855c35378f8f0598bc11a42bd274b7232a5e Gerrit-Change-Number: 34543 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Sep 2023 15:01:12 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: bsc: Start MGCP transaction ID sequence based on media_nr

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34574?usp=email ) Change subject: bsc: Start MGCP transaction ID sequence based on media_nr ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34574?usp=email 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: Icb09d67a1f0207dc8501dd2b47c9162175b691b1 Gerrit-Change-Number: 34574 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Sep 2023 14:55:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: bsc: Use different CIC in concurrent calls from same MSC

by osmith

Attention is currently required from: fixeria, neels, pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34573?usp=email ) Change subject: bsc: Use different CIC in concurrent calls from same MSC ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34573?usp=email 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: Iac09590693bf39ccc90bf2b0645ca672a4787c95 Gerrit-Change-Number: 34573 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> 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: Thu, 28 Sep 2023 14:54:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

7 months, 2 weeks

1
0
0 0

[S] Change in libosmo-netif[master]: stream_srv: Fix connection error handling

by daniel

Attention is currently required from: arehbein, laforge, pespin. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/34338?usp=email ) Change subject: stream_srv: Fix connection error handling ...................................................................... Patch Set 2: (2 comments) File src/stream_srv.c: https://gerrit.osmocom.org/c/libosmo-netif/+/34338/comment/3cb40480_27675525 PS2, Line 489: if (OSMO_UNLIKELY(res <= 0)) { > Why do we not call `osmo_stream_srv_clear_tx_queue()` here, if the connection is dead anyways? Because that's what osmo_stream_srv_destroy() does already (either through msgb_queue_free() or osmo_iofd_free()) https://gerrit.osmocom.org/c/libosmo-netif/+/34338/comment/ff657801_7ece556d PS2, Line 496: if (osmo_iofd_txqueue_len(iofd) == 0) > Can it not happen that messages can't be sent out, so that this condition never holds true? In that […] I just noticed that osmo_stream_srv_clear_tx_queue() is not aware of osmo_io. I'll prepare a patch. We only end up here if there's actual data to be read, so it's not really an endless loop. The only way where a message is never sent out is if the fd never is writable. Even if sending then fails that message has been removed from the tx queue so it will eventually be empty. -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/34338?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: I84eea2717f3762830f3f5b115e6fc8545eaa4fd5 Gerrit-Change-Number: 34338 Gerrit-PatchSet: 2 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: arehbein <arehbein(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Sep 2023 14:43:23 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: arehbein <arehbein(a)sysmocom.de> Gerrit-MessageType: comment

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-bts[master]: l1sap: l1sap_tch_ind(): fix segfault on stale TCH.ind

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34446?usp=email ) Change subject: l1sap: l1sap_tch_ind(): fix segfault on stale TCH.ind ...................................................................... l1sap: l1sap_tch_ind(): fix segfault on stale TCH.ind It was reported that osmo-bts-sysmo is crashing due to a TCH.ind primitive being received by l1sap_tch_ind() for an lchan, which is operating neither in speech nor data, but in signalling mode. It's not clear which scenario is causing this situation. My best guess is that one or more TCH.ind primitive(s) remain waiting in the lower layers and bob up right after the channel mode change. This can happen, for instance, when a dynamic timeslot gets switched from TCH/F or TCH/H to PDCH or SDCCH/8. Change-Id: I2d270ab654fdd9d19d1708ff6c4b4e902bd5d0a3 Fixes: d1f8f3429 "l1sap: proper rate adaptation for CSD" Closes: OS#6180 --- M src/common/l1sap.c 1 file changed, 23 insertions(+), 0 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve diff --git a/src/common/l1sap.c b/src/common/l1sap.c index b828307..844fdad 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -1990,6 +1990,7 @@ send_ul_rtp_packet_data(lchan, fn, msg->data, msg->len); break; case RSL_CMOD_SPD_SIGN: + return 0; /* drop stale TCH.ind */ default: /* shall not happen */ OSMO_ASSERT(0); } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34446?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: I2d270ab654fdd9d19d1708ff6c4b4e902bd5d0a3 Gerrit-Change-Number: 34446 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: keith <keith(a)rhizomatica.org> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-bts[master]: l1sap: l1sap_tch_ind(): fix segfault on stale TCH.ind

by fixeria

Attention is currently required from: keith, laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34446?usp=email ) Change subject: l1sap: l1sap_tch_ind(): fix segfault on stale TCH.ind ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34446?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: I2d270ab654fdd9d19d1708ff6c4b4e902bd5d0a3 Gerrit-Change-Number: 34446 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: keith <keith(a)rhizomatica.org> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: keith <keith(a)rhizomatica.org> Gerrit-Comment-Date: Thu, 28 Sep 2023 14:43:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: bsc: Start MGCP transaction ID sequence based on media_nr

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34574?usp=email ) Change subject: bsc: Start MGCP transaction ID sequence based on media_nr ...................................................................... bsc: Start MGCP transaction ID sequence based on media_nr This allows different MscConnHandlers to concurrently submit MGCP messages with unique transaction ID through the shared MGCP-over-IPA multiplex BSC<->MSC. Without this, 2 MscConnHandlers would both send a CRCX using trans_id=0, and the ConnectionTable in RAN_Emulation.cpp would lookup and return the first MscConnHandler in the table during the 2nd CRCX ACK which was targeted at the second MscConnHandler. Change-Id: Icb09d67a1f0207dc8501dd2b47c9162175b691b1 --- M bsc/BSC_Tests.ttcn M bsc/MSC_ConnectionHandler.ttcn 2 files changed, 20 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/74/34574/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index f8d8c2d..f89e450 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -12180,6 +12180,7 @@ var TestHdlrParams pars2 := f_gen_test_hdlr_pars(); var MSC_ConnHdlr vc_conn2; pars2.mgwpool_idx := 1; + pars2.media_nr := 2; f_init(1, true, nr_mgw := 2); f_sleep(1.0); diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn index 7a5e55e..b499244 100644 --- a/bsc/MSC_ConnectionHandler.ttcn +++ b/bsc/MSC_ConnectionHandler.ttcn @@ -581,6 +581,7 @@ /* initialize all parameters */ function f_MscConnHdlr_init(integer i, HostName bts, HostName mgw, BSSMAP_FIELD_CodecType codecType) runs on MSC_ConnHdlr { + g_trans_id := i * 1000; /* Avoid different MscConnHdlr submitting same trans_id over MGCP-IPA */ f_MediaState_init(g_media, i, bts, mgw, codecType); f_MscConnHdlr_init_vty(); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34574?usp=email 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: Icb09d67a1f0207dc8501dd2b47c9162175b691b1 Gerrit-Change-Number: 34574 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: bsc: Use different CIC in concurrent calls from same MSC

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34573?usp=email ) Change subject: bsc: Use different CIC in concurrent calls from same MSC ...................................................................... bsc: Use different CIC in concurrent calls from same MSC The MSC (our TTCN3 emulation) expects to assign unique CIC for each concurrent call, so that the BSC can properly differentiate and do the proper connection setup. Change-Id: Iac09590693bf39ccc90bf2b0645ca672a4787c95 --- M bsc/BSC_Tests.ttcn M bsc/MSC_ConnectionHandler.ttcn 2 files changed, 21 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/73/34573/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 7773153..f8d8c2d 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -1726,9 +1726,9 @@ } /* generate an assignment request for either AoIP or SCCPlite */ -function f_gen_ass_req(boolean osmux_enabled := false, integer bssap_idx := 0, charstring aoip_tla := "1.2.3.4") return PDU_BSSAP { +function f_gen_ass_req(boolean osmux_enabled := false, uint8_t ass_cid := 0, integer bssap_idx := 0, charstring aoip_tla := "1.2.3.4") return PDU_BSSAP { var PDU_BSSAP ass_cmd; - var BSSMAP_IE_Osmo_OsmuxCID osmux_cid := valueof(ts_OsmuxCID(0)); + var BSSMAP_IE_Osmo_OsmuxCID osmux_cid := valueof(ts_OsmuxCID(ass_cid)); if (mp_bssap_cfg[bssap_idx].transport == BSSAP_TRANSPORT_AoIP) { var BSSMAP_IE_AoIP_TransportLayerAddress tla := valueof(f_ts_BSSMAP_IE_AoIP_TLA(aoip_tla, 2342)); @@ -1738,7 +1738,9 @@ ass_cmd := valueof(ts_BSSMAP_AssignmentReq(omit, tla)); } } else { - var BSSMAP_IE_CircuitIdentityCode cic := valueof(ts_BSSMAP_IE_CIC(0,1)); + var BIT8 ass_cid_bit := int2bit(ass_cid, 8); + var BSSMAP_IE_CircuitIdentityCode cic := valueof(ts_BSSMAP_IE_CIC(bit2int(ass_cid_bit >> 5), + bit2int(ass_cid_bit and4b '00011111'B))); ass_cmd := valueof(ts_BSSMAP_AssignmentReq(cic, omit)); } return ass_cmd; @@ -12144,7 +12146,7 @@ private const charstring COORD_CMD_ESTABLISHED := "COORD_CMD_ESTABLISHED"; private function f_TC_mgwpool_call_seq_1(charstring id) runs on MSC_ConnHdlr { var template PDU_BSSAP exp_compl := f_gen_exp_compl(); - var PDU_BSSAP ass_cmd := f_gen_ass_req(); + var PDU_BSSAP ass_cmd := f_gen_ass_req(ass_cid := 0); ass_cmd.pdu.bssmap.assignmentRequest.channelType := valueof(ts_BSSMAP_IE_ChannelType); ass_cmd.pdu.bssmap.assignmentRequest.codecList := valueof(ts_BSSMAP_IE_CodecList({ts_CodecFR})); @@ -12157,7 +12159,7 @@ } private function f_TC_mgwpool_call_seq_2(charstring id) runs on MSC_ConnHdlr { var template PDU_BSSAP exp_compl := f_gen_exp_compl(); - var PDU_BSSAP ass_cmd := f_gen_ass_req(); + var PDU_BSSAP ass_cmd := f_gen_ass_req(ass_cid := 1); ass_cmd.pdu.bssmap.assignmentRequest.channelType := valueof(ts_BSSMAP_IE_ChannelType); ass_cmd.pdu.bssmap.assignmentRequest.codecList := valueof(ts_BSSMAP_IE_CodecList({ts_CodecFR})); diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn index 269fb79..7a5e55e 100644 --- a/bsc/MSC_ConnectionHandler.ttcn +++ b/bsc/MSC_ConnectionHandler.ttcn @@ -1652,7 +1652,7 @@ var template MgcpCommand cmd; var template MgcpResponse resp; var integer cic := f_bssmap_ie_cic_2_int(ass_cmd.pdu.bssmap.assignmentRequest.circuitIdentityCode); - var MgcpEndpoint ep := int2str(cic) & "@mgw"; /* 1: matches value configured in BSC_Tests.ttcn pass in AssignReq */ + var MgcpEndpoint ep := int2str(cic) & "@mgw"; /* matches value configured in BSC_Tests.ttcn pass in AssignReq */ var MgcpCallId call_id := '51234'H; var SDP_attribute_list attributes := { valueof(ts_SDP_ptime(20)) }; if (g_pars.use_osmux_cn) { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34573?usp=email 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: Iac09590693bf39ccc90bf2b0645ca672a4787c95 Gerrit-Change-Number: 34573 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

7 months, 2 weeks

1
0
0 0

[M] Change in osmo-bsc[master]: vty: make NCC Permitted (SI2) configurable

by osmith

Attention is currently required from: fixeria, pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34543?usp=email ) Change subject: vty: make NCC Permitted (SI2) configurable ...................................................................... Patch Set 2: (2 comments) File src/osmo-bsc/bts_vty.c: https://gerrit.osmocom.org/c/osmo-bsc/+/34543/comment/9eb8753c_0cbc2bcd PS1, Line 1447: no ncc-permitted > I see how "no ncc-permitted" meaning all is confusing. I'll add "ncc-permitted all" instead. […] Done https://gerrit.osmocom.org/c/osmo-bsc/+/34543/comment/d52b7f25_cd870905 PS1, Line 4394: struct gsm_bts *bts > const Done -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34543?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I71bb855c35378f8f0598bc11a42bd274b7232a5e Gerrit-Change-Number: 34543 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Sep 2023 14:36:24 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: mgw: Add missing TC_two_crcx_mdcx_and_rtp_clearmode to expected-resul...

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34553?usp=email ) Change subject: mgw: Add missing TC_two_crcx_mdcx_and_rtp_clearmode to expected-results.xml ...................................................................... mgw: Add missing TC_two_crcx_mdcx_and_rtp_clearmode to expected-results.xml Change-Id: I54fa4aeae49fdae51cfbbf076a56b7185585fc48 --- M mgw/expected-results.xml 1 file changed, 10 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/mgw/expected-results.xml b/mgw/expected-results.xml index 5d57e1c..3c438bd 100644 --- a/mgw/expected-results.xml +++ b/mgw/expected-results.xml @@ -95,5 +95,6 @@ <testcase classname='MGCP_Test' name='TC_two_crcx_mdcx_and_iuup_rtp_rfci_unordered' time='MASKED'/> <testcase classname='MGCP_Test' name='TC_two_crcx_mdcx_and_iuup_rtp_mdcx_recvonly' time='MASKED'/> <testcase classname='MGCP_Test' name='TC_two_crcx_mdcx_and_iuup_rtp_mdcx_to_iuup' time='MASKED'/> + <testcase classname='MGCP_Test' name='TC_two_crcx_mdcx_and_rtp_clearmode' time='MASKED'/> <testcase classname='MGCP_Test' name='TC_one_crcx_loopback_rtp_implicit' time='MASKED'/> </testsuite> -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34553?usp=email 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: I54fa4aeae49fdae51cfbbf076a56b7185585fc48 Gerrit-Change-Number: 34553 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: RTP_Emulation: Log number of error packets

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34551?usp=email ) Change subject: RTP_Emulation: Log number of error packets ...................................................................... RTP_Emulation: Log number of error packets Change-Id: I685fb43ea30c83a975edd32cc24994da15940100 --- M library/RTP_Emulation.ttcn 1 file changed, 14 insertions(+), 5 deletions(-) Approvals: neels: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/library/RTP_Emulation.ttcn b/library/RTP_Emulation.ttcn index de2c877..5e10b3f 100644 --- a/library/RTP_Emulation.ttcn +++ b/library/RTP_Emulation.ttcn @@ -295,23 +295,23 @@ /* Check error counters */ if (s.num_pkts_rx_err_seq != 0) { - setverdict(fail, "RTP packet sequence number errors occurred"); + setverdict(fail, log2str(s.num_pkts_rx_err_seq, " RTP packet sequence number errors occurred")); mtc.stop; } if (s.num_pkts_rx_err_ts != 0) { - setverdict(fail, "RTP packet timestamp errors occurred"); + setverdict(fail, log2str(s.num_pkts_rx_err_ts, " RTP packet timestamp errors occurred")); mtc.stop; } if (s.num_pkts_rx_err_pt != 0) { - setverdict(fail, "RTP packet payload type errors occurred"); + setverdict(fail, log2str(s.num_pkts_rx_err_pt, " RTP packet payload type errors occurred")); mtc.stop; } if (s.num_pkts_rx_err_disabled != 0) { - setverdict(fail, "RTP packets received while RX was disabled"); + setverdict(fail, log2str(s.num_pkts_rx_err_disabled, " RTP packets received while RX was disabled")); mtc.stop; } if (s.num_pkts_rx_err_payload != 0) { - setverdict(fail, "RTP packets with mismatching payload received"); + setverdict(fail, log2str(s.num_pkts_rx_err_payload, " RTP packets with mismatching payload received")); mtc.stop; } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34551?usp=email 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: I685fb43ea30c83a975edd32cc24994da15940100 Gerrit-Change-Number: 34551 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

7 months, 2 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: mgw: Introduce tests TC_two_crcx_mdcx_and_iuup_(rtp_)mdcx_recvonly

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34547?usp=email ) Change subject: mgw: Introduce tests TC_two_crcx_mdcx_and_iuup_(rtp_)mdcx_recvonly ...................................................................... mgw: Introduce tests TC_two_crcx_mdcx_and_iuup_(rtp_)mdcx_recvonly Change-Id: I34d47d0cdde855900798e4cb3efd26af22f5b049 --- M mgw/MGCP_Test.ttcn M mgw/expected-results.xml 2 files changed, 168 insertions(+), 0 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified neels: Looks good to me, approved diff --git a/mgw/MGCP_Test.ttcn b/mgw/MGCP_Test.ttcn index ad564c1..b75fd69 100644 --- a/mgw/MGCP_Test.ttcn +++ b/mgw/MGCP_Test.ttcn @@ -10,6 +10,7 @@ */ module MGCP_Test { + import from Misc_Helpers all; import from Osmocom_Types all; import from MGCP_Types all; import from MGCP_Templates all; @@ -2955,6 +2956,80 @@ mp_local_ipv4, mp_remote_ipv4); } + /* Test that once IuUP->RTP has been set up, if the RTP/IuUP conn is set + * as "recvonly", no more RTP/IuUP packets get out of the MGW. */ + function f_tc_two_crcx_mdcx_and_iuup_mdcx_recvonly(charstring local_ip_a, charstring remote_ip_a, + IuUP_RabFlowCombinationList rfcl_a, + charstring local_ip_b, charstring remote_ip_b) runs on dummy_CT { + var RtpFlowData flow[2]; + var MgcpEndpoint ep := c_mgw_ep_rtpbridge & "2@" & c_mgw_domain; + var MgcpCallId call_id := '1227'H; + var RtpemStats stats[2]; + + f_init(ep); + + /* Create the first connection in receive only mode (RNC side, IuUP-Init active) */ + flow[0] := valueof(t_RtpFlow(local_ip_a, remote_ip_a, 96, "VND.3GPP.IUFP/16000")); + flow[0].em.portnr := 10000; + flow[0].rtp_cfg := c_RtpemDefaultCfg; + flow[0].rtp_cfg.rx_payloads[0].payload_type := flow[0].codec_descr[0].pt; + flow[0].rtp_cfg.tx_payloads[0].payload_type := flow[0].codec_descr[0].pt; + flow[0].rtp_cfg.iuup_mode := true; + flow[0].rtp_cfg.iuup_cfg.active_init := true; + flow[0].rtp_cfg.iuup_cfg.rab_flow_combs := rfcl_a; + + /* Create the second connection. This connection will be also + * in receive only mode (CN side, IuUP-Init passive) */ + flow[1] := valueof(t_RtpFlow(local_ip_b, remote_ip_b, 96, "VND.3GPP.IUFP/16000")); + flow[1].em.portnr := 20000; + flow[1].rtp_cfg := c_RtpemDefaultCfg; + flow[1].rtp_cfg.rx_payloads[0].payload_type := flow[1].codec_descr[0].pt; + flow[1].rtp_cfg.tx_payloads[0].payload_type := flow[1].codec_descr[0].pt; + flow[1].rtp_cfg.iuup_mode := true; + flow[1].rtp_cfg.iuup_cfg.active_init := false; + + f_two_crcx_mdcx_data_transfer(ep, call_id, flow[0], flow[1], false); + + /* Now validate we don't receive more RTP packets after setting it to recvonly: */ + f_rtpem_mode(RTPEM[1], RTPEM_MODE_RXONLY); + f_flow_modify(RTPEM[1], ep, call_id, "recvonly", flow[1]); + f_sleep(0.5); + stats[0] := f_rtpem_stats_get(RTPEM[1]); + f_sleep(0.5); + stats[1] := f_rtpem_stats_get(RTPEM[1]); + if (stats[1].num_pkts_rx > stats[0].num_pkts_rx) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("received ", stats[1].num_pkts_rx - stats[0].num_pkts_rx, " RTP packets from MGW on recvonly connection 1")); + } + + /* Now do the same on the IuUP port: */ + f_rtpem_mode(RTPEM[0], RTPEM_MODE_RXONLY); + f_rtpem_mode(RTPEM[1], RTPEM_MODE_TXONLY); + f_flow_modify(RTPEM[0], ep, call_id, "recvonly", flow[0]); + f_sleep(0.5); + stats[0] := f_rtpem_stats_get(RTPEM[0]); + f_sleep(0.5); + stats[1] := f_rtpem_stats_get(RTPEM[0]); + if (stats[1].num_pkts_rx > stats[0].num_pkts_rx) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("received ", stats[1].num_pkts_rx - stats[0].num_pkts_rx, " IuUP packets from MGW on recvonly connection 1")); + } + + /* Tear down */ + f_flow_delete(RTPEM[0]); + f_flow_delete(RTPEM[1], ep, call_id); + setverdict(pass); + } + testcase TC_two_crcx_mdcx_and_iuup_mdcx_recvonly() runs on dummy_CT { + var template (value) IuUP_RabFlowCombinationList rfcl := { + t_IuUP_RFC_AMR_12_2(0), + t_IuUP_RFC_AMR_SID(1), + t_IuUP_RFC_AMR_NO_DATA(2) + }; + f_tc_two_crcx_mdcx_and_iuup_mdcx_recvonly(mp_local_ipv4, mp_remote_ipv4, valueof(rfcl), + mp_local_ipv4, mp_remote_ipv4); + } + /* create two local emulations (1 RTP, 1 RTP+IuUP) and pass data in both directions */ function f_tc_two_crcx_mdcx_and_iuup_rtp(charstring local_ip_a, charstring remote_ip_a, IuUP_RabFlowCombinationList rfcl_a, @@ -3013,6 +3088,86 @@ mp_local_ipv4, mp_remote_ipv4); } + /* Test that once IuUP->RTP has been set up, if the RTP/IuUP conn is set + * as "recvonly", no more RTP/IuUP packets get out of the MGW. */ + function f_tc_two_crcx_mdcx_and_iuup_rtp_mdcx_recvonly(charstring local_ip_a, charstring remote_ip_a, + IuUP_RabFlowCombinationList rfcl_a, + charstring local_ip_b, charstring remote_ip_b) runs on dummy_CT { + var RtpFlowData flow[2]; + var MgcpEndpoint ep := c_mgw_ep_rtpbridge & "2@" & c_mgw_domain; + var MgcpCallId call_id := '1227'H; + var RtpemStats stats[2]; + + f_init(ep); + + /* Create the first connection in receive only mode (RNC side, IuUP-Init active) */ + flow[0] := valueof(t_RtpFlow(local_ip_a, remote_ip_a, 96, "VND.3GPP.IUFP/16000")); + flow[0].em.portnr := 10000; + flow[0].rtp_cfg := c_RtpemDefaultCfg; + flow[0].rtp_cfg.tx_payloads[0].payload_type := flow[0].codec_descr[0].pt; + flow[0].rtp_cfg.rx_payloads[0].payload_type := flow[0].codec_descr[0].pt; + flow[0].rtp_cfg.tx_payloads[0].fixed_payload := '4f28959ffeb80181f5c4e83d176c897b4a4e333298333419a493ca63ded6e0'O; + /* flow[1].rtp_cfg.rx_payloads[0].fixed_payload converted AMR-BE-RTP->AMR-IUUP*/ + flow[0].rtp_cfg.rx_payloads[0].fixed_payload := '08556d944c71a1a081e7ead204244480000ecd82b81118000097c4794e7740'O; + flow[0].rtp_cfg.iuup_mode := true; + flow[0].rtp_cfg.iuup_cfg.active_init := true; + flow[0].rtp_cfg.iuup_cfg.rab_flow_combs := rfcl_a; + + /* Create the second connection. This connection will be also + * in receive only mode (CN side, regular RTP) */ + flow[1] := valueof(t_RtpFlow(local_ip_b, remote_ip_b, 112, "AMR/8000")); + flow[1].em.portnr := 20000; + flow[1].rtp_cfg := c_RtpemDefaultCfg; + flow[1].rtp_cfg.tx_payloads[0].payload_type := flow[1].codec_descr[0].pt; + flow[1].rtp_cfg.rx_payloads[0].payload_type := flow[1].codec_descr[0].pt; + flow[1].rtp_cfg.tx_payloads[0].fixed_payload := '0382155b65131c68682079fab4810911200003b360ae0446000025f11e539dd0'O; + /* flow[0].rtp_cfg.rx_payloads[0].fixed_payload converted AMR-IuUP->AMR-BE-RTP*/ + flow[1].rtp_cfg.rx_payloads[0].fixed_payload := 'f3d3ca2567ffae00607d713a0f45db225ed2938ccca60ccd066924f298f7b5b8'O; + flow[1].rtp_cfg.iuup_mode := false; + + f_two_crcx_mdcx_data_transfer(ep, call_id, flow[0], flow[1], false); + + /* Now validate we don't receive more RTP packets after setting it to recvonly: */ + f_rtpem_mode(RTPEM[1], RTPEM_MODE_RXONLY); + f_flow_modify(RTPEM[1], ep, call_id, "recvonly", flow[1]); + f_sleep(0.5); + stats[0] := f_rtpem_stats_get(RTPEM[1]); + f_sleep(0.5); + stats[1] := f_rtpem_stats_get(RTPEM[1]); + if (stats[1].num_pkts_rx > stats[0].num_pkts_rx) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("received ", stats[1].num_pkts_rx - stats[0].num_pkts_rx, " RTP packets from MGW on recvonly connection 1")); + } + + /* Now do the same on the IuUP port: */ + f_rtpem_mode(RTPEM[0], RTPEM_MODE_RXONLY); + f_flow_modify(RTPEM[0], ep, call_id, "recvonly", flow[0]); + f_rtpem_mode(RTPEM[1], RTPEM_MODE_TXONLY); + f_flow_modify(RTPEM[1], ep, call_id, "sendrecv", flow[1]); + f_sleep(0.5); + stats[0] := f_rtpem_stats_get(RTPEM[0]); + f_sleep(0.5); + stats[1] := f_rtpem_stats_get(RTPEM[0]); + if (stats[1].num_pkts_rx > stats[0].num_pkts_rx) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("received ", stats[1].num_pkts_rx - stats[0].num_pkts_rx, " IuUP packets from MGW on recvonly connection 1")); + } + + /* Tear down */ + f_flow_delete(RTPEM[0]); + f_flow_delete(RTPEM[1], ep, call_id); + setverdict(pass); + } + testcase TC_two_crcx_mdcx_and_iuup_rtp_mdcx_recvonly() runs on dummy_CT { + var template (value) IuUP_RabFlowCombinationList rfcl := { + t_IuUP_RFC_AMR_12_2(0), + t_IuUP_RFC_AMR_SID(1), + t_IuUP_RFC_AMR_NO_DATA(2) + }; + f_tc_two_crcx_mdcx_and_iuup_rtp_mdcx_recvonly(mp_local_ipv4, mp_remote_ipv4, valueof(rfcl), + mp_local_ipv4, mp_remote_ipv4); + } + control { execute(TC_selftest()); execute(TC_auep_null()); @@ -3099,8 +3254,10 @@ execute(TC_two_crcx_mdcx_and_iuup()); execute(TC_two_crcx_mdcx_and_iuup_rfci_unordered()); + execute(TC_two_crcx_mdcx_and_iuup_mdcx_recvonly()); execute(TC_two_crcx_mdcx_and_iuup_rtp()); execute(TC_two_crcx_mdcx_and_iuup_rtp_rfci_unordered()); + execute(TC_two_crcx_mdcx_and_iuup_rtp_mdcx_recvonly()); execute(TC_two_crcx_mdcx_and_rtp_clearmode()); diff --git a/mgw/expected-results.xml b/mgw/expected-results.xml index a4ce388..44ce65b 100644 --- a/mgw/expected-results.xml +++ b/mgw/expected-results.xml @@ -89,8 +89,10 @@ <testcase classname='MGCP_Test' name='TC_two_crcx_mdcx_and_rtp_osmux_ipv4_ipv6' time='MASKED' /> <testcase classname='MGCP_Test' name='TC_two_crcx_mdcx_and_rtp_osmux_ipv6_ipv4' time='MASKED'/> <testcase classname='MGCP_Test' name='TC_two_crcx_mdcx_and_iuup' time='MASKED'/> + <testcase classname='MGCP_Test' name='TC_two_crcx_mdcx_and_iuup_mdcx_recvonly' time='MASKED'/> <testcase classname='MGCP_Test' name='TC_two_crcx_mdcx_and_iuup_rfci_unordered' time='MASKED'/> <testcase classname='MGCP_Test' name='TC_two_crcx_mdcx_and_iuup_rtp' time='MASKED'/> <testcase classname='MGCP_Test' name='TC_two_crcx_mdcx_and_iuup_rtp_rfci_unordered' time='MASKED'/> + <testcase classname='MGCP_Test' name='TC_two_crcx_mdcx_and_iuup_rtp_mdcx_recvonly' time='MASKED'/> <testcase classname='MGCP_Test' name='TC_one_crcx_loopback_rtp_implicit' time='MASKED'/> </testsuite> -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34547?usp=email 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: I34d47d0cdde855900798e4cb3efd26af22f5b049 Gerrit-Change-Number: 34547 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

7 months, 2 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: mgw: Factor out helper func to test data flows over endp with 2 conns

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34546?usp=email ) Change subject: mgw: Factor out helper func to test data flows over endp with 2 conns ...................................................................... mgw: Factor out helper func to test data flows over endp with 2 conns The logic can be reused by AMR<->IuUP and IuUP<->IuUP tests. Change-Id: Ic4f3c5bb687373bdae6942e1952797e76bfa3ffb --- M mgw/MGCP_Test.ttcn 1 file changed, 58 insertions(+), 115 deletions(-) Approvals: neels: Looks good to me, approved Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve diff --git a/mgw/MGCP_Test.ttcn b/mgw/MGCP_Test.ttcn index 0cedb0e..ad564c1 100644 --- a/mgw/MGCP_Test.ttcn +++ b/mgw/MGCP_Test.ttcn @@ -2804,42 +2804,21 @@ setverdict(pass); } - /* create two local RTP+IuUP emulations and pass data in both directions */ - function f_tc_two_crcx_mdcx_and_iuup(charstring local_ip_a, charstring remote_ip_a, - IuUP_RabFlowCombinationList rfcl_a, - charstring local_ip_b, charstring remote_ip_b) runs on dummy_CT { - var RtpFlowData flow[2]; + /* create two local emulations and pass data in both directions */ + function f_two_crcx_mdcx_data_transfer(MgcpEndpoint ep, MgcpCallId call_id, inout RtpFlowData flow_a, + inout RtpFlowData flow_b, boolean tear_down_rtp := true) runs on dummy_CT { var RtpemStats stats[2]; var MgcpResponse resp; - var MgcpEndpoint ep := c_mgw_ep_rtpbridge & "2@" & c_mgw_domain; - var MgcpCallId call_id := '1227'H; var integer num_pkts_tx[2]; var integer temp; - f_init(ep); - /* Create the first connection in receive only mode (RNC side, IuUP-Init active) */ - flow[0] := valueof(t_RtpFlow(local_ip_a, remote_ip_a, 96, "VND.3GPP.IUFP/16000")); - flow[0].em.portnr := 10000; - flow[0].rtp_cfg := c_RtpemDefaultCfg; - flow[0].rtp_cfg.rx_payloads[0].payload_type := flow[0].codec_descr[0].pt; - flow[0].rtp_cfg.tx_payloads[0].payload_type := flow[0].codec_descr[0].pt; - flow[0].rtp_cfg.iuup_mode := true; - flow[0].rtp_cfg.iuup_cfg.active_init := true; - flow[0].rtp_cfg.iuup_cfg.rab_flow_combs := rfcl_a; - f_flow_create(RTPEM[0], ep, call_id, "recvonly", flow[0], true); + f_flow_create(RTPEM[0], ep, call_id, "recvonly", flow_a, true); f_rtpem_mode(RTPEM[0], RTPEM_MODE_RXONLY); /* Create the second connection. This connection will be also - * in receive only mode (CN side, IuUP-Init passive) */ - flow[1] := valueof(t_RtpFlow(local_ip_b, remote_ip_b, 96, "VND.3GPP.IUFP/16000")); - flow[1].em.portnr := 20000; - flow[1].rtp_cfg := c_RtpemDefaultCfg; - flow[1].rtp_cfg.rx_payloads[0].payload_type := flow[1].codec_descr[0].pt; - flow[1].rtp_cfg.tx_payloads[0].payload_type := flow[1].codec_descr[0].pt; - flow[1].rtp_cfg.iuup_mode := true; - flow[1].rtp_cfg.iuup_cfg.active_init := false; - f_flow_create(RTPEM[1], ep, call_id, "recvonly", flow[1], true); + * in receive only mode (CN side, regular RTP) */ + f_flow_create(RTPEM[1], ep, call_id, "recvonly", flow_b, true); f_rtpem_mode(RTPEM[1], RTPEM_MODE_RXONLY); /* The first leg starts transmitting */ @@ -2875,7 +2854,7 @@ f_rtpem_mode(RTPEM[0], RTPEM_MODE_BIDIR); stats[1] := f_rtpem_stats_get(RTPEM[1]); num_pkts_tx[1] := stats[1].num_pkts_tx; - f_flow_modify(RTPEM[0], ep, call_id, "sendrecv", flow[0]); + f_flow_modify(RTPEM[0], ep, call_id, "sendrecv", flow_a); f_sleep(0.5); stats[0] := f_rtpem_stats_get(RTPEM[0]); if (stats[0].num_pkts_rx_err_disabled != 0) { @@ -2894,7 +2873,7 @@ f_rtpem_mode(RTPEM[1], RTPEM_MODE_BIDIR); stats[0] := f_rtpem_stats_get(RTPEM[0]); num_pkts_tx[0] := stats[0].num_pkts_tx; - f_flow_modify(RTPEM[1], ep, call_id, "sendrecv", flow[1]); + f_flow_modify(RTPEM[1], ep, call_id, "sendrecv", flow_b); f_sleep(2.0); stats[0] := f_rtpem_stats_get(RTPEM[0]); @@ -2916,8 +2895,44 @@ f_rtpem_stats_err_check(stats[1]); /* Tear down */ - f_flow_delete(RTPEM[0]); - f_flow_delete(RTPEM[1], ep, call_id); + if (tear_down_rtp) { + f_flow_delete(RTPEM[0]); + f_flow_delete(RTPEM[1], ep, call_id); + } + setverdict(pass); + } + + /* create two local RTP+IuUP emulations and pass data in both directions */ + function f_tc_two_crcx_mdcx_and_iuup(charstring local_ip_a, charstring remote_ip_a, + IuUP_RabFlowCombinationList rfcl_a, + charstring local_ip_b, charstring remote_ip_b) runs on dummy_CT { + var RtpFlowData flow[2]; + var MgcpEndpoint ep := c_mgw_ep_rtpbridge & "2@" & c_mgw_domain; + var MgcpCallId call_id := '1227'H; + + f_init(ep); + + /* Create the first connection in receive only mode (RNC side, IuUP-Init active) */ + flow[0] := valueof(t_RtpFlow(local_ip_a, remote_ip_a, 96, "VND.3GPP.IUFP/16000")); + flow[0].em.portnr := 10000; + flow[0].rtp_cfg := c_RtpemDefaultCfg; + flow[0].rtp_cfg.rx_payloads[0].payload_type := flow[0].codec_descr[0].pt; + flow[0].rtp_cfg.tx_payloads[0].payload_type := flow[0].codec_descr[0].pt; + flow[0].rtp_cfg.iuup_mode := true; + flow[0].rtp_cfg.iuup_cfg.active_init := true; + flow[0].rtp_cfg.iuup_cfg.rab_flow_combs := rfcl_a; + + /* Create the second connection. This connection will be also + * in receive only mode (CN side, IuUP-Init passive) */ + flow[1] := valueof(t_RtpFlow(local_ip_b, remote_ip_b, 96, "VND.3GPP.IUFP/16000")); + flow[1].em.portnr := 20000; + flow[1].rtp_cfg := c_RtpemDefaultCfg; + flow[1].rtp_cfg.rx_payloads[0].payload_type := flow[1].codec_descr[0].pt; + flow[1].rtp_cfg.tx_payloads[0].payload_type := flow[1].codec_descr[0].pt; + flow[1].rtp_cfg.iuup_mode := true; + flow[1].rtp_cfg.iuup_cfg.active_init := false; + + f_two_crcx_mdcx_data_transfer(ep, call_id, flow[0], flow[1], true); setverdict(pass); } testcase TC_two_crcx_mdcx_and_iuup() runs on dummy_CT { @@ -2945,12 +2960,8 @@ IuUP_RabFlowCombinationList rfcl_a, charstring local_ip_b, charstring remote_ip_b) runs on dummy_CT { var RtpFlowData flow[2]; - var RtpemStats stats[2]; - var MgcpResponse resp; var MgcpEndpoint ep := c_mgw_ep_rtpbridge & "2@" & c_mgw_domain; var MgcpCallId call_id := '1227'H; - var integer num_pkts_tx[2]; - var integer temp; f_init(ep); @@ -2966,8 +2977,6 @@ flow[0].rtp_cfg.iuup_mode := true; flow[0].rtp_cfg.iuup_cfg.active_init := true; flow[0].rtp_cfg.iuup_cfg.rab_flow_combs := rfcl_a; - f_flow_create(RTPEM[0], ep, call_id, "recvonly", flow[0], true); - f_rtpem_mode(RTPEM[0], RTPEM_MODE_RXONLY); /* Create the second connection. This connection will be also * in receive only mode (CN side, regular RTP) */ @@ -2980,85 +2989,8 @@ /* flow[0].rtp_cfg.rx_payloads[0].fixed_payload converted AMR-IuUP->AMR-BE-RTP*/ flow[1].rtp_cfg.rx_payloads[0].fixed_payload := 'f3d3ca2567ffae00607d713a0f45db225ed2938ccca60ccd066924f298f7b5b8'O; flow[1].rtp_cfg.iuup_mode := false; - f_flow_create(RTPEM[1], ep, call_id, "recvonly", flow[1], true); - f_rtpem_mode(RTPEM[1], RTPEM_MODE_RXONLY); - /* The first leg starts transmitting */ - f_rtpem_mode(RTPEM[0], RTPEM_MODE_TXONLY); - f_sleep(0.5); - stats[0] := f_rtpem_stats_get(RTPEM[0]); - if (stats[0].num_pkts_rx_err_disabled != 0) { - setverdict(fail, "received packets from MGW on recvonly connection 0"); - mtc.stop; - } - stats[1] := f_rtpem_stats_get(RTPEM[1]); - if (stats[1].num_pkts_rx_err_disabled != 0) { - setverdict(fail, "received packets from MGW on recvonly connection 1"); - mtc.stop; - } - - /* The second leg starts transmitting a little later */ - f_rtpem_mode(RTPEM[1], RTPEM_MODE_TXONLY); - f_sleep(1.0); - stats[0] := f_rtpem_stats_get(RTPEM[0]); - if (stats[0].num_pkts_rx_err_disabled != 0) { - setverdict(fail, "received packets from MGW on recvonly connection 0"); - mtc.stop; - } - stats[1] := f_rtpem_stats_get(RTPEM[1]); - if (stats[1].num_pkts_rx_err_disabled != 0) { - setverdict(fail, "received packets from MGW on recvonly connection 1"); - mtc.stop; - } - - /* The first leg will now be switched into bidirectional - * mode, but we do not expect any data coming back yet. */ - f_rtpem_mode(RTPEM[0], RTPEM_MODE_BIDIR); - stats[1] := f_rtpem_stats_get(RTPEM[1]); - num_pkts_tx[1] := stats[1].num_pkts_tx; - f_flow_modify(RTPEM[0], ep, call_id, "sendrecv", flow[0]); - f_sleep(0.5); - stats[0] := f_rtpem_stats_get(RTPEM[0]); - if (stats[0].num_pkts_rx_err_disabled != 0) { - setverdict(fail, "received packets from MGW on recvonly connection 0"); - mtc.stop; - } - stats[1] := f_rtpem_stats_get(RTPEM[1]); - if (stats[1].num_pkts_rx_err_disabled != 0) { - setverdict(fail, "received packets from MGW on recvonly connection 1"); - mtc.stop; - } - - /* When the second leg is switched into bidirectional mode - * as well, then the MGW will connect the two together and - * we should see RTP streams passing through from both ends. */ - f_rtpem_mode(RTPEM[1], RTPEM_MODE_BIDIR); - stats[0] := f_rtpem_stats_get(RTPEM[0]); - num_pkts_tx[0] := stats[0].num_pkts_tx; - f_flow_modify(RTPEM[1], ep, call_id, "sendrecv", flow[1]); - f_sleep(2.0); - - stats[0] := f_rtpem_stats_get(RTPEM[0]); - stats[1] := f_rtpem_stats_get(RTPEM[1]); - - temp := stats[0].num_pkts_tx - num_pkts_tx[0] - stats[1].num_pkts_rx; - if (temp > 3 or temp < -3) { - setverdict(fail, "number of packets not within normal parameters:", temp); - mtc.stop; - } - - temp := stats[1].num_pkts_tx - num_pkts_tx[1] - stats[0].num_pkts_rx; - if (temp > 3 or temp < -3) { - setverdict(fail, "number of packets not within normal parameters:", temp); - mtc.stop; - } - - f_rtpem_stats_err_check(stats[0]); - f_rtpem_stats_err_check(stats[1]); - - /* Tear down */ - f_flow_delete(RTPEM[0]); - f_flow_delete(RTPEM[1], ep, call_id); + f_two_crcx_mdcx_data_transfer(ep, call_id, flow[0], flow[1], true); setverdict(pass); } testcase TC_two_crcx_mdcx_and_iuup_rtp() runs on dummy_CT { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34546?usp=email 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: Ic4f3c5bb687373bdae6942e1952797e76bfa3ffb Gerrit-Change-Number: 34546 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: RTP_Emulation: Log the different failure verdicts before stopping

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34552?usp=email ) Change subject: RTP_Emulation: Log the different failure verdicts before stopping ...................................................................... RTP_Emulation: Log the different failure verdicts before stopping Change-Id: I177b2f4e56ac89fcab20ba6235bf968ac1873046 --- M library/RTP_Emulation.ttcn 1 file changed, 26 insertions(+), 6 deletions(-) Approvals: neels: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/library/RTP_Emulation.ttcn b/library/RTP_Emulation.ttcn index 5e10b3f..9095214 100644 --- a/library/RTP_Emulation.ttcn +++ b/library/RTP_Emulation.ttcn @@ -280,38 +280,49 @@ * check that will fit most situations and is intended to be executed by * the testcases as as needed. */ function f_rtpem_stats_err_check(RtpemStats s) { + var boolean do_stop := false; log("stats: ", s); /* Check if there was some activity at either on the RX or on the * TX side, but complete silence would indicate some problem */ if (s.num_pkts_tx < 1 and s.num_pkts_rx < 1) { setverdict(fail, "no RTP packet activity detected (packets)"); - mtc.stop; + do_stop := true; } if (s.bytes_payload_tx < 1 and s.bytes_payload_rx < 1) { setverdict(fail, "no RTP packet activity detected (bytes)"); - mtc.stop; + do_stop := true; } /* Check error counters */ if (s.num_pkts_rx_err_seq != 0) { setverdict(fail, log2str(s.num_pkts_rx_err_seq, " RTP packet sequence number errors occurred")); - mtc.stop; + do_stop := true; } if (s.num_pkts_rx_err_ts != 0) { setverdict(fail, log2str(s.num_pkts_rx_err_ts, " RTP packet timestamp errors occurred")); - mtc.stop; + do_stop := true; } if (s.num_pkts_rx_err_pt != 0) { setverdict(fail, log2str(s.num_pkts_rx_err_pt, " RTP packet payload type errors occurred")); - mtc.stop; + do_stop := true; } if (s.num_pkts_rx_err_disabled != 0) { setverdict(fail, log2str(s.num_pkts_rx_err_disabled, " RTP packets received while RX was disabled")); - mtc.stop; + do_stop := true; } if (s.num_pkts_rx_err_payload != 0) { setverdict(fail, log2str(s.num_pkts_rx_err_payload, " RTP packets with mismatching payload received")); + do_stop := true; + } + + if (do_stop) { + if (self == mtc) { + /* Properly stop all ports before disconnecting them. This avoids + * running into the dynamic testcase error due to messages arriving on + * unconnected ports. */ + all component.stop; + } mtc.stop; } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34552?usp=email 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: I177b2f4e56ac89fcab20ba6235bf968ac1873046 Gerrit-Change-Number: 34552 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

7 months, 2 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: mgw: Introduce test TC_two_crcx_mdcx_and_iuup_rtp_mdcx_to_iuup

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34539?usp=email ) Change subject: mgw: Introduce test TC_two_crcx_mdcx_and_iuup_rtp_mdcx_to_iuup ...................................................................... mgw: Introduce test TC_two_crcx_mdcx_and_iuup_rtp_mdcx_to_iuup Related: SYS#6578 Change-Id: I08eca9ea123029c37892d5de7c94a8ed6cc0a913 --- M mgw/MGCP_Test.ttcn M mgw/expected-results.xml 2 files changed, 113 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified neels: Looks good to me, approved osmith: Looks good to me, but someone else must approve diff --git a/mgw/MGCP_Test.ttcn b/mgw/MGCP_Test.ttcn index b75fd69..7568ac9 100644 --- a/mgw/MGCP_Test.ttcn +++ b/mgw/MGCP_Test.ttcn @@ -3168,6 +3168,107 @@ mp_local_ipv4, mp_remote_ipv4); } + /* Set up Endpoint with 1 IuUP conn and 1 RTP-AMR conn, then MDCX the later to become IuUP. */ + function f_tc_two_crcx_mdcx_and_iuup_rtp_mdcx_to_iuup(charstring local_ip_a, charstring remote_ip_a, + IuUP_RabFlowCombinationList rfcl_a, + charstring local_ip_b, charstring remote_ip_b) runs on dummy_CT { + var RtpFlowData flow[2]; + var MgcpEndpoint ep := c_mgw_ep_rtpbridge & "2@" & c_mgw_domain; + var MgcpCallId call_id := '1227'H; + var RtpemStats stats[2][2]; + + f_init(ep); + + /* Create the first connection in receive only mode (RNC side, IuUP-Init active) */ + flow[0] := valueof(t_RtpFlow(local_ip_a, remote_ip_a, 96, "VND.3GPP.IUFP/16000")); + flow[0].em.portnr := 10000; + flow[0].rtp_cfg := c_RtpemDefaultCfg; + flow[0].rtp_cfg.tx_payloads[0].payload_type := flow[0].codec_descr[0].pt; + flow[0].rtp_cfg.rx_payloads[0].payload_type := flow[0].codec_descr[0].pt; + flow[0].rtp_cfg.tx_payloads[0].fixed_payload := '4f28959ffeb80181f5c4e83d176c897b4a4e333298333419a493ca63ded6e0'O; + /* flow[1].rtp_cfg.rx_payloads[0].fixed_payload converted AMR-BE-RTP->AMR-IUUP*/ + flow[0].rtp_cfg.rx_payloads[0].fixed_payload := '08556d944c71a1a081e7ead204244480000ecd82b81118000097c4794e7740'O; + flow[0].rtp_cfg.iuup_mode := true; + flow[0].rtp_cfg.iuup_cfg.active_init := true; + flow[0].rtp_cfg.iuup_cfg.rab_flow_combs := rfcl_a; + + /* Create the second connection. This connection will be also + * in receive only mode (CN side, regular RTP) */ + flow[1] := valueof(t_RtpFlow(local_ip_b, remote_ip_b, 112, "AMR/8000")); + flow[1].em.portnr := 20000; + flow[1].rtp_cfg := c_RtpemDefaultCfg; + flow[1].rtp_cfg.tx_payloads[0].payload_type := flow[1].codec_descr[0].pt; + flow[1].rtp_cfg.rx_payloads[0].payload_type := flow[1].codec_descr[0].pt; + flow[1].rtp_cfg.tx_payloads[0].fixed_payload := '0382155b65131c68682079fab4810911200003b360ae0446000025f11e539dd0'O; + /* flow[0].rtp_cfg.rx_payloads[0].fixed_payload converted AMR-IuUP->AMR-BE-RTP*/ + flow[1].rtp_cfg.rx_payloads[0].fixed_payload := 'f3d3ca2567ffae00607d713a0f45db225ed2938ccca60ccd066924f298f7b5b8'O; + flow[1].rtp_cfg.iuup_mode := false; + + f_two_crcx_mdcx_data_transfer(ep, call_id, flow[0], flow[1], false); + setverdict(pass); + + /* Stop sending further pkts to RTPEM[1], to avoid race conditions where RTP is sent while we + * reconfigure MGW (and our RTPEM) for IuUP: + */ + f_rtpem_mode(RTPEM[0], RTPEM_MODE_RXONLY); + f_rtpem_mode(RTPEM[1], RTPEM_MODE_RXONLY); + f_sleep(0.5); + + /* Modify the AMR side to also do IuUP */ + flow[1].codec_descr := {{ + pt := 96, + codec := "VND.3GPP.IUFP/16000", + fmtp := omit + }}; + flow[1].rtp_cfg.iuup_mode := true; + flow[1].rtp_cfg.iuup_cfg.active_init := false; + flow[1].rtp_cfg.iuup_cfg.rab_flow_combs := rfcl_a; + flow[1].rtp_cfg.tx_payloads[0].payload_type := flow[1].codec_descr[0].pt; + /* Send whatever payload is expected by the other RTPEM, now without AMR-BE_RTP<->AMR-IUUP conversion: */ + flow[1].rtp_cfg.tx_payloads[0].fixed_payload := flow[0].rtp_cfg.rx_payloads[0].fixed_payload; + flow[1].rtp_cfg.rx_payloads[0].payload_type := flow[1].codec_descr[0].pt; + /* Expect whatever payload is sent by the other RTPEM, now without AMR-BE_RTP<->AMR-IUUP conversion: */ + flow[1].rtp_cfg.rx_payloads[0].fixed_payload := flow[0].rtp_cfg.tx_payloads[0].fixed_payload; + f_flow_modify(RTPEM[1], ep, call_id, "sendrecv", flow[1]); + f_rtpem_mode(RTPEM[0], RTPEM_MODE_BIDIR); + f_sleep(1.0); + f_rtpem_mode(RTPEM[1], RTPEM_MODE_BIDIR); + + /* Now, if MGW would keep sending RTP instead of expected IuUP, then that would make the RTPEM[1] + * component to fail, since it would error trying to decode an RTP pkt as IuUP. + * We simply need to make sure some packets are being forwarded to it: + */ + stats[0][0] := f_rtpem_stats_get(RTPEM[0]); + stats[1][0] := f_rtpem_stats_get(RTPEM[1]); + f_sleep(1.0); + stats[0][1] := f_rtpem_stats_get(RTPEM[0]); + stats[1][1] := f_rtpem_stats_get(RTPEM[1]); + + f_rtpem_stats_err_check(stats[0][1]); + f_rtpem_stats_err_check(stats[1][1]); + if (stats[0][1].num_pkts_rx == stats[0][0].num_pkts_rx) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("No packets received in connection 0 after MDCX")); + } + if (stats[1][1].num_pkts_rx == stats[1][0].num_pkts_rx) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("No packets received in connection 1 after MDCX")); + } + + /* Tear down */ + f_flow_delete(RTPEM[0]); + f_flow_delete(RTPEM[1], ep, call_id); + setverdict(pass); + } + testcase TC_two_crcx_mdcx_and_iuup_rtp_mdcx_to_iuup() runs on dummy_CT { + var template (value) IuUP_RabFlowCombinationList rfcl := { + t_IuUP_RFC_AMR_12_2(0), + t_IuUP_RFC_AMR_SID(1), + t_IuUP_RFC_AMR_NO_DATA(2) + }; + f_tc_two_crcx_mdcx_and_iuup_rtp_mdcx_to_iuup(mp_local_ipv4, mp_remote_ipv4, valueof(rfcl), + mp_local_ipv4, mp_remote_ipv4); + } control { execute(TC_selftest()); execute(TC_auep_null()); @@ -3258,6 +3359,7 @@ execute(TC_two_crcx_mdcx_and_iuup_rtp()); execute(TC_two_crcx_mdcx_and_iuup_rtp_rfci_unordered()); execute(TC_two_crcx_mdcx_and_iuup_rtp_mdcx_recvonly()); + execute(TC_two_crcx_mdcx_and_iuup_rtp_mdcx_to_iuup()); execute(TC_two_crcx_mdcx_and_rtp_clearmode()); diff --git a/mgw/expected-results.xml b/mgw/expected-results.xml index 44ce65b..5d57e1c 100644 --- a/mgw/expected-results.xml +++ b/mgw/expected-results.xml @@ -94,5 +94,6 @@ <testcase classname='MGCP_Test' name='TC_two_crcx_mdcx_and_iuup_rtp' time='MASKED'/> <testcase classname='MGCP_Test' name='TC_two_crcx_mdcx_and_iuup_rtp_rfci_unordered' time='MASKED'/> <testcase classname='MGCP_Test' name='TC_two_crcx_mdcx_and_iuup_rtp_mdcx_recvonly' time='MASKED'/> + <testcase classname='MGCP_Test' name='TC_two_crcx_mdcx_and_iuup_rtp_mdcx_to_iuup' time='MASKED'/> <testcase classname='MGCP_Test' name='TC_one_crcx_loopback_rtp_implicit' time='MASKED'/> </testsuite> -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34539?usp=email 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: I08eca9ea123029c37892d5de7c94a8ed6cc0a913 Gerrit-Change-Number: 34539 Gerrit-PatchSet: 5 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

7 months, 2 weeks

1
0
0 0

[M] Change in osmo-bsc[master]: vty: make NCC Permitted (SI2) configurable

by osmith

Attention is currently required from: fixeria, pespin. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/34543?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: vty: make NCC Permitted (SI2) configurable ...................................................................... vty: make NCC Permitted (SI2) configurable Related: SYS#6579 Change-Id: I71bb855c35378f8f0598bc11a42bd274b7232a5e --- M src/osmo-bsc/bts_vty.c M tests/bts_features.vty 2 files changed, 119 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/43/34543/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34543?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I71bb855c35378f8f0598bc11a42bd274b7232a5e Gerrit-Change-Number: 34543 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

7 months, 2 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: mgw: Introduce test TC_two_crcx_mdcx_and_iuup_rtp_mdcx_to_iuup

by neels

Attention is currently required from: neels, pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34539?usp=email ) Change subject: mgw: Introduce test TC_two_crcx_mdcx_and_iuup_rtp_mdcx_to_iuup ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34539?usp=email 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: I08eca9ea123029c37892d5de7c94a8ed6cc0a913 Gerrit-Change-Number: 34539 Gerrit-PatchSet: 4 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Sep 2023 14:30:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

7 months, 2 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: mgw: Factor out helper func to test data flows over endp with 2 conns

by neels

Attention is currently required from: fixeria, pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34546?usp=email ) Change subject: mgw: Factor out helper func to test data flows over endp with 2 conns ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34546?usp=email 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: Ic4f3c5bb687373bdae6942e1952797e76bfa3ffb Gerrit-Change-Number: 34546 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Sep 2023 14:29:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

7 months, 2 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: mgw: Introduce tests TC_two_crcx_mdcx_and_iuup_(rtp_)mdcx_recvonly

by neels

Attention is currently required from: pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34547?usp=email ) Change subject: mgw: Introduce tests TC_two_crcx_mdcx_and_iuup_(rtp_)mdcx_recvonly ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34547?usp=email 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: I34d47d0cdde855900798e4cb3efd26af22f5b049 Gerrit-Change-Number: 34547 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Sep 2023 14:28:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: RTP_Emulation: Log number of error packets

by neels

Attention is currently required from: pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34551?usp=email ) Change subject: RTP_Emulation: Log number of error packets ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34551?usp=email 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: I685fb43ea30c83a975edd32cc24994da15940100 Gerrit-Change-Number: 34551 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Sep 2023 14:26:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: RTP_Emulation: Log the different failure verdicts before stopping

by neels

Attention is currently required from: pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34552?usp=email ) Change subject: RTP_Emulation: Log the different failure verdicts before stopping ...................................................................... Patch Set 1: Code-Review+2 (1 comment) Patchset: PS1: the commit log seems to be a bit different from the patch? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34552?usp=email 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: I177b2f4e56ac89fcab20ba6235bf968ac1873046 Gerrit-Change-Number: 34552 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Sep 2023 14:25:12 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

7 months, 2 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: mgw: Introduce test TC_two_crcx_mdcx_and_iuup_rtp_mdcx_to_iuup

by neels

Attention is currently required from: neels, pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34539?usp=email ) Change subject: mgw: Introduce test TC_two_crcx_mdcx_and_iuup_rtp_mdcx_to_iuup ...................................................................... Patch Set 4: Code-Review+1 (1 comment) File mgw/MGCP_Test.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34539/comment/1443c3a0_be1f… PS1, Line 3195: > up to here, it is a copy of f_tc_two_crcx_mdcx_and_iuup_rtp() Done -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34539?usp=email 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: I08eca9ea123029c37892d5de7c94a8ed6cc0a913 Gerrit-Change-Number: 34539 Gerrit-PatchSet: 4 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Sep 2023 14:23:00 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: comment

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-msc[master]: Bump version: 1.11.0.7-dbe88 → 1.11.1

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/34572?usp=email ) Change subject: Bump version: 1.11.0.7-dbe88 → 1.11.1 ...................................................................... Bump version: 1.11.0.7-dbe88 → 1.11.1 Change-Id: Ia7a90b7c192702bb71ee55df92cb05030fe5dd03 --- M debian/changelog 1 file changed, 26 insertions(+), 0 deletions(-) Approvals: neels: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/debian/changelog b/debian/changelog index fe631a2..debce4e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,20 @@ +osmo-msc (1.11.1) unstable; urgency=medium + + [ Neels Hofmeyr ] + * fix codecs in internal call bridge + * make two functions static + + [ Mychaela N. Falconia ] + * CC: don't start guard timer on mid-call MNCC messages + * gsup_client_mux: set destination_name in error reply function + * SMS over GSUP: correctly route GSUP responses to MT SMS + * SMS over GSUP: set source_name in GSUP reply messages + + [ Andreas Eversberg ] + * ASCI: Remove duplicated CLEAR COMMAND from VGCS/VBS channel handling + + -- Oliver Smith <osmith(a)sysmocom.de> Thu, 28 Sep 2023 13:53:07 +0200 + osmo-msc (1.11.0) unstable; urgency=medium [ arehbein ] -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/34572?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ia7a90b7c192702bb71ee55df92cb05030fe5dd03 Gerrit-Change-Number: 34572 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-msc[master]: Bump version: 1.11.0.7-dbe88 → 1.11.1

by neels

Attention is currently required from: osmith. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/34572?usp=email ) Change subject: Bump version: 1.11.0.7-dbe88 → 1.11.1 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/34572?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ia7a90b7c192702bb71ee55df92cb05030fe5dd03 Gerrit-Change-Number: 34572 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Sep 2023 14:18:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

7 months, 2 weeks

1
0
0 0

[S] Change in libosmocore[master]: osmo_io: Clean up code

by pespin

Attention is currently required from: arehbein, daniel. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34524?usp=email ) Change subject: osmo_io: Clean up code ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34524?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: I77f7ae2b211507f420d87c484ec75ee054fceb63 Gerrit-Change-Number: 34524 Gerrit-PatchSet: 3 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Sep 2023 14:14:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-mgw[master]: Bump version: 1.12.0.3-58d5b → 1.12.1

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/34571?usp=email ) Change subject: Bump version: 1.12.0.3-58d5b → 1.12.1 ...................................................................... Bump version: 1.12.0.3-58d5b → 1.12.1 Change-Id: Iefb000582a139ff53c4afbf94e1299e26ceeac44 --- M debian/changelog M src/libosmo-mgcp-client/Makefile.am 2 files changed, 19 insertions(+), 1 deletion(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/debian/changelog b/debian/changelog index 4b7cef6..1e23bc2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +osmo-mgw (1.12.1) unstable; urgency=medium + + [ Pau Espin Pedrol ] + * mgcp-client: Fix missing include in mgcp_client_pool.h + * mgcp-client: Introduce API osmo_mgcpc_ep_local_name() + * mgw: Configure IuUP if codec set during MDCX + + -- Oliver Smith <osmith(a)sysmocom.de> Thu, 28 Sep 2023 15:58:17 +0200 + osmo-mgw (1.12.0) unstable; urgency=medium [ Philipp Maier ] diff --git a/src/libosmo-mgcp-client/Makefile.am b/src/libosmo-mgcp-client/Makefile.am index 6446fed..b2bed9a 100644 --- a/src/libosmo-mgcp-client/Makefile.am +++ b/src/libosmo-mgcp-client/Makefile.am @@ -19,7 +19,7 @@ # This is not at all related to the release version, but a range of supported # API versions. Read TODO_RELEASE in the source tree's root! -MGCP_CLIENT_LIBVERSION=12:0:0 +MGCP_CLIENT_LIBVERSION=13:0:1 lib_LTLIBRARIES = \ libosmo-mgcp-client.la \ -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/34571?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Iefb000582a139ff53c4afbf94e1299e26ceeac44 Gerrit-Change-Number: 34571 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-mgw[master]: Bump version: 1.12.0.3-58d5b → 1.12.1

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/34571?usp=email ) Change subject: Bump version: 1.12.0.3-58d5b → 1.12.1 ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/34571?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Iefb000582a139ff53c4afbf94e1299e26ceeac44 Gerrit-Change-Number: 34571 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Sep 2023 14:13:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

7 months, 2 weeks

1
0
0 0

[S] Change in libosmocore[master]: osmo_io: Clean up code

by arehbein

Attention is currently required from: arehbein, daniel, pespin. Hello Jenkins Builder, daniel, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/34524?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: osmo_io: Clean up code ...................................................................... osmo_io: Clean up code - Remove osmo_io_init() from header, since it has no function definition - Add osmo_iofd_init() to header Change-Id: I77f7ae2b211507f420d87c484ec75ee054fceb63 --- M include/osmocom/core/osmo_io.h 1 file changed, 13 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/24/34524/3 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34524?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: I77f7ae2b211507f420d87c484ec75ee054fceb63 Gerrit-Change-Number: 34524 Gerrit-PatchSet: 3 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: newpatchset

7 months, 2 weeks

1
0
0 0

[S] Change in libosmo-netif[master]: stream_srv: Fix connection error handling

by arehbein

Attention is currently required from: daniel, laforge, pespin. arehbein has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/34338?usp=email ) Change subject: stream_srv: Fix connection error handling ...................................................................... Patch Set 2: (3 comments) Patchset: PS2: This patch didn't really introduce the (possible) issues I'm addressing here, but I think it would be better if we fixed them while we're at it File src/stream_srv.c: https://gerrit.osmocom.org/c/libosmo-netif/+/34338/comment/01098932_6b4c22fa PS2, Line 489: if (OSMO_UNLIKELY(res <= 0)) { Why do we not call `osmo_stream_srv_clear_tx_queue()` here, if the connection is dead anyways? https://gerrit.osmocom.org/c/libosmo-netif/+/34338/comment/a563c839_25e5d060 PS2, Line 496: if (osmo_iofd_txqueue_len(iofd) == 0) Can it not happen that messages can't be sent out, so that this condition never holds true? In that case, the connection won't be closed as announced (I think this is a problem without this change, as well). Also, `osmo_stream_srv_clear_tx_queue()` isn't called anywhere except in `osmo-hnbgw.git:src/osmo-hnbgw/hnbgw.c` on connection restart (or something among those lines) as far as I can tell, so if messages can't be sent out and `OSMO_STREAM_SRV_F_FLUSH_DESTROY` is set, then it looks like we will have some sort of endless loop here. -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/34338?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: I84eea2717f3762830f3f5b115e6fc8545eaa4fd5 Gerrit-Change-Number: 34338 Gerrit-PatchSet: 2 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: arehbein <arehbein(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Sep 2023 14:08:52 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-mgw[master]: Bump version: 1.12.0.3-58d5b → 1.12.1

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/34571?usp=email ) Change subject: Bump version: 1.12.0.3-58d5b → 1.12.1 ...................................................................... Patch Set 2: (1 comment) Patchset: PS1: > missing bump in LIBVERSION due to new API (+1:same:+1) Done -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/34571?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Iefb000582a139ff53c4afbf94e1299e26ceeac44 Gerrit-Change-Number: 34571 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Sep 2023 14:00:30 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-mgw[master]: Bump version: 1.12.0.3-58d5b → 1.12.1

by osmith

Attention is currently required from: osmith. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/34571?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: Bump version: 1.12.0.3-58d5b → 1.12.1 ...................................................................... Bump version: 1.12.0.3-58d5b → 1.12.1 Change-Id: Iefb000582a139ff53c4afbf94e1299e26ceeac44 --- M debian/changelog M src/libosmo-mgcp-client/Makefile.am 2 files changed, 19 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/71/34571/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/34571?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Iefb000582a139ff53c4afbf94e1299e26ceeac44 Gerrit-Change-Number: 34571 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newpatchset

7 months, 2 weeks

1
0
0 0

2024

2023

2022

gerrit-log September 2023