pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36166?usp=email ) Change subject: epdg: Add missing Non-3GPP-User-Data AVP to tx Swx SAA ...................................................................... epdg: Add missing Non-3GPP-User-Data AVP to tx Swx SAA Change-Id: I05bbf076464f9110ee68c46e309d150207f8bfcd --- M epdg/EPDG_Tests.ttcn M epdg/gen_links.sh M library/DIAMETER_ts29_273_Templates.ttcn 3 files changed, 60 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/66/36166/1 diff --git a/epdg/EPDG_Tests.ttcn b/epdg/EPDG_Tests.ttcn index fb9f98b..30bb6f1 100644 --- a/epdg/EPDG_Tests.ttcn +++ b/epdg/EPDG_Tests.ttcn @@ -417,6 +417,8 @@ sess_id := valueof(avp.avp_data.avp_BASE_NONE_Session_Id); /* Send SAA to translator; expect it to show up on GSUP side */ SWx.send(ts_DIA_SWx_SAA(g_pars.imsi, + IPv4, + g_pars.apn, sess_id := sess_id, hbh_id := rx_dia.hop_by_hop_id, ete_id := rx_dia.end_to_end_id)); diff --git a/epdg/gen_links.sh b/epdg/gen_links.sh index 7a4e60d..ec8b9da 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_rfc5447_Templates.ttcn DIAMETER_ts29_273_Templates.ttcn " +FILES+="DIAMETER_Templates.ttcn DIAMETER_rfc5447_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_ts29_273_Templates.ttcn b/library/DIAMETER_ts29_273_Templates.ttcn index 87d1601..e116cfd 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_272_Templates all; import from Osmocom_Types all; import from Misc_Helpers all; @@ -34,6 +35,49 @@ * SWx 3GPP TS 29.273 section 8 *******************************/ +/* TS 29.273 8.2.3.1 Non-3GPP-User-Data */ +template (value) GenericAVP ts_AVP_3GPP_Non_3GPP_User_Data(template (value) AAA_3GPP_PDN_Type pdn_type, + template (value) charstring apn, + template (value) uint32_t ambr_max_req_ul := 1000000000, + template (value) uint32_t ambr_max_req_dl := 1000000000) := { + avp := { + avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_AAA_3GPP_Non_3GPP_User_Data), + avp_data := { + avp_AAA_3GPP_Non_3GPP_User_Data := { + ts_AVP_3GPP_Non_3GPP_IP_Access(NON_3GPP_SUBSCRIPTION_ALLOWED), + ts_AVP_3GPP_Non_3GPP_IP_Access_APN(NON_3GPP_APNS_ENABLE), + ts_AVP_3GPP_AMBR(ambr_max_req_ul, ambr_max_req_dl), + ts_AVP_3GPP_ContextId(1), + ts_AVP_3GPP_ApnConfig(1, pdn_type, apn) + } + } + } +} + +/* TS 29.273 8.2.3.3 Non-3GPP-IP-Access */ +template (value) GenericAVP ts_AVP_3GPP_Non_3GPP_IP_Access(template (value) AAA_3GPP_Non_3GPP_IP_Access val := NON_3GPP_SUBSCRIPTION_ALLOWED) := { + avp := { + avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_AAA_3GPP_Non_3GPP_IP_Access), + avp_data := { + avp_AAA_3GPP_Non_3GPP_IP_Access := val + } + } +} + + +/* TS 29.273 8.2.3.4 Non-3GPP-IP-Access-APN */ +template (value) GenericAVP ts_AVP_3GPP_Non_3GPP_IP_Access_APN(template (value) AAA_3GPP_Non_3GPP_IP_Access_APN val := NON_3GPP_APNS_ENABLE) := { + avp := { + avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_AAA_3GPP_Non_3GPP_IP_Access_APN), + avp_data := { + avp_AAA_3GPP_Non_3GPP_IP_Access_APN := val + } + } +} + +/* TS 29.273 8.2.3.7 APN-Configuration: The APN-Configuration AVP is of type Grouped AVP and is defined in 3GPP TS 29.272 */ +/* TS 29.273 5.2.3.8 AMBR: Please refer to 3GPP TS 29.272 [29] for the encoding of this AVP. */ + /* SIP-Auth-Data-Item , 3GPP TS 29.273 8.2.3.9 */ template (present) GenericAVP tr_AVP_3GPP_SIPAuthDataItem(template (present) uint32_t num := ?) := { avp := { @@ -170,6 +214,8 @@ * 3GPP TS 29.273 8.2.2.3 Non-3GPP IP Access Registration Procedure */ template (value) PDU_DIAMETER ts_DIA_SWx_SAA(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", @@ -188,9 +234,9 @@ ts_AVP_AuthSessionState(NO_STATE_MAINTAINED), ts_AVP_OriginHost(orig_host), ts_AVP_OriginRealm(orig_realm), - ts_AVP_UserNameImsi(valueof(imsi)) + ts_AVP_UserNameImsi(valueof(imsi)), + ts_AVP_3GPP_Non_3GPP_User_Data(pdn_type, apn) /* TODO: - * [ Non-3GPP-User-Data ] * [ 3GPP-AAA-Server-Name ] * [ OC-Supported-Features ] * [ OC-OLR ] ] -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36166?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: I05bbf076464f9110ee68c46e309d150207f8bfcd Gerrit-Change-Number: 36166 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange