- gerrit-log - lists.osmocom.org

[S] Change in osmo-pcap[master]: tests/Makefile.am: Fix trailing whitespace
by pespin 16 Dec '24

16 Dec '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcap/+/39152?usp=email ) Change subject: tests/Makefile.am: Fix trailing whitespace ...................................................................... tests/Makefile.am: Fix trailing whitespace Change-Id: I121a0d596a645e6c70b5c9d2ff394d263d2a1dc4 --- M tests/Makefile.am 1 file changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/52/39152/1 diff --git a/tests/Makefile.am b/tests/Makefile.am index 5084704..2098927 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -15,7 +15,7 @@ echo 'm4_define([AT_PACKAGE_URL],' && \ echo ' [$(PACKAGE_URL)])'; \ } >'$(srcdir)/package.m4' - + EXTRA_DIST = testsuite.at $(srcdir)/package.m4 $(TESTSUITE) DISTCLEANFILES = atconfig TESTSUITE = $(srcdir)/testsuite @@ -29,19 +29,19 @@ python-tests: echo "Not running python-based tests (determined at configure-time)" endif - + check-local: atconfig $(TESTSUITE) $(SHELL) '$(TESTSUITE)' $(TESTSUITEFLAGS) $(MAKE) $(AM_MAKEFLAGS) python-tests - + installcheck-local: atconfig $(TESTSUITE) $(SHELL) '$(TESTSUITE)' AUTOTEST_PATH='$(bindir)' \ $(TESTSUITEFLAGS) - + clean-local: test ! -f '$(TESTSUITE)' || \ $(SHELL) '$(TESTSUITE)' --clean - + AUTOM4TE = $(SHELL) $(top_srcdir)/missing --run autom4te AUTOTEST = $(AUTOM4TE) --language=autotest $(TESTSUITE): $(srcdir)/testsuite.at $(srcdir)/package.m4 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/39152?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: I121a0d596a645e6c70b5c9d2ff394d263d2a1dc4 Gerrit-Change-Number: 39152 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-pcap[master]: pcap-server: Move write checks to reopen pcap into helper functions
by pespin 16 Dec '24

16 Dec '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcap/+/39150?usp=email ) Change subject: pcap-server: Move write checks to reopen pcap into helper functions ...................................................................... pcap-server: Move write checks to reopen pcap into helper functions The logic there will be further extended, hence move the code as a preparatory patch. Change-Id: Icc2a8e424b166863afa9f8704fd48d35528972df --- M src/osmo_server_network.c 1 file changed, 26 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/50/39150/1 diff --git a/src/osmo_server_network.c b/src/osmo_server_network.c index 41d0b3f..1ace77a 100644 --- a/src/osmo_server_network.c +++ b/src/osmo_server_network.c @@ -212,6 +212,30 @@ return 1; } +/* Returns true if pcap was re-opened */ +static bool check_restart_pcap_max_size(struct osmo_pcap_conn *conn, const struct osmo_pcap_data *data) +{ + off_t cur; + + cur = lseek(conn->local_fd, 0, SEEK_CUR); + if (cur + data->len <= conn->server->max_size) + return false; + LOGP(DSERVER, LOGL_NOTICE, "Rolling over file for %s (max-size)\n", conn->name); + restart_pcap(conn); + return true; +} + +static bool check_restart_pcap_localtime(struct osmo_pcap_conn *conn, const struct tm *tm) +{ + if (conn->last_write.tm_mday == tm->tm_mday && + conn->last_write.tm_mon == tm->tm_mon && + conn->last_write.tm_year == tm->tm_year) + return false; + LOGP(DSERVER, LOGL_NOTICE, "Rolling over file for %s (localtime)\n", conn->name); + restart_pcap(conn); + return true; +} + /* * Check if we are past the limit or on a day change */ @@ -233,16 +257,8 @@ return -1; } - off_t cur = lseek(conn->local_fd, 0, SEEK_CUR); - if (cur + data->len > conn->server->max_size) { - LOGP(DSERVER, LOGL_NOTICE, "Rolling over file for %s\n", conn->name); - restart_pcap(conn); - } else if (conn->last_write.tm_mday != tm->tm_mday || - conn->last_write.tm_mon != tm->tm_mon || - conn->last_write.tm_year != tm->tm_year) { - LOGP(DSERVER, LOGL_NOTICE, "Rolling over file for %s\n", conn->name); - restart_pcap(conn); - } + if (!check_restart_pcap_max_size(conn, data)) + check_restart_pcap_localtime(conn, tm); conn->last_write = *tm; rc = write(conn->local_fd, &data->data[0], data->len); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/39150?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: Icc2a8e424b166863afa9f8704fd48d35528972df Gerrit-Change-Number: 39150 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-pcap[master]: pcap-server: New vty command 'no max-file-size'
by pespin 16 Dec '24

16 Dec '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcap/+/39151?usp=email ) Change subject: pcap-server: New vty command 'no max-file-size' ...................................................................... pcap-server: New vty command 'no max-file-size' This new VTY command allows disabling the max-file-size feature. Change-Id: I54f1f0e2976ea235e92a1c527fa80f18ae166992 --- M include/osmo-pcap/osmo_pcap_server.h M src/osmo_server_main.c M src/osmo_server_network.c M src/osmo_server_vty.c 4 files changed, 20 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/51/39151/1 diff --git a/include/osmo-pcap/osmo_pcap_server.h b/include/osmo-pcap/osmo_pcap_server.h index 6d2afcf..5fe6d11 100644 --- a/include/osmo-pcap/osmo_pcap_server.h +++ b/include/osmo-pcap/osmo_pcap_server.h @@ -131,6 +131,7 @@ char *base_path; mode_t permission_mask; off_t max_size; + bool max_size_enabled; int max_snaplen; /* statistics */ diff --git a/src/osmo_server_main.c b/src/osmo_server_main.c index 4633888..85f4290 100644 --- a/src/osmo_server_main.c +++ b/src/osmo_server_main.c @@ -281,7 +281,8 @@ INIT_LLIST_HEAD(&pcap_server->conn); pcap_server->base_path = talloc_strdup(pcap_server, "./"); pcap_server->permission_mask = 0440; - pcap_server->max_size = 1073741824; + pcap_server->max_size = 1073741824; /* 1024^3, 1GB **/ + pcap_server->max_size_enabled = true; pcap_server->max_snaplen = DEFAULT_SNAPLEN; if (vty_read_config_file(config_file, NULL) < 0) { diff --git a/src/osmo_server_network.c b/src/osmo_server_network.c index 1ace77a..e53ce01 100644 --- a/src/osmo_server_network.c +++ b/src/osmo_server_network.c @@ -217,6 +217,8 @@ { off_t cur; + if (pcap_server->max_size_enabled) + return false; cur = lseek(conn->local_fd, 0, SEEK_CUR); if (cur + data->len <= conn->server->max_size) return false; diff --git a/src/osmo_server_vty.c b/src/osmo_server_vty.c index 796aed8..507a477 100644 --- a/src/osmo_server_vty.c +++ b/src/osmo_server_vty.c @@ -93,8 +93,10 @@ vty_out(vty, " server ip %s%s", pcap_server->addr, VTY_NEWLINE); if (pcap_server->port > 0) vty_out(vty, " server port %d%s", pcap_server->port, VTY_NEWLINE); - vty_out(vty, " max-file-size %llu%s", - (unsigned long long) pcap_server->max_size, VTY_NEWLINE); + if (pcap_server->max_size_enabled) + vty_out(vty, " max-file-size %llu%s", (unsigned long long)pcap_server->max_size, VTY_NEWLINE); + else + vty_out(vty, " no max-file-size%s", VTY_NEWLINE); if (pcap_server->max_snaplen != DEFAULT_SNAPLEN) vty_out(vty, " server max-snaplen %d%s", pcap_server->max_snaplen, VTY_NEWLINE); if (pcap_server->zmq_port > 0) @@ -198,6 +200,16 @@ "Maximum file size for a trace\n" "Filesize in bytes\n") { pcap_server->max_size = strtoull(argv[0], NULL, 10); + pcap_server->max_size_enabled = true; + return CMD_SUCCESS; +} + +DEFUN(cfg_server_no_max_size, + cfg_server_no_max_size_cmd, + "no max-file-size", + NO_STR "Maximum file size for a trace\n") +{ + pcap_server->max_size_enabled = false; return CMD_SUCCESS; } @@ -564,6 +576,7 @@ install_element(SERVER_NODE, &cfg_server_ip_cmd); install_element(SERVER_NODE, &cfg_server_port_cmd); install_element(SERVER_NODE, &cfg_server_max_size_cmd); + install_element(SERVER_NODE, &cfg_server_no_max_size_cmd); install_element(SERVER_NODE, &cfg_server_max_snaplen_cmd); install_element(SERVER_NODE, &cfg_server_zmq_ip_port_cmd); install_element(SERVER_NODE, &cfg_no_server_zmq_ip_port_cmd); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/39151?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: I54f1f0e2976ea235e92a1c527fa80f18ae166992 Gerrit-Change-Number: 39151 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-pcap[master]: pcap-server: Take into account PDU len when calculating pcap max-size
by pespin 16 Dec '24

16 Dec '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcap/+/39149?usp=email ) Change subject: pcap-server: Take into account PDU len when calculating pcap max-size ...................................................................... pcap-server: Take into account PDU len when calculating pcap max-size We never want to overpass the configured max-size. Change-Id: I666830fbbc23ce34007d45bbf8c7a13a1f2a93ea --- M src/osmo_server_network.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/49/39149/1 diff --git a/src/osmo_server_network.c b/src/osmo_server_network.c index b566bd2..41d0b3f 100644 --- a/src/osmo_server_network.c +++ b/src/osmo_server_network.c @@ -234,7 +234,7 @@ } off_t cur = lseek(conn->local_fd, 0, SEEK_CUR); - if (cur > conn->server->max_size) { + if (cur + data->len > conn->server->max_size) { LOGP(DSERVER, LOGL_NOTICE, "Rolling over file for %s\n", conn->name); restart_pcap(conn); } else if (conn->last_write.tm_mday != tm->tm_mday || -- To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/39149?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-pcap Gerrit-Branch: master Gerrit-Change-Id: I666830fbbc23ce34007d45bbf8c7a13a1f2a93ea Gerrit-Change-Number: 39149 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in mncc-python[master]: mncc_mt_loadgen.py: Allow configuring first_msisdn_called in calls()
by pespin 16 Dec '24

16 Dec '24

Attention is currently required from: osmith. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/mncc-python/+/39143?usp=email ) Change subject: mncc_mt_loadgen.py: Allow configuring first_msisdn_called in calls() ...................................................................... Patch Set 1: (1 comment) File mncc_mt_loadgen.py: https://gerrit.osmocom.org/c/mncc-python/+/39143/comment/e188830a_fbf3661a?… : PS1, Line 185: if len(first_msisdn_called) > needed_len: > Can this if condition ever be true? as I understand it, nr is always >= 1. […] nr=3 first_msisdn_called='00000', so that it produces: "00000" "00001" "00002" instead of "0" "1" "2" -- To view, visit https://gerrit.osmocom.org/c/mncc-python/+/39143?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: mncc-python Gerrit-Branch: master Gerrit-Change-Id: I2dd6b96ea2da117d67a368bc076969f25fa61a52 Gerrit-Change-Number: 39143 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 16 Dec 2024 10:06:21 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de>

1 0

[S] Change in osmo-msc[master]: Indicate error and release BSS connection when SMS transaction fails
by pespin 16 Dec '24

16 Dec '24

Attention is currently required from: fixeria, jolly. pespin has posted comments on this change by jolly. ( https://gerrit.osmocom.org/c/osmo-msc/+/38514?usp=email ) Change subject: Indicate error and release BSS connection when SMS transaction fails ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/38514?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I82da9c283205c69b19ceb4ba40ac5aa7f37d159b Gerrit-Change-Number: 38514 Gerrit-PatchSet: 5 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 16 Dec 2024 10:00:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in osmo-ttcn3-hacks[master]: library/s1ap: f_tr_S1AP_RABSetupRsp(): use ispresent()
by fixeria 16 Dec '24

16 Dec '24

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39074?usp=email ) Change subject: library/s1ap: f_tr_S1AP_RABSetupRsp(): use ispresent() ...................................................................... library/s1ap: f_tr_S1AP_RABSetupRsp(): use ispresent() Change-Id: I6ee1246ef9f32ac7d5ce107d3ba9ea11ed87af20 --- M library/s1ap/S1AP_Templates.ttcn 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/s1ap/S1AP_Templates.ttcn b/library/s1ap/S1AP_Templates.ttcn index 0a91935..58722e5 100644 --- a/library/s1ap/S1AP_Templates.ttcn +++ b/library/s1ap/S1AP_Templates.ttcn @@ -1301,7 +1301,7 @@ }; var integer idx := lengthof(rsp.protocolIEs); - if (isvalue(rab_setup_items) or istemplatekind(rab_setup_items, "?")) { + if (ispresent(rab_setup_items)) { rsp.protocolIEs[idx] := { id := S1AP_Constants.id_E_RABSetupListBearerSURes, criticality := ignore, @@ -1309,7 +1309,7 @@ }; idx := idx + 1; } - if (isvalue(rab_failed_items) or istemplatekind(rab_failed_items, "?")) { + if (ispresent(rab_failed_items)) { rsp.protocolIEs[idx] := { id := S1AP_Constants.id_E_RABFailedToSetupListBearerSURes, criticality := ignore, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39074?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I6ee1246ef9f32ac7d5ce107d3ba9ea11ed87af20 Gerrit-Change-Number: 39074 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[L] Change in osmo-ttcn3-hacks[master]: library/s1ap: add E-RAB MODIFY REQ/RSP templates
by fixeria 16 Dec '24

16 Dec '24

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39075?usp=email ) Change subject: library/s1ap: add E-RAB MODIFY REQ/RSP templates ...................................................................... library/s1ap: add E-RAB MODIFY REQ/RSP templates Change-Id: Id38cd51698c1388311a41f045ff08ec7f8a85146 --- M library/s1ap/S1AP_Templates.ttcn 1 file changed, 333 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/library/s1ap/S1AP_Templates.ttcn b/library/s1ap/S1AP_Templates.ttcn index 58722e5..b40f948 100644 --- a/library/s1ap/S1AP_Templates.ttcn +++ b/library/s1ap/S1AP_Templates.ttcn @@ -1354,6 +1354,339 @@ } } +/* 9.1.3.3 E-RAB MODIFY REQUEST */ +template (value) E_RABToBeModifiedItemBearerModReq +ts_E_RABToBeModifiedItemBearerModReq(template (value) E_RAB_ID rab_id, + template (value) E_RABLevelQoSParameters qos_params, + template (value) NAS_PDU nas_pdu) := { + e_RAB_ID := rab_id, + e_RABLevelQoSParameters := qos_params, + nAS_PDU := nas_pdu, + iE_Extensions := omit +} +template (present) E_RABToBeModifiedItemBearerModReq +tr_E_RABToBeModifiedItemBearerModReq(template (present) E_RAB_ID rab_id := ?, + template (present) E_RABLevelQoSParameters qos_params := ?, + template (present) NAS_PDU nas_pdu := ?) := { + e_RAB_ID := rab_id, + e_RABLevelQoSParameters := qos_params, + nAS_PDU := nas_pdu, + iE_Extensions := * +} + +template (value) E_RABToBeModifiedItemBearerModReq +ts_E_RABToBeModifiedItemBearerModReqExt(template (value) E_RAB_ID rab_id, + template (value) E_RABLevelQoSParameters qos_params, + template (value) NAS_PDU nas_pdu, + template (value) TransportLayerAddress tla, + template (value) GTP_TEID gtp_teid) +modifies ts_E_RABToBeModifiedItemBearerModReq := { + iE_Extensions := { + { + id := S1AP_Constants.id_TransportInformation, + criticality := reject, + extensionValue := { + TransportInformation := { + transportLayerAddress := tla, + uL_GTP_TEID := gtp_teid + } + } + } + } +} +template (present) E_RABToBeModifiedItemBearerModReq +tr_E_RABToBeModifiedItemBearerModReqExt(template (present) E_RAB_ID rab_id := ?, + template (present) E_RABLevelQoSParameters qos_params := ?, + template (present) NAS_PDU nas_pdu := ?, + template (present) TransportLayerAddress tla := ?, + template (present) GTP_TEID gtp_teid := ?) +modifies tr_E_RABToBeModifiedItemBearerModReq := { + iE_Extensions := { + { + id := S1AP_Constants.id_TransportInformation, + criticality := reject, + extensionValue := { + TransportInformation := { + transportLayerAddress := tla, + uL_GTP_TEID := gtp_teid + } + } + } + } +} + +template (value) E_RABToBeModifiedListBearerModReq +ts_E_RABToBeModifiedListBearerModReq(template (value) E_RABToBeModifiedItemBearerModReq it) := { + { + id := S1AP_Constants.id_E_RABToBeModifiedItemBearerModReq, + criticality := reject, + value_ := { E_RABToBeModifiedItemBearerModReq := it } + } +} +template (present) E_RABToBeModifiedListBearerModReq +tr_E_RABToBeModifiedListBearerModReq(template (present) E_RABToBeModifiedItemBearerModReq it := ?) := { + { + id := S1AP_Constants.id_E_RABToBeModifiedItemBearerModReq, + criticality := reject, + value_ := { E_RABToBeModifiedItemBearerModReq := it } + } +} + +private function +f_ts_S1AP_RABModifyReq(template (value) MME_UE_S1AP_ID mme_id, + template (value) ENB_UE_S1AP_ID enb_id, + template (value) E_RABToBeModifiedListBearerModReq rab_modify_items, + template (omit) UEAggregateMaximumBitrate max_br := omit) +return template (value) E_RABModifyRequest +{ + var template (value) E_RABModifyRequest req := { + protocolIEs := { + { + id := S1AP_Constants.id_MME_UE_S1AP_ID, + criticality := reject, + value_ := { MME_UE_S1AP_ID := mme_id } + }, { + id := S1AP_Constants.id_eNB_UE_S1AP_ID, + criticality := reject, + value_ := { ENB_UE_S1AP_ID := enb_id } + } + } + }; + + var integer idx := lengthof(req.protocolIEs); + if (isvalue(max_br)) { + req.protocolIEs[idx] := { + id := S1AP_Constants.id_uEaggregateMaximumBitrate, + criticality := reject, + value_ := { UEAggregateMaximumBitrate := max_br } + }; + idx := idx + 1; + } + + req.protocolIEs[idx] := { + id := S1AP_Constants.id_E_RABToBeModifiedListBearerModReq, + criticality := reject, + value_ := { E_RABToBeModifiedListBearerModReq := rab_modify_items } + }; + idx := idx + 1; + + return req; +} +private function +f_tr_S1AP_RABModifyReq(template (present) MME_UE_S1AP_ID mme_id, + template (present) ENB_UE_S1AP_ID enb_id, + template (present) E_RABToBeModifiedListBearerModReq rab_modify_items, + template UEAggregateMaximumBitrate max_br := *) +return template E_RABModifyRequest +{ + var template E_RABModifyRequest req := { + protocolIEs := { + { + id := S1AP_Constants.id_MME_UE_S1AP_ID, + criticality := reject, + value_ := { MME_UE_S1AP_ID := mme_id } + }, { + id := S1AP_Constants.id_eNB_UE_S1AP_ID, + criticality := reject, + value_ := { ENB_UE_S1AP_ID := enb_id } + } + } + }; + + var integer idx := lengthof(req.protocolIEs); + if (ispresent(max_br)) { + req.protocolIEs[idx] := { + id := S1AP_Constants.id_uEaggregateMaximumBitrate, + criticality := reject, + value_ := { UEAggregateMaximumBitrate := max_br } + }; + idx := idx + 1; + } else if (istemplatekind(max_br, "*")) { + req.protocolIEs[idx] := *; + idx := idx + 1; + } + + req.protocolIEs[idx] := { + id := S1AP_Constants.id_E_RABToBeModifiedListBearerModReq, + criticality := reject, + value_ := { E_RABToBeModifiedListBearerModReq := rab_modify_items } + }; + idx := idx + 1; + + /* ignore the remaining IEs */ + req.protocolIEs[idx] := *; + + return req; +} + +template (value) S1AP_PDU +ts_S1AP_RABModifyReq(template (value) MME_UE_S1AP_ID mme_id, + template (value) ENB_UE_S1AP_ID enb_id, + template (value) E_RABToBeModifiedListBearerModReq rab_modify_items, + template (omit) UEAggregateMaximumBitrate max_br := omit) := { + initiatingMessage := { + procedureCode := S1AP_Constants.id_E_RABModify, + criticality := reject, + value_ := { + E_RABModifyRequest := f_ts_S1AP_RABModifyReq(mme_id, enb_id, + rab_modify_items, + max_br) + } + } +} +template (present) S1AP_PDU +tr_S1AP_RABModifyReq(template (present) MME_UE_S1AP_ID mme_id := ?, + template (present) ENB_UE_S1AP_ID enb_id := ?, + template (present) E_RABToBeModifiedListBearerModReq rab_modify_items := ?, + template UEAggregateMaximumBitrate max_br := *) := { + initiatingMessage := { + procedureCode := S1AP_Constants.id_E_RABModify, + criticality := reject, + value_ := { + E_RABModifyRequest := f_tr_S1AP_RABModifyReq(mme_id, enb_id, + rab_modify_items, + max_br) + } + } +} + +/* 9.1.3.4 E-RAB MODIFY RESPONSE */ +template (value) E_RABModifyItemBearerModRes +ts_E_RABModifyItemBearerModRes(template (value) E_RAB_ID rab_id) := { + e_RAB_ID := rab_id, + iE_Extensions := omit +} +template (present) E_RABModifyItemBearerModRes +tr_E_RABModifyItemBearerModRes(template (present) E_RAB_ID rab_id := ?) := { + e_RAB_ID := rab_id, + iE_Extensions := * +} + +template (value) E_RABModifyListBearerModRes +ts_E_RABModifyListBearerModRes(template (value) E_RABModifyItemBearerModRes it) := { + { + id := S1AP_Constants.id_E_RABModifyItemBearerModRes, + criticality := ignore, + value_ := { E_RABModifyItemBearerModRes := it } + } +} +template (present) E_RABModifyListBearerModRes +tr_E_RABModifyListBearerModRes(template (present) E_RABModifyItemBearerModRes it := ?) := { + { + id := S1AP_Constants.id_E_RABModifyItemBearerModRes, + criticality := ignore, + value_ := { E_RABModifyItemBearerModRes := it } + } +} + +private function +f_ts_S1AP_RABModifyRsp(template (value) MME_UE_S1AP_ID mme_id, + template (value) ENB_UE_S1AP_ID enb_id, + template (value) E_RABModifyListBearerModRes rab_modified_items, + template (omit) E_RABList rab_failed_items := omit) +return template (value) E_RABModifyResponse +{ + var template (value) E_RABModifyResponse rsp := { + protocolIEs := { + { + id := S1AP_Constants.id_MME_UE_S1AP_ID, + criticality := ignore, + value_ := { MME_UE_S1AP_ID := mme_id } + }, { + id := S1AP_Constants.id_eNB_UE_S1AP_ID, + criticality := ignore, + value_ := { ENB_UE_S1AP_ID := enb_id } + }, { + id := S1AP_Constants.id_E_RABModifyListBearerModRes, + criticality := ignore, + value_ := { E_RABModifyListBearerModRes := rab_modified_items } + } + } + }; + + var integer idx := lengthof(rsp.protocolIEs); + if (isvalue(rab_failed_items)) { + rsp.protocolIEs[idx] := { + id := S1AP_Constants.id_E_RABFailedToModifyList, + criticality := ignore, + value_ := { e_RABList := rab_failed_items } + }; + idx := idx + 1; + } + + return rsp; +} +private function +f_tr_S1AP_RABModifyRsp(template (present) MME_UE_S1AP_ID mme_id, + template (present) ENB_UE_S1AP_ID enb_id, + template (present) E_RABModifyListBearerModRes rab_modified_items, + template E_RABList rab_failed_items := *) +return template E_RABModifyResponse +{ + var template E_RABModifyResponse rsp := { + protocolIEs := { + { + id := S1AP_Constants.id_MME_UE_S1AP_ID, + criticality := ignore, + value_ := { MME_UE_S1AP_ID := mme_id } + }, { + id := S1AP_Constants.id_eNB_UE_S1AP_ID, + criticality := ignore, + value_ := { ENB_UE_S1AP_ID := enb_id } + }, { + id := S1AP_Constants.id_E_RABModifyListBearerModRes, + criticality := ignore, + value_ := { E_RABModifyListBearerModRes := rab_modified_items } + } + } + }; + + var integer idx := lengthof(rsp.protocolIEs); + if (ispresent(rab_failed_items)) { + rsp.protocolIEs[idx] := { + id := S1AP_Constants.id_E_RABFailedToModifyList, + criticality := ignore, + value_ := { e_RABList := rab_failed_items } + }; + idx := idx + 1; + } + /* ignore the remaining IEs */ + rsp.protocolIEs[idx] := *; + + return rsp; +} + +template (value) S1AP_PDU +ts_S1AP_RABModifyRsp(template (value) MME_UE_S1AP_ID mme_id, + template (value) ENB_UE_S1AP_ID enb_id, + template (value) E_RABModifyListBearerModRes rab_modified_items, + template (omit) E_RABList rab_failed_items := omit) := { + successfulOutcome := { + procedureCode := S1AP_Constants.id_E_RABModify, + criticality := reject, + value_ := { + E_RABModifyResponse := f_ts_S1AP_RABModifyRsp(mme_id, enb_id, + rab_modified_items, + rab_failed_items) + } + } +} +template (present) S1AP_PDU +tr_S1AP_RABModifyRsp(template (present) MME_UE_S1AP_ID mme_id := ?, + template (present) ENB_UE_S1AP_ID enb_id := ?, + template (present) E_RABModifyListBearerModRes rab_modified_items := ?, + template E_RABList rab_failed_items := *) := { + successfulOutcome := { + procedureCode := S1AP_Constants.id_E_RABModify, + criticality := reject, + value_ := { + E_RABModifyResponse := f_tr_S1AP_RABModifyRsp(mme_id, enb_id, + rab_modified_items, + rab_failed_items) + } + } +} + /* 9.1.3.5 E-RAB RELEASE COMMAND */ template (value) S1AP_PDU ts_S1AP_RABReleaseCmd(template (value) MME_UE_S1AP_ID mme_id, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39075?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id38cd51698c1388311a41f045ff08ec7f8a85146 Gerrit-Change-Number: 39075 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[L] Change in osmo-ttcn3-hacks[master]: library/s1ap: add E-RAB MODIFY IND/CNF templates
by fixeria 16 Dec '24

16 Dec '24

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39144?usp=email ) Change subject: library/s1ap: add E-RAB MODIFY IND/CNF templates ...................................................................... library/s1ap: add E-RAB MODIFY IND/CNF templates Change-Id: I2dd3d420ebfaf37fefa1d33a40176ec57fee5619 --- M library/s1ap/S1AP_Templates.ttcn 1 file changed, 358 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/library/s1ap/S1AP_Templates.ttcn b/library/s1ap/S1AP_Templates.ttcn index b40f948..cb74cb4 100644 --- a/library/s1ap/S1AP_Templates.ttcn +++ b/library/s1ap/S1AP_Templates.ttcn @@ -1923,4 +1923,362 @@ iE_Extensions := * } +/* 9.1.3.8 E-RAB MODIFICATION INDICATION */ +template (value) S1AP_PDU +ts_S1AP_RABModifyInd(template (value) MME_UE_S1AP_ID mme_id, + template (value) ENB_UE_S1AP_ID enb_id, + template (value) E_RABToBeModifiedListBearerModInd rab_do_modify_items, + template (omit) E_RABNotToBeModifiedListBearerModInd rab_no_modify_items := omit) := { + initiatingMessage := { + procedureCode := S1AP_Constants.id_E_RABModificationIndication, + criticality := reject, + value_ := { + e_RABModificationIndication := f_ts_S1AP_RABModifyInd(mme_id, enb_id, + rab_do_modify_items, + rab_no_modify_items) + } + } +} +template (present) S1AP_PDU +tr_S1AP_RABModifyInd(template (present) MME_UE_S1AP_ID mme_id := ?, + template (present) ENB_UE_S1AP_ID enb_id := ?, + template (present) E_RABToBeModifiedListBearerModInd rab_do_modify_items := ?, + template E_RABNotToBeModifiedListBearerModInd rab_no_modify_items := *) := { + initiatingMessage := { + procedureCode := S1AP_Constants.id_E_RABModificationIndication, + criticality := reject, + value_ := { + e_RABModificationIndication := f_tr_S1AP_RABModifyInd(mme_id, enb_id, + rab_do_modify_items, + rab_no_modify_items) + } + } +} + +private function +f_ts_S1AP_RABModifyInd(template (value) MME_UE_S1AP_ID mme_id, + template (value) ENB_UE_S1AP_ID enb_id, + template (value) E_RABToBeModifiedListBearerModInd rab_do_modify_items, + template (omit) E_RABNotToBeModifiedListBearerModInd rab_no_modify_items) +return template (value) E_RABModificationIndication +{ + var template (value) E_RABModificationIndication ind := { + protocolIEs := { + { + id := S1AP_Constants.id_MME_UE_S1AP_ID, + criticality := reject, + value_ := { MME_UE_S1AP_ID := mme_id } + }, { + id := S1AP_Constants.id_eNB_UE_S1AP_ID, + criticality := reject, + value_ := { ENB_UE_S1AP_ID := enb_id } + }, { + id := S1AP_Constants.id_E_RABToBeModifiedListBearerModInd, + criticality := reject, + value_ := { e_RABToBeModifiedListBearerModInd := rab_do_modify_items } + } + } + }; + + var integer idx := lengthof(ind.protocolIEs); + if (isvalue(rab_no_modify_items)) { + ind.protocolIEs[idx] := { + id := S1AP_Constants.id_E_RABNotToBeModifiedListBearerModInd, + criticality := reject, + value_ := { e_RABNotToBeModifiedListBearerModInd := rab_no_modify_items } + }; + idx := idx + 1; + } + + return ind; +} +private function +f_tr_S1AP_RABModifyInd(template (present) MME_UE_S1AP_ID mme_id, + template (present) ENB_UE_S1AP_ID enb_id, + template (present) E_RABToBeModifiedListBearerModInd rab_do_modify_items, + template E_RABNotToBeModifiedListBearerModInd rab_no_modify_items) +return template E_RABModificationIndication +{ + var template E_RABModificationIndication ind := { + protocolIEs := { + { + id := S1AP_Constants.id_MME_UE_S1AP_ID, + criticality := reject, + value_ := { MME_UE_S1AP_ID := mme_id } + }, { + id := S1AP_Constants.id_eNB_UE_S1AP_ID, + criticality := reject, + value_ := { ENB_UE_S1AP_ID := enb_id } + }, { + id := S1AP_Constants.id_E_RABToBeModifiedListBearerModInd, + criticality := reject, + value_ := { e_RABToBeModifiedListBearerModInd := rab_do_modify_items } + } + } + }; + + var integer idx := lengthof(ind.protocolIEs); + if (ispresent(rab_no_modify_items)) { + ind.protocolIEs[idx] := { + id := S1AP_Constants.id_E_RABNotToBeModifiedListBearerModInd, + criticality := reject, + value_ := { e_RABNotToBeModifiedListBearerModInd := rab_no_modify_items } + }; + idx := idx + 1; + } + + /* ignore the remaining IEs */ + ind.protocolIEs[idx] := *; + + return ind; +} + +template (value) E_RABToBeModifiedListBearerModInd +ts_E_RABToBeModifiedListBearerModInd(template (value) E_RABToBeModifiedItemBearerModInd it) := { + { + id := S1AP_Constants.id_E_RABToBeModifiedItemBearerModInd, + criticality := reject, + value_ := { e_RABToBeModifiedItemBearerModInd := it } + } +} +template (present) E_RABToBeModifiedListBearerModInd +tr_E_RABToBeModifiedListBearerModInd(template (present) E_RABToBeModifiedItemBearerModInd it := ?) := { + { + id := S1AP_Constants.id_E_RABToBeModifiedItemBearerModInd, + criticality := reject, + value_ := { e_RABToBeModifiedItemBearerModInd := it } + } +} + +template (value) E_RABToBeModifiedItemBearerModInd +ts_E_RABToBeModifiedItemBearerModInd(template (value) E_RAB_ID rab_id, + template (value) TransportLayerAddress tla, + template (value) GTP_TEID gtp_teid) := { + e_RAB_ID := rab_id, + transportLayerAddress := tla, + dL_GTP_TEID := gtp_teid, + iE_Extensions := omit +} +template (present) E_RABToBeModifiedItemBearerModInd +tr_E_RABToBeModifiedItemBearerModInd(template (present) E_RAB_ID rab_id, + template (present) TransportLayerAddress tla, + template (present) GTP_TEID gtp_teid) := { + e_RAB_ID := rab_id, + transportLayerAddress := tla, + dL_GTP_TEID := gtp_teid, + iE_Extensions := * +} + +template (value) E_RABNotToBeModifiedListBearerModInd +ts_E_RABNotToBeModifiedListBearerModInd(template (value) E_RABNotToBeModifiedItemBearerModInd it) := { + { + id := S1AP_Constants.id_E_RABNotToBeModifiedItemBearerModInd, + criticality := reject, + value_ := { e_RABNotToBeModifiedItemBearerModInd := it } + } +} +template (present) E_RABNotToBeModifiedListBearerModInd +tr_E_RABNotToBeModifiedListBearerModInd(template (present) E_RABNotToBeModifiedItemBearerModInd it := ?) := { + { + id := S1AP_Constants.id_E_RABNotToBeModifiedItemBearerModInd, + criticality := reject, + value_ := { e_RABNotToBeModifiedItemBearerModInd := it } + } +} + +template (value) E_RABNotToBeModifiedItemBearerModInd +ts_E_RABNotToBeModifiedItemBearerModInd(template (value) E_RAB_ID rab_id, + template (value) TransportLayerAddress tla, + template (value) GTP_TEID gtp_teid) := { + e_RAB_ID := rab_id, + transportLayerAddress := tla, + dL_GTP_TEID := gtp_teid, + iE_Extensions := omit +} +template (present) E_RABNotToBeModifiedItemBearerModInd +tr_E_RABNotToBeModifiedItemBearerModInd(template (present) E_RAB_ID rab_id, + template (present) TransportLayerAddress tla, + template (present) GTP_TEID gtp_teid) := { + e_RAB_ID := rab_id, + transportLayerAddress := tla, + dL_GTP_TEID := gtp_teid, + iE_Extensions := * +} + +/* 9.1.3.9 E-RAB MODIFICATION CONFIRMATION */ +template (value) S1AP_PDU +ts_S1AP_RABModifyCnf(template (value) MME_UE_S1AP_ID mme_id, + template (value) ENB_UE_S1AP_ID enb_id, + template (omit) E_RABModifyListBearerModConf rab_modified_items := omit, + template (omit) E_RABList rab_failed_items := omit, + template (omit) E_RABList rab_release_items := omit) := { + successfulOutcome := { + procedureCode := S1AP_Constants.id_E_RABModificationIndication, + criticality := reject, + value_ := { + e_RABModificationConfirm := f_ts_S1AP_RABModifyCnf(mme_id, enb_id, + rab_modified_items, + rab_failed_items, + rab_release_items) + } + } +} +template (present) S1AP_PDU +tr_S1AP_RABModifyCnf(template (present) MME_UE_S1AP_ID mme_id := ?, + template (present) ENB_UE_S1AP_ID enb_id := ?, + template E_RABModifyListBearerModConf rab_modified_items := *, + template E_RABList rab_failed_items := *, + template E_RABList rab_release_items := *) := { + successfulOutcome := { + procedureCode := S1AP_Constants.id_E_RABModificationIndication, + criticality := reject, + value_ := { + e_RABModificationConfirm := f_tr_S1AP_RABModifyCnf(mme_id, enb_id, + rab_modified_items, + rab_failed_items, + rab_release_items) + } + } +} + +private function +f_ts_S1AP_RABModifyCnf(template (value) MME_UE_S1AP_ID mme_id, + template (value) ENB_UE_S1AP_ID enb_id, + template (omit) E_RABModifyListBearerModConf rab_modified_items, + template (omit) E_RABList rab_failed_items, + template (omit) E_RABList rab_release_items) +return template (value) E_RABModificationConfirm +{ + var template (value) E_RABModificationConfirm cnf := { + protocolIEs := { + { + id := S1AP_Constants.id_MME_UE_S1AP_ID, + criticality := ignore, + value_ := { MME_UE_S1AP_ID := mme_id } + }, { + id := S1AP_Constants.id_eNB_UE_S1AP_ID, + criticality := ignore, + value_ := { ENB_UE_S1AP_ID := enb_id } + } + } + }; + + var integer idx := lengthof(cnf.protocolIEs); + if (isvalue(rab_modified_items)) { + cnf.protocolIEs[idx] := { + id := S1AP_Constants.id_E_RABModifyListBearerModConf, + criticality := ignore, + value_ := { e_RABModifyListBearerModConf := rab_modified_items } + }; + idx := idx + 1; + } + if (isvalue(rab_failed_items)) { + cnf.protocolIEs[idx] := { + id := S1AP_Constants.id_E_RABFailedToModifyListBearerModConf, + criticality := ignore, + value_ := { e_RABList := rab_failed_items } + }; + idx := idx + 1; + } + if (isvalue(rab_release_items)) { + cnf.protocolIEs[idx] := { + id := S1AP_Constants.id_E_RABToBeReleasedListBearerModConf, + criticality := ignore, + value_ := { e_RABList := rab_release_items } + }; + idx := idx + 1; + } + + return cnf; +} +private function +f_tr_S1AP_RABModifyCnf(template (present) MME_UE_S1AP_ID mme_id, + template (present) ENB_UE_S1AP_ID enb_id, + template E_RABModifyListBearerModConf rab_modified_items, + template E_RABList rab_failed_items, + template E_RABList rab_release_items) +return template E_RABModificationConfirm +{ + var template E_RABModificationConfirm cnf := { + protocolIEs := { + { + id := S1AP_Constants.id_MME_UE_S1AP_ID, + criticality := ignore, + value_ := { MME_UE_S1AP_ID := mme_id } + }, { + id := S1AP_Constants.id_eNB_UE_S1AP_ID, + criticality := ignore, + value_ := { ENB_UE_S1AP_ID := enb_id } + } + } + }; + + var integer idx := lengthof(cnf.protocolIEs); + if (ispresent(rab_modified_items)) { + cnf.protocolIEs[idx] := { + id := S1AP_Constants.id_E_RABModifyListBearerModConf, + criticality := ignore, + value_ := { e_RABModifyListBearerModConf := rab_modified_items } + }; + idx := idx + 1; + } else if (istemplatekind(rab_modified_items, "*")) { + cnf.protocolIEs[idx] := *; + idx := idx + 1; + } + + if (ispresent(rab_failed_items)) { + cnf.protocolIEs[idx] := { + id := S1AP_Constants.id_E_RABFailedToModifyListBearerModConf, + criticality := ignore, + value_ := { e_RABList := rab_failed_items } + }; + idx := idx + 1; + } else if (istemplatekind(rab_failed_items, "*")) { + cnf.protocolIEs[idx] := *; + idx := idx + 1; + } + + if (ispresent(rab_release_items)) { + cnf.protocolIEs[idx] := { + id := S1AP_Constants.id_E_RABToBeReleasedListBearerModConf, + criticality := ignore, + value_ := { e_RABList := rab_release_items } + }; + idx := idx + 1; + } + + /* ignore the remaining IEs */ + cnf.protocolIEs[idx] := *; + + return cnf; +} + +template (value) E_RABModifyListBearerModConf +ts_E_RABModifyListBearerModConf(template (value) E_RABModifyItemBearerModConf it) := { + { + id := S1AP_Constants.id_E_RABModifyItemBearerModConf, + criticality := ignore, + value_ := { e_RABModifyItemBearerModConf := it } + } +} +template (present) E_RABModifyListBearerModConf +tr_E_RABModifyListBearerModConf(template (present) E_RABModifyItemBearerModConf it := ?) := { + { + id := S1AP_Constants.id_E_RABModifyItemBearerModConf, + criticality := ignore, + value_ := { e_RABModifyItemBearerModConf := it } + } +} + +template (value) E_RABModifyItemBearerModConf +ts_E_RABModifyItemBearerModConf(template (value) E_RAB_ID rab_id) := { + e_RAB_ID := rab_id, + iE_Extensions := omit +} +template (present) E_RABModifyItemBearerModConf +tr_E_RABModifyItemBearerModConf(template (present) E_RAB_ID rab_id) := { + e_RAB_ID := rab_id, + iE_Extensions := * +} + } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39144?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I2dd3d420ebfaf37fefa1d33a40176ec57fee5619 Gerrit-Change-Number: 39144 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(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>

1 0

[S] Change in osmo-ttcn3-hacks[master]: s1gw: make f_ConnHdlr_rx_session_modify_req() more flexible
by fixeria 16 Dec '24

16 Dec '24

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39076?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: s1gw: make f_ConnHdlr_rx_session_modify_req() more flexible ...................................................................... s1gw: make f_ConnHdlr_rx_session_modify_req() more flexible Allow the caller to pass FAR ID, SEID, and E-RAB parameters (F-TEID), so that it can also be used for testing the E-RAB MODIFY procedure. Change-Id: I52317e79ac02cb4e321b49c2cd824de28e25a1c6 --- M s1gw/S1GW_ConnHdlr.ttcn 1 file changed, 17 insertions(+), 13 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/s1gw/S1GW_ConnHdlr.ttcn b/s1gw/S1GW_ConnHdlr.ttcn index 453eff5..4634064 100644 --- a/s1gw/S1GW_ConnHdlr.ttcn +++ b/s1gw/S1GW_ConnHdlr.ttcn @@ -664,25 +664,27 @@ PFCP.send(resp); } -function f_ConnHdlr_rx_session_modify_req(in ERab erab) +function f_ConnHdlr_rx_session_modify_req(in ERabParams epars, + template (present) OCT8 seid := ?, + template (present) LIN4_BO_LAST far_id := ?) runs on ConnHdlr return PDU_PFCP { /* Forwarding Action Rules */ - var template (present) Outer_Header_Creation ohc1; - var template (present) Update_Forwarding_Parameters fpars1; - var template (present) Update_FAR far1; + var template (present) Outer_Header_Creation ohc; + var template (present) Update_Forwarding_Parameters fpars; + var template (present) Update_FAR far; - ohc1 := tr_PFCP_Outer_Header_Creation_GTP_ipv4(erab.u2a.teid, - f_inet_addr(erab.u2a.tla)); - fpars1 := tr_PFCP_Update_Forwarding_Parameters(ohc := ohc1); + ohc := tr_PFCP_Outer_Header_Creation_GTP_ipv4(epars.teid, + f_inet_addr(epars.tla)); + fpars := tr_PFCP_Update_Forwarding_Parameters(ohc := ohc); - far1 := tr_PFCP_Update_FAR(far_id := 1, /* -- for Core -> Access */ - aa := tr_PFCP_Apply_Action_FORW, - fp := fpars1); + far := tr_PFCP_Update_FAR(far_id := far_id, + aa := tr_PFCP_Apply_Action_FORW, + fp := fpars); /* The final Session Modification Request PDU */ var template (present) PDU_PFCP tr_pdu; - tr_pdu := tr_PFCP_Session_Mod_Req(seid := erab.pfcp_loc_seid, - update_far := far1); + tr_pdu := tr_PFCP_Session_Mod_Req(seid := seid, + update_far := far); return f_ConnHdlr_pfcp_expect(tr_pdu); } @@ -732,7 +734,9 @@ runs on ConnHdlr { for (var integer i := 0; i < lengthof(erabs); i := i + 1) { log("UPF <- S1GW: PFCP Session Modification Request for E-RAB ID ", erabs[i].erab_id); - var PDU_PFCP pdu := f_ConnHdlr_rx_session_modify_req(erabs[i]); + var PDU_PFCP pdu := f_ConnHdlr_rx_session_modify_req(epars := erabs[i].u2a, + seid := erabs[i].pfcp_loc_seid, + far_id := 1); log("UPF -> S1GW: PFCP Session Modification Response for E-RAB ID ", erabs[i].erab_id); f_ConnHdlr_tx_session_modify_resp(erabs[i], pdu); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39076?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I52317e79ac02cb4e321b49c2cd824de28e25a1c6 Gerrit-Change-Number: 39076 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(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>

1 0

2026

2025

2024

2023

2022

gerrit-log