Change in osmo-ttcn3-hacks[master]: lib/DIAMETER: Allow send CEA with AuthAppInd

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27424 ) Change subject: lib/DIAMETER: Allow send CEA with AuthAppInd ...................................................................... lib/DIAMETER: Allow send CEA with AuthAppInd The new message is to be used by Gy interface emulation, which according to RFC4006 uses AppInd 4 "Credit Control Application". The application is apparently not 3GPP vendor specific. Change-Id: I0e33673d65140aad34d2efcae3c7f49154ceb99f --- M ggsn_tests/GGSN_Tests.ttcn M library/DIAMETER_Emulation.ttcn M library/DIAMETER_Templates.ttcn 3 files changed, 41 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/24/27424/1 diff --git a/ggsn_tests/GGSN_Tests.ttcn b/ggsn_tests/GGSN_Tests.ttcn index 02b5aa4..6329400 100644 --- a/ggsn_tests/GGSN_Tests.ttcn +++ b/ggsn_tests/GGSN_Tests.ttcn @@ -217,6 +217,7 @@ local_sctp_port := PCRF_PORT, origin_host := "pcrf.localdomain", origin_realm := "localdomain", + auth_app_id := omit, vendor_app_id := c_DIAMETER_3GPP_Gx_AID }; vc_Gx := DIAMETER_Emulation_CT.create(id); @@ -233,7 +234,8 @@ local_sctp_port := OCS_PORT, origin_host := "ocs.localdomain", origin_realm := "localdomain", - vendor_app_id := c_DIAMETER_CREDIT_CONTROL_AID + auth_app_id := c_DIAMETER_CREDIT_CONTROL_AID, + vendor_app_id := omit }; vc_Gy := DIAMETER_Emulation_CT.create(id); map(vc_Gy:DIAMETER, system:DIAMETER_CODEC_PT); diff --git a/library/DIAMETER_Emulation.ttcn b/library/DIAMETER_Emulation.ttcn index e35a87a..73fc87c 100644 --- a/library/DIAMETER_Emulation.ttcn +++ b/library/DIAMETER_Emulation.ttcn @@ -111,7 +111,8 @@ PortNumber local_sctp_port, charstring origin_host, charstring origin_realm, - uint32_t vendor_app_id + uint32_t auth_app_id optional, + uint32_t vendor_app_id optional } function tr_DIAMETER_RecvFrom_R(template PDU_DIAMETER msg) @@ -329,8 +330,8 @@ /* handle CER/CEA handshake */ [] DIAMETER.receive(tr_DIAMETER_RecvFrom_R(tr_DIAMETER_R(cmd_code := Capabilities_Exchange))) -> value mrf { var template (value) PDU_DIAMETER resp; - resp := ts_DIA_CEA(mrf.msg.hop_by_hop_id, mrf.msg.end_to_end_id, p.origin_host, - p.origin_realm, f_inet_addr(p.local_ip), p.vendor_app_id); + resp := f_ts_DIA_CEA(mrf.msg.hop_by_hop_id, mrf.msg.end_to_end_id, p.origin_host, + p.origin_realm, f_inet_addr(p.local_ip), p.auth_app_id, p.vendor_app_id); DIAMETER.send(t_DIAMETER_Send(g_diameter_conn_id, resp)); /* notify our user that the CER->CEA exchange has happened */ DIAMETER_UNIT.send(DiameterCapabilityExchgInd:{rx:=mrf.msg, tx:=valueof(resp)}); diff --git a/library/DIAMETER_Templates.ttcn b/library/DIAMETER_Templates.ttcn index e2067f6..37bf401 100644 --- a/library/DIAMETER_Templates.ttcn +++ b/library/DIAMETER_Templates.ttcn @@ -866,7 +866,27 @@ /* 5.3.2 Capabilities Exchange Answer */ template (value) PDU_DIAMETER -ts_DIA_CEA(template (value) UINT32 hbh_id, template (value) UINT32 ete_id, +ts_DIA_CEA_AUTH_APP_ID(template (value) UINT32 hbh_id, template (value) UINT32 ete_id, + template (value) charstring origin_host, template (value) charstring origin_realm, + template (value) octetstring host_ip, uint32_t auth_app_id) +:= ts_DIAMETER(flags:='00000000'B, cmd_code:=Capabilities_Exchange, hbh_id:=hbh_id, ete_id:=ete_id, + avps := { + ts_AVP_ResultCode(DIAMETER_SUCCESS), + ts_AVP_OriginHost(origin_host), + ts_AVP_OriginRealm(origin_realm), + ts_AVP_HostIpAddr(host_ip), + ts_AVP_VendorId(vendor_id_3GPP), + ts_AVP_ProductName("TTCN-3 Testsuite"), + ts_AVP_OriginStateId('00000001'O), + ts_AVP_SuppVendorIdRaw(5535), /* 3GPP2 */ + ts_AVP_SuppVendorId(vendor_id_3GPP), + ts_AVP_SuppVendorIdRaw(13019), /* ETSI */ + ts_AVP_AuthAppId('FFFFFFFF'O), + ts_AVP_AuthAppId(int2oct(auth_app_id, 4)), + ts_AVP_InbSecId('00000000'O) + }); +template (value) PDU_DIAMETER +ts_DIA_CEA_VENDOR_APP_ID(template (value) UINT32 hbh_id, template (value) UINT32 ete_id, template (value) charstring origin_host, template (value) charstring origin_realm, template (value) octetstring host_ip, uint32_t vendor_app_id) := ts_DIAMETER(flags:='00000000'B, cmd_code:=Capabilities_Exchange, hbh_id:=hbh_id, ete_id:=ete_id, @@ -885,6 +905,19 @@ ts_AVP_InbSecId('00000000'O), ts_AVP_VendorSpecAppId(vendor_id_3GPP, vendor_app_id) }); +function f_ts_DIA_CEA(template (value) UINT32 hbh_id, template (value) UINT32 ete_id, + template (value) charstring origin_host, template (value) charstring origin_realm, + template (value) octetstring host_ip, template (omit) uint32_t auth_app_id, template (omit) uint32_t vendor_app_id) + return template (value) PDU_DIAMETER +{ + var template (value) PDU_DIAMETER diam_pdu; + if (istemplatekind(vendor_app_id, "omit")) { + diam_pdu := ts_DIA_CEA_AUTH_APP_ID(hbh_id, ete_id, origin_host, origin_realm, host_ip, valueof(auth_app_id)); + } else { + diam_pdu := ts_DIA_CEA_VENDOR_APP_ID(hbh_id, ete_id, origin_host, origin_realm, host_ip, valueof(vendor_app_id)); + } + return diam_pdu; +} template (value) PDU_DIAMETER -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27424 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: I0e33673d65140aad34d2efcae3c7f49154ceb99f Gerrit-Change-Number: 27424 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange