August 2026 - gerrit-log - lists.osmocom.org

[L] Change in osmo-ttcn3-hacks[master]: pgw: Move lots of diameter msg building to library/
by pespin 18 Aug '26

18 Aug '26

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43286?usp=email ) Change subject: pgw: Move lots of diameter msg building to library/ ...................................................................... pgw: Move lots of diameter msg building to library/ This way it can be easily reused on other testsuites willing to emulate an OCS, and PCRF, etc. Change-Id: Ifff21ed39c685406abf734b03aa2d9d17c37c4f6 --- M library/DIAMETER_ts29_212_Templates.ttcn M library/DIAMETER_ts29_273_Templates.ttcn M library/DIAMETER_ts32_299_Templates.ttcn M pgw/PGW_Tests.ttcn 4 files changed, 274 insertions(+), 209 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/86/43286/1 diff --git a/library/DIAMETER_ts29_212_Templates.ttcn b/library/DIAMETER_ts29_212_Templates.ttcn index ec0e637..d36bfbb 100644 --- a/library/DIAMETER_ts29_212_Templates.ttcn +++ b/library/DIAMETER_ts29_212_Templates.ttcn @@ -102,4 +102,28 @@ tr_AVP_CcReqNum(?) )); +/* generate a send template successful answer based on received request */ +function f_ts_DIA_Gx_CCA(PDU_DIAMETER rx_gx) +return template (value) PDU_DIAMETER +{ + var template (value) PDU_DIAMETER tx_dia; + var template (omit) AVP avp; + var octetstring sess_id; + var AVP_Unsigned32 req_num; + var DCC_NONE_CC_Request_Type req_type; + + avp := f_DIAMETER_get_avp(rx_gx, c_AVP_Code_BASE_NONE_Session_Id); + sess_id := valueof(avp.avp_data.avp_BASE_NONE_Session_Id); + + avp := f_DIAMETER_get_avp(rx_gx, c_AVP_Code_DCC_NONE_CC_Request_Number); + req_num := valueof(avp.avp_data.avp_DCC_NONE_CC_Request_Number); + + avp := f_DIAMETER_get_avp(rx_gx, c_AVP_Code_DCC_NONE_CC_Request_Type); + req_type := valueof(avp.avp_data.avp_DCC_NONE_CC_Request_Type); + + tx_dia := ts_DIA_Gx_CCA(rx_gx.hop_by_hop_id, rx_gx.end_to_end_id, sess_id, + req_type, req_num); + return tx_dia; +} + } /* module */ diff --git a/library/DIAMETER_ts29_273_Templates.ttcn b/library/DIAMETER_ts29_273_Templates.ttcn index 6ed00ff..a9f1769 100644 --- a/library/DIAMETER_ts29_273_Templates.ttcn +++ b/library/DIAMETER_ts29_273_Templates.ttcn @@ -674,4 +674,27 @@ ts_AVP_OriginRealm(orig_realm) }); + +/* generate a send template successful answer based on received AAR */ +function f_ts_DIA_S6b_AAA(PDU_DIAMETER rx_s6b, + template (value) charstring orig_host := "aaa.localdomain", + template (value) charstring orig_realm := "localdomain", + template (value) charstring dest_realm := "localdomain") +return template (value) PDU_DIAMETER +{ + var template (value) PDU_DIAMETER tx_dia; + var template (omit) AVP avp; + var octetstring sess_id; + + avp := f_DIAMETER_get_avp(rx_s6b, c_AVP_Code_BASE_NONE_Session_Id); + sess_id := valueof(avp.avp_data.avp_BASE_NONE_Session_Id); + + tx_dia := ts_DIA_S6b_AAA(sess_id, orig_host, + orig_realm, + dest_realm, + rx_s6b.hop_by_hop_id, + rx_s6b.end_to_end_id); + return tx_dia; +} + } diff --git a/library/DIAMETER_ts32_299_Templates.ttcn b/library/DIAMETER_ts32_299_Templates.ttcn index ffbd15f..249e633 100644 --- a/library/DIAMETER_ts32_299_Templates.ttcn +++ b/library/DIAMETER_ts32_299_Templates.ttcn @@ -14,6 +14,7 @@ import from General_Types all; import from DIAMETER_Types all; import from DIAMETER_Templates all; +import from DIAMETER_ts29_272_Templates all; /* tr_AVP_GI_3GPP_RatType */ import from Osmocom_Types all; import from Misc_Helpers all; @@ -181,4 +182,200 @@ } } +function f_tr_DIA_Gy_CCR(DCC_NONE_CC_Request_Type req_type, + template (present) octetstring imsi := ?, + template (present) octetstring msisdn := ?, + template (present) octetstring rat_type := ?, + template (present) OCT1 nsapi := ?, + template (present) OCT4 charging_char := ?, + template (present) charstring origin_host := ?, + template (present) charstring diam_realm := ?, + template (present) octetstring sgsn_addr := ?, + template (present) octetstring ggsn_addr := ?) +return template (present) PDU_DIAMETER +{ + var template (present) PDU_DIAMETER tpl; + select (req_type) { + case (INITIAL_REQUEST) { + tpl := tr_DIAMETER(flags:='11000000'B, cmd_code:=Credit_Control, + avps := superset( + tr_AVP_SessionId, + tr_AVP_OriginHost(origin_host), + tr_AVP_OriginRealm(diam_realm), + tr_AVP_DestinationRealm(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_PCC_3GPP_QoS_Information + )), + 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, sgsn_addr)), + tr_AVP_3GPP_GGSNAddress(tr_AVP_Address(IP, ggsn_addr)), + 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, + tr_AVP_GI_3GPP_RatType(rat_type)/*, + 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(origin_host), + tr_AVP_OriginRealm(diam_realm), + tr_AVP_DestinationRealm(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_Multiple_Services_Credit_Control(content := superset( + tr_AVP_Requested_Service_Unit, + tr_AVP_Used_Service_Unit, + /* tr_AVP_3GPP_Reporting_Reason, can be sometimes inside UsedServiceUnit */ + tr_AVP_PCC_3GPP_QoS_Information + )), + 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, sgsn_addr)), + tr_AVP_3GPP_GGSNAddress(tr_AVP_Address(IP, ggsn_addr)), + 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, + tr_AVP_GI_3GPP_RatType(rat_type)/*, + 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(origin_host), + tr_AVP_OriginRealm(diam_realm), + tr_AVP_DestinationRealm(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_Multiple_Services_Credit_Control(content := superset( + /* tr_AVP_Requested_Service_Unit, Only in INIT and UPDATE */ + tr_AVP_Used_Service_Unit, + tr_AVP_3GPP_Reporting_Reason(FINAL), + tr_AVP_PCC_3GPP_QoS_Information + )), + 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, sgsn_addr)), + tr_AVP_3GPP_GGSNAddress(tr_AVP_Address(IP, ggsn_addr)), + 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, + tr_AVP_GI_3GPP_RatType(rat_type)/*, + We don't yet send IMEI in CreateSessionReq: + tr_AVP_UserEquipmentInfo({ + tr_AVP_UserEquipmentInfoType(IMEISV), + tr_AVP_UserEquipmentInfoValue(imeisv) + })*/ + )) + )) + )); + } + } + return tpl; +} + +/* generate a send template successful/reject answer based on received request */ +function f_ts_DIA_Gy_CCA(PDU_DIAMETER rx_gy, + DIAMETER_Resultcode cca_res_code, + template (omit) uint32_t validity_time := omit) +return template (value) PDU_DIAMETER +{ + var template (value) PDU_DIAMETER tx_dia; + var template (omit) AVP avp; + var octetstring sess_id; + var AVP_Unsigned32 req_num; + var DCC_NONE_CC_Request_Type req_type; + var DIAMETER_Resultcode cca_res_code_success := DIAMETER_SUCCESS; + + avp := f_DIAMETER_get_avp(rx_gy, c_AVP_Code_BASE_NONE_Session_Id); + sess_id := valueof(avp.avp_data.avp_BASE_NONE_Session_Id); + + avp := f_DIAMETER_get_avp(rx_gy, c_AVP_Code_DCC_NONE_CC_Request_Type); + req_type := valueof(avp.avp_data.avp_DCC_NONE_CC_Request_Type); + + avp := f_DIAMETER_get_avp(rx_gy, c_AVP_Code_DCC_NONE_CC_Request_Number); + req_num := valueof(avp.avp_data.avp_DCC_NONE_CC_Request_Number); + + if (cca_res_code != cca_res_code_success) { + tx_dia := ts_DIA_Gy_CCA(rx_gy.hop_by_hop_id, rx_gy.end_to_end_id, sess_id, + cca_res_code, req_type, req_num); + } else if (isvalue(validity_time)) { + tx_dia := ts_DIA_Gy_CCA_ValidityTime(rx_gy.hop_by_hop_id, rx_gy.end_to_end_id, sess_id, + req_type, req_num, valueof(validity_time)); + } else { + tx_dia := ts_DIA_Gy_CCA(rx_gy.hop_by_hop_id, rx_gy.end_to_end_id, sess_id, + cca_res_code, req_type, req_num); + } + return tx_dia; +} + } /* module */ diff --git a/pgw/PGW_Tests.ttcn b/pgw/PGW_Tests.ttcn index 9dd759b..612073b 100644 --- a/pgw/PGW_Tests.ttcn +++ b/pgw/PGW_Tests.ttcn @@ -383,15 +383,12 @@ private altstep as_DIA_S6b_AAR() runs on PGW_Session_CT { var PDU_DIAMETER rx_dia; [] DIAMETER[DIA_S6b].receive(tr_DIA_S6b_AAR()) -> value rx_dia { - var template (omit) AVP avp; - var octetstring sess_id; - - 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); - - DIAMETER[DIA_S6b].send(ts_DIA_S6b_AAA(sess_id, "aaa." & mp_diam_realm, - mp_diam_realm, mp_diam_realm, - rx_dia.hop_by_hop_id, rx_dia.end_to_end_id)); + var template (value) PDU_DIAMETER tx_dia; + tx_dia := f_ts_DIA_S6b_AAA(rx_dia, + "aaa." & mp_diam_realm, + mp_diam_realm, + mp_diam_realm); + DIAMETER[DIA_S6b].send(tx_dia); setverdict(pass); } [] DIAMETER[DIA_S6b].receive(PDU_DIAMETER:?) -> value rx_dia { @@ -404,18 +401,8 @@ private altstep as_DIA_Gx_CCR(DCC_NONE_CC_Request_Type req_type) runs on PGW_Session_CT { var PDU_DIAMETER rx_dia; [] DIAMETER[DIA_Gx].receive(tr_DIA_Gx_CCR(req_type := req_type)) -> value rx_dia { - var template (omit) AVP avp; - var octetstring sess_id; - var AVP_Unsigned32 req_num; - - 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); - - avp := f_DIAMETER_get_avp(rx_dia, c_AVP_Code_DCC_NONE_CC_Request_Number); - req_num := valueof(avp.avp_data.avp_DCC_NONE_CC_Request_Number); - - DIAMETER[DIA_Gx].send(ts_DIA_Gx_CCA(rx_dia.hop_by_hop_id, rx_dia.end_to_end_id, sess_id, - req_type, req_num)); + var template (value) PDU_DIAMETER tx_dia := f_ts_DIA_Gx_CCA(rx_dia); + DIAMETER[DIA_Gx].send(tx_dia); } [] DIAMETER[DIA_Gx].receive(PDU_DIAMETER:?) -> value rx_dia { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, @@ -427,203 +414,37 @@ 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 octetstring imsi := char2oct(f_dec_TBCD(imsi_hex2oct(g_pars.imsi))); + var octetstring rat_type := int2oct(enum2int(g_pars.rat_type), 1); + var OCT1 nsapi := int2oct(g_pars.bearer.ebi, 1); + var OCT4 charging_char := char2oct(oct2str('0000'O)); // f_s5s8_create_session() uses hardcoded chg_car := '0000'O 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(enum2int(g_pars.rat_type), 1); - charging_char := char2oct(oct2str('0000'O)); // f_s5s8_create_session() uses hardcoded chg_car := '0000'O - nsapi := int2oct(g_pars.bearer.ebi, 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_PCC_3GPP_QoS_Information - )), - 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, - tr_AVP_GI_3GPP_RatType(rat_type)/*, - 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_Multiple_Services_Credit_Control(content := superset( - tr_AVP_Requested_Service_Unit, - tr_AVP_Used_Service_Unit, - /* tr_AVP_3GPP_Reporting_Reason, can be sometimes inside UsedServiceUnit */ - tr_AVP_PCC_3GPP_QoS_Information - )), - 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, - tr_AVP_GI_3GPP_RatType(rat_type)/*, - 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_Multiple_Services_Credit_Control(content := superset( - /* tr_AVP_Requested_Service_Unit, Only in INIT and UPDATE */ - tr_AVP_Used_Service_Unit, - tr_AVP_3GPP_Reporting_Reason(FINAL), - tr_AVP_PCC_3GPP_QoS_Information - )), - 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, - tr_AVP_GI_3GPP_RatType(rat_type)/*, - We don't yet send IMEI in CreateSessionReq: - tr_AVP_UserEquipmentInfo({ - tr_AVP_UserEquipmentInfoType(IMEISV), - tr_AVP_UserEquipmentInfoValue(imeisv) - })*/ - )) - )) - )); - } - } - return tpl; -} + var charstring smf_origin_host := "smf." & mp_diam_realm; + var octetstring sgsn_addr := f_inet_addr(mp_pcrf_local_ip); + var octetstring ggsn_addr := f_inet_addr(mp_pgw_hostname); -function f_ts_DIA_Gy_CCA(PDU_DIAMETER rx_gy) -runs on PGW_Session_CT return template (value) PDU_DIAMETER -{ - var template (value) PDU_DIAMETER tx_dia; - var template (omit) AVP avp; - var octetstring sess_id; - var AVP_Unsigned32 req_num; - var DCC_NONE_CC_Request_Type req_type; - var DIAMETER_Resultcode cca_res_code_success := DIAMETER_SUCCESS; + return DIAMETER_ts32_299_Templates.f_tr_DIA_Gy_CCR(req_type, + imsi, + msisdn, + rat_type, + nsapi, + charging_char, + smf_origin_host, + mp_diam_realm, + sgsn_addr, + ggsn_addr); - avp := f_DIAMETER_get_avp(rx_gy, c_AVP_Code_BASE_NONE_Session_Id); - sess_id := valueof(avp.avp_data.avp_BASE_NONE_Session_Id); - - avp := f_DIAMETER_get_avp(rx_gy, c_AVP_Code_DCC_NONE_CC_Request_Type); - req_type := valueof(avp.avp_data.avp_DCC_NONE_CC_Request_Type); - - avp := f_DIAMETER_get_avp(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.cca_res_code != cca_res_code_success) { - tx_dia := ts_DIA_Gy_CCA(rx_gy.hop_by_hop_id, rx_gy.end_to_end_id, sess_id, - g_pars.gy.cca_res_code, req_type, req_num); - } else if (g_pars.gy.validity_time > 0) { - tx_dia := ts_DIA_Gy_CCA_ValidityTime(rx_gy.hop_by_hop_id, rx_gy.end_to_end_id, sess_id, - req_type, req_num, g_pars.gy.validity_time); - } else { - tx_dia := ts_DIA_Gy_CCA(rx_gy.hop_by_hop_id, rx_gy.end_to_end_id, sess_id, - g_pars.gy.cca_res_code, req_type, req_num); - } - return tx_dia; } private altstep as_DIA_Gy_CCR(DCC_NONE_CC_Request_Type req_type) runs on PGW_Session_CT { [] DIAMETER[DIA_Gy].receive(f_tr_DIA_Gy_CCR(req_type := req_type)) -> value g_rx_gy { var template (value) PDU_DIAMETER tx_dia; - tx_dia := f_ts_DIA_Gy_CCA(g_rx_gy); + var template (omit) integer validity_time := omit; + if (g_pars.gy.validity_time > 0) { + validity_time := g_pars.gy.validity_time; + } + tx_dia := DIAMETER_ts32_299_Templates.f_ts_DIA_Gy_CCA(g_rx_gy, g_pars.gy.cca_res_code, validity_time); DIAMETER[DIA_Gy].send(tx_dia); } [] DIAMETER[DIA_Gy].receive(PDU_DIAMETER:?) -> value g_rx_gy { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43286?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ifff21ed39c685406abf734b03aa2d9d17c37c4f6 Gerrit-Change-Number: 43286 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-msc[master]: sgs_iface: clean up code in function decode_mme_name
by dexter 18 Aug '26

18 Aug '26

Attention is currently required from: laforge, pespin. dexter has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/osmo-msc/+/43237?usp=email ) Change subject: sgs_iface: clean up code in function decode_mme_name ...................................................................... Patch Set 6: (1 comment) File src/libmsc/sgs_iface.c: https://gerrit.osmocom.org/c/osmo-msc/+/43237/comment/b057d7f7_005a88c9?usp… : PS6, Line 192: osmo_apn_to_str(mme_name, mme_name_enc, mme_name_enc_len); > if we end up here, does it makes sense to previously have checked "if (mme_name_enc_len >= mme_name_ […] The check in line 176 is still valid. The only difference between the two formats is only the delimiter. The gpp format uses a dot as delimiter and the IETF format uses a one byte length field. But let's take a closer look: SGS_MME_NAME_LEN = 55 The URL as per 3gpp TS 23.003 looks like this. The URL is 54 bytes long, so I assume we have defined SGS_MME_NAME_LEN to accommodate for the string terminator. (This would also mean that the sgs_iface.c code is a bit unclean now since we add another string terminator byte, but that is a different story). mmec00.mmegi0000.mme.epc.mncMNC.mccMCC.3gppnetwork.org0 (the string terminator in the TLV object is actually a length byte that is set to 0, see NOTE in 3GPP TS 23.003, section 19.4.2.1) Now let's hold this against the RFC-1035, section 3.1 format. I have added 'L' to mark the length fields. Lmmec00Lmmegi0000LmmeLepcLmncMNCLmccMCCL3gppnetwork.org So both end up with the same length, which mean both will pass the minimum length test and the maximum length test. Apart from the fact that our code now wastes one byte everything should be fine. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/43237?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I9aec8300f15264b68ac8e7805e93e621b12cafb2 Gerrit-Change-Number: 43237 Gerrit-PatchSet: 6 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 18 Aug 2026 16:09:05 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-ttcn3-hacks[master]: DIAMETER_ts29_212_Templates: Fix spec reference
by pespin 18 Aug '26

18 Aug '26

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43285?usp=email ) Change subject: DIAMETER_ts29_212_Templates: Fix spec reference ...................................................................... DIAMETER_ts29_212_Templates: Fix spec reference Change-Id: I0ceabdb10a875a9cadc12d2eee08b41535531b8e --- M library/DIAMETER_ts29_212_Templates.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/85/43285/1 diff --git a/library/DIAMETER_ts29_212_Templates.ttcn b/library/DIAMETER_ts29_212_Templates.ttcn index 73d5177..ec0e637 100644 --- a/library/DIAMETER_ts29_212_Templates.ttcn +++ b/library/DIAMETER_ts29_212_Templates.ttcn @@ -18,7 +18,7 @@ import from Misc_Helpers all; /******************************* - * S6a 3GPP TS 29.212 section 7 + * Gx 3GPP TS 29.212 section 5 *******************************/ /* 3GPP TS 29.212 Section 5.1 */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43285?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I0ceabdb10a875a9cadc12d2eee08b41535531b8e Gerrit-Change-Number: 43285 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in simtrace2[master]: contrib/jenkins.sh: pin libosmocore to the last release
by lynxis lazus 18 Aug '26

18 Aug '26

Attention is currently required from: laforge, osmith, pespin. lynxis lazus has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/simtrace2/+/43281?usp=email ) Change subject: contrib/jenkins.sh: pin libosmocore to the last release ...................................................................... Patch Set 2: (1 comment) Patchset: PS1: > What I feat is that this will simply become stuck at that libosmocore version, and then we have an e […] We also pinned the libosmocore version for osmo-ccid-firmware. I improved the check and add an env for it. -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/43281?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I753d634674f76c50e1a9cf67e5adc43201d54f0c Gerrit-Change-Number: 43281 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 18 Aug 2026 15:39:52 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in libosmocore[master]: tests/sms: Validate gsm_septet_pack2() succeeds
by fixeria 18 Aug '26

18 Aug '26

Attention is currently required from: pespin. fixeria has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmocore/+/43265?usp=email ) Change subject: tests/sms: Validate gsm_septet_pack2() succeeds ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/43265?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I12583ce07e7885974225ce0118f737c4a5f9bcfd Gerrit-Change-Number: 43265 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 18 Aug 2026 15:39:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in simtrace2[master]: contrib/jenkins.sh: pin libosmocore to the last release
by pespin 18 Aug '26

18 Aug '26

Attention is currently required from: laforge, lynxis lazus, osmith. pespin has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/simtrace2/+/43281?usp=email ) Change subject: contrib/jenkins.sh: pin libosmocore to the last release ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/43281?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I753d634674f76c50e1a9cf67e5adc43201d54f0c Gerrit-Change-Number: 43281 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Tue, 18 Aug 2026 15:39:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in simtrace2[master]: contrib/jenkins.sh: pin libosmocore to the last release
by lynxis lazus 18 Aug '26

18 Aug '26

Attention is currently required from: laforge, lynxis lazus, osmith. Hello Jenkins Builder, laforge, osmith, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/simtrace2/+/43281?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+1 by osmith, Verified+1 by Jenkins Builder Change subject: contrib/jenkins.sh: pin libosmocore to the last release ...................................................................... contrib/jenkins.sh: pin libosmocore to the last release Ensure the libosmocore version doesn't move while building firmwares which are published. This improve reproducible builds. Change-Id: I753d634674f76c50e1a9cf67e5adc43201d54f0c --- M contrib/jenkins.sh 1 file changed, 6 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/81/43281/2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/43281?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I753d634674f76c50e1a9cf67e5adc43201d54f0c Gerrit-Change-Number: 43281 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu>

1 0

[L] Change in osmo-ttcn3-hacks[master]: DIAMETER: Get Rid of DIAMETER_ConnHdlr_CT in several testsuites
by pespin 18 Aug '26

18 Aug '26

Attention is currently required from: pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43284?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: DIAMETER: Get Rid of DIAMETER_ConnHdlr_CT in several testsuites ...................................................................... DIAMETER: Get Rid of DIAMETER_ConnHdlr_CT in several testsuites A man-in-the-middle component DIAMETER_ConnHdlr_CT was used so far for tests willing to use multiple DIAMETER_ConnHdlr connected to a single component served by multiple DIAMETER_Emulation. Remove the need for this component by modifying the DIAMETER_ConnHdlr component to have an array of ports. This way the same ConnHdlr can be registered on multiple DIAMETER_Emulation components directly. Change-Id: Id88b88d2f3472e1f4daa8344ca1fc6d408edfb62 --- M dia2gsup/DIA2GSUP_Tests.ttcn M epdg/EPDG_Tests.ttcn M hss/HSS_Tests.ttcn M library/DIAMETER_Emulation.ttcn M mme/ConnHdlr.ttcn M mme/MME_Tests.ttcn M pcrf/PCRF_Tests.ttcn M pgw/PGW_Tests.ttcn 8 files changed, 153 insertions(+), 304 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/84/43284/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43284?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id88b88d2f3472e1f4daa8344ca1fc6d408edfb62 Gerrit-Change-Number: 43284 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in libosmocore[master]: linuxlist: drop no-op prefetch() calls
by laforge 18 Aug '26

18 Aug '26

Attention is currently required from: fixeria. laforge has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/libosmocore/+/43151?usp=email ) Change subject: linuxlist: drop no-op prefetch() calls ...................................................................... Patch Set 3: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/43151?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id84973330df44b4efdd1bd85e4b7c3cb88642f92 Gerrit-Change-Number: 43151 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 18 Aug 2026 15:33:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in osmo-msc[master]: iu: Fix encoding of IPv6 RTP address in RAB Ass Req
by pespin 18 Aug '26

18 Aug '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/43259?usp=email ) Change subject: iu: Fix encoding of IPv6 RTP address in RAB Ass Req ...................................................................... iu: Fix encoding of IPv6 RTP address in RAB Ass Req Use the newly added ranap_new_msg_rab_assign_voice2() API from osmo-iuh, which allows passing a struct osmo_sockaddr hence supporting IPv6. This way we get rid of the use of deprecated inet_addr() API. Also make sure to avoid crashing if the function fails (return NULL). Depends: osmo-iuh.git I3a8800afd03b94349c8acec778ab7003819e80af Change-Id: I23298235f4457bd556d2291d81c4aed3f009af0f --- M TODO-RELEASE M src/libmsc/ran_msg_iu.c 2 files changed, 16 insertions(+), 8 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/TODO-RELEASE b/TODO-RELEASE index 84a2985..0a60dbb 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -10,3 +10,4 @@ libosmovty >=1.12.1 working optional-multi-choice libosmocore >1.12.0 log_get_context(), log_{get,set}_filter(_data)() libosmogsm >1.14.1 gsm_septet_pack2() +osmo-iuh >1.8.0 ranap_new_msg_rab_assign_voice2() diff --git a/src/libmsc/ran_msg_iu.c b/src/libmsc/ran_msg_iu.c index 37cdf10..823c91b 100644 --- a/src/libmsc/ran_msg_iu.c +++ b/src/libmsc/ran_msg_iu.c @@ -348,7 +348,7 @@ { struct msgb *msg; bool use_x213_nsap; - uint32_t cn_rtp_ip; + struct osmo_sockaddr cn_rtp_addr = {}; static uint8_t next_rab_id = 1; uint8_t rab_id = next_rab_id; @@ -356,22 +356,29 @@ if (!next_rab_id) next_rab_id = 1; - cn_rtp_ip = osmo_htonl(inet_addr(ac->cn_rtp->ip)); - - if (cn_rtp_ip == INADDR_NONE) { - LOG_RAN_IU_ENC(caller_fi, LOGL_ERROR, "Error during RAB Assignment: invalid RTP IP-Address\n"); - return NULL; - } + OSMO_ASSERT(ac->cn_rtp); if (ac->cn_rtp->port == 0) { LOG_RAN_IU_ENC(caller_fi, LOGL_ERROR, "Error during RAB Assignment: invalid RTP port\n"); return NULL; } + if (osmo_sockaddr_str_to_osa(ac->cn_rtp, &cn_rtp_addr) < 0) { + LOG_RAN_IU_ENC(caller_fi, LOGL_ERROR, "Error during RAB Assignment: invalid RTP IP-Address\n"); + return NULL; + } + use_x213_nsap = (ac->rab_assign_addr_enc == NSAP_ADDR_ENC_X213); LOG_RAN_IU_ENC(caller_fi, LOGL_DEBUG, "RAB Assignment: rab_id=%d, rtp=" OSMO_SOCKADDR_STR_FMT ", use_x213_nsap=%d\n", rab_id, OSMO_SOCKADDR_STR_FMT_ARGS(ac->cn_rtp), use_x213_nsap); - msg = ranap_new_msg_rab_assign_voice(rab_id, cn_rtp_ip, ac->cn_rtp->port, use_x213_nsap); + msg = ranap_new_msg_rab_assign_voice2(rab_id, &cn_rtp_addr, use_x213_nsap); + if (!msg) { + LOG_RAN_IU_ENC(caller_fi, LOGL_ERROR, + "Error during RAB Assignment: Encoding failed rab_id=%d, rtp=" + OSMO_SOCKADDR_STR_FMT ", use_x213_nsap=%d\n", + rab_id, OSMO_SOCKADDR_STR_FMT_ARGS(ac->cn_rtp), use_x213_nsap); + return NULL; + } msg->l2h = msg->data; return msg; -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/43259?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I23298235f4457bd556d2291d81c4aed3f009af0f Gerrit-Change-Number: 43259 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log August 2026