- gerrit-log - lists.osmocom.org

[L] Change in ...osmo-epdg[master]: Initial S6b support
by pespin 23 Oct '23

23 Oct '23

Attention is currently required from: pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34858?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: Initial S6b support ...................................................................... Initial S6b support So far only the Rx of AAR msg and Tx of AAA is supported. This allows already going forward during the session creation, where PGW sends AAR to the AAA server and expects AAA message. Related: OS#6229 Change-Id: Ia2b138317cb291a95882853f5403949c5e6a5a1b --- M config/sys.config A src/aaa_diameter_s6b.erl A src/aaa_diameter_s6b_cb.erl M src/osmo_epdg_sup.erl 4 files changed, 305 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/58/34858/2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34858?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: Ia2b138317cb291a95882853f5403949c5e6a5a1b Gerrit-Change-Number: 34858 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[L] Change in ...osmo-epdg[master]: Handle GSUP EPDG_Tunnel through GTPv2C CreateSession Req+Resp
by pespin 23 Oct '23

23 Oct '23

Attention is currently required from: fixeria, laforge, lynxis lazus, pespin. Hello Jenkins Builder, fixeria, laforge, lynxis lazus, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34804?usp=email to look at the new patch set (#4). The following approvals got outdated and were removed: Code-Review+1 by fixeria, Code-Review+1 by laforge, Verified-1 by Jenkins Builder Change subject: Handle GSUP EPDG_Tunnel through GTPv2C CreateSession Req+Resp ...................................................................... Handle GSUP EPDG_Tunnel through GTPv2C CreateSession Req+Resp Initial GTPv2C infrastructure to send GTPv2C CreateSession Request upon receival of GSUP EPDG_Tunnel Request, and answer with EPDG_Tunnel Resp/err when creating the session fails. Related: OS#6046 Change-Id: I6f00b7fce2d5fcdc484bfd45629b9141f16bc579 --- M config/sys.config M rebar.config M rebar.lock A src/epdg_gtpc_s2b.erl M src/gsup_server.erl M src/osmo_epdg.app.src M src/osmo_epdg_sup.erl 7 files changed, 320 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/04/34804/4 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34804?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: I6f00b7fce2d5fcdc484bfd45629b9141f16bc579 Gerrit-Change-Number: 34804 Gerrit-PatchSet: 4 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-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-MessageType: newpatchset

1 0

[S] Change in docker-playground[master]: ttcn3-epdg: Configure S6b interface
by pespin 23 Oct '23

23 Oct '23

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/34862?usp=email ) Change subject: ttcn3-epdg: Configure S6b interface ...................................................................... ttcn3-epdg: Configure S6b interface Configure the newly added S6b interface on both TTCN3 emulation code as well as osmo-epdg. Depends: osmo-ttcn3-hacks.git Change-Id Ia50698a3f6f5ed8251486b84c09f84edfd6d3951 Depends: osmo-epdg.git Change-Id Ia2b138317cb291a95882853f5403949c5e6a5a1b Change-Id: I1145ee1068a2fdd2fe8d3e48b80c8e6c1fcb50ad --- M ttcn3-epdg-test/EPDG_Tests.cfg M ttcn3-epdg-test/osmo-epdg.config 2 files changed, 23 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/62/34862/1 diff --git a/ttcn3-epdg-test/EPDG_Tests.cfg b/ttcn3-epdg-test/EPDG_Tests.cfg index f05a819..2a39b67 100644 --- a/ttcn3-epdg-test/EPDG_Tests.cfg +++ b/ttcn3-epdg-test/EPDG_Tests.cfg @@ -13,6 +13,7 @@ EPDG_Tests.mp_s2b_local_ip := "172.18.10.103" EPDG_Tests.mp_gsup_remote_ip := "172.18.10.20" +EPDG_Tests.mp_s6b_remote_ip := "172.18.10.20" EPDG_Tests.mp_s2b_remote_ip := "172.18.10.20" [MAIN_CONTROLLER] diff --git a/ttcn3-epdg-test/osmo-epdg.config b/ttcn3-epdg-test/osmo-epdg.config index 8036b2c..0aa9807 100644 --- a/ttcn3-epdg-test/osmo-epdg.config +++ b/ttcn3-epdg-test/osmo-epdg.config @@ -10,11 +10,18 @@ {diameter_remote_ip, "172.18.10.103"}, {diameter_remote_port, 3868}, {diameter_proto, sctp}, - % Diameter Server parameters {vendor_id, 0}, {origin_host, "epdg.localdomain"}, {origin_realm, "localdomain"}, {context_id, "epdg@localdomain"}, + % Diameter s6b Connection parameters + {dia_s6b_local_ip, "172.18.10.20"}, + {dia_s6b_local_port, 3869}, + {dia_s6b_proto, sctp}, + {dia_s6b_vendor_id, 0}, + {dia_s6b_origin_host, "aaa.localdomain"}, + {dia_s6b_origin_realm, "localdomain"}, + {dia_s6b_context_id, "aaa@localdomain"}, % GTPv2C Connection parameters {gtpc_local_ip, "172.18.10.20"}, {gtpc_local_port, 2123}, -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34862?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I1145ee1068a2fdd2fe8d3e48b80c8e6c1fcb50ad Gerrit-Change-Number: 34862 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-ttcn3-hacks[master]: epdg: Emulate PGW tx AAR and rx AAA in S6b interface
by pespin 23 Oct '23

23 Oct '23

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34861?usp=email ) Change subject: epdg: Emulate PGW tx AAR and rx AAA in S6b interface ...................................................................... epdg: Emulate PGW tx AAR and rx AAA in S6b interface Related: OS#6229 Change-Id: Ia50698a3f6f5ed8251486b84c09f84edfd6d3951 --- M epdg/EPDG_Tests.ttcn 1 file changed, 42 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/61/34861/1 diff --git a/epdg/EPDG_Tests.ttcn b/epdg/EPDG_Tests.ttcn index 3a0c3a6..76fd45e 100644 --- a/epdg/EPDG_Tests.ttcn +++ b/epdg/EPDG_Tests.ttcn @@ -32,6 +32,8 @@ /* our emulated PGW (Diameter S6b) */ charstring mp_s6b_local_ip := "127.0.0.100"; integer mp_s6b_local_port := 3869; + charstring mp_s6b_remote_ip := "127.0.0.1"; + integer mp_s6b_remote_port := 3869; /* our emulated PGW (GTPv2C S2b) */ charstring mp_s2b_local_ip := "127.0.0.100"; @@ -212,14 +214,14 @@ /* S6b setup: */ pars := { - remote_ip := "", - remote_sctp_port := -1, /* server mode */ + remote_ip := mp_s6b_remote_ip, + remote_sctp_port := mp_s6b_remote_port, /* client mode */ local_ip := mp_s6b_local_ip, local_sctp_port := mp_s6b_local_port, - origin_host := "hss." & mp_diam_realm, + origin_host := "pgw." & mp_diam_realm, origin_realm := mp_diam_realm, - auth_app_id := omit, - vendor_app_id := c_DIAMETER_3GPP_S6_AID + auth_app_id := c_DIAMETER_3GPP_S6b_AID, + vendor_app_id := c_DIAMETER_3GPP_S6b_AID }; vc_S6b := DIAMETER_Emulation_CT.create(id); map(vc_S6b:DIAMETER, system:DIAMETER_CODEC_PT); @@ -228,8 +230,7 @@ vc_S6b.start(DIAMETER_Emulation.main(ops, pars, id)); f_diameter_wait_capability(SWx_UNIT); - // FIXME: osmo-epdg doesn't connect to S6b yet. - //f_diameter_wait_capability(S6b_UNIT); + f_diameter_wait_capability(S6b_UNIT); /* Give some time for our emulation to get out of SUSPECT list of SUT (3 watchdog ping-pongs): * RFC6733 sec 5.1 @@ -362,6 +363,26 @@ } } +/* 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; + var UINT32 hbh_id := f_rnd_octstring(4); + var UINT32 ete_id := f_rnd_octstring(4); + + /* Unlike AAR, AAA 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_S6b_expect_eteid(ete_id); + + S6b.send(ts_DIA_S6b_AAR(g_pars.imsi, hbh_id := hbh_id, ete_id := ete_id)); + alt { + [] S6b.receive(tr_DIA_S6b_AAA) -> value rx_dia {} + [] S6b.receive(PDU_DIAMETER:?) -> value rx_dia { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Unexpected Diameter S6b msg rx: ", rx_dia)); + } + } +} + /* Diameter SWx SAR + SAA. */ private altstep as_GTP2C_CreateSession_success() runs on EPDG_ConnHdlr { var PDU_GTPCv2 rx_msg; @@ -375,11 +396,15 @@ g_pars.teic := f_gtp2_allocate_teid(); g_pars.teid := g_pars.teic; + /* Upon rx of CreateSession, emulate PGW asking the AAA server. */ + f_S6b_AA_success(); + 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); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34861?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: Ia50698a3f6f5ed8251486b84c09f84edfd6d3951 Gerrit-Change-Number: 34861 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in osmo-ttcn3-hacks[master]: DIAMETER_Templates: Add S6b AAR and AAA message templates
by pespin 23 Oct '23

23 Oct '23

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34860?usp=email ) Change subject: DIAMETER_Templates: Add S6b AAR and AAA message templates ...................................................................... DIAMETER_Templates: Add S6b AAR and AAA message templates Related: OS#6229 Change-Id: I302d9a94e6ffbb62b6db81e1b14484355e55ebe5 --- M library/DIAMETER_Templates.ttcn 1 file changed, 97 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/60/34860/1 diff --git a/library/DIAMETER_Templates.ttcn b/library/DIAMETER_Templates.ttcn index f909b5f..f46bf37 100644 --- a/library/DIAMETER_Templates.ttcn +++ b/library/DIAMETER_Templates.ttcn @@ -127,6 +127,8 @@ const uint32_t c_DIAMETER_3GPP_S7_AID := 16777308; /* 3GPP TS 29.273 Section 8.2 */ const uint32_t c_DIAMETER_3GPP_SWx_AID := 16777265; +/* 3GPP TS 29.273 Section 9 */ +const uint32_t c_DIAMETER_3GPP_S6b_AID := 16777272; const octetstring c_def_sess_id := char2oct("ttcn3.session"); @@ -1518,6 +1520,34 @@ } } +/* RFC6733 8.7. Auth-Request-Type AVP */ +template (value) GenericAVP ts_AVP_AuthRequestType(BASE_NONE_Auth_Request_Type auth_req_type) := { + avp := { + avp_header := ts_DIA_Hdr(c_AVP_Code_BASE_NONE_Auth_Request_Type, '00000000'B), + avp_data := { + avp_BASE_NONE_Auth_Request_Type := auth_req_type + } + } +}/* +private function f_tr_AVP_AuthRequestType(template (present) BASE_NONE_Auth_Request_Type auth_req_type) +return template (present) BASE_NONE_Auth_Request_Type { + if (istemplatekind(auth_req_type, "?")) { + return ?; + } else { + var template (present) BASE_NONE_Auth_Request_Type c; + c := int2oct(enum2int(valueof(auth_req_type)), 4); + return c; + } +}*/ +template (present) GenericAVP tr_AVP_AuthRequestType(template (present) BASE_NONE_Auth_Request_Type auth_req_type) := { + avp := { + avp_header := tr_DIA_Hdr(c_AVP_Code_BASE_NONE_Auth_Request_Type), + avp_data := { + avp_BASE_NONE_Auth_Request_Type := auth_req_type + } + } +} + /* 5.3.1 Capabilities Exchange Request */ template (value) PDU_DIAMETER @@ -2276,9 +2306,9 @@ } } -/***************************** - * SWx 3GPP TS 29.273 - *****************************/ +/******************************* + * SWx 3GPP TS 29.273 section 8 + *******************************/ /* SIP-Auth-Data-Item , 3GPP TS 29.273 8.2.3.9 */ template (present) GenericAVP tr_AVP_3GPP_SIPAuthDataItem(template (present) uint32_t num := ?) := { @@ -2445,4 +2475,58 @@ */ }); +/******************************* + * S6b 3GPP TS 29.273 section 9 + *******************************/ + + /* TS 29.273 9.2.2.5.1 AA-Request (AAR) */ +template (value) PDU_DIAMETER +ts_DIA_S6b_AAR(template (value) hexstring imsi, + template (value) octetstring sess_id := c_def_sess_id, + template (value) charstring orig_host := "pgw.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 := '11000000'B, + cmd_code := Authorize_Authenticate, + 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_AuthAppId(int2oct(c_DIAMETER_3GPP_S6b_AID, 4)), + ts_AVP_OriginHost(orig_host), + ts_AVP_OriginRealm(orig_realm), + ts_AVP_DestinationRealm(dest_realm), + ts_AVP_AuthRequestType(AUTHORIZE_ONLY), + ts_AVP_UserNameImsi(valueof(imsi)) + /* TODO: Lots other optional */ + }); + +/* TS 29.273 9.2.2.2.2 AA-Answer (AAA) */ +template (present) PDU_DIAMETER +tr_DIA_S6b_AAA(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 := ?, + template (present) CxDx_3GPP_Server_Assignment_Type server_ass_type := ?, + template (present) charstring service_selection := ?) := + tr_DIAMETER(flags := '0???????'B, + cmd_code := Authorize_Authenticate, + 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_AuthAppId(int2oct(c_DIAMETER_3GPP_S6b_AID, 4)), + tr_AVP_AuthRequestType(AUTHORIZE_ONLY), + tr_AVP_ResultCode(DIAMETER_SUCCESS), + tr_AVP_OriginHost(orig_host), + tr_AVP_OriginRealm(orig_realm) + )); + } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34860?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: I302d9a94e6ffbb62b6db81e1b14484355e55ebe5 Gerrit-Change-Number: 34860 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[L] Change in ...osmo-epdg[master]: diameter: Add spec definitions for S6b (TS 28.273 and dep RFC 5777)
by Jenkins Builder 23 Oct '23

23 Oct '23

Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34857?usp=email ) Change subject: diameter: Add spec definitions for S6b (TS 28.273 and dep RFC 5777) ...................................................................... Patch Set 1: (1 comment) File dia/diameter_3gpp_ts29_273_s6b.dia: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-12018): https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34857/comment/cc7898ce_d611… PS1, Line 4: ;; Copyright (C) 2023 by sysmocom - s.m.f.c. GmbH <info(a)sysmocom.de> 's.m.f.c.' may be misspelled - perhaps 's.f.m.c.'? -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34857?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: I8075dd54a5fec386feecdf797d710a2524413acc Gerrit-Change-Number: 34857 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Mon, 23 Oct 2023 12:35:58 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[L] Change in ...osmo-epdg[master]: Handle GSUP EPDG_Tunnel through GTPv2C CreateSession Req+Resp
by Jenkins Builder 23 Oct '23

23 Oct '23

Attention is currently required from: lynxis lazus, pespin. Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34804?usp=email ) Change subject: Handle GSUP EPDG_Tunnel through GTPv2C CreateSession Req+Resp ...................................................................... Patch Set 3: (1 comment) File src/epdg_gtpc_s2b.erl: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-12017): https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34804/comment/24d562e3_99a5… PS3, Line 5: % (C) 2023 by sysmocom - s.m.f.c. GmbH <info(a)sysmocom.de> 's.m.f.c.' may be misspelled - perhaps 's.f.m.c.'? -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34804?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: I6f00b7fce2d5fcdc484bfd45629b9141f16bc579 Gerrit-Change-Number: 34804 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-CC: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Mon, 23 Oct 2023 12:35:57 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[L] Change in ...osmo-epdg[master]: Initial S6b support
by Jenkins Builder 23 Oct '23

23 Oct '23

Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34858?usp=email ) Change subject: Initial S6b support ...................................................................... Patch Set 1: (1 comment) File src/aaa_diameter_s6b.erl: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-12016): https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34858/comment/5befadd7_4a1c… PS1, Line 5: % (C) 2023 by sysmocom - s.m.f.c. GmbH <info(a)sysmocom.de> 's.m.f.c.' may be misspelled - perhaps 's.f.m.c.'? -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34858?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: Ia2b138317cb291a95882853f5403949c5e6a5a1b Gerrit-Change-Number: 34858 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Mon, 23 Oct 2023 12:35:56 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in ...osmo-epdg[master]: WIP
by pespin 23 Oct '23

23 Oct '23

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34859?usp=email ) Change subject: WIP ...................................................................... WIP Change-Id: I88cb82cc245da7da1c5f04fc20dc529110c34c51 --- M rebar.config 1 file changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/59/34859/1 diff --git a/rebar.config b/rebar.config index d834c32..83923b8 100644 --- a/rebar.config +++ b/rebar.config @@ -6,7 +6,7 @@ {lager, {git, "https://github.com/erlang-lager/lager", {tag, "3.9.2"}}}, {gtplib, "3.2.0"}, {osmo_ss7, {git, "https://gitea.osmocom.org/erlang/osmo_ss7", {ref, "9f294d3612f998860004820d1d85b4264721577b"}}}, - {osmo_gsup, {git, "https://gitea.osmocom.org/erlang/osmo_gsup", {ref, "07672d8ab1608aa9c9e50ca035521876558fcd42"}}} + {osmo_gsup, {git, "https://gitea.osmocom.org/erlang/osmo_gsup", {ref, "e23f118e6e8f7ee1247db34e4cb79e4cecdb0947"}}} ]}. {minimum_otp_vsn, "20.3"}. -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34859?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: I88cb82cc245da7da1c5f04fc20dc529110c34c51 Gerrit-Change-Number: 34859 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[L] Change in ...osmo-epdg[master]: Initial S6b support
by pespin 23 Oct '23

23 Oct '23

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34858?usp=email ) Change subject: Initial S6b support ...................................................................... Initial S6b support So far only the Rx of AAR msg and Tx of AAA is supported. This allows already going forward during the session creation, where PGW sends AAR to the AAA server and expects AAA message. Related: OS#6229 Change-Id: Ia2b138317cb291a95882853f5403949c5e6a5a1b --- M config/sys.config A src/aaa_diameter_s6b.erl A src/aaa_diameter_s6b_cb.erl M src/osmo_epdg_sup.erl 4 files changed, 305 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/58/34858/1 diff --git a/config/sys.config b/config/sys.config index 1b89e86..630a057 100755 --- a/config/sys.config +++ b/config/sys.config @@ -5,15 +5,22 @@ [% GSUP Server connection parameters {gsup_local_ip, "0.0.0.0"}, {gsup_local_port, 4222}, - % Diameter Connection parameters + % Diameter SWx Connection parameters {diameter_remote_ip, "127.0.0.1"}, {diameter_remote_port, 3868}, {diameter_proto, sctp}, - % Diameter Server parameters {vendor_id, 0}, {origin_host, "epdg.localdomain"}, {origin_realm, "localdomain"}, {context_id, "epdg@localdomain"}, + % Diameter s6b Connection parameters + {dia_s6b_local_ip, "127.0.0.10"}, + {dia_s6b_local_port, 3868}, + {dia_s6b_proto, sctp}, + {dia_s6b_vendor_id, 0}, + {dia_s6b_origin_host, "aaa.localdomain"}, + {dia_s6b_origin_realm, "localdomain"}, + {dia_s6b_context_id, "aaa@localdomain"}, % GTPv2C Connection parameters {gtpc_local_ip, "127.0.0.2"}, {gtpc_local_port, 2123}, diff --git a/src/aaa_diameter_s6b.erl b/src/aaa_diameter_s6b.erl new file mode 100644 index 0000000..1348e70 --- /dev/null +++ b/src/aaa_diameter_s6b.erl @@ -0,0 +1,203 @@ +% S6b: AAA side +% +% 3GPP TS 29.273 section 9 +% +% (C) 2023 by sysmocom - s.m.f.c. GmbH <info(a)sysmocom.de> +% Author: Pau Espin Pedrol <pespin(a)sysmocom.de> +% +% All Rights Reserved +% +% This program is free software; you can redistribute it and/or modify +% it under the terms of the GNU Affero General Public License as +% published by the Free Software Foundation; either version 3 of the +% License, or (at your option) any later version. +% +% This program is distributed in the hope that it will be useful, +% but WITHOUT ANY WARRANTY; without even the implied warranty of +% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +% GNU General Public License for more details. +% +% You should have received a copy of the GNU Affero General Public License +% along with this program. If not, see <http://www.gnu.org/licenses/>. +% +% Additional Permission under GNU AGPL version 3 section 7: +% +% If you modify this Program, or any covered work, by linking or +% combining it with runtime libraries of Erlang/OTP as released by +% Ericsson on http://www.erlang.org (or a modified version of these +% libraries), containing parts covered by the terms of the Erlang Public +% License (http://www.erlang.org/EPLICENSE), the licensors of this +% Program grant you additional permission to convey the resulting work +% without the need to license the runtime libraries of Erlang/OTP under +% the GNU Affero General Public License. Corresponding Source for a +% non-source form of such a combination shall include the source code +% for the parts of the runtime libraries of Erlang/OTP used as well as +% that of the covered work. + + +-module(aaa_diameter_s6b). +-author('Pau Espin Pedrol <pespin(a)sysmocom.de>'). + +-behaviour(gen_server). + +-include_lib("diameter_3gpp_ts29_273_s6b.hrl"). +-include_lib("diameter/include/diameter_gen_base_rfc6733.hrl"). + +%% API Function Exports +-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([code_change/3]). +-export([multimedia_auth_request/6]). +-export([server_assignment_request/3]). +-export([test/0, test/1]). + +%% Diameter Application Definitions +-define(SERVER, ?MODULE). +-define(SVC_NAME, ?MODULE). +-define(APP_ALIAS, ?MODULE). +-define(CALLBACK_MOD, aaa_diameter_s6b_cb). +-define(DIAMETER_DICT_S6b, diameter_3gpp_ts29_273_s6b). +-define(ENV_APP_NAME, osmo_epdg). +-define(ENV_DEFAULT_SESSION_ID, "aaa@localdomain"). +-define(ENV_DEFAULT_ORIG_REALM, "localdomain"). +-define(ENV_DEFAULT_ORIG_HOST, "aaa.localdomain"). +-define(ENV_DEFAULT_VENDOR_ID, 0). +-define(ENV_DEFAULT_DIAMETER_PROTO, sctp). +-define(ENV_DEFAULT_DIAMETER_REMOTE_IP, "127.0.0.10"). +-define(ENV_DEFAULT_DIAMETER_REMOTE_PORT, 3868). + +-define(VENDOR_ID_3GPP, 10415). +-define(VENDOR_ID_3GPP2, 5535). +-define(VENDOR_ID_ETSI, 13019). +-define(DIAMETER_APP_ID_S6b, ?DIAMETER_DICT_S6b:id()). +%% The service configuration. As in the server example, a client +%% supporting multiple Diameter applications may or may not want to +%% configure a common callback module on all applications. +-define(SERVICE, + [{'Origin-Host', application:get_env(?ENV_APP_NAME, dia_s6b_origin_host, ?ENV_DEFAULT_ORIG_HOST)}, + {'Origin-Realm', application:get_env(?ENV_APP_NAME, dia_s6b_origin_realm, ?ENV_DEFAULT_ORIG_REALM)}, + {'Vendor-Id', application:get_env(?ENV_APP_NAME, dia_s6b_vendor_id, ?ENV_DEFAULT_VENDOR_ID)}, + {'Vendor-Specific-Application-Id', + [#'diameter_base_Vendor-Specific-Application-Id'{ + 'Vendor-Id' = ?VENDOR_ID_3GPP, + 'Auth-Application-Id' = [?DIAMETER_APP_ID_S6b]}]}, + {'Product-Name', "osmo-epdg-AAA"}, + % TODO: check which we should annouce here as Supported-Vendor-Id + {'Supported-Vendor-Id', [?VENDOR_ID_3GPP, ?VENDOR_ID_ETSI, ?VENDOR_ID_3GPP2]}, + { application, + [{alias, ?APP_ALIAS}, + {dictionary, ?DIAMETER_DICT_S6b}, + {module, ?CALLBACK_MOD}, + {answer_errors, callback}]}]). + +-record(state, { + handlers, + peers = #{} +}). + +%% @doc starts gen_server implementation process +-spec start() -> ok | {error, term()}. +start() -> + application:ensure_all_started(?MODULE), + start_link(). + +%% @doc stops gen_server implementation process +-spec stop() -> ok. +stop() -> + gen_server:cast(?SERVER, stop). + +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})), + gen_server:cast(?SERVER, {peer_down, SvcName, Peer}), + ok. + +init(State) -> + Proto = application:get_env(?ENV_APP_NAME, dia_s6b_proto, ?ENV_DEFAULT_DIAMETER_PROTO), + Ip = application:get_env(?ENV_APP_NAME, dia_s6b_local_ip, ?ENV_DEFAULT_DIAMETER_REMOTE_IP), + Port = application:get_env(?ENV_APP_NAME, dia_s6b_local_port, ?ENV_DEFAULT_DIAMETER_REMOTE_PORT), + ok = diameter:start_service(?MODULE, ?SERVICE), + % lager:info("DiaServices is ~p~n", [DiaServ]), + {ok, _} = listen({address, Proto, Ip, Port}), + {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}}). + +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)). + +%% @callback gen_server +handle_cast(stop, State) -> + {stop, normal, State}; +handle_cast(_Req, State) -> + {noreply, State}. + +%% @callback gen_server +handle_info(_Info, State) -> + {noreply, State}. + +%% @callback gen_server +code_change(_OldVsn, State, _Extra) -> + {ok, State}. + +%% @callback gen_server +terminate(normal, _State) -> + diameter:stop_service(?SVC_NAME), + ok; +terminate(shutdown, _State) -> + ok; +terminate({shutdown, _Reason}, _State) -> + ok; +terminate(_Reason, _State) -> + ok. + +%% ------------------------------------------------------------------ +%% Internal Function Definitions +%% ------------------------------------------------------------------ + +%% connect/2 +listen(Name, {address, Protocol, IPAddr, Port}) -> + lager:notice("~s Listening on IP ~s port ~p~n", [Name, IPAddr, Port]), + {ok, IP} = inet_parse:address(IPAddr), + TransportOpts = + [{transport_module, tmod(Protocol)}, + {transport_config, + [{reuseaddr, true}, + {ip, IP}, + {port, Port} + %%{raddr, IP}, + %%{rport, Port} + ]}], + diameter:add_transport(Name, {listen, [{reconnect_timer, 1000} | TransportOpts]}). + +listen(Address) -> + listen(?SVC_NAME, Address). + +%% Convert connection type +tmod(tcp) -> + diameter_tcp; +tmod(sctp) -> + diameter_sctp. + + diff --git a/src/aaa_diameter_s6b_cb.erl b/src/aaa_diameter_s6b_cb.erl new file mode 100644 index 0000000..55bc66f --- /dev/null +++ b/src/aaa_diameter_s6b_cb.erl @@ -0,0 +1,73 @@ +%% +%% The diameter application callback module configured by client.erl. +%% +-module(aaa_diameter_s6b_cb). + +-include_lib("diameter/include/diameter.hrl"). +-include_lib("diameter_3gpp_ts29_273_s6b.hrl"). + +%% diameter callbacks +-export([peer_up/3, peer_down/3, pick_peer/4, prepare_request/3, prepare_retransmit/3, + handle_answer/4, handle_error/4, handle_request/3]). + +-define(UNEXPECTED, erlang:error({unexpected, ?MODULE, ?LINE})). + +%% peer_up/3 +peer_up(_SvcName, Peer, State) -> + lager:info("Peer up: ~p~n", [Peer]), + State. + +%% peer_down/3 +peer_down(_SvcName, Peer, State) -> + lager:info("Peer down: ~p~n", [Peer]), + State. + +%% pick_peer/4 +pick_peer([_Peer | _], _, _SvcName, _State) -> + ?UNEXPECTED. + +%% prepare_request/3 + +prepare_request(_, _SvcName, _Peer) -> + ?UNEXPECTED. + +%% prepare_retransmit/3 +prepare_retransmit(_Packet, _SvcName, _Peer) -> + ?UNEXPECTED. + +%% handle_answer/4 + +%% Since client.erl has detached the call when using the list +%% encoding and not otherwise, output to the terminal in the +%% the former case, return in the latter. + +handle_answer(_Packet, _Request, _SvcName, _Peer) -> + ?UNEXPECTED. + +%% handle_error/4 +handle_error(Reason, Request, _SvcName, _Peer) when is_list(Request) -> + lager:error("Request error: ~p~n", [Reason]), + ?UNEXPECTED. + +handle_request(#diameter_packet{msg = Req, errors = []}, _SvcName, {_, Caps}) when is_record(Req, 'AAR') -> + lager:info("S6b Rx from ~p: ~p~n", [Caps, Req]), + % extract relevant fields from DIAMETER AAR + #diameter_caps{origin_host = {OH,_}, origin_realm = {OR,_}} = Caps, + #'AAR'{'Session-Id' = SessionId, + 'Auth-Application-Id' = AuthAppId, + 'Auth-Request-Type' = AuthReqType, + 'User-Name' = _UserName} = Req, + Resp = #'AAA'{'Session-Id'=SessionId, + 'Auth-Application-Id' = AuthAppId, + 'Auth-Request-Type' = AuthReqType, + 'Result-Code'=2001, + 'Origin-Host'=OH, + 'Origin-Realm'=OR}, + lager:info("S6b Tx to ~p: ~p~n", [Caps, Resp]), + {reply, Resp}; + % TODO: extract relevant fields from DIAMETER AAA +%% handle_request/3 +handle_request(Packet, _SvcName, Peer) -> + lager:error("S6b Rx unexpected msg from ~p: ~p~n", [Peer, Packet]), + %PESPIN: TODO: handle S6b AAR here, see osmo_dia2gsup "handle_request" as example. + erlang:error({unexpected, ?MODULE, ?LINE}). diff --git a/src/osmo_epdg_sup.erl b/src/osmo_epdg_sup.erl index c679b39..e226567 100644 --- a/src/osmo_epdg_sup.erl +++ b/src/osmo_epdg_sup.erl @@ -28,6 +28,11 @@ 5000, worker, [epdg_diameter_swx_cb]}, + DiaS6bServer = {aaa_diameter_s6b, {aaa_diameter_s6b,start_link,[]}, + permanent, + 5000, + worker, + [aaa_diameter_s6b_cb]}, GtpcServer = {epdg_gtpc_s2b, {epdg_gtpc_s2b,start_link, [GtpcLocalIp, GtpcLocalPort, GtpcRemoteIp, GtpcRemotePort, []]}, permanent, 5000, @@ -43,4 +48,4 @@ 5000, worker, [auth_handler]}, - {ok, { {one_for_all, 5, 10}, [DiaServer, GtpcServer, GsupServer, AuthHandler]} }. + {ok, { {one_for_all, 5, 10}, [DiaServer, DiaS6bServer, GtpcServer, GsupServer, AuthHandler]} }. -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/34858?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: Ia2b138317cb291a95882853f5403949c5e6a5a1b Gerrit-Change-Number: 34858 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

2026

2025

2024

2023

2022

gerrit-log