pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43666?usp=email )
Change subject: smf: Move HTTP2 hdr block compressor helper to HTTP2_Functions.ttcn ......................................................................
smf: Move HTTP2 hdr block compressor helper to HTTP2_Functions.ttcn
Change-Id: I5a4fffd4c26bde78340612fe024dc54c918885ab --- M library/HTTP2_Functions.ttcn M library/HTTP2_Server_Emulation.ttcn M smf/SMF_Session_CT_5G.ttcn 3 files changed, 19 insertions(+), 36 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/66/43666/1
diff --git a/library/HTTP2_Functions.ttcn b/library/HTTP2_Functions.ttcn index 307938b..2aae55e 100644 --- a/library/HTTP2_Functions.ttcn +++ b/library/HTTP2_Functions.ttcn @@ -7,6 +7,22 @@ import from HTTP2_Types all; import from HTTP2_Templates all;
+function f_HTTP2_header_block_encode(HTTP2_header_block hb) return octetstring +{ + var HTTP2_comp_context ctx; + var octetstring data := ''O; + var integer rc; + + ctx := HTTP2_comp_context_init(); + rc := HTTP2_comp_context_encode(ctx, hb, data); + HTTP2_comp_context_free(ctx); + if (rc != 0) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("HTTP2_comp_context_encode returned ", rc)); + } + return data; +} + function f_HTTP2_header_list_find_header(HTTP2_header_list headers, charstring header_name) return template (omit) charstring { for (var integer i := 0; i < lengthof(headers); i := i + 1) { diff --git a/library/HTTP2_Server_Emulation.ttcn b/library/HTTP2_Server_Emulation.ttcn index 779d7f3..f8f60ed 100644 --- a/library/HTTP2_Server_Emulation.ttcn +++ b/library/HTTP2_Server_Emulation.ttcn @@ -20,6 +20,7 @@ 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; @@ -152,25 +153,6 @@ return pl_hblock; }
-private function f_HTTP2_Server_Conn_comp_encode(inout HTTP2_Server_Conn conn, HTTP2_header_block hb) -return octetstring -{ - var octetstring pl_frame_data; - var HTTP2_comp_context ctx; - var integer rc; - - ctx := HTTP2_comp_context_init(); - rc := HTTP2_comp_context_encode(ctx, hb, pl_frame_data); - HTTP2_comp_context_free(ctx); - if (rc != 0) { - Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, - log2str(f_HTTP2_Server_Conn_str(conn), - ": HTTP2_comp_context_encode returned ", rc)); - } - - return pl_frame_data; -} - /*********************************************************************** * Main Emulation Component (HTTP2 Server) ***********************************************************************/ @@ -461,7 +443,7 @@
/* Send Header: */ f_HTTP2_Msg_append_hdr_content_length(http2_msg); - var octetstring hdr_enc := f_HTTP2_Server_Conn_comp_encode(conn_table[idx], http2_msg.hb); + var octetstring hdr_enc := f_HTTP2_header_block_encode(http2_msg.hb); http2_frame := ts_HTTP2_Frame_Header(http2_msg.stream_id, end_stream_flag := not ispresent(http2_msg.body), end_header_flag := true, diff --git a/smf/SMF_Session_CT_5G.ttcn b/smf/SMF_Session_CT_5G.ttcn index 22dc5e5..500dac4 100644 --- a/smf/SMF_Session_CT_5G.ttcn +++ b/smf/SMF_Session_CT_5G.ttcn @@ -63,21 +63,6 @@ f_http2_adapter_send(ts_HTTP2_Frame_Window_Update(0, 1073741824)); }
-function f_http2_header_block_encode(HTTP2_header_block hb) return octetstring -{ - var HTTP2_comp_context ctx := HTTP2_comp_context_init(); - var integer rc; - var octetstring data := ''O; - - rc := HTTP2_comp_context_encode(ctx, hb, data); - if (rc != 0) { - Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, - log2str("HTTP2_comp_context_encode returned ", rc)); - } - HTTP2_comp_context_free(ctx); - return data; -} - function f_http2_encode_body_multipart_json_5gnas(octetstring json_encoded, octetstring nas_ecnoded, charstring boundary := "=-0EVVjxcWWFYNd1JXh1OQEg==") return octetstring @@ -150,7 +135,7 @@ ts_HTTP2_Hdr_accept_encoding("gzip") }; hb := ts_HTTP2_header_block(pseudo_hdr, hdr_li); - hdr_enc := f_http2_header_block_encode(valueof(hb)); + hdr_enc := f_HTTP2_header_block_encode(valueof(hb)); f_http2_adapter_send(ts_HTTP2_Frame_Header(3, end_stream_flag := false, end_header_flag := true,