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

[S] Change in ...osmo-epdg[master]: aaa_diameter_s6b.erl: Get rid of unused code

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36234?usp=email ) Change subject: aaa_diameter_s6b.erl: Get rid of unused code ...................................................................... aaa_diameter_s6b.erl: Get rid of unused code Change-Id: I9e94fe26073ddb1740c3ae1d761d359c3f1b7439 --- M src/aaa_diameter_s6b.erl 1 file changed, 13 insertions(+), 32 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/34/36234/1 diff --git a/src/aaa_diameter_s6b.erl b/src/aaa_diameter_s6b.erl index 163ffbd..baf251f 100644 --- a/src/aaa_diameter_s6b.erl +++ b/src/aaa_diameter_s6b.erl @@ -47,12 +47,9 @@ -export([start_link/0]). -export([start/0, stop/0, terminate/2]). %% gen_server Function Exports --export([init/1, handle_call/3, handle_cast/2, handle_info/2]). +-export([init/1, handle_call/3, handle_cast/2, handle_info/2, peer_down/3]). -export([code_change/3]). --export([multimedia_auth_request/6]). --export([server_assignment_request/3]). -export([tx_aa_answer/2, tx_st_answer/2]). --export([test/0, test/1]). %% Diameter Application Definitions -define(SERVER, ?MODULE). @@ -96,11 +93,6 @@ {module, ?CALLBACK_MOD}, {answer_errors, callback}]}]). --record(state, { - handlers, - peers = #{} -}). - %% @doc starts gen_server implementation process -spec start() -> ok | {error, term()}. start() -> @@ -115,9 +107,7 @@ start_link() -> gen_server:start_link({local, ?SERVER}, ?MODULE, [], []). -peer_down(API, SvcName, {PeerRef, _} = Peer) -> - % fixme: why do we still have ets here? - (catch ets:delete(?MODULE, {API, PeerRef})), +peer_down(_API, SvcName, {_PeerRef, _} = Peer) -> gen_server:cast(?SERVER, {peer_down, SvcName, Peer}), ok. @@ -133,20 +123,6 @@ {ok, _} = listen({address, Proto, Ip, Port}, {timer, ConnectTimer, WatchdogTimer, WatchdogConfig}), {ok, State}. -test() -> - test("001011234567890"). - -test(IMSI) -> - multimedia_auth_request(IMSI, 3, "EAP-AKA", 1, [], []). - -multimedia_auth_request(IMSI, NumAuthItems, AuthScheme, RAT, CKey, IntegrityKey) -> - gen_server:call(?SERVER, - {mar, {IMSI, NumAuthItems, AuthScheme, RAT, CKey, IntegrityKey}}). -% APN is optional and should be [] -server_assignment_request(IMSI, Type, APN) -> - gen_server:call(?SERVER, - {sar, {IMSI, Type, APN}}). - tx_aa_answer(Pid, DiaRC) -> % handle_request(AAR) was spawned into its own process, and it's blocked waiting for AAA: Pid ! {aaa, DiaRC}. @@ -155,12 +131,8 @@ % handle_request(STR) was spawned into its own process, and it's blocked waiting for STA: Pid ! {sta, DiaRC}. -result_code_success(2001) -> ok; -result_code_success(2002) -> ok; -result_code_success(_) -> invalid_result_code. - -handle_call({aar, {IMSI, Type, APN}}, _From, State) -> - SessionId = diameter:session_id(application:get_env(?ENV_APP_NAME, origin_host, ?ENV_DEFAULT_ORIG_HOST)). +handle_call(Info, _From, State) -> + error_logger:error_report(["unknown handle_call", {module, ?MODULE}, {info, Info}, {state, State}]). %% @callback gen_server handle_cast(stop, State) -> -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36234?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I9e94fe26073ddb1740c3ae1d761d359c3f1b7439 Gerrit-Change-Number: 36234 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 5 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: epdg: Introduce test TC_hss_initiated_deregister_permanent_termination

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36233?usp=email ) Change subject: epdg: Introduce test TC_hss_initiated_deregister_permanent_termination ...................................................................... epdg: Introduce test TC_hss_initiated_deregister_permanent_termination Change-Id: I50daa7a04e0f19dbf987a8baba7a979a353089a3 --- M epdg/EPDG_Tests.ttcn M library/DIAMETER_Templates.ttcn M library/DIAMETER_ts29_273_Templates.ttcn 3 files changed, 145 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/33/36233/1 diff --git a/epdg/EPDG_Tests.ttcn b/epdg/EPDG_Tests.ttcn index 9aaeb60..99e70b6 100644 --- a/epdg/EPDG_Tests.ttcn +++ b/epdg/EPDG_Tests.ttcn @@ -478,6 +478,7 @@ var UINT32 hbh_id := f_rnd_octstring(4); var UINT32 ete_id := f_rnd_octstring(4); var octetstring reason_info := char2oct("test"); + var CxDx_3GPP_Reason_Code reason_code_permanent_termination := PERMANENT_TERMINATION; /* Unlike STR, STA contains no IMSI. Register ete_id in DIAMETER_Emulation, * so AIA is forwarded back to us in DIAMETER port instead of MTC_CT.DIAMETER_UNIT. @@ -488,6 +489,14 @@ hbh_id := hbh_id, ete_id := ete_id)); + if (match(reason_code_permanent_termination, reason_code)) { + /* Expect Abort-Session procedure (ASR + ASA) in the S6b interface: */ + as_DIA_S6b_AS_success(); + /* Here AAA-Server starts an ASR + ASA procedure towards ePDG, which forwards it to strongswan: */ + as_GSUP_rx_CL_REQ(OSMO_GSUP_CANCEL_TYPE_WITHDRAW); + f_GSUP_tx_CL_RES(); + } + alt { [] SWx.receive(tr_DIA_SWx_RTA(exp_result_tmpl, hbh_id := hbh_id, ete_id := ete_id)) -> value rx_dia {} [] SWx.receive(PDU_DIAMETER:?) -> value rx_dia { @@ -549,6 +558,25 @@ } } +/* Diameter S6b ASR + ASA, TS 29.273 9.1.2.3.4. */ +private altstep as_DIA_S6b_AS_success() runs on EPDG_ConnHdlr { + var PDU_DIAMETER rx_dia; + var template (omit) AVP avp; + var octetstring sess_id; + [] S6b.receive(tr_DIA_S6b_ASR(f_nai())) -> value rx_dia { + avp := f_DIAMETER_get_avp(rx_dia, c_AVP_Code_BASE_NONE_Session_Id); + sess_id := valueof(avp.avp_data.avp_BASE_NONE_Session_Id); + SWx.send(ts_DIA_S6b_ASA(DIAMETER_SUCCESS, + sess_id := sess_id, + hbh_id := rx_dia.hop_by_hop_id, + ete_id := rx_dia.end_to_end_id)); + setverdict(pass); + } + [] S6b.receive(PDU_DIAMETER:?) -> value rx_dia { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Unexpected Diameter msg rx: ", rx_dia)); + } +} + private function f_exp_tr_GTP2C_APCO_in_CreateSessionReq() runs on EPDG_ConnHdlr return template (present) APCO { var template ProtocolIDs_and_ContainerIDs protos, protosV4, protosV6, protosV46; @@ -796,6 +824,10 @@ } } +/************ + * GSUP CEAI + ************/ + private function f_GSUP_tx_SAI_REQ(boolean req_resync := false) runs on EPDG_ConnHdlr { var GSUP_PDU rx_gsup; var template (value) GSUP_IEs pdp_info; @@ -811,7 +843,6 @@ } } - private altstep as_GSUP_rx_SAI_RES() runs on EPDG_ConnHdlr { var GSUP_PDU rx_gsup; var template (present) GSUP_IE auth_tuple_ie := tr_GSUP_IE_AuthTuple3G( @@ -838,6 +869,20 @@ } } +private altstep as_GSUP_rx_CL_REQ(template GSUP_CancelType ctype := omit) runs on EPDG_ConnHdlr { + var GSUP_PDU rx_gsup; + + [] GSUP.receive(tr_GSUP_CL_REQ(g_pars.imsi, dom := *, ctype := ctype)) -> value rx_gsup { + } + [] GSUP.receive(GSUP_PDU:?) -> value rx_gsup { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Unexpected GSUP msg rx: ", rx_gsup)); + } +} + +private function f_GSUP_tx_CL_RES() runs on EPDG_ConnHdlr { + GSUP.send(ts_GSUP_CL_RES(g_pars.imsi)); +} + /* GSUP AuthInfo Req + Resp, triggers SWx MAR + MAA. */ private function f_GSUP_AI_success(boolean req_resync := false) runs on EPDG_ConnHdlr { f_GSUP_tx_SAI_REQ(req_resync); @@ -1071,6 +1116,24 @@ setverdict(pass); } +private function f_TC_hss_initiated_deregister_permanent_termination(charstring id) runs on EPDG_ConnHdlr { + f_initial_attach(); + /* Procedure should be performed properly: */ + f_DIA_SWx_RT(PERMANENT_TERMINATION, tr_AVP_ResultCode(DIAMETER_SUCCESS)); + /* Subscriber was already removed, it should fail if requested again: */ + var DIAMETER_ts29_229_ExperimentalResultcode erc := DIAMETER_ERROR_USER_UNKNOWN; + f_DIA_SWx_RT(PERMANENT_TERMINATION, tr_AVP_ExperimentalResult(vendor_id_3GPP, int2oct(enum2int(erc), 4))); + f_sleep(3.0); +} +testcase TC_hss_initiated_deregister_permanent_termination() runs on MTC_CT { + var EPDG_ConnHdlrPars pars := f_init_pars(); + var EPDG_ConnHdlr vc_conn; + f_init(); + vc_conn := f_start_handler(refers(f_TC_hss_initiated_deregister_permanent_termination), pars); + vc_conn.done; + setverdict(pass); +} + private function f_TC_concurrent_ues(charstring id) runs on EPDG_ConnHdlr { COORD.send(COORD_CMD_READY); COORD.receive(COORD_CMD_START); @@ -1168,6 +1231,7 @@ execute ( TC_ho_wifi_to_lte() ); execute ( TC_s2b_CreateSession_rejected() ); execute ( TC_hss_initiated_deregister_new_server_assigned() ); + execute ( TC_hss_initiated_deregister_permanent_termination() ); execute ( TC_concurrent_ues2() ); execute ( TC_concurrent_ues100() ); execute ( TC_upf_echo_req() ); diff --git a/library/DIAMETER_Templates.ttcn b/library/DIAMETER_Templates.ttcn index 31ea821..933c97b 100644 --- a/library/DIAMETER_Templates.ttcn +++ b/library/DIAMETER_Templates.ttcn @@ -569,11 +569,11 @@ template (value) GenericAVP ts_AVP_SuppVendorId(Vendor_Id vendor_id) := ts_AVP_SuppVendorIdRaw(enum2int(vendor_id)); -template (value) GenericAVP ts_AVP_ResultCode(DIAMETER_Resultcode res_code) := { +template (value) GenericAVP ts_AVP_ResultCode(template (value) DIAMETER_Resultcode res_code) := { avp := { avp_header := ts_DIA_Hdr(c_AVP_Code_BASE_NONE_Result_Code), avp_data := { - avp_BASE_NONE_Result_Code := int2oct(enum2int(res_code), 4) + avp_BASE_NONE_Result_Code := int2oct(enum2int(valueof(res_code)), 4) } } } diff --git a/library/DIAMETER_ts29_273_Templates.ttcn b/library/DIAMETER_ts29_273_Templates.ttcn index 0a42d6a..e1a0700 100644 --- a/library/DIAMETER_ts29_273_Templates.ttcn +++ b/library/DIAMETER_ts29_273_Templates.ttcn @@ -486,4 +486,73 @@ /* Lots other Optional */ )); + +/* TS 29.273 9.2.2.4.1 Abort-Session-Request (ASR) */ +template (present) PDU_DIAMETER +tr_DIA_S6b_ASR(template (present) charstring username_nai := ?, + template (present) octetstring sess_id := ?, + template (present) charstring orig_host := ?, + template (present) charstring orig_realm := ?, + template (present) charstring dest_realm := ?, + template (present) charstring dest_host := ?, + template (present) UINT32 hbh_id := ?, + template (present) UINT32 ete_id := ?) := + tr_DIAMETER(flags := '1???????'B, + cmd_code := Abort_Session, + app_id := int2oct(c_DIAMETER_3GPP_S6b_AID, 4), + hbh_id := hbh_id, + ete_id := ete_id, + avps := superset( + tr_AVP_SessionId(sess_id), + /* Optional: DRMP, */ + tr_AVP_OriginHost(orig_host), + tr_AVP_OriginRealm(orig_realm), + tr_AVP_DestinationRealm(dest_realm), + tr_AVP_DestinationHost(dest_host), + tr_AVP_AuthAppId(int2oct(c_DIAMETER_3GPP_S6b_AID, 4)), + tr_AVP_UserName(char2oct_tmpl_present(username_nai)), + tr_AVP_AuthSessionState(NO_STATE_MAINTAINED) + )); + +/* TS 29.273 9.2.2.4.2 Abort-Session-Answer (ASA) */ +template (present) PDU_DIAMETER +tr_DIA_S6b_ASA(template (present) DIAMETER_Resultcode res_code := ?, + template (present) octetstring sess_id := ?, + template (present) charstring orig_host := ?, + template (present) charstring orig_realm := ?, + template (present) charstring dest_realm := ?, + template (present) UINT32 hbh_id := ?, + template (present) UINT32 ete_id := ?) := + tr_DIAMETER(flags := '0???????'B, + cmd_code := Abort_Session, + app_id := int2oct(c_DIAMETER_3GPP_S6b_AID, 4), + hbh_id := hbh_id, ete_id := ete_id, + avps := superset( + tr_AVP_SessionId(sess_id), + /* Optional: DRMP */ + tr_AVP_ResultCode(res_code), + tr_AVP_OriginHost(orig_host), + tr_AVP_OriginRealm(orig_realm) + )); + +template (value) PDU_DIAMETER +ts_DIA_S6b_ASA(template (value) DIAMETER_Resultcode res_code := DIAMETER_SUCCESS, + template (value) octetstring sess_id := c_def_sess_id, + template (value) charstring orig_host := "aaa.localdomain", + template (value) charstring orig_realm := "localdomain", + template (value) charstring dest_realm := "localdomain", + template (value) UINT32 hbh_id := '00000000'O, + template (value) UINT32 ete_id := '00000000'O) := + ts_DIAMETER(flags := '01000000'B, + cmd_code := Abort_Session, + app_id := int2oct(c_DIAMETER_3GPP_S6b_AID, 4), + hbh_id := hbh_id, ete_id := ete_id, + avps := { + ts_AVP_SessionId(sess_id), + /* Optional: DRMP, */ + ts_AVP_ResultCode(res_code), + ts_AVP_OriginHost(orig_host), + ts_AVP_OriginRealm(orig_realm) + }); + } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36233?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: I50daa7a04e0f19dbf987a8baba7a979a353089a3 Gerrit-Change-Number: 36233 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 5 months

1
0
0 0

[XL] Change in osmo-ttcn3-hacks[master]: library: add SGP.32 and SGP.22 ASN.1 specification, encoder and templ...

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36154?usp=email ) Change subject: library: add SGP.32 and SGP.22 ASN.1 specification, encoder and templates ...................................................................... library: add SGP.32 and SGP.22 ASN.1 specification, encoder and templates This patch adds the eUICC related SGP.32 and SGP.22 ASN.1 specification along with templates and related encoder/decoders (_EncDec.cc). The collection of templates is not comprehensive, which means that there are only templates available for a subset needed to implement testcases for an IPAd. Related: SYS#6563 Change-Id: I9df8caa98aeb6953a738660a758c92249832d780 --- A library/euicc/PEDefinitions.asn A library/euicc/PKIX1Explicit88.asn A library/euicc/PKIX1Explicit88_EncDec.cc A library/euicc/PKIX1Explicit88_Templates.ttcn A library/euicc/PKIX1Explicit88_Types.ttcn A library/euicc/PKIX1Implicit88.asn A library/euicc/PKIX1Implicit88_EncDec.cc A library/euicc/PKIX1Implicit88_Templates.ttcn A library/euicc/PKIX1Implicit88_Types.ttcn A library/euicc/RSPDefinitions.asn A library/euicc/RSPDefinitions_EncDec.cc A library/euicc/RSPDefinitions_Templates.ttcn A library/euicc/RSPDefinitions_Types.ttcn A library/euicc/SGP32Definitions.asn A library/euicc/SGP32Definitions_EncDec.cc A library/euicc/SGP32Definitions_Templates.ttcn A library/euicc/SGP32Definitions_Types.ttcn 17 files changed, 7,473 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36154?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: I9df8caa98aeb6953a738660a758c92249832d780 Gerrit-Change-Number: 36154 Gerrit-PatchSet: 4 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 5 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: library: add HTTP_Server_Emulation

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36155?usp=email ) Change subject: library: add HTTP_Server_Emulation ...................................................................... library: add HTTP_Server_Emulation We already have an HTTP_Adapter, which plays the client role. Now let's add an HTTP_Server_Emulation, that will allow us to play the server role as well. Related: SYS#6563 Change-Id: Ie9a3b31a047b617ae69b7a65e1d69b8d3da863e5 --- A library/HTTP_Server_Emulation.ttcn 1 file changed, 161 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/library/HTTP_Server_Emulation.ttcn b/library/HTTP_Server_Emulation.ttcn new file mode 100644 index 0000000..16d142d --- /dev/null +++ b/library/HTTP_Server_Emulation.ttcn @@ -0,0 +1,147 @@ +/* HTTP Emulation in TTCN-3 + * + * Author: Philipp Maier <pmaier(a)sysmocom.de> / sysmocom - s.f.m.c. GmbH + * + * 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 server based on TestPorts/HTTPmsg, + * (see also deps/titan.TestPorts.HTTPmsg) + */ + +module HTTP_Server_Emulation { + +import from General_Types all; +import from Osmocom_Types all; +import from HTTPmsg_Types all; +import from HTTPmsg_PortType all; + +/*********************************************************************** + * Main Emulation Component + ***********************************************************************/ + +type record HttpServerEmulationCfg { + charstring http_bind_ip, + integer http_bind_port, + boolean use_ssl +}; + +type component HTTP_Server_Emulation_CT { + /* Communication with underlying HTTP CodecPort */ + port HTTPmsg_PT HTTP_server_port; + + /* Communication with Clients */ + port HTTP_SRV_PT CLIENT; + port HTTP_SRV_PROC_PT CLIENT_PROC; + port HTTP_SRV_PT CLIENT_DEFAULT; + + /* Configuration by the user */ + var HttpServerEmulationCfg g_http_cfg; + + /* State */ + var HTTP_ConnHdlr vc_conn_table[16]; +}; + +private function f_init(HttpServerEmulationCfg cfg) runs on HTTP_Server_Emulation_CT { + + g_http_cfg := cfg; + + map(self:HTTP_server_port, system:HTTP_server_port); + var Listen listen := { local_hostname := g_http_cfg.http_bind_ip, + portnumber := g_http_cfg.http_bind_port, + use_ssl := g_http_cfg.use_ssl }; + + /* Start HTTP server */ + HTTP_server_port.send(listen); +} + +private function f_vc_conn_table_add(HTTP_ConnHdlr vc_conn) runs on HTTP_Server_Emulation_CT { + var integer i; + for (i := 0; i < sizeof(vc_conn_table); i := i + 1) { + if (not isbound(vc_conn_table[i])) { + vc_conn_table[i] := vc_conn; + return; + } + } + testcase.stop("No Space in vc_conn_table[i] for ", vc_conn); +} + +/* Forward request to all registered clients */ +private function forward_req(HTTPMessage recv_req_value) runs on HTTP_Server_Emulation_CT { + + var integer i; + for (i := 0; i < sizeof(vc_conn_table); i := i + 1) { + if (isbound(vc_conn_table[i])) { + CLIENT.send(recv_req_value) to vc_conn_table[i]; + } + } +} + +function main(HttpServerEmulationCfg cfg) runs on HTTP_Server_Emulation_CT { + + var HTTP_ConnHdlr vc_conn; + var template (value) Close close := { client_id := omit }; + var template (present) Half_close half_close := { client_id := ? }; + var template (present) HTTPMessage recv_req := { request := ? }; + var template (present) HTTPMessage recv_req_bin := { request_binary := ? }; + var HTTPMessage recv_req_value; + var HTTPMessage send_resp_value; + + f_init(cfg); + + while(true) { + alt { + [] HTTP_server_port.receive(recv_req) -> value recv_req_value { + forward_req(recv_req_value); + } + [] HTTP_server_port.receive(recv_req_bin) -> value recv_req_value { + forward_req(recv_req_value); + } + [] CLIENT.receive(HTTPMessage:?) -> value send_resp_value sender vc_conn { + HTTP_server_port.send(send_resp_value); + } + [] HTTP_server_port.receive(half_close) { + HTTP_server_port.send(close); + } + [] CLIENT_PROC.getcall(HTTPEM_register:{}) -> sender vc_conn { + f_vc_conn_table_add(vc_conn); + CLIENT_PROC.reply(HTTPEM_register:{}) to vc_conn; + } + } + } + +} + + +/*********************************************************************** + * Interaction between Main and Client Components + ***********************************************************************/ +type port HTTP_SRV_PT message { + inout HTTPMessage; +} with { extension "internal" }; + +signature HTTPEM_register(); + +type port HTTP_SRV_PROC_PT procedure { + inout HTTPEM_register; +} with { extension "internal" }; + + +/*********************************************************************** + * Client Component + ***********************************************************************/ + +type component HTTP_ConnHdlr { + port HTTP_SRV_PT HTTP_SRV; + port HTTP_SRV_PROC_PT HTTP_SRV_PROC; +}; + +function f_http_register() runs on HTTP_ConnHdlr { + HTTP_SRV_PROC.call(HTTPEM_register:{}) { + [] HTTP_SRV_PROC.getreply(HTTPEM_register:{}); + } +} + +} -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36155?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: Ie9a3b31a047b617ae69b7a65e1d69b8d3da863e5 Gerrit-Change-Number: 36155 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 5 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: library: add HTTP_Server_Emulation

by laforge

Attention is currently required from: daniel, dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36155?usp=email ) Change subject: library: add HTTP_Server_Emulation ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36155?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: Ie9a3b31a047b617ae69b7a65e1d69b8d3da863e5 Gerrit-Change-Number: 36155 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 11 Mar 2024 16:22:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

[XL] Change in osmo-ttcn3-hacks[master]: library: add SGP.32 and SGP.22 ASN.1 specification, encoder and templ...

by laforge

Attention is currently required from: daniel, dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36154?usp=email ) Change subject: library: add SGP.32 and SGP.22 ASN.1 specification, encoder and templates ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36154?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: I9df8caa98aeb6953a738660a758c92249832d780 Gerrit-Change-Number: 36154 Gerrit-PatchSet: 4 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 11 Mar 2024 16:21:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

[M] Change in ...osmo-epdg[master]: aaa_diameter_swm: Look up aaa_ue_fsm process each time it needs to be...

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36231?usp=email ) Change subject: aaa_diameter_swm: Look up aaa_ue_fsm process each time it needs to be accessed ...................................................................... aaa_diameter_swm: Look up aaa_ue_fsm process each time it needs to be accessed Similar to what was already done in 745d542b9202d3c5ef69d44d8c1c140490012822 fpr epdg_ue_fsm. Change-Id: Ic019d41716284639f6256f7ba24533bf806333b1 --- M src/aaa_diameter_swm.erl M src/aaa_ue_fsm.erl 2 files changed, 37 insertions(+), 51 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/31/36231/1 diff --git a/src/aaa_diameter_swm.erl b/src/aaa_diameter_swm.erl index 5050ffb..2e39048 100644 --- a/src/aaa_diameter_swm.erl +++ b/src/aaa_diameter_swm.erl @@ -7,15 +7,9 @@ -include_lib("diameter_3gpp_ts29_273.hrl"). -record(swm_state, { - table_id, % ets table id, - ues = sets:new() + table_id % ets table id }). --record(swm_session, { - imsi :: string(), - pid :: pid() - }). - -export([start_link/0]). -export([init/1, handle_call/3, handle_cast/2, handle_info/2]). -export([code_change/3, terminate/2]). @@ -56,16 +50,18 @@ session_termination_request(Imsi) -> gen_server:cast(?SERVER, {str, Imsi}). -handle_cast({epdg_auth_req, Imsi, PdpTypeNr, Apn, EAP}, State0) -> - {Sess, State1} = find_or_new_swm_session(Imsi, State0), - aaa_ue_fsm:ev_swm_auth_req(Sess#swm_session.pid, {PdpTypeNr, Apn, EAP}), - {noreply, State1}; +handle_cast({epdg_auth_req, Imsi, PdpTypeNr, Apn, EAP}, State) -> + case aaa_ue_fsm:get_pid_by_imsi(Imsi) of + undefined -> {ok, Pid} = aaa_ue_fsm:start(Imsi); + Pid -> Pid + end, + aaa_ue_fsm:ev_swm_auth_req(Pid, {PdpTypeNr, Apn, EAP}), + {noreply, State}; handle_cast({epdg_auth_compl_req, Imsi, Apn}, State) -> - Sess = find_swm_session_by_imsi(Imsi, State), - case Sess of - #swm_session{imsi = Imsi} -> - aaa_ue_fsm:ev_swm_auth_compl(Sess#swm_session.pid, Apn); + case aaa_ue_fsm:get_pid_by_imsi(Imsi) of + Pid when is_pid(Pid) -> + aaa_ue_fsm:ev_swm_auth_compl(Pid, Apn); undefined -> RC_USER_UNKNOWN=5030, epdg_diameter_swm:auth_compl_response(Imsi, {error, RC_USER_UNKNOWN}) @@ -73,10 +69,9 @@ {noreply, State}; handle_cast({str, Imsi}, State) -> - Sess = find_swm_session_by_imsi(Imsi, State), - case Sess of - #swm_session{} -> - case aaa_ue_fsm:ev_rx_swm_str(Sess#swm_session.pid) of + case aaa_ue_fsm:get_pid_by_imsi(Imsi) of + Pid when is_pid(Pid) -> + case aaa_ue_fsm:ev_rx_swm_str(Pid) of ok -> ok; % Answering delayed due to SAR+SAA towards HSS. {ok, DiaRC} when is_integer(DiaRC) -> ok = epdg_diameter_swm:session_termination_answer(Imsi, DiaRC); @@ -126,32 +121,3 @@ %% ------------------------------------------------------------------ %% Internal Function Definitions %% ------------------------------------------------------------------ - -new_swm_session(Imsi, State) -> - {ok, Pid} = aaa_ue_fsm:start_link(Imsi), - UE = #swm_session{imsi = Imsi, pid = Pid}, - NewSt = State#swm_state{ues = sets:add_element(UE, State#swm_state.ues)}, - {UE, NewSt}. - -% returns swm_session if found, undefined if not -find_swm_session_by_imsi(Imsi, State) -> - {Imsi, Res} = sets:fold( - fun(UEsIt = #swm_session{imsi = LookupImsi}, {LookupImsi, _AccIn}) -> {LookupImsi, UEsIt}; - (_, AccIn) -> AccIn - end, - {Imsi, undefined}, - State#swm_state.ues), - Res. - -find_or_new_swm_session(Imsi, State) -> - UE = find_swm_session_by_imsi(Imsi, State), - case UE of - #swm_session{imsi = Imsi} -> - {UE, State}; - undefined -> - new_swm_session(Imsi, State) - end. - -delete_swm_session(Imsi, State) -> - SetRemoved = sets:del_element(Imsi, State#swm_state.ues), - State#swm_state{ues = SetRemoved}. \ No newline at end of file diff --git a/src/aaa_ue_fsm.erl b/src/aaa_ue_fsm.erl index 5a6e847..52057ba 100644 --- a/src/aaa_ue_fsm.erl +++ b/src/aaa_ue_fsm.erl @@ -39,7 +39,7 @@ -include_lib("diameter_3gpp_ts29_273_s6b.hrl"). -include("conv.hrl"). --export([start_link/1]). +-export([start/1, stop/1]). -export([init/1,callback_mode/0,terminate/3]). -export([get_server_name_by_imsi/1, get_pid_by_imsi/1]). -export([ev_swm_auth_req/2, ev_swm_auth_compl/2, ev_rx_swm_str/1, ev_rx_swx_maa/2, ev_rx_swx_saa/2, @@ -62,10 +62,18 @@ ServerName = get_server_name_by_imsi(Imsi), whereis(ServerName). -start_link(Imsi) -> +start(Imsi) -> ServerName = get_server_name_by_imsi(Imsi), lager:info("ue_fsm start_link(~p)~n", [ServerName]), - gen_statem:start_link({local, ServerName}, ?MODULE, Imsi, [{debug, [trace]}]). + gen_statem:start({local, ServerName}, ?MODULE, Imsi, [{debug, [trace]}]). + +stop(SrvRef) -> + try + gen_statem:stop(SrvRef) + catch + exit:Err -> + {error, Err} + end. ev_swm_auth_req(Pid, {PdpTypeNr, Apn, EAP}) -> lager:info("ue_fsm ev_swm_auth_req~n", []), -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36231?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: Ic019d41716284639f6256f7ba24533bf806333b1 Gerrit-Change-Number: 36231 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 5 months

1
0
0 0

[M] Change in ...osmo-epdg[master]: AAA: Swx: Answer RTR with RTA

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36232?usp=email ) Change subject: AAA: Swx: Answer RTR with RTA ...................................................................... AAA: Swx: Answer RTR with RTA Related: OS#6042 Change-Id: Iba49fe8565d2303f975003ed2a79de25a4b23832 --- M include/conv.hrl M src/aaa_diameter_swx_cb.erl 2 files changed, 52 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/32/36232/1 diff --git a/include/conv.hrl b/include/conv.hrl index 786bdff..dda21f4 100644 --- a/include/conv.hrl +++ b/include/conv.hrl @@ -31,6 +31,8 @@ % -hrl_name('conv.hrl'). +-define(VENDOR_ID_3GPP, 10415). + %% Can Hold information about Result-Code or Experimental-Result: -record(epdg_dia_rc, { vendor_id :: non_neg_integer(), %% or undefined if Result-Code diff --git a/src/aaa_diameter_swx_cb.erl b/src/aaa_diameter_swx_cb.erl index 8a6dd08..4936c24 100644 --- a/src/aaa_diameter_swx_cb.erl +++ b/src/aaa_diameter_swx_cb.erl @@ -10,7 +10,8 @@ %% diameter callbacks -export([peer_up/3, peer_down/3, pick_peer/4, pick_peer/5, prepare_request/3, prepare_request/4, prepare_retransmit/3, prepare_retransmit/4, - handle_answer/4, handle_answer/5, handle_error/4, handle_error/5, handle_request/3]). + handle_request/3, + handle_answer/4, handle_answer/5, handle_error/4, handle_error/5]). %% peer_up/3 peer_up(_SvcName, Peer, State) -> @@ -67,6 +68,41 @@ prepare_retransmit(Packet, SvcName, Peer, ExtraPars) -> prepare_request(Packet, SvcName, Peer, ExtraPars). +%% handle_request/3 + +%% 3GPP TS 29.273 8.2.2.4 Network Initiated De-Registration by HSS Procedure +handle_request(#diameter_packet{msg = Req, errors = []}, _SvcName, {_, Caps}) when is_record(Req, 'RTR') -> + lager:info("SWx Rx RTR from ~p: ~p~n", [Caps, Req]), + #diameter_caps{origin_host = {OH,_}, origin_realm = {OR,_}} = Caps, + #'RTR'{'Session-Id' = SessionId, + 'Vendor-Specific-Application-Id' = VendorAppId, + 'Auth-Session-State' = AuthSessState, + 'User-Name' = Imsi, + 'Deregistration-Reason' = _DeregReason} = Req, + case aaa_ue_fsm:get_pid_by_imsi(Imsi) of + Pid when is_pid(Pid) -> + aaa_ue_fsm:stop(Pid), + Res = 2001, %% Success + ERes = []; + undefined -> + Res = [], + %% TS 29.229 6.2.2.1 DIAMETER_ERROR_USER_UNKNOWN + ERes = #'Experimental-Result'{'Vendor-Id' = ?VENDOR_ID_3GPP, 'Experimental-Result-Code' = 5001} + end, + Resp = #'RTA'{'Session-Id' = SessionId, + 'Vendor-Specific-Application-Id' = VendorAppId, + 'Result-Code' = Res, + 'Experimental-Result' = ERes, + 'Auth-Session-State' = AuthSessState, + 'Origin-Host' = OH, + 'Origin-Realm' = OR}, + lager:info("SWx Tx to ~p: ~p~n", [Caps, Resp]), + {reply, Resp}; + +handle_request(Msg, _SvcName, Peer) -> + lager:error("SWx Rx unexpected msg from ~p: ~p~n", [Peer, Msg]), + erlang:error({unexpected, ?MODULE, ?LINE}). + %% handle_answer/4 handle_answer(#diameter_packet{msg = Msg, errors = Errors}, _Request, _SvcName, Peer, ReqPid) when is_record(Msg, 'MAA') -> lager:info("SWx Rx MAA ~p: ~p/ Errors ~p ~n", [Peer, Msg, Errors]), @@ -82,6 +118,7 @@ aaa_ue_fsm:ev_rx_swx_maa(ReqPid, {error, DiaRC}) end, {ok, Msg}; + handle_answer(#diameter_packet{msg = Msg, errors = Errors}, Request, _SvcName, Peer, ReqPid) when is_record(Msg, 'SAA') -> lager:info("SWx Rx SAA ~p: ~p/ Errors ~p ~n", [Peer, Msg, Errors]), % Recover fields from originating request: @@ -103,9 +140,11 @@ aaa_ue_fsm:ev_rx_swx_saa(ReqPid, {error, SAType, DiaRC}) end, {ok, Msg}. + handle_answer(#diameter_packet{msg = Msg, errors = []}, _Request, _SvcName, Peer) -> lager:info("SWx Rx ~p: ~p~n", [Peer, Msg]), {ok, Msg}; + handle_answer(#diameter_packet{msg = Msg, errors = Errors}, _Request, _SvcName, Peer) -> lager:info("SWx Rx ~p: ~p / Errors ~p ~n", [Peer, Msg, Errors]), {error, Errors}. @@ -122,10 +161,6 @@ lager:error("SWx error: ~p, ExtraPars: ~p~n", [Reason, ExtraPars]), {error, Reason}. -%% handle_request/3 -handle_request(_Packet, _SvcName, _Peer) -> - erlang:error({unexpected, ?MODULE, ?LINE}). - %% ------------------------------------------------------------------ %% Internal Function Definitions %% ------------------------------------------------------------------ -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/36232?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: Iba49fe8565d2303f975003ed2a79de25a4b23832 Gerrit-Change-Number: 36232 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 5 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: epdg: Introduce test TC_hss_initiated_deregister_new_server_assigned

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36230?usp=email ) Change subject: epdg: Introduce test TC_hss_initiated_deregister_new_server_assigned ...................................................................... epdg: Introduce test TC_hss_initiated_deregister_new_server_assigned Related: OS#6042 Change-Id: Ia5bf7708d11421710f3a88669d94c4f01060cdd6 --- M epdg/EPDG_Tests.ttcn M epdg/gen_links.sh M library/DIAMETER_Templates.ttcn A library/DIAMETER_ts29_229_Templates.ttcn M library/DIAMETER_ts29_273_Templates.ttcn M pgw/gen_links.sh 6 files changed, 194 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/30/36230/1 diff --git a/epdg/EPDG_Tests.ttcn b/epdg/EPDG_Tests.ttcn index d8112e8..9aaeb60 100644 --- a/epdg/EPDG_Tests.ttcn +++ b/epdg/EPDG_Tests.ttcn @@ -19,6 +19,7 @@ import from DIAMETER_Types all; import from DIAMETER_Templates all; import from DIAMETER_rfc4004_Templates all; +import from DIAMETER_ts29_229_Templates all; import from DIAMETER_ts29_272_Templates all; import from DIAMETER_ts29_273_Templates all; import from DIAMETER_Emulation all; @@ -470,6 +471,32 @@ } } +/* Send RTR as HSS to AAA server, expect back RTA */ +private function f_DIA_SWx_RT(template (value) CxDx_3GPP_Reason_Code reason_code, + template (present) GenericAVP exp_result_tmpl := tr_AVP_ResultCode(DIAMETER_SUCCESS)) runs on EPDG_ConnHdlr { + var PDU_DIAMETER rx_dia; + var UINT32 hbh_id := f_rnd_octstring(4); + var UINT32 ete_id := f_rnd_octstring(4); + var octetstring reason_info := char2oct("test"); + + /* Unlike STR, STA contains no IMSI. Register ete_id in DIAMETER_Emulation, + * so AIA is forwarded back to us in DIAMETER port instead of MTC_CT.DIAMETER_UNIT. + */ + f_epdg_connhldr_SWx_expect_eteid(ete_id); + + SWx.send(ts_DIA_SWx_RTR(g_pars.imsi, reason_code, reason_info, + hbh_id := hbh_id, + ete_id := ete_id)); + + alt { + [] SWx.receive(tr_DIA_SWx_RTA(exp_result_tmpl, hbh_id := hbh_id, ete_id := ete_id)) -> value rx_dia {} + [] SWx.receive(PDU_DIAMETER:?) -> value rx_dia { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Unexpected Diameter SWx msg rx: ", rx_dia)); + } + } +} + + /* Send AAR as PGW to AAA server, expect back AAA */ private function f_S6b_AA_success() runs on EPDG_ConnHdlr { var PDU_DIAMETER rx_dia; @@ -1025,6 +1052,25 @@ setverdict(pass); } +/* 3GPP TS 29.273 Network Initiated De-Registration by HSS, Administrative */ +private function f_TC_hss_initiated_deregister_new_server_assigned(charstring id) runs on EPDG_ConnHdlr { + f_initial_attach(); + /* Procedure should be performed properly: */ + f_DIA_SWx_RT(NEW_SERVER_ASSIGNED, tr_AVP_ResultCode(DIAMETER_SUCCESS)); + /* Subscriber was already removed, it should fail if requested again: */ + var DIAMETER_ts29_229_ExperimentalResultcode erc := DIAMETER_ERROR_USER_UNKNOWN; + f_DIA_SWx_RT(NEW_SERVER_ASSIGNED, tr_AVP_ExperimentalResult(vendor_id_3GPP, int2oct(enum2int(erc), 4))); + f_sleep(3.0); +} +testcase TC_hss_initiated_deregister_new_server_assigned() runs on MTC_CT { + var EPDG_ConnHdlrPars pars := f_init_pars(); + var EPDG_ConnHdlr vc_conn; + f_init(); + vc_conn := f_start_handler(refers(f_TC_hss_initiated_deregister_new_server_assigned), pars); + vc_conn.done; + setverdict(pass); +} + private function f_TC_concurrent_ues(charstring id) runs on EPDG_ConnHdlr { COORD.send(COORD_CMD_READY); COORD.receive(COORD_CMD_START); @@ -1121,6 +1167,7 @@ execute ( TC_ho_lte_to_wifi() ); execute ( TC_ho_wifi_to_lte() ); execute ( TC_s2b_CreateSession_rejected() ); + execute ( TC_hss_initiated_deregister_new_server_assigned() ); execute ( TC_concurrent_ues2() ); execute ( TC_concurrent_ues100() ); execute ( TC_upf_echo_req() ); diff --git a/epdg/gen_links.sh b/epdg/gen_links.sh index f0b2f5c..55e449f 100755 --- a/epdg/gen_links.sh +++ b/epdg/gen_links.sh @@ -55,7 +55,7 @@ FILES+="L3_Common.ttcn " FILES+="DNS_Helpers.ttcn " FILES+="DIAMETER_Types.ttcn DIAMETER_CodecPort.ttcn DIAMETER_CodecPort_CtrlFunct.ttcn DIAMETER_CodecPort_CtrlFunctDef.cc DIAMETER_Emulation.ttcn " -FILES+="DIAMETER_Templates.ttcn DIAMETER_rfc4004_Templates.ttcn DIAMETER_rfc5447_Templates.ttcn DIAMETER_ts29_272_Templates.ttcn DIAMETER_ts29_273_Templates.ttcn " +FILES+="DIAMETER_Templates.ttcn DIAMETER_rfc4004_Templates.ttcn DIAMETER_rfc5447_Templates.ttcn DIAMETER_ts29_229_Templates.ttcn DIAMETER_ts29_272_Templates.ttcn DIAMETER_ts29_273_Templates.ttcn " FILES+="IPA_Types.ttcn IPA_CodecPort.ttcn IPA_CodecPort_CtrlFunct.ttcn IPA_CodecPort_CtrlFunctDef.cc IPA_Emulation.ttcnpp " FILES+="PCO_Types.ttcn GSUP_Types.ttcn GSUP_Templates.ttcn GSUP_Emulation.ttcn " diff --git a/library/DIAMETER_Templates.ttcn b/library/DIAMETER_Templates.ttcn index 338899f..31ea821 100644 --- a/library/DIAMETER_Templates.ttcn +++ b/library/DIAMETER_Templates.ttcn @@ -682,7 +682,7 @@ } } } -template (value) GenericAVP ts_AVP_UserNameImsi(hexstring imsi) := ts_AVP_UserName(char2oct(hex2str(imsi))); +template (value) GenericAVP ts_AVP_UserNameImsi(template (value) hexstring imsi) := ts_AVP_UserName(char2oct(hex2str(valueof(imsi)))); template (present) GenericAVP tr_AVP_UserNameImsi(template (present) hexstring imsi := ?) := tr_AVP_UserName(char2oct_tmpl(hex2str_tmpl(imsi))); diff --git a/library/DIAMETER_ts29_229_Templates.ttcn b/library/DIAMETER_ts29_229_Templates.ttcn new file mode 100644 index 0000000..bab9bd9 --- /dev/null +++ b/library/DIAMETER_ts29_229_Templates.ttcn @@ -0,0 +1,78 @@ +module DIAMETER_ts29_229_Templates { + +/* (C) 2023 by sysmocom s.f.m.c. GmbH <info(a)sysmocom.de + * All rights reserved. + * + * 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 + * + * Templates for AVPs and messages for TS 29.273 + */ + +import from General_Types all; +import from DIAMETER_Types all; +import from DIAMETER_Templates all; +import from DIAMETER_rfc5447_Templates all; +import from DIAMETER_ts29_272_Templates all; +import from Osmocom_Types all; +import from Misc_Helpers all; + +/* 3GPP TS 29.229 section 6.2. Errors in Result-Code AVP values */ +type enumerated DIAMETER_ts29_229_ExperimentalResultcode { + /* Success */ + DIAMETER_FIRST_REGISTRATION (2001), + DIAMETER_SUBSEQUENT_REGISTRATION (2002), + DIAMETER_UNREGISTERED_SERVICE (2003), + DIAMETER_SUCCESS_SERVER_NAME_NOT_STORED (2004), + /* Permanent Failures */ + DIAMETER_ERROR_USER_UNKNOWN (5001), + DIAMETER_ERROR_IDENTITIES_DONT_MATCH (5002), + DIAMETER_ERROR_IDENTITY_NOT_REGISTERED (5003), + DIAMETER_ERROR_ROAMING_NOT_ALLOWED (5004), + DIAMETER_ERROR_IDENTITY_ALREADY_REGISTERED (5005), + DIAMETER_ERROR_AUTH_SCHEME_NOT_SUPPORTED (5006), + DIAMETER_ERROR_IN_ASSIGNMENT_TYPE (5007), + DIAMETER_ERROR_TOO_MUCH_DATA (5008), + DIAMETER_ERROR_NOT_SUPPORTED_USER_DATA (5009), + DIAMETER_ERROR_FEATURE_UNSUPPORTED (5011), + DIAMETER_ERROR_SERVING_NODE_FEATURE_UNSUPPORTED (5012) +} + +/* TS 29.229 6.3.16 Deregistration-Reason */ +template (value) GenericAVP ts_AVP_CxDx_3GPP_Deregistration_Reason(template (value) CxDx_3GPP_Reason_Code reason, + template (value) octetstring info) := { + avp := { + avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_AAA_3GPP_Non_3GPP_User_Data), + avp_data := { + avp_CxDx_3GPP_Deregistration_Reason := { + ts_AVP_CxDx_3GPP_Reason_Code(reason), + ts_AVP_CxDx_3GPP_Reason_Info(info) + } + } + } +} + +/* TS 29.229 6.3.17 Reason-Code AVP */ +template (value) GenericAVP ts_AVP_CxDx_3GPP_Reason_Code(template (value) CxDx_3GPP_Reason_Code reason) := { + avp := { + avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_CxDx_3GPP_Reason_Code), + avp_data := { + avp_CxDx_3GPP_Reason_Code := reason + } + } +} + + +/* 6.3.18 Reason-Info AVP */ +template (value) GenericAVP ts_AVP_CxDx_3GPP_Reason_Info(template (value) octetstring info) := { + avp := { + avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_CxDx_3GPP_Reason_Info), + avp_data := { + avp_CxDx_3GPP_Reason_Info := info + } + } +} + +} diff --git a/library/DIAMETER_ts29_273_Templates.ttcn b/library/DIAMETER_ts29_273_Templates.ttcn index f0ac442..0a42d6a 100644 --- a/library/DIAMETER_ts29_273_Templates.ttcn +++ b/library/DIAMETER_ts29_273_Templates.ttcn @@ -15,6 +15,7 @@ import from DIAMETER_Types all; import from DIAMETER_Templates all; import from DIAMETER_rfc5447_Templates all; +import from DIAMETER_ts29_229_Templates all; import from DIAMETER_ts29_272_Templates all; import from Osmocom_Types all; import from Misc_Helpers all; @@ -269,6 +270,61 @@ */ }); +/* Registration-Termination-Request (RTR) , 8.2.2.4 Network Initiated De-Registration by HSS Procedure */ +template (value) PDU_DIAMETER +ts_DIA_SWx_RTR(template (value) hexstring imsi, + template (value) CxDx_3GPP_Reason_Code reason_code := PERMANENT_TERMINATION, + template (value) octetstring reason_info := ''O, + template (value) uint32_t vendor_app_id := c_DIAMETER_3GPP_SWx_AID, + template (value) octetstring sess_id := c_def_sess_id, + template (value) charstring orig_host := "hss.localdomain", + template (value) charstring orig_realm := "localdomain", + template (value) charstring dest_host := "aaa.localdomain", + template (value) charstring dest_realm := "localdomain", + template (value) UINT32 hbh_id := '00000000'O, + template (value) UINT32 ete_id := '00000000'O) := + ts_DIAMETER(flags := '11000000'B, + cmd_code := Registration_Termination, + app_id := int2oct(c_DIAMETER_3GPP_SWx_AID, 4), + hbh_id := hbh_id, + ete_id := ete_id, + avps := { + ts_AVP_SessionId(sess_id), + ts_AVP_VendorSpecAppId(vendor_id_3GPP, valueof(vendor_app_id)), + ts_AVP_AuthSessionState(NO_STATE_MAINTAINED), + ts_AVP_OriginHost(orig_host), + ts_AVP_OriginRealm(orig_realm), + ts_AVP_DestinationHost(dest_host), + ts_AVP_DestinationRealm(dest_realm), + ts_AVP_UserNameImsi(imsi), + ts_AVP_CxDx_3GPP_Deregistration_Reason(reason_code, reason_info) + /* TODO: + * *[ Supported-Features ] + */ + }); + +template (present) PDU_DIAMETER +tr_DIA_SWx_RTA(template (present) GenericAVP tmpl_result := ?, + template (present) octetstring sess_id := ?, + template (present) charstring orig_host := ?, + template (present) charstring orig_realm := ?, + template (present) charstring dest_host := ?, + template (present) charstring dest_realm := ?, + template (present) UINT32 hbh_id := ?, + template (present) UINT32 ete_id := ?) := + tr_DIAMETER(flags := '0???????'B, + cmd_code := Registration_Termination, + app_id := int2oct(c_DIAMETER_3GPP_SWx_AID, 4), + hbh_id := hbh_id, ete_id := ete_id, + avps := superset( + tr_AVP_SessionId(sess_id), + tr_AVP_VendorSpecAppId(?, ?), + tmpl_result, + tr_AVP_AuthSessionState(NO_STATE_MAINTAINED), + tr_AVP_OriginHost(orig_host), + tr_AVP_OriginRealm(orig_realm) + )); + /******************************* * S6b 3GPP TS 29.273 section 9 *******************************/ diff --git a/pgw/gen_links.sh b/pgw/gen_links.sh index 70494ce..9bdface 100755 --- a/pgw/gen_links.sh +++ b/pgw/gen_links.sh @@ -64,7 +64,7 @@ FILES+="GTPv2_CodecPort.ttcn GTPv2_CodecPort_CtrlFunctDef.cc GTPv2_CodecPort_CtrlFunct.ttcn GTPv2_Emulation.ttcn " FILES+="DNS_Helpers.ttcn " FILES+="DIAMETER_Types.ttcn DIAMETER_CodecPort.ttcn DIAMETER_CodecPort_CtrlFunct.ttcn DIAMETER_CodecPort_CtrlFunctDef.cc DIAMETER_Emulation.ttcn " -FILES+="DIAMETER_Templates.ttcn DIAMETER_rfc4004_Templates.ttcn DIAMETER_rfc5447_Templates.ttcn DIAMETER_ts29_212_Templates.ttcn DIAMETER_ts29_272_Templates.ttcn DIAMETER_ts29_273_Templates.ttcn DIAMETER_ts32_299_Templates.ttcn " +FILES+="DIAMETER_Templates.ttcn DIAMETER_rfc4004_Templates.ttcn DIAMETER_rfc5447_Templates.ttcn DIAMETER_ts29_212_Templates.ttcn DIAMETER_ts29_212_Templates.ttcn DIAMETER_ts29_229_Templates.ttcn DIAMETER_ts29_272_Templates.ttcn DIAMETER_ts29_273_Templates.ttcn DIAMETER_ts32_299_Templates.ttcn " gen_links $DIR $FILES ignore_pp_results -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36230?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: Ia5bf7708d11421710f3a88669d94c4f01060cdd6 Gerrit-Change-Number: 36230 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 5 months

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: IPAd_Tests: add testsuite for an IPAd

by pespin

Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36229?usp=email ) Change subject: IPAd_Tests: add testsuite for an IPAd ...................................................................... Patch Set 1: (2 comments) File ipad/IPAd_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36229/comment/66c15806_3ca9… PS1, Line 445: for (i := 0; i < sizeof(esipa_res.getBoundProfilePackageResponseEsipa.getBoundProfilePackageOkEsipa.boundProfilePackage.firstSequenceOf87); i := i + 1) { sounds like you want to put this in a variable ;) "esipa_res.getBoundProfilePackageResponseEsipa.getBoundProfilePackageOkEsipa.boundProfilePackage" https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36229/comment/ea4af62a_0b04… PS1, Line 652: // execute ( TC_add_init_eim() ); why is this one commented out? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36229?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: Ic9ea8c69e56a2e8ddf0f506861ece6d40cbcb06d Gerrit-Change-Number: 36229 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 11 Mar 2024 14:56:35 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

2025

2024

2023

2022

gerrit-log March 2024