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

[S] Change in osmo-bts[master]: vty info: MS power levels in dBm are not negative

by laforge

Attention is currently required from: keith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/36497?usp=email ) Change subject: vty info: MS power levels in dBm are not negative ...................................................................... Patch Set 1: Code-Review+1 (1 comment) Patchset: PS1: oh my, what an embarrassing bug... -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/36497?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: Ib928a1378bc00b8ccb0365e5536f010e1f8a3d43 Gerrit-Change-Number: 36497 Gerrit-PatchSet: 1 Gerrit-Owner: keith <keith(a)rhizomatica.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: keith <keith(a)rhizomatica.org> Gerrit-Comment-Date: Sun, 31 Mar 2024 19:19:01 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 weeks, 6 days

1
0
0 0

[S] Change in osmo-bts[master]: vty info: MS power levels in dBm are not negative

by keith

keith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/36497?usp=email ) Change subject: vty info: MS power levels in dBm are not negative ...................................................................... vty info: MS power levels in dBm are not negative Change-Id: Ib928a1378bc00b8ccb0365e5536f010e1f8a3d43 --- M src/common/vty.c 1 file changed, 11 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/97/36497/1 diff --git a/src/common/vty.c b/src/common/vty.c index 6ec96da..c0008a8 100644 --- a/src/common/vty.c +++ b/src/common/vty.c @@ -1867,10 +1867,10 @@ int current_dbm = ms_pwr_dbm(trx->bts->band, st->current); int max_dbm = ms_pwr_dbm(trx->bts->band, st->max); - cfg_out(vty, "Current power level: %u, -%d dBm", + cfg_out(vty, "Current power level: %u, %d dBm", st->current, current_dbm); if (st->dpc_params != NULL) - vty_out(vty, " (max %u, -%d dBm)", st->max, max_dbm); + vty_out(vty, " (max %u, %d dBm)", st->max, max_dbm); vty_out(vty, "%s", VTY_NEWLINE); if (st->dpc_params == NULL) -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/36497?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: Ib928a1378bc00b8ccb0365e5536f010e1f8a3d43 Gerrit-Change-Number: 36497 Gerrit-PatchSet: 1 Gerrit-Owner: keith <keith(a)rhizomatica.org> Gerrit-MessageType: newchange

3 weeks, 6 days

1
0
0 0

[S] Change in libosmo-sccp[master]: fix log_sctp_notification(): remove unused variable

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/36496?usp=email ) Change subject: fix log_sctp_notification(): remove unused variable ...................................................................... fix log_sctp_notification(): remove unused variable This unused variable causes failures in Jenkins master build job. Change-Id: Ifc563a7fe9006b6e412f1104cbc7e4d9b8ccae3f Fixes: 2c9ba16 "ipa: Use pseudo-random number for SLS in IPA->M3UA direction" --- M src/osmo_ss7_asp.c 1 file changed, 12 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo_ss7_asp.c b/src/osmo_ss7_asp.c index f290fdb..90c72a9 100644 --- a/src/osmo_ss7_asp.c +++ b/src/osmo_ss7_asp.c @@ -798,7 +798,6 @@ /* netif code tells us we can read something from the socket */ int ss7_asp_ipa_srv_conn_rx_cb(struct osmo_stream_srv *conn, struct msgb *msg) { - int fd = osmo_stream_srv_get_fd(conn); struct osmo_ss7_asp *asp = osmo_stream_srv_get_data(conn); msg->dst = asp; -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/36496?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ifc563a7fe9006b6e412f1104cbc7e4d9b8ccae3f Gerrit-Change-Number: 36496 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

3 weeks, 6 days

1
0
0 0

[S] Change in libosmo-sccp[master]: fix log_sctp_notification(): remove unused variable

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/36496?usp=email ) Change subject: fix log_sctp_notification(): remove unused variable ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/36496?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ifc563a7fe9006b6e412f1104cbc7e4d9b8ccae3f Gerrit-Change-Number: 36496 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Sun, 31 Mar 2024 18:17:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 weeks, 6 days

1
0
0 0

[S] Change in libosmo-sccp[master]: fix log_sctp_notification(): remove unused variable

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/36496?usp=email ) Change subject: fix log_sctp_notification(): remove unused variable ...................................................................... fix log_sctp_notification(): remove unused variable This unused variable causes failures in Jenkins master build job. Change-Id: Ifc563a7fe9006b6e412f1104cbc7e4d9b8ccae3f Fixes: 2c9ba16 "ipa: Use pseudo-random number for SLS in IPA->M3UA direction" --- M src/osmo_ss7_asp.c 1 file changed, 12 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/96/36496/1 diff --git a/src/osmo_ss7_asp.c b/src/osmo_ss7_asp.c index f290fdb..90c72a9 100644 --- a/src/osmo_ss7_asp.c +++ b/src/osmo_ss7_asp.c @@ -798,7 +798,6 @@ /* netif code tells us we can read something from the socket */ int ss7_asp_ipa_srv_conn_rx_cb(struct osmo_stream_srv *conn, struct msgb *msg) { - int fd = osmo_stream_srv_get_fd(conn); struct osmo_ss7_asp *asp = osmo_stream_srv_get_data(conn); msg->dst = asp; -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/36496?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ifc563a7fe9006b6e412f1104cbc7e4d9b8ccae3f Gerrit-Change-Number: 36496 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

3 weeks, 6 days

1
0
0 0

[S] Change in libosmo-sccp[master]: ipa: Use pseudo-random number for SLS in IPA->M3UA direction

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/36115?usp=email ) Change subject: ipa: Use pseudo-random number for SLS in IPA->M3UA direction ...................................................................... ipa: Use pseudo-random number for SLS in IPA->M3UA direction In Change-Id Ice7bab997b84cfed00c7d6d780c70f4e9fac6002 we introduced code that would make the LSB of the file descriptor be used as SLS when passing packets from IPA in M3UA direction. This did however not achieve sufficient entropy in real-world use cases. In this change, we change over to allocating a pseudo-random SLS to each IPA connection at the time it is established; We then assign that SLS to each packet received on that IPA connection. Change-Id: Ia4e66d660b6057338f66a47fffc8a0d32759f733 Related: SYS#6543 Closes: SYS#6802 --- M src/osmo_ss7_asp.c M stp/stp_main.c 2 files changed, 32 insertions(+), 3 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified dexter: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/src/osmo_ss7_asp.c b/src/osmo_ss7_asp.c index 1f45749..f290fdb 100644 --- a/src/osmo_ss7_asp.c +++ b/src/osmo_ss7_asp.c @@ -803,9 +803,9 @@ msg->dst = asp; rate_ctr_inc2(asp->ctrg, SS7_ASP_CTR_PKT_RX_TOTAL); - /* we can use the 'fd' return value of osmo_stream_srv_get_fd() here unverified as all we do - * is 'roll the dice' to obtain a 4-bit SLS value. */ - return ipa_rx_msg(asp, msg, fd & 0xf); + /* we simply use the lower 4 bits of the asp_id, which is initialized to a pseudo-random value upon + * connect */ + return ipa_rx_msg(asp, msg, asp->asp_id & 0xf); } /* netif code tells us we can read something from the socket */ @@ -916,6 +916,12 @@ if (asp->cfg.trans_proto == IPPROTO_SCTP) { rc = ss7_asp_apply_peer_primary_address(asp); rc = ss7_asp_apply_primary_address(asp); + } else { + if (asp->cfg.proto == OSMO_SS7_ASP_PROT_IPA) { + /* we use the lower 4 bits of the asp_id feld as SLS; let's initialize it here from a + * pseudo-random value */ + asp->asp_id = rand() & 0xf; + } } if (asp->lm && asp->lm->prim_cb) { diff --git a/stp/stp_main.c b/stp/stp_main.c index 01d1865..d630032 100644 --- a/stp/stp_main.c +++ b/stp/stp_main.c @@ -213,6 +213,8 @@ { int rc; + srand(time(NULL)); + tall_stp_ctx = talloc_named_const(NULL, 1, "osmo-stp"); msgb_talloc_ctx_init(tall_stp_ctx, 0); osmo_init_logging2(tall_stp_ctx, &log_info); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/36115?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ia4e66d660b6057338f66a47fffc8a0d32759f733 Gerrit-Change-Number: 36115 Gerrit-PatchSet: 4 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

4 weeks

1
0
0 0

[S] Change in osmo-ci[master]: jobs/ttcn3: …-pablo-gtp: don't wipe workspace

by laforge

Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/36486?usp=email ) Change subject: jobs/ttcn3: …-pablo-gtp: don't wipe workspace ...................................................................... Patch Set 1: (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-ci/+/36486/comment/a74e3e80_b10fe884 PS1, Line 10: cloning the kernel repositories takes a long time and lots of traffic maybe it's worth doing a shallow clone, avoiding 90% of the traffic and time if all we want is one specific [base] version, and nothing earlier than that? Also: if we know there are [likely] other kernel trees around somewhere in [other] workspaces, we can specify those with --reference-if-able to get any objects locally, if available/present. -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/36486?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I4ac1b2c3f5ba63c131dd1d6a4888f32a27264eba Gerrit-Change-Number: 36486 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Mar 2024 14:12:32 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

4 weeks, 1 day

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: msc: f_expect_paging(): fix by_tmsi arg

by laforge

Attention is currently required from: fixeria, neels, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36455?usp=email ) Change subject: msc: f_expect_paging(): fix by_tmsi arg ...................................................................... Patch Set 1: (1 comment) File msc/BSC_ConnectionHandler.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36455/comment/7df0e0f3_f4f5… PS1, Line 1360: boolean by_tmsi := true > You already spent more time saying how much time you'd spend changing it, than actually applying the […] I think we should in general try to write idiomatic code, whether it's python or TTCN3. If it's a huge effort/detour, ok, then we can deviate from it. Or if we simply are not knowledgeable enough in a given language. But here it really seems relatively trivial (unless I'm missing something) to do things "right". -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36455?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: I9434745b7faeb738caafed8080b9f7b1a6a8079a Gerrit-Change-Number: 36455 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Mar 2024 13:42:49 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

4 weeks, 1 day

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: Introduce Asterisk_Tests testsuite

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36490?usp=email ) Change subject: Introduce Asterisk_Tests testsuite ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36490?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: I66f776d5df6fb5dc488d9e589b84a6b2385406e8 Gerrit-Change-Number: 36490 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Mar 2024 12:48:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

4 weeks, 1 day

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: SIP_Templates: Rework templates to make them more extensible

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36489?usp=email ) Change subject: SIP_Templates: Rework templates to make them more extensible ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36489?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: Ifd14213e9c2b8f5061f828a63ef47844828d94ea Gerrit-Change-Number: 36489 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Mar 2024 12:45:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

4 weeks, 1 day

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: SIP: generate seq_nr within allowed range

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36488?usp=email ) Change subject: SIP: generate seq_nr within allowed range ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36488?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: Iea5f4568af1bd795db57d2b77e82d976edc9e337 Gerrit-Change-Number: 36488 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Mar 2024 12:41:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

4 weeks, 1 day

1
0
0 0

[L] Change in docker-playground[master]: Introduce ttcn3-asterisk-ims-ue-test

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36492?usp=email ) Change subject: Introduce ttcn3-asterisk-ims-ue-test ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36492?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Idd262b9224ea879a6e941792944fe0b0db3e68ba Gerrit-Change-Number: 36492 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Mar 2024 12:40:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

4 weeks, 1 day

1
0
0 0

[M] Change in docker-playground[master]: Introduce asterisk-master docker image

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36491?usp=email ) Change subject: Introduce asterisk-master docker image ...................................................................... Patch Set 1: Code-Review+1 (1 comment) File asterisk-master/Dockerfile: https://gerrit.osmocom.org/c/docker-playground/+/36491/comment/9718ff12_a92… PS1, Line 40: open5gs `assert(!copy_paste)` failed! -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36491?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Iaa3816f8ceefac8956e61e15f79ed708dec55238 Gerrit-Change-Number: 36491 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Mar 2024 12:38:07 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

4 weeks, 1 day

1
0
0 0

[S] Change in osmo-iuh[master]: hnbap_common: Make error message more verbose (which type failed)

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/36480?usp=email ) Change subject: hnbap_common: Make error message more verbose (which type failed) ...................................................................... hnbap_common: Make error message more verbose (which type failed) Change-Id: I3d263a2a50afbe1a2a99e52b16e983e0aae22edf --- M src/hnbap_common.c 1 file changed, 13 insertions(+), 4 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/hnbap_common.c b/src/hnbap_common.c index 10a29fa..c7678fb 100644 --- a/src/hnbap_common.c +++ b/src/hnbap_common.c @@ -152,7 +152,7 @@ pdu.choice.initiatingMessage.criticality = criticality; rc = ANY_fromType_aper(&pdu.choice.initiatingMessage.value, td, sptr); if (rc < 0) { - LOGP(DHNBAP, LOGL_ERROR, "Error in ANY_fromType_aper\n"); + LOGP(DHNBAP, LOGL_ERROR, "%s: Error in ANY_fromType_aper (%s)\n", __func__, td->name); return NULL; } @@ -179,7 +179,7 @@ pdu.choice.successfulOutcome.criticality = criticality; rc = ANY_fromType_aper(&pdu.choice.successfulOutcome.value, td, sptr); if (rc < 0) { - LOGP(DHNBAP, LOGL_ERROR, "Error in ANY_fromType_aper\n"); + LOGP(DHNBAP, LOGL_ERROR, "%s: Error in ANY_fromType_aper (%s)\n", __func__, td->name); return NULL; } @@ -206,7 +206,7 @@ pdu.choice.unsuccessfulOutcome.criticality = criticality; rc = ANY_fromType_aper(&pdu.choice.unsuccessfulOutcome.value, td, sptr); if (rc < 0) { - LOGP(DHNBAP, LOGL_ERROR, "Error in ANY_fromType_aper\n"); + LOGP(DHNBAP, LOGL_ERROR, "%s: Error in ANY_fromType_aper (%s)\n", __func__, td->name); return NULL; } @@ -234,7 +234,7 @@ rc = ANY_fromType_aper(&buff->value, type, sptr); if (rc < 0) { - LOGP(DHNBAP, LOGL_ERROR, "Error in ANY_fromType_aper\n"); + LOGP(DHNBAP, LOGL_ERROR, "%s: Error in ANY_fromType_aper(%s)\n", __func__, type->name); FREEMEM(buff); return NULL; } -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/36480?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I3d263a2a50afbe1a2a99e52b16e983e0aae22edf Gerrit-Change-Number: 36480 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

4 weeks, 1 day

1
0
0 0

[S] Change in osmo-iuh[master]: hnbap_common: Make error message more verbose (which type failed)

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/36480?usp=email ) Change subject: hnbap_common: Make error message more verbose (which type failed) ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/36480?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I3d263a2a50afbe1a2a99e52b16e983e0aae22edf Gerrit-Change-Number: 36480 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Mar 2024 11:34:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

4 weeks, 1 day

1
0
0 0

[L] Change in osmo-mgw[master]: Convert RTP/RTCP/OSMUX I/O from osmo_fd to osmo_io

by laforge

Attention is currently required from: dexter, fixeria, neels, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/36363?usp=email ) Change subject: Convert RTP/RTCP/OSMUX I/O from osmo_fd to osmo_io ...................................................................... Patch Set 4: (5 comments) File src/libosmo-mgcp/mgcp_network.c: https://gerrit.osmocom.org/c/osmo-mgw/+/36363/comment/d7843810_68ce3add PS4, Line 1047: * \param[in] msg message buffer that holds the data to be send. > Please document here: […] Done https://gerrit.osmocom.org/c/osmo-mgw/+/36363/comment/b60c709c_b5cddd7c PS4, Line 1520: .from_addr = (struct osmo_sockaddr *) saddr, > I odn't see why the cast is needed here? saddr is already that type. but not const... we need to de-constify it, as 'struct osmo_rtp_msg_ctx' has a non-const from_addr member. https://gerrit.osmocom.org/c/osmo-mgw/+/36363/comment/0568d840_72e84b46 PS4, Line 1696: if ((end->rtp && osmo_iofd_get_fd(end->rtp) != -1) || > You can probably skip the "osmo_iofd_get_fd(end->rtp) != -1" check here, or otherwise make sure you […] I originally did not have that check in place and it created problems (I think a crash). I don't recall the details. In any case, I'm just translating the old code with its -1 check to osmo_io. Anything else would be outside of the scope of this patch. The smaller such a patch is, and the less it changes the existing code, the better. File src/libosmo-mgcp/mgcp_osmux.c: https://gerrit.osmocom.org/c/osmo-mgw/+/36363/comment/e178a3da_f902f6c6 PS4, Line 526: goto out_free_v4; > you may be missing an "osmo_iofd_unregister()" in the section you are going with goto here. […] osmo_iofd_free() includes both closing and unregistering. This is documented in the omsmo_iofd documentation, and the code even has a comment below at the goto label that explicitly explains/states this. File tests/mgcp/mgcp_test.c: https://gerrit.osmocom.org/c/osmo-mgw/+/36363/comment/385b76a2_6a1da5ee PS4, Line 661: uint8_t *buf = msgb_data(msg); > const Done -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/36363?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: I8471960d5d8088a70cf105f2f40dfa5d5458169a Gerrit-Change-Number: 36363 Gerrit-PatchSet: 4 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(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-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Mar 2024 11:34:11 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

4 weeks, 1 day

1
0
0 0

[L] Change in osmo-mgw[master]: Convert RTP/RTCP/OSMUX I/O from osmo_fd to osmo_io

by laforge

Attention is currently required from: dexter, fixeria, laforge, neels. Hello Jenkins Builder, dexter, fixeria, neels, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/36363?usp=email to look at the new patch set (#5). The following approvals got outdated and were removed: Code-Review+1 by fixeria, Verified+1 by Jenkins Builder Change subject: Convert RTP/RTCP/OSMUX I/O from osmo_fd to osmo_io ...................................................................... Convert RTP/RTCP/OSMUX I/O from osmo_fd to osmo_io Converting from osmo_fd to osmo_io allows us to switch to the new io_uring backend and benefit from related performance benefits. In a benchmark running 200 concurrent bi-directional voice calls with GSM-EFR codec, I am observing: * the code before this patch uses 40..42% of a single core on a Ryzen 5950X at 200 calls (=> 200 endpoints with each two connections) * no increase in CPU utilization before/after this patch, i.e. the osmo_io overhead for the osmo_fd backend is insignificant compared to the direct osmo_fd mode before * an almost exactly 50% reduction of CPU utilization when running the same osmo-mgw build with LIBOSMO_IO_BACKEND=IO_URING - top shows 19..21% for the same workload instead of 40..42% with the OSMO_FD default backend. * An increase of about 4 Megabytes in both RSS and VIRT size when enabling the OSMO_IO backend. This is likely the memory-mapped rings. No memory leakage is observed when using either of the backends. Change-Id: I8471960d5d8088a70cf105f2f40dfa5d5458169a --- M include/osmocom/mgcp/mgcp.h M include/osmocom/mgcp/mgcp_network.h M src/libosmo-mgcp/mgcp_conn.c M src/libosmo-mgcp/mgcp_iuup.c M src/libosmo-mgcp/mgcp_network.c M src/libosmo-mgcp/mgcp_osmux.c M tests/mgcp/mgcp_test.c 7 files changed, 234 insertions(+), 169 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/63/36363/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/36363?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: I8471960d5d8088a70cf105f2f40dfa5d5458169a Gerrit-Change-Number: 36363 Gerrit-PatchSet: 5 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newpatchset

4 weeks, 1 day

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: hnbgw: Introduce tests about UE registration

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36484?usp=email ) Change subject: hnbgw: Introduce tests about UE registration ...................................................................... Patch Set 2: (1 comment) File hnbgw/HNBGW_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36484/comment/759910e0_367e… PS1, Line 1011: testcase TC_ue_register_before_hnb_register() runs on test_CT { > You are missing adding these tests to control()? Done -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36484?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: Ice2743d376ab8041646259fa25117d6fd0e8c2fd Gerrit-Change-Number: 36484 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Mar 2024 11:21:02 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

4 weeks, 1 day

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: hnbgw: Introduce tests about UE registration

by laforge

Attention is currently required from: laforge. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36484?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: hnbgw: Introduce tests about UE registration ...................................................................... hnbgw: Introduce tests about UE registration We didn't have any test coverage for HNBAP UE registration so far. Let's start with two basic tests: * normal / successful case * abnormal case: UE Register without prior HNB Register Change-Id: Ice2743d376ab8041646259fa25117d6fd0e8c2fd --- M hnbgw/HNBGW_Tests.ttcn M library/hnbap/HNBAP_Templates.ttcn 2 files changed, 234 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/84/36484/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36484?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: Ice2743d376ab8041646259fa25117d6fd0e8c2fd Gerrit-Change-Number: 36484 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

4 weeks, 1 day

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: hnbgw: Qualify RAC/LAI/SAI to RANAP_IEs module

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36483?usp=email ) Change subject: hnbgw: Qualify RAC/LAI/SAI to RANAP_IEs module ...................................................................... hnbgw: Qualify RAC/LAI/SAI to RANAP_IEs module This is in preparation of importing HNBAP_IEs which introduces types of the same name. Change-Id: I2fb7ca8dfc2011c727633e795a9d16856825379d --- M hnbgw/HNBGW_Tests.ttcn 1 file changed, 15 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn index cd8ac7a..91677b1 100644 --- a/hnbgw/HNBGW_Tests.ttcn +++ b/hnbgw/HNBGW_Tests.ttcn @@ -800,12 +800,12 @@ private function f_build_initial_ue_with_nas(TestHdlrParams pars, octetstring nas) return RANAP_PDU { - var LAI lai := { + var RANAP_IEs.LAI lai := { pLMNidentity := hex2oct(pars.hnb.lai.mcc_mnc), lAC := int2oct(pars.hnb.lai.lac, 2), iE_Extensions := omit }; - var SAI sai := { + var RANAP_IEs.SAI sai := { pLMNidentity := lai.pLMNidentity, lAC := lai.lAC, sAC := int2oct(pars.hnb.sac, 2), @@ -818,7 +818,7 @@ } var template RANAP_PDU ret; if (pars.ps_domain) { - var RAC rac := '00'O; + var RANAP_IEs.RAC rac := '00'O; ret := ts_RANAP_initialUE_PS(lai, rac, sai, nas, sigc_id, grnc_id); } else { ret := ts_RANAP_initialUE_CS(lai, sai, nas, sigc_id, grnc_id); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36483?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: I2fb7ca8dfc2011c727633e795a9d16856825379d Gerrit-Change-Number: 36483 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

4 weeks, 1 day

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: hnbgw: Rename f_hnbap_register to f_hnbap_hnb_register

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36482?usp=email ) Change subject: hnbgw: Rename f_hnbap_register to f_hnbap_hnb_register ...................................................................... hnbgw: Rename f_hnbap_register to f_hnbap_hnb_register There's HNB and UE registration; let's make clear which it is. Change-Id: I171f0385389c5f50dc7ad28525deef396fff5fbf --- M hnbgw/HNBGW_Tests.ttcn 1 file changed, 20 insertions(+), 9 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn index 89b243b..cd8ac7a 100644 --- a/hnbgw/HNBGW_Tests.ttcn +++ b/hnbgw/HNBGW_Tests.ttcn @@ -560,7 +560,7 @@ /* helper function to start all of the simulated hNodeBs */ function f_start_hnbs() runs on test_CT { for (var integer i:= 0; i < g_num_hnbs; i := i+1) { - f_hnbap_register(i, i); + f_hnbap_hnb_register(i, i); } } @@ -887,7 +887,7 @@ ***********************************************************************/ -function f_hnbap_register(integer hnb_idx := 0, integer cell_id := 0, boolean expect_reject := false) runs on test_CT +function f_hnbap_hnb_register(integer hnb_idx := 0, integer cell_id := 0, boolean expect_reject := false) runs on test_CT { timer T := 2.0; @@ -926,7 +926,7 @@ testcase TC_hnb_register() runs on test_CT { g_num_hnbs := 1; f_init(start_hnb := false); - f_hnbap_register(0); + f_hnbap_hnb_register(0); f_shutdown_helper(); } @@ -935,8 +935,8 @@ testcase TC_hnb_register_duplicate() runs on test_CT { g_num_hnbs := 2; f_init(start_hnb := false); - f_hnbap_register(0); - f_hnbap_register(1, 0, expect_reject := true); + f_hnbap_hnb_register(0); + f_hnbap_hnb_register(1, 0, expect_reject := true); f_verify_talloc_count(HNBGWVTY, {"struct hnb_context"}, expect_count := 1); f_shutdown_helper(); } @@ -947,8 +947,8 @@ testcase TC_hnb_register_duplicate_reuse_sctp_assoc() runs on test_CT { g_num_hnbs := 1; f_init(start_hnb := false); - f_hnbap_register(0); - f_hnbap_register(0); + f_hnbap_hnb_register(0); + f_hnbap_hnb_register(0); f_verify_talloc_count(HNBGWVTY, {"struct hnb_context"}, expect_count := 1); f_shutdown_helper(); } @@ -958,9 +958,9 @@ testcase TC_hnb_reregister_reuse_sctp_assoc() runs on test_CT { g_num_hnbs := 1; f_init(start_hnb := false); - f_hnbap_register(0); + f_hnbap_hnb_register(0); HNBAP[0].send(ts_HNBAP_HNBDe_Register(ts_HnbapCause(unspecified))); - f_hnbap_register(0); + f_hnbap_hnb_register(0); f_verify_talloc_count(HNBGWVTY, {"struct hnb_context"}, expect_count := 1); f_shutdown_helper(); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36482?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: I171f0385389c5f50dc7ad28525deef396fff5fbf Gerrit-Change-Number: 36482 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

4 weeks, 1 day

1
0
0 0

[M] Change in docker-playground[master]: */osmo-bsc.cfg: BTS type 'sysmobts' (deprecated) -> osmo-bts

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36493?usp=email ) Change subject: */osmo-bsc.cfg: BTS type 'sysmobts' (deprecated) -> osmo-bts ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36493?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I98ea9e96d490473efbbe189842ed9f547060dc7d Gerrit-Change-Number: 36493 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Mar 2024 11:15:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

4 weeks, 1 day

1
0
0 0

[S] Change in osmo-hnbgw[master]: HNBAP: Support IMSI identity type in hnbgw_tx_ue_register_rej()

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36481?usp=email ) Change subject: HNBAP: Support IMSI identity type in hnbgw_tx_ue_register_rej() ...................................................................... Patch Set 4: (1 comment) File src/osmo-hnbgw/hnbgw_hnbap.c: https://gerrit.osmocom.org/c/osmo-hnbgw/+/36481/comment/003819c1_d73da41f PS3, Line 213: char imsi[16]; > we probably have defined for this 16? Done -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36481?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I2e00968cbf686f78f5c9655e899963f2b84dd78b Gerrit-Change-Number: 36481 Gerrit-PatchSet: 4 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Mar 2024 11:01:56 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

4 weeks, 1 day

1
0
0 0

[S] Change in osmo-hnbgw[master]: HNBAP: Support IMSI identity type in hnbgw_tx_ue_register_rej()

by laforge

Attention is currently required from: laforge. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36481?usp=email to look at the new patch set (#4). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: HNBAP: Support IMSI identity type in hnbgw_tx_ue_register_rej() ...................................................................... HNBAP: Support IMSI identity type in hnbgw_tx_ue_register_rej() Change-Id: I2e00968cbf686f78f5c9655e899963f2b84dd78b --- M src/osmo-hnbgw/hnbgw_hnbap.c 1 file changed, 21 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/81/36481/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36481?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I2e00968cbf686f78f5c9655e899963f2b84dd78b Gerrit-Change-Number: 36481 Gerrit-PatchSet: 4 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

4 weeks, 1 day

1
0
0 0

[S] Change in osmo-hnbgw[master]: HNBAP: use GSM23003_IMSI_MAX_DIGITS instead of magic number

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36495?usp=email ) Change subject: HNBAP: use GSM23003_IMSI_MAX_DIGITS instead of magic number ...................................................................... HNBAP: use GSM23003_IMSI_MAX_DIGITS instead of magic number Change-Id: I2ea0a6a93194da2efb768cd4245767301411eb41 --- M src/osmo-hnbgw/hnbgw_hnbap.c 1 file changed, 11 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/95/36495/1 diff --git a/src/osmo-hnbgw/hnbgw_hnbap.c b/src/osmo-hnbgw/hnbgw_hnbap.c index 6d3c8e0..fc06462 100644 --- a/src/osmo-hnbgw/hnbgw_hnbap.c +++ b/src/osmo-hnbgw/hnbgw_hnbap.c @@ -22,6 +22,7 @@ #include <osmocom/core/utils.h> #include <osmocom/core/socket.h> #include <osmocom/gsm/gsm48.h> +#include <osmocom/gsm/protocol/gsm_23_003.h> #include <osmocom/netif/stream.h> #include <unistd.h> @@ -564,7 +565,7 @@ HNBAP_Cause_t cause; struct ue_context *ue; struct ue_context *ue_allocated = NULL; - char imsi[16]; + char imsi[GSM23003_IMSI_MAX_DIGITS+1]; int rc; rc = hnbap_decode_ueregisterrequesties(&ies, in); -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36495?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I2ea0a6a93194da2efb768cd4245767301411eb41 Gerrit-Change-Number: 36495 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

4 weeks, 1 day

1
0
0 0

[S] Change in docker-playground[master]: ttcn3-bsc-test-sccplite: osmo-bsc.cfg: remove deprecated 'mgw remote-ip'

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/36494?usp=email ) Change subject: ttcn3-bsc-test-sccplite: osmo-bsc.cfg: remove deprecated 'mgw remote-ip' ...................................................................... ttcn3-bsc-test-sccplite: osmo-bsc.cfg: remove deprecated 'mgw remote-ip' Change-Id: Ie322315dd1608636002d4003e5f8629925041476 --- M ttcn3-bsc-test/sccplite/osmo-bsc.cfg 1 file changed, 9 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/94/36494/1 diff --git a/ttcn3-bsc-test/sccplite/osmo-bsc.cfg b/ttcn3-bsc-test/sccplite/osmo-bsc.cfg index 1e293f0..10ed346 100644 --- a/ttcn3-bsc-test/sccplite/osmo-bsc.cfg +++ b/ttcn3-bsc-test/sccplite/osmo-bsc.cfg @@ -481,8 +481,6 @@ amr-config 4_75k forbidden codec-list fr1 fr2 fr3 hr1 hr3 asp-protocol ipa - ! REMOVE after OsmoBSC > 1.8.0 is released - mgw remote-ip 172.18.12.203 bsc mid-call-timeout 0 no missing-msc-text -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36494?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ie322315dd1608636002d4003e5f8629925041476 Gerrit-Change-Number: 36494 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

4 weeks, 1 day

1
0
0 0

[M] Change in docker-playground[master]: */osmo-bsc.cfg: BTS type 'sysmobts' (deprecated) -> osmo-bts

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/36493?usp=email ) Change subject: */osmo-bsc.cfg: BTS type 'sysmobts' (deprecated) -> osmo-bts ...................................................................... */osmo-bsc.cfg: BTS type 'sysmobts' (deprecated) -> osmo-bts Change-Id: I98ea9e96d490473efbbe189842ed9f547060dc7d --- M osmo-bsc-latest/osmo-bsc.cfg M osmo-bsc-master/osmo-bsc.cfg M osmo-dev-on-debian-sid/cfg/osmo-bsc.cfg M osmo-nitb-latest/openbsc.cfg M osmo-nitb-master/openbsc.cfg M osmo-ran/osmocom/osmo-bsc.cfg M osmo-ran/split/ran-bsc_mgw/osmocom/osmo-bsc.cfg M ttcn3-bsc-test-vamos/osmo-bsc.cfg M ttcn3-bsc-test/osmo-bsc.cfg M ttcn3-bsc-test/sccplite/osmo-bsc.cfg 10 files changed, 30 insertions(+), 21 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/93/36493/1 diff --git a/osmo-bsc-latest/osmo-bsc.cfg b/osmo-bsc-latest/osmo-bsc.cfg index 79d765f..3d5a3d3 100644 --- a/osmo-bsc-latest/osmo-bsc.cfg +++ b/osmo-bsc-latest/osmo-bsc.cfg @@ -64,7 +64,7 @@ timer t3113 10 timer t3212 30 bts 0 - type sysmobts + type osmo-bts band DCS1800 cell_identity 0 location_area_code 1 @@ -153,7 +153,7 @@ phys_chan_config PDCH hopping enabled 0 bts 1 - type sysmobts + type osmo-bts band DCS1800 cell_identity 1 location_area_code 2 @@ -242,7 +242,7 @@ phys_chan_config PDCH hopping enabled 0 bts 2 - type sysmobts + type osmo-bts band DCS1800 cell_identity 1 location_area_code 1 diff --git a/osmo-bsc-master/osmo-bsc.cfg b/osmo-bsc-master/osmo-bsc.cfg index 4d331de..6af6d2a 100644 --- a/osmo-bsc-master/osmo-bsc.cfg +++ b/osmo-bsc-master/osmo-bsc.cfg @@ -67,7 +67,7 @@ timer t3113 10 timer t3212 30 bts 0 - type sysmobts + type osmo-bts band DCS1800 cell_identity 0 location_area_code 1 diff --git a/osmo-dev-on-debian-sid/cfg/osmo-bsc.cfg b/osmo-dev-on-debian-sid/cfg/osmo-bsc.cfg index 8b72dee..19bde95 100644 --- a/osmo-dev-on-debian-sid/cfg/osmo-bsc.cfg +++ b/osmo-dev-on-debian-sid/cfg/osmo-bsc.cfg @@ -8,7 +8,7 @@ mgw remote-ip 127.0.0.1 mgw remote-port 12427 bts 0 - type sysmobts + type osmo-bts band GSM-1800 location_area_code 23 ip.access unit_id 1800 0 diff --git a/osmo-nitb-latest/openbsc.cfg b/osmo-nitb-latest/openbsc.cfg index 6166d7e..980a5d6 100644 --- a/osmo-nitb-latest/openbsc.cfg +++ b/osmo-nitb-latest/openbsc.cfg @@ -95,7 +95,7 @@ dyn_ts_allow_tch_f 0 subscriber-keep-in-ram 0 bts 0 - type sysmobts + type osmo-bts band DCS1800 cell_identity 20960 location_area_code 13135 diff --git a/osmo-nitb-master/openbsc.cfg b/osmo-nitb-master/openbsc.cfg index 6166d7e..980a5d6 100644 --- a/osmo-nitb-master/openbsc.cfg +++ b/osmo-nitb-master/openbsc.cfg @@ -95,7 +95,7 @@ dyn_ts_allow_tch_f 0 subscriber-keep-in-ram 0 bts 0 - type sysmobts + type osmo-bts band DCS1800 cell_identity 20960 location_area_code 13135 diff --git a/osmo-ran/osmocom/osmo-bsc.cfg b/osmo-ran/osmocom/osmo-bsc.cfg index bfc23f5..265960e 100644 --- a/osmo-ran/osmocom/osmo-bsc.cfg +++ b/osmo-ran/osmocom/osmo-bsc.cfg @@ -23,7 +23,7 @@ mgw remote-ip 127.0.0.1 mgw remote-port 2427 bts 0 - type sysmobts + type osmo-bts band DCS1800 cell_identity 0 location_area_code 5 diff --git a/osmo-ran/split/ran-bsc_mgw/osmocom/osmo-bsc.cfg b/osmo-ran/split/ran-bsc_mgw/osmocom/osmo-bsc.cfg index b105ead..dbdaece 100644 --- a/osmo-ran/split/ran-bsc_mgw/osmocom/osmo-bsc.cfg +++ b/osmo-ran/split/ran-bsc_mgw/osmocom/osmo-bsc.cfg @@ -20,7 +20,7 @@ handover1 maximum distance 9999 periodic location update 30 bts 0 - type sysmobts + type osmo-bts band DCS1800 cell_identity 0 location_area_code 5 diff --git a/ttcn3-bsc-test-vamos/osmo-bsc.cfg b/ttcn3-bsc-test-vamos/osmo-bsc.cfg index 98f1304..48f756a 100644 --- a/ttcn3-bsc-test-vamos/osmo-bsc.cfg +++ b/ttcn3-bsc-test-vamos/osmo-bsc.cfg @@ -82,7 +82,7 @@ mgw 0 mgw remote-ip 172.18.31.203 bts 0 - type sysmobts + type osmo-bts band DCS1800 cell_identity 0 location_area_code 1 @@ -172,7 +172,7 @@ phys_chan_config PDCH hopping enabled 0 bts 1 - type sysmobts + type osmo-bts band DCS1800 cell_identity 1 location_area_code 1 @@ -262,7 +262,7 @@ phys_chan_config PDCH hopping enabled 0 bts 2 - type sysmobts + type osmo-bts band DCS1800 cell_identity 1 location_area_code 2 @@ -352,7 +352,7 @@ phys_chan_config PDCH hopping enabled 0 bts 3 - type sysmobts + type osmo-bts band DCS1800 cell_identity 3 location_area_code 3 diff --git a/ttcn3-bsc-test/osmo-bsc.cfg b/ttcn3-bsc-test/osmo-bsc.cfg index 5902b1d..7cd8e1d 100644 --- a/ttcn3-bsc-test/osmo-bsc.cfg +++ b/ttcn3-bsc-test/osmo-bsc.cfg @@ -92,7 +92,7 @@ mgw 0 mgw remote-ip 172.18.2.203 bts 0 - type sysmobts + type osmo-bts band DCS1800 cell_identity 0 location_area_code 1 @@ -194,7 +194,7 @@ phys_chan_config PDCH hopping enabled 0 bts 1 - type sysmobts + type osmo-bts band DCS1800 cell_identity 1 location_area_code 1 @@ -284,7 +284,7 @@ phys_chan_config PDCH hopping enabled 0 bts 2 - type sysmobts + type osmo-bts band DCS1800 cell_identity 1 location_area_code 2 @@ -464,7 +464,7 @@ phys_chan_config PDCH hopping enabled 0 bts 3 - type sysmobts + type osmo-bts band DCS1800 cell_identity 3 location_area_code 3 diff --git a/ttcn3-bsc-test/sccplite/osmo-bsc.cfg b/ttcn3-bsc-test/sccplite/osmo-bsc.cfg index 423f6d9..1e293f0 100644 --- a/ttcn3-bsc-test/sccplite/osmo-bsc.cfg +++ b/ttcn3-bsc-test/sccplite/osmo-bsc.cfg @@ -81,7 +81,7 @@ mgw 0 mgw remote-ip 172.18.12.203 bts 0 - type sysmobts + type osmo-bts band DCS1800 cell_identity 0 location_area_code 1 @@ -171,7 +171,7 @@ phys_chan_config PDCH hopping enabled 0 bts 1 - type sysmobts + type osmo-bts band DCS1800 cell_identity 1 location_area_code 1 @@ -261,7 +261,7 @@ phys_chan_config PDCH hopping enabled 0 bts 2 - type sysmobts + type osmo-bts band DCS1800 cell_identity 1 location_area_code 2 @@ -441,7 +441,7 @@ phys_chan_config PDCH hopping enabled 0 bts 3 - type sysmobts + type osmo-bts band DCS1800 cell_identity 3 location_area_code 3 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36493?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I98ea9e96d490473efbbe189842ed9f547060dc7d Gerrit-Change-Number: 36493 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

4 weeks, 1 day

1
0
0 0

[M] Change in docker-playground[master]: Introduce asterisk-master docker image

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36491?usp=email ) Change subject: Introduce asterisk-master docker image ...................................................................... Patch Set 1: Code-Review+1 (1 comment) File asterisk-master/Dockerfile: https://gerrit.osmocom.org/c/docker-playground/+/36491/comment/7836af88_0c1… PS1, Line 42: RUN git btw, particularly with large git repos it might be sufficient to do a shallow clone here, as we don't really care about the history during build. Not saying it must be done here, just sharing an idea. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36491?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Iaa3816f8ceefac8956e61e15f79ed708dec55238 Gerrit-Change-Number: 36491 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Mar 2024 10:06:16 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

4 weeks, 1 day

1
0
0 0

[L] Change in docker-playground[master]: Introduce ttcn3-asterisk-ims-ue-test

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36492?usp=email ) Change subject: Introduce ttcn3-asterisk-ims-ue-test ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36492?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Idd262b9224ea879a6e941792944fe0b0db3e68ba Gerrit-Change-Number: 36492 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Mar 2024 10:05:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

4 weeks, 1 day

1
0
0 0

[M] Change in osmo-hnbgw[master]: use json to decode counters from nftables

by laforge

Attention is currently required from: neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36485?usp=email ) Change subject: use json to decode counters from nftables ...................................................................... Patch Set 4: (1 comment) Patchset: PS4: from the build errors and looking at the patch it seems like it's missing using the LIBJANSSON_LIBS / LIBJANSSON_CFLAGS in the Makefile.am ? -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36485?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Id4e7fa017c31945388a010d8581715d71482116b Gerrit-Change-Number: 36485 Gerrit-PatchSet: 4 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Mar 2024 10:04:35 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

4 weeks, 1 day

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: Introduce Asterisk_Tests testsuite

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36490?usp=email ) Change subject: Introduce Asterisk_Tests testsuite ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36490?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: I66f776d5df6fb5dc488d9e589b84a6b2385406e8 Gerrit-Change-Number: 36490 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Mar 2024 10:02:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

4 weeks, 1 day

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: SIP_Templates: Rework templates to make them more extensible

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36489?usp=email ) Change subject: SIP_Templates: Rework templates to make them more extensible ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36489?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: Ifd14213e9c2b8f5061f828a63ef47844828d94ea Gerrit-Change-Number: 36489 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Mar 2024 10:01:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

4 weeks, 1 day

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: SIP: generate seq_nr within allowed range

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36488?usp=email ) Change subject: SIP: generate seq_nr within allowed range ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36488?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: Iea5f4568af1bd795db57d2b77e82d976edc9e337 Gerrit-Change-Number: 36488 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Mar 2024 10:01:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

4 weeks, 1 day

1
0
0 0

[S] Change in osmo-hnbgw[master]: generalize hnbgw_tx_ue_register_rej_tmsi() to hnbgw_tx_ue_register_rej()

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36474?usp=email ) Change subject: generalize hnbgw_tx_ue_register_rej_tmsi() to hnbgw_tx_ue_register_rej() ...................................................................... generalize hnbgw_tx_ue_register_rej_tmsi() to hnbgw_tx_ue_register_rej() This way the caller can provide the cause value to be used during reject. Requires: osmo-iuh I7db92b51847c282d23d568970dfd2bedecdea486 Change-Id: Ic83674523c0326a7ae51fb176bddfd6641ed3ac4 --- M src/osmo-hnbgw/hnbgw_hnbap.c 1 file changed, 28 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/src/osmo-hnbgw/hnbgw_hnbap.c b/src/osmo-hnbgw/hnbgw_hnbap.c index b2ff911..32b0904 100644 --- a/src/osmo-hnbgw/hnbgw_hnbap.c +++ b/src/osmo-hnbgw/hnbgw_hnbap.c @@ -161,13 +161,15 @@ return hnbgw_hnbap_tx(ue->hnb, msg); } -static int hnbgw_tx_ue_register_rej_tmsi(struct hnb_context *hnb, HNBAP_UE_Identity_t *ue_id) +static int hnbgw_tx_ue_register_rej(struct hnb_context *hnb, HNBAP_UE_Identity_t *ue_id, const struct HNBAP_Cause *cause) { HNBAP_UERegisterReject_t reject_out; HNBAP_UERegisterRejectIEs_t reject; struct msgb *msg; int rc; + OSMO_ASSERT(cause); + memset(&reject, 0, sizeof(reject)); reject.uE_Identity.present = ue_id->present; @@ -229,10 +231,9 @@ return -1; } - LOGHNB(hnb, DHNBAP, LOGL_ERROR, "Rejecting UE Register Request: TMSI identity registration is switched off\n"); + LOGHNB(hnb, DHNBAP, LOGL_ERROR, "Rejecting UE Register Request cause=%s\n", hnbap_cause_str(cause)); - reject.cause.present = HNBAP_Cause_PR_radioNetwork; - reject.cause.choice.radioNetwork = HNBAP_CauseRadioNetwork_invalid_UE_identity; + reject.cause = *cause; memset(&reject_out, 0, sizeof(reject_out)); rc = hnbap_encode_ueregisterrejecties(&reject_out, &reject); @@ -527,10 +528,17 @@ break; case HNBAP_UE_Identity_PR_tMSILAI: case HNBAP_UE_Identity_PR_pTMSIRAI: - if (g_hnbgw->config.hnbap_allow_tmsi) + if (g_hnbgw->config.hnbap_allow_tmsi) { rc = hnbgw_tx_ue_register_acc_tmsi(ctx, &ies.uE_Identity); - else - rc = hnbgw_tx_ue_register_rej_tmsi(ctx, &ies.uE_Identity); + } else { + struct HNBAP_Cause cause = { + .present = HNBAP_Cause_PR_radioNetwork, + .choice = { + .radioNetwork = HNBAP_CauseRadioNetwork_invalid_UE_identity, + }, + }; + rc = hnbgw_tx_ue_register_rej(ctx, &ies.uE_Identity, &cause); + } /* all has been handled by TMSI, skip the IMSI code below */ goto free_and_return_rc; default: -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36474?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Ic83674523c0326a7ae51fb176bddfd6641ed3ac4 Gerrit-Change-Number: 36474 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

4 weeks, 1 day

1
0
0 0

[S] Change in osmo-hnbgw[master]: HNBAP: Use proper cause values during HNB-REGISTER-REQ processing

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36475?usp=email ) Change subject: HNBAP: Use proper cause values during HNB-REGISTER-REQ processing ...................................................................... HNBAP: Use proper cause values during HNB-REGISTER-REQ processing When we reject the HNB-REGISTER-REQ, let's use an as specific as possible cause value to let the peer know why we rejected registration. Change-Id: Iadddd26b751a9fd80c829068792aa93cd538c43d --- M src/osmo-hnbgw/hnbgw_hnbap.c 1 file changed, 26 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/src/osmo-hnbgw/hnbgw_hnbap.c b/src/osmo-hnbgw/hnbgw_hnbap.c index 32b0904..5cca3cb 100644 --- a/src/osmo-hnbgw/hnbgw_hnbap.c +++ b/src/osmo-hnbgw/hnbgw_hnbap.c @@ -49,16 +49,19 @@ return 0; } -static int hnbgw_tx_hnb_register_rej(struct hnb_context *ctx) +static int hnbgw_tx_hnb_register_rej(struct hnb_context *ctx, const HNBAP_Cause_t *cause) { HNBAP_HNBRegisterReject_t reject_out; HNBAP_HNBRegisterRejectIEs_t reject; struct msgb *msg; int rc; - reject.presenceMask = 0, - reject.cause.present = HNBAP_Cause_PR_radioNetwork; - reject.cause.choice.radioNetwork = HNBAP_CauseRadioNetwork_unspecified; + OSMO_ASSERT(cause); + + LOGHNB(ctx, DHNBAP, LOGL_ERROR, "Rejecting HNB Register Request cause=%s\n", hnbap_cause_str(cause)); + + reject.presenceMask = 0; + reject.cause = *cause; /* encode the Information Elements */ memset(&reject_out, 0, sizeof(reject_out)); @@ -414,6 +417,7 @@ char identity_str[256]; const char *cell_id_str; struct timespec tp; + HNBAP_Cause_t cause; rc = hnbap_decode_hnbregisterrequesties(&ies, in); if (rc < 0) { @@ -440,7 +444,9 @@ if (!hnbp) { LOGHNB(ctx, DHNBAP, LOGL_NOTICE, "Rejecting unknonwn HNB with identity %s\n", identity_str); hnbap_free_hnbregisterrequesties(&ies); - return hnbgw_tx_hnb_register_rej(ctx); + cause.present = HNBAP_Cause_PR_radioNetwork; + cause.choice.radioNetwork = HNBAP_CauseRadioNetwork_unauthorised_HNB; + return hnbgw_tx_hnb_register_rej(ctx, &cause); } ctx->persistent = hnbp; hnbp->ctx = ctx; @@ -480,7 +486,9 @@ * misconfigurations or someone trying to impersonate an already working HNB: */ LOGHNB(ctx, DHNBAP, LOGL_ERROR, "rejecting HNB-REGISTER-REQ with duplicate cell identity %s\n", cell_id_str); hnbap_free_hnbregisterrequesties(&ies); - return hnbgw_tx_hnb_register_rej(ctx); + cause.present = HNBAP_Cause_PR_radioNetwork; + cause.choice.radioNetwork = HNBAP_CauseRadioNetwork_hNB_parameter_mismatch; + return hnbgw_tx_hnb_register_rej(ctx, &cause); } } -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36475?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Iadddd26b751a9fd80c829068792aa93cd538c43d Gerrit-Change-Number: 36475 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

4 weeks, 1 day

1
0
0 0

[S] Change in osmo-hnbgw[master]: HNBAP: Send HNB-REGISTER-REJ on ASN.1 decoding error

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36476?usp=email ) Change subject: HNBAP: Send HNB-REGISTER-REJ on ASN.1 decoding error ...................................................................... HNBAP: Send HNB-REGISTER-REJ on ASN.1 decoding error Change-Id: Ic4a40966194a57cccc0eb056233f7e7426d6e8f9 --- M src/osmo-hnbgw/hnbgw_hnbap.c 1 file changed, 12 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/osmo-hnbgw/hnbgw_hnbap.c b/src/osmo-hnbgw/hnbgw_hnbap.c index 5cca3cb..9ffb0ba 100644 --- a/src/osmo-hnbgw/hnbgw_hnbap.c +++ b/src/osmo-hnbgw/hnbgw_hnbap.c @@ -422,7 +422,9 @@ rc = hnbap_decode_hnbregisterrequesties(&ies, in); if (rc < 0) { LOGHNB(ctx, DHNBAP, LOGL_ERROR, "Failure to decode HNB-REGISTER-REQ: rc=%d\n", rc); - return rc; + cause.present = HNBAP_Cause_PR_protocol; + cause.choice.radioNetwork = HNBAP_CauseProtocol_unspecified; + return hnbgw_tx_hnb_register_rej(ctx, &cause); } asn1_strncpy(identity_str, &ies.hnB_Identity.hNB_Identity_Info, sizeof(identity_str)); -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36476?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Ic4a40966194a57cccc0eb056233f7e7426d6e8f9 Gerrit-Change-Number: 36476 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

4 weeks, 1 day

1
0
0 0

[M] Change in osmo-hnbgw[master]: HNBAP: Always respond to UE-REGISTER-REQUEST

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36477?usp=email ) Change subject: HNBAP: Always respond to UE-REGISTER-REQUEST ...................................................................... HNBAP: Always respond to UE-REGISTER-REQUEST We always should respond to a UE-REGISTER-REQ. Either it's an ACK or we must send a REJ. There should not be any "quiet" error cases where we don't respond at all: * send general Error Indication at a point where we cannot decode the UE-Identity-IE (which is mandatory in UE-REGISTER-REJECT) * send UE-REGISTER-REJECT with matching cause value whenever we have the decoded UE Identity around Change-Id: I5338a1324545b2c6d31fb45f1e69fee45842e207 --- M src/osmo-hnbgw/hnbgw_hnbap.c 1 file changed, 73 insertions(+), 9 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/src/osmo-hnbgw/hnbgw_hnbap.c b/src/osmo-hnbgw/hnbgw_hnbap.c index 9ffb0ba..631c782 100644 --- a/src/osmo-hnbgw/hnbgw_hnbap.c +++ b/src/osmo-hnbgw/hnbgw_hnbap.c @@ -49,6 +49,48 @@ return 0; } +static int hnbgw_tx_error_ind(struct hnb_context *ctx, const HNBAP_Cause_t *cause, + HNBAP_ProcedureCode_t proc_code, HNBAP_Criticality_t criticality, + HNBAP_TriggeringMessage_t trig_msg) +{ + HNBAP_ErrorIndication_t err_ind; + HNBAP_ErrorIndicationIEs_t err_ind_ies; + struct msgb *msg; + int rc; + + LOGHNB(ctx, DHNBAP, LOGL_ERROR, "Tx ErrorIndication cause=%s\n", hnbap_cause_str(cause)); + + err_ind_ies.presenceMask = 0; + err_ind_ies.cause = *cause; + + if (proc_code != -1 || trig_msg != -1 || criticality != -1) { + err_ind_ies.presenceMask |= ERRORINDICATIONIES_HNBAP_CRITICALITYDIAGNOSTICS_PRESENT; + if (proc_code != -1) + err_ind_ies.criticalityDiagnostics.procedureCode = &proc_code; + if (trig_msg != -1) + err_ind_ies.criticalityDiagnostics.triggeringMessage = &trig_msg; + if (criticality != -1) + err_ind_ies.criticalityDiagnostics.procedureCriticality = &criticality; + } + + memset(&err_ind, 0, sizeof(err_ind)); + rc = hnbap_encode_errorindicationies(&err_ind, &err_ind_ies); + if (rc < 0) { + LOGHNB(ctx, DHNBAP, LOGL_ERROR, "Failure to encode ERROR-INDICATION to %s: rc=%d\n", + ctx->identity_info, rc); + return rc; + } + + msg = hnbap_generate_initiating_message(HNBAP_ProcedureCode_id_ErrorIndication, + HNBAP_Criticality_ignore, + &asn_DEF_HNBAP_ErrorIndication, + &err_ind); + + ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_HNBAP_ErrorIndication, &err_ind); + + return hnbgw_hnbap_tx(ctx, msg); +} + static int hnbgw_tx_hnb_register_rej(struct hnb_context *ctx, const HNBAP_Cause_t *cause) { HNBAP_HNBRegisterReject_t reject_out; @@ -514,14 +556,20 @@ static int hnbgw_rx_ue_register_req(struct hnb_context *ctx, ANY_t *in) { HNBAP_UERegisterRequestIEs_t ies; + HNBAP_Cause_t cause; struct ue_context *ue; struct ue_context *ue_allocated = NULL; char imsi[16]; int rc; rc = hnbap_decode_ueregisterrequesties(&ies, in); - if (rc < 0) - return rc; + if (rc < 0) { + LOGHNB(ctx, DHNBAP, LOGL_ERROR, "Failure to decode UE-REGISTER-REQ: rc=%d\n", rc); + cause.present = HNBAP_Cause_PR_protocol; + cause.choice.radioNetwork = HNBAP_CauseProtocol_unspecified; + return hnbgw_tx_error_ind(ctx, &cause, HNBAP_ProcedureCode_id_UERegister, HNBAP_Criticality_reject, + HNBAP_TriggeringMessage_initiating_message); + } switch (ies.uE_Identity.present) { case HNBAP_UE_Identity_PR_iMSI: @@ -541,12 +589,8 @@ if (g_hnbgw->config.hnbap_allow_tmsi) { rc = hnbgw_tx_ue_register_acc_tmsi(ctx, &ies.uE_Identity); } else { - struct HNBAP_Cause cause = { - .present = HNBAP_Cause_PR_radioNetwork, - .choice = { - .radioNetwork = HNBAP_CauseRadioNetwork_invalid_UE_identity, - }, - }; + cause.present = HNBAP_Cause_PR_radioNetwork; + cause.choice.radioNetwork = HNBAP_CauseRadioNetwork_invalid_UE_identity; rc = hnbgw_tx_ue_register_rej(ctx, &ies.uE_Identity, &cause); } /* all has been handled by TMSI, skip the IMSI code below */ @@ -554,7 +598,9 @@ default: LOGHNB(ctx, DHNBAP, LOGL_NOTICE, "UE-REGISTER-REQ with unsupported UE Id type %d\n", ies.uE_Identity.present); - rc = -ENOTSUP; + cause.present = HNBAP_Cause_PR_radioNetwork; + cause.choice.radioNetwork = HNBAP_CauseRadioNetwork_invalid_UE_identity; + rc = hnbgw_tx_ue_register_rej(ctx, &ies.uE_Identity, &cause); goto free_and_return_rc; } -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36477?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I5338a1324545b2c6d31fb45f1e69fee45842e207 Gerrit-Change-Number: 36477 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

4 weeks, 1 day

1
0
0 0

[M] Change in osmo-hnbgw[master]: HNBAP: Make sure to respond with correct "reject"

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36478?usp=email ) Change subject: HNBAP: Make sure to respond with correct "reject" ...................................................................... HNBAP: Make sure to respond with correct "reject" If we receive a procedure (like UE-REGISTER) in a state where it's not permitted (e.g. HNB not registered), we should send a UE-REGISTER-REJ with proper cause value, rather than not sending any response at all. Change-Id: I300db368a3d1d2fb5967f69f2ed4ac90ecf85e75 --- M src/osmo-hnbgw/hnbgw_hnbap.c 1 file changed, 62 insertions(+), 46 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/osmo-hnbgw/hnbgw_hnbap.c b/src/osmo-hnbgw/hnbgw_hnbap.c index 631c782..8615f91 100644 --- a/src/osmo-hnbgw/hnbgw_hnbap.c +++ b/src/osmo-hnbgw/hnbgw_hnbap.c @@ -571,6 +571,14 @@ HNBAP_TriggeringMessage_initiating_message); } + if (!ctx->hnb_registered) { + /* UE registration requires prior HNB registration; reject with proper cause */ + cause.present = HNBAP_Cause_PR_radioNetwork; + cause.choice.radioNetwork = HNBAP_CauseRadioNetwork_hNB_not_registered; + rc = hnbgw_tx_ue_register_rej(ctx, &ies.uE_Identity, &cause); + goto free_and_return_rc; + } + switch (ies.uE_Identity.present) { case HNBAP_UE_Identity_PR_iMSI: ranap_bcd_decode(imsi, sizeof(imsi), ies.uE_Identity.choice.iMSI.buf, @@ -627,6 +635,7 @@ static int hnbgw_rx_ue_deregister(struct hnb_context *ctx, ANY_t *in) { HNBAP_UEDe_RegisterIEs_t ies; + HNBAP_Cause_t cause; struct ue_context *ue; int rc; uint32_t ctxid; @@ -637,11 +646,19 @@ ctxid = asn1bitstr_to_u24(&ies.context_ID); - LOGHNB(ctx, DHNBAP, LOGL_DEBUG, "UE-DE-REGISTER context=%u cause=%s\n", ctxid, hnbap_cause_str(&ies.cause)); - - ue = ue_context_by_id(ctxid); - if (ue) - ue_context_free(ue); + if (!ctx->hnb_registered) { + LOGHNB(ctx, DHNBAP, LOGL_NOTICE, "UE-DE-REGISTER context=%u cause=%s not permitted; HNB not registered\n", + ctxid, hnbap_cause_str(&ies.cause)); + cause.present = HNBAP_Cause_PR_radioNetwork; + cause.choice.radioNetwork = HNBAP_CauseRadioNetwork_hNB_not_registered; + hnbgw_tx_error_ind(ctx, &cause, HNBAP_ProcedureCode_id_UEDe_Register, + HNBAP_Criticality_ignore, HNBAP_TriggeringMessage_initiating_message); + } else { + LOGHNB(ctx, DHNBAP, LOGL_DEBUG, "UE-DE-REGISTER context=%u cause=%s\n", ctxid, hnbap_cause_str(&ies.cause)); + ue = ue_context_by_id(ctxid); + if (ue) + ue_context_free(ue); + } hnbap_free_uede_registeries(&ies); return 0; @@ -666,47 +683,32 @@ { int rc = 0; - if (!hnb->hnb_registered) { - switch (imsg->procedureCode) { - case HNBAP_ProcedureCode_id_HNBRegister: /* 8.2 */ - rc = hnbgw_rx_hnb_register_req(hnb, &imsg->value); - break; - case HNBAP_ProcedureCode_id_HNBDe_Register: /* 8.3 */ - rc = hnbgw_rx_hnb_deregister(hnb, &imsg->value); - break; - default: - LOGHNB(hnb, DHNBAP, LOGL_NOTICE, "HNBAP Procedure %ld not permitted for de-registered HNB\n", - imsg->procedureCode); - break; - } - } else { - switch (imsg->procedureCode) { - case HNBAP_ProcedureCode_id_HNBRegister: /* 8.2.4: Abnormal Condition, Accept. */ - rc = hnbgw_rx_hnb_register_req(hnb, &imsg->value); - break; - case HNBAP_ProcedureCode_id_HNBDe_Register: /* 8.3 */ - rc = hnbgw_rx_hnb_deregister(hnb, &imsg->value); - break; - case HNBAP_ProcedureCode_id_UERegister: /* 8.4 */ - rc = hnbgw_rx_ue_register_req(hnb, &imsg->value); - break; - case HNBAP_ProcedureCode_id_UEDe_Register: /* 8.5 */ - rc = hnbgw_rx_ue_deregister(hnb, &imsg->value); - break; - case HNBAP_ProcedureCode_id_ErrorIndication: /* 8.6 */ - rc = hnbgw_rx_err_ind(hnb, &imsg->value); - break; - case HNBAP_ProcedureCode_id_TNLUpdate: /* 8.9 */ - case HNBAP_ProcedureCode_id_HNBConfigTransfer: /* 8.10 */ - case HNBAP_ProcedureCode_id_RelocationComplete: /* 8.11 */ - case HNBAP_ProcedureCode_id_U_RNTIQuery: /* 8.12 */ - case HNBAP_ProcedureCode_id_privateMessage: - LOGHNB(hnb, DHNBAP, LOGL_NOTICE, "Unimplemented HNBAP Procedure %ld\n", imsg->procedureCode); - break; - default: - LOGHNB(hnb, DHNBAP, LOGL_NOTICE, "Unknown HNBAP Procedure %ld\n", imsg->procedureCode); - break; - } + switch (imsg->procedureCode) { + case HNBAP_ProcedureCode_id_HNBRegister: /* 8.2 */ + rc = hnbgw_rx_hnb_register_req(hnb, &imsg->value); + break; + case HNBAP_ProcedureCode_id_HNBDe_Register: /* 8.3 */ + rc = hnbgw_rx_hnb_deregister(hnb, &imsg->value); + break; + case HNBAP_ProcedureCode_id_UERegister: /* 8.4 */ + rc = hnbgw_rx_ue_register_req(hnb, &imsg->value); + break; + case HNBAP_ProcedureCode_id_UEDe_Register: /* 8.5 */ + rc = hnbgw_rx_ue_deregister(hnb, &imsg->value); + break; + case HNBAP_ProcedureCode_id_ErrorIndication: /* 8.6 */ + rc = hnbgw_rx_err_ind(hnb, &imsg->value); + break; + case HNBAP_ProcedureCode_id_TNLUpdate: /* 8.9 */ + case HNBAP_ProcedureCode_id_HNBConfigTransfer: /* 8.10 */ + case HNBAP_ProcedureCode_id_RelocationComplete: /* 8.11 */ + case HNBAP_ProcedureCode_id_U_RNTIQuery: /* 8.12 */ + case HNBAP_ProcedureCode_id_privateMessage: + LOGHNB(hnb, DHNBAP, LOGL_NOTICE, "Unimplemented HNBAP Procedure %ld\n", imsg->procedureCode); + break; + default: + LOGHNB(hnb, DHNBAP, LOGL_NOTICE, "Unknown HNBAP Procedure %ld\n", imsg->procedureCode); + break; } return rc; -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36478?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I300db368a3d1d2fb5967f69f2ed4ac90ecf85e75 Gerrit-Change-Number: 36478 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

4 weeks, 1 day

1
0
0 0

[S] Change in osmo-hnbgw[master]: HNBAP: Transmit ErrorIndication in more situations

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36479?usp=email ) Change subject: HNBAP: Transmit ErrorIndication in more situations ...................................................................... HNBAP: Transmit ErrorIndication in more situations Whenever we receive a message and cannot decode the most basic IEs, or receive an unknown/unsupported procedure code, we should respond with an ErrorIndication in order to inform the peer. Change-Id: I7aaa66f83f62ee1b5ba5204248e9f4cc754263ed --- M src/osmo-hnbgw/hnbgw_hnbap.c 1 file changed, 32 insertions(+), 4 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmo-hnbgw/hnbgw_hnbap.c b/src/osmo-hnbgw/hnbgw_hnbap.c index 8615f91..6d3c8e0 100644 --- a/src/osmo-hnbgw/hnbgw_hnbap.c +++ b/src/osmo-hnbgw/hnbgw_hnbap.c @@ -434,11 +434,16 @@ static int hnbgw_rx_hnb_deregister(struct hnb_context *ctx, ANY_t *in) { HNBAP_HNBDe_RegisterIEs_t ies; + HNBAP_Cause_t cause; int rc; rc = hnbap_decode_hnbde_registeries(&ies, in); - if (rc < 0) - return rc; + if (rc < 0) { + cause.present = HNBAP_Cause_PR_protocol; + cause.choice.radioNetwork = HNBAP_CauseProtocol_unspecified; + return hnbgw_tx_error_ind(ctx, &cause, HNBAP_ProcedureCode_id_HNBDe_Register, HNBAP_Criticality_ignore, + HNBAP_TriggeringMessage_initiating_message); + } LOGHNB(ctx, DHNBAP, LOGL_DEBUG, "HNB-DE-REGISTER cause=%s\n", hnbap_cause_str(&ies.cause)); @@ -641,8 +646,12 @@ uint32_t ctxid; rc = hnbap_decode_uede_registeries(&ies, in); - if (rc < 0) - return rc; + if (rc < 0) { + cause.present = HNBAP_Cause_PR_protocol; + cause.choice.protocol = HNBAP_CauseProtocol_unspecified; + return hnbgw_tx_error_ind(ctx, &cause, HNBAP_ProcedureCode_id_UEDe_Register, + HNBAP_Criticality_ignore, HNBAP_TriggeringMessage_initiating_message); + } ctxid = asn1bitstr_to_u24(&ies.context_ID); @@ -681,6 +690,10 @@ static int hnbgw_rx_initiating_msg(struct hnb_context *hnb, HNBAP_InitiatingMessage_t *imsg) { + HNBAP_Cause_t cause = { + .present = HNBAP_Cause_PR_protocol, + .choice.protocol = HNBAP_CauseProtocol_unspecified, + }; int rc = 0; switch (imsg->procedureCode) { @@ -705,9 +718,11 @@ case HNBAP_ProcedureCode_id_U_RNTIQuery: /* 8.12 */ case HNBAP_ProcedureCode_id_privateMessage: LOGHNB(hnb, DHNBAP, LOGL_NOTICE, "Unimplemented HNBAP Procedure %ld\n", imsg->procedureCode); + rc = hnbgw_tx_error_ind(hnb, &cause, imsg->procedureCode, -1, HNBAP_TriggeringMessage_initiating_message); break; default: LOGHNB(hnb, DHNBAP, LOGL_NOTICE, "Unknown HNBAP Procedure %ld\n", imsg->procedureCode); + rc = hnbgw_tx_error_ind(hnb, &cause, imsg->procedureCode, -1, HNBAP_TriggeringMessage_initiating_message); break; } -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36479?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I7aaa66f83f62ee1b5ba5204248e9f4cc754263ed Gerrit-Change-Number: 36479 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

4 weeks, 1 day

1
0
0 0

[S] Change in osmo-hnbgw[master]: HNBAP: Transmit ErrorIndication in more situations

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36479?usp=email ) Change subject: HNBAP: Transmit ErrorIndication in more situations ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36479?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I7aaa66f83f62ee1b5ba5204248e9f4cc754263ed Gerrit-Change-Number: 36479 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Mar 2024 09:55:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

4 weeks, 1 day

1
0
0 0

[M] Change in osmo-hnbgw[master]: HNBAP: Make sure to respond with correct "reject"

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36478?usp=email ) Change subject: HNBAP: Make sure to respond with correct "reject" ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36478?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I300db368a3d1d2fb5967f69f2ed4ac90ecf85e75 Gerrit-Change-Number: 36478 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Mar 2024 09:55:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

4 weeks, 1 day

1
0
0 0

[M] Change in osmo-hnbgw[master]: HNBAP: Always respond to UE-REGISTER-REQUEST

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36477?usp=email ) Change subject: HNBAP: Always respond to UE-REGISTER-REQUEST ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36477?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I5338a1324545b2c6d31fb45f1e69fee45842e207 Gerrit-Change-Number: 36477 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Mar 2024 09:55:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

4 weeks, 1 day

1
0
0 0

[S] Change in osmo-hnbgw[master]: HNBAP: Send HNB-REGISTER-REJ on ASN.1 decoding error

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36476?usp=email ) Change subject: HNBAP: Send HNB-REGISTER-REJ on ASN.1 decoding error ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36476?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Ic4a40966194a57cccc0eb056233f7e7426d6e8f9 Gerrit-Change-Number: 36476 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Mar 2024 09:55:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

4 weeks, 1 day

1
0
0 0

[S] Change in osmo-hnbgw[master]: HNBAP: Use proper cause values during HNB-REGISTER-REQ processing

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36475?usp=email ) Change subject: HNBAP: Use proper cause values during HNB-REGISTER-REQ processing ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36475?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Iadddd26b751a9fd80c829068792aa93cd538c43d Gerrit-Change-Number: 36475 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Mar 2024 09:55:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

4 weeks, 1 day

1
0
0 0

[S] Change in osmo-hnbgw[master]: generalize hnbgw_tx_ue_register_rej_tmsi() to hnbgw_tx_ue_register_rej()

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36474?usp=email ) Change subject: generalize hnbgw_tx_ue_register_rej_tmsi() to hnbgw_tx_ue_register_rej() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36474?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Ic83674523c0326a7ae51fb176bddfd6641ed3ac4 Gerrit-Change-Number: 36474 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 29 Mar 2024 09:55:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

4 weeks, 1 day

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: Introduce Asterisk_Tests testsuite

by pespin

Attention is currently required from: pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36490?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: Introduce Asterisk_Tests testsuite ...................................................................... Introduce Asterisk_Tests testsuite Add initial infrastructure to run tests against an Asterisk process. An not-yet-finished draft test doing registration is submitted to validate communication towards Asterisk works. The testsuite will be improved in follow-up commits, but this way other people can already start using it and we can set up the dockerized setup + jenkins jobs to run it nightly. Related: SYS#6782 Change-Id: I66f776d5df6fb5dc488d9e589b84a6b2385406e8 --- M Makefile A asterisk/Asterisk_Tests.cfg A asterisk/Asterisk_Tests.default A asterisk/Asterisk_Tests.ttcn A asterisk/README.md A asterisk/expected-results.xml A asterisk/gen_links.sh A asterisk/regen_makefile.sh M library/SIP_Emulation.ttcn M library/SIP_Templates.ttcn 10 files changed, 414 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/90/36490/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36490?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: I66f776d5df6fb5dc488d9e589b84a6b2385406e8 Gerrit-Change-Number: 36490 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 month

1
0
0 0

[M] Change in docker-playground[master]: Introduce asterisk-master docker image

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/36491?usp=email ) Change subject: Introduce asterisk-master docker image ...................................................................... Introduce asterisk-master docker image This Docker image allows building and running Asterisk from git. Default config is to build the sysmocom fork used to develop new features (hence pointing to sysmocom/master branch in that repo. Related: SYS#6782 Change-Id: Iaa3816f8ceefac8956e61e15f79ed708dec55238 --- A asterisk-master/Dockerfile A asterisk-master/Makefile M make/Makefile 3 files changed, 81 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/91/36491/1 diff --git a/asterisk-master/Dockerfile b/asterisk-master/Dockerfile new file mode 100644 index 0000000..6b8c21b --- /dev/null +++ b/asterisk-master/Dockerfile @@ -0,0 +1,64 @@ +ARG REGISTRY=docker.io +ARG USER +ARG DISTRO +FROM $USER/$DISTRO-build +# Arguments used after FROM must be specified again +ARG DISTRO + +RUN apt-get update && \ + apt-get upgrade -y && \ + DEBIAN_FRONTEND=noninteractive \ + apt-get install -y --no-install-recommends \ + vim \ + sudo \ + iproute2 \ + iputils-ping \ + libcap2-bin \ + net-tools \ + libedit-dev \ + libnewt-dev \ + libssl-dev \ + libncurses5-dev \ + subversion \ + libsqlite3-dev \ + build-essential \ + libjansson-dev \ + libxml2-dev \ + uuid-dev \ + wget && \ + apt-get clean + +# create a user +ARG username=asterisk +RUN useradd -m ${username} && \ + echo "${username} ALL=(root) NOPASSWD:ALL" > /etc/sudoers.d/${username} && \ + chmod 0440 /etc/sudoers.d/${username} + +WORKDIR /home/${username} + + +# clone open5gs +ARG ASTERISK_REMOTE=https://gitea.sysmocom.de/sysmocom/asterisk.git +RUN git clone $ASTERISK_REMOTE + +RUN cd asterisk && \ + git fetch && git checkout -f -B sysmocom/master origin/sysmocom/master + +RUN cd asterisk && \ + ./bootstrap.sh && \ + ./configure && \ + make "-j$(nproc)" + +ARG ASTERISK_BRANCH=sysmocom/master + +ADD https://gitea.sysmocom.de/api/v1/repos/sysmocom/asterisk/git/refs/heads/$AS… /tmp/asterisk-ver + +# update the source code (if needed) +RUN cd asterisk && \ + git fetch && git checkout -B $ASTERISK_BRANCH origin/$ASTERISK_BRANCH + +RUN cd asterisk && \ + make "-j$(nproc)" && \ + make install && \ + make samples && \ + ldconfig diff --git a/asterisk-master/Makefile b/asterisk-master/Makefile new file mode 100644 index 0000000..8d0e10b --- /dev/null +++ b/asterisk-master/Makefile @@ -0,0 +1 @@ +include ../make/Makefile diff --git a/make/Makefile b/make/Makefile index 7266662..74efbff 100644 --- a/make/Makefile +++ b/make/Makefile @@ -17,6 +17,7 @@ USERNAME?=$(USER) UID=$(shell id -u) NAME?=$(shell basename $(CURDIR)) +ASTERISK_BRANCH?=sysmocom/master LIBOSMOCORE_BRANCH?=master OSMO_TTCN3_BRANCH?=master OSMO_BB_BRANCH?=master @@ -100,6 +101,7 @@ --build-arg OSMOCOM_REPO_PATH=$(OSMOCOM_REPO_PATH) \ --build-arg OSMOCOM_REPO_VERSION=$(OSMOCOM_REPO_VERSION) \ --build-arg OSMOCOM_REPO_TESTSUITE_MIRROR=$(OSMOCOM_REPO_TESTSUITE_MIRROR) \ + --build-arg ASTERISK_BRANCH=$(ASTERISK_BRANCH) \ --build-arg LIBOSMOCORE_BRANCH=$(LIBOSMOCORE_BRANCH) \ --build-arg OSMO_BB_BRANCH=$(OSMO_BB_BRANCH) \ --build-arg OSMO_BSC_BRANCH=$(OSMO_BSC_BRANCH) \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36491?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Iaa3816f8ceefac8956e61e15f79ed708dec55238 Gerrit-Change-Number: 36491 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 month

1
0
0 0

[L] Change in docker-playground[master]: Introduce ttcn3-asterisk-ims-ue-test

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/36492?usp=email ) Change subject: Introduce ttcn3-asterisk-ims-ue-test ...................................................................... Introduce ttcn3-asterisk-ims-ue-test This dockerized setup allows running the Asterisk_Tests ttcn3 testsuite against Asterisk from the asterisk-master docker image, in order to test the IMS UE feature which will be developed soon. Related: SYS#6782 Depends: osmo-ttcn3-hacks.git Change-Id I66f776d5df6fb5dc488d9e589b84a6b2385406e8 Change-Id: Idd262b9224ea879a6e941792944fe0b0db3e68ba --- A ttcn3-asterisk-ims-ue-test/Asterisk_Tests.cfg A ttcn3-asterisk-ims-ue-test/Dockerfile A ttcn3-asterisk-ims-ue-test/Makefile A ttcn3-asterisk-ims-ue-test/asterisk/asterisk.conf A ttcn3-asterisk-ims-ue-test/asterisk/asterisk.sh A ttcn3-asterisk-ims-ue-test/asterisk/extensions.conf A ttcn3-asterisk-ims-ue-test/asterisk/pjsip.conf A ttcn3-asterisk-ims-ue-test/jenkins.sh 8 files changed, 361 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/92/36492/1 diff --git a/ttcn3-asterisk-ims-ue-test/Asterisk_Tests.cfg b/ttcn3-asterisk-ims-ue-test/Asterisk_Tests.cfg new file mode 100644 index 0000000..c8744bb --- /dev/null +++ b/ttcn3-asterisk-ims-ue-test/Asterisk_Tests.cfg @@ -0,0 +1,22 @@ +[ORDERED_INCLUDE] +"/osmo-ttcn3-hacks/Common.cfg" +"/osmo-ttcn3-hacks/asterisk/Asterisk_Tests.default" + +[LOGGING] + +[TESTPORT_PARAMETERS] +*.SIP.default_local_address := "172.18.11.103" +*.SIP.local_sip_port := "5060" +*.SIP.default_dest_address := "172.18.11.10" +*.SIP.default_dest_port := "5094" + +[MODULE_PARAMETERS] +Asterisk_Tests.mp_local_sip_host := "172.18.11.103" +Asterisk_Tests.mp_remote_sip_host := "172.18.11.10" +Asterisk_Tests.mp_local_sip_port := 5060 +Asterisk_Tests.mp_remote_sip_port := 5094 + +[MAIN_CONTROLLER] + +[EXECUTE] +Asterisk_Tests.control diff --git a/ttcn3-asterisk-ims-ue-test/Dockerfile b/ttcn3-asterisk-ims-ue-test/Dockerfile new file mode 100644 index 0000000..1a2f8aa --- /dev/null +++ b/ttcn3-asterisk-ims-ue-test/Dockerfile @@ -0,0 +1,13 @@ +ARG REGISTRY +ARG USER +FROM $REGISTRY/$USER/debian-bookworm-titan +ARG OSMO_TTCN3_BRANCH="master" + +ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ttcn3-hacks/+/$OSMO_TTCN3_B… /tmp/commit +RUN ttcn3-docker-prepare "$OSMO_TTCN3_BRANCH" asterisk + +VOLUME /data + +COPY Asterisk_Tests.cfg /data/Asterisk_Tests.cfg + +CMD ttcn3-docker-run asterisk Asterisk_Tests diff --git a/ttcn3-asterisk-ims-ue-test/Makefile b/ttcn3-asterisk-ims-ue-test/Makefile new file mode 100644 index 0000000..8d0e10b --- /dev/null +++ b/ttcn3-asterisk-ims-ue-test/Makefile @@ -0,0 +1 @@ +include ../make/Makefile diff --git a/ttcn3-asterisk-ims-ue-test/asterisk/asterisk.conf b/ttcn3-asterisk-ims-ue-test/asterisk/asterisk.conf new file mode 100644 index 0000000..a17d606 --- /dev/null +++ b/ttcn3-asterisk-ims-ue-test/asterisk/asterisk.conf @@ -0,0 +1,142 @@ +[directories](!) +astcachedir => /var/cache/asterisk +astetcdir => /etc/asterisk +astmoddir => /usr/lib/asterisk/modules +astvarlibdir => /var/lib/asterisk +astdbdir => /var/lib/asterisk +astkeydir => /var/lib/asterisk +astdatadir => /var/lib/asterisk +astagidir => /var/lib/asterisk/agi-bin +astspooldir => /var/spool/asterisk +astrundir => /var/run/asterisk +astlogdir => /data +astsbindir => /usr/sbin + +[options] +;verbose = 3 +;debug = 3 +;trace = 0 ; Set the trace level. +;refdebug = yes ; Enable reference count debug logging. +;alwaysfork = yes ; Same as -F at startup. +;nofork = yes ; Same as -f at startup. +;quiet = yes ; Same as -q at startup. +;timestamp = yes ; Same as -T at startup. +;execincludes = yes ; Support #exec in config files. +;console = yes ; Run as console (same as -c at startup). +;highpriority = yes ; Run realtime priority (same as -p at + ; startup). +;initcrypto = yes ; Initialize crypto keys (same as -i at + ; startup). +;nocolor = yes ; Disable console colors. +;dontwarn = yes ; Disable some warnings. +;dumpcore = yes ; Dump core on crash (same as -g at startup). +;languageprefix = yes ; Use the new sound prefix path syntax. +;systemname = my_system_name ; Prefix uniqueid with a system name for + ; Global uniqueness issues. +;autosystemname = yes ; Automatically set systemname to hostname, + ; uses 'localhost' on failure, or systemname if + ; set. +;mindtmfduration = 80 ; Set minimum DTMF duration in ms (default 80 ms) + ; If we get shorter DTMF messages, these will be + ; changed to the minimum duration +;maxcalls = 10 ; Maximum amount of calls allowed. +;maxload = 0.9 ; Asterisk stops accepting new calls if the + ; load average exceed this limit. +;maxfiles = 1000 ; Maximum amount of openfiles. +;minmemfree = 1 ; In MBs, Asterisk stops accepting new calls if + ; the amount of free memory falls below this + ; watermark. +;cache_media_frames = yes ; Cache media frames for performance + ; Disable this option to help track down media frame + ; mismanagement when using valgrind or MALLOC_DEBUG. + ; The cache gets in the way of determining if the + ; frame is used after being freed and who freed it. + ; NOTE: This option has no effect when Asterisk is + ; compiled with the LOW_MEMORY compile time option + ; enabled because the cache code does not exist. + ; Default yes +;cache_record_files = yes ; Cache recorded sound files to another + ; directory during recording. +;record_cache_dir = /tmp ; Specify cache directory (used in conjunction + ; with cache_record_files). +;transmit_silence = yes ; Transmit silence while a channel is in a + ; waiting state, a recording only state, or + ; when DTMF is being generated. Note that the + ; silence internally is generated in raw signed + ; linear format. This means that it must be + ; transcoded into the native format of the + ; channel before it can be sent to the device. + ; It is for this reason that this is optional, + ; as it may result in requiring a temporary + ; codec translation path for a channel that may + ; not otherwise require one. +;transcode_via_sln = yes ; Build transcode paths via SLINEAR, instead of + ; directly. +;runuser = asterisk ; The user to run as. +;rungroup = asterisk ; The group to run as. +;lightbackground = yes ; If your terminal is set for a light-colored + ; background. +;forceblackbackground = yes ; Force the background of the terminal to be + ; black, in order for terminal colors to show + ; up properly. +;defaultlanguage = en ; Default language +documentation_language = en_US ; Set the language you want documentation + ; displayed in. Value is in the same format as + ; locale names. +;hideconnect = yes ; Hide messages displayed when a remote console + ; connects and disconnects. +;lockconfdir = no ; Protect the directory containing the + ; configuration files (/etc/asterisk) with a + ; lock. +;stdexten = gosub ; How to invoke the extensions.conf stdexten. + ; macro - Invoke the stdexten using a macro as + ; done by legacy Asterisk versions. + ; gosub - Invoke the stdexten using a gosub as + ; documented in extensions.conf.sample. + ; Default gosub. +;live_dangerously = no ; Enable the execution of 'dangerous' dialplan + ; functions and configuration file access from + ; external sources (AMI, etc.) These functions + ; (such as SHELL) are considered dangerous + ; because they can allow privilege escalation. + ; Configuration files are considered dangerous + ; if they exist outside of the Asterisk + ; configuration directory. + ; Default no +;entityid=00:11:22:33:44:55 ; Entity ID. + ; This is in the form of a MAC address. + ; It should be universally unique. + ; It must be unique between servers communicating + ; with a protocol that uses this value. + ; This is currently is used by DUNDi and + ; Exchanging Device and Mailbox State + ; using protocols: XMPP, Corosync and PJSIP. +;rtp_use_dynamic = yes ; When set to "yes" RTP dynamic payload types + ; are assigned dynamically per RTP instance vs. + ; allowing Asterisk to globally initialize them + ; to pre-designated numbers (defaults to "yes"). +;rtp_pt_dynamic = 35 ; Normally the Dynamic RTP Payload Type numbers + ; are 96-127, which allow just 32 formats. The + ; starting point 35 enables the range 35-63 and + ; allows 29 additional formats. When you use + ; more than 32 formats in the dynamic range and + ; calls are not accepted by a remote + ; implementation, please report this and go + ; back to value 96. +;hide_messaging_ami_events = no; This option, if enabled, will + ; suppress all of the Message/ast_msg_queue channel's + ; housekeeping AMI and ARI channel events. This can + ; reduce the load on the manager and ARI applications + ; when the Digium Phone Module for Asterisk is in use. +;sounds_search_custom_dir = no; This option, if enabled, will + ; cause Asterisk to search for sounds files in + ; AST_DATA_DIR/sounds/custom before searching the + ; normal directories like AST_DATA_DIR/sounds/<lang>. + +; Changing the following lines may compromise your security. +;[files] +;astctlpermissions = 0660 +;astctlowner = root +;astctlgroup = apache +;astctl = asterisk.ctl + diff --git a/ttcn3-asterisk-ims-ue-test/asterisk/asterisk.sh b/ttcn3-asterisk-ims-ue-test/asterisk/asterisk.sh new file mode 100755 index 0000000..24a20db --- /dev/null +++ b/ttcn3-asterisk-ims-ue-test/asterisk/asterisk.sh @@ -0,0 +1,16 @@ +#!/bin/bash +set +e +set -x + +ASTERISK_CFG_PATH="/etc/asterisk" + +#rm -rf "${ASTERISK_CFG_PATH}" +#mkdir -p "${ASTERISK_CFG_PATH}" + +#cp -r /etc/asterisk/* "${ASTERISK_CFG_PATH}/" +cp /data/asterisk.conf "${ASTERISK_CFG_PATH}/" +#sed -i "s#/etc/asterisk#${ASTERISK_CFG_PATH}#" "${ASTERISK_CFG_PATH}/asterisk.conf" +cp /data/pjsip.conf "${ASTERISK_CFG_PATH}/" +cat /data/extensions.conf >>"${ASTERISK_CFG_PATH}/extensions.conf" + +/usr/sbin/asterisk -C "${ASTERISK_CFG_PATH}/asterisk.conf" -f -g -vvvvv -ddddd diff --git a/ttcn3-asterisk-ims-ue-test/asterisk/extensions.conf b/ttcn3-asterisk-ims-ue-test/asterisk/extensions.conf new file mode 100644 index 0000000..3c78a2d --- /dev/null +++ b/ttcn3-asterisk-ims-ue-test/asterisk/extensions.conf @@ -0,0 +1,37 @@ +[get-valid-endpoints] + +exten => s,1,Verbose(5, Entering get-valid-endpoints gosub.) + ; usage: no arguments, returns DIALGROUP object of registered and valid 050x endpoints + same => n,Set(ENDPOINT_1_STATE=${DEVICE_STATE(PJSIP/0501)}) + same => n,Set(ENDPOINT_2_STATE=${DEVICE_STATE(PJSIP/0502)}) + same => n,Set(ENDPOINT_3_STATE=${DEVICE_STATE(PJSIP/0503)}) + same => n,Set(ENDPOINT_4_STATE=${DEVICE_STATE(PJSIP/0504)}) + same => n,Set(ENDPOINT_1_EXPR=$[$["${ENDPOINT_1_STATE}" = "UNAVAILABLE"] | $["${ENDPOINT_1_STATE}" = "UNKNOWN"] | $["${ENDPOINT_1_STATE}" = "INVALID"]]) + same => n,Set(ENDPOINT_2_EXPR=$[$["${ENDPOINT_2_STATE}" = "UNAVAILABLE"] | $["${ENDPOINT_2_STATE}" = "UNKNOWN"] | $["${ENDPOINT_2_STATE}" = "INVALID"]]) + same => n,Set(ENDPOINT_3_EXPR=$[$["${ENDPOINT_3_STATE}" = "UNAVAILABLE"] | $["${ENDPOINT_3_STATE}" = "UNKNOWN"] | $["${ENDPOINT_3_STATE}" = "INVALID"]]) + same => n,Set(ENDPOINT_4_EXPR=$[$["${ENDPOINT_4_STATE}" = "UNAVAILABLE"] | $["${ENDPOINT_4_STATE}" = "UNKNOWN"] | $["${ENDPOINT_4_STATE}" = "INVALID"]]) + same => n,Set(DIALGROUP(CALL_VALID_LIST)=) ; clear list + same => n,ExecIf($[${ENDPOINT_1_EXPR} = 0]?Set(DIALGROUP(CALL_VALID_LIST,add)=PJSIP/0501)) + same => n,ExecIf($[${ENDPOINT_2_EXPR} = 0]?Set(DIALGROUP(CALL_VALID_LIST,add)=PJSIP/0502)) + same => n,ExecIf($[${ENDPOINT_3_EXPR} = 0]?Set(DIALGROUP(CALL_VALID_LIST,add)=PJSIP/0503)) + same => n,ExecIf($[${ENDPOINT_4_EXPR} = 0]?Set(DIALGROUP(CALL_VALID_LIST,add)=PJSIP/0504)) + same => n,Return(${DIALGROUP(CALL_VALID_LIST)}) + +[from-phone] + +exten => 0500,1,Verbose(5,${EXTEN}: Call all registered pjsips from ${CALLERID(num)}) + same => n,Gosub(get-valid-endpoints,s,1()) + same => n,Set(DIALGROUP(CALL_EVERYONE_LIST)=${GOSUB_RETVAL}) + same => n,Set(DIALGROUP(CALL_EVERYONE_LIST,del)=PJSIP/${CALLERID(num)}) ; remove the caller + same => n,Dial(${DIALGROUP(CALL_EVERYONE_LIST)}) + same => n,Hangup(16) + +exten => _050X,1,Verbose(5,${EXTEN}: Call pjsip endpoint from ${CALLERID(num)}) + same => n,Dial(PJSIP/${EXTEN}) + same => n,Hangup(16) + +exten => _X,1,Verbose(5,${EXTEN}: Call external number from ${CALLERID(num)}) + same => n,Dial(PJSIP/${EXTEN}@973171) + same => n,Hangup(16) + + diff --git a/ttcn3-asterisk-ims-ue-test/asterisk/pjsip.conf b/ttcn3-asterisk-ims-ue-test/asterisk/pjsip.conf new file mode 100644 index 0000000..39cf9bb --- /dev/null +++ b/ttcn3-asterisk-ims-ue-test/asterisk/pjsip.conf @@ -0,0 +1,71 @@ + +[transport-udp] +type=transport +protocol=udp +bind=172.18.11.10:5094 +local_net=172.18.11.0/24 +;external_media_address=[obfuscated] +;external_signaling_address=[obfuscated] + + +[endpoint_phone_template] +type=endpoint +transport=transport-udp +context=from-phone +disallow=all +allow=alaw +allow=ulaw + +[auth_phone_template] +type=auth +auth_type=userpass + +[aor_phone_template] +type=aor +max_contacts=1 +remove_existing=yes + +[0501](endpoint_phone_template) +auth=0501 +aors=0501 +callerid=0501 + +[0501](auth_phone_template) +username=0501 +password=secret + +[0501](aor_phone_template) + +[0502](endpoint_phone_template) +auth=0502 +aors=0502 +callerid=0502 + +[0502](auth_phone_template) +username=0502 +password=secret + +[0502](aor_phone_template) + +[0503](endpoint_phone_template) +auth=0503 +aors=0503 +callerid=0503 + +[0503](auth_phone_template) +username=0503 +password=secret + +[0503](aor_phone_template) + +[0504](endpoint_phone_template) +auth=0504 +aors=0504 +callerid=0504 + +[0504](auth_phone_template) +username=0504 +password=secret + +[0504](aor_phone_template) + diff --git a/ttcn3-asterisk-ims-ue-test/jenkins.sh b/ttcn3-asterisk-ims-ue-test/jenkins.sh new file mode 100755 index 0000000..7e5361d --- /dev/null +++ b/ttcn3-asterisk-ims-ue-test/jenkins.sh @@ -0,0 +1,44 @@ +#!/bin/sh + +. ../jenkins-common.sh +IMAGE_SUFFIX="${IMAGE_SUFFIX:-master}" +docker_images_require \ + "asterisk-$IMAGE_SUFFIX" \ + "ttcn3-asterisk-ims-ue-test" + +set_clean_up_trap +set -e + +mkdir $VOL_BASE_DIR/asterisk-ims-ue-tester +mkdir $VOL_BASE_DIR/asterisk-ims-ue-tester/unix +cp Asterisk_Tests.cfg $VOL_BASE_DIR/asterisk-ims-ue-tester/ +write_mp_osmo_repo "$VOL_BASE_DIR/asterisk-ims-ue-tester/Asterisk_Tests.cfg" + +mkdir $VOL_BASE_DIR/asterisk +cp asterisk/* $VOL_BASE_DIR/asterisk/ + +network_create +network_replace_subnet_in_configs + +echo Starting container with Asterisk +docker run --rm \ + $(docker_network_params $SUBNET 10) \ + --ulimit core=-1 \ + -v $VOL_BASE_DIR/asterisk:/data \ + --name ${BUILD_TAG}-asterisk -d \ + $DOCKER_ARGS \ + $REPO_USER/asterisk-$IMAGE_SUFFIX \ + /bin/sh -c "/data/asterisk.sh >/data/asterisk.console.log 2>&1" + +# Leave some time for asterisk to start: +sleep 3 + +echo Starting container with Asterisk testsuite +docker run --rm \ + $(docker_network_params $SUBNET 103) \ + --ulimit core=-1 \ + -e "TTCN3_PCAP_PATH=/data" \ + -v $VOL_BASE_DIR/asterisk-ims-ue-tester:/data \ + --name ${BUILD_TAG}-ttcn3-asterisk-ims-ue-test \ + $DOCKER_ARGS \ + $REPO_USER/ttcn3-asterisk-ims-ue-test -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36492?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Idd262b9224ea879a6e941792944fe0b0db3e68ba Gerrit-Change-Number: 36492 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 month

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: Introduce Asterisk_Tests testsuite

by Jenkins Builder

Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36490?usp=email ) Change subject: Introduce Asterisk_Tests testsuite ...................................................................... Patch Set 1: (1 comment) File library/SIP_Templates.ttcn: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-15493): https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36490/comment/9a182294_fe18… PS1, Line 528: /* Expect during first REGISTER when authorization is requried: */ 'requried' may be misspelled - perhaps 'required'? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36490?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: I66f776d5df6fb5dc488d9e589b84a6b2385406e8 Gerrit-Change-Number: 36490 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Thu, 28 Mar 2024 20:21:20 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 month

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: Introduce Asterisk_Tests testsuite

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36490?usp=email ) Change subject: Introduce Asterisk_Tests testsuite ...................................................................... Introduce Asterisk_Tests testsuite Add initial infrastructure to run tests against an Asterisk process. An not-yet-finished draft test doing registration is submitted to validate communication towards Asterisk works. The testsuite will be improved in follow-up commits, but this way other people can already start using it and we can set up the dockerized setup + jenkins jobs to run it nightly. Related: SYS#6782 Change-Id: I66f776d5df6fb5dc488d9e589b84a6b2385406e8 --- M Makefile A asterisk/Asterisk_Tests.cfg A asterisk/Asterisk_Tests.default A asterisk/Asterisk_Tests.ttcn A asterisk/README.md A asterisk/expected-results.xml A asterisk/gen_links.sh A asterisk/regen_makefile.sh M library/SIP_Emulation.ttcn M library/SIP_Templates.ttcn 10 files changed, 414 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/90/36490/1 diff --git a/Makefile b/Makefile index 51e51ed..bd88ca5 100644 --- a/Makefile +++ b/Makefile @@ -14,6 +14,7 @@ # limitations under the License. SUBDIRS= \ + asterisk \ bsc \ bsc-nat \ bts \ diff --git a/asterisk/Asterisk_Tests.cfg b/asterisk/Asterisk_Tests.cfg new file mode 100644 index 0000000..a3669f9 --- /dev/null +++ b/asterisk/Asterisk_Tests.cfg @@ -0,0 +1,18 @@ +[ORDERED_INCLUDE] +# Common configuration, shared between test suites +"../Common.cfg" +# testsuite specific configuration, not expected to change +"./Asterisk_Tests.default" + +# Local configuration below + +[LOGGING] + +[TESTPORT_PARAMETERS] + +[MODULE_PARAMETERS] + +[MAIN_CONTROLLER] + +[EXECUTE] +Asterisk_Tests.control diff --git a/asterisk/Asterisk_Tests.default b/asterisk/Asterisk_Tests.default new file mode 100644 index 0000000..a2fda0f --- /dev/null +++ b/asterisk/Asterisk_Tests.default @@ -0,0 +1,18 @@ +[LOGGING] +FileMask := LOG_ALL | TTCN_MATCHING; + +mtc.FileMask := ERROR | WARNING | PARALLEL | VERDICTOP; + +[TESTPORT_PARAMETERS] +*.SIP.local_sip_port := "5060" +*.SIP.default_local_address := "127.0.0.2" +*.SIP.default_sip_protocol := "UDP" +*.SIP.default_dest_port := "5060" +*.SIP.default_dest_address := "127.0.0.1" + + +[MODULE_PARAMETERS] + +[MAIN_CONTROLLER] + +[EXECUTE] diff --git a/asterisk/Asterisk_Tests.ttcn b/asterisk/Asterisk_Tests.ttcn new file mode 100644 index 0000000..5d9754e --- /dev/null +++ b/asterisk/Asterisk_Tests.ttcn @@ -0,0 +1,240 @@ +module Asterisk_Tests { + +/* Asterisk test suite in TTCN-3 + * (C) 2024 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + * All rights reserved. + * Author: Pau Espin Pedrol <pespin(a)sysmocom.de> + * + * Released under the terms of GNU General Public License, Version 2 or + * (at your option) any later version. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +import from General_Types all; +import from Osmocom_Types all; +import from Native_Functions all; +import from Misc_Helpers all; + +import from SDP_Types all; +import from SDP_Templates all; + +import from SIP_Emulation all; +import from SIPmsg_Types all; +import from SIP_Templates all; + +modulepar { + charstring mp_local_sip_host := "127.0.0.2"; + integer mp_local_sip_port := 5060; + charstring mp_remote_sip_host := "127.0.0.1"; + integer mp_remote_sip_port := 5060; +} + +type component test_CT { + var SIP_Emulation_CT vc_SIP; +} + +type component ConnHdlr extends SIP_ConnHdlr { + var ConnHdlrPars g_pars; + timer g_Tguard; + var PDU_SIP_Request g_rx_sip_req; + var PDU_SIP_Response g_rx_sip_resp; +} + +type record ConnHdlrPars { + float t_guard, + charstring user, + SipUrl registrar_sip_url, + SipAddr registrar_sip_record, + CallidString registrar_sip_call_id, + Via registrar_via, + integer registrar_sip_seq_nr, + SipAddr sip_url_ext, + Contact local_contact, + CallPars cp optional +} + +template (value) ConnHdlrPars t_Pars(charstring user, + charstring displayname := "\"Anonymous\"") := { + t_guard := 30.0, + user := user, + registrar_sip_url := valueof(ts_SipUrlHost(mp_remote_sip_host)), + registrar_sip_record := ts_SipAddr(ts_HostPort(mp_remote_sip_host), + ts_UserInfo(user), + displayName := displayname), + registrar_sip_call_id := hex2str(f_rnd_hexstring(15)) & "@" & mp_local_sip_host, + registrar_via := ts_Via_from(ts_HostPort(mp_local_sip_host, mp_local_sip_port)), + registrar_sip_seq_nr := f_sip_rand_seq_nr(), + sip_url_ext := ts_SipAddr(ts_HostPort(mp_local_sip_host, mp_local_sip_port), + ts_UserInfo(user)), + local_contact := valueof(ts_Contact({ + ts_ContactAddress( + ts_Addr_Union_SipUrl(ts_SipUrl(ts_HostPort( + mp_local_sip_host, + mp_local_sip_port), + ts_UserInfo(user))), + omit) + })), + cp := omit +} + +function f_init_ConnHdlrPars(integer idx := 1) runs on test_CT return ConnHdlrPars { + var ConnHdlrPars pars := valueof(t_Pars(int2str(500 + idx))); + return pars; +} + +type record CallPars { + boolean is_mo, + charstring calling, + charstring called, + + CallParsComputed comp optional, + + charstring sip_rtp_addr, + uint16_t sip_rtp_port, + charstring cn_rtp_addr, + uint16_t cn_rtp_port +} + +type record CallParsComputed { + CallidString sip_call_id, + charstring sip_body, + integer sip_seq_nr +} + +private template (value) CallPars t_CallPars(boolean is_mo) := { + is_mo := is_mo, + calling := "12345", + called := "98766", + comp := { + sip_call_id := hex2str(f_rnd_hexstring(15)), + sip_body := "", + sip_seq_nr := f_sip_rand_seq_nr() + }, + sip_rtp_addr := "1.2.3.4", + sip_rtp_port := 1234, + cn_rtp_addr := "5.6.7.8", + cn_rtp_port := 5678 +} + +function f_init() runs on test_CT { + f_init_sip(vc_SIP, "Asterisk_Test"); + log("end of f_init"); +} + +type function void_fn(charstring id) runs on ConnHdlr; + +function f_start_handler(void_fn fn, ConnHdlrPars pars) +runs on test_CT return ConnHdlr { + var ConnHdlr vc_conn; + var charstring id := testcasename(); + + vc_conn := ConnHdlr.create(id); + + connect(vc_conn:SIP, vc_SIP:CLIENT); + connect(vc_conn:SIP_PROC, vc_SIP:CLIENT_PROC); + + vc_conn.start(f_handler_init(fn, id, pars)); + return vc_conn; +} + +private altstep as_Tguard() runs on ConnHdlr { + [] g_Tguard.timeout { + setverdict(fail, "Tguard timeout"); + mtc.stop; + } +} + +private function f_handler_init(void_fn fn, charstring id, ConnHdlrPars pars) +runs on ConnHdlr { + g_pars := pars; + g_Tguard.start(pars.t_guard); + activate(as_Tguard()); + + // Make sure the UA is deregistered before starting the test: + // sends REGISTER with Contact = "*" and Expires = 0 + //f_SIP_deregister(); + + /* call the user-supied test case function */ + fn.apply(id); +} + +altstep as_SIP_expect_req(template PDU_SIP_Request sip_expect) runs on ConnHdlr +{ + [] SIP.receive(sip_expect) -> value g_rx_sip_req; + [] SIP.receive { + log("FAIL: expected SIP message ", sip_expect); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Received unexpected SIP message"); + } +} + +altstep as_SIP_expect_resp(template PDU_SIP_Response sip_expect) runs on ConnHdlr +{ + [] SIP.receive(sip_expect) -> value g_rx_sip_resp; + [] SIP.receive { + log("FAIL: expected SIP message ", sip_expect); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Received unexpected SIP message"); + } +} + +private function f_tr_Via_response(Via via_req) return template (present) Via { + template (present) SemicolonParam_List via_resp_params := ?; + + /*via_resp_params := { + { id := "rport", paramValue := int2str(mp_remote_sip_port) }, + { id := "received", paramValue := mp_remote_sip_host } + }; */ + return tr_Via_from(via_req.viaBody[0].sentBy, + via_resp_params); +} + +function f_SIP_register() runs on ConnHdlr return PDU_SIP_Response +{ + var template (present) PDU_SIP_Response exp; + + SIP.send(ts_SIP_REGISTER(g_pars.registrar_sip_url, + g_pars.registrar_sip_call_id, + g_pars.registrar_sip_record, + g_pars.registrar_sip_record, + g_pars.registrar_via, + g_pars.registrar_sip_seq_nr, + g_pars.local_contact, + ts_Expires("7200"))); + + exp := tr_SIP_Response_REGISTER_Unauthorized( + g_pars.registrar_sip_call_id, + g_pars.registrar_sip_record, + g_pars.registrar_sip_record, + f_tr_Via_response(g_pars.registrar_via), + *, + g_pars.registrar_sip_seq_nr); + as_SIP_expect_resp(exp); + + /* Do the registering after calculating the md5 hash, etc. */ + return g_rx_sip_resp; +} + +/* Successful MO Call, which is subsequently released by SIP side */ +private function f_TC_internal_registration(charstring id) runs on ConnHdlr { + + f_SIP_register(); + /* now call is fully established */ + f_sleep(2.0); + // f_SIP_deregister(); + setverdict(pass); +} + +testcase TC_internal_registration() runs on test_CT { + var ConnHdlrPars pars; + var ConnHdlr vc_conn; + f_init(); + pars := f_init_ConnHdlrPars(); + vc_conn := f_start_handler(refers(f_TC_internal_registration), pars); + vc_conn.done; +} + +control { + execute( TC_internal_registration() ); +} + +} diff --git a/asterisk/README.md b/asterisk/README.md new file mode 100644 index 0000000..c034bbb --- /dev/null +++ b/asterisk/README.md @@ -0,0 +1,16 @@ +* Asterisk_Tests.ttcn + +* external interfaces + * SIP (emulates SIP UAs) + * VoLTE (emulates IMS server) + +{% dot sip_tests.svg +digraph G { + rankdir=LR; + Asterisk [label="IUT\nAsterisk",shape="box"]; + ATS [label="ATS\nAsterisk_Tests.ttcn"]; + + ATS -> Asterisk [label="SIP"]; + ATS -> Asterisk [label="VoLTE (IMS)"]; +} +%} diff --git a/asterisk/expected-results.xml b/asterisk/expected-results.xml new file mode 100644 index 0000000..c1d9e2e --- /dev/null +++ b/asterisk/expected-results.xml @@ -0,0 +1,4 @@ +<?xml version="1.0"?> +<testsuite name='Titan' tests='9' failures='0' errors='0' skipped='0' inconc='0' time='MASKED'> + <testcase classname='Asterisk_Tests' name='TC_internal_registration' time='MASKED'/> +</testsuite> diff --git a/asterisk/gen_links.sh b/asterisk/gen_links.sh new file mode 100755 index 0000000..1fd6ecc --- /dev/null +++ b/asterisk/gen_links.sh @@ -0,0 +1,40 @@ +#!/bin/bash + +BASEDIR=../deps + +. ../gen_links.sh.inc + +DIR=$BASEDIR/titan.Libraries.TCCUsefulFunctions/src +FILES="TCCInterface_Functions.ttcn TCCConversion_Functions.ttcn TCCConversion.cc TCCInterface.cc TCCInterface_ip.h" +gen_links $DIR $FILES + +DIR=$BASEDIR/titan.TestPorts.Common_Components.Socket-API/src +FILES="Socket_API_Definitions.ttcn" +gen_links $DIR $FILES + +# Required by MGCP and IPA +DIR=$BASEDIR/titan.TestPorts.IPL4asp/src +FILES="IPL4asp_Functions.ttcn IPL4asp_PT.cc IPL4asp_PT.hh IPL4asp_PortType.ttcn IPL4asp_Types.ttcn IPL4asp_discovery.cc IPL4asp_protocol_L234.hh" +gen_links $DIR $FILES + +DIR=$BASEDIR/titan.ProtocolModules.SDP/src +FILES="SDP_EncDec.cc SDP_Types.ttcn SDP_parse_.tab.c SDP_parse_.tab.h SDP_parse_parser.h SDP_parser.l +SDP_parser.y lex.SDP_parse_.c" +gen_links $DIR $FILES + +DIR=$BASEDIR/titan.ProtocolModules.RTP/src +FILES="RTP_EncDec.cc RTP_Types.ttcn" +gen_links $DIR $FILES + +DIR=$BASEDIR/titan.TestPorts.SIPmsg/src +FILES="SIP_parse.h SIP_parse.y SIP_parse_.tab.h SIPmsg_PT.hh SIPmsg_Types.ttcn SIP_parse.l SIP_parse_.tab.c SIPmsg_PT.cc SIPmsg_PortType.ttcn lex.SIP_parse_.c" +gen_links $DIR $FILES + +DIR=../library +FILES="Misc_Helpers.ttcn General_Types.ttcn GSM_Types.ttcn Osmocom_Types.ttcn Native_Functions.ttcn Native_FunctionDefs.cc " +FILES+="RTP_CodecPort.ttcn RTP_CodecPort_CtrlFunctDef.cc " +FILES+="SDP_Templates.ttcn " +FILES+="SIP_Emulation.ttcn SIP_Templates.ttcn " +gen_links $DIR $FILES + +ignore_pp_results diff --git a/asterisk/regen_makefile.sh b/asterisk/regen_makefile.sh new file mode 100755 index 0000000..3995b3d --- /dev/null +++ b/asterisk/regen_makefile.sh @@ -0,0 +1,19 @@ +#!/bin/sh + +NAME=Asterisk_Tests + +FILES=" + *.c + *.ttcn + IPL4asp_PT.cc + IPL4asp_discovery.cc + Native_FunctionDefs.cc + RTP_CodecPort_CtrlFunctDef.cc + RTP_EncDec.cc + SDP_EncDec.cc + SIPmsg_PT.cc + TCCConversion.cc + TCCInterface.cc +" + +../regen-makefile.sh -e $NAME $FILES diff --git a/library/SIP_Emulation.ttcn b/library/SIP_Emulation.ttcn index e71c611..41e6975 100644 --- a/library/SIP_Emulation.ttcn +++ b/library/SIP_Emulation.ttcn @@ -72,6 +72,13 @@ sipVersion := ? } +private template PDU_SIP_Request tr_SIP_REGISTER := { + requestLine := tr_ReqLine(REGISTER_E), + msgHeader := t_SIP_msgHeader_any, + messageBody := *, + payload := * +} + private template PDU_SIP_Request tr_SIP_INVITE := { requestLine := tr_ReqLine(INVITE_E), msgHeader := t_SIP_msgHeader_any, @@ -79,7 +86,6 @@ payload := * } - template SipUrl tr_SIP_Url(template charstring user_or_num, template charstring host := *, template integer portField := *) := { @@ -286,6 +292,19 @@ } } + /* a ConnHdlr is sending us a SIP REGISTER: Forward to SIP port */ + [] CLIENT.receive(tr_SIP_REGISTER) -> value sip_req sender vc_conn { + var CallidString call_id := sip_req.msgHeader.callId.callid; + if (f_call_id_known(call_id)) { + /* re-register */ + vc_conn := f_comp_by_call_id(call_id); + } else { + /* new REGISTER: add to table */ + f_call_table_add(vc_conn, call_id); + } + SIP.send(sip_req); + } + /* a ConnHdlr is sending us a SIP INVITE: Forward to SIP port */ [] CLIENT.receive(tr_SIP_INVITE) -> value sip_req sender vc_conn { var CallidString call_id := sip_req.msgHeader.callId.callid; diff --git a/library/SIP_Templates.ttcn b/library/SIP_Templates.ttcn index f48d137..7b5e94f 100644 --- a/library/SIP_Templates.ttcn +++ b/library/SIP_Templates.ttcn @@ -525,6 +525,26 @@ payload := omit } +/* Expect during first REGISTER when authorization is requried: */ +template (present) PDU_SIP_Response +tr_SIP_Response_REGISTER_Unauthorized( + template CallidString call_id, + template SipAddr from_addr, + template SipAddr to_addr, + template (present) Via via := tr_Via_from(?), + template Contact contact := *, + template integer seq_nr := ?, + template charstring method := "REGISTER", + template integer status_code := 401, + template charstring reason := "Unauthorized", + template charstring body := *) := { + statusLine := tr_SIP_StatusLine(status_code, reason), + msgHeader := tr_SIP_msgh_std(call_id, from_addr, to_addr, contact, + via, + method, *, seq_nr), + messageBody := body, + payload := omit +} /* RFC 3261 8.1.1.5: * "The sequence number value MUST be expressible as a 32-bit unsigned integer -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36490?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: I66f776d5df6fb5dc488d9e589b84a6b2385406e8 Gerrit-Change-Number: 36490 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 month

1
0
0 0

2024

2023

2022

gerrit-log March 2024