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

[M] Change in libosmo-sigtran[master]: Update VTY tests to Cisco like DSCP configuration
by pespin 21 Sep '26

21 Sep '26

Attention is currently required from: jolly. pespin has posted comments on this change by jolly. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/43684?usp=email ) Change subject: Update VTY tests to Cisco like DSCP configuration ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: This should be merged into the previous commit. -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/43684?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: If4f96e27861428bec183e93b765f7f0185d8fc54 Gerrit-Change-Number: 43684 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Mon, 21 Sep 2026 11:15:00 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 0

[L] Change in pysim[master]: contrib: SCP81 TLS-PSK RAS for RAM/RFM over HTTPS
by dexter 21 Sep '26

21 Sep '26

Attention is currently required from: Hoernchen, daniel, lynxis lazus. dexter has posted comments on this change by Hoernchen. ( https://gerrit.osmocom.org/c/pysim/+/43547?usp=email ) Change subject: contrib: SCP81 TLS-PSK RAS for RAM/RFM over HTTPS ...................................................................... Patch Set 2: Code-Review+1 (1 comment) File contrib/scp81_admin_server.py: https://gerrit.osmocom.org/c/pysim/+/43547/comment/3fa8571a_0f5c5745?usp=em… : PS2, Line 3: This file has the execution bit not set. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/43547?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I4f243aeca65d0f33ff34e6932e3f4e156446af8b Gerrit-Change-Number: 43547 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Mon, 21 Sep 2026 11:14:36 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

1 0

[L] Change in libosmo-sigtran[master]: Add Cisco like DSCP configuration support
by pespin 21 Sep '26

21 Sep '26

Attention is currently required from: jolly. pespin has posted comments on this change by jolly. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/43667?usp=email ) Change subject: Add Cisco like DSCP configuration support ...................................................................... Patch Set 4: (3 comments) Patchset: PS4: +1 once you fix the vty tests in this same commit, see also my other 2 comments regarding vty output improvements. File src/ss7_asp_vty.c: https://gerrit.osmocom.org/c/libosmo-sigtran/+/43667/comment/e50eadfb_7e568… : PS4, Line 420: struct osmo_ss7_asp *asp = vty->index; btw, I'd personally add a vty_out() here telling the user this vty is deprecated and that qos-class should be used instead. https://gerrit.osmocom.org/c/libosmo-sigtran/+/43667/comment/df2fa597_55eae… : PS4, Line 449: vty_out(vty, "%% Config updated: ip-dscp %d -> %d%s", asp->cfg.ip_dscp, qos->ip_dscp, I think you are missing the "qoss-class" somewhere in the string? like " -> qos-class %d (ip-dscp %d)" -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/43667?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: Ic346698fc63771d95e474aec53ffb6c776636b3b Gerrit-Change-Number: 43667 Gerrit-PatchSet: 4 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Mon, 21 Sep 2026 11:14:00 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 0

[M] Change in pysim[master]: contrib: add scp81 OTA trigger builder
by dexter 21 Sep '26

21 Sep '26

Attention is currently required from: Hoernchen. dexter has posted comments on this change by Hoernchen. ( https://gerrit.osmocom.org/c/pysim/+/43566?usp=email ) Change subject: contrib: add scp81 OTA trigger builder ...................................................................... Patch Set 3: Code-Review+1 Verified+1 (3 comments) Patchset: PS3: I have tried it (only generating the API, I didn't sent it to a card), seems to work fine. File contrib/scp81_trigger.py: https://gerrit.osmocom.org/c/pysim/+/43566/comment/bf1113ed_f8248a44?usp=em… : PS3, Line 1: #!/usr/bin/env python3 As it seems the execution bit is not set on this file. https://gerrit.osmocom.org/c/pysim/+/43566/comment/6ba49438_ecca2576?usp=em… : PS3, Line 50: ap.add_argument("--psk-id", help="PSK identity for ClientHello (required unless --no-sec)") missing comma: (required, unless ...) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/43566?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ic646626319cd7a26195d0ffff55900032abcddeb Gerrit-Change-Number: 43566 Gerrit-PatchSet: 3 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Comment-Date: Mon, 21 Sep 2026 11:08:31 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

1 0

[L] Change in osmo-ttcn3-hacks[master]: smf: Implement f_n11_update_sm_context()
by pespin 21 Sep '26

21 Sep '26

pespin has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43681?usp=email ) Change subject: smf: Implement f_n11_update_sm_context() ...................................................................... smf: Implement f_n11_update_sm_context() Change-Id: I3c79ba747886add0ea8e5ea3003364eedf4c43be --- M library/HTTP2_Msg.ttcn M library/TS29502_Nsmf_PDUSession_Templates.ttcn A library/TS29503_Nudm_UECM_Templates.ttcn M smf/SMF_Session_CT.ttcn M smf/SMF_Session_CT_5G.ttcn M smf/gen_links.sh 6 files changed, 482 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/81/43681/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43681?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3c79ba747886add0ea8e5ea3003364eedf4c43be Gerrit-Change-Number: 43681 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-ttcn3-hacks[master]: smf: Add several SBI helpers
by pespin 21 Sep '26

21 Sep '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43680?usp=email ) Change subject: smf: Add several SBI helpers ...................................................................... smf: Add several SBI helpers Those types will need to be generated for multiple messages; put them in helper functions so they can be generated easily wherever needed. Change-Id: Ieff9db356a97d041cd62af41d7810d4bf0fc630a --- M smf/SMF_Session_CT_5G.ttcn 1 file changed, 27 insertions(+), 7 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/smf/SMF_Session_CT_5G.ttcn b/smf/SMF_Session_CT_5G.ttcn index 6809785..7b4e3bc 100644 --- a/smf/SMF_Session_CT_5G.ttcn +++ b/smf/SMF_Session_CT_5G.ttcn @@ -71,6 +71,30 @@ f_http2_adapter_init(); } +function f_ts_PlmnId() +runs on SMF_Session_CT return TS29502_Nsmf_PDUSession.PlmnId { + return valueof(TS29502_Nsmf_PDUSession_Templates.ts_PlmnId("001", "001")); +} + +function f_ts_PlmnIdNid() +runs on SMF_Session_CT return TS29502_Nsmf_PDUSession.PlmnIdNid { + return valueof(TS29502_Nsmf_PDUSession_Templates.ts_PlmnIdNid("001", "001")); +} + +function f_ts_UserLocation() +runs on SMF_Session_CT return TS29502_Nsmf_PDUSession.UserLocation { + var template (value) TS29502_Nsmf_PDUSession.PlmnId plmn_id := f_ts_PlmnId(); + return valueof(ts_UserLocation(nrLocation := ts_NrLocation(tai := ts_Tai(plmn_id, "000001"), + ncgi := ts_Ncgi(plmn_id, "000000000")))); +} + +function f_ts_Guami() +runs on SMF_Session_CT return TS29502_Nsmf_PDUSession.Guami { + var template (value) TS29502_Nsmf_PDUSession.PlmnIdNid plmn_id_nid := f_ts_PlmnIdNid(); + return valueof(ts_Guami(plmnId := plmn_id_nid, + amfId := "020040")); +} + function f_http2_encode_body_multipart_json_5gnas(octetstring json_encoded, octetstring nas_ecnoded, charstring boundary := "=-0EVVjxcWWFYNd1JXh1OQEg==") return octetstring @@ -94,8 +118,6 @@ var template (value) NG_NAS_UL_Message_Type nas_ul_msg; var ProcedureTransactionIdentifier pti := f_next_pti(); var template (value) octetstring body; - var template (value) TS29502_Nsmf_PDUSession.PlmnId plmn_id := TS29502_Nsmf_PDUSession_Templates.ts_PlmnId("001", "001"); - var template (value) TS29502_Nsmf_PDUSession.PlmnIdNid plmn_id_nid := TS29502_Nsmf_PDUSession_Templates.ts_PlmnIdNid(plmn_id.mcc, plmn_id.mnc); var integer pdu_sess_id := 1; var integer http2_idx; var integer http2_stream_id := 3; @@ -111,14 +133,12 @@ dnn := "internet", sNssai := TS29502_Nsmf_PDUSession_Templates.ts_Snssai(1), servingNfId := "foobar", - guami := ts_Guami(plmnId := plmn_id_nid, - amfId := "020040"), - servingNetwork := plmn_id_nid, + guami := f_ts_Guami(), + servingNetwork := f_ts_PlmnIdNid(), n1SmMsg := TS29502_Nsmf_PDUSession_Templates.ts_RefToBinaryData("5gnas-sm"), anType := ThreeGPP_ACCESS, ratType := ts_RatType(NR), - ueLocation := ts_UserLocation(nrLocation := ts_NrLocation(tai := ts_Tai(plmn_id, "000001"), - ncgi := ts_Ncgi(plmn_id, "000000000"))), + ueLocation := f_ts_UserLocation(), smContextStatusUri := ts_Namf_Callback_uri_imsi_sm_context_status_id(g_pars.imsi_str, int2str(pdu_sess_id))); sm_contexts_enc := f_enc_SmContextCreateData(valueof(sm_contexts)); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43680?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: Ieff9db356a97d041cd62af41d7810d4bf0fc630a Gerrit-Change-Number: 43680 Gerrit-PatchSet: 3 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-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in osmo-ttcn3-hacks[master]: HTTP2_Adapter: Use HTTP2_Msg in user APIs
by pespin 21 Sep '26

21 Sep '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43675?usp=email ) Change subject: HTTP2_Adapter: Use HTTP2_Msg in user APIs ...................................................................... HTTP2_Adapter: Use HTTP2_Msg in user APIs This allows simplifying usual user logic where only wanted thing is to send a Header+optData (request) and receive back a Header+optData (Response). Change-Id: I79d74939d8280dfff5ee61c59072466916300017 --- M library/HTTP2_Adapter.ttcn M library/HTTP2_Msg.ttcn M smf/SMF_Session_CT_5G.ttcn 3 files changed, 103 insertions(+), 64 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/library/HTTP2_Adapter.ttcn b/library/HTTP2_Adapter.ttcn index 8616ea4..4d9a750 100644 --- a/library/HTTP2_Adapter.ttcn +++ b/library/HTTP2_Adapter.ttcn @@ -20,6 +20,8 @@ import from Socket_API_Definitions all; import from HTTP2_Templates all; +import from HTTP2_Functions all; +import from HTTP2_Msg all; import from Native_Functions all; import from Misc_Helpers all; @@ -120,10 +122,10 @@ ts_HTTP2_Setting_INITIAL_WINDOW_SIZE(4194304), ts_HTTP2_Setting_MAX_HEADER_LIST_SIZE(10485760) } - f_http2_adapter_send(ts_HTTP2_Frame_Settings(settings := settings), idx := idx); - as_http2_adapter_receive(rx_http_frame, tr_HTTP2_Frame_Settings(ack_flag := false), idx := idx); - as_http2_adapter_receive(rx_http_frame, tr_HTTP2_Frame_Settings(ack_flag := true), idx := idx); - f_http2_adapter_send(ts_HTTP2_Frame_Window_Update(0, 1073741824), idx := idx); + f_http2_adapter_send_frame(ts_HTTP2_Frame_Settings(settings := settings), idx := idx); + as_http2_adapter_receive_frame(rx_http_frame, tr_HTTP2_Frame_Settings(ack_flag := false), idx := idx); + as_http2_adapter_receive_frame(rx_http_frame, tr_HTTP2_Frame_Settings(ack_flag := true), idx := idx); + f_http2_adapter_send_frame(ts_HTTP2_Frame_Window_Update(0, 1073741824), idx := idx); } function f_http2_adapter_close(integer idx := 0) @@ -133,21 +135,78 @@ g_self_conn_id[idx] := -1; } -function f_http2_adapter_send(template (value) HTTP2_Frame http2_frame, - integer idx := 0) +private function f_http2_adapter_send_frame(template (value) HTTP2_Frame http2_frame, + integer idx := 0) runs on HTTP2_CT { HTTP2[idx].send(ts_HTTP2_Send(g_self_conn_id[idx], http2_frame)); } -altstep as_http2_adapter_receive(out HTTP2_Frame rx_http_frame, - template (present) HTTP2_Frame exp_http2_frame := ?, - integer idx := 0) +function f_http2_adapter_send(template (value) HTTP2_Msg http2_msg) +runs on HTTP2_CT +{ + var HTTP2_Msg msg := valueof(http2_msg); + var template (value) HTTP2_Frame http2_frame; + var octetstring hdr_enc; + var integer idx := msg.conn_id; + + /* Send Header: */ + f_HTTP2_Msg_append_hdr_content_length(msg); + hdr_enc := f_HTTP2_header_block_encode(msg.hb); + http2_frame := ts_HTTP2_Frame_Header(msg.stream_id, + end_stream_flag := not ispresent(msg.body), + end_header_flag := true, + header_block_fragment := hdr_enc); + f_http2_adapter_send_frame(http2_frame, idx := idx); + + /* Send body: */ + if (ispresent(msg.body)) { + http2_frame := ts_HTTP2_Frame_Data(msg.body.stream_id, + msg.body.end_stream_flag, + msg.body.data, + msg.body.padding); + f_http2_adapter_send_frame(http2_frame, idx := idx); + } +} + +private altstep as_http2_adapter_receive_frame(out HTTP2_Frame rx_http2_frame, + template (present) HTTP2_Frame exp_http2_frame := ?, + integer idx := 0) runs on HTTP2_CT { var HTTP2_Recv http2_rx; [] HTTP2[idx].receive(tr_HTTP2_Recv(g_self_conn_id[idx], exp_http2_frame, omit)) -> value http2_rx { - rx_http_frame := http2_rx.frame; + rx_http2_frame := http2_rx.frame; + } +} + +altstep as_http2_adapter_receive(out HTTP2_Msg http2_rx_msg, + template (present) HTTP2_Msg http2_exp_msg := ?, + integer idx := 0) +runs on HTTP2_CT +{ + var HTTP2_Frame rx_http2_frame; + [] as_http2_adapter_receive_frame(rx_http2_frame, + tr_HTTP2_Frame_Header(stream_id := http2_exp_msg.stream_id, + header_block_fragment := ?), + idx := idx) { + var template (omit) HTTP2_Data_frame body := omit; + var HTTP2_header_block hb; + + hb := f_HTTP2_header_block_decode(rx_http2_frame.header_frame.header_block_fragment); + if (not rx_http2_frame.header_frame.end_stream_flag) { /* Expect body */ + var HTTP2_Frame body_frame; + as_http2_adapter_receive_frame(body_frame, HTTP2_Frame:{ data_frame := http2_exp_msg.body }); + body := body_frame.data_frame; + } else if (not istemplatekind(http2_exp_msg.body, "*") and + not istemplatekind(http2_exp_msg.body, "omit")) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str(idx, ": Expecting body but header came with end_stream_flag = true!")); + } + http2_rx_msg := valueof(ts_HTTP2_Msg(idx, + rx_http2_frame.header_frame.stream_id, + hb, + body)); } } diff --git a/library/HTTP2_Msg.ttcn b/library/HTTP2_Msg.ttcn index 3ff6ab8..b5b5bc6 100644 --- a/library/HTTP2_Msg.ttcn +++ b/library/HTTP2_Msg.ttcn @@ -1,4 +1,4 @@ -/* HTTP2 Emulation in TTCN-3 +/* HTTP2_Msg * * (C) 2026 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> * @@ -7,7 +7,9 @@ * * SPDX-License-Identifier: GPL-2.0-or-later * - * This module implements a HTTP/HTTPs 2.0 server, + * This module specifies type HTTP2_Msg and functionality around it. + * A HTTP2_Msg is a wrapper around HTTP2_Types.ttcn which allows easier + * transceive of header + body HTTP2 frames. */ module HTTP2_Msg { diff --git a/smf/SMF_Session_CT_5G.ttcn b/smf/SMF_Session_CT_5G.ttcn index e8db57d..b74625c 100644 --- a/smf/SMF_Session_CT_5G.ttcn +++ b/smf/SMF_Session_CT_5G.ttcn @@ -91,21 +91,17 @@ * 3GPP TS 29.502 6.1.3.2 */ function f_n11_create_session() runs on SMF_Session_CT { - var octetstring hdr_enc; - var template (value) HTTP2_pseudo_headers pseudo_hdr; - var template (value) HTTP2_header_list hdr_li; - var template (value) HTTP2_header_block tx_hb; - var template (present) HTTP2_header_block exp_rx_hb; - var HTTP2_header_block rx_hb; var template (value) NG_NAS_UL_Message_Type nas_ul_msg; var ProcedureTransactionIdentifier pti := f_next_pti(); var template (value) octetstring body; - var HTTP2_Frame rx_http_frame; var template (value) TS29502_Nsmf_PDUSession.PlmnId plmn_id := TS29502_Nsmf_PDUSession_Templates.ts_PlmnId("001", "001"); var template (value) TS29502_Nsmf_PDUSession.PlmnIdNid plmn_id_nid := TS29502_Nsmf_PDUSession_Templates.ts_PlmnIdNid(plmn_id.mcc, plmn_id.mnc); var integer pdu_sess_id := 1; var integer http2_idx; var integer http2_stream_id := 3; + var template (value) HTTP2_Msg http2_tx; + var HTTP2_Msg http2_rx; + var template (present) HTTP2_Msg http2_exp_rx; var template (value) SmContextCreateData sm_contexts; var octetstring sm_contexts_enc; @@ -135,30 +131,26 @@ var octetstring nas_enc := enc_NG_NAS_UL_Message_Type(valueof(nas_ul_msg)); body := f_http2_encode_body_multipart_json_5gnas(sm_contexts_enc, nas_enc, boundary); - - pseudo_hdr := ts_HTTP2_pseudo_headers_Req(method := "POST", - scheme := "http", - authority := Nsmf_uri_hostport, - path := Nsmf_PDUSession_path_sm_contexts); - hdr_li := { - ts_HTTP2_Hdr_content_type("multipart/related; boundary=\"" & boundary & "\""), - ts_HTTP2_Hdr_accept("application/json,application/vnd.3gpp.ngap,application/problem+json"), - ts_HTTP2_Hdr_user_agent("ttcn3-amf"), - ts_HTTP2_Hdr_content_length(int2str(lengthof(body))), - ts_HTTP2_Hdr_accept_encoding("gzip") - }; - tx_hb := ts_HTTP2_header_block(pseudo_hdr, hdr_li); - hdr_enc := f_HTTP2_header_block_encode(valueof(tx_hb)); - http2_idx := f_http2_adapter_find_free_idx(); - f_http2_adapter_connect(mp_smf_hostname, mp_smf_sbi_port, mp_amf_local_ip, -1, idx := http2_idx); - f_http2_adapter_send(ts_HTTP2_Frame_Header(http2_stream_id, - end_stream_flag := false, - end_header_flag := true, - header_block_fragment := hdr_enc - ), - idx := http2_idx); + http2_tx := ts_HTTP2_Msg(http2_idx, + http2_stream_id, + hb := { + pseudo_headers := ts_HTTP2_pseudo_headers_Req(method := "POST", + scheme := "http", + authority := Nsmf_uri_hostport, + path := Nsmf_PDUSession_path_sm_contexts), + headers := { + ts_HTTP2_Hdr_content_type("multipart/related; boundary=\"" & boundary & "\""), + ts_HTTP2_Hdr_accept("application/json,application/vnd.3gpp.ngap,application/problem+json"), + ts_HTTP2_Hdr_user_agent("ttcn3-amf"), + ts_HTTP2_Hdr_accept_encoding("gzip") + } + }, + body := ts_HTTP2_Data_frame(http2_stream_id, + end_stream_flag := true, + data := body)); + f_http2_adapter_connect(mp_smf_hostname, mp_smf_sbi_port, mp_amf_local_ip, -1, idx := http2_idx); /////////// START MUTUAL EXCLUSION ZONE //////////// /* This code block cannot be executed by more than one component at a time because @@ -173,10 +165,7 @@ * expected to have SEID set to 0, as per 3GPP TS 29.244, section 7.2.2.4.2. */ f_PFCPEM_subscribe_seid(c_SEID0); - f_http2_adapter_send(ts_HTTP2_Frame_Data(3, - end_stream_flag := true, - data := body), - idx := http2_idx); + f_http2_adapter_send(http2_tx); /* Expect UDM to receive GET sm-data: */ as_nudm_sdm_get_sm_data(); @@ -184,25 +173,14 @@ as_nudm_sdm_post_sdm_subscriptions(); /* Expect to receive "201 Created body={}" answer to our Nsmf sm-contexts request: */ - as_http2_adapter_receive(rx_http_frame, - tr_HTTP2_Frame_Header(stream_id := http2_stream_id, - end_stream_flag := false, - end_header_flag := true, - header_block_fragment := ?), - idx := http2_idx); - rx_hb := f_HTTP2_header_block_decode(rx_http_frame.header_frame.header_block_fragment); - exp_rx_hb := tr_HTTP2_header_block(pseudo_headers := tr_HTTP2_pseudo_headers_Resp(201), - headers := {*, tr_HTTP2_Hdr_location(tr_Nsmf_PDUSession_uri_sm_contexts), *}); - if (not match(rx_hb, exp_rx_hb)) { - Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, - log2str("Rx unexpected HTTP2 response hdr: ", rx_hb, " vs exp ", exp_rx_hb)); - - } - as_http2_adapter_receive(rx_http_frame, - tr_HTTP2_Frame_Data(stream_id := http2_stream_id, - end_stream_flag := true, - data := char2oct("{}")), - idx := http2_idx); + http2_exp_rx := tr_HTTP2_Msg(http2_idx, + http2_stream_id, + tr_HTTP2_header_block(pseudo_headers := tr_HTTP2_pseudo_headers_Resp(201), + headers := {*, tr_HTTP2_Hdr_location(tr_Nsmf_PDUSession_uri_sm_contexts), *}), + tr_HTTP2_Data_frame(stream_id := http2_stream_id, + end_stream_flag := true, + data := char2oct("{}"))); + as_http2_adapter_receive(http2_rx, http2_exp_rx, idx := http2_idx); f_http2_adapter_close(idx := http2_idx); /* Expect PCF to receive POST sm-policies: */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43675?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: I79d74939d8280dfff5ee61c59072466916300017 Gerrit-Change-Number: 43675 Gerrit-PatchSet: 4 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-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-ttcn3-hacks[master]: HTTP2_Templates: add ts_HTTP2_Hdr_content_type_multipart
by pespin 21 Sep '26

21 Sep '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43679?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: HTTP2_Templates: add ts_HTTP2_Hdr_content_type_multipart ...................................................................... HTTP2_Templates: add ts_HTTP2_Hdr_content_type_multipart Change-Id: I14903636636bbd6cd139244d5aed8617df458a0c --- M library/HTTP2_Templates.ttcn M smf/SMF_Session_CT_5G.ttcn 2 files changed, 5 insertions(+), 1 deletion(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/HTTP2_Templates.ttcn b/library/HTTP2_Templates.ttcn index 929b324..e07d4b6 100644 --- a/library/HTTP2_Templates.ttcn +++ b/library/HTTP2_Templates.ttcn @@ -233,6 +233,10 @@ := ts_HTTP2_header_field(c_HTTP2_HDR_content_type, header_value); template (value) HTTP2_header_field +ts_HTTP2_Hdr_content_type_multipart(template (value) charstring boundary) +:= ts_HTTP2_header_field(c_HTTP2_HDR_content_type, "multipart/related; boundary=\"" & valueof(boundary) & "\""); + +template (value) HTTP2_header_field ts_HTTP2_Hdr_accept(template (omit) charstring header_value := omit) := ts_HTTP2_header_field(c_HTTP2_HDR_accept, header_value); diff --git a/smf/SMF_Session_CT_5G.ttcn b/smf/SMF_Session_CT_5G.ttcn index b74625c..6809785 100644 --- a/smf/SMF_Session_CT_5G.ttcn +++ b/smf/SMF_Session_CT_5G.ttcn @@ -140,7 +140,7 @@ authority := Nsmf_uri_hostport, path := Nsmf_PDUSession_path_sm_contexts), headers := { - ts_HTTP2_Hdr_content_type("multipart/related; boundary=\"" & boundary & "\""), + ts_HTTP2_Hdr_content_type_multipart(boundary), ts_HTTP2_Hdr_accept("application/json,application/vnd.3gpp.ngap,application/problem+json"), ts_HTTP2_Hdr_user_agent("ttcn3-amf"), ts_HTTP2_Hdr_accept_encoding("gzip") -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43679?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: I14903636636bbd6cd139244d5aed8617df458a0c Gerrit-Change-Number: 43679 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in osmo-ttcn3-hacks[master]: HTTP2_Adapter: Support multiple concurrent open client connections
by pespin 21 Sep '26

21 Sep '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43673?usp=email ) Change subject: HTTP2_Adapter: Support multiple concurrent open client connections ...................................................................... HTTP2_Adapter: Support multiple concurrent open client connections Change-Id: I194ba7d5ad72363a0e398847360e985e7f7ec6cb --- M library/HTTP2_Adapter.ttcn M smf/SMF_Session_CT_5G.ttcn 2 files changed, 63 insertions(+), 35 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/HTTP2_Adapter.ttcn b/library/HTTP2_Adapter.ttcn index 787dff0..8616ea4 100644 --- a/library/HTTP2_Adapter.ttcn +++ b/library/HTTP2_Adapter.ttcn @@ -24,16 +24,19 @@ import from Native_Functions all; import from Misc_Helpers all; +const integer HTTP2_MAX_NUM_CLIENTS := 4; + type component HTTP2_CT { - port HTTP2_CODEC_PT HTTP2; + port HTTP2_CODEC_PT HTTP2[HTTP2_MAX_NUM_CLIENTS]; /* double underscore to have "g_pars" available on components extending this one: */ - var template (omit) HTTP2_Adapter_Params g_http2_pars; + var HTTP2_Adapter_Params g_http2_pars[HTTP2_MAX_NUM_CLIENTS]; /* Connection identifier of the client / server itself */ - var IPL4asp_Types.ConnectionId g_self_conn_id := -1; + var IPL4asp_Types.ConnectionId g_self_conn_id[HTTP2_MAX_NUM_CLIENTS]; }; type record HTTP2_Adapter_Params { + integer idx, charstring local_host, integer local_port, charstring remote_host, @@ -42,11 +45,13 @@ }; template (value) HTTP2_Adapter_Params -ts_HTTP2_Adapter_Params(template (value) charstring local_host, +ts_HTTP2_Adapter_Params(template (value) integer idx, + template (value) charstring local_host, template (value) integer local_port, template (value) charstring remote_host, template (value) integer remote_port, template (value) boolean use_ssl) := { + idx := idx, local_host := local_host, local_port := local_port, remote_host := remote_host, @@ -55,7 +60,10 @@ } function f_http2_adapter_init() runs on HTTP2_CT { - map(self:HTTP2, system:HTTP2_CODEC_PT); + for(var integer i := 0; i < HTTP2_MAX_NUM_CLIENTS; i := i + 1) { + map(self:HTTP2[i], system:HTTP2_CODEC_PT); + g_self_conn_id[i] := -1; + } } private function f_http2_adapter_getMsgLen(in octetstring pl_stream, @@ -66,34 +74,45 @@ } -private function f_set_tcp_segmentation() +private function f_set_tcp_segmentation(integer idx := 0) runs on HTTP2_CT { /* Set function for dissecting the binary stream into packets */ var f_IPL4_getMsgLen vl_f := refers(f_http2_adapter_getMsgLen); - HTTP2_CodecPort_CtrlFunct.f_IPL4_setGetMsgLen(HTTP2, g_self_conn_id, vl_f, {}); + HTTP2_CodecPort_CtrlFunct.f_IPL4_setGetMsgLen(HTTP2[idx], g_self_conn_id[idx], vl_f, {}); +} + +/* Obtain index of free slot which can be then used to connect, etc., negative on error. */ +function f_http2_adapter_find_free_idx() +runs on HTTP2_CT return integer { + for(var integer i := 0; i < HTTP2_MAX_NUM_CLIENTS; i := i + 1) { + if (g_self_conn_id[i] == -1) { + return i; + } + } + return -1; } /* Function to use to connect as client to a remote IPA Server */ function f_http2_adapter_connect(charstring remote_host, IPL4asp_Types.PortNumber remote_port, - charstring local_host, IPL4asp_Types.PortNumber local_port, boolean use_ssl := false) + charstring local_host, IPL4asp_Types.PortNumber local_port, boolean use_ssl := false, integer idx := 0) runs on HTTP2_CT { var IPL4asp_Types.Result res; - res := HTTP2_CodecPort_CtrlFunct.f_IPL4_connect(HTTP2, remote_host, remote_port, + res := HTTP2_CodecPort_CtrlFunct.f_IPL4_connect(HTTP2[idx], remote_host, remote_port, local_host, local_port, 0, { tcp:={} }); if (not ispresent(res.connId)) { - setverdict(fail, "Could not connect HTTP2 socket from ", local_host, " port ", local_port, - " to ", remote_host, " port ", remote_port, "; check your configuration"); - mtc.stop; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str(idx, ": Could not connect HTTP2 socket from ", local_host, " port ", local_port, + " to ", remote_host, " port ", remote_port, "; check your configuration")); } - g_self_conn_id := res.connId; - g_http2_pars := ts_HTTP2_Adapter_Params(remote_host, remote_port, local_host, local_port, use_ssl); + g_self_conn_id[idx] := res.connId; + g_http2_pars[idx] := valueof(ts_HTTP2_Adapter_Params(idx, remote_host, remote_port, local_host, local_port, use_ssl)); - f_set_tcp_segmentation(); - HTTP2.send(ts_HTTP2_Send_magic(g_self_conn_id)); - f_http2_adapter_initial_handshake(); + f_set_tcp_segmentation(idx := idx); + HTTP2[idx].send(ts_HTTP2_Send_magic(g_self_conn_id[idx])); + f_http2_adapter_initial_handshake(idx := idx); } -private function f_http2_adapter_initial_handshake() +private function f_http2_adapter_initial_handshake(integer idx := 0) runs on HTTP2_CT { var HTTP2_Frame rx_http_frame; var template (value) HTTP2_Setting_list settings := { @@ -101,31 +120,33 @@ ts_HTTP2_Setting_INITIAL_WINDOW_SIZE(4194304), ts_HTTP2_Setting_MAX_HEADER_LIST_SIZE(10485760) } - f_http2_adapter_send(ts_HTTP2_Frame_Settings(settings := settings)); - as_http2_adapter_receive(rx_http_frame, tr_HTTP2_Frame_Settings(ack_flag := false)); - as_http2_adapter_receive(rx_http_frame, tr_HTTP2_Frame_Settings(ack_flag := true)); - f_http2_adapter_send(ts_HTTP2_Frame_Window_Update(0, 1073741824)); + f_http2_adapter_send(ts_HTTP2_Frame_Settings(settings := settings), idx := idx); + as_http2_adapter_receive(rx_http_frame, tr_HTTP2_Frame_Settings(ack_flag := false), idx := idx); + as_http2_adapter_receive(rx_http_frame, tr_HTTP2_Frame_Settings(ack_flag := true), idx := idx); + f_http2_adapter_send(ts_HTTP2_Frame_Window_Update(0, 1073741824), idx := idx); } -function f_http2_adapter_close() +function f_http2_adapter_close(integer idx := 0) runs on HTTP2_CT { var IPL4asp_Types.Result res; - res := HTTP2_CodecPort_CtrlFunct.f_IPL4_close(HTTP2, g_self_conn_id, {tcp := {}}); - g_self_conn_id := -1; + res := HTTP2_CodecPort_CtrlFunct.f_IPL4_close(HTTP2[idx], g_self_conn_id[idx], {tcp := {}}); + g_self_conn_id[idx] := -1; } -function f_http2_adapter_send(template (value) HTTP2_Frame http2_frame) +function f_http2_adapter_send(template (value) HTTP2_Frame http2_frame, + integer idx := 0) runs on HTTP2_CT { - HTTP2.send(ts_HTTP2_Send(g_self_conn_id, http2_frame)); + HTTP2[idx].send(ts_HTTP2_Send(g_self_conn_id[idx], http2_frame)); } altstep as_http2_adapter_receive(out HTTP2_Frame rx_http_frame, - template (present) HTTP2_Frame exp_http2_frame := ?) + template (present) HTTP2_Frame exp_http2_frame := ?, + integer idx := 0) runs on HTTP2_CT { var HTTP2_Recv http2_rx; - [] HTTP2.receive(tr_HTTP2_Recv(g_self_conn_id, exp_http2_frame, omit)) -> value http2_rx { + [] HTTP2[idx].receive(tr_HTTP2_Recv(g_self_conn_id[idx], exp_http2_frame, omit)) -> value http2_rx { rx_http_frame := http2_rx.frame; } } diff --git a/smf/SMF_Session_CT_5G.ttcn b/smf/SMF_Session_CT_5G.ttcn index 78cc72f..b2c20c4 100644 --- a/smf/SMF_Session_CT_5G.ttcn +++ b/smf/SMF_Session_CT_5G.ttcn @@ -68,7 +68,6 @@ function f_n11_init() runs on SMF_Session_CT { f_http2_adapter_init(); - f_http2_adapter_connect(mp_smf_hostname, mp_smf_sbi_port, mp_amf_local_ip, -1); } function f_http2_encode_body_multipart_json_5gnas(octetstring json_encoded, @@ -104,6 +103,7 @@ var template (value) TS29502_Nsmf_PDUSession.PlmnId plmn_id := TS29502_Nsmf_PDUSession_Templates.ts_PlmnId("001", "001"); var template (value) TS29502_Nsmf_PDUSession.PlmnIdNid plmn_id_nid := TS29502_Nsmf_PDUSession_Templates.ts_PlmnIdNid(plmn_id.mcc, plmn_id.mnc); var integer pdu_sess_id := 1; + var integer http2_idx; var integer http2_stream_id := 3; var template (value) SmContextCreateData sm_contexts; @@ -148,11 +148,15 @@ }; tx_hb := ts_HTTP2_header_block(pseudo_hdr, hdr_li); hdr_enc := f_HTTP2_header_block_encode(valueof(tx_hb)); + + http2_idx := f_http2_adapter_find_free_idx(); + f_http2_adapter_connect(mp_smf_hostname, mp_smf_sbi_port, mp_amf_local_ip, -1, idx := http2_idx); f_http2_adapter_send(ts_HTTP2_Frame_Header(http2_stream_id, end_stream_flag := false, end_header_flag := true, header_block_fragment := hdr_enc - )); + ), + idx := http2_idx); /////////// START MUTUAL EXCLUSION ZONE //////////// @@ -170,7 +174,8 @@ f_http2_adapter_send(ts_HTTP2_Frame_Data(3, end_stream_flag := true, - data := body)); + data := body), + idx := http2_idx); /* Expect UDM to receive GET sm-data: */ as_nudm_sdm_get_sm_data(); @@ -182,7 +187,8 @@ tr_HTTP2_Frame_Header(stream_id := http2_stream_id, end_stream_flag := false, end_header_flag := true, - header_block_fragment := ?)); + header_block_fragment := ?), + idx := http2_idx); rx_hb := f_HTTP2_header_block_decode(rx_http_frame.header_frame.header_block_fragment); exp_rx_hb := tr_HTTP2_header_block(pseudo_headers := tr_HTTP2_pseudo_headers_Resp(201), headers := {*, tr_HTTP2_Hdr_location(tr_Nsmf_PDUSession_uri_sm_contexts), *}); @@ -194,8 +200,9 @@ as_http2_adapter_receive(rx_http_frame, tr_HTTP2_Frame_Data(stream_id := http2_stream_id, end_stream_flag := true, - data := char2oct("{}"))); - f_http2_adapter_close(); + data := char2oct("{}")), + idx := http2_idx); + f_http2_adapter_close(idx := http2_idx); /* Expect PCF to receive POST sm-policies: */ as_npcf_smpolicycontrol_post_sm_policies(); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43673?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: I194ba7d5ad72363a0e398847360e985e7f7ec6cb Gerrit-Change-Number: 43673 Gerrit-PatchSet: 3 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-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in osmo-ttcn3-hacks[master]: Move HTTP2_Msg to its own file
by pespin 21 Sep '26

21 Sep '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43674?usp=email ) Change subject: Move HTTP2_Msg to its own file ...................................................................... Move HTTP2_Msg to its own file It is so far only used by HTTP2_Server_Emulation, but it will be reused by HTTP2_Adapter in a follow-up patch. Change-Id: Ib5ec7c2bb6882b2359c6b98836c01f70b1c28585 --- A library/HTTP2_Msg.ttcn M library/HTTP2_Server_Emulation.ttcn M smf/SMF_Session_CT_5G.ttcn M smf/gen_links.sh 4 files changed, 103 insertions(+), 73 deletions(-) Approvals: osmith: Looks good to me, approved Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve diff --git a/library/HTTP2_Msg.ttcn b/library/HTTP2_Msg.ttcn new file mode 100644 index 0000000..3ff6ab8 --- /dev/null +++ b/library/HTTP2_Msg.ttcn @@ -0,0 +1,100 @@ +/* HTTP2 Emulation in TTCN-3 + * + * (C) 2026 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + * + * Released under the terms of GNU General Public License, Version 2 or + * (at your option) any later version. + * + * SPDX-License-Identifier: GPL-2.0-or-later + * + * This module implements a HTTP/HTTPs 2.0 server, + */ + +module HTTP2_Msg { + +import from HTTP2_Types all; +import from HTTP2_CodecPort all; +import from HTTP2_CodecPort_CtrlFunct all; +import from IPL4asp_Types all; +import from IPL4asp_PortType all; +import from Socket_API_Definitions all; + +import from HTTP2_Templates all; +import from HTTP2_Functions all; + +import from Native_Functions all; +import from Misc_Helpers all; + + +/*************** + * HTTP2_Msg + **************/ + +type record HTTP2_Msg { + IPL4asp_Types.ConnectionId conn_id, + integer stream_id, + HTTP2_header_block hb, + HTTP2_Data_frame body optional +} + +template (present) HTTP2_Msg +tr_HTTP2_Msg(template (present) IPL4asp_Types.ConnectionId conn_id := ?, + template (present) integer stream_id := ?, + template (present) HTTP2_header_block hb := ?, + template HTTP2_Data_frame body := *) := { + conn_id := conn_id, + stream_id := stream_id, + hb := hb, + body := body +} + +template (value) HTTP2_Msg +ts_HTTP2_Msg(template (value) IPL4asp_Types.ConnectionId conn_id, + template (value) integer stream_id, + template (value) HTTP2_header_block hb, + template (omit) HTTP2_Data_frame body := omit) := { + conn_id := conn_id, + stream_id := stream_id, + hb := hb, + body := body +} + +template (value) HTTP2_Msg +ts_HTTP2_Msg_Status(template (value) IPL4asp_Types.ConnectionId conn_id, + template (value) integer stream_id, + template (value) integer status, + template (omit) HTTP2_header_list headers := omit, + template (omit) HTTP2_Data_frame body := omit) := +ts_HTTP2_Msg(conn_id, + stream_id, + hb := ts_HTTP2_header_block(pseudo_headers := ts_HTTP2_pseudo_headers_Resp(status), + headers := headers), + body := body + ); + +template (value) HTTP2_Msg +ts_HTTP2_Msg_200_OK(template (value) IPL4asp_Types.ConnectionId conn_id, + template (value) integer stream_id, + template (omit) HTTP2_header_list headers := omit, + template (omit) HTTP2_Data_frame body := omit) := +ts_HTTP2_Msg_Status(conn_id, stream_id, 200, headers, body); + +template (value) HTTP2_Msg +ts_HTTP2_Msg_201_Created(template (value) IPL4asp_Types.ConnectionId conn_id, + template (value) integer stream_id, + template (omit) HTTP2_header_list headers := omit, + template (omit) HTTP2_Data_frame body := omit) := +ts_HTTP2_Msg_Status(conn_id, stream_id, 201, headers, body); + + +function f_HTTP2_Msg_append_hdr_content_length(inout HTTP2_Msg http2_msg) +{ + if (not ispresent(http2_msg.body)) { + return; + } + var integer content_length := lengthof(http2_msg.body.data); /* TODO: http2_msg.body.padding ? */ + http2_msg.hb.headers := http2_msg.hb.headers & + { valueof(ts_HTTP2_Hdr_content_length(int2str(content_length))) }; +} + +} diff --git a/library/HTTP2_Server_Emulation.ttcn b/library/HTTP2_Server_Emulation.ttcn index 46b30d0..528cd94 100644 --- a/library/HTTP2_Server_Emulation.ttcn +++ b/library/HTTP2_Server_Emulation.ttcn @@ -21,82 +21,11 @@ import from HTTP2_Templates all; import from HTTP2_Functions all; +import from HTTP2_Msg all; import from Native_Functions all; import from Misc_Helpers all; - -/*************** - * HTTP2_Msg - **************/ - -type record HTTP2_Msg { - IPL4asp_Types.ConnectionId conn_id, - integer stream_id, - HTTP2_header_block hb, - HTTP2_Data_frame body optional -} - -template (present) HTTP2_Msg -tr_HTTP2_Msg(template (present) IPL4asp_Types.ConnectionId conn_id := ?, - template (present) integer stream_id := ?, - template (present) HTTP2_header_block hb := ?, - template HTTP2_Data_frame body := *) := { - conn_id := conn_id, - stream_id := stream_id, - hb := hb, - body := body -} - -template (value) HTTP2_Msg -ts_HTTP2_Msg(template (value) IPL4asp_Types.ConnectionId conn_id, - template (value) integer stream_id, - template (value) HTTP2_header_block hb, - template (omit) HTTP2_Data_frame body := omit) := { - conn_id := conn_id, - stream_id := stream_id, - hb := hb, - body := body -} - -template (value) HTTP2_Msg -ts_HTTP2_Msg_Status(template (value) IPL4asp_Types.ConnectionId conn_id, - template (value) integer stream_id, - template (value) integer status, - template (omit) HTTP2_header_list headers := omit, - template (omit) HTTP2_Data_frame body := omit) := -ts_HTTP2_Msg(conn_id, - stream_id, - hb := ts_HTTP2_header_block(pseudo_headers := ts_HTTP2_pseudo_headers_Resp(status), - headers := headers), - body := body - ); - -template (value) HTTP2_Msg -ts_HTTP2_Msg_200_OK(template (value) IPL4asp_Types.ConnectionId conn_id, - template (value) integer stream_id, - template (omit) HTTP2_header_list headers := omit, - template (omit) HTTP2_Data_frame body := omit) := -ts_HTTP2_Msg_Status(conn_id, stream_id, 200, headers, body); - -template (value) HTTP2_Msg -ts_HTTP2_Msg_201_Created(template (value) IPL4asp_Types.ConnectionId conn_id, - template (value) integer stream_id, - template (omit) HTTP2_header_list headers := omit, - template (omit) HTTP2_Data_frame body := omit) := -ts_HTTP2_Msg_Status(conn_id, stream_id, 201, headers, body); - - -function f_HTTP2_Msg_append_hdr_content_length(inout HTTP2_Msg http2_msg) -{ - if (not ispresent(http2_msg.body)) { - return; - } - var integer content_length := lengthof(http2_msg.body.data); /* TODO: http2_msg.body.padding ? */ - http2_msg.hb.headers := http2_msg.hb.headers & - { valueof(ts_HTTP2_Hdr_content_length(int2str(content_length))) }; -} - /********************* * HTTP2_Server_Conn ********************/ diff --git a/smf/SMF_Session_CT_5G.ttcn b/smf/SMF_Session_CT_5G.ttcn index b2c20c4..e8db57d 100644 --- a/smf/SMF_Session_CT_5G.ttcn +++ b/smf/SMF_Session_CT_5G.ttcn @@ -8,6 +8,7 @@ import from HTTP2_Types all; import from HTTP2_Templates all; import from HTTP2_Functions all; +import from HTTP2_Msg all; import from HTTP2_Adapter all; import from HTTP2_Server_Emulation all; diff --git a/smf/gen_links.sh b/smf/gen_links.sh index 352f4a9..b95339f 100755 --- a/smf/gen_links.sh +++ b/smf/gen_links.sh @@ -126,7 +126,7 @@ FILES+="SCTP_Templates.ttcn " FILES+="NTP_Functions.ttcn PFCP_Templates.ttcn PFCP_CodecPort.ttcn PFCP_CodecPort_CtrlFunct.ttcn PFCP_CodecPort_CtrlFunctDef.cc PFCP_Emulation.ttcn " FILES+="Mutex.ttcn " -FILES+="HTTP2_CodecPort.ttcn HTTP2_CodecPort_CtrlFunct.ttcn HTTP2_CodecPort_CtrlFunctDef.cc HTTP2_Templates.ttcn HTTP2_Functions.ttcn HTTP2_Adapter.ttcn HTTP2_Server_Emulation.ttcn " +FILES+="HTTP2_CodecPort.ttcn HTTP2_CodecPort_CtrlFunct.ttcn HTTP2_CodecPort_CtrlFunctDef.cc HTTP2_Templates.ttcn HTTP2_Functions.ttcn HTTP2_Msg.ttcn HTTP2_Adapter.ttcn HTTP2_Server_Emulation.ttcn " FILES+="TS29503_Nudm_SDM_Templates.ttcn TS29502_Nsmf_PDUSession_Templates.ttcn TS29512_Npcf_SMPolicyControl_Templates.ttcn TS29518_Namf_Communication_Templates.ttcn " FILES+="NG_NAS_Osmo_Types.ttcn NG_NAS_Osmo_Templates.ttcn NG_NAS_Functions.ttcn " gen_links $DIR $FILES -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43674?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: Ib5ec7c2bb6882b2359c6b98836c01f70b1c28585 Gerrit-Change-Number: 43674 Gerrit-PatchSet: 4 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-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log September 2026