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

[S] Change in docker-playground[master]: ttcn3-docker-run.sh: Fix dumpcap failing to access /data inside docker

by Hoernchen

Attention is currently required from: laforge, osmith, pespin. Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36836?usp=email ) Change subject: ttcn3-docker-run.sh: Fix dumpcap failing to access /data inside docker ...................................................................... Patch Set 2: Code-Review+1 (1 comment) Patchset: PS2: I guess this is the obvious fix without messing with the id mappings and making everything even more complicated., -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36836?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: I1229a91cdbb1aa73fd94f1bf7e26f34086f06b25 Gerrit-Change-Number: 36836 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 15 May 2024 18:57:48 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

9 minutes

1
0
0 0

[S] Change in docker-playground[master]: ttcn3-docker-run.sh: Fix dumpcap failing to access /data inside docker

by pespin

Attention is currently required from: Hoernchen, laforge, osmith. Hello Hoernchen, Jenkins Builder, laforge, osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/docker-playground/+/36836?usp=email to look at the new patch set (#2). Change subject: ttcn3-docker-run.sh: Fix dumpcap failing to access /data inside docker ...................................................................... ttcn3-docker-run.sh: Fix dumpcap failing to access /data inside docker In docker, the /data dir is mapped to $VOL_BASE_DIR, which is created by docker-playground.git jenkins-common.sh, hence as the user running jenkins.sh in the host system. As a result, when the dir is mapped to /data, inside the container it will have the UID:GID of the outter user, not the one inside docker. Before this patch, if a ttcn3 container was started in jenkins.sh with --cap-add=NET_ADMIN, then osmo-ttcn3-hacks.git/ttcn3-tcpdump-start.sh would select dumpcap instead of tcpdump, to attempt to record a pcap file to /data/$testcase.pcap. Due to some unknown way of dropping privileges done by dumpcap though, it was unable to open the /data/$testcase.pcap due to /data being owned to another user (tcpdump doesn't have this problem). This patch fixes the above scenario by making sure /data is chowned to the user running stuff inside docker. This is already kinda expected since there's a fix_perms() script in jenkins-common.sh reverting files created during the test so that they can be accessible by outter user once everything is finished. Change-Id: I1229a91cdbb1aa73fd94f1bf7e26f34086f06b25 --- M common/ttcn3-docker-run.sh 1 file changed, 32 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/36/36836/2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36836?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: I1229a91cdbb1aa73fd94f1bf7e26f34086f06b25 Gerrit-Change-Number: 36836 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

41 minutes

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: asterisk: Initial IMS registration

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36759?usp=email ) Change subject: asterisk: Initial IMS registration ...................................................................... Patch Set 5: (1 comment) File library/SIP_Templates.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36759/comment/e0e6c57f_bccb… PS4, Line 904: Unauthozied > Unauthorized Done -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36759?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: Idb3b19ccd82cad25948106b2c72aa424d7f79cd8 Gerrit-Change-Number: 36759 Gerrit-PatchSet: 5 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 15 May 2024 18:23:31 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: comment

43 minutes

1
0
0 0

[S] Change in docker-playground[master]: ttcn3-docker-run.sh: Fix dumpcap failing to access /data inside docker

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/36836?usp=email ) Change subject: ttcn3-docker-run.sh: Fix dumpcap failing to access /data inside docker ...................................................................... ttcn3-docker-run.sh: Fix dumpcap failing to access /data inside docker In docker, the /data dir is mapped to $VOL_BASE_DIR, which is created by docker-playground.git jenkins-common.sh, hence as the user running jenkins.sh in the host system. As a result, when the dir is mapped to /data, inside the container it will have the UID:GID of the outter user, not the one inside docker. Before this patch, if a ttcn3 container was started in jenkins.sh with --cap-add=NET_ADMIN, then osmo-ttcn3-hacks.git/ttcn3-tcpdump-start.sh would select dumpcap instead of tcpdump, to attempt to record a pcap file to /data/$testcase.pcap. Due to some unknown way of dropping privileges done by dumpcap though, it was unable to open the /data/$testcase.pcap due to /data being owned to another user (tcpdump doesn't have this problem). This patch fixes the above scenario by making dure /data is chowned to the user running stuff inside docker. This is already kinda expected since there's a fix_perms() script in jenkins-common.sh reverting files created during the test so that they can be accessible by outter user once everything is finished. Change-Id: I1229a91cdbb1aa73fd94f1bf7e26f34086f06b25 --- M common/ttcn3-docker-run.sh 1 file changed, 32 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/36/36836/1 diff --git a/common/ttcn3-docker-run.sh b/common/ttcn3-docker-run.sh index c8c871e..60339c4 100755 --- a/common/ttcn3-docker-run.sh +++ b/common/ttcn3-docker-run.sh @@ -31,6 +31,9 @@ done fi +# Make sure /data is owned to the user running inside docker. +# jenkins-commons.sh fix_perms() will fix back the permissions once done. +chown -R "$(id -u):$(id -g)" /data cd /data # Use TEST_NAME to only run one test instead of all. Set it like this: -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36836?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: I1229a91cdbb1aa73fd94f1bf7e26f34086f06b25 Gerrit-Change-Number: 36836 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

49 minutes

1
0
0 0

[M] Change in osmo-pcu[master]: contrib/systemd: run as osmocom user

by laforge

Attention is currently required from: osmith, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/36828?usp=email ) Change subject: contrib/systemd: run as osmocom user ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/36828?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I362a9e55309033c42b16f12321f8d1aa27da7b59 Gerrit-Change-Number: 36828 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 15 May 2024 15:53:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 hours, 13 minutes

1
0
0 0

[M] Change in osmo-bts[master]: contrib/systemd: run as osmocom user

by laforge

Attention is currently required from: msuraev, osmith, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/30133?usp=email ) Change subject: contrib/systemd: run as osmocom user ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/30133?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: I37be0dd4df012047a495235195912bd06ad2423d Gerrit-Change-Number: 30133 Gerrit-PatchSet: 3 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Wed, 15 May 2024 15:52:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 hours, 14 minutes

1
0
0 0

[S] Change in osmo-ci[master]: jobs/ttcn3: run ttcn3-msc-test earlier

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/36834?usp=email ) Change subject: jobs/ttcn3: run ttcn3-msc-test earlier ...................................................................... jobs/ttcn3: run ttcn3-msc-test earlier It seems like various tests are failing from time to time due to the builder having a too high load. As several ttcn3 testsuites run around 4 am already, move ttcn3-msc-test to 1 hour earlier where we don't have anything currently. Change-Id: I8eaf058f13f4175a458e9abe544bfb21ace481b7 --- M jobs/README.adoc M jobs/ttcn3-testsuites.yml 2 files changed, 17 insertions(+), 3 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/jobs/README.adoc b/jobs/README.adoc index eb14152..d403bff 100644 --- a/jobs/README.adoc +++ b/jobs/README.adoc @@ -139,7 +139,7 @@ 02:XX registry-triggers 02:XX registry-rebuild-upload-fpga-build (weekly) - 04:00 - 18:00 Jobs that need binary packages + 03:00 - 18:00 Jobs that need binary packages ttcn3-testsuites 04:XX osmocom-release-manuals 05:XX osmocom-release-tarballs diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml index ac79f4d..f436e26 100644 --- a/jobs/ttcn3-testsuites.yml +++ b/jobs/ttcn3-testsuites.yml @@ -20,6 +20,8 @@ # timer: 10 per hour from 04:00 - 18:00, see jobs/README.adoc job-name: # debian nightly - order by time + - ttcn3-msc-test: + timer: H 03 * * * - nplab-m3ua-test: timer: H 04 * * * - nplab-sua-test: @@ -67,8 +69,6 @@ description: | Test open5gs-smfd + open5gs-upfd main. email: jenkins-notifications(a)lists.osmocom.org acetcom(a)gmail.com - - ttcn3-msc-test: - timer: H 04 * * * - ttcn3-pcu-test: timer: H 04 * * * - ttcn3-pcu-test-sns: -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/36834?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: I8eaf058f13f4175a458e9abe544bfb21ace481b7 Gerrit-Change-Number: 36834 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 hours, 14 minutes

1
0
0 0

[S] Change in osmo-ci[master]: jobs/ttcn3: run ttcn3-msc-test earlier

by laforge

Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/36834?usp=email ) Change subject: jobs/ttcn3: run ttcn3-msc-test earlier ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/36834?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: I8eaf058f13f4175a458e9abe544bfb21ace481b7 Gerrit-Change-Number: 36834 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 15 May 2024 15:52:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 hours, 14 minutes

1
0
0 0

[S] Change in osmo-remsim[master]: user_ifdhandler: Fix segfault on startup

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/36835?usp=email ) Change subject: user_ifdhandler: Fix segfault on startup ...................................................................... user_ifdhandler: Fix segfault on startup Change-Id: I6e839b7772a9b176b972c5c0a01bb352a7a68923 --- M src/client/user_ifdhandler.c 1 file changed, 10 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/client/user_ifdhandler.c b/src/client/user_ifdhandler.c index c6a9392..7435832 100644 --- a/src/client/user_ifdhandler.c +++ b/src/client/user_ifdhandler.c @@ -372,9 +372,9 @@ if (gethostname(hostname, sizeof(hostname)) < 0) OSMO_STRLCPY_ARRAY(hostname, "unknown"); - osmo_select_init(); rc = osmo_ctx_init("client"); OSMO_ASSERT(rc == 0); + osmo_select_init(); ct = talloc_zero(OTC_GLOBAL, struct client_thread); OSMO_ASSERT(ct); -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/36835?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I6e839b7772a9b176b972c5c0a01bb352a7a68923 Gerrit-Change-Number: 36835 Gerrit-PatchSet: 3 Gerrit-Owner: Joey Berkovitz <joey(a)berkovitz.us> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

3 hours, 15 minutes

1
0
0 0

[S] Change in osmo-remsim[master]: user_ifdhandler: Fix segfault on startup

by laforge

Attention is currently required from: Joey Berkovitz. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/36835?usp=email ) Change subject: user_ifdhandler: Fix segfault on startup ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/36835?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I6e839b7772a9b176b972c5c0a01bb352a7a68923 Gerrit-Change-Number: 36835 Gerrit-PatchSet: 3 Gerrit-Owner: Joey Berkovitz <joey(a)berkovitz.us> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: Joey Berkovitz <joey(a)berkovitz.us> Gerrit-Comment-Date: Wed, 15 May 2024 15:51:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 hours, 15 minutes

1
0
0 0

[M] Change in osmo-hnbgw[master]: KPI: Add initial set of DTAP message type rate counters

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36788?usp=email ) Change subject: KPI: Add initial set of DTAP message type rate counters ...................................................................... KPI: Add initial set of DTAP message type rate counters From an operational perspective, it may be interesting to know how many LU/RAU/Attach attempts, rejects and accepts are happening in a given hNodeB. Let's add some common infrastructure for DTAP related statistics as well as some initial counters. Related: SYS#6885 Depends: osmo-iuh.git Change-Id I7dea74102da8b610ff2a310c5814f5c89f08e7a6 Change-Id: I3e1ad7a2aa71674a22a27c31512600f2de139032 --- M TODO-RELEASE M include/osmocom/hnbgw/hnbgw.h M include/osmocom/hnbgw/kpi.h M src/osmo-hnbgw/Makefile.am M src/osmo-hnbgw/context_map_rua.c M src/osmo-hnbgw/hnbgw.c A src/osmo-hnbgw/kpi_dtap.c M src/osmo-hnbgw/kpi_ranap.c 8 files changed, 197 insertions(+), 3 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/TODO-RELEASE b/TODO-RELEASE index a80e188..b0ad6a0 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -11,3 +11,4 @@ MGW MGCP CRCX osmo-hnbgw used to CRCX in loopback mode, to trigger a legacy IuUP hack. CRCX is no longer in loopback mode now, so older osmo-mgw may fail to respond to IuUP Initialization. +osmo-iuh >1.5.1 decoding of more RANAP procedures in ranap_common required for DTAP rate_counters diff --git a/include/osmocom/hnbgw/hnbgw.h b/include/osmocom/hnbgw/hnbgw.h index 8daf713..dc046a0 100644 --- a/include/osmocom/hnbgw/hnbgw.h +++ b/include/osmocom/hnbgw/hnbgw.h @@ -136,6 +136,18 @@ HNB_CTR_CS_PAGING_ATTEMPTED, HNB_CTR_RAB_ACTIVE_MILLISECONDS_TOTAL, + + HNB_CTR_DTAP_CS_LU_REQ, + HNB_CTR_DTAP_CS_LU_ACC, + HNB_CTR_DTAP_CS_LU_REJ, + + HNB_CTR_DTAP_PS_ATT_REQ, + HNB_CTR_DTAP_PS_ATT_ACK, + HNB_CTR_DTAP_PS_ATT_REJ, + + HNB_CTR_DTAP_PS_RAU_REQ, + HNB_CTR_DTAP_PS_RAU_ACK, + HNB_CTR_DTAP_PS_RAU_REJ, }; enum hnb_stat { diff --git a/include/osmocom/hnbgw/kpi.h b/include/osmocom/hnbgw/kpi.h index 63f3477..2a13972 100644 --- a/include/osmocom/hnbgw/kpi.h +++ b/include/osmocom/hnbgw/kpi.h @@ -6,3 +6,6 @@ void kpi_ranap_process_ul(struct hnbgw_context_map *map, ranap_message *ranap); void kpi_ranap_process_dl(struct hnbgw_context_map *map, ranap_message *ranap); + +void kpi_dtap_process_ul(struct hnbgw_context_map *map, const uint8_t *buf, unsigned int len, uint8_t sapi); +void kpi_dtap_process_dl(struct hnbgw_context_map *map, const uint8_t *buf, unsigned int len, uint8_t sapi); diff --git a/src/osmo-hnbgw/Makefile.am b/src/osmo-hnbgw/Makefile.am index 0727f30..9dffabf 100644 --- a/src/osmo-hnbgw/Makefile.am +++ b/src/osmo-hnbgw/Makefile.am @@ -44,6 +44,7 @@ cnlink.c \ ranap_rab_ass.c \ mgw_fsm.c \ + kpi_dtap.c \ kpi_ranap.c \ tdefs.c \ $(NULL) diff --git a/src/osmo-hnbgw/context_map_rua.c b/src/osmo-hnbgw/context_map_rua.c index f37ded8..d5b2cb7 100644 --- a/src/osmo-hnbgw/context_map_rua.c +++ b/src/osmo-hnbgw/context_map_rua.c @@ -220,10 +220,9 @@ switch (event) { case MAP_RUA_EV_RX_CONNECT: + /* not needed for RAB assignment scanning, but for KPI scanning */ + handle_rx_rua(fi, ranap_msg); map_rua_fsm_state_chg(MAP_RUA_ST_CONNECTED); - /* The Connect will never be a RAB Assignment response, so no need for handle_rx_rua() (which decodes - * the RANAP message to detect a RAB Assignment response). Just forward to SCCP as is. */ - map_sccp_dispatch(map, MAP_SCCP_EV_TX_DATA_REQUEST, ranap_msg); return; case MAP_RUA_EV_RX_DISCONNECT: diff --git a/src/osmo-hnbgw/hnbgw.c b/src/osmo-hnbgw/hnbgw.c index fe29c29..24d11a5 100644 --- a/src/osmo-hnbgw/hnbgw.c +++ b/src/osmo-hnbgw/hnbgw.c @@ -464,6 +464,18 @@ [HNB_CTR_RAB_ACTIVE_MILLISECONDS_TOTAL] = { "rab:cs:active_milliseconds:total", "Cumulative number of milliseconds of CS RAB activity" }, + + [HNB_CTR_DTAP_CS_LU_REQ] = { "dtap:cs:location_update:req", "CS Location Update Requests" }, + [HNB_CTR_DTAP_CS_LU_ACC] = { "dtap:cs:location_update:accept", "CS Location Update Accepts" }, + [HNB_CTR_DTAP_CS_LU_REJ] = { "dtap:cs:location_update:reject", "CS Location Update Rejects" }, + + [HNB_CTR_DTAP_PS_ATT_REQ] = { "dtap:ps:attach:req", "PS Attach Requests" }, + [HNB_CTR_DTAP_PS_ATT_ACK] = { "dtap:ps:attach:accept", "PS Attach Accepts" }, + [HNB_CTR_DTAP_PS_ATT_REJ] = { "dtap:ps:attach:reject", "PS Attach Rejects" }, + + [HNB_CTR_DTAP_PS_RAU_REQ] = { "dtap:ps:routing_area_update:req", "PS Routing Area Update Requests" }, + [HNB_CTR_DTAP_PS_RAU_ACK] = { "dtap:ps:routing_area_update:accept", "PS Routing Area Update Accepts" }, + [HNB_CTR_DTAP_PS_RAU_REJ] = { "dtap:ps:routing_area_update:reject", "PS Routing Area Update Rejects" }, }; const struct rate_ctr_group_desc hnb_ctrg_desc = { diff --git a/src/osmo-hnbgw/kpi_dtap.c b/src/osmo-hnbgw/kpi_dtap.c new file mode 100644 index 0000000..8d47208 --- /dev/null +++ b/src/osmo-hnbgw/kpi_dtap.c @@ -0,0 +1,111 @@ +/* KPI (statistics, counters) at DTAP level */ +/* (C) 2024 by Harald Welte <laforge(a)osmocom.org> + * All Rights Reserved + * + * SPDX-License-Identifier: AGPL-3.0+ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#include "config.h" + +#include <osmocom/core/utils.h> + +#include <osmocom/ranap/ranap_common_ran.h> +#include <osmocom/gsm/protocol/gsm_04_08.h> +#include <osmocom/gsm/protocol/gsm_04_08_gprs.h> + +#include <osmocom/hnbgw/hnbgw.h> +#include <osmocom/hnbgw/context_map.h> +#include <osmocom/hnbgw/kpi.h> + +/*********************************************************************** + * DOWNLINK messages + ***********************************************************************/ + +void kpi_dtap_process_dl(struct hnbgw_context_map *map, const uint8_t *buf, unsigned int len, + uint8_t sapi) +{ + struct hnb_persistent *hnbp = map->hnb_ctx->persistent; + const struct gsm48_hdr *gh = (const struct gsm48_hdr *)buf; + if (len < sizeof(*gh)) + return; + + /* if you make use of any data beyond the fixed-size gsm48_hdr, you must make sure the underlying + * buffer length is actually long enough! */ + + if (map->is_ps) { + /* Packet Switched Domain (from SGSN) */ + switch (gsm48_hdr_msg_type(gh)) { + case GSM48_MT_GMM_ATTACH_ACK: + HNBP_CTR_INC(hnbp, HNB_CTR_DTAP_PS_ATT_ACK); + break; + case GSM48_MT_GMM_ATTACH_REJ: + HNBP_CTR_INC(hnbp, HNB_CTR_DTAP_PS_ATT_REJ); + break; + case GSM48_MT_GMM_RA_UPD_ACK: + HNBP_CTR_INC(hnbp, HNB_CTR_DTAP_PS_RAU_ACK); + break; + case GSM48_MT_GMM_RA_UPD_REJ: + HNBP_CTR_INC(hnbp, HNB_CTR_DTAP_PS_RAU_REJ); + break; + } + } else { + /* Circuit Switched Domain (from MSC) */ + switch (gsm48_hdr_msg_type(gh)) { + case GSM48_MT_MM_LOC_UPD_ACCEPT: + /* FIXME: many LU are acknwoeldged implicitly with TMSI allocation */ + HNBP_CTR_INC(hnbp, HNB_CTR_DTAP_CS_LU_ACC); + break; + case GSM48_MT_MM_LOC_UPD_REJECT: + HNBP_CTR_INC(hnbp, HNB_CTR_DTAP_CS_LU_REJ); + break; + } + } +} + +/*********************************************************************** + * UPLINK messages + ***********************************************************************/ + +void kpi_dtap_process_ul(struct hnbgw_context_map *map, const uint8_t *buf, unsigned int len, + uint8_t sapi) +{ + struct hnb_persistent *hnbp = map->hnb_ctx->persistent; + const struct gsm48_hdr *gh = (const struct gsm48_hdr *)buf; + if (len < sizeof(*gh)) + return; + + /* if you make use of any data beyond the fixed-size gsm48_hdr, you must make sure the underlying + * buffer length is actually long enough! */ + + if (map->is_ps) { + /* Packet Switched Domain (to SGSN) */ + switch (gsm48_hdr_msg_type(gh)) { + case GSM48_MT_GMM_ATTACH_REQ: + HNBP_CTR_INC(hnbp, HNB_CTR_DTAP_PS_ATT_REQ); + break; + case GSM48_MT_GMM_RA_UPD_REQ: + HNBP_CTR_INC(hnbp, HNB_CTR_DTAP_PS_RAU_REQ); + break; + } + } else { + /* Circuit Switched Domain (to MSC) */ + switch (gsm48_hdr_msg_type(gh)) { + case GSM48_MT_MM_LOC_UPD_REQUEST: + HNBP_CTR_INC(hnbp, HNB_CTR_DTAP_CS_LU_REQ); + break; + } + } +} diff --git a/src/osmo-hnbgw/kpi_ranap.c b/src/osmo-hnbgw/kpi_ranap.c index c4460ff..59631cf 100644 --- a/src/osmo-hnbgw/kpi_ranap.c +++ b/src/osmo-hnbgw/kpi_ranap.c @@ -165,6 +165,18 @@ } } +static void kpi_ranap_process_dl_direct_transfer(struct hnbgw_context_map *map, ranap_message *ranap) +{ + const RANAP_DirectTransferIEs_t *dt_ies = &ranap->msg.directTransferIEs; + uint8_t sapi = 0; + + if (dt_ies->presenceMask & DIRECTTRANSFERIES_RANAP_SAPI_PRESENT) { + if (dt_ies->sapi == RANAP_SAPI_sapi_3) + sapi = 3; + } + kpi_dtap_process_dl(map, dt_ies->nas_pdu.buf, dt_ies->nas_pdu.size, sapi); +} + void kpi_ranap_process_dl(struct hnbgw_context_map *map, ranap_message *ranap) { switch (ranap->procedureCode) { @@ -174,6 +186,9 @@ case RANAP_ProcedureCode_id_Iu_Release: kpi_ranap_process_dl_iu_rel_cmd(map, ranap); /* IU RELEASE CMD (8.5) */ break; + case RANAP_ProcedureCode_id_DirectTransfer: + kpi_ranap_process_dl_direct_transfer(map, ranap); + break; default: break; } @@ -370,6 +385,24 @@ } } +static void kpi_ranap_process_ul_initial_ue(struct hnbgw_context_map *map, ranap_message *ranap) +{ + const RANAP_InitialUE_MessageIEs_t *iue_ies = &ranap->msg.initialUE_MessageIEs; + kpi_dtap_process_ul(map, iue_ies->nas_pdu.buf, iue_ies->nas_pdu.size, 0); +} + +static void kpi_ranap_process_ul_direct_transfer(struct hnbgw_context_map *map, ranap_message *ranap) +{ + const RANAP_DirectTransferIEs_t *dt_ies = &ranap->msg.directTransferIEs; + uint8_t sapi = 0; + + if (dt_ies->presenceMask & DIRECTTRANSFERIES_RANAP_SAPI_PRESENT) { + if (dt_ies->sapi == RANAP_SAPI_sapi_3) + sapi = 3; + } + kpi_dtap_process_ul(map, dt_ies->nas_pdu.buf, dt_ies->nas_pdu.size, sapi); +} + void kpi_ranap_process_ul(struct hnbgw_context_map *map, ranap_message *ranap) { switch (ranap->procedureCode) { @@ -382,6 +415,12 @@ * processing of the downlink Iu Release Command. It's not like the RNC/HNB has any way to * refuse the release anyway. */ break; + case RANAP_ProcedureCode_id_InitialUE_Message: + kpi_ranap_process_ul_initial_ue(map, ranap); + break; + case RANAP_ProcedureCode_id_DirectTransfer: + kpi_ranap_process_ul_direct_transfer(map, ranap); + break; default: break; } -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36788?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: I3e1ad7a2aa71674a22a27c31512600f2de139032 Gerrit-Change-Number: 36788 Gerrit-PatchSet: 5 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 hours, 29 minutes

1
0
0 0

[M] Change in osmo-hnbgw[master]: KPI: Add initial set of DTAP message type rate counters

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36788?usp=email ) Change subject: KPI: Add initial set of DTAP message type rate counters ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36788?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: I3e1ad7a2aa71674a22a27c31512600f2de139032 Gerrit-Change-Number: 36788 Gerrit-PatchSet: 4 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 15 May 2024 15:37:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 hours, 29 minutes

1
0
0 0

[L] Change in osmo-iuh[master]: ranap_common: Implement support for missing procedures

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/36787?usp=email ) Change subject: ranap_common: Implement support for missing procedures ...................................................................... ranap_common: Implement support for missing procedures Both the RAN and the CN side of ranap_common were missing support for decoding requests and/or responses for a number of RANAP procedures. This patch adds all of them a of TS 25.413 Release 12 except those related to MBMS or SRVCC. Related: SYS#6885 Change-Id: I7dea74102da8b610ff2a310c5814f5c89f08e7a6 --- M src/ranap_common_cn.c M src/ranap_common_ran.c 2 files changed, 284 insertions(+), 25 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved tnt: Looks good to me, but someone else must approve diff --git a/src/ranap_common_cn.c b/src/ranap_common_cn.c index 56ac4e8..72698a4 100644 --- a/src/ranap_common_cn.c +++ b/src/ranap_common_cn.c @@ -72,6 +72,20 @@ /* FIXME this is not a message received by CN (used by hnb-test) */ rc = ranap_decode_iu_releasecommandies(&message->msg.iu_ReleaseCommandIEs, &imsg->value); break; + case RANAP_ProcedureCode_id_RelocationPreparation: /* RELOCATION REQUIRED */ + rc = ranap_decode_relocationrequiredies(&message->msg.relocationRequiredIEs, &imsg->value); + break; + //case RANAP_ProcedureCode_id_RelocationDetect: /* TODO: no member in ranap_message */ + //case RANAP_ProcedureCode_id_RelocationComplete: /* TODO: no member in ranap_message */ + case RANAP_ProcedureCode_id_RelocationCancel: + rc = ranap_decode_relocationcancelies(&message->msg.relocationCancelIEs, &imsg->value); + break; + case RANAP_ProcedureCode_id_ForwardSRNS_Context: + rc = ranap_decode_forwardsrns_contexties(&message->msg.forwardSRNS_ContextIEs, &imsg->value); + break; + case RANAP_ProcedureCode_id_LocationReport: + rc = ranap_decode_locationreporties(&message->msg.locationReportIEs, &imsg->value); + break; default: LOGP(DRANAP, LOGL_INFO, "Received RANAP Procedure %s (CO, IM) from RNC. Decode not implemented\n", @@ -116,6 +130,20 @@ /* FIXME this is not a message received by CN (used by hnb-test) */ ranap_free_iu_releasecommandies(&message->msg.iu_ReleaseCommandIEs); break; + case RANAP_ProcedureCode_id_RelocationPreparation: /* RELOCATION REQUIRED */ + ranap_free_relocationrequiredies(&message->msg.relocationRequiredIEs); + break; + //case RANAP_ProcedureCode_id_RelocationDetect: /* TODO: no member in ranap_message */ + //case RANAP_ProcedureCode_id_RelocationComplete: /* TODO: no member in ranap_message */ + case RANAP_ProcedureCode_id_RelocationCancel: + ranap_free_relocationcancelies(&message->msg.relocationCancelIEs); + break; + case RANAP_ProcedureCode_id_ForwardSRNS_Context: + ranap_free_forwardsrns_contexties(&message->msg.forwardSRNS_ContextIEs); + break; + case RANAP_ProcedureCode_id_LocationReport: + ranap_free_locationreporties(&message->msg.locationReportIEs); + break; default: LOGP(DRANAP, LOGL_INFO, "Freeing RANAP Procedure %s (CO, IM) from RNC not implemented\n", @@ -139,13 +167,25 @@ /* RAB assignment response */ rc = ranap_decode_rab_assignmentresponseies(&message->msg.raB_AssignmentResponseIEs, &imsg->value); break; + case RANAP_ProcedureCode_id_Iu_Release: + /* Iu release Complete; confirmation of CN-initiated release */ + rc = ranap_decode_iu_releasecompleteies(&message->msg.iu_ReleaseCompleteIEs, &imsg->value); + break; + case RANAP_ProcedureCode_id_RelocationResourceAllocation: + rc = ranap_decode_relocationrequestacknowledgeies(&message->msg.relocationRequestAcknowledgeIEs, &imsg->value); + break; + case RANAP_ProcedureCode_id_SRNS_ContextTransfer: + rc = ranap_decode_srns_contextresponseies(&message->msg.srnS_ContextResponseIEs, &imsg->value); + break; case RANAP_ProcedureCode_id_SecurityModeControl: /* Security Mode Complete */ rc = ranap_decode_securitymodecompleteies(&message->msg.securityModeCompleteIEs, &imsg->value); break; - case RANAP_ProcedureCode_id_Iu_Release: - /* Iu release Complete; confirmation of CN-initiated release */ - rc = ranap_decode_iu_releasecompleteies(&message->msg.iu_ReleaseCompleteIEs, &imsg->value); + case RANAP_ProcedureCode_id_DataVolumeReport: + rc = ranap_decode_datavolumereporties(&message->msg.dataVolumeReportIEs, &imsg->value); + break; + case RANAP_ProcedureCode_id_LocationRelatedData: + rc = ranap_decode_locationrelateddataresponseies(&message->msg.locationRelatedDataResponseIEs, &imsg->value); break; default: LOGP(DRANAP, LOGL_INFO, @@ -165,13 +205,25 @@ /* RAB assignment response */ ranap_free_rab_assignmentresponseies(&message->msg.raB_AssignmentResponseIEs); break; + case RANAP_ProcedureCode_id_Iu_Release: + /* Iu release Complete; confirmation of CN-initiated release */ + ranap_free_iu_releasecompleteies(&message->msg.iu_ReleaseCompleteIEs); + break; + case RANAP_ProcedureCode_id_RelocationResourceAllocation: + ranap_free_relocationrequestacknowledgeies(&message->msg.relocationRequestAcknowledgeIEs); + break; + case RANAP_ProcedureCode_id_SRNS_ContextTransfer: + ranap_free_srns_contextresponseies(&message->msg.srnS_ContextResponseIEs); + break; case RANAP_ProcedureCode_id_SecurityModeControl: /* Security Mode Complete */ ranap_free_securitymodecompleteies(&message->msg.securityModeCompleteIEs); break; - case RANAP_ProcedureCode_id_Iu_Release: - /* Iu release Complete; confirmation of CN-initiated release */ - ranap_free_iu_releasecompleteies(&message->msg.iu_ReleaseCompleteIEs); + case RANAP_ProcedureCode_id_DataVolumeReport: + ranap_free_datavolumereporties(&message->msg.dataVolumeReportIEs); + break; + case RANAP_ProcedureCode_id_LocationRelatedData: + ranap_free_locationrelateddataresponseies(&message->msg.locationRelatedDataResponseIEs); break; default: LOGP(DRANAP, LOGL_INFO, @@ -222,6 +274,55 @@ } } +static int cn_ranap_rx_unsuccessful_msg_co(RANAP_UnsuccessfulOutcome_t *imsg, ranap_message *message) +{ + int rc = 0; + + message->procedureCode = imsg->procedureCode; + message->criticality = imsg->criticality; + + DEBUGP(DRANAP, "Rx CO USO (%s)\n", get_value_string(ranap_procedure_code_vals, imsg->procedureCode)); + + switch (imsg->procedureCode) { + case RANAP_ProcedureCode_id_RelocationResourceAllocation: + rc = ranap_decode_relocationfailureies(&message->msg.relocationFailureIEs, &imsg->value); + break; + case RANAP_ProcedureCode_id_SecurityModeControl: + rc = ranap_decode_securitymoderejecties(&message->msg.securityModeRejectIEs, &imsg->value); + break; + case RANAP_ProcedureCode_id_LocationRelatedData: + rc = ranap_decode_locationrelateddatafailureies(&message->msg.locationRelatedDataFailureIEs, &imsg->value); + break; + default: + LOGP(DRANAP, LOGL_NOTICE, "Received unsupported RANAP " + "unsuccessful outcome procedure %s (CO) from RNC, ignoring\n", + get_value_string(ranap_procedure_code_vals, imsg->procedureCode)); + rc = -1; + break; + } + + return rc; +} + +static void cn_ranap_free_unsuccessful_msg_co(ranap_message *message) +{ + switch (message->procedureCode) { + case RANAP_ProcedureCode_id_RelocationResourceAllocation: + ranap_free_relocationfailureies(&message->msg.relocationFailureIEs); + break; + case RANAP_ProcedureCode_id_SecurityModeControl: + ranap_free_securitymoderejecties(&message->msg.securityModeRejectIEs); + break; + case RANAP_ProcedureCode_id_LocationRelatedData: + ranap_free_locationrelateddatafailureies(&message->msg.locationRelatedDataFailureIEs); + break; + default: + LOGP(DRANAP, LOGL_INFO, "Freeing RANAP unsuccessful outcome procedure %s (CO) from RNC " + "not implemented\n", get_value_string(ranap_procedure_code_vals, message->procedureCode)); + break; + } +} + static int _cn_ranap_rx_co(RANAP_RANAP_PDU_t *pdu, ranap_message *message) { int rc = 0; @@ -234,11 +335,7 @@ rc = cn_ranap_rx_successful_msg_co(&pdu->choice.successfulOutcome, message); break; case RANAP_RANAP_PDU_PR_unsuccessfulOutcome: - LOGP(DRANAP, LOGL_NOTICE, "Received unsupported RANAP " - "unsuccessful outcome procedure %s (CO) from RNC, ignoring\n", - get_value_string(ranap_procedure_code_vals, - pdu->choice.unsuccessfulOutcome.procedureCode)); - rc = -1; + rc = cn_ranap_rx_unsuccessful_msg_co(&pdu->choice.unsuccessfulOutcome, message); break; case RANAP_RANAP_PDU_PR_outcome: rc = cn_ranap_rx_outcome_msg_co(&pdu->choice.outcome, message); @@ -265,8 +362,7 @@ cn_ranap_free_successful_msg_co(message); break; case RANAP_RANAP_PDU_PR_unsuccessfulOutcome: - LOGP(DRANAP, LOGL_INFO, - "Freeing RANAP unsuccessful outcome procedure (CO) from RNC not implemented\n"); + cn_ranap_free_unsuccessful_msg_co(message); break; case RANAP_RANAP_PDU_PR_outcome: cn_ranap_free_outcome_msg_co(message); diff --git a/src/ranap_common_ran.c b/src/ranap_common_ran.c index 0bf3796..048a5df 100644 --- a/src/ranap_common_ran.c +++ b/src/ranap_common_ran.c @@ -46,9 +46,48 @@ case RANAP_ProcedureCode_id_RAB_Assignment: rc = ranap_decode_rab_assignmentrequesties(&message->msg.raB_AssignmentRequestIEs, &imsg->value); break; + case RANAP_ProcedureCode_id_DirectTransfer: + rc = ranap_decode_directtransferies(&message->msg.directTransferIEs, &imsg->value); + break; + case RANAP_ProcedureCode_id_ErrorIndication: + rc = ranap_decode_errorindicationies(&message->msg.errorIndicationIEs, &imsg->value); + break; case RANAP_ProcedureCode_id_Iu_Release: rc = ranap_decode_iu_releasecommandies(&message->msg.iu_ReleaseCommandIEs, &imsg->value); break; + case RANAP_ProcedureCode_id_RelocationResourceAllocation: + rc = ranap_decode_relocationrequesties(&message->msg.relocationRequestIEs, &imsg->value); + break; + case RANAP_ProcedureCode_id_SRNS_ContextTransfer: + rc = ranap_decode_srns_contextrequesties(&message->msg.srnS_ContextRequestIEs, &imsg->value); + break; + case RANAP_ProcedureCode_id_SRNS_DataForward: + rc = ranap_decode_srns_dataforwardcommandies(&message->msg.srnS_DataForwardCommandIEs, &imsg->value); + break; + case RANAP_ProcedureCode_id_ForwardSRNS_Context: + rc = ranap_decode_forwardsrns_contexties(&message->msg.forwardSRNS_ContextIEs, &imsg->value); + break; + case RANAP_ProcedureCode_id_CommonID: + rc = ranap_decode_commonid_ies(&message->msg.commonID_IEs, &imsg->value); + break; + case RANAP_ProcedureCode_id_CN_InvokeTrace: + rc = ranap_decode_cn_invoketraceies(&message->msg.cN_InvokeTraceIEs, &imsg->value); + break; + case RANAP_ProcedureCode_id_SecurityModeControl: + rc = ranap_decode_securitymodecommandies(&message->msg.securityModeCommandIEs, &imsg->value); + break; + case RANAP_ProcedureCode_id_LocationReportingControl: + rc = ranap_decode_locationreportingcontrolies(&message->msg.locationReportingControlIEs, &imsg->value); + break; + case RANAP_ProcedureCode_id_DataVolumeReport: + rc = ranap_decode_datavolumereportrequesties(&message->msg.dataVolumeReportRequestIEs, &imsg->value); + break; + case RANAP_ProcedureCode_id_CN_DeactivateTrace: + rc = ranap_decode_cn_deactivatetraceies(&message->msg.cN_DeactivateTraceIEs, &imsg->value); + break; + case RANAP_ProcedureCode_id_LocationRelatedData: + rc = ranap_decode_locationrelateddatarequesties(&message->msg.locationRelatedDataRequestIEs, &imsg->value); + break; default: LOGP(DRANAP, LOGL_INFO, "Received RANAP Procedure %s (CO, IM) from CN. Decode not implemented\n", @@ -66,9 +105,48 @@ case RANAP_ProcedureCode_id_RAB_Assignment: ranap_free_rab_assignmentrequesties(&message->msg.raB_AssignmentRequestIEs); break; + case RANAP_ProcedureCode_id_DirectTransfer: + ranap_free_directtransferies(&message->msg.directTransferIEs); + break; + case RANAP_ProcedureCode_id_ErrorIndication: + ranap_free_errorindicationies(&message->msg.errorIndicationIEs); + break; case RANAP_ProcedureCode_id_Iu_Release: ranap_free_iu_releasecommandies(&message->msg.iu_ReleaseCommandIEs); break; + case RANAP_ProcedureCode_id_RelocationResourceAllocation: + ranap_free_relocationrequesties(&message->msg.relocationRequestIEs); + break; + case RANAP_ProcedureCode_id_SRNS_ContextTransfer: + ranap_free_srns_contextrequesties(&message->msg.srnS_ContextRequestIEs); + break; + case RANAP_ProcedureCode_id_SRNS_DataForward: + ranap_free_srns_dataforwardcommandies(&message->msg.srnS_DataForwardCommandIEs); + break; + case RANAP_ProcedureCode_id_ForwardSRNS_Context: + ranap_free_forwardsrns_contexties(&message->msg.forwardSRNS_ContextIEs); + break; + case RANAP_ProcedureCode_id_CommonID: + ranap_free_commonid_ies(&message->msg.commonID_IEs); + break; + case RANAP_ProcedureCode_id_CN_InvokeTrace: + ranap_free_cn_invoketraceies(&message->msg.cN_InvokeTraceIEs); + break; + case RANAP_ProcedureCode_id_SecurityModeControl: + ranap_free_securitymodecommandies(&message->msg.securityModeCommandIEs); + break; + case RANAP_ProcedureCode_id_LocationReportingControl: + ranap_free_locationreportingcontrolies(&message->msg.locationReportingControlIEs); + break; + case RANAP_ProcedureCode_id_DataVolumeReport: + ranap_free_datavolumereportrequesties(&message->msg.dataVolumeReportRequestIEs); + break; + case RANAP_ProcedureCode_id_CN_DeactivateTrace: + ranap_free_cn_deactivatetraceies(&message->msg.cN_DeactivateTraceIEs); + break; + case RANAP_ProcedureCode_id_LocationRelatedData: + ranap_free_locationrelateddatarequesties(&message->msg.locationRelatedDataRequestIEs); + break; default: LOGP(DRANAP, LOGL_INFO, "Freeing RANAP Procedure %s (CO, IM) from CN not implemented\n", @@ -77,6 +155,83 @@ } } +static int ran_ranap_rx_successful_msg_co(RANAP_SuccessfulOutcome_t *imsg, ranap_message *message) +{ + int rc = 0; + + message->procedureCode = imsg->procedureCode; + message->criticality = imsg->criticality; + + DEBUGP(DRANAP, "Rx CO SO (%s)\n", get_value_string(ranap_procedure_code_vals, imsg->procedureCode)); + + switch (imsg->procedureCode) { + case RANAP_ProcedureCode_id_RelocationPreparation: /* RELOCATION COMMAND */ + rc = ranap_decode_relocationcommandies(&message->msg.relocationCommandIEs, &imsg->value); + break; + default: + LOGP(DRANAP, LOGL_NOTICE, "Received unsupported RANAP " + "successful outcome procedure %s (CO) from CN, ignoring\n", + get_value_string(ranap_procedure_code_vals, imsg->procedureCode)); + rc = -1; + break; + } + + return rc; +} + +static void ran_ranap_free_successful_msg_co(ranap_message *message) +{ + switch (message->procedureCode) { + case RANAP_ProcedureCode_id_RelocationPreparation: + ranap_free_relocationcommandies(&message->msg.relocationCommandIEs); + break; + default: + LOGP(DRANAP, LOGL_NOTICE, "Freeing RANAP " + "successful outcome procedure %s (CO) from CN not implemented\n", + get_value_string(ranap_procedure_code_vals, message->procedureCode)); + break; + } +} + +static int ran_ranap_rx_unsuccessful_msg_co(RANAP_SuccessfulOutcome_t *imsg, ranap_message *message) +{ + int rc = 0; + + message->procedureCode = imsg->procedureCode; + message->criticality = imsg->criticality; + + DEBUGP(DRANAP, "Rx CO USO (%s)\n", get_value_string(ranap_procedure_code_vals, imsg->procedureCode)); + + switch (imsg->procedureCode) { + case RANAP_ProcedureCode_id_RelocationPreparation: /* RELOCATION PREPARATION FAILURE */ + rc = ranap_decode_relocationpreparationfailureies(&message->msg.relocationPreparationFailureIEs, &imsg->value); + break; + default: + LOGP(DRANAP, LOGL_NOTICE, "Received unsupported RANAP " + "unsuccessful outcome procedure %s (CO) from CN, ignoring\n", + get_value_string(ranap_procedure_code_vals, imsg->procedureCode)); + rc = -1; + break; + + } + + return rc; +} + +static void ran_ranap_free_unsuccessful_msg_co(ranap_message *message) +{ + switch (message->procedureCode) { + case RANAP_ProcedureCode_id_RelocationPreparation: + ranap_free_relocationpreparationfailureies(&message->msg.relocationPreparationFailureIEs); + break; + default: + LOGP(DRANAP, LOGL_NOTICE, "Freeing RANAP " + "unsuccessful outcome procedure %s (CO) from CN not implemented\n", + get_value_string(ranap_procedure_code_vals, message->procedureCode)); + break; + } +} + static int _ran_ranap_rx_co(void *ctx, RANAP_RANAP_PDU_t *pdu, ranap_message *message) { int rc = 0; @@ -86,16 +241,10 @@ rc = ran_ranap_rx_initiating_msg_co(ctx, &pdu->choice.initiatingMessage, message); break; case RANAP_RANAP_PDU_PR_successfulOutcome: - LOGP(DRANAP, LOGL_NOTICE, "Received unsupported RANAP " - "successful outcome procedure %s (CO) from CN, ignoring\n", - get_value_string(ranap_procedure_code_vals, pdu->choice.successfulOutcome.procedureCode)); - rc = -1; + rc = ran_ranap_rx_successful_msg_co(&pdu->choice.successfulOutcome, message); break; case RANAP_RANAP_PDU_PR_unsuccessfulOutcome: - LOGP(DRANAP, LOGL_NOTICE, "Received unsupported RANAP " - "unsuccessful outcome procedure %s (CO) from CN, ignoring\n", - get_value_string(ranap_procedure_code_vals, pdu->choice.unsuccessfulOutcome.procedureCode)); - rc = -1; + rc = ran_ranap_rx_unsuccessful_msg_co(&pdu->choice.successfulOutcome, message); break; case RANAP_RANAP_PDU_PR_outcome: LOGP(DRANAP, LOGL_NOTICE, "Received unsupported RANAP " @@ -122,12 +271,10 @@ ran_ranap_free_initiating_msg_co(message); break; case RANAP_RANAP_PDU_PR_successfulOutcome: - LOGP(DRANAP, LOGL_NOTICE, "Not freeing unsupported RANAP " - "successful outcome procedure (CO) from CN\n"); + ran_ranap_free_successful_msg_co(message); break; case RANAP_RANAP_PDU_PR_unsuccessfulOutcome: - LOGP(DRANAP, LOGL_NOTICE, "Not freeing unsupported RANAP " - "unsuccessful outcome procedure (CO) from CN\n"); + ran_ranap_free_unsuccessful_msg_co(message); break; case RANAP_RANAP_PDU_PR_outcome: LOGP(DRANAP, LOGL_NOTICE, "Not freeing unsupported RANAP " -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/36787?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: I7dea74102da8b610ff2a310c5814f5c89f08e7a6 Gerrit-Change-Number: 36787 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-MessageType: merged

3 hours, 29 minutes

1
0
0 0

[L] Change in osmo-iuh[master]: ranap_common: Implement support for missing procedures

by laforge

Attention is currently required from: daniel, neels, tnt. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/36787?usp=email ) Change subject: ranap_common: Implement support for missing procedures ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/36787?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: I7dea74102da8b610ff2a310c5814f5c89f08e7a6 Gerrit-Change-Number: 36787 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Wed, 15 May 2024 15:37:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 hours, 29 minutes

1
0
0 0

[L] Change in osmo-iuh[master]: ranap_common: Implement support for missing procedures

by pespin

Attention is currently required from: daniel, laforge, neels, tnt. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/36787?usp=email ) Change subject: ranap_common: Implement support for missing procedures ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/36787?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: I7dea74102da8b610ff2a310c5814f5c89f08e7a6 Gerrit-Change-Number: 36787 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Wed, 15 May 2024 15:27:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 hours, 39 minutes

1
0
0 0

[L] Change in osmo-iuh[master]: ranap_common: Implement support for missing procedures

by tnt

Attention is currently required from: daniel, neels, pespin, tnt. tnt has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/36787?usp=email ) Change subject: ranap_common: Implement support for missing procedures ...................................................................... Patch Set 2: Code-Review+1 (4 comments) Patchset: PS1: > I don't really understand what this is about TBH, just doing a quick read of the code for "unexpecte […] Done Patchset: PS2: Looks logical to me. File src/ranap_common_ran.c: https://gerrit.osmocom.org/c/osmo-iuh/+/36787/comment/69e96e8c_19bd53ac PS1, Line 196: static int ran_ranap_rx_unsuccessful_msg_co(RANAP_SuccessfulOutcome_t *imsg, ranap_message *message) > ran_ranap_rx_unsuccessful_msg_co takes a RANAP_SuccessfulOutcome_t as param and not some RANAP_Unsuc […] Done https://gerrit.osmocom.org/c/osmo-iuh/+/36787/comment/300fccd4_2fecee0b PS1, Line 247: rc = ran_ranap_rx_unsuccessful_msg_co(&pdu->choice.successfulOutcome, message); > Not pdu->choice. […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/36787?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: I7dea74102da8b610ff2a310c5814f5c89f08e7a6 Gerrit-Change-Number: 36787 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Wed, 15 May 2024 15:15:45 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: tnt <tnt(a)246tNt.com> Gerrit-MessageType: comment

3 hours, 51 minutes

1
0
0 0

[S] Change in osmo-remsim[master]: user_ifdhandler: Fix segfault on startup

by Joey Berkovitz

Attention is currently required from: laforge. Joey Berkovitz has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/36835?usp=email ) Change subject: user_ifdhandler: Fix segfault on startup ...................................................................... Patch Set 3: (1 comment) File src/client/user_ifdhandler.c: https://gerrit.osmocom.org/c/osmo-remsim/+/36835/comment/08424d65_bc6da8f0 PS1, Line 374: ensure_osmo_ctx > ensure_osmo_ctx() basically calls osmo_ctx_init() which is called just two lines below. […] confirmed - moving osmo_select_init below the successful osmo_ctx_init fixes the issue -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/36835?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I6e839b7772a9b176b972c5c0a01bb352a7a68923 Gerrit-Change-Number: 36835 Gerrit-PatchSet: 3 Gerrit-Owner: Joey Berkovitz <joey(a)berkovitz.us> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 15 May 2024 15:13:46 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

3 hours, 53 minutes

1
0
0 0

[S] Change in osmo-remsim[master]: user_ifdhandler: Fix segfault on startup

by Joey Berkovitz

Attention is currently required from: Joey Berkovitz. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-remsim/+/36835?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: user_ifdhandler: Fix segfault on startup ...................................................................... user_ifdhandler: Fix segfault on startup Change-Id: I6e839b7772a9b176b972c5c0a01bb352a7a68923 --- M src/client/user_ifdhandler.c 1 file changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/35/36835/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/36835?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I6e839b7772a9b176b972c5c0a01bb352a7a68923 Gerrit-Change-Number: 36835 Gerrit-PatchSet: 3 Gerrit-Owner: Joey Berkovitz <joey(a)berkovitz.us> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: Joey Berkovitz <joey(a)berkovitz.us> Gerrit-MessageType: newpatchset

3 hours, 54 minutes

1
0
0 0

[L] Change in osmo-iuh[master]: ranap_common: Implement support for missing procedures

by laforge

Attention is currently required from: daniel, neels, pespin, tnt. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/36787?usp=email ) Change subject: ranap_common: Implement support for missing procedures ...................................................................... Patch Set 2: (3 comments) Patchset: PS1: > I don't really understand what this is about TBH, just doing a quick read of the code for "unexpecte […] thanks, it was a simple copy+paste mistake. File src/ranap_common_ran.c: https://gerrit.osmocom.org/c/osmo-iuh/+/36787/comment/9f6380a6_a8ca699e PS1, Line 196: static int ran_ranap_rx_unsuccessful_msg_co(RANAP_SuccessfulOutcome_t *imsg, ranap_message *message) > ran_ranap_rx_unsuccessful_msg_co takes a RANAP_SuccessfulOutcome_t as param and not some RANAP_Unsuc […] Done https://gerrit.osmocom.org/c/osmo-iuh/+/36787/comment/80125f9e_14235a47 PS1, Line 247: rc = ran_ranap_rx_unsuccessful_msg_co(&pdu->choice.successfulOutcome, message); > Not pdu->choice. […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/36787?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: I7dea74102da8b610ff2a310c5814f5c89f08e7a6 Gerrit-Change-Number: 36787 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: tnt <tnt(a)246tNt.com> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Wed, 15 May 2024 15:10:24 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: tnt <tnt(a)246tNt.com> Gerrit-MessageType: comment

3 hours, 56 minutes

1
0
0 0

[L] Change in osmo-iuh[master]: ranap_common: Implement support for missing procedures

by laforge

Attention is currently required from: daniel, laforge, neels, pespin. Hello Jenkins Builder, daniel, neels, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-iuh/+/36787?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+1 by pespin, Verified+1 by Jenkins Builder Change subject: ranap_common: Implement support for missing procedures ...................................................................... ranap_common: Implement support for missing procedures Both the RAN and the CN side of ranap_common were missing support for decoding requests and/or responses for a number of RANAP procedures. This patch adds all of them a of TS 25.413 Release 12 except those related to MBMS or SRVCC. Related: SYS#6885 Change-Id: I7dea74102da8b610ff2a310c5814f5c89f08e7a6 --- M src/ranap_common_cn.c M src/ranap_common_ran.c 2 files changed, 284 insertions(+), 25 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/87/36787/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/36787?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: I7dea74102da8b610ff2a310c5814f5c89f08e7a6 Gerrit-Change-Number: 36787 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: tnt <tnt(a)246tNt.com> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: newpatchset

3 hours, 57 minutes

1
0
0 0

[L] Change in osmo-iuh[master]: ranap_common: Implement support for missing procedures

by tnt

Attention is currently required from: daniel, laforge, neels. tnt has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/36787?usp=email ) Change subject: ranap_common: Implement support for missing procedures ...................................................................... Patch Set 1: (3 comments) Patchset: PS1: I don't really understand what this is about TBH, just doing a quick read of the code for "unexpected" things and this seemed a bit weird to me, feel free to ignore if this is how it should be ... File src/ranap_common_ran.c: https://gerrit.osmocom.org/c/osmo-iuh/+/36787/comment/050f4484_42ff9ca5 PS1, Line 196: static int ran_ranap_rx_unsuccessful_msg_co(RANAP_SuccessfulOutcome_t *imsg, ranap_message *message) ran_ranap_rx_unsuccessful_msg_co takes a RANAP_SuccessfulOutcome_t as param and not some RANAP_UnsuccessfulOutcome_t https://gerrit.osmocom.org/c/osmo-iuh/+/36787/comment/38ab628c_4d80622b PS1, Line 247: rc = ran_ranap_rx_unsuccessful_msg_co(&pdu->choice.successfulOutcome, message); Not pdu->choice.unsuccessfulOutcome ? -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/36787?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: I7dea74102da8b610ff2a310c5814f5c89f08e7a6 Gerrit-Change-Number: 36787 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: tnt <tnt(a)246tNt.com> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Wed, 15 May 2024 15:04:43 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

4 hours, 2 minutes

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: remsim: Move PIPEasp generic helper code to library/PIPEasp_Templates...

by laforge

Attention is currently required from: dexter, fixeria, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36832?usp=email ) Change subject: remsim: Move PIPEasp generic helper code to library/PIPEasp_Templates.ttcn ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36832?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: I4a5ededbd958c87537f84155092b6a6cd715865a Gerrit-Change-Number: 36832 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(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: Wed, 15 May 2024 14:56:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

4 hours, 11 minutes

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: remsim: Move PIPEasp generic helper code to library/PIPEasp_Templates...

by laforge

Attention is currently required from: dexter, fixeria, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36832?usp=email ) Change subject: remsim: Move PIPEasp generic helper code to library/PIPEasp_Templates.ttcn ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: adding @pmaier@sysmocom.de as I know he also has been using PIPEasp recently in his eIM/IPAd tests -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36832?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: I4a5ededbd958c87537f84155092b6a6cd715865a Gerrit-Change-Number: 36832 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Wed, 15 May 2024 14:55:59 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

4 hours, 11 minutes

1
0
0 0

[S] Change in osmo-remsim[master]: user_ifdhandler: Fix segfault on startup

by laforge

Attention is currently required from: Joey Berkovitz. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-remsim/+/36835?usp=email ) Change subject: user_ifdhandler: Fix segfault on startup ...................................................................... Patch Set 1: (1 comment) File src/client/user_ifdhandler.c: https://gerrit.osmocom.org/c/osmo-remsim/+/36835/comment/c6824d93_206eb05a PS1, Line 374: ensure_osmo_ctx ensure_osmo_ctx() basically calls osmo_ctx_init() which is called just two lines below. Might it be that the existing code just needs to be re-ordered? Did you try the following: * not adding ensure_osmo_ctx * moving osmo_select_init below osmo_ctx_init Thanks! -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/36835?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I6e839b7772a9b176b972c5c0a01bb352a7a68923 Gerrit-Change-Number: 36835 Gerrit-PatchSet: 1 Gerrit-Owner: Joey Berkovitz <joey(a)berkovitz.us> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: Joey Berkovitz <joey(a)berkovitz.us> Gerrit-Comment-Date: Wed, 15 May 2024 14:55:09 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

4 hours, 12 minutes

1
0
0 0

[S] Change in osmo-remsim[master]: user_ifdhandler: Fix segfault on startup

by Joey Berkovitz

Joey Berkovitz has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-remsim/+/36835?usp=email ) Change subject: user_ifdhandler: Fix segfault on startup ...................................................................... user_ifdhandler: Fix segfault on startup Change-Id: I6e839b7772a9b176b972c5c0a01bb352a7a68923 --- M src/client/user_ifdhandler.c 1 file changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/35/36835/1 diff --git a/src/client/user_ifdhandler.c b/src/client/user_ifdhandler.c index c6a9392..b9ddfb9 100644 --- a/src/client/user_ifdhandler.c +++ b/src/client/user_ifdhandler.c @@ -371,6 +371,7 @@ if (gethostname(hostname, sizeof(hostname)) < 0) OSMO_STRLCPY_ARRAY(hostname, "unknown"); + ensure_osmo_ctx(); osmo_select_init(); rc = osmo_ctx_init("client"); -- To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/36835?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-Change-Id: I6e839b7772a9b176b972c5c0a01bb352a7a68923 Gerrit-Change-Number: 36835 Gerrit-PatchSet: 1 Gerrit-Owner: Joey Berkovitz <joey(a)berkovitz.us> Gerrit-MessageType: newchange

4 hours, 25 minutes

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: remsim: Move PIPEasp generic helper code to library/PIPEasp_Templates...

by osmith

Attention is currently required from: fixeria, pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36832?usp=email ) Change subject: remsim: Move PIPEasp generic helper code to library/PIPEasp_Templates.ttcn ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36832?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: I4a5ededbd958c87537f84155092b6a6cd715865a Gerrit-Change-Number: 36832 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 15 May 2024 14:05:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

5 hours, 1 minute

1
0
0 0

[S] Change in osmo-ci[master]: jobs/ttcn3: run ttcn3-msc-test earlier

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/36834?usp=email ) Change subject: jobs/ttcn3: run ttcn3-msc-test earlier ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/36834?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: I8eaf058f13f4175a458e9abe544bfb21ace481b7 Gerrit-Change-Number: 36834 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 15 May 2024 13:33:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

5 hours, 33 minutes

1
0
0 0

[M] Change in osmo-hnbgw[master]: KPI: Add initial set of DTAP message type rate counters

by osmith

Attention is currently required from: laforge. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36788?usp=email ) Change subject: KPI: Add initial set of DTAP message type rate counters ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36788?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: I3e1ad7a2aa71674a22a27c31512600f2de139032 Gerrit-Change-Number: 36788 Gerrit-PatchSet: 4 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 15 May 2024 13:17:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

5 hours, 49 minutes

1
0
0 0

[S] Change in osmo-ci[master]: jobs/ttcn3: run ttcn3-msc-test earlier

by osmith

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ci/+/36834?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: jobs/ttcn3: run ttcn3-msc-test earlier ...................................................................... jobs/ttcn3: run ttcn3-msc-test earlier It seems like various tests are failing from time to time due to the builder having a too high load. As several ttcn3 testsuites run around 4 am already, move ttcn3-msc-test to 1 hour earlier where we don't have anything currently. Change-Id: I8eaf058f13f4175a458e9abe544bfb21ace481b7 --- M jobs/README.adoc M jobs/ttcn3-testsuites.yml 2 files changed, 17 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/34/36834/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/36834?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: I8eaf058f13f4175a458e9abe544bfb21ace481b7 Gerrit-Change-Number: 36834 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

6 hours, 5 minutes

1
0
0 0

[S] Change in osmo-ci[master]: lint: do "docker run --rm" check only in jenkins

by osmith

osmith has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/36833?usp=email ) Change subject: lint: do "docker run --rm" check only in jenkins ...................................................................... Abandoned submitted by accident, need to test more if this makes a difference -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/36833?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: I00a28a04b0fae8804846948a155c6214bf1aca00 Gerrit-Change-Number: 36833 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: abandon

6 hours, 7 minutes

1
0
0 0

[S] Change in osmo-ci[master]: lint: do "docker run --rm" check only in jenkins

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/36833?usp=email ) Change subject: lint: do "docker run --rm" check only in jenkins ...................................................................... lint: do "docker run --rm" check only in jenkins Change-Id: I00a28a04b0fae8804846948a155c6214bf1aca00 --- M jobs/gerrit-lint.yml M lint/lint_diff.sh 2 files changed, 16 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/33/36833/1 diff --git a/jobs/gerrit-lint.yml b/jobs/gerrit-lint.yml index 3039829..62dc969 100644 --- a/jobs/gerrit-lint.yml +++ b/jobs/gerrit-lint.yml @@ -50,6 +50,7 @@ git -C osmo-ci log --oneline cd code-from-gerrit + export CHECK_DOCKER_RM=1 ../osmo-ci/lint/lint_diff.sh HEAD~1 wrappers: diff --git a/lint/lint_diff.sh b/lint/lint_diff.sh index 662bdd3..b8a84c4 100755 --- a/lint/lint_diff.sh +++ b/lint/lint_diff.sh @@ -21,10 +21,12 @@ ERROR=0 -echo "Running docker_run_rm.sh on the whole tree..." -echo -if ! "$SCRIPT_DIR"/docker_run_rm.sh; then - ERROR=1 +if [ "$CHECK_DOCKER_RM" = 1 ]; then + echo "Running docker_run_rm.sh on the whole tree..." + echo + if ! "$SCRIPT_DIR"/docker_run_rm.sh; then + ERROR=1 + fi fi echo "Running checkpatch on 'git diff $COMMIT'..." -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/36833?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: I00a28a04b0fae8804846948a155c6214bf1aca00 Gerrit-Change-Number: 36833 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

6 hours, 7 minutes

1
0
0 0

[S] Change in osmo-ci[master]: jobs/ttcn3: run ttcn3-msc-test earlier

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/36834?usp=email ) Change subject: jobs/ttcn3: run ttcn3-msc-test earlier ...................................................................... jobs/ttcn3: run ttcn3-msc-test earlier It seems like various tests are failing from time to time due to the builder having a too high load. As several ttcn3 testsuites run around 4 am already, move ttcn3-msc-test to 1 hour earlier where we don't have anything currently. Change-Id: I8eaf058f13f4175a458e9abe544bfb21ace481b7 --- M jobs/README.adoc M jobs/ttcn3-testsuites.yml 2 files changed, 16 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/34/36834/1 diff --git a/jobs/README.adoc b/jobs/README.adoc index eb14152..d403bff 100644 --- a/jobs/README.adoc +++ b/jobs/README.adoc @@ -139,7 +139,7 @@ 02:XX registry-triggers 02:XX registry-rebuild-upload-fpga-build (weekly) - 04:00 - 18:00 Jobs that need binary packages + 03:00 - 18:00 Jobs that need binary packages ttcn3-testsuites 04:XX osmocom-release-manuals 05:XX osmocom-release-tarballs diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml index ac79f4d..8d17938 100644 --- a/jobs/ttcn3-testsuites.yml +++ b/jobs/ttcn3-testsuites.yml @@ -68,7 +68,7 @@ Test open5gs-smfd + open5gs-upfd main. email: jenkins-notifications(a)lists.osmocom.org acetcom(a)gmail.com - ttcn3-msc-test: - timer: H 04 * * * + timer: H 03 * * * - ttcn3-pcu-test: timer: H 04 * * * - ttcn3-pcu-test-sns: -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/36834?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: I8eaf058f13f4175a458e9abe544bfb21ace481b7 Gerrit-Change-Number: 36834 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

6 hours, 7 minutes

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: remsim: Move PIPEasp generic helper code to library/PIPEasp_Templates...

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36832?usp=email ) Change subject: remsim: Move PIPEasp generic helper code to library/PIPEasp_Templates.ttcn ...................................................................... remsim: Move PIPEasp generic helper code to library/PIPEasp_Templates.ttcn This way code can be used and extended for other testsuites. Change-Id: I4a5ededbd958c87537f84155092b6a6cd715865a --- A library/PIPEasp_Templates.ttcn M remsim/RemsimClient_Tests.ttcn M remsim/gen_links.sh 3 files changed, 41 insertions(+), 22 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/32/36832/1 diff --git a/library/PIPEasp_Templates.ttcn b/library/PIPEasp_Templates.ttcn new file mode 100644 index 0000000..af4e434 --- /dev/null +++ b/library/PIPEasp_Templates.ttcn @@ -0,0 +1,27 @@ +module PIPEasp_Templates { + +import from PIPEasp_PortType all; +import from PIPEasp_Types all; + +template (value) ASP_PExecuteBackground ts_ExecBg(charstring cmd) := { + command := cmd +} + +template (present) ASP_PStdout tr_Stdout(template (present) charstring line) := { + stdout := line +} + +template (present) ASP_PStderr tr_Stderr(template (present) charstring line) := { + stderr := line +} + +template (value) ASP_PStdin ts_Stdin(template (value) charstring line) := { + stdin :=line +} + +/* Ignore output from stderr: */ +altstep as_ignore_stderr(PIPEasp_PT pt) { +[] pt.receive(tr_Stderr(?)) { repeat; } +} + +} diff --git a/remsim/RemsimClient_Tests.ttcn b/remsim/RemsimClient_Tests.ttcn index 219573c..d747eef 100644 --- a/remsim/RemsimClient_Tests.ttcn +++ b/remsim/RemsimClient_Tests.ttcn @@ -20,6 +20,7 @@ /* the PIPEasp port allows us to interact with osmo-remsim-client-shell via stdin/stdout */ import from PIPEasp_PortType all; import from PIPEasp_Types all; +import from PIPEasp_Templates all; import from RSPRO all; import from RSPRO_Types all; @@ -196,34 +197,13 @@ * Tests interacting with local remsim-bankd-client via PIPE port ***********************************************************************/ -template (value) ASP_PExecuteBackground ts_ExecBg(charstring cmd) := { - command := cmd -} - -template (present) ASP_PStdout tr_Stdout(template (present) charstring line) := { - stdout := line -} - -template (present) ASP_PStderr tr_Stderr(template (present) charstring line) := { - stderr := line -} - -template (value) ASP_PStdin ts_Stdin(template (value) charstring line) := { - stdin :=line -} - -/* osmo-remsim-client logs to stderr, so we need to ignore that log output */ -private altstep as_ignore_stderr() runs on client_test_CT { -[] PIPE.receive(tr_Stderr(?)) { repeat; } -} - /* start a local osmo-remsim-client as sub-process and attach it to PIPE port */ private function f_init_client_pipe(ClientSlot cs) runs on client_test_CT { var charstring cmdline := mp_client_shell_cmd & " -i 127.0.0.1"; map(self:PIPE, system:PIPE); PIPE.send(ts_ExecBg(cmdline & " -c " & int2str(cs.clientId) & " -n " & int2str(cs.slotNr))); - activate(as_ignore_stderr()); + activate(as_ignore_stderr(PIPE)); } /* pretty-print an octet string as series of ASCII encoded hex bytes with spaces */ diff --git a/remsim/gen_links.sh b/remsim/gen_links.sh index b25375b..615c550 100755 --- a/remsim/gen_links.sh +++ b/remsim/gen_links.sh @@ -39,6 +39,7 @@ DIR=../library FILES="Misc_Helpers.ttcn General_Types.ttcn Osmocom_VTY_Functions.ttcn Osmocom_Types.ttcn " +FILES+="PIPEasp_Templates.ttcn " FILES+="IPA_Types.ttcn IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc IPA_Emulation.ttcnpp IPA_CodecPort.ttcn " #RSL_Types.ttcn RSL_Emulation.ttcn " FILES+="Osmocom_CTRL_Types.ttcn Osmocom_CTRL_Functions.ttcn Osmocom_CTRL_Adapter.ttcn " FILES+="Native_Functions.ttcn Native_FunctionDefs.cc " -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36832?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: I4a5ededbd958c87537f84155092b6a6cd715865a Gerrit-Change-Number: 36832 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

6 hours, 23 minutes

1
0
0 0

[S] Change in osmo-ci[master]: jobs/ttcn3-testsuites.yml: add ttcn3-bts-test-io_uring

by osmith

Attention is currently required from: fixeria, laforge. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/36830?usp=email ) Change subject: jobs/ttcn3-testsuites.yml: add ttcn3-bts-test-io_uring ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/36830?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: I3af791103d863290a53c9ce2d1a8d1d9e42e91c7 Gerrit-Change-Number: 36830 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 15 May 2024 12:31:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

6 hours, 35 minutes

1
0
0 0

[M] Change in docker-playground[master]: ttcn3-asterisk: Configure asterisk for initial SIP register on IMS side

by osmith

Attention is currently required from: jolly, pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36831?usp=email ) Change subject: ttcn3-asterisk: Configure asterisk for initial SIP register on IMS side ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36831?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: I66d128192146ad600203ea2a41b8bf019311d603 Gerrit-Change-Number: 36831 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 15 May 2024 12:19:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

6 hours, 47 minutes

1
0
0 0

[S] Change in osmo-ci[master]: jobs/ttcn3-testsuites.yml: add ttcn3-bts-test-io_uring

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/36830?usp=email ) Change subject: jobs/ttcn3-testsuites.yml: add ttcn3-bts-test-io_uring ...................................................................... Patch Set 1: Code-Review+1 (1 comment) Patchset: PS1: This should probably also help a lot with TRXD and PCUIF once we move it to osmo_io. -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/36830?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: I3af791103d863290a53c9ce2d1a8d1d9e42e91c7 Gerrit-Change-Number: 36830 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 15 May 2024 12:15:09 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

6 hours, 52 minutes

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: asterisk: Initial IMS registration

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36759?usp=email ) Change subject: asterisk: Initial IMS registration ...................................................................... asterisk: Initial IMS registration This patch is a step towards testing IMS. So far only the code infrstrastructure to handle the 1st REGISTER (outside IPSEC) is provided. It can already be seen how Asterisk sends the second REGISTER over IPSEC, but there's no means to test it yet in TTCN-3. This will be done in a follow-up patch, which may take some work. Change-Id: Idb3b19ccd82cad25948106b2c72aa424d7f79cd8 --- M asterisk/Asterisk_Tests.ttcn M asterisk/IMS_ConnectionHandler.ttcn M library/SIP_Templates.ttcn 3 files changed, 432 insertions(+), 3 deletions(-) Approvals: osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/asterisk/Asterisk_Tests.ttcn b/asterisk/Asterisk_Tests.ttcn index 08a5f65..8a124c1 100644 --- a/asterisk/Asterisk_Tests.ttcn +++ b/asterisk/Asterisk_Tests.ttcn @@ -37,6 +37,7 @@ charstring mp_local_ims_host := "127.0.0.3"; integer mp_local_ims_port := 5060; + charstring mp_ims_imsi := "238010000090828"; /* Asterisk AMI: */ charstring mp_ami_remote_host := "127.0.0.1"; @@ -45,6 +46,7 @@ integer mp_ami_local_port := 0; charstring mp_ami_user := "test_user"; charstring mp_ami_secret := "1234"; + charstring mp_volte_ims_outbound_registration := "volte_ims"; } type component test_CT { @@ -74,6 +76,15 @@ return valueof(pars); } +function f_init_IMS_ConnHdlrPars(integer idx := 1) runs on test_CT return IMS_ConnHdlrPars { + var template (value) IMS_CallPars cp := t_IMS_CallPars(mp_local_sip_host, 1234 + 2*idx); + var template (value) IMS_ConnHdlrPars pars := t_IMS_Pars(mp_local_ims_host, + mp_local_ims_port, + mp_ims_imsi, + cp := cp); + return valueof(pars); +} + /* Initialize connection towards Asterisk AMI */ private function f_init_ami() runs on test_CT { var charstring id := "Asterisk_Tests_AMI_EMU"; @@ -139,6 +150,22 @@ return vc_conn; } +function f_start_handler_IMS(ims_void_fn fn, IMS_ConnHdlrPars pars) +runs on test_CT return IMS_ConnHdlr { + var IMS_ConnHdlr vc_conn; + var charstring id := testcasename() & "-IMS_ConnHdlr-" & pars.user; + + vc_conn := IMS_ConnHdlr.create(id) alive; + + connect(vc_conn:SIP, vc_IMS:CLIENT); + connect(vc_conn:SIP_PROC, vc_IMS:CLIENT_PROC); + + connect(vc_conn:COORD, self:IMS_COORD); + + vc_conn.start(f_ims_handler_init(fn, id, pars)); + return vc_conn; +} + /* Test SIP registration of local clients */ private function f_TC_internal_registration(charstring id) runs on SIPConnHdlr { @@ -322,12 +349,51 @@ setverdict(pass); } +/* Test SIP registration of local clients */ +private function f_TC_ims_registration(charstring id) runs on IMS_ConnHdlr { + f_create_sip_expect(valueof(ts_SipUrl_from_Addr_Union(g_pars.registrar_sip_record.addr))); + as_IMS_register(); + setverdict(pass); +} +testcase TC_ims_registration() runs on test_CT { + var IMS_ConnHdlrPars pars; + var IMS_ConnHdlr vc_conn; + f_init(); + pars := f_init_IMS_ConnHdlrPars(); + vc_conn := f_start_handler_IMS(refers(f_TC_ims_registration), pars); + + /* Give some time for IMS_ConnHdlr to register SIP expect. This could be done through IMS_COORD. */ + f_sleep(1.0); + /* Clear events: */ + AMI_CLIENT.clear; + /* Trigger registration: */ + f_ami_action_PJSIPRegister(AMI_CLIENT, mp_volte_ims_outbound_registration); + /* TODO: Rx "Event: AuthRequest" */ + /* TODO: Tx "Action: AuthResponse" */ + /* TODO: Rx "Response: Success" */ + /* TODO: once registration is successful, rx: + * Event: Registry + * ChannelType: pjsip + * Username: <value> + * Domain: <value> + * Status: <value> + * Cause: <value> */ + + /* TODO: test "Action: PJSIPUnregister" */ + + /* TODO: in another test emulating a call, test "Action: DedicatedBearerStatus" */ + + vc_conn.done; + f_shutdown(); +} + control { execute( TC_internal_registration() ); execute( TC_internal_call_momt() ); execute( TC_internal_call_all_2registered() ); execute( TC_internal_call_all_3registered() ); execute( TC_internal_call_all_4registered() ); + execute( TC_ims_registration() ); } } diff --git a/asterisk/IMS_ConnectionHandler.ttcn b/asterisk/IMS_ConnectionHandler.ttcn index a1baeb4..18404f1 100644 --- a/asterisk/IMS_ConnectionHandler.ttcn +++ b/asterisk/IMS_ConnectionHandler.ttcn @@ -23,6 +23,9 @@ import from SIPmsg_Types all; import from SIP_Templates all; +const char c_sip_server_name := "osmo-ttcn3-hacks/0.23"; + + type port IMSCoord_PT message { inout charstring; @@ -43,11 +46,18 @@ type record IMS_ConnHdlrPars { float t_guard, - charstring remote_sip_host, - uint16_t remote_sip_port, + charstring realm, + charstring local_sip_host, + uint16_t local_sip_port, + charstring remote_sip_host optional, + uint16_t remote_sip_port optional, charstring user, charstring display_name, charstring password, + integer ipsec_local_spi_c, + integer ipsec_local_spi_s, + integer ipsec_remote_spi_c optional, + integer ipsec_remote_spi_s optional, SipUrl registrar_sip_req_uri, SipAddr registrar_sip_record, CallidString registrar_sip_call_id, @@ -66,6 +76,10 @@ /* Whether to expect CANCEL instead of ACK as answer to our OK */ boolean exp_cancel } +template (value) IMS_CallParsMT t_IMS_CallParsMT := { + wait_coord_cmd_pickup := false, + exp_cancel := false +} type record IMS_CallPars { SipAddr calling optional, @@ -85,4 +99,300 @@ IMS_CallParsMT mt } +template (value) IMS_CallPars t_IMS_CallPars(charstring local_rtp_addr, + uint16_t local_rtp_port := 0, + template (omit) SipAddr calling := omit, + template (omit) SipAddr called := omit) := { + calling := calling, + called := called, + from_addr := omit, + to_addr := omit, + sip_call_id := hex2str(f_rnd_hexstring(15)), + sip_seq_nr := f_sip_rand_seq_nr(), + sip_body := omit, + local_rtp_addr := local_rtp_addr, + local_rtp_port := local_rtp_port, + peer_sdp := omit, + mt := t_IMS_CallParsMT +} + +template (value) IMS_ConnHdlrPars t_IMS_Pars(charstring local_sip_host, + uint16_t local_sip_port, + charstring user, + charstring display_name := "Anonymous", + charstring password := "secret", + template (omit) IMS_CallPars cp := omit) := { + t_guard := 30.0, + realm := local_sip_host, + local_sip_host := local_sip_host, + local_sip_port := local_sip_port, + remote_sip_host := omit, + remote_sip_port := omit, + user := user, + display_name := f_sip_str_quote(display_name), + password := password, + ipsec_local_spi_c := 4142, + ipsec_local_spi_s := 4143, + ipsec_remote_spi_c := omit, + ipsec_remote_spi_s := omit, + registrar_sip_req_uri := valueof(ts_SipUrlHost(local_sip_host)), + registrar_sip_record := ts_SipAddr(ts_HostPort(local_sip_host), + ts_UserInfo(user), + f_sip_str_quote(display_name)), + registrar_sip_call_id := hex2str(f_rnd_hexstring(15)) & "@" & local_sip_host, + registrar_sip_seq_nr := f_sip_rand_seq_nr(), + local_via := ts_Via_from(ts_HostPort(local_sip_host, local_sip_port)), + local_sip_url_ext := ts_SipUrl(ts_HostPort(local_sip_host, local_sip_port), + ts_UserInfo(user)), + local_sip_record := ts_SipAddr(ts_HostPort(local_sip_host), + ts_UserInfo(user)), + local_contact := valueof(ts_Contact({ + ts_ContactAddress( + ts_Addr_Union_SipUrl(ts_SipUrl(ts_HostPort( + local_sip_host, + local_sip_port), + ts_UserInfo(user))), + omit) + })), + cp := cp +} + +private altstep as_Tguard() runs on IMS_ConnHdlr { + [] g_Tguard.timeout { + setverdict(fail, "Tguard timeout"); + mtc.stop; + } +} + +type function ims_void_fn(charstring id) runs on IMS_ConnHdlr; +function f_ims_handler_init(ims_void_fn fn, charstring id, IMS_ConnHdlrPars pars) +runs on IMS_ConnHdlr { + g_name := id; + g_pars := pars; + g_Tguard.start(pars.t_guard); + activate(as_Tguard()); + + /* call the user-supied test case function */ + fn.apply(id); +} + +private altstep as_SIP_fail_req(charstring exp_msg_str := "") runs on IMS_ConnHdlr +{ + var PDU_SIP_Request sip_req; + [] SIP.receive(PDU_SIP_Request:?) -> value sip_req { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str(g_name & ": Received unexpected SIP Req message := ", sip_req, "\nvs exp := ", exp_msg_str)); + } +} + +private altstep as_SIP_fail_resp(charstring exp_msg_str := "") runs on IMS_ConnHdlr +{ + var PDU_SIP_Response sip_resp; + [] SIP.receive(PDU_SIP_Response:?) -> value sip_resp { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str(g_name & ": Received unexpected SIP Resp message := ", sip_resp, "\nvs exp := ", exp_msg_str)); + } +} + +private function f_ims_validate_register_contact(Contact rx_contact) +{ +/* IMS contact shows up like this: + * Contact: <sip:8adf9f3d-9342-4060-aa4f-a909f37fd6f6@192.168.101.2:5060>;+g.3gpp.accesstype="cellular2";video;audio;+g.3gpp.smsip;+g.3gpp.nw-init-ussi;+g.3gpp.icsi-ref="urn%3Aurn-7%3A3gpp-service.ims.icsi.mmtel";+sip.instance="<urn:gsma:imei:35589811-338445-0>" + */ + /* TODO: "that the UE must include the IMS Communication Service Identifier (ICSI) +in the contact: header to indicate IMS Multimedia Telephony." */ + /* TODO: "The UE must include an IMEI URN in the +sip.instance header field +parameter of the contact: header." */ + /* TODO: "If the UE supports SMS over IP, it must include the feature tag +“+g.3gpp.smsip” in the contact: header." */ + /* TODO: "If the UE supports conversational audio and video service, then this must +be indicated by adding a “video” media feature tag to the contact: header." */ +} + +private function f_ims_parse_security_client(Security_client security_client) runs on IMS_ConnHdlr +{ + var boolean found := false; + for (var integer i := 0; i < lengthof(security_client.sec_mechanism_list); i := i + 1) { + var Security_mechanism sec_mec := security_client.sec_mechanism_list[i]; + if (sec_mec.mechanism_name != "ipsec-3gpp") { + log("Skipping Security Mechansim: ", sec_mec.mechanism_name); + continue; + } + var SemicolonParam_List sec_pars := sec_mec.mechanism_params; + var charstring par_val; + par_val := f_sip_param_get_value_present_or_fail(sec_pars, "alg"); + if (par_val != "hmac-sha-1-96") { + log("Skipping Security Mechansim Algo: ", par_val); + continue; + } + par_val := f_sip_param_get_value_present_or_fail(sec_pars, "spi-c"); + g_pars.ipsec_remote_spi_c := str2int(par_val); + par_val := f_sip_param_get_value_present_or_fail(sec_pars, "spi-s"); + g_pars.ipsec_remote_spi_s := str2int(par_val); + found := true; + break; + } + + if (not found) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str(g_name & "alg=hmac-sha-1-96 not found: ", security_client)); + } + + log("ipsec: remote_spi_c=", g_pars.ipsec_remote_spi_c, " remote_spi_s=", g_pars.ipsec_remote_spi_s, + "local_spi_c=", g_pars.ipsec_local_spi_c, " local_spi_s=", g_pars.ipsec_local_spi_s); +} + +private function f_ims_setup_ipsec(PDU_SIP_Request req_req) runs on IMS_ConnHdlr +{ + var Security_client security_client := req_req.msgHeader.security_client; + f_ims_parse_security_client(security_client); +} + +/* Peer is calling us, accept it: */ +altstep as_IMS_register(boolean exp_update_to_direct_rtp := true, + boolean fail_others := true) runs on IMS_ConnHdlr +{ + var template (present) PDU_SIP_Request exp_req := + tr_SIP_REGISTER(g_pars.registrar_sip_req_uri, + ?, + tr_SipAddr(), + tr_SipAddr(), + tr_Via_from(?), + require := tr_Require(superset("sec-agree")), + security_client := tr_Security_client(superset(tr_Security_mechanism("ipsec-3gpp", + superset(tr_Param("alg","hmac-sha-1-96"))))), + supported := tr_Supported(superset("path", "sec-agree"))); + var charstring sip_expect_str := log2str(exp_req); + + [] SIP.receive(exp_req) -> value g_rx_sip_req { + var template (value) PDU_SIP_Response tx_resp; + var Via via; + var CallidString sip_call_id; + var Contact contact; + var template (value) SipAddr from_addr; + var template (value) SipAddr to_addr; + var template (value) CommaParam_List digestCln ; + var template (value) WwwAuthenticate wwwAuthenticate; + var template (value) Security_server security_server; + var template (value) Server server_name := ts_Server({c_sip_server_name}); + var template (value) Supported supported := ts_Supported({"sec-agree"}); + var Authorization authorization; + var integer sip_seq_nr; + var charstring tx_sdp; + + sip_call_id := g_rx_sip_req.msgHeader.callId.callid; + via := g_rx_sip_req.msgHeader.via; + via.viaBody[0].viaParams := f_sip_param_set(via.viaBody[0].viaParams, "rport", "1234"); /* TODO: set remote src port of the REGISTER */ + from_addr := ts_SipAddr_from_Addr_Union(g_rx_sip_req.msgHeader.fromField.addressField, + g_rx_sip_req.msgHeader.fromField.fromParams); + to_addr := ts_SipAddr_from_Addr_Union(g_rx_sip_req.msgHeader.toField.addressField, + g_rx_sip_req.msgHeader.toField.toParams); + sip_seq_nr := g_rx_sip_req.msgHeader.cSeq.seqNumber; + + contact := g_rx_sip_req.msgHeader.contact; + f_ims_validate_register_contact(contact); + + /* TODO: Validate "Expires" is 600000 */ + /* TODO: validate presence of: + * Security-Client: ipsec-3gpp; alg=hmac-md5-96; ealg=des-ede3-cbc; spi-c=431842084; spi-s=650017092; port-c=41271; port-s=41718,ipsec-3gpp; alg=hmac-md5-96; ealg=aes-cbc; spi-c=431842084; spi-s=650017092; port-c=41271; port-s=41718,ipsec-3gpp; alg=hmac-md5-96; ealg=null; spi-c=431842084; spi-s=650017092; port-c=41271; port-s=41718,ipsec-3gpp; alg=hmac-sha-1-96; ealg=des-ede3-cbc; spi-c=431842084; spi-s=650017092; port-c=41271; port-s=41718,ipsec-3gpp; alg=hmac-sha-1-96; ealg=aes-cbc; spi-c=431842084; spi-s=650017092; port-c=41271; port-s=41718,ipsec-3gpp; alg=hmac-sha-1-96; ealg=null; spi-c=431842084; spi-s=650017092; port-c=41271; port-s=41718 + */ + + /* Tx 100 Tyring */ + tx_resp := ts_SIP_Response_Trying(sip_call_id, + from_addr, + to_addr, + via, + sip_seq_nr, + "REGISTER", + allow := omit, + server := server_name, + userAgent := omit); + SIP.send(tx_resp); + + f_ims_setup_ipsec(g_rx_sip_req); + + to_addr.params := f_sip_param_set(to_addr.params, "tag", f_sip_rand_tag()); + + digestCln := { + ts_Param("realm", f_sip_str_quote(g_pars.realm)), + ts_Param("qop", f_sip_str_quote("auth")), + ts_Param("algorithm", "AKAv1-MD5"), + ts_Param("nonce", f_sip_str_quote("FJh2MfZfjjeIoHmLbrzQjvbhmnzLAoAAoGsZyVRFFuU=")) + /* "opaque not needed in IMS "*/ + }; + wwwAuthenticate := ts_WwwAuthenticate( { ts_Challenge_digestCln(digestCln) } ) + + /* Security-Server: ipsec-3gpp;q=0.1;prot=esp;mod=trans;spi-c=4096;spi-s=4097;port-c=5104;port-s=6104;alg=hmac-sha-1-96;ealg=null */ + var template (value) SemicolonParam_List sec_params := { + ts_Param("q", "0.1"), + ts_Param("prot", "esp"), + ts_Param("mod", "trans"), + ts_Param("spi-c", int2str(g_pars.ipsec_local_spi_c)), + ts_Param("spi-s", int2str(g_pars.ipsec_local_spi_s)), + ts_Param("port-c", int2str(g_pars.local_sip_port)), + ts_Param("port-s", int2str(g_pars.local_sip_port)), + ts_Param("alg", "hmac-sha-1-96"), + ts_Param("ealg", "null") + }; + security_server := ts_Security_server({ + ts_Security_mechanism("ipsec-3gpp", sec_params) + }); + /* Tx 401 Unauthorized + * TODO: with IMS params */ + tx_resp := ts_SIP_Response_Unauthorized(sip_call_id, + from_addr, + to_addr, + via, + wwwAuthenticate, + sip_seq_nr, + "REGISTER", + security_server := security_server, + server := server_name, + supported := supported, + userAgent := omit); + SIP.send(tx_resp); + + /* TODO: Generate expected Authoritzation based on AKAv1-MD5: */ + /*authorization := f_sip_digest_gen_Authorization(valueof(wwwAuthenticate), + g_pars.user, g_pars.password, + "REGISTER", + f_sip_SipUrl_to_str(g_pars.registrar_sip_record.addr.nameAddr.addrSpec)) + */ + /* TODO: match Authorization from above: */ + exp_req := + tr_SIP_REGISTER(g_pars.registrar_sip_req_uri, + ?, + tr_SipAddr(), + tr_SipAddr(), + tr_Via_from(?)); + SIP.receive(exp_req) -> value g_rx_sip_req; + + sip_call_id := g_rx_sip_req.msgHeader.callId.callid; + via := g_rx_sip_req.msgHeader.via; + from_addr := ts_SipAddr_from_Addr_Union(g_rx_sip_req.msgHeader.fromField.addressField, + g_rx_sip_req.msgHeader.fromField.fromParams); + to_addr := ts_SipAddr_from_Addr_Union(g_rx_sip_req.msgHeader.toField.addressField, + g_rx_sip_req.msgHeader.toField.toParams); + to_addr.params := f_sip_param_set(to_addr.params, "tag", f_sip_rand_tag()); + sip_seq_nr := g_rx_sip_req.msgHeader.cSeq.seqNumber; + + /* TODO: Add following fields: + * Supported: sec-agree + * Security-Server: ipsec-3gpp;q=0.1;prot=esp;mod=trans;spi-c=4096;spi-s=4097;port-c=5104;port-s=6104;alg=hmac-sha-1-96;ealg=null + * */ + + tx_resp := ts_SIP_Response(sip_call_id, + from_addr, + to_addr, + "REGISTER", 200, + sip_seq_nr, + "OK", + via); + SIP.send(tx_resp); + } + [fail_others] as_SIP_fail_resp(sip_expect_str); + [fail_others] as_SIP_fail_req(sip_expect_str); + +} + } diff --git a/library/SIP_Templates.ttcn b/library/SIP_Templates.ttcn index e2be94b..ffd6f2b 100644 --- a/library/SIP_Templates.ttcn +++ b/library/SIP_Templates.ttcn @@ -853,12 +853,18 @@ Via via, integer seq_nr, charstring method := "INVITE", + template (omit) Allow allow := omit, + template (omit) Server server := omit, + template (omit) UserAgent userAgent := omit, template (omit) charstring body := omit) := { statusLine := ts_SIP_StatusLine(100, "Trying"), msgHeader := ts_SIP_msgh_std(call_id, from_addr, to_addr, omit, method, seq_nr, via, content_length := f_ContentLength(body), - content_type := f_ContentTypeOrOmit(ts_CT_SDP, body)), + content_type := f_ContentTypeOrOmit(ts_CT_SDP, body), + allow := allow, + server := server, + userAgent := userAgent), messageBody := body, payload := omit } @@ -881,6 +887,37 @@ payload := omit } +/* 401 Unauthorized */ +template (value) PDU_SIP_Response +ts_SIP_Response_Unauthorized( + template (value) CallidString call_id, + template (value) SipAddr from_addr, + template (value) SipAddr to_addr, + Via via, + template (value) WwwAuthenticate wwwAuthenticate, + integer seq_nr, + charstring method := "REGISTER", + template (omit) Allow allow := omit, + template (omit) Security_server security_server := omit, + template (omit) Server server := omit, + template (omit) Supported supported := omit, + template (omit) UserAgent userAgent := omit, + template (omit) charstring body := omit) := { + statusLine := ts_SIP_StatusLine(401, "Unauthorized"), + msgHeader := ts_SIP_msgh_std(call_id, from_addr, to_addr, omit, method, seq_nr, + via, + content_length := f_ContentLength(body), + content_type := f_ContentTypeOrOmit(ts_CT_SDP, body), + allow := allow, + security_server := security_server, + server := server, + supported := supported, + userAgent := userAgent, + wwwAuthenticate := wwwAuthenticate), + messageBody := body, + payload := omit +} + template (present) PDU_SIP_Response tr_SIP_Response(template CallidString call_id, template SipAddr from_addr, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36759?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: Idb3b19ccd82cad25948106b2c72aa424d7f79cd8 Gerrit-Change-Number: 36759 Gerrit-PatchSet: 5 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

6 hours, 55 minutes

1
0
0 0

[M] Change in docker-playground[master]: ttcn3-asterisk: Configure asterisk for initial SIP register on IMS side

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/36831?usp=email ) Change subject: ttcn3-asterisk: Configure asterisk for initial SIP register on IMS side ...................................................................... ttcn3-asterisk: Configure asterisk for initial SIP register on IMS side This set of pjsip config requires work done by jolly in our fork of asterisk adding IMS features. Depends: osmo-ttcn3-hacks.git Change-Id Idb3b19ccd82cad25948106b2c72aa424d7f79cd8 Change-Id: I66d128192146ad600203ea2a41b8bf019311d603 --- M ttcn3-asterisk-ims-ue-test/Asterisk_Tests.cfg M ttcn3-asterisk-ims-ue-test/asterisk/pjsip.conf 2 files changed, 67 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/31/36831/1 diff --git a/ttcn3-asterisk-ims-ue-test/Asterisk_Tests.cfg b/ttcn3-asterisk-ims-ue-test/Asterisk_Tests.cfg index c9011d5..40bc86e 100644 --- a/ttcn3-asterisk-ims-ue-test/Asterisk_Tests.cfg +++ b/ttcn3-asterisk-ims-ue-test/Asterisk_Tests.cfg @@ -20,6 +20,9 @@ Asterisk_Tests.mp_remote_sip_host := "172.18.11.10" Asterisk_Tests.mp_local_sip_port := 5061 Asterisk_Tests.mp_remote_sip_port := 5094 +Asterisk_Tests.mp_local_ims_host := "172.18.11.103" +Asterisk_Tests.mp_local_ims_port := 5060 +Asterisk_Tests.mp_ims_imsi := "238010000090828" Asterisk_Tests.mp_ami_remote_host := "172.18.11.10" [MAIN_CONTROLLER] diff --git a/ttcn3-asterisk-ims-ue-test/asterisk/pjsip.conf b/ttcn3-asterisk-ims-ue-test/asterisk/pjsip.conf index 57cab41..07f68ba 100644 --- a/ttcn3-asterisk-ims-ue-test/asterisk/pjsip.conf +++ b/ttcn3-asterisk-ims-ue-test/asterisk/pjsip.conf @@ -1,4 +1,6 @@ - +;############ +; LOCAL SIP +;############ [transport-udp] type=transport protocol=udp @@ -68,3 +70,51 @@ [0504](aor_phone_template) +;############ +; VoLTE +;############ +[transport-tcp] +type=transport +protocol=tcp +bind=172.18.11.10:5060 +ims_port_c=5555 +ims_port_s=5060 + +[volte_ims] +type=registration +transport=transport-tcp +outbound_auth=volte_ims +server_uri=sip:172.18.11.103 +client_uri=sip:238010000090828@172.18.11.103 +retry_interval=30 +fatal_retry_interval=30 +expiration=600000 +ims_aka=yes +contact_user=volte_ims +endpoint=volte_ims +line=yes + +[volte_ims] +type=endpoint +context=volte_ims +disallow=all +allow=vevs +outbound_auth=volte_ims +aors=volte_ims +rewrite_contact=yes +from_user=238010000090828 +from_domain=172.18.11.103 + +[volte_ims] +type=auth +auth_type=ims_aka +username=238010000090828(a)172.18.11.103 +usim_ami=no +usim_opc=775A1F887D2AD66F9719C2C79F847B50 +usim_k=D534E07854B75E475C667A856AA31F9C +usim_sqn=000000011000 + +[volte_ims] +type=aor +contact=sip:238010000090828@172.18.11.103 +max_contacts=1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36831?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: I66d128192146ad600203ea2a41b8bf019311d603 Gerrit-Change-Number: 36831 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

6 hours, 55 minutes

1
0
0 0

[S] Change in osmo-ci[master]: jobs/ttcn3-testsuites.yml: add ttcn3-bts-test-io_uring

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/36830?usp=email ) Change subject: jobs/ttcn3-testsuites.yml: add ttcn3-bts-test-io_uring ...................................................................... jobs/ttcn3-testsuites.yml: add ttcn3-bts-test-io_uring osmo-bts in theory can also benefit from io_uring, at least because it can maintain multiple RTP connections for voice calls. Let's execute the respective testsuite with io_uring too. Change-Id: I3af791103d863290a53c9ce2d1a8d1d9e42e91c7 --- M jobs/ttcn3-testsuites.yml 1 file changed, 15 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/30/36830/1 diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml index ac79f4d..dda956c 100644 --- a/jobs/ttcn3-testsuites.yml +++ b/jobs/ttcn3-testsuites.yml @@ -236,6 +236,8 @@ timer: H 11 * * * - ttcn3-mgw-test-io_uring: timer: H 11 * * * + - ttcn3-bts-test-io_uring: + timer: H 11 * * * - job-template: name: '{job-name}' -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/36830?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: I3af791103d863290a53c9ce2d1a8d1d9e42e91c7 Gerrit-Change-Number: 36830 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

7 hours

1
0
0 0

[S] Change in osmo-mgw[master]: doc: example configs: fix deprecation warnings

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/36785?usp=email ) Change subject: doc: example configs: fix deprecation warnings ...................................................................... doc: example configs: fix deprecation warnings Fix for: range must end at an odd port number, autocorrecting port (16000) to: 16001 % Deprecated 'sdp audio-payload number <0-255>' config no longer has any effect % Deprecated 'sdp audio-payload name NAME' config no longer has any effect % Deprecated 'loop (0|1)' config no longer has any effect Change-Id: I62a4fd119de48039c3c450d5323d8f9b7de8120f --- M doc/examples/osmo-mgw/osmo-mgw-abis_e1.cfg M doc/examples/osmo-mgw/osmo-mgw.cfg 2 files changed, 17 insertions(+), 8 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/doc/examples/osmo-mgw/osmo-mgw-abis_e1.cfg b/doc/examples/osmo-mgw/osmo-mgw-abis_e1.cfg index dcf3663..cf53de2 100644 --- a/doc/examples/osmo-mgw/osmo-mgw-abis_e1.cfg +++ b/doc/examples/osmo-mgw/osmo-mgw-abis_e1.cfg @@ -14,15 +14,12 @@ e1_line 0 port 0 mgcp bind ip 127.0.0.1 - rtp port-range 4002 16000 + rtp port-range 4002 16001 rtp bind-ip 127.0.0.1 rtp ip-probing rtp ip-dscp 46 bind port 2427 - sdp audio payload number 98 - sdp audio payload name GSM number endpoints 512 - loop 0 force-realloc 1 rtcp-omit rtp-patch ssrc diff --git a/doc/examples/osmo-mgw/osmo-mgw.cfg b/doc/examples/osmo-mgw/osmo-mgw.cfg index 8535efe..0542edd 100644 --- a/doc/examples/osmo-mgw/osmo-mgw.cfg +++ b/doc/examples/osmo-mgw/osmo-mgw.cfg @@ -11,15 +11,12 @@ mgcp bind ip 127.0.0.1 - rtp port-range 4002 16000 + rtp port-range 4002 16001 rtp bind-ip 127.0.0.1 rtp ip-probing rtp ip-dscp 46 bind port 2427 - sdp audio payload number 98 - sdp audio payload name GSM number endpoints 512 - loop 0 force-realloc 1 rtcp-omit rtp-patch ssrc -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/36785?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: I62a4fd119de48039c3c450d5323d8f9b7de8120f Gerrit-Change-Number: 36785 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

7 hours, 8 minutes

1
0
0 0

[M] Change in osmo-trx[master]: contrib/systemd: run as osmocom user

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/30131?usp=email ) Change subject: contrib/systemd: run as osmocom user ...................................................................... contrib/systemd: run as osmocom user I have verified that with AmbientCapabilities=CAP_SYS_NICE, setting scheduling policy as described in the manual still works as expected. Related: OS#4107 Change-Id: I3e0e5978992dac0a0c76c6f0e859576aa3eb72eb --- M contrib/systemd/osmo-trx-ipc.service M contrib/systemd/osmo-trx-lms.service M contrib/systemd/osmo-trx-uhd.service M contrib/systemd/osmo-trx-usrp1.service A debian/osmo-trx-ipc.postinst A debian/osmo-trx-lms.postinst A debian/osmo-trx-uhd.postinst A debian/osmo-trx-usrp1.postinst 8 files changed, 177 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/contrib/systemd/osmo-trx-ipc.service b/contrib/systemd/osmo-trx-ipc.service index c7f7c17..12372c0 100644 --- a/contrib/systemd/osmo-trx-ipc.service +++ b/contrib/systemd/osmo-trx-ipc.service @@ -8,8 +8,11 @@ Restart=always StateDirectory=osmocom WorkingDirectory=%S/osmocom +User=osmocom +Group=osmocom ExecStart=/usr/bin/osmo-trx-ipc -C /etc/osmocom/osmo-trx-ipc.cfg RestartSec=2 +AmbientCapabilities=CAP_SYS_NICE # CPU scheduling policy: CPUSchedulingPolicy=rr # For real-time scheduling policies an integer between 1 (lowest priority) and 99 (highest priority): diff --git a/contrib/systemd/osmo-trx-lms.service b/contrib/systemd/osmo-trx-lms.service index f51bd45..09c7475 100644 --- a/contrib/systemd/osmo-trx-lms.service +++ b/contrib/systemd/osmo-trx-lms.service @@ -8,8 +8,11 @@ Restart=always StateDirectory=osmocom WorkingDirectory=%S/osmocom +User=osmocom +Group=osmocom ExecStart=/usr/bin/osmo-trx-lms -C /etc/osmocom/osmo-trx-lms.cfg RestartSec=2 +AmbientCapabilities=CAP_SYS_NICE # CPU scheduling policy: CPUSchedulingPolicy=rr # For real-time scheduling policies an integer between 1 (lowest priority) and 99 (highest priority): diff --git a/contrib/systemd/osmo-trx-uhd.service b/contrib/systemd/osmo-trx-uhd.service index 6c5c2de..64eb510 100644 --- a/contrib/systemd/osmo-trx-uhd.service +++ b/contrib/systemd/osmo-trx-uhd.service @@ -9,8 +9,11 @@ StateDirectory=osmocom WorkingDirectory=%S/osmocom Environment=HOME=%h +User=osmocom +Group=osmocom ExecStart=/usr/bin/osmo-trx-uhd -C /etc/osmocom/osmo-trx-uhd.cfg RestartSec=2 +AmbientCapabilities=CAP_SYS_NICE # CPU scheduling policy: CPUSchedulingPolicy=rr # For real-time scheduling policies an integer between 1 (lowest priority) and 99 (highest priority): diff --git a/contrib/systemd/osmo-trx-usrp1.service b/contrib/systemd/osmo-trx-usrp1.service index 988c053..4e795a2 100644 --- a/contrib/systemd/osmo-trx-usrp1.service +++ b/contrib/systemd/osmo-trx-usrp1.service @@ -8,8 +8,11 @@ Restart=always StateDirectory=osmocom WorkingDirectory=%S/osmocom +User=osmocom +Group=osmocom ExecStart=/usr/bin/osmo-trx-usrp1 -C /etc/osmocom/osmo-trx-usrp1.cfg RestartSec=2 +AmbientCapabilities=CAP_SYS_NICE # CPU scheduling policy: CPUSchedulingPolicy=rr # For real-time scheduling policies an integer between 1 (lowest priority) and 99 (highest priority): diff --git a/debian/osmo-trx-ipc.postinst b/debian/osmo-trx-ipc.postinst new file mode 100755 index 0000000..ed0f889 --- /dev/null +++ b/debian/osmo-trx-ipc.postinst @@ -0,0 +1,38 @@ +#!/bin/sh -e +case "$1" in + configure) + # Create the osmocom group and user (if it doesn't exist yet) + if ! getent group osmocom >/dev/null; then + groupadd --system osmocom + fi + if ! getent passwd osmocom >/dev/null; then + useradd \ + --system \ + --gid osmocom \ + --home-dir /var/lib/osmocom \ + --shell /sbin/nologin \ + --comment "Open Source Mobile Communications" \ + osmocom + fi + + # Fix permissions of previous (root-owned) install (OS#4107) + if dpkg --compare-versions "$2" le "1.13.0"; then + if [ -e /etc/osmocom/osmo-trx-ipc.cfg ]; then + chown -v osmocom:osmocom /etc/osmocom/osmo-trx-ipc.cfg + chmod -v 0660 /etc/osmocom/osmo-trx-ipc.cfg + fi + + if [ -d /etc/osmocom ]; then + chown -v root:osmocom /etc/osmocom + chmod -v 2775 /etc/osmocom + fi + + mkdir -p /var/lib/osmocom + chown -R -v osmocom:osmocom /var/lib/osmocom + fi + ;; +esac + +# dh_installdeb(1) will replace this with shell code automatically +# generated by other debhelper scripts. +#DEBHELPER# diff --git a/debian/osmo-trx-lms.postinst b/debian/osmo-trx-lms.postinst new file mode 100755 index 0000000..4040e98 --- /dev/null +++ b/debian/osmo-trx-lms.postinst @@ -0,0 +1,38 @@ +#!/bin/sh -e +case "$1" in + configure) + # Create the osmocom group and user (if it doesn't exist yet) + if ! getent group osmocom >/dev/null; then + groupadd --system osmocom + fi + if ! getent passwd osmocom >/dev/null; then + useradd \ + --system \ + --gid osmocom \ + --home-dir /var/lib/osmocom \ + --shell /sbin/nologin \ + --comment "Open Source Mobile Communications" \ + osmocom + fi + + # Fix permissions of previous (root-owned) install (OS#4107) + if dpkg --compare-versions "$2" le "1.13.0"; then + if [ -e /etc/osmocom/osmo-trx-lms.cfg ]; then + chown -v osmocom:osmocom /etc/osmocom/osmo-trx-lms.cfg + chmod -v 0660 /etc/osmocom/osmo-trx-lms.cfg + fi + + if [ -d /etc/osmocom ]; then + chown -v root:osmocom /etc/osmocom + chmod -v 2775 /etc/osmocom + fi + + mkdir -p /var/lib/osmocom + chown -R -v osmocom:osmocom /var/lib/osmocom + fi + ;; +esac + +# dh_installdeb(1) will replace this with shell code automatically +# generated by other debhelper scripts. +#DEBHELPER# diff --git a/debian/osmo-trx-uhd.postinst b/debian/osmo-trx-uhd.postinst new file mode 100755 index 0000000..2d1f62d --- /dev/null +++ b/debian/osmo-trx-uhd.postinst @@ -0,0 +1,38 @@ +#!/bin/sh -e +case "$1" in + configure) + # Create the osmocom group and user (if it doesn't exist yet) + if ! getent group osmocom >/dev/null; then + groupadd --system osmocom + fi + if ! getent passwd osmocom >/dev/null; then + useradd \ + --system \ + --gid osmocom \ + --home-dir /var/lib/osmocom \ + --shell /sbin/nologin \ + --comment "Open Source Mobile Communications" \ + osmocom + fi + + # Fix permissions of previous (root-owned) install (OS#4107) + if dpkg --compare-versions "$2" le "1.13.0"; then + if [ -e /etc/osmocom/osmo-trx-uhd.cfg ]; then + chown -v osmocom:osmocom /etc/osmocom/osmo-trx-uhd.cfg + chmod -v 0660 /etc/osmocom/osmo-trx-uhd.cfg + fi + + if [ -d /etc/osmocom ]; then + chown -v root:osmocom /etc/osmocom + chmod -v 2775 /etc/osmocom + fi + + mkdir -p /var/lib/osmocom + chown -R -v osmocom:osmocom /var/lib/osmocom + fi + ;; +esac + +# dh_installdeb(1) will replace this with shell code automatically +# generated by other debhelper scripts. +#DEBHELPER# diff --git a/debian/osmo-trx-usrp1.postinst b/debian/osmo-trx-usrp1.postinst new file mode 100755 index 0000000..93585e6 --- /dev/null +++ b/debian/osmo-trx-usrp1.postinst @@ -0,0 +1,38 @@ +#!/bin/sh -e +case "$1" in + configure) + # Create the osmocom group and user (if it doesn't exist yet) + if ! getent group osmocom >/dev/null; then + groupadd --system osmocom + fi + if ! getent passwd osmocom >/dev/null; then + useradd \ + --system \ + --gid osmocom \ + --home-dir /var/lib/osmocom \ + --shell /sbin/nologin \ + --comment "Open Source Mobile Communications" \ + osmocom + fi + + # Fix permissions of previous (root-owned) install (OS#4107) + if dpkg --compare-versions "$2" le "1.13.0"; then + if [ -e /etc/osmocom/osmo-trx-usrp1.cfg ]; then + chown -v osmocom:osmocom /etc/osmocom/osmo-trx-usrp1.cfg + chmod -v 0660 /etc/osmocom/osmo-trx-usrp1.cfg + fi + + if [ -d /etc/osmocom ]; then + chown -v root:osmocom /etc/osmocom + chmod -v 2775 /etc/osmocom + fi + + mkdir -p /var/lib/osmocom + chown -R -v osmocom:osmocom /var/lib/osmocom + fi + ;; +esac + +# dh_installdeb(1) will replace this with shell code automatically +# generated by other debhelper scripts. +#DEBHELPER# -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/30131?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I3e0e5978992dac0a0c76c6f0e859576aa3eb72eb Gerrit-Change-Number: 30131 Gerrit-PatchSet: 4 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

7 hours, 8 minutes

1
0
0 0

[S] Change in docker-playground[master]: ttcn3-asterisk: Enable debug in log file

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36786?usp=email ) Change subject: ttcn3-asterisk: Enable debug in log file ...................................................................... ttcn3-asterisk: Enable debug in log file Change-Id: Ifbc8208507ba47e9f6a1eaf5a43465d2a1af08c1 --- M ttcn3-asterisk-ims-ue-test/asterisk/asterisk.conf M ttcn3-asterisk-ims-ue-test/asterisk/asterisk.sh A ttcn3-asterisk-ims-ue-test/asterisk/logger.conf 3 files changed, 16 insertions(+), 1 deletion(-) Approvals: osmith: Looks good to me, but someone else must approve pespin: Looks good to me, approved laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/ttcn3-asterisk-ims-ue-test/asterisk/asterisk.conf b/ttcn3-asterisk-ims-ue-test/asterisk/asterisk.conf index a17d606..3ec5f17 100644 --- a/ttcn3-asterisk-ims-ue-test/asterisk/asterisk.conf +++ b/ttcn3-asterisk-ims-ue-test/asterisk/asterisk.conf @@ -14,7 +14,7 @@ [options] ;verbose = 3 -;debug = 3 +debug = 1 ;trace = 0 ; Set the trace level. ;refdebug = yes ; Enable reference count debug logging. ;alwaysfork = yes ; Same as -F at startup. diff --git a/ttcn3-asterisk-ims-ue-test/asterisk/asterisk.sh b/ttcn3-asterisk-ims-ue-test/asterisk/asterisk.sh index c79408d..f9b4bf5 100755 --- a/ttcn3-asterisk-ims-ue-test/asterisk/asterisk.sh +++ b/ttcn3-asterisk-ims-ue-test/asterisk/asterisk.sh @@ -12,6 +12,7 @@ #sed -i "s#/etc/asterisk#${ASTERISK_CFG_PATH}#" "${ASTERISK_CFG_PATH}/asterisk.conf" cp /data/pjsip.conf "${ASTERISK_CFG_PATH}/" cp /data/manager.conf "${ASTERISK_CFG_PATH}/" +cp /data/logger.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/logger.conf b/ttcn3-asterisk-ims-ue-test/asterisk/logger.conf new file mode 100644 index 0000000..292e624 --- /dev/null +++ b/ttcn3-asterisk-ims-ue-test/asterisk/logger.conf @@ -0,0 +1,5 @@ +[logfiles] +;messages = notice,warning,error +;console = verbose,notice,warning,error,debug,trace,dtmf +console = * +;security = security -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36786?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: Ifbc8208507ba47e9f6a1eaf5a43465d2a1af08c1 Gerrit-Change-Number: 36786 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

7 hours, 9 minutes

1
0
0 0

[S] Change in docker-playground[master]: ttcn3-asterisk: Enable debug for pjproject

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36795?usp=email ) Change subject: ttcn3-asterisk: Enable debug for pjproject ...................................................................... ttcn3-asterisk: Enable debug for pjproject Change-Id: I7de6ac31f7a75411fb515501611187f97e829ab3 --- M ttcn3-asterisk-ims-ue-test/asterisk/asterisk.sh A ttcn3-asterisk-ims-ue-test/asterisk/pjproject.conf 2 files changed, 23 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/ttcn3-asterisk-ims-ue-test/asterisk/asterisk.sh b/ttcn3-asterisk-ims-ue-test/asterisk/asterisk.sh index f9b4bf5..b31015f 100755 --- a/ttcn3-asterisk-ims-ue-test/asterisk/asterisk.sh +++ b/ttcn3-asterisk-ims-ue-test/asterisk/asterisk.sh @@ -10,6 +10,7 @@ #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/pjproject.conf "${ASTERISK_CFG_PATH}/" cp /data/pjsip.conf "${ASTERISK_CFG_PATH}/" cp /data/manager.conf "${ASTERISK_CFG_PATH}/" cp /data/logger.conf "${ASTERISK_CFG_PATH}/" diff --git a/ttcn3-asterisk-ims-ue-test/asterisk/pjproject.conf b/ttcn3-asterisk-ims-ue-test/asterisk/pjproject.conf new file mode 100644 index 0000000..fdcc545 --- /dev/null +++ b/ttcn3-asterisk-ims-ue-test/asterisk/pjproject.conf @@ -0,0 +1,13 @@ +[startup] +;https://docs.asterisk.org/Certified-Asterisk_18.9_Documentation/API_Documentation/Module_Configuration/res_pjproject/ +; These logging level meanings are typically used by pjproject: +; - 0: fatal error +; - 1: error +; - 2: warning +; - 3: info +; - 4: debug +; - 5: trace +; - 6: more detailed trace +; +; log_level 6 "trace" is too much. +log_level=5 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36795?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: I7de6ac31f7a75411fb515501611187f97e829ab3 Gerrit-Change-Number: 36795 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

7 hours, 9 minutes

1
0
0 0

[S] Change in docker-playground[master]: ttcn3-asterisk: Enable debug for pjproject

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36795?usp=email ) Change subject: ttcn3-asterisk: Enable debug for pjproject ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36795?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: I7de6ac31f7a75411fb515501611187f97e829ab3 Gerrit-Change-Number: 36795 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 15 May 2024 11:57:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

7 hours, 9 minutes

1
0
0 0

[S] Change in docker-playground[master]: ttcn3-asterisk: Enable debug in log file

by pespin

Attention is currently required from: jolly. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36786?usp=email ) Change subject: ttcn3-asterisk: Enable debug in log file ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36786?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: Ifbc8208507ba47e9f6a1eaf5a43465d2a1af08c1 Gerrit-Change-Number: 36786 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Wed, 15 May 2024 11:57:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

7 hours, 9 minutes

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: SIP_Templates: Always set Content-Length

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36814?usp=email ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: SIP_Templates: Always set Content-Length ...................................................................... SIP_Templates: Always set Content-Length According to RFC3261 7.4.2, 7.5, 20.14 Content-Length SHOULD be set over any transport, and MUST be set over TCP. Hence, make sure we set it in all cases. This allows Asterisk being able to decode SIP messages sent to it over a TCP connection, since it uses the Content-Length field to look up for message boundaries over the TCP stream. Change-Id: I26e444fe466b4742d74ef5a6e371ce8488a5afcf --- M library/SIP_Templates.ttcn 1 file changed, 68 insertions(+), 17 deletions(-) Approvals: osmith: Looks good to me, approved Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve diff --git a/library/SIP_Templates.ttcn b/library/SIP_Templates.ttcn index 65f9d22..e2be94b 100644 --- a/library/SIP_Templates.ttcn +++ b/library/SIP_Templates.ttcn @@ -201,6 +201,16 @@ } +// [20.14] +template (value) ContentLength ts_ContentLength(template (value) integer len := 0) := { + fieldName := CONTENT_LENGTH_E, + len := len +} +template (present) ContentLength tr_ContentLength(template (present) integer len := ?) := { + fieldName := CONTENT_LENGTH_E, + len := len +} + // [20.19] template (value) Expires ts_Expires(template (value) DeltaSec deltaSec := "7200") := { fieldName := EXPIRES_E, @@ -419,6 +429,16 @@ return ct; } +private function f_ContentLength(template (omit) charstring body) +return template (value) ContentLength { + /* rfc3261 20.14: "If no body is present in a message, then the + * Content-Length header field value MUST be set to zero." */ + if (istemplatekind(body, "omit")) { + return ts_ContentLength(0); + } + return ts_ContentLength(lengthof(body)); +} + template (value) ContentType ts_CT_SDP := { fieldName := CONTENT_TYPE_E, mediaType := "application/sdp" @@ -539,6 +559,7 @@ template (value) charstring method, template (value) integer seq_nr, template (value) Via via, + template (omit) ContentLength content_length := ts_ContentLength(0), template (omit) ContentType content_type := omit, template (omit)Authorization authorization := omit, template (omit) Allow allow := ts_Allow(c_SIP_defaultMethods), @@ -558,6 +579,7 @@ callid := call_id }, contact := contact, + contentLength := content_length, contentType := content_type, cSeq := { fieldName := CSEQ_E, @@ -592,8 +614,9 @@ template Contact contact, template (present) Via via := tr_Via_from(?), template charstring method, - template ContentType content_type := *, template integer seq_nr := ?, + template ContentLength content_length := *, + template ContentType content_type := *, template Allow allow := *, template Expires expires := *, template Require require := *, @@ -610,6 +633,7 @@ callid := call_id }, contact := contact, + contentLength := content_length, contentType := content_type, cSeq := { fieldName := CSEQ_E, @@ -655,7 +679,8 @@ requestLine := ts_SIP_ReqLine(REGISTER_E, sip_url_host_port), msgHeader := ts_SIP_msgh_std(call_id, from_addr, to_addr, contact, "REGISTER", seq_nr, via, - f_ContentTypeOrOmit(ts_CT_SDP, body), + content_length := f_ContentLength(body), + content_type := f_ContentTypeOrOmit(ts_CT_SDP, body), authorization := authorization, expires := expires, require := require, @@ -679,7 +704,7 @@ template charstring body := *) := { requestLine := tr_SIP_ReqLine(REGISTER_E, sip_url_host_port), msgHeader := tr_SIP_msgh_std(call_id, from_addr, to_addr, contact, - via, "REGISTER", *, seq_nr, + via, "REGISTER", seq_nr, expires := expires, require := require, security_client := security_client, @@ -700,7 +725,8 @@ msgHeader := ts_SIP_msgh_std(call_id, from_addr, to_addr, contact, "INVITE", seq_nr, via, - f_ContentTypeOrOmit(ts_CT_SDP, body)), + content_length := f_ContentLength(body), + content_type := f_ContentTypeOrOmit(ts_CT_SDP, body)), messageBody := body, payload := omit } @@ -714,7 +740,7 @@ template charstring body) := { requestLine := tr_SIP_ReqLine(INVITE_E, uri), msgHeader := tr_SIP_msgh_std(call_id, from_addr, to_addr, ?, - via, "INVITE", *, seq_nr), + via, "INVITE", seq_nr), messageBody := body, payload := omit } @@ -728,7 +754,9 @@ template (omit) charstring body) := { requestLine := ts_SIP_ReqLine(BYE_E, to_addr.addr.nameAddr.addrSpec), msgHeader := ts_SIP_msgh_std(call_id, from_addr, to_addr, omit, "BYE", seq_nr, - via, f_ContentTypeOrOmit(ts_CT_SDP, body)), + via, + content_length := f_ContentLength(body), + content_type := f_ContentTypeOrOmit(ts_CT_SDP, body)), messageBody := body, payload := omit } @@ -743,7 +771,7 @@ template charstring body := *) := { requestLine := tr_SIP_ReqLine(BYE_E, uri), msgHeader := tr_SIP_msgh_std(call_id, from_addr, to_addr, omit, - via, "BYE", *, seq_nr), + via, "BYE", seq_nr), messageBody := body, payload := omit } @@ -761,7 +789,8 @@ ts_Contact_SipAddr(from_addr), "ACK", seq_nr, via, - f_ContentTypeOrOmit(ts_CT_SDP, body)), + content_length := f_ContentLength(body), + content_type := f_ContentTypeOrOmit(ts_CT_SDP, body)), messageBody := body, payload := omit } @@ -776,7 +805,7 @@ requestLine := tr_SIP_ReqLine(ACK_E, uri), msgHeader := tr_SIP_msgh_std(call_id, from_addr, to_addr, *, via, - "ACK", *, seq_nr), + "ACK", seq_nr), messageBody := body, payload := omit } @@ -792,7 +821,7 @@ requestLine := tr_SIP_ReqLine(CANCEL_E, uri), msgHeader := tr_SIP_msgh_std(call_id, from_addr, to_addr, *, via, - "CANCEL", *, seq_nr), + "CANCEL", seq_nr), messageBody := body, payload := omit } @@ -809,7 +838,9 @@ template (omit) charstring body := omit) := { statusLine := ts_SIP_StatusLine(status_code, reason), msgHeader := ts_SIP_msgh_std(call_id, from_addr, to_addr, omit, method, seq_nr, - via, f_ContentTypeOrOmit(ts_CT_SDP, body)), + via, + content_length := f_ContentLength(body), + content_type := f_ContentTypeOrOmit(ts_CT_SDP, body)), messageBody := body, payload := omit } @@ -825,7 +856,9 @@ template (omit) charstring body := omit) := { statusLine := ts_SIP_StatusLine(100, "Trying"), msgHeader := ts_SIP_msgh_std(call_id, from_addr, to_addr, omit, method, seq_nr, - via, f_ContentTypeOrOmit(ts_CT_SDP, body)), + via, + content_length := f_ContentLength(body), + content_type := f_ContentTypeOrOmit(ts_CT_SDP, body)), messageBody := body, payload := omit } @@ -841,7 +874,9 @@ template (omit) charstring body := omit) := { statusLine := ts_SIP_StatusLine(180, "Ringing"), msgHeader := ts_SIP_msgh_std(call_id, from_addr, to_addr, omit, method, seq_nr, - via, f_ContentTypeOrOmit(ts_CT_SDP, body)), + via, + content_length := f_ContentLength(body), + content_type := f_ContentTypeOrOmit(ts_CT_SDP, body)), messageBody := body, payload := omit } @@ -860,7 +895,7 @@ statusLine := tr_SIP_StatusLine(status_code, reason), msgHeader := tr_SIP_msgh_std(call_id, from_addr, to_addr, contact, via, - method, *, seq_nr), + method, seq_nr), messageBody := body, payload := omit } @@ -882,7 +917,7 @@ statusLine := tr_SIP_StatusLine(status_code, reason), msgHeader := tr_SIP_msgh_std(call_id, from_addr, to_addr, contact, via, - method, *, seq_nr, + method, seq_nr, wwwAuthenticate := wwwAuthenticate), messageBody := body, payload := omit @@ -903,7 +938,7 @@ statusLine := tr_SIP_StatusLine(status_code, reason), msgHeader := tr_SIP_msgh_std(call_id, from_addr, to_addr, omit, via, - method, *, seq_nr), + method, seq_nr), messageBody := body, payload := omit } @@ -923,7 +958,7 @@ statusLine := tr_SIP_StatusLine(status_code, reason), msgHeader := tr_SIP_msgh_std(call_id, from_addr, to_addr, *, via, - method, *, seq_nr), + method, seq_nr), messageBody := body, payload := omit } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36814?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: I26e444fe466b4742d74ef5a6e371ce8488a5afcf Gerrit-Change-Number: 36814 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

7 hours, 9 minutes

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: SIP_Templates: Allow passing Server field

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36797?usp=email ) ( 2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: SIP_Templates: Allow passing Server field ...................................................................... SIP_Templates: Allow passing Server field This field is used by an IMS core. Change-Id: I7816eb4565fb027a2902c60c600a75b96dc293bc --- M library/SIP_Templates.ttcn 1 file changed, 25 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/library/SIP_Templates.ttcn b/library/SIP_Templates.ttcn index e6e8b53..65f9d22 100644 --- a/library/SIP_Templates.ttcn +++ b/library/SIP_Templates.ttcn @@ -218,6 +218,16 @@ optionsTags := optionsTags } +// [20.35 RFC2616 14.38] +template (value) Server ts_Server(template (value) ServerVal_List serverBody := {}) := { + fieldName := SERVER_E, + serverBody := serverBody +} +template (present) Server tr_Server(template (present) ServerVal_List serverBody := ?) := { + fieldName := SERVER_E, + serverBody := serverBody +} + // [20.37] template (value) Supported ts_Supported(template (value) OptionTag_List optionsTags := {}) := { fieldName := SUPPORTED_E, @@ -536,6 +546,7 @@ template (omit) Require require := omit, template (omit) Security_client security_client := omit, template (omit) Security_server security_server := omit, + template (omit) Server server := omit, template (omit) Supported supported := omit, template (omit) UserAgent userAgent := ts_UserAgent({ "osmo-ttcn3-hacks/0.23" }), template (omit) WwwAuthenticate wwwAuthenticate := omit @@ -562,6 +573,7 @@ require := require, security_client := security_client, security_server := security_server, + server := server, supported := supported, toField := { fieldName := TO_E, @@ -587,6 +599,7 @@ template Require require := *, template Security_client security_client := *, template Security_server security_server := *, + template Server server := *, template Supported supported := *, template UserAgent userAgent := *, template WwwAuthenticate wwwAuthenticate := * @@ -612,6 +625,7 @@ require := require, security_client := security_client, security_server := security_server, + server := server, supported := supported, toField := { fieldName := TO_E, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36797?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: I7816eb4565fb027a2902c60c600a75b96dc293bc Gerrit-Change-Number: 36797 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

7 hours, 9 minutes

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: SIP_Templates: Add ts_SIP_Response_Trying

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36794?usp=email ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: SIP_Templates: Add ts_SIP_Response_Trying ...................................................................... SIP_Templates: Add ts_SIP_Response_Trying Similar to ts_SIP_Response_Ringing. We also have the counterpart tr_* for both Trying and Ringing. This is needed in a follow-up patch. Change-Id: I05d8be9ce8860c610c509670392e14f1096fdddb --- M library/SIP_Templates.ttcn 1 file changed, 28 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, but someone else must approve osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/SIP_Templates.ttcn b/library/SIP_Templates.ttcn index 1eeccb9..e1c9ec6 100644 --- a/library/SIP_Templates.ttcn +++ b/library/SIP_Templates.ttcn @@ -792,7 +792,22 @@ messageBody := body, payload := omit } - +/* 100 Trying */ +template (value) PDU_SIP_Response +ts_SIP_Response_Trying( + template (value) CallidString call_id, + template (value) SipAddr from_addr, + template (value) SipAddr to_addr, + Via via, + integer seq_nr, + charstring method := "INVITE", + template (omit) charstring body := omit) := { + statusLine := ts_SIP_StatusLine(100, "Trying"), + msgHeader := ts_SIP_msgh_std(call_id, from_addr, to_addr, omit, method, seq_nr, + via, f_ContentTypeOrOmit(ts_CT_SDP, body)), + messageBody := body, + payload := omit +} /* 180 Ringing */ template (value) PDU_SIP_Response ts_SIP_Response_Ringing( -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36794?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: I05d8be9ce8860c610c509670392e14f1096fdddb Gerrit-Change-Number: 36794 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

7 hours, 9 minutes

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: SIP_Templates: Allow passing 'Allow' field

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36793?usp=email ) Change subject: SIP_Templates: Allow passing 'Allow' field ...................................................................... SIP_Templates: Allow passing 'Allow' field Change-Id: I10dd36d8c0ef8dbcbb58016c9684d877a0455b03 --- M library/SIP_Templates.ttcn 1 file changed, 23 insertions(+), 22 deletions(-) Approvals: osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/SIP_Templates.ttcn b/library/SIP_Templates.ttcn index d35813e..1eeccb9 100644 --- a/library/SIP_Templates.ttcn +++ b/library/SIP_Templates.ttcn @@ -66,6 +66,16 @@ } } +// [20.5] +template (present) Allow tr_Allow(template Method_List methods := *) := { + fieldName := ALLOW_E, + methods := methods +} +template (value) Allow ts_Allow(template (omit) Method_List methods := omit) := { + fieldName := ALLOW_E, + methods := methods +} + template (value) Credentials ts_Credentials_DigestResponse(template (value) CommaParam_List digestResponse) := { digestResponse := digestResponse } @@ -511,7 +521,7 @@ template (value) Via via, template (omit) ContentType content_type := omit, template (omit)Authorization authorization := omit, - template (value) Method_List allow_methods := c_SIP_defaultMethods, + template (omit) Allow allow := ts_Allow(c_SIP_defaultMethods), template (omit) Expires expires := omit, template (omit) Require require := omit, template (omit) Security_client security_client := omit, @@ -519,10 +529,7 @@ template (omit) Supported supported := omit, template (omit) WwwAuthenticate wwwAuthenticate := omit ) modifies ts_SIP_msgHeader_empty := { - allow := { - fieldName := ALLOW_E, - methods := allow_methods - }, + allow := allow, authorization := authorization, callId := { fieldName := CALL_ID_E, @@ -560,21 +567,6 @@ wwwAuthenticate := wwwAuthenticate } -function tr_AllowMethods(template Method_List allow_methods) return template Allow { - if (istemplatekind(allow_methods, "omit")) { - return omit; - } else if (istemplatekind(allow_methods, "*")) { - return *; - } else if (istemplatekind(allow_methods, "?")) { - return ?; - } - var template (present) Allow ret := { - fieldName := ALLOW_E, - methods := allow_methods - } - return ret -} - template (present) MessageHeader tr_SIP_msgh_std(template CallidString call_id, template SipAddr from_addr, @@ -584,7 +576,7 @@ template charstring method, template ContentType content_type := *, template integer seq_nr := ?, - template Method_List allow_methods := *, + template Allow allow := *, template Expires expires := *, template Require require := *, template Security_client security_client := *, @@ -592,7 +584,7 @@ template Supported supported := *, template WwwAuthenticate wwwAuthenticate := * ) modifies t_SIP_msgHeader_any := { - allow := tr_AllowMethods(allow_methods), + allow := allow, callId := { fieldName := CALL_ID_E, callid := call_id -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36793?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: I10dd36d8c0ef8dbcbb58016c9684d877a0455b03 Gerrit-Change-Number: 36793 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

7 hours, 9 minutes

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: SIP_Templates: Allow passing UserAgent field

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36796?usp=email ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: SIP_Templates: Allow passing UserAgent field ...................................................................... SIP_Templates: Allow passing UserAgent field This way it can be set to omit, since this field is not set by an IMS core. Change-Id: Ib1e3e66b8fe46ad2626b07193dfcaa594f26352e --- M library/SIP_Templates.ttcn 1 file changed, 26 insertions(+), 7 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/SIP_Templates.ttcn b/library/SIP_Templates.ttcn index e1c9ec6..e6e8b53 100644 --- a/library/SIP_Templates.ttcn +++ b/library/SIP_Templates.ttcn @@ -228,6 +228,16 @@ optionsTags := optionsTags } +// [20.41 RFC2616 14.43] +template (value) UserAgent ts_UserAgent(template (value) ServerVal_List userAgentBody := {}) := { + fieldName := USER_AGENT_E, + userAgentBody := userAgentBody +} +template (present) UserAgent tr_UserAgent(template (present) ServerVal_List userAgentBody := ?) := { + fieldName := USER_AGENT_E, + userAgentBody := userAgentBody +} + template (value) SipAddr ts_SipAddr(template (value) HostPort host_port, template (omit) UserInfo user_info := omit, @@ -527,6 +537,7 @@ template (omit) Security_client security_client := omit, template (omit) Security_server security_server := omit, template (omit) Supported supported := omit, + template (omit) UserAgent userAgent := ts_UserAgent({ "osmo-ttcn3-hacks/0.23" }), template (omit) WwwAuthenticate wwwAuthenticate := omit ) modifies ts_SIP_msgHeader_empty := { allow := allow, @@ -557,12 +568,7 @@ addressField := to_addr.addr, toParams := to_addr.params }, - userAgent := { - fieldName := USER_AGENT_E, - userAgentBody := { - "osmo-ttcn3-hacks/0.23" - } - }, + userAgent := userAgent, via := via, wwwAuthenticate := wwwAuthenticate } @@ -582,6 +588,7 @@ template Security_client security_client := *, template Security_server security_server := *, template Supported supported := *, + template UserAgent userAgent := *, template WwwAuthenticate wwwAuthenticate := * ) modifies t_SIP_msgHeader_any := { allow := allow, @@ -611,7 +618,7 @@ addressField := to_addr.addr, toParams := to_addr.params }, - userAgent := *, + userAgent := userAgent, via := via, wwwAuthenticate := wwwAuthenticate } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36796?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: Ib1e3e66b8fe46ad2626b07193dfcaa594f26352e Gerrit-Change-Number: 36796 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

7 hours, 9 minutes

1
0
0 0

2024

2023

2022

gerrit-log May 2024