- gerrit-log - lists.osmocom.org

Change in osmo-ttcn3-hacks[master]: pgw: Improve checks around Gy messages
by laforge 20 May '22

20 May '22

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28157 ) Change subject: pgw: Improve checks around Gy messages ...................................................................... pgw: Improve checks around Gy messages Change-Id: Ica3ca4cf72113d66e74dcff9f838e39cc5d63468 --- M pgw/PGW_Tests.ttcn M pgw/gen_links.sh M pgw/regen_makefile.sh 3 files changed, 179 insertions(+), 12 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/pgw/PGW_Tests.ttcn b/pgw/PGW_Tests.ttcn index 44bf6f9..6df4ca7 100644 --- a/pgw/PGW_Tests.ttcn +++ b/pgw/PGW_Tests.ttcn @@ -1,5 +1,7 @@ module PGW_Tests { +import from TCCEncoding_Functions all; + import from General_Types all; import from Osmocom_Types all; import from Native_Functions all; @@ -33,6 +35,8 @@ charstring mp_ocs_local_ip := "127.0.0.9"; integer mp_ocs_local_port := 3869; + + charstring mp_diam_realm := "localdomain"; } /* main component, we typically have one per testcase */ @@ -112,7 +116,7 @@ /* configuration data for a given Session */ type record SessionPars { hexstring imsi, - octetstring msisdn optional, + hexstring msisdn optional, // serving network integer rat_type, // flags? @@ -138,7 +142,7 @@ t_SessionPars(hexstring imsi, charstring tundev, integer rat_type := 6, charstring apn := "internet", boolean selection_mode := false, BIT3 pdn_type := '001'B) := { imsi := imsi, - msisdn := omit, + msisdn := '1234'H, rat_type := rat_type, apn := apn, selection_mode := selection_mode, @@ -176,8 +180,8 @@ remote_sctp_port := -1, local_ip := mp_pcrf_local_ip, local_sctp_port := mp_pcrf_local_port, - origin_host := "pcrf.localdomain", - origin_realm := "localdomain", + origin_host := "pcrf." & mp_diam_realm, + origin_realm := mp_diam_realm, auth_app_id := omit, vendor_app_id := c_DIAMETER_3GPP_Gx_AID }; @@ -193,8 +197,8 @@ remote_sctp_port := -1, local_ip := mp_ocs_local_ip, local_sctp_port := mp_ocs_local_port, - origin_host := "ocs.localdomain", - origin_realm := "localdomain", + origin_host := "ocs." & mp_diam_realm, + origin_realm := mp_diam_realm, auth_app_id := c_DIAMETER_CREDIT_CONTROL_AID, vendor_app_id := omit }; @@ -296,10 +300,6 @@ return f_concat_pad(15, '26242'H, suffix); } -function f_gen_msisdn(integer suffix) return hexstring { - return f_concat_pad(12, '49123'H, suffix); -} - private altstep as_DIA_Gx_CCR(DCC_NONE_CC_Request_Type req_type) runs on PGW_Session_CT { var PDU_DIAMETER rx_dia; [] Gx.receive(tr_DIA_Gx_CCR(req_type := req_type)) -> value rx_dia { @@ -322,9 +322,174 @@ } } +function f_tr_DIA_Gy_CCR(DCC_NONE_CC_Request_Type req_type) +runs on PGW_Session_CT return template (present) PDU_DIAMETER +{ + var template (present) PDU_DIAMETER tpl; + var charstring smf_origin_host := "smf." & mp_diam_realm; + var template (present) octetstring imsi := ?; + var template (present) octetstring msisdn := ?; + var template (present) octetstring rat_type := ?; + var template (present) OCT4 charging_char := ?; + var template (present) OCT1 nsapi := ?; + imsi := char2oct(f_dec_TBCD(imsi_hex2oct(g_pars.imsi))); + //msisdn := char2oct(f_dec_TBCD(substr(ctx_val.msisdn, 1, lengthof(ctx_val.msisdn) -1))); + rat_type := int2oct(g_pars.rat_type, 1); + charging_char := char2oct(oct2str('0000'O)); // f_create_session() uses hardcoded chg_car := '0000'O + nsapi := '01'O; // f_create_session() uses hardcoded bearer_id := 1 + select (req_type) { + case (INITIAL_REQUEST) { + tpl := tr_DIAMETER(flags:='11000000'B, cmd_code:=Credit_Control, + avps := superset( + tr_AVP_SessionId, + tr_AVP_OriginHost(smf_origin_host), + tr_AVP_OriginRealm(mp_diam_realm), + tr_AVP_DestinationRealm(mp_diam_realm), + tr_AVP_AuthAppId(int2oct(c_DIAMETER_CREDIT_CONTROL_AID, 4)), + tr_AVP_ServiceContextId, + tr_AVP_CcReqType(req_type), + tr_AVP_CcReqNum(?), + tr_AVP_EventTimestamp(?), + tr_AVP_SubcrId({tr_AVP_SubcrIdType(END_USER_IMSI), tr_AVP_SubcrIdData(imsi)}), + tr_AVP_SubcrId({tr_AVP_SubcrIdType(END_USER_E164), tr_AVP_SubcrIdData(msisdn)}), + tr_AVP_RequestedAction(DIRECT_DEBITING), + tr_AVP_3GPP_AoCRequestType, + tr_AVP_MultipleServicesIndicator, + tr_AVP_Multiple_Services_Credit_Control(content := superset( + tr_AVP_Requested_Service_Unit, + tr_AVP_Used_Service_Unit, + tr_AVP_3GPP_QoS_Information, + tr_AVP_GI_3GPP_RatType(rat_type) + )), + tr_AVP_3GPP_ServiceInformation(content := superset( + tr_AVP_3GPP_PSInformation(content := superset( + tr_AVP_3GPP_ChargingId, + tr_AVP_3GPP_PDPType((IPv4,IPv6,IPv4v6)), + tr_AVP_3GPP_PDPAddress(tr_AVP_Address((IP,IP6), ?)), + tr_AVP_3GPP_SGSNAddress(tr_AVP_Address(IP, f_inet_addr(mp_pcrf_local_ip))), + tr_AVP_3GPP_GGSNAddress(tr_AVP_Address(IP, f_inet_addr(mp_pgw_hostname))), + tr_AVP_3GPP_CalledStationId, + tr_AVP_3GPP_SelectionMode, + tr_AVP_3GPP_ChargingCharacteristics(charging_char), + tr_AVP_3GPP_SGSNMCCMNC, + tr_AVP_3GPP_NSAPI(nsapi), + /*We don't yet send MS_Tz in CreateSessionReq: + tr_AVP_3GPP_MS_TimeZone,*/ + tr_AVP_3GPP_ULI/*, + We don't yet send IMEI in CreateSessionReq: + tr_AVP_UserEquipmentInfo({ + tr_AVP_UserEquipmentInfoType(IMEISV), + tr_AVP_UserEquipmentInfoValue(imeisv) + })*/ + )) + )) + )); + } + case (UPDATE_REQUEST) { + tpl := tr_DIAMETER(flags:='11000000'B, cmd_code:=Credit_Control, + avps := superset( + tr_AVP_SessionId, + tr_AVP_OriginHost(smf_origin_host), + tr_AVP_OriginRealm(mp_diam_realm), + tr_AVP_DestinationRealm(mp_diam_realm), + tr_AVP_AuthAppId(int2oct(c_DIAMETER_CREDIT_CONTROL_AID, 4)), + tr_AVP_ServiceContextId, + tr_AVP_CcReqType(req_type), + tr_AVP_CcReqNum(?), + tr_AVP_DestinationHost(?), + tr_AVP_EventTimestamp(?), + tr_AVP_SubcrId({tr_AVP_SubcrIdType(END_USER_IMSI), tr_AVP_SubcrIdData(imsi)}), + tr_AVP_SubcrId({tr_AVP_SubcrIdType(END_USER_E164), tr_AVP_SubcrIdData(msisdn)}), + tr_AVP_RequestedAction(DIRECT_DEBITING), + tr_AVP_3GPP_AoCRequestType, + tr_AVP_MultipleServicesIndicator, + tr_AVP_Multiple_Services_Credit_Control(content := superset( + tr_AVP_Requested_Service_Unit, + tr_AVP_Used_Service_Unit, + tr_AVP_3GPP_Reporting_Reason, + tr_AVP_3GPP_QoS_Information, + tr_AVP_GI_3GPP_RatType(rat_type) + )), + tr_AVP_3GPP_ServiceInformation(content := superset( + tr_AVP_3GPP_PSInformation(content := superset( + tr_AVP_3GPP_ChargingId, + /* tr_AVP_3GPP_PDPType, Only in INIT */ + tr_AVP_3GPP_PDPAddress(tr_AVP_Address((IP,IP6), ?)), + tr_AVP_3GPP_SGSNAddress(tr_AVP_Address(IP, f_inet_addr(mp_pcrf_local_ip))), + tr_AVP_3GPP_GGSNAddress(tr_AVP_Address(IP, f_inet_addr(mp_pgw_hostname))), + tr_AVP_3GPP_CalledStationId, + tr_AVP_3GPP_SelectionMode, + tr_AVP_3GPP_ChargingCharacteristics(charging_char), + tr_AVP_3GPP_SGSNMCCMNC, + tr_AVP_3GPP_NSAPI(nsapi), + /*We don't yet send MS_Tz in CreateSessionReq: + tr_AVP_3GPP_MS_TimeZone,*/ + tr_AVP_3GPP_ULI/*, + We don't yet send IMEI in CreateSessionReq: + tr_AVP_UserEquipmentInfo({ + tr_AVP_UserEquipmentInfoType(IMEISV), + tr_AVP_UserEquipmentInfoValue(imeisv) + })*/ + )) + )) + )); + } + case (TERMINATION_REQUEST) { + tpl := tr_DIAMETER(flags:='11000000'B, cmd_code:=Credit_Control, + avps := superset( + tr_AVP_SessionId, + tr_AVP_OriginHost(smf_origin_host), + tr_AVP_OriginRealm(mp_diam_realm), + tr_AVP_DestinationRealm(mp_diam_realm), + tr_AVP_AuthAppId(int2oct(c_DIAMETER_CREDIT_CONTROL_AID, 4)), + tr_AVP_ServiceContextId, + tr_AVP_CcReqType(req_type), + tr_AVP_CcReqNum(?), + tr_AVP_DestinationHost(?), + tr_AVP_EventTimestamp(?), + tr_AVP_SubcrId({tr_AVP_SubcrIdType(END_USER_IMSI), tr_AVP_SubcrIdData(imsi)}), + tr_AVP_SubcrId({tr_AVP_SubcrIdType(END_USER_E164), tr_AVP_SubcrIdData(msisdn)}), + tr_AVP_TerminationCause(?), + tr_AVP_RequestedAction(DIRECT_DEBITING), + tr_AVP_3GPP_AoCRequestType, + tr_AVP_MultipleServicesIndicator, + tr_AVP_Multiple_Services_Credit_Control(content := superset( + /* tr_AVP_Requested_Service_Unit, Only in INIT and UPDATE */ + tr_AVP_Used_Service_Unit, + tr_AVP_3GPP_QoS_Information, + tr_AVP_GI_3GPP_RatType(rat_type) + )), + tr_AVP_3GPP_ServiceInformation(content := superset( + tr_AVP_3GPP_PSInformation(content := superset( + tr_AVP_3GPP_ChargingId, + /* tr_AVP_3GPP_PDPType, Only in INIT */ + tr_AVP_3GPP_PDPAddress(tr_AVP_Address((IP,IP6), ?)), + tr_AVP_3GPP_SGSNAddress(tr_AVP_Address(IP, f_inet_addr(mp_pcrf_local_ip))), + tr_AVP_3GPP_GGSNAddress(tr_AVP_Address(IP, f_inet_addr(mp_pgw_hostname))), + tr_AVP_3GPP_CalledStationId, + tr_AVP_3GPP_SelectionMode, + tr_AVP_3GPP_ChargingCharacteristics(charging_char), + tr_AVP_3GPP_SGSNMCCMNC, + tr_AVP_3GPP_NSAPI(nsapi), + /*We don't yet send MS_Tz in CreateSessionReq: + tr_AVP_3GPP_MS_TimeZone,*/ + tr_AVP_3GPP_ULI/*, + We don't yet send IMEI in CreateSessionReq: + tr_AVP_UserEquipmentInfo({ + tr_AVP_UserEquipmentInfoType(IMEISV), + tr_AVP_UserEquipmentInfoValue(imeisv) + })*/ + )) + )) + )); + } + } + return tpl; +} + private altstep as_DIA_Gy_CCR(DCC_NONE_CC_Request_Type req_type) runs on PGW_Session_CT { var PDU_DIAMETER rx_dia; - [] Gy.receive(tr_DIA_Gy_CCR(req_type := req_type)) -> value rx_dia { + [] Gy.receive(f_tr_DIA_Gy_CCR(req_type := req_type)) -> value rx_dia { var template (value) PDU_DIAMETER tx_dia; var template (omit) AVP avp; var octetstring sess_id; @@ -421,7 +586,7 @@ fteid_u_ie := ts_GTP2C_FTEID(FTEID_IF_S5S8_SGW_GTPU, g_teid, 2, f_inet_addr(mp_local_hostname_u), omit); var template (value) PDU_GTPCv2 g2c := - ts_GTP2C_CreateSessionReq(imsi := g_pars.imsi, msisdn := oct2hex('1234567890'O), rat_type := 6, + ts_GTP2C_CreateSessionReq(imsi := g_pars.imsi, msisdn := g_pars.msisdn, rat_type := 6, sender_fteid := fteid_c_ie, apn := f_enc_dns_hostname(g_pars.apn), pdn_type := g_pars.pdn_type, teid_list := { fteid_u_ie }, diff --git a/pgw/gen_links.sh b/pgw/gen_links.sh index b061fea..c8333c7 100755 --- a/pgw/gen_links.sh +++ b/pgw/gen_links.sh @@ -6,6 +6,7 @@ DIR=$BASEDIR/titan.Libraries.TCCUsefulFunctions/src FILES="TCCInterface_Functions.ttcn TCCConversion_Functions.ttcn TCCConversion.cc TCCInterface.cc TCCInterface_ip.h" +FILES+=" TCCEncoding_Functions.ttcn TCCEncoding.cc " # BCD coding gen_links $DIR $FILES DIR=$BASEDIR/titan.TestPorts.Common_Components.Socket-API/src diff --git a/pgw/regen_makefile.sh b/pgw/regen_makefile.sh index ce59dfb..5edcaef 100755 --- a/pgw/regen_makefile.sh +++ b/pgw/regen_makefile.sh @@ -19,6 +19,7 @@ Native_FunctionDefs.cc TCCConversion.cc TCCInterface.cc + TCCEncoding.cc UDP_EncDec.cc UECUPS_CodecPort_CtrlFunctDef.cc " -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28157 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: Ica3ca4cf72113d66e74dcff9f838e39cc5d63468 Gerrit-Change-Number: 28157 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

1 0

Change in osmo-ttcn3-hacks[master]: ggsn: Improve checks around Gy messages
by laforge 20 May '22

20 May '22

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28156 ) Change subject: ggsn: Improve checks around Gy messages ...................................................................... ggsn: Improve checks around Gy messages Change-Id: I702796f2f941b78da904faa2ffdba4185333bc0d --- M ggsn_tests/GGSN_Tests.ttcn M library/DIAMETER_Templates.ttcn 2 files changed, 478 insertions(+), 23 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/ggsn_tests/GGSN_Tests.ttcn b/ggsn_tests/GGSN_Tests.ttcn index 965dcbe..ae2a9bf 100644 --- a/ggsn_tests/GGSN_Tests.ttcn +++ b/ggsn_tests/GGSN_Tests.ttcn @@ -130,9 +130,11 @@ var integer g_use_echo_intval := 0; /* 0 = disabled */ /* emulated PCRF, used with m_ggsn_impl = GGSN_IMPL_OPEN5GS */ + var DIAMETER_conn_parameters g_gx_pars; var DIAMETER_Emulation_CT vc_Gx; port DIAMETER_PT Gx_UNIT; port DIAMETEREM_PROC_PT Gx_PROC; + var DIAMETER_conn_parameters g_gy_pars; var DIAMETER_Emulation_CT vc_Gy; port DIAMETER_PT Gy_UNIT; port DIAMETEREM_PROC_PT Gy_PROC; @@ -212,10 +214,9 @@ unitdata_cb := refers(DiameterForwardUnitdataCallback), raw := true /* handler mode (single component for all IMSI)) */ }; - var DIAMETER_conn_parameters pars; /* Gx setup: */ - pars := { + g_gx_pars := { remote_ip := m_ggsn_ip_gtpc, remote_sctp_port := -1, local_ip := m_bind_ip_gtpc, @@ -229,10 +230,10 @@ map(vc_Gx:DIAMETER, system:DIAMETER_CODEC_PT); connect(vc_Gx:DIAMETER_UNIT, self:Gx_UNIT); connect(vc_Gx:DIAMETER_PROC, self:Gx_PROC); - vc_Gx.start(DIAMETER_Emulation.main(ops, pars, id)); + vc_Gx.start(DIAMETER_Emulation.main(ops, g_gx_pars, id)); /* Gy setup: */ - pars := { + g_gy_pars := { remote_ip := m_ggsn_ip_gtpc, remote_sctp_port := -1, local_ip := m_bind_ip_gtpc, @@ -246,7 +247,7 @@ map(vc_Gy:DIAMETER, system:DIAMETER_CODEC_PT); connect(vc_Gy:DIAMETER_UNIT, self:Gy_UNIT); connect(vc_Gy:DIAMETER_PROC, self:Gy_PROC); - vc_Gy.start(DIAMETER_Emulation.main(ops, pars, id)); + vc_Gy.start(DIAMETER_Emulation.main(ops, g_gy_pars, id)); f_diameter_wait_capability(Gx_UNIT); f_diameter_wait_capability(Gy_UNIT); @@ -485,9 +486,173 @@ } } - private altstep as_DIA_Gy_CCR(DCC_NONE_CC_Request_Type req_type) runs on GT_CT { + private function f_tr_DIA_Gy_CCR(template (omit) PdpContext ctx, DCC_NONE_CC_Request_Type req_type) + runs on GT_CT return template (present) PDU_DIAMETER + { + var template (present) PDU_DIAMETER tpl; + var charstring smf_origin_host := "smf.localdomain"; + var template (present) octetstring imsi := ?; + var template (present) octetstring msisdn := ?; + var template (present) octetstring imeisv := ?; + var template (present) octetstring rat_type := ?; + var template (present) OCT4 charging_char := ?; + var template (present) OCT1 nsapi := ?; + if (not istemplatekind(ctx, "omit")) { + var PdpContext ctx_val := valueof(ctx); + imsi := char2oct(f_dec_TBCD(imsi_hex2oct(ctx_val.imsi))); + msisdn := char2oct(f_dec_TBCD(substr(ctx_val.msisdn, 1, lengthof(ctx_val.msisdn) -1))); + imeisv := char2oct(f_dec_TBCD(ctx_val.imeisv)); + rat_type := ctx_val.ratType; + charging_char := char2oct(oct2str(ctx_val.charging_char)); + nsapi := char2oct(hex2str(bit2hex(ctx_val.nsapi))); + } + select (req_type) { + case (INITIAL_REQUEST) { + tpl := tr_DIAMETER(flags:='11000000'B, cmd_code:=Credit_Control, + avps := superset( + tr_AVP_SessionId, + tr_AVP_OriginHost(smf_origin_host), + tr_AVP_OriginRealm(g_gy_pars.origin_realm), + tr_AVP_DestinationRealm(g_gy_pars.origin_realm), + tr_AVP_AuthAppId(int2oct(c_DIAMETER_CREDIT_CONTROL_AID, 4)), + tr_AVP_ServiceContextId, + tr_AVP_CcReqType(req_type), + tr_AVP_CcReqNum(?), + tr_AVP_EventTimestamp(?), + tr_AVP_SubcrId({tr_AVP_SubcrIdType(END_USER_IMSI), tr_AVP_SubcrIdData(imsi)}), + tr_AVP_SubcrId({tr_AVP_SubcrIdType(END_USER_E164), tr_AVP_SubcrIdData(msisdn)}), + tr_AVP_RequestedAction(DIRECT_DEBITING), + tr_AVP_3GPP_AoCRequestType, + tr_AVP_MultipleServicesIndicator, + tr_AVP_Multiple_Services_Credit_Control(content := superset( + tr_AVP_Requested_Service_Unit, + tr_AVP_Used_Service_Unit, + tr_AVP_3GPP_QoS_Information, + tr_AVP_GI_3GPP_RatType(rat_type) + )), + tr_AVP_3GPP_ServiceInformation(content := superset( + tr_AVP_3GPP_PSInformation(content := superset( + tr_AVP_3GPP_ChargingId, + tr_AVP_3GPP_PDPType((IPv4,IPv6,IPv4v6)), + tr_AVP_3GPP_PDPAddress(tr_AVP_Address((IP,IP6), ?)), + tr_AVP_3GPP_SGSNAddress(tr_AVP_Address(IP, f_inet_addr(m_bind_ip_gtpc))), + tr_AVP_3GPP_GGSNAddress(tr_AVP_Address(IP, f_inet_addr(m_ggsn_ip_gtpc))), + tr_AVP_3GPP_CalledStationId, + tr_AVP_3GPP_SelectionMode, + tr_AVP_3GPP_ChargingCharacteristics(charging_char), + tr_AVP_3GPP_SGSNMCCMNC, + tr_AVP_3GPP_NSAPI(nsapi), + tr_AVP_3GPP_MS_TimeZone, + tr_AVP_3GPP_ULI, + tr_AVP_UserEquipmentInfo({ + tr_AVP_UserEquipmentInfoType(IMEISV), + tr_AVP_UserEquipmentInfoValue(imeisv) + }) + )) + )) + )); + } + case (UPDATE_REQUEST) { + tpl := tr_DIAMETER(flags:='11000000'B, cmd_code:=Credit_Control, + avps := superset( + tr_AVP_SessionId, + tr_AVP_OriginHost(smf_origin_host), + tr_AVP_OriginRealm(g_gy_pars.origin_realm), + tr_AVP_DestinationRealm(g_gy_pars.origin_realm), + tr_AVP_AuthAppId(int2oct(c_DIAMETER_CREDIT_CONTROL_AID, 4)), + tr_AVP_ServiceContextId, + tr_AVP_CcReqType(req_type), + tr_AVP_CcReqNum(?), + tr_AVP_DestinationHost(?), + tr_AVP_EventTimestamp(?), + tr_AVP_SubcrId({tr_AVP_SubcrIdType(END_USER_IMSI), tr_AVP_SubcrIdData(imsi)}), + tr_AVP_SubcrId({tr_AVP_SubcrIdType(END_USER_E164), tr_AVP_SubcrIdData(msisdn)}), + tr_AVP_RequestedAction(DIRECT_DEBITING), + tr_AVP_3GPP_AoCRequestType, + tr_AVP_MultipleServicesIndicator, + tr_AVP_Multiple_Services_Credit_Control(content := superset( + tr_AVP_Requested_Service_Unit, + tr_AVP_Used_Service_Unit, + tr_AVP_3GPP_Reporting_Reason, + tr_AVP_3GPP_QoS_Information, + tr_AVP_GI_3GPP_RatType(rat_type) + )), + tr_AVP_3GPP_ServiceInformation(content := superset( + tr_AVP_3GPP_PSInformation(content := superset( + tr_AVP_3GPP_ChargingId, + /* tr_AVP_3GPP_PDPType, Only in INIT */ + tr_AVP_3GPP_PDPAddress(tr_AVP_Address((IP,IP6), ?)), + tr_AVP_3GPP_SGSNAddress(tr_AVP_Address(IP, f_inet_addr(m_bind_ip_gtpc))), + tr_AVP_3GPP_GGSNAddress(tr_AVP_Address(IP, f_inet_addr(m_ggsn_ip_gtpc))), + tr_AVP_3GPP_CalledStationId, + tr_AVP_3GPP_SelectionMode, + tr_AVP_3GPP_ChargingCharacteristics(charging_char), + tr_AVP_3GPP_SGSNMCCMNC, + tr_AVP_3GPP_NSAPI(nsapi), + tr_AVP_3GPP_MS_TimeZone, + tr_AVP_3GPP_ULI, + tr_AVP_UserEquipmentInfo({ + tr_AVP_UserEquipmentInfoType(IMEISV), + tr_AVP_UserEquipmentInfoValue(imeisv) + }) + )) + )) + )); + } + case (TERMINATION_REQUEST) { + tpl := tr_DIAMETER(flags:='11000000'B, cmd_code:=Credit_Control, + avps := superset( + tr_AVP_SessionId, + tr_AVP_OriginHost(smf_origin_host), + tr_AVP_OriginRealm(g_gy_pars.origin_realm), + tr_AVP_DestinationRealm(g_gy_pars.origin_realm), + tr_AVP_AuthAppId(int2oct(c_DIAMETER_CREDIT_CONTROL_AID, 4)), + tr_AVP_ServiceContextId, + tr_AVP_CcReqType(req_type), + tr_AVP_CcReqNum(?), + tr_AVP_DestinationHost(?), + tr_AVP_EventTimestamp(?), + tr_AVP_SubcrId({tr_AVP_SubcrIdType(END_USER_IMSI), tr_AVP_SubcrIdData(imsi)}), + tr_AVP_SubcrId({tr_AVP_SubcrIdType(END_USER_E164), tr_AVP_SubcrIdData(msisdn)}), + tr_AVP_TerminationCause(?), + tr_AVP_RequestedAction(DIRECT_DEBITING), + tr_AVP_3GPP_AoCRequestType, + tr_AVP_MultipleServicesIndicator, + tr_AVP_Multiple_Services_Credit_Control(content := superset( + /* tr_AVP_Requested_Service_Unit, Only in INIT and UPDATE */ + tr_AVP_Used_Service_Unit, + tr_AVP_3GPP_QoS_Information, + tr_AVP_GI_3GPP_RatType(rat_type) + )), + tr_AVP_3GPP_ServiceInformation(content := superset( + tr_AVP_3GPP_PSInformation(content := superset( + tr_AVP_3GPP_ChargingId, + /* tr_AVP_3GPP_PDPType, Only in INIT */ + tr_AVP_3GPP_PDPAddress(tr_AVP_Address((IP,IP6), ?)), + tr_AVP_3GPP_SGSNAddress(tr_AVP_Address(IP, f_inet_addr(m_bind_ip_gtpc))), + tr_AVP_3GPP_GGSNAddress(tr_AVP_Address(IP, f_inet_addr(m_ggsn_ip_gtpc))), + tr_AVP_3GPP_CalledStationId, + tr_AVP_3GPP_SelectionMode, + tr_AVP_3GPP_ChargingCharacteristics(charging_char), + tr_AVP_3GPP_SGSNMCCMNC, + tr_AVP_3GPP_NSAPI(nsapi), + tr_AVP_3GPP_MS_TimeZone, + tr_AVP_3GPP_ULI, + tr_AVP_UserEquipmentInfo({ + tr_AVP_UserEquipmentInfoType(IMEISV), + tr_AVP_UserEquipmentInfoValue(imeisv) + }) + )) + )) + )); + } + } + return tpl; + } + + private altstep as_DIA_Gy_CCR(template (omit) PdpContext ctx, DCC_NONE_CC_Request_Type req_type) runs on GT_CT { var PDU_DIAMETER rx_dia; - [] Gy_UNIT.receive(tr_DIA_Gy_CCR(req_type := req_type)) -> value rx_dia { + [] Gy_UNIT.receive(f_tr_DIA_Gy_CCR(ctx, req_type := req_type)) -> value rx_dia { var template (value) PDU_DIAMETER tx_dia; var template (omit) AVP avp; var octetstring sess_id; @@ -530,7 +695,7 @@ as_DIA_Gx_CCR(INITIAL_REQUEST); } if (Gy_PROC.checkstate("Connected")) { - as_DIA_Gy_CCR(INITIAL_REQUEST); + as_DIA_Gy_CCR(ctx, INITIAL_REQUEST); } alt { [] GTPC.receive(tr_GTPC_MsgType(g_peer_c, createPDPContextResponse, ctx.teic)) -> value ud { @@ -595,7 +760,7 @@ as_DIA_Gx_CCR(TERMINATION_REQUEST); } if (Gy_PROC.checkstate("Connected") and expect_diameter) { - as_DIA_Gy_CCR(TERMINATION_REQUEST); + as_DIA_Gy_CCR(ctx, TERMINATION_REQUEST); } alt { [] GTPC.receive(tr_GTPC_MsgType(g_peer_c, deletePDPContextResponse, expect_teid)) -> value ud { @@ -2001,7 +2166,7 @@ f_init(); for (var integer i := 0; i < num_ctx; i := i + 1) { - ctx[i] := valueof(t_DefinePDP(f_rnd_imsi('26242'H), f_dec_TBCD(f_rnd_msisdn('1234'O)), c_ApnInternet, valueof(t_EuaIPv4Dyn))); + ctx[i] := valueof(t_DefinePDP(f_rnd_imsi('26242'H), "1234" & int2str(f_rnd_int(4294967296)), c_ApnInternet, valueof(t_EuaIPv4Dyn))); ctx[i].teic := int2oct(i+1, 4); /* +1: skip TEIC=0 */ ctx[i].teid := int2oct(i+1, 4); /* +1: skip TEID=0 */ ctx[i].pco_req := valueof(ts_PCO_IPv4_DNS_CONT); @@ -2012,7 +2177,7 @@ T_next.start; alt { [Gx_PROC.checkstate("Connected")] as_DIA_Gx_CCR(INITIAL_REQUEST) { repeat; } - [Gy_PROC.checkstate("Connected")] as_DIA_Gy_CCR(INITIAL_REQUEST) { repeat; } + [Gy_PROC.checkstate("Connected")] as_DIA_Gy_CCR(omit, INITIAL_REQUEST) { repeat; } [] pingpong(); [] T_next.timeout { f_send_gtpc(ts_GTPC_CreatePDP(g_peer_c, g_c_seq_nr, ctx[next_req_ctx].imsi, g_restart_ctr, @@ -2068,7 +2233,7 @@ T_next.start; alt { [Gx_PROC.checkstate("Connected")] as_DIA_Gx_CCR(TERMINATION_REQUEST) { repeat; } - [Gy_PROC.checkstate("Connected")] as_DIA_Gy_CCR(TERMINATION_REQUEST) { repeat; } + [Gy_PROC.checkstate("Connected")] as_DIA_Gy_CCR(omit, TERMINATION_REQUEST) { repeat; } [] pingpong(); [] T_next.timeout { f_send_gtpc(ts_GTPC_DeletePDP(g_peer_c, g_c_seq_nr, ctx[next_req_ctx].teic_remote, ctx[next_req_ctx].nsapi, '1'B)); @@ -2121,12 +2286,12 @@ T_next.start; alt { [Gx_PROC.checkstate("Connected")] as_DIA_Gx_CCR(INITIAL_REQUEST) { repeat; } - [Gy_PROC.checkstate("Connected")] as_DIA_Gy_CCR(INITIAL_REQUEST) { repeat; } + [Gy_PROC.checkstate("Connected")] as_DIA_Gy_CCR(omit, INITIAL_REQUEST) { repeat; } [] pingpong(); [] T_next.timeout { if (cont_req) { if (next_req_ctx - rx_resp_ctx < 100) { /* if we have too many in progress, wait a bit to continue */ - ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), f_dec_TBCD(f_rnd_msisdn('1234'O)), c_ApnInternet, valueof(t_EuaIPv4Dyn))); + ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), "1234" & int2str(f_rnd_int(4294967296)), c_ApnInternet, valueof(t_EuaIPv4Dyn))); ctx.nsapi := '0001'B; ctx.teic := int2oct(next_req_ctx+1, 4); /* +1: skip TEIC=0 */ ctx.teid := int2oct(next_req_ctx+1, 4); /* +1: skip TEID=0 */ @@ -2172,7 +2337,7 @@ T_next.start; alt { [Gx_PROC.checkstate("Connected")] as_DIA_Gx_CCR(TERMINATION_REQUEST) { repeat; } - [Gy_PROC.checkstate("Connected")] as_DIA_Gy_CCR(TERMINATION_REQUEST) { repeat; } + [Gy_PROC.checkstate("Connected")] as_DIA_Gy_CCR(omit, TERMINATION_REQUEST) { repeat; } [] pingpong(); [] T_next.timeout { f_send_gtpc(ts_GTPC_DeletePDP(g_peer_c, g_c_seq_nr, teic_list[next_req_ctx], '0001'B, '1'B)); @@ -2225,17 +2390,17 @@ g_gy_validity_time := 2; /* First update reports octests/pkt on both UL/DL (see icmp ping-pong above) */ - as_DIA_Gy_CCR(UPDATE_REQUEST); + as_DIA_Gy_CCR(ctx, UPDATE_REQUEST); /* Second update: 0 ul/dl pkt/octet should be reported, since nothing was sent */ - as_DIA_Gy_CCR(UPDATE_REQUEST); + as_DIA_Gy_CCR(ctx, UPDATE_REQUEST); /* Third update: make sure report contains again octets/pkts for both UL/DL: */ f_send_gtpu(ctx, f_gen_icmpv4_echo(saddr, dns1_addr)); f_wait_icmp4_echo_reply(ctx); f_send_gtpu(ctx, f_gen_icmpv4_echo(saddr, dns1_addr)); f_wait_icmp4_echo_reply(ctx); - as_DIA_Gy_CCR(UPDATE_REQUEST); + as_DIA_Gy_CCR(ctx, UPDATE_REQUEST); /* Let the CCA reach the GGSN */ f_sleep(0.5); diff --git a/library/DIAMETER_Templates.ttcn b/library/DIAMETER_Templates.ttcn index adf4ee6..855358d 100644 --- a/library/DIAMETER_Templates.ttcn +++ b/library/DIAMETER_Templates.ttcn @@ -195,6 +195,21 @@ vendor_id := vendor_id_3GPP } +template (present) AVP_Address tr_AVP_Address(template (present) AddressType addr_type := ?, + template (present) octetstring addr_data := ?) := { + address_type := addr_type, + address_data := addr_data +} + +template (present) GenericAVP tr_AVP_SubcrId(template (present) DCC_NONE_Subscription_Id t) := { + avp := { + avp_header := tr_DIA_Hdr(c_AVP_Code_DCC_NONE_Subscription_Id), + avp_data := { + avp_DCC_NONE_Subscription_Id := t + } + } +} + template (present) GenericAVP tr_AVP_SubcrIdType(template (present) DCC_NONE_Subscription_Id_Type t) := { avp := { avp_header := tr_DIA_Hdr(c_AVP_Code_DCC_NONE_Subscription_Id_Type), @@ -204,6 +219,42 @@ } } +template (present) GenericAVP tr_AVP_SubcrIdData(template (present) DCC_NONE_Subscription_Id_Data t) := { + avp := { + avp_header := tr_DIA_Hdr(c_AVP_Code_DCC_NONE_Subscription_Id_Data), + avp_data := { + avp_DCC_NONE_Subscription_Id_Data := t + } + } +} + +template (present) GenericAVP tr_AVP_RequestedAction(template (present) DCC_NONE_Requested_Action t := ?) := { + avp := { + avp_header := tr_DIA_Hdr(c_AVP_Code_DCC_NONE_Requested_Action), + avp_data := { + avp_DCC_NONE_Requested_Action := t + } + } +} + +template (present) GenericAVP tr_AVP_MultipleServicesIndicator(template (present) DCC_NONE_Multiple_Services_Indicator t := ?) := { + avp := { + avp_header := tr_DIA_Hdr(c_AVP_Code_DCC_NONE_Multiple_Services_Indicator), + avp_data := { + avp_DCC_NONE_Multiple_Services_Indicator := t + } + } +} + +template (present) GenericAVP tr_AVP_ServiceContextId(template (present) DCC_NONE_Service_Context_Id id := ?) := { + avp := { + avp_header := tr_DIA_Hdr(c_AVP_Code_DCC_NONE_Service_Context_Id), + avp_data := { + avp_DCC_NONE_Service_Context_Id := id + } + } +} + template (value) GenericAVP ts_AVP_OriginHost(template (value) charstring host) := { avp := { avp_header := ts_DIA_Hdr(c_AVP_Code_BASE_NONE_Origin_Host), @@ -257,6 +308,15 @@ } } +template (present) GenericAVP tr_AVP_TerminationCause(template (present) BASE_NONE_Termination_Cause tc) := { + avp := { + avp_header := tr_DIA_Hdr(c_AVP_Code_BASE_NONE_Termination_Cause), + avp_data := { + avp_BASE_NONE_Termination_Cause := tc + } + } +} + template (value) GenericAVP ts_AVP_HostIpAddr(template (value) OCTET4 ipv4_addr) := { avp := { avp_header := ts_DIA_Hdr(c_AVP_Code_BASE_NONE_Host_IP_Address), @@ -381,7 +441,14 @@ } } - +template (present) GenericAVP tr_AVP_EventTimestamp(template (present) AVP_Unsigned32 n := ?) := { + avp := { + avp_header := tr_DIA_Hdr(c_AVP_Code_BASE_NONE_Event_Timestamp), + avp_data := { + avp_BASE_NONE_Event_Timestamp := n + } + } +} template (value) GenericAVP ts_AVP_SuppVendorIdRaw(uint32_t vendor_id) := { @@ -446,6 +513,15 @@ } } +template (present) GenericAVP tr_AVP_DestinationHost(template (present) charstring host := ?) := { + avp := { + avp_header := tr_DIA_Hdr(c_AVP_Code_BASE_NONE_Destination_Host), + avp_data := { + avp_BASE_NONE_Destination_Host := host + } + } +} + /* 3.3 Destination Realm */ template (value) GenericAVP ts_AVP_DestinationRealm(template (value) charstring dest_realm) := { avp := { @@ -611,7 +687,7 @@ } /* TS 29.262 7.3.13 RAT-Type */ -template (value) GenericAVP ts_AVP_3GPP_RatType(template (value) PCC_3GPP_RAT_Type rat_type) := { +template (value) GenericAVP ts_AVP_PCC_3GPP_RatType(template (value) PCC_3GPP_RAT_Type rat_type) := { avp := { avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_PCC_3GPP_RAT_Type), avp_data := { @@ -619,7 +695,7 @@ } } } -template (present) GenericAVP tr_AVP_3GPP_RatType(template (present) PCC_3GPP_RAT_Type rat_type := ?) := { +template (present) GenericAVP tr_AVP_PCC_3GPP_RatType(template (present) PCC_3GPP_RAT_Type rat_type := ?) := { avp := { avp_header := tr_DIA_Hdr_3GPP(c_AVP_Code_PCC_3GPP_RAT_Type), avp_data := { @@ -628,6 +704,15 @@ } } +template (present) GenericAVP tr_AVP_GI_3GPP_RatType(template (present) GI_3GPP_3GPP_RAT_Type rat_type := ?) := { + avp := { + avp_header := tr_DIA_Hdr_3GPP(c_AVP_Code_GI_3GPP_3GPP_RAT_Type), + avp_data := { + avp_GI_3GPP_3GPP_RAT_Type := rat_type + } + } +} + /* TS 29.262 7.3.7 ULR-Flags */ template (value) GenericAVP ts_AVP_3GPP_UlrFlags(template (value) UINT32 flags) := { avp := { @@ -774,6 +859,15 @@ } } +template (present) GenericAVP tr_AVP_3GPP_QoS_Information(template (present) AVP_list list := ?) := { + avp := { + avp_header := tr_DIA_Hdr_3GPP(c_AVP_Code_PCC_3GPP_QoS_Information), + avp_data := { + avp_PCC_3GPP_QoS_Information := list + } + } +} + template (value) GenericAVP ts_AVP_3GPP_QosClassId(uint32_t id) := { avp := { avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_PCC_3GPP_QoS_Class_Identifier), @@ -850,7 +944,167 @@ } } +template (present) GenericAVP tr_AVP_3GPP_Reporting_Reason(template (present) DCA_3GPP_Reporting_Reason r := ?) := { + avp := { + avp_header := tr_DIA_Hdr_3GPP(c_AVP_Code_DCA_3GPP_Reporting_Reason), + avp_data := { + avp_DCA_3GPP_Reporting_Reason := r + } + } +} +template (present) GenericAVP tr_AVP_3GPP_AoCRequestType(template (present) DCA_3GPP_AoC_Request_Type t := ?) := { + avp := { + avp_header := tr_DIA_Hdr_3GPP(c_AVP_Code_DCA_3GPP_AoC_Request_Type), + avp_data := { + avp_DCA_3GPP_AoC_Request_Type := t + } + } +} + +template (present) GenericAVP tr_AVP_3GPP_ServiceInformation(template (present) AVP_list content := ?) := { + avp := { + avp_header := tr_DIA_Hdr_3GPP(c_AVP_Code_DCA_3GPP_Service_Information), + avp_data := { + avp_DCA_3GPP_Service_Information := content + } + } +} + +template (present) GenericAVP tr_AVP_3GPP_PSInformation(template (present) AVP_list content := ?) := { + avp := { + avp_header := tr_DIA_Hdr_3GPP(c_AVP_Code_DCA_3GPP_PS_Information), + avp_data := { + avp_DCA_3GPP_PS_Information := content + } + } +} + +template (present) GenericAVP tr_AVP_3GPP_ChargingId(template (present) AVP_OctetString id := ?) := { + avp := { + avp_header := tr_DIA_Hdr_3GPP(c_AVP_Code_GI_3GPP_3GPP_Charging_Id), + avp_data := { + avp_GI_3GPP_3GPP_Charging_Id := id + } + } +} + +template (present) GenericAVP tr_AVP_3GPP_PDPType(template (present) GI_3GPP_3GPP_PDP_Type t := ?) := { + avp := { + avp_header := tr_DIA_Hdr_3GPP(c_AVP_Code_GI_3GPP_3GPP_PDP_Type), + avp_data := { + avp_GI_3GPP_3GPP_PDP_Type := t + } + } +} + +template (present) GenericAVP tr_AVP_3GPP_PDPAddress(template (present) DCA_3GPP_PDP_Address addr := ?) := { + avp := { + avp_header := tr_DIA_Hdr_3GPP(c_AVP_Code_DCA_3GPP_PDP_Address), + avp_data := { + avp_DCA_3GPP_PDP_Address := addr + } + } +} + +template (present) GenericAVP tr_AVP_3GPP_SGSNAddress(template (present) DCA_3GPP_SGSN_Address addr := ?) := { + avp := { + avp_header := tr_DIA_Hdr_3GPP(c_AVP_Code_DCA_3GPP_SGSN_Address), + avp_data := { + avp_DCA_3GPP_SGSN_Address := addr + } + } +} + +template (present) GenericAVP tr_AVP_3GPP_GGSNAddress(template (present) DCA_3GPP_GGSN_Address addr := ?) := { + avp := { + avp_header := tr_DIA_Hdr_3GPP(c_AVP_Code_DCA_3GPP_GGSN_Address), + avp_data := { + avp_DCA_3GPP_GGSN_Address := addr + } + } +} + +template (present) GenericAVP tr_AVP_3GPP_SelectionMode(template (present) GI_3GPP_3GPP_Selection_Mode sm := ?) := { + avp := { + avp_header := tr_DIA_Hdr_3GPP(c_AVP_Code_GI_3GPP_3GPP_Selection_Mode), + avp_data := { + avp_GI_3GPP_3GPP_Selection_Mode := sm + } + } +} + +template (present) GenericAVP tr_AVP_3GPP_ChargingCharacteristics(template (present) GI_3GPP_3GPP_Charging_Characteristics cc := ?) := { + avp := { + avp_header := tr_DIA_Hdr_3GPP(c_AVP_Code_GI_3GPP_3GPP_Charging_Characteristics), + avp_data := { + avp_GI_3GPP_3GPP_Charging_Characteristics := cc + } + } +} + +template (present) GenericAVP tr_AVP_3GPP_SGSNMCCMNC(template (present) GI_3GPP_3GPP_SGSN_MCC_MNC smn := ?) := { + avp := { + avp_header := tr_DIA_Hdr_3GPP(c_AVP_Code_GI_3GPP_3GPP_SGSN_MCC_MNC), + avp_data := { + avp_GI_3GPP_3GPP_SGSN_MCC_MNC := smn + } + } +} + +template (present) GenericAVP tr_AVP_3GPP_NSAPI(template (present) GI_3GPP_3GPP_NSAPI nsapi := ?) := { + avp := { + avp_header := tr_DIA_Hdr_3GPP(c_AVP_Code_GI_3GPP_3GPP_NSAPI), + avp_data := { + avp_GI_3GPP_3GPP_NSAPI := nsapi + } + } +} + +template (present) GenericAVP tr_AVP_3GPP_MS_TimeZone(template (present) GI_3GPP_3GPP_MS_TimeZone ms_tz := ?) := { + avp := { + avp_header := tr_DIA_Hdr_3GPP(c_AVP_Code_GI_3GPP_3GPP_MS_TimeZone), + avp_data := { + avp_GI_3GPP_3GPP_MS_TimeZone := ms_tz + } + } +} + +template (present) GenericAVP tr_AVP_3GPP_ULI(template (present) GI_3GPP_3GPP_User_Location_Info uli := ?) := { + avp := { + avp_header := tr_DIA_Hdr_3GPP(c_AVP_Code_GI_3GPP_3GPP_User_Location_Info), + avp_data := { + avp_GI_3GPP_3GPP_User_Location_Info := uli + } + } +} + +template (present) GenericAVP tr_AVP_UserEquipmentInfo(template (present) DCC_NONE_User_Equipment_Info uei := ?) := { + avp := { + avp_header := tr_DIA_Hdr(c_AVP_Code_DCC_NONE_User_Equipment_Info), + avp_data := { + avp_DCC_NONE_User_Equipment_Info := uei + } + } +} + +template (present) GenericAVP tr_AVP_UserEquipmentInfoType(template (present) DCC_NONE_User_Equipment_Info_Type ueit := ?) := { + avp := { + avp_header := tr_DIA_Hdr(c_AVP_Code_DCC_NONE_User_Equipment_Info_Type), + avp_data := { + avp_DCC_NONE_User_Equipment_Info_Type := ueit + } + } +} + +template (present) GenericAVP tr_AVP_UserEquipmentInfoValue(template (present) DCC_NONE_User_Equipment_Info_Value ueiv := ?) := { + avp := { + avp_header := tr_DIA_Hdr(c_AVP_Code_DCC_NONE_User_Equipment_Info_Value), + avp_data := { + avp_DCC_NONE_User_Equipment_Info_Value := ueiv + } + } +} /* TS 29.262 7.3.62 PDN-Type */ template (value) GenericAVP ts_AVP_3GPP_PdnType(template (value) AAA_3GPP_PDN_Type pdn_type) := { @@ -871,6 +1125,34 @@ } } } +template (present) GenericAVP tr_AVP_Multiple_Services_Credit_Control(template (present) AVP_list content := ?) := { + avp := { + avp_header := tr_DIA_Hdr(c_AVP_Code_DCC_NONE_Multiple_Services_Credit_Control), + avp_data := { + avp_DCC_NONE_Multiple_Services_Credit_Control := content + } + } +} + +/* Requested-Service-Unit AVP */ +template (present) GenericAVP tr_AVP_Requested_Service_Unit(template (present) AVP_list content := ?) := { + avp := { + avp_header := tr_DIA_Hdr(c_AVP_Code_DCC_NONE_Requested_Service_Unit), + avp_data := { + avp_DCC_NONE_Requested_Service_Unit := content + } + } +} + +/* Used-Service-Unit AVP */ +template (present) GenericAVP tr_AVP_Used_Service_Unit(template (present) AVP_list content := ?) := { + avp := { + avp_header := tr_DIA_Hdr(c_AVP_Code_DCC_NONE_Used_Service_Unit), + avp_data := { + avp_DCC_NONE_Used_Service_Unit := content + } + } +} /* RFC4006 8.17 Granted-Service-Unit AVP */ template (value) GenericAVP ts_AVP_Granted_Service_Unit(template (value) AVP_list content) := { @@ -912,6 +1194,14 @@ } } +template (present) GenericAVP tr_AVP_3GPP_CalledStationId(template (present) DNAS_NONE_Called_Station_Id id := ?) := { + avp := { + avp_header := tr_DIA_Hdr(c_AVP_Code_DNAS_NONE_Called_Station_Id), + avp_data := { + avp_DNAS_NONE_Called_Station_Id := id + } + } +} /* 5.3.2 Capabilities Exchange Answer */ @@ -1076,7 +1366,7 @@ ts_AVP_UserNameImsi(imsi), ts_AVP_3GPP_UlrFlags('00000000'O), ts_AVP_3GPP_VisitedPlmnId('11111F'O), - ts_AVP_3GPP_RatType(EUTRAN), + ts_AVP_PCC_3GPP_RatType(EUTRAN), ts_AVP_OriginHost(orig_host), ts_AVP_OriginRealm(orig_realm), ts_AVP_DestinationRealm(dest_realm) @@ -1101,7 +1391,7 @@ tr_AVP_OriginRealm(orig_realm), tr_AVP_DestinationRealm(dest_realm), tr_AVP_UserNameImsi(imsi), - tr_AVP_3GPP_RatType(EUTRAN), + tr_AVP_PCC_3GPP_RatType, tr_AVP_3GPP_UlrFlags, tr_AVP_3GPP_VisitedPlmnId )); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28156 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: I702796f2f941b78da904faa2ffdba4185333bc0d Gerrit-Change-Number: 28156 Gerrit-PatchSet: 5 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: merged

1 0

Change in osmo-ttcn3-hacks[master]: pgw: Improve checks around Gy messages
by laforge 20 May '22

20 May '22

Attention is currently required from: osmith, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28157 ) Change subject: pgw: Improve checks around Gy messages ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28157 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: Ica3ca4cf72113d66e74dcff9f838e39cc5d63468 Gerrit-Change-Number: 28157 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 19 May 2022 19:55:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmo-ttcn3-hacks[master]: ggsn: Improve checks around Gy messages
by laforge 20 May '22

20 May '22

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28156 ) Change subject: ggsn: Improve checks around Gy messages ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28156 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: I702796f2f941b78da904faa2ffdba4185333bc0d Gerrit-Change-Number: 28156 Gerrit-PatchSet: 5 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 19 May 2022 19:55:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in pysim[master]: pySim-shell: make APDU command available on the lowest level
by laforge 20 May '22

20 May '22

Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/28163 ) Change subject: pySim-shell: make APDU command available on the lowest level ...................................................................... Patch Set 1: (2 comments) File pySim-shell.py: https://gerrit.osmocom.org/c/pysim/+/28163/comment/4f6444e7_c5dc7b71 PS1, Line 227: if (self.card): I think in python you don't usually put parenthesis around a single condition in an if statement, see "if new == True:" above. https://gerrit.osmocom.org/c/pysim/+/28163/comment/684a6018_275b38cd PS1, Line 257: if (data): same here. "if data:" should do the trick. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28163 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I601b8f17bd6af41dcbf7bbb53c75903dd46beee7 Gerrit-Change-Number: 28163 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 19 May 2022 19:54:05 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

Change in pysim[master]: pySim-shell: catch exceptions from walk() while exporting
by laforge 20 May '22

20 May '22

Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/28162 ) Change subject: pySim-shell: catch exceptions from walk() while exporting ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28162 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I3edc250ef2a84550c5b821a72e207e4d685790a5 Gerrit-Change-Number: 28162 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 19 May 2022 19:52:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in pysim[master]: pySim-shell: add export option to add CREATE FILE APDUs
by laforge 20 May '22

20 May '22

Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/28161 ) Change subject: pySim-shell: add export option to add CREATE FILE APDUs ...................................................................... Patch Set 3: Code-Review+1 (1 comment) File pySim-shell.py: https://gerrit.osmocom.org/c/pysim/+/28161/comment/ff774aab_d60554c4 PS3, Line 556: self._cmd.poutput("apdu 00E00000%02x%s" % (int(len(self._cmd.rs.selected_file_fcp_hex)/2), str(self._cmd.rs.selected_file_fcp_hex))) I would have preferred if we actually generate the 'create file' command here. That would be readable with its arguments. But I understand that you don' have the decoded FCP here and a "raw" statement is more convenient (and less error-prone) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28161 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: If529b86062f7c678c9c75f46ce9ca116cea8b47b Gerrit-Change-Number: 28161 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 19 May 2022 19:52:27 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in pysim[master]: pySim-shell: extend walk() so that we can also have action of ADF or DF
by laforge 20 May '22

20 May '22

Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/28160 ) Change subject: pySim-shell: extend walk() so that we can also have action of ADF or DF ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28160 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Iabcd78552a14a2d3f8f31273dda7731e1f640cdb Gerrit-Change-Number: 28160 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 19 May 2022 19:50:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in pysim[master]: pySim-shell: more generic export options
by laforge 20 May '22

20 May '22

Attention is currently required from: pespin, Christian Amsüss, dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/28159 ) Change subject: pySim-shell: more generic export options ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: I think the more pythonic way would be **kwargs instead of passing a custom dict? But then, I'm not a native Python speaker. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28159 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie860eec918e7cdb01651642f4bc2474c9fb1924f Gerrit-Change-Number: 28159 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Christian Amsüss <chrysn(a)fsfe.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: Christian Amsüss <chrysn(a)fsfe.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 19 May 2022 19:50:23 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

Change in osmo-ci[master]: ansible/jenkins/osmocom_build_deps: drop py2 pkgs
by laforge 20 May '22

20 May '22

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/28151 ) Change subject: ansible/jenkins/osmocom_build_deps: drop py2 pkgs ...................................................................... ansible/jenkins/osmocom_build_deps: drop py2 pkgs Drop python2 packages. It's deprecated, packages don't exist in debian 11 and our jenkins nodes don't need it anymore. Related: OS#5453 Change-Id: Id2da7adab83f240e7e0b45c018f91c9e639fc80d --- M ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml 1 file changed, 0 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml b/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml index 5cf0677..1cfb715 100644 --- a/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml +++ b/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml @@ -29,7 +29,6 @@ - mscgen - osc - pkgconf - - python-minimal - python-setuptools - python3 - python3-setuptools @@ -37,7 +36,6 @@ - texinfo # by gsm-manuals - python3-nwdiag - - python-pychart - inkscape # by gapk - libasound-dev -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/28151 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Id2da7adab83f240e7e0b45c018f91c9e639fc80d Gerrit-Change-Number: 28151 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(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

2026

2025

2024

2023

2022

gerrit-log