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

[S] Change in libosmo-pfcp[master]: pfcp up_function_features: allow shorter lengths

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-pfcp/+/36347?usp=email ) Change subject: pfcp up_function_features: allow shorter lengths ...................................................................... pfcp up_function_features: allow shorter lengths eUPF sends a short CP Function Features bitmap, which is easy to solve by just zero padding to the minimum length specified in PFCP (3GPP TS 29.244) Related: SYS#6590 Change-Id: I40e255fd0b4770e578aea7a10ba88f5eeba087f4 --- M src/libosmo-pfcp/pfcp_ies_custom.c 1 file changed, 18 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-pfcp refs/changes/47/36347/1 diff --git a/src/libosmo-pfcp/pfcp_ies_custom.c b/src/libosmo-pfcp/pfcp_ies_custom.c index e2e9f02..d3ecda5 100644 --- a/src/libosmo-pfcp/pfcp_ies_custom.c +++ b/src/libosmo-pfcp/pfcp_ies_custom.c @@ -431,8 +431,10 @@ int osmo_pfcp_dec_up_function_features(void *decoded_struct, void *decode_to, const struct osmo_gtlv_load *tlv) { struct osmo_pfcp_ie_up_function_features *up_function_features = decode_to; - ENSURE_LENGTH_IS_AT_LEAST(6); - memcpy(up_function_features->bits, tlv->val, 6); + /* 3GPP TS 29.244 version 16.6.0 Release 16 8.2.25 UP Function Features defines at least 6 octets of bits, but + * if the peer sends less octets, make do with what we get. */ + memset(up_function_features->bits, 0, sizeof(up_function_features->bits)); + memcpy(up_function_features->bits, tlv->val, OSMO_MIN(sizeof(up_function_features->bits), tlv->len)); return 0; } -- To view, visit https://gerrit.osmocom.org/c/libosmo-pfcp/+/36347?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-pfcp Gerrit-Branch: master Gerrit-Change-Id: I40e255fd0b4770e578aea7a10ba88f5eeba087f4 Gerrit-Change-Number: 36347 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 5 months

1
0
0 0

[S] Change in osmo-mgw[master]: mgw: do not fail MGCP on codec mismatch

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/35302?usp=email ) Change subject: mgw: do not fail MGCP on codec mismatch ...................................................................... mgw: do not fail MGCP on codec mismatch Before this patch, when an CRCX+MDCX wants to set a codec list that has no match with the codecs for the other conn of that same endpoint, osmo-mgw returns an MGCP "FAIL" response. When a client wants to change the codec, it has to do that one RTP port at a time. So osmo-mgw *must* allow to configure an MGCP conn with a codec choice that mismatches the other conn. This is crucial to allow codec negotiation in osmo-msc: if MO has already assigned a specific codec, and later wants to re-assign to the codec that MT has chosen, the codec needs to be changed at osmo-mgw. This patch is the minimal fix required to get re-assignment to a different codec to work (via osmo-msc). There is more work to be done about this bit of code in osmo-mgw, but keep that to a separate patch. In detail, before this patch, we fail both - when a side has no codecs, - or when there is no single match between codecs of the two sides of the endpoint. Remove only the second condition; after this patch, still fail when a side has no codecs -- this allows mgcp_test.c to still pass. Related: OS#6293 Related: osmo-msc I8760feaa8598047369ef8c3ab2673013bac8ac8a Change-Id: I3d1163fe622bdd7dc42a485f796072524ab39db9 --- M src/libosmo-mgcp/mgcp_codec.c 1 file changed, 45 insertions(+), 1 deletion(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve diff --git a/src/libosmo-mgcp/mgcp_codec.c b/src/libosmo-mgcp/mgcp_codec.c index 4626d03..2f1df7b 100644 --- a/src/libosmo-mgcp/mgcp_codec.c +++ b/src/libosmo-mgcp/mgcp_codec.c @@ -455,7 +455,17 @@ } } - return -EINVAL; + if (conn_dst->end.codecs_assigned) + conn_dst->end.codec = &conn_dst->end.codecs[0]; + else + return -EINVAL; + + if (conn_src->end.codecs_assigned) + conn_src->end.codec = &conn_src->end.codecs[0]; + else + return -EINVAL; + + return 0; } /* Check if the codec has a specific AMR mode (octet-aligned or bandwith-efficient) set. */ -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/35302?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I3d1163fe622bdd7dc42a485f796072524ab39db9 Gerrit-Change-Number: 35302 Gerrit-PatchSet: 7 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 5 months

1
0
0 0

[S] Change in libosmocore[master]: sockaddr_str: add conversion to,from osmo_sockaddr

by neels

Attention is currently required from: pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/36265?usp=email ) Change subject: sockaddr_str: add conversion to,from osmo_sockaddr ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > Missing update in TODO-RELEASE. do you really need a TODO-RELEASE entry for an added function? the changelog will anyway list the commit log summary. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/36265?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: I0df84b4bb8cb5d8434b735fa3a38e7f95be43e91 Gerrit-Change-Number: 36265 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 19 Mar 2024 03:37:58 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: DIAMETER_ts32_299_Templates.ttcn: Define Result codes specified in TS

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36345?usp=email ) Change subject: DIAMETER_ts32_299_Templates.ttcn: Define Result codes specified in TS ...................................................................... DIAMETER_ts32_299_Templates.ttcn: Define Result codes specified in TS Change-Id: I6c102e6a10469d0d054cb55f7d2100c8887ab6e0 --- M library/DIAMETER_ts32_299_Templates.ttcn 1 file changed, 22 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/45/36345/1 diff --git a/library/DIAMETER_ts32_299_Templates.ttcn b/library/DIAMETER_ts32_299_Templates.ttcn index c22b6fa..55402ab 100644 --- a/library/DIAMETER_ts32_299_Templates.ttcn +++ b/library/DIAMETER_ts32_299_Templates.ttcn @@ -18,11 +18,23 @@ import from Misc_Helpers all; /******************************* - * S6a 3GPP TS 32.299 section 7 + * Gy 3GPP TS 32.299 section 7 *******************************/ /* Gy AID : 3GPP TS 32.299 7.1.6, RFC4006 3.1: c_DIAMETER_CREDIT_CONTROL_AID */ +/* 3GPP TS 32.299 7.1.11 Result-Code AVP*/ +type enumerated DIAMETER_ts32_229_Resultcode { + /* transient */ + DIAMETER_END_USER_SERVICE_DENIED (4010), + DIAMETER_CREDIT_CONTROL_NOT_APPLICABLE (4011), + DIAMETER_CREDIT_LIMIT_REACHED (4012), + /* permanent */ + DIAMETER_AUTHORIZATION_REJECTED (5003), + DIAMETER_USER_UNKNOWN (5030), + DIAMETER_RATING_FAILED (5031) +} + /* 3GPP TS 32.299 6.4.2 Credit-Control-Request */ template (present) PDU_DIAMETER tr_DIA_Gy_CCR(template (present) DCC_NONE_CC_Request_Type req_type := INITIAL_REQUEST) -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36345?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: I6c102e6a10469d0d054cb55f7d2100c8887ab6e0 Gerrit-Change-Number: 36345 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 5 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: pgw: Set Gy CCA Result-Code based on settings

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36344?usp=email ) Change subject: pgw: Set Gy CCA Result-Code based on settings ...................................................................... pgw: Set Gy CCA Result-Code based on settings This allows the test to change the Result-Code being transmitted during Gy CCA at any time. Related: SYS#6845 Change-Id: I2c3b1057908c1c76a55c41a7f45728a0fdee3cf0 --- M ggsn_tests/GGSN_Tests.ttcn M library/DIAMETER_ts32_299_Templates.ttcn M pgw/PGW_Tests.ttcn 3 files changed, 33 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/44/36344/1 diff --git a/ggsn_tests/GGSN_Tests.ttcn b/ggsn_tests/GGSN_Tests.ttcn index 55720ee..74c2e8c 100644 --- a/ggsn_tests/GGSN_Tests.ttcn +++ b/ggsn_tests/GGSN_Tests.ttcn @@ -686,7 +686,7 @@ } } else { tx_dia := ts_DIA_Gy_CCA(g_rx_gy.hop_by_hop_id, g_rx_gy.end_to_end_id, sess_id, - req_type, req_num); + DIAMETER_SUCCESS, req_type, req_num); } Gy_UNIT.send(tx_dia); } diff --git a/library/DIAMETER_ts32_299_Templates.ttcn b/library/DIAMETER_ts32_299_Templates.ttcn index af8f514..c22b6fa 100644 --- a/library/DIAMETER_ts32_299_Templates.ttcn +++ b/library/DIAMETER_ts32_299_Templates.ttcn @@ -41,13 +41,14 @@ template (value) PDU_DIAMETER ts_DIA_Gy_CCA(template (value) UINT32 hbh_id, template (value) UINT32 ete_id, template (value) octetstring sess_id, + template (value) DIAMETER_Resultcode res_code, template (value) DCC_NONE_CC_Request_Type req_type, template (value) AVP_Unsigned32 req_num) := ts_DIAMETER(flags:='01000000'B, cmd_code:=Credit_Control, app_id:=int2oct(c_DIAMETER_CREDIT_CONTROL_AID, 4), hbh_id:=hbh_id, ete_id:=ete_id, avps := { ts_AVP_SessionId(sess_id), - ts_AVP_ResultCode(DIAMETER_SUCCESS), + ts_AVP_ResultCode(res_code), ts_AVP_OriginHost("ocs.localdomain"), ts_AVP_OriginRealm("localdomain"), ts_AVP_AuthAppId(int2oct(c_DIAMETER_CREDIT_CONTROL_AID, 4)), diff --git a/pgw/PGW_Tests.ttcn b/pgw/PGW_Tests.ttcn index fb893fc..0fa7394 100644 --- a/pgw/PGW_Tests.ttcn +++ b/pgw/PGW_Tests.ttcn @@ -132,6 +132,14 @@ OCT4 teid_remote optional }; +type record SessionParsGy { + /* In seconds. 0 => disabled, !0 => grant over CC-Time period */ + integer validity_time, + + /* Result-Code to use when sending Gy CCA, usually DIAMETER_SUCCESS */ + DIAMETER_Resultcode cca_res_code +}; + /* configuration data for a given Session */ type record SessionPars { hexstring imsi, @@ -159,8 +167,7 @@ charstring tun_dev_name, charstring tun_netns_name optional, - /* In seconds. 0 => disabled, !0 => grant over CC-Time period */ - integer gy_validity_time + SessionParsGy gy } template (value) SessionPars @@ -188,7 +195,10 @@ }, tun_dev_name := tundev, tun_netns_name := tundev, - gy_validity_time := 0 + gy := { + validity_time := 0, + cca_res_code := DIAMETER_SUCCESS + } } @@ -588,12 +598,12 @@ avp := f_DIAMETER_get_avp(g_rx_gy, c_AVP_Code_DCC_NONE_CC_Request_Number); req_num := valueof(avp.avp_data.avp_DCC_NONE_CC_Request_Number); - if (g_pars.gy_validity_time > 0) { + if (g_pars.gy.validity_time > 0) { tx_dia := ts_DIA_Gy_CCA_ValidityTime(g_rx_gy.hop_by_hop_id, g_rx_gy.end_to_end_id, sess_id, - req_type, req_num, g_pars.gy_validity_time); + req_type, req_num, g_pars.gy.validity_time); } else { tx_dia := ts_DIA_Gy_CCA(g_rx_gy.hop_by_hop_id, g_rx_gy.end_to_end_id, sess_id, - req_type, req_num); + g_pars.gy.cca_res_code, req_type, req_num); } Gy.send(tx_dia); } @@ -1046,7 +1056,7 @@ testcase TC_gy_charging_cc_time() runs on PGW_Test_CT { var PGW_Session_CT vc_conn; var SessionPars pars := valueof(t_SessionPars('001010123456789'H, "tun23")); - pars.gy_validity_time := 3; /* Grant access for 3 seconds, needs to be re-validated afterwards */ + pars.gy.validity_time := 3; /* Grant access for 3 seconds, needs to be re-validated afterwards */ f_init(); vc_conn := f_start_handler(refers(f_TC_gy_charging_cc_time), pars); vc_conn.done; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36344?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: I2c3b1057908c1c76a55c41a7f45728a0fdee3cf0 Gerrit-Change-Number: 36344 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 5 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: pgw: Fix typo in comment

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36343?usp=email ) Change subject: pgw: Fix typo in comment ...................................................................... pgw: Fix typo in comment Change-Id: Ie768044d9f80cc3837685167d98a1e270d0abde4 --- M pgw/PGW_Tests.ttcn 1 file changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/43/36343/1 diff --git a/pgw/PGW_Tests.ttcn b/pgw/PGW_Tests.ttcn index 281f816..fb893fc 100644 --- a/pgw/PGW_Tests.ttcn +++ b/pgw/PGW_Tests.ttcn @@ -1031,7 +1031,7 @@ d := activate(as_DIA_Gy_CCR(UPDATE_REQUEST)); f_ping4(mp_ping_hostname); - /* Let the CCA reach the GGSN */ + /* Let the CCA reach the PGW */ f_sleep(0.5); deactivate(d); f_validate_gy_cc_report(g_rx_gy, VALIDITY_TIME, (3..4), (28..1000), (28..1000)); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36343?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: Ie768044d9f80cc3837685167d98a1e270d0abde4 Gerrit-Change-Number: 36343 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: TC_hss_initiated_update_user_profile: test SWx PPR -> S6b RAR p...

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36307?usp=email ) Change subject: epdg: TC_hss_initiated_update_user_profile: test SWx PPR -> S6b RAR propagation ...................................................................... epdg: TC_hss_initiated_update_user_profile: test SWx PPR -> S6b RAR propagation Related: OS#6400 Change-Id: I064ee9e18809a507d0185f640b4a972ee5a2ce3f --- M epdg/EPDG_Tests.ttcn M library/DIAMETER_Templates.ttcn M library/DIAMETER_ts29_273_Templates.ttcn 3 files changed, 125 insertions(+), 6 deletions(-) Approvals: pespin: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/epdg/EPDG_Tests.ttcn b/epdg/EPDG_Tests.ttcn index 1742fd7..f963994 100644 --- a/epdg/EPDG_Tests.ttcn +++ b/epdg/EPDG_Tests.ttcn @@ -472,7 +472,8 @@ } /* Send PPR as HSS to AAA server, expect back PPA */ -private function f_DIA_SWx_PP(template (present) GenericAVP exp_result_tmpl := tr_AVP_ResultCode(DIAMETER_SUCCESS)) runs on EPDG_ConnHdlr { +private function f_DIA_SWx_PP(template (present) GenericAVP exp_result_tmpl := tr_AVP_ResultCode(DIAMETER_SUCCESS), + boolean exp_aaa_proc := true) 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); @@ -489,6 +490,24 @@ hbh_id := hbh_id, ete_id := ete_id)); + if (exp_aaa_proc) { + /* TODO: in successful case, we want to validate how this procedure extends to other interfaces: + * """ 3GPP TS 29.273 8.1.2.3.3: + * After a successful user profile download, the 3GPP AAA Server shall + * initiate re-authentication procedure as described + * in clause 7.2.2.4 if the subscriber has previously been authenticated + * and authorized to untrusted non-3GPP access. + * """ + */ + /* TS 29.273 9.1.2.5.1: + * "The Service Authorization Information Update procedure is performed in two steps": + * step 1: */ + as_DIA_S6b_RA_success(); + /* step 2 */ + /* Since PGW Address didn't change, expect no SAR+SAA triggered as a consequence to AAR+AAA. */ + f_S6b_AA_success(exp_swx_sa_proc := false); + } + alt { [] SWx.receive(tr_DIA_SWx_PPA(exp_result_tmpl, hbh_id := hbh_id, ete_id := ete_id)) -> value rx_dia {} [] SWx.receive(PDU_DIAMETER:?) -> value rx_dia { @@ -536,7 +555,7 @@ /* Send AAR as PGW to AAA server, expect back AAA */ -private function f_S6b_AA_success() runs on EPDG_ConnHdlr { +private function f_S6b_AA_success(boolean exp_swx_sa_proc := true) 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); @@ -555,8 +574,10 @@ pgw_addr, hbh_id := hbh_id, ete_id := ete_id)); - /* AAR in S6b in AAA-Server triggers Service-Assignment Request/Answer towards HSS: */ - as_DIA_SWx_SA_success(); + if (exp_swx_sa_proc) { + /* AAR in S6b in AAA-Server triggers Service-Assignment Request/Answer towards HSS: */ + as_DIA_SWx_SA_success(); + } alt { [] S6b.receive(tr_DIA_S6b_AAA) -> value rx_dia {} @@ -587,6 +608,25 @@ } } +/* Diameter S6b RAR + RAA, TS 29.273 9.1.2.5. */ +private altstep as_DIA_S6b_RA_success() runs on EPDG_ConnHdlr { + var PDU_DIAMETER rx_dia; + var template (omit) AVP avp; + var octetstring sess_id; + [] S6b.receive(tr_DIA_S6b_RAR(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); + S6b.send(ts_DIA_S6b_RAA(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 S6b msg rx: ", rx_dia)); + } +} + /* 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; @@ -602,7 +642,7 @@ setverdict(pass); } [] S6b.receive(PDU_DIAMETER:?) -> value rx_dia { - Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Unexpected Diameter msg rx: ", rx_dia)); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Unexpected Diameter S6b msg rx: ", rx_dia)); } } @@ -1188,7 +1228,8 @@ */ private function f_TC_hss_initiated_update_user_profile_unknown(charstring id) runs on EPDG_ConnHdlr { var DIAMETER_ts29_229_ExperimentalResultcode erc := DIAMETER_ERROR_USER_UNKNOWN; - f_DIA_SWx_PP(tr_AVP_ExperimentalResult(vendor_id_3GPP, int2oct(enum2int(erc), 4))); + f_DIA_SWx_PP(tr_AVP_ExperimentalResult(vendor_id_3GPP, int2oct(enum2int(erc), 4)), + exp_aaa_proc := false); } testcase TC_hss_initiated_update_user_profile_unknown() runs on MTC_CT { var EPDG_ConnHdlrPars pars := f_init_pars(); diff --git a/library/DIAMETER_Templates.ttcn b/library/DIAMETER_Templates.ttcn index 933c97b..7148513 100644 --- a/library/DIAMETER_Templates.ttcn +++ b/library/DIAMETER_Templates.ttcn @@ -1144,6 +1144,23 @@ } } +/* RFC6733 8.12. Re-Auth-Request-Type AVP */ +template (value) GenericAVP ts_AVP_ReAuthRequestType(BASE_NONE_Re_Auth_Request_Type reauth_req_type) := { + avp := { + avp_header := ts_DIA_Hdr(c_AVP_Code_BASE_NONE_Re_Auth_Request_Type, '00000000'B), + avp_data := { + avp_BASE_NONE_Re_Auth_Request_Type := reauth_req_type + } + } +} +template (present) GenericAVP tr_AVP_ReAuthRequestType(template (present) BASE_NONE_Re_Auth_Request_Type reauth_req_type) := { + avp := { + avp_header := tr_DIA_Hdr(c_AVP_Code_BASE_NONE_Re_Auth_Request_Type), + avp_data := { + avp_BASE_NONE_Re_Auth_Request_Type := reauth_req_type + } + } +} /* 5.3.1 Capabilities Exchange Request */ template (value) PDU_DIAMETER diff --git a/library/DIAMETER_ts29_273_Templates.ttcn b/library/DIAMETER_ts29_273_Templates.ttcn index dcb5a31..6ed00ff 100644 --- a/library/DIAMETER_ts29_273_Templates.ttcn +++ b/library/DIAMETER_ts29_273_Templates.ttcn @@ -623,4 +623,55 @@ ts_AVP_OriginRealm(orig_realm) }); +/* TS 29.273 9.2.2.6.1 Re-Auth-Request (RAR) + * TS 29.273 Table 9.1.2.5.1/1: S6b Re-authorization request */ +template (present) PDU_DIAMETER +tr_DIA_S6b_RAR(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 := Re_Auth, + 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_ReAuthRequestType(AUTHORIZE_ONLY), + tr_AVP_UserName(char2oct_tmpl_present(username_nai)) + /* Optional: RAR-Flags, */ + )); + +/* TS 29.273 9.2.2.6.2 Re-Auth-Answer (RAA) + * TS 29.273 Table 9.1.2.5.1/2: S6b Re-authorization response */ +template (value) PDU_DIAMETER +ts_DIA_S6b_RAA(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 := Re_Auth, + 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/+/36307?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: I064ee9e18809a507d0185f640b4a972ee5a2ce3f Gerrit-Change-Number: 36307 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-Reviewer: osmith <osmith(a)sysmocom.de> 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]: epdg: Introduce test TC_hss_initiated_update_user_profile(_unknown)

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36285?usp=email ) Change subject: epdg: Introduce test TC_hss_initiated_update_user_profile(_unknown) ...................................................................... epdg: Introduce test TC_hss_initiated_update_user_profile(_unknown) This test so far only validates the SWx interface during the procedure. It can be extended at a later time when implementing propagation of the procedure to other interfaces in osmo-epdg. Related: OS#6042 Change-Id: Ic7c19a3fe7b2b1411414fb6b78ab9a665a1aa42b --- M epdg/EPDG_Tests.ttcn M epdg/expected-results.xml M library/DIAMETER_ts29_273_Templates.ttcn 3 files changed, 147 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/epdg/EPDG_Tests.ttcn b/epdg/EPDG_Tests.ttcn index bc4219b..1742fd7 100644 --- a/epdg/EPDG_Tests.ttcn +++ b/epdg/EPDG_Tests.ttcn @@ -471,6 +471,32 @@ } } +/* Send PPR as HSS to AAA server, expect back PPA */ +private function f_DIA_SWx_PP(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 PPR, PPA contains no IMSI. Register ete_id in DIAMETER_Emulation, + * so PPA 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_PPR(g_pars.imsi, + IPv4, + g_pars.apn, + hbh_id := hbh_id, + ete_id := ete_id)); + + alt { + [] SWx.receive(tr_DIA_SWx_PPA(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 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), @@ -1138,6 +1164,41 @@ setverdict(pass); } +/* + * 3GPP TS 29.273 8.1.2.3 HSS Initiated Update of User Profile + * 3GPP TS 29.273 8.2.2.2 HSS Initiated Update of User Profile Procedure + */ +private function f_TC_hss_initiated_update_user_profile(charstring id) runs on EPDG_ConnHdlr { + f_initial_attach(); + /* Procedure should be performed properly: */ + f_DIA_SWx_PP(tr_AVP_ResultCode(DIAMETER_SUCCESS)); +} +testcase TC_hss_initiated_update_user_profile() 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_update_user_profile), pars); + vc_conn.done; + setverdict(pass); +} + +/* + * Same as TC_hss_initiated_update_user_profile_unknown, but without registering + * subscriber first, so expect DIAMETER_ERROR_USER_UNKNOWN in answer. + */ +private function f_TC_hss_initiated_update_user_profile_unknown(charstring id) runs on EPDG_ConnHdlr { + var DIAMETER_ts29_229_ExperimentalResultcode erc := DIAMETER_ERROR_USER_UNKNOWN; + f_DIA_SWx_PP(tr_AVP_ExperimentalResult(vendor_id_3GPP, int2oct(enum2int(erc), 4))); +} +testcase TC_hss_initiated_update_user_profile_unknown() 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_update_user_profile_unknown), 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); @@ -1236,6 +1297,8 @@ execute ( TC_s2b_CreateSession_rejected() ); execute ( TC_hss_initiated_deregister_new_server_assigned() ); execute ( TC_hss_initiated_deregister_permanent_termination() ); + execute ( TC_hss_initiated_update_user_profile() ); + execute ( TC_hss_initiated_update_user_profile_unknown() ); execute ( TC_concurrent_ues2() ); execute ( TC_concurrent_ues100() ); execute ( TC_upf_echo_req() ); diff --git a/epdg/expected-results.xml b/epdg/expected-results.xml index ccc69cb..83155cd 100644 --- a/epdg/expected-results.xml +++ b/epdg/expected-results.xml @@ -9,6 +9,8 @@ <testcase classname='EPDG_Tests' name='TC_s2b_CreateSession_rejected' time='MASKED'/> <testcase classname='EPDG_Tests' name='TC_hss_initiated_deregister_new_server_assigned' time='MASKED'/> <testcase classname='EPDG_Tests' name='TC_hss_initiated_deregister_permanent_termination' time='MASKED'/> + <testcase classname='EPDG_Tests' name='TC_hss_initiated_update_user_profile' time='MASKED'/> + <testcase classname='EPDG_Tests' name='TC_hss_initiated_update_user_profile_unknown' time='MASKED'/> <testcase classname='EPDG_Tests' name='TC_concurrent_ues2' time='MASKED'/> <testcase classname='EPDG_Tests' name='TC_concurrent_ues100' time='MASKED'/> <testcase classname='EPDG_Tests' name='TC_upf_echo_req' time='MASKED'/> diff --git a/library/DIAMETER_ts29_273_Templates.ttcn b/library/DIAMETER_ts29_273_Templates.ttcn index e1a0700..dcb5a31 100644 --- a/library/DIAMETER_ts29_273_Templates.ttcn +++ b/library/DIAMETER_ts29_273_Templates.ttcn @@ -205,6 +205,74 @@ ts_AVP_UserNameImsi(valueof(imsi)) }); +/* Push-Profile-Request, + * 3GPP TS 29.273 8.1.2.3 HSS Initiated Update of User Profile + * 3GPP TS 29.273 8.2.2.2 HSS Initiated Update of User Profile Procedure + */ +template (value) PDU_DIAMETER +ts_DIA_SWx_PPR(template (value) hexstring imsi, + template (value) AAA_3GPP_PDN_Type pdn_type, + template (value) charstring apn, + 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 := Push_Profile, + 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_3GPP_Non_3GPP_User_Data(pdn_type, apn) + /* Optional: PPR-Flags */ + /* TODO: + * *[ Supported-Features ] + */ + }); + +/* Push-Profile-Answer, + * 3GPP TS 29.273 8.1.2.3 HSS Initiated Update of User Profile + * 3GPP TS 29.273 8.2.2.2 HSS Initiated Update of User Profile Procedure + */ +template (present) PDU_DIAMETER +tr_DIA_SWx_PPA(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 := Push_Profile, + 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) + /* Optional: + * [ Access-Network-Info ] + * [ Local-Time-Zone ] + * *[ Supported-Features ] + */ + )); + /* Server-Assignment-Request, * 3GPP TS 29.273 8.1.2.2.2 UE/PDN Registration/DeRegistration Notification * 3GPP TS 29.273 8.2.2.3 Non-3GPP IP Access Registration Procedure */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36285?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: Ic7c19a3fe7b2b1411414fb6b78ab9a665a1aa42b Gerrit-Change-Number: 36285 Gerrit-PatchSet: 2 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: osmith <osmith(a)sysmocom.de> 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]: epdg: TC_hss_initiated_update_user_profile: test SWx PPR -> S6b RAR p...

by pespin

Attention is currently required from: fixeria, laforge, lynxis lazus. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36307?usp=email ) Change subject: epdg: TC_hss_initiated_update_user_profile: test SWx PPR -> S6b RAR propagation ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36307?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: I064ee9e18809a507d0185f640b4a972ee5a2ce3f Gerrit-Change-Number: 36307 Gerrit-PatchSet: 3 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: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Mon, 18 Mar 2024 17:29:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: epdg: Introduce test TC_hss_initiated_update_user_profile(_unknown)

by pespin

Attention is currently required from: fixeria, laforge, lynxis lazus. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36285?usp=email ) Change subject: epdg: Introduce test TC_hss_initiated_update_user_profile(_unknown) ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36285?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: Ic7c19a3fe7b2b1411414fb6b78ab9a665a1aa42b Gerrit-Change-Number: 36285 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: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Mon, 18 Mar 2024 17:29:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

2025

2024

2023

2022

gerrit-log March 2024