October 2023 - gerrit-log - lists.osmocom.org

[M] Change in osmo-ttcn3-hacks[master]: epdg: Test GTPv2C CreateSession triggerd by EPDG_Tunnel Req
by pespin 19 Oct '23

19 Oct '23

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34833?usp=email ) Change subject: epdg: Test GTPv2C CreateSession triggerd by EPDG_Tunnel Req ...................................................................... epdg: Test GTPv2C CreateSession triggerd by EPDG_Tunnel Req Change-Id: I8f18c927b1897806233cc9d049c25694c1e639d4 --- M epdg/EPDG_Tests.ttcn 1 file changed, 84 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/33/34833/1 diff --git a/epdg/EPDG_Tests.ttcn b/epdg/EPDG_Tests.ttcn index 2006632..24e924a 100644 --- a/epdg/EPDG_Tests.ttcn +++ b/epdg/EPDG_Tests.ttcn @@ -2,6 +2,7 @@ import from Misc_Helpers all; import from General_Types all; +import from Native_Functions all; import from Osmocom_Types all; import from L3_Common all; @@ -13,6 +14,8 @@ import from DIAMETER_Templates all; import from DIAMETER_Emulation all; +import from GTPv2_Types all; +import from GTPv2_Templates all; import from GTPv2_Emulation all; modulepar { @@ -108,6 +111,17 @@ type record EPDG_ConnHdlrPars { hexstring imsi, + charstring ue_ip, + + /* TEI (Data) local side */ + OCT4 teid, + /* TEI (Control) local side */ + OCT4 teic, + /* TEI (Data) remote side */ + OCT4 teid_remote optional, + /* TEI (Control) remote side */ + OCT4 teic_remote optional, + AuthVector vec optional }; @@ -122,11 +136,15 @@ } } - private function f_init_pars(integer imsi_suffix := 1) runs on MTC_CT return EPDG_ConnHdlrPars { var EPDG_ConnHdlrPars pars := { imsi := f_gen_imsi(imsi_suffix), + ue_ip := "192.168.123.50", + teid := '00000000'O, + teic := '00000000'O, + teid_remote := omit, + teic_remote := omit, vec := f_gen_auth_vec_3g() }; return pars; @@ -231,7 +249,7 @@ use_gtpu_daemon := false /* TODO: maybe use, set to true */ }; - vc_GTP2 := GTPv2_Emulation_CT.create("GTP2_EM"); + vc_GTP2 := GTPv2_Emulation_CT.create(id & "-GTPV2"); map(vc_GTP2:GTP2C, system:GTP2C); connect(vc_GTP2:TEID0, self:TEID0); vc_GTP2.start(GTPv2_Emulation.main(cfg)); @@ -255,6 +273,9 @@ /* tell GSUP dispatcher to send this IMSI to us */ f_create_gsup_expect(hex2str(g_pars.imsi)); + /* tell GTPv2 dispatcher to send this IMSI to us */ + f_gtp2_register_imsi(g_pars.imsi); + fn.apply(id); } @@ -266,9 +287,14 @@ vc_conn := EPDG_ConnHdlr.create(id); + /* GSUP */ connect(vc_conn:GSUP, vc_GSUP:GSUP_CLIENT); connect(vc_conn:GSUP_PROC, vc_GSUP:GSUP_PROC); + /* GTP2 */ + connect(vc_conn:GTP2, vc_GTP2:CLIENT); + connect(vc_conn:GTP2_PROC, vc_GTP2:CLIENT_PROC); + /* SWx */ vc_conn_swx := DIAMETER_ConnHdlr_CT.create(id); connect(vc_conn_swx:DIAMETER, vc_SWx:DIAMETER_CLIENT); @@ -336,6 +362,36 @@ } } +/* Diameter SWx SAR + SAA. */ +private altstep as_GTP2C_CreateSession_success() runs on EPDG_ConnHdlr { + var PDU_GTPCv2 rx_msg; + var template (value) FullyQualifiedTEID fteid_c_ie, fteid_u_ie; + var template (value) PDN_AddressAllocation paa; + + [] GTP2.receive(tr_GTP2C_CreateSessionReq(g_pars.imsi)) -> value rx_msg { + /* TODO: parse TEIC and TEID and store it in g_pars.remote_tei{c,d} */ + + /* allocate + register TEID-C on local side */ + g_pars.teic := f_gtp2_allocate_teid(); + g_pars.teid := g_pars.teic; + + fteid_c_ie := ts_GTP2C_FTEID(FTEID_IF_S2b_ePDG_GTPC, g_pars.teic, 0, + f_inet_addr(mp_s2b_local_ip), omit); + fteid_u_ie := ts_GTP2C_FTEID(FTEID_IF_S2bU_ePDG_GTPU, g_pars.teid, 2, + f_inet_addr(mp_s2b_local_ip), omit); + paa := ts_GTP2C_PdnAddrAlloc_v4(f_inet_addr(g_pars.ue_ip)); + GTP2.send(ts_GTP2C_CreateSessionResp({ fteid_c_ie }, paa)); + setverdict(pass); + } + [] GTP2.receive(PDU_GTPCv2:?) -> value rx_msg { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Unexpected GTP2C msg rx: ", rx_msg)); + } +} +private function f_GTP2C_CreateSession_success() runs on EPDG_ConnHdlr { + f_gtp2_register_udmsg('20'O); + as_GTP2C_CreateSession_success(); +} + /* GSUP AuthInfo Req + Resp, triggers SWx MAR + MAA. */ private function f_GSUP_AI_success() runs on EPDG_ConnHdlr { var GSUP_PDU rx_gsup; @@ -363,7 +419,7 @@ var template octetstring destination_name := *; GSUP.send(ts_GSUP_UL_REQ(g_pars.imsi)); as_DIA_SWx_SA_success(); - /* Expect a positive response back to the translator; expect AIA */ + /* Expect a positive response back to the translator */ alt { [] GSUP.receive(tr_GSUP_UL_RES(g_pars.imsi, destination_name)); [] GSUP.receive(GSUP_PDU:?) -> value rx_gsup { @@ -373,9 +429,25 @@ setverdict(pass); } +/* GSUP TunnelEPDG Tunnel Req + Resp, triggers S2b CreateSession Req + Response. */ +private function f_GSUP_EPDGTunnel_success() runs on EPDG_ConnHdlr { + var GSUP_PDU rx_gsup; + GSUP.send(ts_GSUP_EPDGTunnel_REQ(g_pars.imsi)); + f_GTP2C_CreateSession_success(); + /* Expect a positive response back to the translator; */ + alt { + [] GSUP.receive(tr_GSUP_EPDGTunnel_RES(g_pars.imsi)); + [] GSUP.receive(GSUP_PDU:?) -> value rx_gsup { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Unexpected GSUP msg rx: ", rx_gsup)); + } + } + setverdict(pass); +} + private function f_TC_authinfo_normal(charstring id) runs on EPDG_ConnHdlr { f_GSUP_AI_success(); f_GSUP_LU_success(); + f_GSUP_EPDGTunnel_success(); } testcase TC_authinfo_normal() runs on MTC_CT { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34833?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: I8f18c927b1897806233cc9d049c25694c1e639d4 Gerrit-Change-Number: 34833 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-ttcn3-hacks[master]: GSUP_Types: Fix tr_GSUP_IMSI params
by pespin 19 Oct '23

19 Oct '23

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34831?usp=email ) Change subject: GSUP_Types: Fix tr_GSUP_IMSI params ...................................................................... GSUP_Types: Fix tr_GSUP_IMSI params Change-Id: Ifeff47d35df53f4238bc1556bdee037e62e9d892 --- M library/GSUP_Types.ttcn 1 file changed, 11 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/31/34831/1 diff --git a/library/GSUP_Types.ttcn b/library/GSUP_Types.ttcn index ef98175..739dcbc 100644 --- a/library/GSUP_Types.ttcn +++ b/library/GSUP_Types.ttcn @@ -507,7 +507,7 @@ ies := ies } -template GSUP_PDU tr_GSUP_IMSI(template GSUP_MessageType msgt := ?, template hexstring imsi) := { +template (present) GSUP_PDU tr_GSUP_IMSI(template (present) GSUP_MessageType msgt := ?, template (present) hexstring imsi := ?) := { msg_type := msgt, ies := { tr_GSUP_IE_IMSI(imsi), * } } @@ -715,7 +715,7 @@ } } -template GSUP_IE tr_GSUP_IE_IMSI(template hexstring imsi) := { +template (present) GSUP_IE tr_GSUP_IE_IMSI(template (present) hexstring imsi := ?) := { tag := OSMO_GSUP_IMSI_IE, len := ?, val := { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34831?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: Ifeff47d35df53f4238bc1556bdee037e62e9d892 Gerrit-Change-Number: 34831 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-ttcn3-hacks[master]: GSUP_Types: Add EDPG_Tunnel messages
by pespin 19 Oct '23

19 Oct '23

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34832?usp=email ) Change subject: GSUP_Types: Add EDPG_Tunnel messages ...................................................................... GSUP_Types: Add EDPG_Tunnel messages Change-Id: Iadba149e6d299e5e666b2debdc23a00d37e78da5 --- M library/GSUP_Types.ttcn 1 file changed, 40 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/32/34832/1 diff --git a/library/GSUP_Types.ttcn b/library/GSUP_Types.ttcn index 739dcbc..cd532c8 100644 --- a/library/GSUP_Types.ttcn +++ b/library/GSUP_Types.ttcn @@ -138,7 +138,11 @@ OSMO_GSUP_MSGT_E_CLOSE ('01000111'B), OSMO_GSUP_MSGT_E_ABORT ('01001011'B), - OSMO_GSUP_MSGT_E_ROUTING_ERROR ('01001110'B) + OSMO_GSUP_MSGT_E_ROUTING_ERROR ('01001110'B), + + OSMO_GSUP_MSGT_EPDG_TUNNEL_REQUEST ('01010000'B), + OSMO_GSUP_MSGT_EPDG_TUNNEL_ERROR ('01010001'B), + OSMO_GSUP_MSGT_EPDG_TUNNEL_RESULT ('01010010'B) } with { variant "FIELDLENGTH(8)" }; type enumerated GSUP_CancelType { @@ -687,6 +691,32 @@ tr_GSUP(OSMO_GSUP_MSGT_CHECK_IMEI_ERROR, f_gen_tr_ies(imsi, cause := cause, destination_name := destination_name)); +/* EPDG Tunnel */ +template GSUP_PDU ts_GSUP_EPDGTunnel_REQ(hexstring imsi, GSUP_CnDomain dom := OSMO_GSUP_CN_DOMAIN_PS, + template octetstring source_name := omit) := + ts_GSUP(OSMO_GSUP_MSGT_EPDG_TUNNEL_REQUEST, f_gen_ts_ies(imsi, dom := dom, + source_name := source_name)); + +template (present) GSUP_PDU tr_GSUP_EPDGTunnel_REQ(template (present) hexstring imsi := ?) := + tr_GSUP_IMSI(OSMO_GSUP_MSGT_EPDG_TUNNEL_REQUEST, imsi); + +template (value) GSUP_PDU ts_GSUP_EPDGTunnel_RES(hexstring imsi, octetstring destination_name := ''O) := + ts_GSUP(OSMO_GSUP_MSGT_EPDG_TUNNEL_RESULT, { valueof(ts_GSUP_IE_IMSI(imsi)), + valueof(ts_GSUP_IE_Destination_Name(destination_name))}); + +template (present) GSUP_PDU tr_GSUP_EPDGTunnel_RES(template (present) hexstring imsi, template octetstring destination_name := omit) := + tr_GSUP(OSMO_GSUP_MSGT_EPDG_TUNNEL_RESULT, f_gen_tr_ies(imsi, destination_name := destination_name)); + +template (value) GSUP_PDU ts_GSUP_EPDGTunnel_ERR(hexstring imsi, integer cause) := + ts_GSUP(OSMO_GSUP_MSGT_EPDG_TUNNEL_ERROR, { + valueof(ts_GSUP_IE_IMSI(imsi)), valueof(ts_GSUP_IE_Cause(cause)) }); + +template (present) GSUP_PDU tr_GSUP_EPDGTunnel_ERR(template (present) hexstring imsi, template (present) integer cause := ?, + template octetstring destination_name := omit) := + tr_GSUP(OSMO_GSUP_MSGT_EPDG_TUNNEL_ERROR, + f_gen_tr_ies(imsi, cause := cause, destination_name := destination_name)); + + template (value) GSUP_IE ts_GSUP_IE_CancelType(GSUP_CancelType ctype) := { tag := OSMO_GSUP_CANCEL_TYPE_IE, len := 0, /* overwritten */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34832?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: Iadba149e6d299e5e666b2debdc23a00d37e78da5 Gerrit-Change-Number: 34832 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-ttcn3-hacks[master]: GTPv2_Templates: Several improvements to tr_GTP2C_CreateSessionReq
by osmith 19 Oct '23

19 Oct '23

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34822?usp=email ) Change subject: GTPv2_Templates: Several improvements to tr_GTP2C_CreateSessionReq ...................................................................... Patch Set 1: (1 comment) File library/GTPv2_Templates.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34822/comment/f7fb467a_bf52… PS1, Line 751: 6 why replace it with ? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34822?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: I6dd8cddcb986969d713ed7975a55cb31ab47c499 Gerrit-Change-Number: 34822 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 19 Oct 2023 14:56:48 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in libosmocore[master]: gsup: Define EPDG Tunnel messages
by pespin 19 Oct '23

19 Oct '23

pespin has abandoned this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34784?usp=email ) Change subject: gsup: Define EPDG Tunnel messages ...................................................................... Abandoned Abandoning in favor of https://gerrit.osmocom.org/c/libosmocore/+/32033 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34784?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I482060da4a13e30a76527ad911f8583b3937d077 Gerrit-Change-Number: 34784 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-MessageType: abandon

1 0

[S] Change in osmo-ttcn3-hacks[master]: GTPv2_Templates: Several improvements to tr_GTP2C_CreateSessionReq
by osmith 19 Oct '23

19 Oct '23

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34822?usp=email ) Change subject: GTPv2_Templates: Several improvements to tr_GTP2C_CreateSessionReq ...................................................................... Patch Set 1: (1 comment) File library/GTPv2_Templates.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34822/comment/7e757946_ec63… PS1, Line 743: ? shouldn't the previous default '012a'O be here? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34822?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: I6dd8cddcb986969d713ed7975a55cb31ab47c499 Gerrit-Change-Number: 34822 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 19 Oct 2023 14:56:16 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in osmo-ttcn3-hacks[master]: GTPv2: Fix match of 15-digit IMSIs
by osmith 19 Oct '23

19 Oct '23

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34821?usp=email ) Change subject: GTPv2: Fix match of 15-digit IMSIs ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34821?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: Ie2f316ccb5bc69ec15e861616de4fd5babc4004e Gerrit-Change-Number: 34821 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 19 Oct 2023 14:55:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in ...osmo-epdg[master]: Makefile: pass config file to 'make run'
by pespin 19 Oct '23

19 Oct '23

pespin has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34803?usp=email ) Change subject: Makefile: pass config file to 'make run' ...................................................................... Makefile: pass config file to 'make run' Change-Id: Icbd12d5aac363c6cdc54aac88c0e2fa619c1e01b --- M Makefile 1 file changed, 10 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/Makefile b/Makefile index 43e749d..5b2196e 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ rebar3 escriptize run: build - _build/default/bin/osmo-epdg + ERL_FLAGS='-config config/sys.config' _build/default/bin/osmo-epdg check: rebar3 eunit -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34803?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: Icbd12d5aac363c6cdc54aac88c0e2fa619c1e01b Gerrit-Change-Number: 34803 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in ...osmo-epdg[master]: diameter_swx: Fix MAA and SAA parsing mixed
by pespin 19 Oct '23

19 Oct '23

pespin has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34783?usp=email ) Change subject: diameter_swx: Fix MAA and SAA parsing mixed ...................................................................... diameter_swx: Fix MAA and SAA parsing mixed Change-Id: I570dd7c0ae521ccaea5fceb7eef90b4975cb0fbc --- M src/epdg_diameter_swx.erl 1 file changed, 35 insertions(+), 12 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/epdg_diameter_swx.erl b/src/epdg_diameter_swx.erl index fe89f11..dadfa65 100644 --- a/src/epdg_diameter_swx.erl +++ b/src/epdg_diameter_swx.erl @@ -152,19 +152,28 @@ unknown_user => #{error => "User is not known by HSS"} }). --spec parse_mar(#'MAA'{}) -> map(). -parse_mar(#'MAA'{'Result-Code' = [ResultCode]} = Maa) -> +-spec parse_maa(#'MAA'{}) -> map(). +parse_maa(#'MAA'{'Result-Code' = [ResultCode]} = Maa) -> Success = result_code_success(ResultCode), {Success, ResultCode}; - -parse_mar(#'MAA'{'Experimental-Result' = [#{'Vendor-Code' := ?VENDOR_ID_3GPP, 'ExpResultCode' := 5001}]} = Maa) -> +parse_maa(#'MAA'{'Experimental-Result' = [#{'Vendor-Code' := ?VENDOR_ID_3GPP, 'ExpResultCode' := 5001}]} = Maa) -> {unknown_user, 5001}; -parse_mar(#'MAA'{'Experimental-Result' = [#{'Vendor-Code' := ?VENDOR_ID_3GPP, 'ExpResultCode' := ResultCode}]} = Maa) -> +parse_maa(#'MAA'{'Experimental-Result' = [#{'Vendor-Code' := ?VENDOR_ID_3GPP, 'ExpResultCode' := ResultCode}]} = Maa) -> {invalid_exp_result, ResultCode}; -parse_mar(Maa) -> +parse_maa(Maa) -> {unknown_err, []}. +% parse_maa(#'MAA'{'Experimental-Result-Code' = [ResultCode] = MAA) -> -% parse_mar(#'MAA'{'Experimental-Result-Code' = [ResultCode] = MAA) -> +-spec parse_saa(#'SAA'{}) -> map(). +parse_saa(#'SAA'{'Result-Code' = [ResultCode]} = Saa) -> + Success = result_code_success(ResultCode), + {Success, ResultCode}; +parse_saa(#'SAA'{'Experimental-Result' = [#{'Vendor-Code' := ?VENDOR_ID_3GPP, 'ExpResultCode' := 5001}]} = Saa) -> + {unknown_user, 5001}; +parse_saa(#'SAA'{'Experimental-Result' = [#{'Vendor-Code' := ?VENDOR_ID_3GPP, 'ExpResultCode' := ResultCode}]} = Saa) -> + {invalid_exp_result, ResultCode}; +parse_saa(Saa) -> + {unknown_err, []}. handle_call({mar, {IMSI, NumAuthItems, AuthScheme, RAT, CKey, IntegrityKey}}, _From, State) -> SessionId = diameter:session_id(application:get_env(?ENV_APP_NAME, origin_host, ?ENV_DEFAULT_ORIG_HOST)), @@ -184,11 +193,16 @@ Ret = diameter:call(?SVC_NAME, ?APP_ALIAS, MAR, []), case Ret of {ok, MAA} -> - {reply, {ok, MAA}, State}; + SuccessCode = parse_maa(MAA), + case SuccessCode of + {ok, _} -> {reply, {ok, MAA}, State}; + {Err, Info} -> {reply, {error, {Err, Info, MAA}}, State} + end; {error, Err} -> lager:error("Error: ~w~n", [Err]), {reply, {error, Err}, State} end; + handle_call({sar, {IMSI, Type, APN}}, _From, State) -> SessionId = diameter:session_id(application:get_env(?ENV_APP_NAME, origin_host, ?ENV_DEFAULT_ORIG_HOST)), SAR = #'SAR'{'Vendor-Specific-Application-Id' = #'Vendor-Specific-Application-Id'{ @@ -202,11 +216,11 @@ }, Ret = diameter:call(?SVC_NAME, ?APP_ALIAS, SAR, []), case Ret of - {ok, Maa} -> - SuccessCode = parse_mar(Maa), + {ok, Saa} -> + SuccessCode = parse_saa(Saa), case SuccessCode of - {ok, _} -> {reply, {ok, Maa}, State}; - {Err, Info} -> {reply, {error, {Err, Info, Maa}}, State} + {ok, _} -> {reply, {ok, Saa}, State}; + {Err, Info} -> {reply, {error, {Err, Info, Saa}}, State} end; {error, Err} -> lager:error("Error: ~w~n", [Err]), -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34783?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: I570dd7c0ae521ccaea5fceb7eef90b4975cb0fbc Gerrit-Change-Number: 34783 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in ...osmo-epdg[master]: README.md: Fix path to config file
by pespin 19 Oct '23

19 Oct '23

pespin has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34802?usp=email ) Change subject: README.md: Fix path to config file ...................................................................... README.md: Fix path to config file Change-Id: Id0f7cb0d991895da96694082ab367c30867a7bce --- M README.md 1 file changed, 10 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/README.md b/README.md index 6f93fed..d425efc 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ == Configuration == -$ rebar3 shell --config ./examples/sys.config +$ rebar3 shell --config ./config/sys.config ``` 1> osmo_epdg:start(). ``` -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34802?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: Id0f7cb0d991895da96694082ab367c30867a7bce Gerrit-Change-Number: 34802 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0