From 118d62d42df5037665b93698cfaa67d34a7519ec Mon Sep 17 00:00:00 2001 From: Sukchan Lee Date: Sun, 6 Jun 2021 22:35:46 +0900 Subject: [PATCH] Add more memory log --- lib/asn1c/common/asn_internal.h | 6 +- lib/asn1c/util/message.c | 2 +- lib/core/ogs-3gpp-types.c | 26 ++- lib/core/ogs-conv.c | 4 +- lib/core/ogs-epoll.c | 2 +- lib/core/ogs-hash.c | 6 +- lib/core/ogs-kqueue.c | 1 + lib/core/ogs-memory.c | 43 +++- lib/core/ogs-memory.h | 22 +- lib/core/ogs-pkbuf.c | 43 ++-- lib/core/ogs-pkbuf.h | 4 +- lib/core/ogs-poll.c | 2 +- lib/core/ogs-queue.c | 2 + lib/core/ogs-sockaddr.c | 6 + lib/core/ogs-socket.c | 2 +- lib/core/ogs-socknode.c | 5 +- lib/core/ogs-strings.c | 29 ++- lib/core/ogs-strings.h | 37 ++-- lib/core/ogs-thread.c | 2 +- lib/core/ogs-timer.c | 2 +- lib/core/ogs-tlv-msg.h | 1 + lib/crypt/snow-3g.c | 2 +- lib/crypt/zuc.c | 4 +- lib/dbi/ogs-mongoc.c | 1 + lib/dbi/session.c | 1 + lib/gtp/build.c | 2 +- lib/gtp/context.c | 16 +- lib/gtp/conv.c | 29 ++- lib/gtp/path.c | 2 +- lib/nas/5gs/conv.c | 17 +- lib/nas/5gs/decoder.c | 2 +- lib/nas/5gs/encoder.c | 6 +- lib/nas/5gs/ies.c | 2 +- lib/nas/5gs/ies.h | 2 +- lib/nas/5gs/message.h | 2 +- lib/nas/5gs/support/nas-message.py | 4 +- lib/nas/5gs/types.c | 25 ++- lib/nas/5gs/types.h | 6 +- lib/nas/common/types.h | 1 + lib/nas/eps/decoder.c | 2 +- lib/nas/eps/encoder.c | 6 +- lib/nas/eps/ies.c | 2 +- lib/nas/eps/ies.h | 2 +- lib/nas/eps/message.h | 2 +- lib/nas/eps/support/nas-message.py | 4 +- lib/nas/eps/types.c | 12 +- lib/nas/eps/types.h | 2 +- lib/ngap/message.c | 5 +- lib/pfcp/build.c | 22 +- lib/pfcp/context.c | 36 +-- lib/pfcp/context.h | 4 +- lib/pfcp/conv.c | 69 +++--- lib/pfcp/conv.h | 2 +- lib/pfcp/handler.c | 50 +++-- lib/pfcp/handler.h | 16 +- lib/pfcp/path.c | 58 +++-- lib/pfcp/path.h | 14 +- lib/s1ap/message.c | 5 +- lib/sbi/client.c | 35 ++- lib/sbi/client.h | 2 +- lib/sbi/context.c | 27 ++- lib/sbi/conv.c | 32 +-- lib/sbi/message.c | 85 ++++--- lib/sbi/mhd-server.c | 19 +- lib/sbi/nghttp2-server.c | 28 ++- lib/sbi/nnrf-build.c | 54 +++-- lib/sbi/nnrf-handler.c | 27 ++- .../templates/apiKey.c.mustache | 2 + .../templates/cJSON.c.mustache | 4 +- .../templates/list.c.mustache | 2 + .../templates/list.h.mustache | 2 +- .../templates/model-body.mustache | 18 +- .../templates/object-body.mustache | 1 + lib/sbi/openapi/external/cJSON.c | 4 +- lib/sbi/openapi/include/list.h | 2 +- lib/sbi/openapi/model/acc_net_ch_id.c | 2 +- .../openapi/model/acc_net_charging_address.c | 4 +- .../openapi/model/acceptable_service_info.c | 4 +- .../openapi/model/access_and_mobility_data.c | 20 +- .../access_and_mobility_subscription_data.c | 14 +- lib/sbi/openapi/model/accu_usage_report.c | 2 +- lib/sbi/openapi/model/acknowledge_info.c | 8 +- lib/sbi/openapi/model/acs_info.c | 6 +- lib/sbi/openapi/model/acs_info_rm.c | 6 +- .../openapi/model/af_event_exposure_data.c | 4 +- lib/sbi/openapi/model/af_external.c | 2 +- .../openapi/model/alternative_qos_profile.c | 6 +- lib/sbi/openapi/model/am_policy_data.c | 2 +- lib/sbi/openapi/model/ambr.c | 4 +- lib/sbi/openapi/model/ambr_rm.c | 4 +- .../model/amf3_gpp_access_registration.c | 18 +- ...mf3_gpp_access_registration_modification.c | 2 +- lib/sbi/openapi/model/amf_cond.c | 4 +- lib/sbi/openapi/model/amf_event_mode.c | 2 +- .../openapi/model/amf_event_subscription.c | 18 +- lib/sbi/openapi/model/amf_info.c | 4 +- .../model/amf_non3_gpp_access_registration.c | 18 +- ...on3_gpp_access_registration_modification.c | 2 +- .../amf_status_change_subscription_data.c | 2 +- lib/sbi/openapi/model/amf_status_info.c | 4 +- lib/sbi/openapi/model/amf_subscription_info.c | 6 +- lib/sbi/openapi/model/an_gw_address.c | 4 +- lib/sbi/openapi/model/apn_rate_status.c | 2 +- lib/sbi/openapi/model/app_descriptor.c | 4 +- lib/sbi/openapi/model/app_detection_info.c | 4 +- .../model/app_session_context_req_data.c | 38 ++-- .../model/app_session_context_resp_data.c | 2 +- .../model/app_session_context_update_data.c | 16 +- .../model/application_data_change_notif.c | 2 +- lib/sbi/openapi/model/application_data_subs.c | 6 +- lib/sbi/openapi/model/area.c | 4 +- lib/sbi/openapi/model/area_scope.c | 6 +- lib/sbi/openapi/model/atom.c | 4 +- lib/sbi/openapi/model/ausf_info.c | 4 +- lib/sbi/openapi/model/auth_event.c | 6 +- lib/sbi/openapi/model/authentication_info.c | 12 +- .../model/authentication_info_request.c | 8 +- .../model/authentication_info_result.c | 4 +- .../model/authentication_subscription.c | 14 +- lib/sbi/openapi/model/authentication_vector.c | 14 +- lib/sbi/openapi/model/authorization_data.c | 2 +- .../openapi/model/authorized_default_qos.c | 8 +- .../model/authorized_network_slice_info.c | 14 +- lib/sbi/openapi/model/av5_g_he_aka.c | 8 +- lib/sbi/openapi/model/av5g_aka.c | 6 +- lib/sbi/openapi/model/av_eap_aka_prime.c | 10 +- lib/sbi/openapi/model/av_eps_aka.c | 8 +- lib/sbi/openapi/model/av_ims_gba_eap_aka.c | 10 +- lib/sbi/openapi/model/backup_amf_info.c | 2 +- lib/sbi/openapi/model/bdt_data.c | 6 +- lib/sbi/openapi/model/bdt_policy_data.c | 8 +- lib/sbi/openapi/model/bdt_policy_data_patch.c | 2 +- lib/sbi/openapi/model/binding_resp.c | 2 +- lib/sbi/openapi/model/bsf_info.c | 4 +- lib/sbi/openapi/model/cag_ack_data.c | 2 +- lib/sbi/openapi/model/cag_data.c | 2 +- lib/sbi/openapi/model/cag_info.c | 2 +- .../openapi/model/candidate_for_replacement.c | 2 +- lib/sbi/openapi/model/change_item.c | 8 +- lib/sbi/openapi/model/charging_data.c | 8 +- lib/sbi/openapi/model/charging_information.c | 12 +- lib/sbi/openapi/model/chf_info.c | 2 +- lib/sbi/openapi/model/chf_service_info.c | 4 +- lib/sbi/openapi/model/civic_address.c | 62 +++--- lib/sbi/openapi/model/condition_data.c | 6 +- lib/sbi/openapi/model/confirmation_data.c | 2 +- .../model/confirmation_data_response.c | 4 +- lib/sbi/openapi/model/context_info.c | 2 +- lib/sbi/openapi/model/data_change_notify.c | 4 +- lib/sbi/openapi/model/data_filter.c | 14 +- .../model/datalink_reporting_configuration.c | 2 +- .../openapi/model/ddd_traffic_descriptor.c | 6 +- lib/sbi/openapi/model/ddn_failure_sub_info.c | 2 +- .../model/default_notification_subscription.c | 6 +- .../openapi/model/default_unrelated_class.c | 2 +- lib/sbi/openapi/model/deregistration_data.c | 2 +- lib/sbi/openapi/model/dnai_information.c | 2 +- lib/sbi/openapi/model/dnn_configuration.c | 4 +- lib/sbi/openapi/model/dnn_info.c | 4 +- .../model/dnn_route_selection_descriptor.c | 2 +- lib/sbi/openapi/model/dnn_smf_info_item.c | 2 +- lib/sbi/openapi/model/dnn_upf_info_item.c | 4 +- lib/sbi/openapi/model/dynamic5_qi.c | 2 +- lib/sbi/openapi/model/eap_session.c | 6 +- lib/sbi/openapi/model/ec_restriction.c | 4 +- lib/sbi/openapi/model/ecgi.c | 4 +- lib/sbi/openapi/model/edrx_parameters.c | 2 +- lib/sbi/openapi/model/ee_profile_data.c | 2 +- lib/sbi/openapi/model/ee_subscription.c | 12 +- lib/sbi/openapi/model/emergency_info.c | 4 +- lib/sbi/openapi/model/eps_iwk_pgw.c | 4 +- lib/sbi/openapi/model/eth_flow_description.c | 14 +- lib/sbi/openapi/model/eutra_location.c | 6 +- lib/sbi/openapi/model/events_notification.c | 4 +- lib/sbi/openapi/model/events_subsc_req_data.c | 4 +- .../openapi/model/events_subsc_req_data_rm.c | 4 +- lib/sbi/openapi/model/expected_ue_behavior.c | 2 +- lib/sbi/openapi/model/expected_ue_behaviour.c | 6 +- .../model/expected_ue_behaviour_data.c | 2 +- .../model/exposure_data_change_notification.c | 4 +- .../model/exposure_data_subscription.c | 8 +- lib/sbi/openapi/model/ext_problem_details.c | 14 +- lib/sbi/openapi/model/ext_snssai.c | 2 +- .../openapi/model/extended_problem_details.c | 14 +- lib/sbi/openapi/model/flow_info.c | 2 +- lib/sbi/openapi/model/flow_information.c | 10 +- lib/sbi/openapi/model/frame_route_info.c | 4 +- lib/sbi/openapi/model/g_nb_id.c | 2 +- .../openapi/model/gbr_qos_flow_information.c | 8 +- lib/sbi/openapi/model/global_ran_node_id.c | 12 +- lib/sbi/openapi/model/group_identifiers.c | 4 +- lib/sbi/openapi/model/guami.c | 2 +- lib/sbi/openapi/model/hfc_node_id.c | 2 +- lib/sbi/openapi/model/hsmf_update_data.c | 20 +- lib/sbi/openapi/model/hsmf_update_error.c | 4 +- lib/sbi/openapi/model/hsmf_updated_data.c | 4 +- .../model/hss_authentication_info_request.c | 2 +- .../model/hss_authentication_info_result.c | 2 +- lib/sbi/openapi/model/hss_info.c | 2 +- lib/sbi/openapi/model/id_translation_result.c | 6 +- lib/sbi/openapi/model/identity_data.c | 4 +- lib/sbi/openapi/model/identity_range.c | 6 +- lib/sbi/openapi/model/imsi_range.c | 6 +- .../indirect_data_forwarding_tunnel_info.c | 6 +- .../openapi/model/interface_upf_info_item.c | 8 +- .../openapi/model/internal_group_id_range.c | 6 +- lib/sbi/openapi/model/invalid_param.c | 4 +- lib/sbi/openapi/model/ip_address.c | 6 +- lib/sbi/openapi/model/ip_end_point.c | 4 +- .../openapi/model/ip_multicast_address_info.c | 8 +- lib/sbi/openapi/model/ip_sm_gw_registration.c | 2 +- lib/sbi/openapi/model/iptv_config_data.c | 10 +- lib/sbi/openapi/model/ipv4_address_range.c | 4 +- lib/sbi/openapi/model/ipv6_prefix_range.c | 4 +- lib/sbi/openapi/model/key_amf.c | 2 +- lib/sbi/openapi/model/ladn_info.c | 2 +- .../openapi/model/lcs_client_group_external.c | 2 +- lib/sbi/openapi/model/lcs_privacy.c | 4 +- .../model/limit_id_to_monitoring_key.c | 4 +- lib/sbi/openapi/model/link.c | 2 +- lib/sbi/openapi/model/links_value_schema.c | 2 +- lib/sbi/openapi/model/lmf_info.c | 2 +- lib/sbi/openapi/model/location_info.c | 6 +- lib/sbi/openapi/model/media_component.c | 30 +-- lib/sbi/openapi/model/media_component_rm.c | 30 +-- lib/sbi/openapi/model/media_sub_component.c | 8 +- .../openapi/model/media_sub_component_rm.c | 8 +- lib/sbi/openapi/model/mm_context.c | 4 +- lib/sbi/openapi/model/mo_exp_data_counter.c | 2 +- .../model/model_5_g_vn_group_configuration.c | 8 +- .../openapi/model/model_5_g_vn_group_data.c | 2 +- .../openapi/model/monitoring_configuration.c | 4 +- .../openapi/model/multicast_access_control.c | 8 +- lib/sbi/openapi/model/n1_message_container.c | 4 +- .../openapi/model/n1_message_notification.c | 6 +- .../model/n1_n2_message_transfer_req_data.c | 6 +- .../model/n1_n2_message_transfer_rsp_data.c | 2 +- .../n1_n2_msg_txfr_failure_notification.c | 2 +- .../model/n2_information_notification.c | 10 +- .../model/n2_information_transfer_req_data.c | 2 +- .../model/n2_information_transfer_rsp_data.c | 2 +- lib/sbi/openapi/model/n2_interface_amf_info.c | 6 +- lib/sbi/openapi/model/n3ga_location.c | 8 +- lib/sbi/openapi/model/ncgi.c | 4 +- lib/sbi/openapi/model/nef_info.c | 4 +- .../model/network_node_diameter_address.c | 4 +- lib/sbi/openapi/model/network_slice_cond.c | 2 +- lib/sbi/openapi/model/nf_group_cond.c | 2 +- lib/sbi/openapi/model/nf_instance_id_cond.c | 2 +- .../openapi/model/nf_instance_id_list_cond.c | 2 +- lib/sbi/openapi/model/nf_profile.c | 28 +-- lib/sbi/openapi/model/nf_service.c | 22 +- lib/sbi/openapi/model/nf_service_set_cond.c | 2 +- lib/sbi/openapi/model/nf_service_version.c | 6 +- lib/sbi/openapi/model/nf_set_cond.c | 2 +- lib/sbi/openapi/model/nidd_information.c | 6 +- .../non_ue_n2_info_subscription_create_data.c | 6 +- ...non_ue_n2_info_subscription_created_data.c | 4 +- lib/sbi/openapi/model/notif_condition.c | 4 +- lib/sbi/openapi/model/notification_data.c | 2 +- lib/sbi/openapi/model/notification_item.c | 2 +- lib/sbi/openapi/model/notify_item.c | 2 +- lib/sbi/openapi/model/nr_location.c | 6 +- lib/sbi/openapi/model/nrppa_information.c | 4 +- lib/sbi/openapi/model/nsi_information.c | 8 +- lib/sbi/openapi/model/nssai.c | 4 +- lib/sbi/openapi/model/nssai_ack_data.c | 2 +- lib/sbi/openapi/model/nwdaf_cond.c | 2 +- lib/sbi/openapi/model/object.c | 1 + .../model/operator_specific_data_container.c | 6 +- lib/sbi/openapi/model/options_response.c | 2 +- lib/sbi/openapi/model/packet_filter_info.c | 10 +- lib/sbi/openapi/model/parameter_combination.c | 4 +- lib/sbi/openapi/model/parameter_over_pc5.c | 2 +- lib/sbi/openapi/model/parameter_over_uu.c | 2 +- lib/sbi/openapi/model/patch_item.c | 6 +- lib/sbi/openapi/model/pc5_flow_bit_rates.c | 4 +- lib/sbi/openapi/model/pc5_qo_s_para.c | 2 +- lib/sbi/openapi/model/pc5_qos_mapping.c | 2 +- lib/sbi/openapi/model/pcc_rule.c | 22 +- lib/sbi/openapi/model/pcf_binding.c | 38 ++-- lib/sbi/openapi/model/pcf_binding_patch.c | 20 +- lib/sbi/openapi/model/pcf_info.c | 8 +- lib/sbi/openapi/model/pcscf_info.c | 8 +- .../model/pcscf_restoration_notification.c | 2 +- .../model/pcscf_restoration_request_data.c | 10 +- lib/sbi/openapi/model/pdu_session.c | 4 +- lib/sbi/openapi/model/pdu_session_context.c | 26 +-- .../openapi/model/pdu_session_create_data.c | 48 ++-- .../openapi/model/pdu_session_create_error.c | 4 +- .../openapi/model/pdu_session_created_data.c | 26 +-- .../model/pdu_session_management_data.c | 18 +- .../openapi/model/pdu_session_status_cfg.c | 2 +- lib/sbi/openapi/model/pei_update_info.c | 2 +- .../openapi/model/pfd_change_notification.c | 2 +- lib/sbi/openapi/model/pfd_content.c | 8 +- lib/sbi/openapi/model/pfd_data.c | 4 +- lib/sbi/openapi/model/pfd_data_for_app.c | 4 +- lib/sbi/openapi/model/pfd_data_for_app_ext.c | 6 +- .../model/pfd_data_for_app_ext_all_of.c | 2 +- lib/sbi/openapi/model/pgw_info.c | 4 +- lib/sbi/openapi/model/plmn_id.c | 4 +- lib/sbi/openapi/model/plmn_id_nid.c | 6 +- lib/sbi/openapi/model/plmn_operator_class.c | 2 +- lib/sbi/openapi/model/plmn_range.c | 6 +- lib/sbi/openapi/model/plmn_snssai.c | 2 +- lib/sbi/openapi/model/policy_association.c | 2 +- .../model/policy_association_request.c | 20 +- .../model/policy_association_update_request.c | 6 +- .../model/policy_data_change_notification.c | 12 +- .../openapi/model/policy_data_subscription.c | 10 +- lib/sbi/openapi/model/policy_update.c | 2 +- lib/sbi/openapi/model/pp_active_time.c | 6 +- lib/sbi/openapi/model/pp_data.c | 4 +- .../openapi/model/pp_dl_packet_count_ext.c | 6 +- lib/sbi/openapi/model/pp_maximum_latency.c | 6 +- .../openapi/model/pp_maximum_response_time.c | 6 +- lib/sbi/openapi/model/pp_subs_reg_timer.c | 6 +- lib/sbi/openapi/model/presence_info.c | 4 +- lib/sbi/openapi/model/presence_info_rm.c | 4 +- lib/sbi/openapi/model/privacy_parameter.c | 4 +- lib/sbi/openapi/model/problem_details.c | 14 +- lib/sbi/openapi/model/problem_details_2.c | 14 +- lib/sbi/openapi/model/psa_information.c | 6 +- lib/sbi/openapi/model/ptw_parameters.c | 2 +- lib/sbi/openapi/model/pws_information.c | 2 +- lib/sbi/openapi/model/qos_characteristics.c | 2 +- lib/sbi/openapi/model/qos_data.c | 14 +- lib/sbi/openapi/model/qos_flow_usage_report.c | 4 +- lib/sbi/openapi/model/qos_monitoring_data.c | 6 +- .../model/qos_notification_control_info.c | 2 +- .../model/radio_parameter_not_served.c | 4 +- lib/sbi/openapi/model/redirect_information.c | 2 +- lib/sbi/openapi/model/ref_to_binary_data.c | 2 +- .../model/registration_context_container.c | 10 +- .../model/registration_location_info.c | 2 +- lib/sbi/openapi/model/release_data.c | 2 +- lib/sbi/openapi/model/report_item.c | 2 +- lib/sbi/openapi/model/reporting_options.c | 2 +- lib/sbi/openapi/model/requested_qos.c | 4 +- lib/sbi/openapi/model/requested_rule_data.c | 2 +- lib/sbi/openapi/model/requested_usage_data.c | 2 +- lib/sbi/openapi/model/resource_item.c | 4 +- .../openapi/model/resynchronization_info.c | 4 +- lib/sbi/openapi/model/rg_auth_ctx.c | 2 +- .../openapi/model/rg_authentication_info.c | 2 +- lib/sbi/openapi/model/route_information.c | 4 +- lib/sbi/openapi/model/route_to_location.c | 4 +- lib/sbi/openapi/model/rule_report.c | 2 +- .../model/scheduled_communication_time.c | 4 +- .../model/scheduled_communication_time_rm.c | 4 +- lib/sbi/openapi/model/scp_domain_cond.c | 2 +- lib/sbi/openapi/model/scp_domain_info.c | 4 +- lib/sbi/openapi/model/scp_info.c | 10 +- lib/sbi/openapi/model/sd_range.c | 4 +- lib/sbi/openapi/model/sdm_subs_modification.c | 4 +- lib/sbi/openapi/model/sdm_subscription.c | 16 +- lib/sbi/openapi/model/seaf_data.c | 2 +- lib/sbi/openapi/model/search_result.c | 4 +- lib/sbi/openapi/model/sequence_number.c | 2 +- .../service_application_server_address.c | 10 +- .../openapi/model/service_id_to_frequency.c | 4 +- .../openapi/model/service_id_to_layer2_id.c | 4 +- lib/sbi/openapi/model/service_id_to_pppr.c | 2 +- lib/sbi/openapi/model/service_name_cond.c | 2 +- .../openapi/model/service_parameter_data.c | 16 +- .../openapi/model/service_to_pdu_session.c | 4 +- lib/sbi/openapi/model/service_to_tx.c | 4 +- .../model/service_type_unrelated_class.c | 2 +- lib/sbi/openapi/model/serving_nf_identity.c | 2 +- .../session_management_subscription_data.c | 8 +- lib/sbi/openapi/model/session_rule.c | 8 +- lib/sbi/openapi/model/session_rule_report.c | 2 +- lib/sbi/openapi/model/shared_data.c | 2 +- lib/sbi/openapi/model/slrb_configurations.c | 2 +- lib/sbi/openapi/model/sm_context.c | 40 ++-- .../openapi/model/sm_context_create_data.c | 64 +++--- .../openapi/model/sm_context_create_error.c | 2 +- .../openapi/model/sm_context_created_data.c | 16 +- .../openapi/model/sm_context_release_data.c | 2 +- .../openapi/model/sm_context_retrieved_data.c | 2 +- .../model/sm_context_status_notification.c | 10 +- .../openapi/model/sm_context_update_data.c | 16 +- .../openapi/model/sm_context_update_error.c | 2 +- .../openapi/model/sm_context_updated_data.c | 10 +- .../openapi/model/sm_policy_context_data.c | 30 +-- lib/sbi/openapi/model/sm_policy_data.c | 2 +- lib/sbi/openapi/model/sm_policy_decision.c | 4 +- lib/sbi/openapi/model/sm_policy_delete_data.c | 4 +- lib/sbi/openapi/model/sm_policy_dnn_data.c | 10 +- .../openapi/model/sm_policy_dnn_data_patch.c | 2 +- .../openapi/model/sm_policy_notification.c | 2 +- .../model/sm_policy_update_context_data.c | 24 +- .../openapi/model/small_data_rate_status.c | 2 +- .../model/small_data_rate_status_info.c | 2 +- lib/sbi/openapi/model/smf_info.c | 2 +- lib/sbi/openapi/model/smf_registration.c | 16 +- lib/sbi/openapi/model/smf_selection_data.c | 2 +- .../model/smf_selection_subscription_data.c | 4 +- .../model/sms_management_subscription_data.c | 4 +- lib/sbi/openapi/model/sms_subscription_data.c | 2 +- lib/sbi/openapi/model/smsc_data.c | 2 +- lib/sbi/openapi/model/smsf_info.c | 2 +- lib/sbi/openapi/model/smsf_registration.c | 10 +- lib/sbi/openapi/model/snssai.c | 2 +- lib/sbi/openapi/model/sor_data.c | 6 +- lib/sbi/openapi/model/sor_info.c | 6 +- .../openapi/model/sponsor_connectivity_data.c | 2 +- lib/sbi/openapi/model/subscription_data.c | 14 +- .../model/subscription_data_subscr_cond.c | 18 +- .../model/subscription_data_subscriptions.c | 14 +- .../openapi/model/suggested_packet_num_dl.c | 2 +- lib/sbi/openapi/model/supi_range.c | 6 +- lib/sbi/openapi/model/tac_info.c | 2 +- lib/sbi/openapi/model/tac_range.c | 6 +- lib/sbi/openapi/model/tai.c | 4 +- lib/sbi/openapi/model/tai_range.c | 2 +- lib/sbi/openapi/model/temporal_validity.c | 4 +- lib/sbi/openapi/model/termination_info.c | 2 +- .../openapi/model/termination_notification.c | 2 +- lib/sbi/openapi/model/time_window.c | 4 +- lib/sbi/openapi/model/tnap_id.c | 4 +- lib/sbi/openapi/model/tngf_info.c | 6 +- lib/sbi/openapi/model/trace_data.c | 12 +- lib/sbi/openapi/model/trace_data_response.c | 2 +- lib/sbi/openapi/model/traffic_control_data.c | 6 +- lib/sbi/openapi/model/traffic_descriptor.c | 2 +- lib/sbi/openapi/model/traffic_influ_data.c | 18 +- .../openapi/model/traffic_influ_data_notif.c | 2 +- .../openapi/model/traffic_influ_data_patch.c | 14 +- lib/sbi/openapi/model/traffic_influ_sub.c | 12 +- .../openapi/model/transfer_mt_data_error.c | 14 +- lib/sbi/openapi/model/transfer_policy.c | 4 +- lib/sbi/openapi/model/trigger_request.c | 2 +- lib/sbi/openapi/model/tscai_input_container.c | 2 +- lib/sbi/openapi/model/tsn_bridge_info.c | 4 +- lib/sbi/openapi/model/tsn_port_identifier.c | 2 +- lib/sbi/openapi/model/tunnel_info.c | 6 +- lib/sbi/openapi/model/twap_id.c | 4 +- lib/sbi/openapi/model/twif_info.c | 6 +- lib/sbi/openapi/model/udm_info.c | 4 +- lib/sbi/openapi/model/udr_info.c | 2 +- lib/sbi/openapi/model/udsf_info.c | 2 +- lib/sbi/openapi/model/ue_authentication_ctx.c | 2 +- lib/sbi/openapi/model/ue_camping_rep.c | 2 +- lib/sbi/openapi/model/ue_context.c | 36 +-- .../openapi/model/ue_context_create_data.c | 4 +- .../openapi/model/ue_context_created_data.c | 2 +- lib/sbi/openapi/model/ue_context_release.c | 2 +- .../model/ue_context_transfer_req_data.c | 2 +- .../model/ue_context_transfer_rsp_data.c | 2 +- lib/sbi/openapi/model/ue_id.c | 4 +- lib/sbi/openapi/model/ue_identity_info.c | 6 +- .../model/ue_initiated_resource_request.c | 2 +- .../ue_n1_n2_info_subscription_create_data.c | 8 +- .../ue_n1_n2_info_subscription_created_data.c | 4 +- lib/sbi/openapi/model/ue_policy_section.c | 2 +- lib/sbi/openapi/model/ue_policy_set.c | 8 +- lib/sbi/openapi/model/ue_policy_set_patch.c | 6 +- lib/sbi/openapi/model/ulcl_bp_information.c | 2 +- lib/sbi/openapi/model/up_path_chg_event.c | 4 +- lib/sbi/openapi/model/updated_item.c | 4 +- lib/sbi/openapi/model/upf_cond.c | 2 +- lib/sbi/openapi/model/upf_info.c | 2 +- lib/sbi/openapi/model/upu_data.c | 6 +- lib/sbi/openapi/model/upu_data_2.c | 4 +- lib/sbi/openapi/model/upu_info.c | 6 +- lib/sbi/openapi/model/usage_mon_data.c | 2 +- lib/sbi/openapi/model/usage_mon_data_limit.c | 8 +- lib/sbi/openapi/model/usage_mon_data_scope.c | 2 +- lib/sbi/openapi/model/usage_monitoring_data.c | 6 +- lib/sbi/openapi/model/user_identifier.c | 6 +- lib/sbi/openapi/model/v2x_context.c | 4 +- lib/sbi/openapi/model/v2x_subscription_data.c | 4 +- lib/sbi/openapi/model/valid_time_period.c | 4 +- .../openapi/model/vendor_specific_feature.c | 4 +- lib/sbi/openapi/model/vgmlc_address.c | 6 +- lib/sbi/openapi/model/vn_group_data.c | 2 +- lib/sbi/openapi/model/volume_timed_report.c | 4 +- lib/sbi/openapi/model/vplmn_qos.c | 8 +- lib/sbi/openapi/model/vsmf_update_data.c | 8 +- lib/sbi/openapi/model/vsmf_update_error.c | 4 +- lib/sbi/openapi/model/vsmf_updated_data.c | 2 +- lib/sbi/openapi/model/w_agf_info.c | 6 +- lib/sbi/openapi/model/wireline_area.c | 6 +- lib/sbi/openapi/src/apiKey.c | 2 + lib/sbi/openapi/src/list.c | 2 + lib/sbi/path.c | 85 ++++--- lib/sbi/path.h | 16 +- lib/sbi/server.c | 18 +- lib/sbi/server.h | 8 +- lib/sbi/support/README.md | 4 +- lib/sctp/ogs-sctp.c | 1 + src/amf/amf-sm.c | 62 ++++-- src/amf/context.c | 5 + src/amf/context.h | 2 + src/amf/gmm-build.c | 5 +- src/amf/gmm-handler.c | 28 ++- src/amf/gmm-sm.c | 62 ++++-- src/amf/namf-handler.c | 6 +- src/amf/nas-path.c | 16 +- src/amf/nausf-build.c | 7 +- src/amf/nausf-handler.c | 1 + src/amf/nf-sm.c | 34 +-- src/amf/ngap-handler.c | 45 ++-- src/amf/ngap-path.c | 10 +- src/amf/ngap-path.h | 4 +- src/amf/nnrf-build.c | 2 +- src/amf/nnrf-handler.c | 50 +++-- src/amf/nnssf-handler.c | 4 +- src/amf/npcf-build.c | 18 +- src/amf/npcf-handler.c | 1 + src/amf/nsmf-build.c | 56 +++-- src/amf/nsmf-handler.c | 6 +- src/amf/nudm-handler.c | 19 +- src/amf/sbi-path.c | 47 ++-- src/amf/sbi-path.h | 12 +- src/ausf/ausf-sm.c | 44 ++-- src/ausf/context.c | 2 + src/ausf/nausf-handler.c | 31 ++- src/ausf/nf-sm.c | 14 +- src/ausf/nnrf-build.c | 2 +- src/ausf/nnrf-handler.c | 47 ++-- src/ausf/nudm-build.c | 7 +- src/ausf/nudm-handler.c | 69 +++--- src/ausf/sbi-path.c | 38 ++-- src/ausf/sbi-path.h | 6 +- src/ausf/ue-sm.c | 12 +- src/bsf/bsf-sm.c | 49 +++-- src/bsf/context.c | 4 +- src/bsf/nbsf-handler.c | 17 +- src/bsf/nf-sm.c | 9 +- src/bsf/nnrf-build.c | 2 +- src/bsf/nnrf-handler.c | 48 ++-- src/bsf/sbi-path.c | 36 +-- src/bsf/sbi-path.h | 6 +- src/hss/hss-context.c | 3 + src/mme/emm-build.c | 10 +- src/mme/emm-sm.c | 2 +- src/mme/mme-context.c | 4 + src/mme/mme-fd-path.c | 1 + src/mme/mme-gtp-path.c | 2 +- src/mme/mme-s11-build.c | 10 +- src/mme/mme-s11-handler.c | 12 +- src/mme/nas-path.c | 12 +- src/mme/s1ap-handler.c | 2 +- src/mme/s1ap-path.c | 12 +- src/mme/s1ap-path.h | 2 +- src/mme/sgsap-build.c | 54 ++++- src/mme/sgsap-handler.c | 6 +- src/mme/sgsap-sctp.c | 1 + src/nrf/nf-sm.c | 53 +++-- src/nrf/nnrf-build.c | 10 +- src/nrf/nnrf-handler.c | 79 ++++--- src/nrf/nrf-sm.c | 46 ++-- src/nrf/sbi-path.c | 16 +- src/nrf/sbi-path.h | 4 +- src/nssf/context.c | 2 +- src/nssf/nf-sm.c | 9 +- src/nssf/nnrf-build.c | 2 +- src/nssf/nnrf-handler.c | 47 ++-- src/nssf/nnssf-handler.c | 2 +- src/nssf/nssf-sm.c | 32 ++- src/nssf/sbi-path.c | 11 +- src/nssf/sbi-path.h | 2 +- src/pcf/am-sm.c | 16 +- src/pcf/context.c | 5 +- src/pcf/nbsf-build.c | 27 ++- src/pcf/nbsf-handler.c | 9 +- src/pcf/nf-sm.c | 19 +- src/pcf/nnrf-build.c | 2 +- src/pcf/nnrf-handler.c | 50 +++-- src/pcf/npcf-handler.c | 59 +++-- src/pcf/nudr-handler.c | 14 +- src/pcf/pcf-sm.c | 56 +++-- src/pcf/sbi-path.c | 61 +++--- src/pcf/sbi-path.h | 12 +- src/pcf/sm-sm.c | 23 +- src/pcrf/pcrf-context.c | 1 + src/pcrf/pcrf-gx-path.c | 10 +- src/pcrf/pcrf-rx-path.c | 31 ++- src/sgwc/context.c | 13 +- src/sgwc/pfcp-path.c | 10 +- src/sgwc/pfcp-sm.c | 13 +- src/sgwc/s11-handler.c | 24 +- src/sgwc/s5c-handler.c | 10 +- src/sgwc/sxa-build.c | 8 +- src/sgwc/sxa-handler.c | 26 ++- src/sgwu/context.c | 1 + src/sgwu/gtp-path.c | 8 +- src/sgwu/pfcp-sm.c | 13 +- src/sgwu/sxa-build.c | 8 +- src/sgwu/sxa-handler.c | 16 +- src/smf/binding.c | 20 +- src/smf/binding.h | 2 +- src/smf/context.c | 31 ++- src/smf/fd-path.c | 5 +- src/smf/gsm-build.c | 26 ++- src/smf/gsm-handler.c | 5 +- src/smf/gsm-sm.c | 54 +++-- src/smf/gtp-path.c | 3 +- src/smf/gx-handler.c | 26 ++- src/smf/n4-build.c | 8 +- src/smf/n4-handler.c | 42 ++-- src/smf/namf-handler.c | 23 +- src/smf/nf-sm.c | 29 ++- src/smf/ngap-handler.c | 23 +- src/smf/nnrf-build.c | 31 +-- src/smf/nnrf-handler.c | 50 +++-- src/smf/npcf-build.c | 16 +- src/smf/npcf-handler.c | 26 ++- src/smf/nsmf-handler.c | 20 +- src/smf/nudm-handler.c | 14 +- src/smf/pfcp-path.c | 5 +- src/smf/pfcp-sm.c | 13 +- src/smf/s5c-build.c | 6 +- src/smf/s5c-handler.c | 14 +- src/smf/sbi-path.c | 48 ++-- src/smf/sbi-path.h | 8 +- src/smf/smf-sm.c | 56 +++-- src/udm/context.c | 2 + src/udm/nf-sm.c | 14 +- src/udm/nnrf-build.c | 2 +- src/udm/nnrf-handler.c | 50 +++-- src/udm/nudm-handler.c | 128 ++++++----- src/udm/nudr-handler.c | 207 +++++++++++------- src/udm/sbi-path.c | 33 +-- src/udm/sbi-path.h | 6 +- src/udm/udm-sm.c | 58 +++-- src/udm/ue-sm.c | 47 ++-- src/udr/nf-sm.c | 9 +- src/udr/nnrf-build.c | 2 +- src/udr/nnrf-handler.c | 48 ++-- src/udr/nudr-handler.c | 121 ++++++---- src/udr/sbi-path.c | 9 +- src/udr/sbi-path.h | 2 +- src/udr/udr-sm.c | 47 ++-- src/upf/context.c | 3 + src/upf/gtp-path.c | 33 ++- src/upf/n4-handler.c | 16 +- src/upf/pfcp-sm.c | 13 +- tests/af/af-sm.c | 37 ++-- tests/af/context.c | 6 + tests/af/nbsf-handler.c | 2 + tests/af/nf-sm.c | 14 +- tests/af/nnrf-build.c | 2 +- tests/af/nnrf-handler.c | 48 ++-- tests/af/npcf-build.c | 15 +- tests/af/sbi-path.c | 10 +- tests/af/sbi-path.h | 2 +- tests/common/context.c | 2 + tests/common/gmm-build.c | 1 + tests/common/gtpu.c | 12 +- tests/common/sctp.c | 12 +- tests/core/memory-test.c | 2 +- tests/unit/security-test.c | 1 + tests/volte/diameter-rx-path.c | 3 +- 657 files changed, 4179 insertions(+), 3131 deletions(-) diff --git a/lib/asn1c/common/asn_internal.h b/lib/asn1c/common/asn_internal.h index 71397a6284..53166190b2 100644 --- a/lib/asn1c/common/asn_internal.h +++ b/lib/asn1c/common/asn_internal.h @@ -41,9 +41,9 @@ int get_asn1c_environment_version(void); /* Run-time version */ #define FREEMEM(ptr) free(ptr) #else #include "ogs-core.h" -#define CALLOC(nmemb, size) ogs_calloc(nmemb, size) -#define MALLOC(size) ogs_malloc(size) -#define REALLOC(oldptr, size) ogs_realloc(oldptr, size) +#define CALLOC(nmemb, size) ogs_calloc_or_assert(nmemb, size) +#define MALLOC(size) ogs_malloc_or_assert(size) +#define REALLOC(oldptr, size) ogs_realloc_or_assert(oldptr, size) #define FREEMEM(ptr) ogs_free(ptr) #endif diff --git a/lib/asn1c/util/message.c b/lib/asn1c/util/message.c index 0be8ff0fc0..d7f23b6157 100644 --- a/lib/asn1c/util/message.c +++ b/lib/asn1c/util/message.c @@ -28,7 +28,7 @@ ogs_pkbuf_t *ogs_asn_encode(const asn_TYPE_descriptor_t *td, void *sptr) ogs_assert(sptr); pkbuf = ogs_pkbuf_alloc(NULL, OGS_MAX_SDU_LEN); - ogs_assert(pkbuf); + ogs_expect_or_return_val(pkbuf, NULL); ogs_pkbuf_put(pkbuf, OGS_MAX_SDU_LEN); enc_ret = aper_encode_to_buffer(td, NULL, diff --git a/lib/core/ogs-3gpp-types.c b/lib/core/ogs-3gpp-types.c index 2f840613cb..521dc6fe13 100644 --- a/lib/core/ogs-3gpp-types.c +++ b/lib/core/ogs-3gpp-types.c @@ -137,7 +137,7 @@ char *ogs_amf_id_to_string(ogs_amf_id_t *amf_id) ogs_assert(amf_id); str = ogs_calloc(1, OGS_AMFIDSTRLEN); - ogs_assert(str); + ogs_expect_or_return_val(str, NULL); ogs_hex_to_ascii(amf_id, sizeof(ogs_amf_id_t), str, OGS_AMFIDSTRLEN); @@ -182,6 +182,7 @@ char *ogs_supi_from_suci(char *suci) ogs_assert(suci); tmp = ogs_strdup(suci); + ogs_expect_or_return_val(tmp, NULL); p = strtok_r(tmp, "-", &saveptr); @@ -222,10 +223,12 @@ char *ogs_id_get_type(char *str) ogs_assert(str); tmp = ogs_strdup(str); + ogs_expect_or_return_val(tmp, NULL); p = strtok_r(tmp, "-", &saveptr); ogs_assert(p); type = ogs_strdup(p); + ogs_expect_or_return_val(type, NULL); ogs_free(tmp); return type; @@ -239,12 +242,14 @@ char *ogs_id_get_value(char *str) ogs_assert(str); tmp = ogs_strdup(str); + ogs_expect_or_return_val(tmp, NULL); p = strtok_r(tmp, "-", &saveptr); ogs_assert(p); p = strtok_r(NULL, "-", &saveptr); ogs_assert(p); ueid = ogs_strdup(p); + ogs_expect_or_return_val(ueid, NULL); ogs_free(tmp); return ueid; @@ -252,10 +257,15 @@ char *ogs_id_get_value(char *str) char *ogs_s_nssai_sd_to_string(ogs_uint24_t sd) { + char *string = NULL; + if (sd.v == OGS_S_NSSAI_NO_SD_VALUE) return NULL; - return ogs_uint24_to_0string(sd); + string = ogs_uint24_to_0string(sd); + ogs_expect(string); + + return string; } ogs_uint24_t ogs_s_nssai_sd_from_string(const char *hex) @@ -391,12 +401,12 @@ int ogs_ip_to_sockaddr(ogs_ip_t *ip, uint16_t port, ogs_sockaddr_t **list) ogs_assert(list); addr = ogs_calloc(1, sizeof(ogs_sockaddr_t)); - ogs_assert(addr); + ogs_expect_or_return_val(addr, OGS_ERROR); addr->ogs_sa_family = AF_INET; addr->ogs_sin_port = htobe16(port); addr6 = ogs_calloc(1, sizeof(ogs_sockaddr_t)); - ogs_assert(addr6); + ogs_expect_or_return_val(addr6, OGS_ERROR); addr6->ogs_sa_family = AF_INET6; addr6->ogs_sin_port = htobe16(port); @@ -457,7 +467,7 @@ char *ogs_ipv4_to_string(uint32_t addr) char *buf = NULL; buf = ogs_calloc(1, OGS_ADDRSTRLEN); - ogs_assert(buf); + ogs_expect_or_return_val(buf, NULL); return (char*)OGS_INET_NTOP(&addr, buf); } @@ -468,7 +478,7 @@ char *ogs_ipv6addr_to_string(uint8_t *addr6) ogs_assert(addr6); buf = ogs_calloc(1, OGS_ADDRSTRLEN); - ogs_assert(buf); + ogs_expect_or_return_val(buf, NULL); return (char *)OGS_INET6_NTOP(addr6, buf); } @@ -483,7 +493,7 @@ char *ogs_ipv6prefix_to_string(uint8_t *addr6, uint8_t prefixlen) memcpy(tmp, addr6, prefixlen >> 3); buf = ogs_calloc(1, OGS_ADDRSTRLEN); - ogs_assert(buf); + ogs_expect_or_return_val(buf, NULL); if (OGS_INET6_NTOP(tmp, buf) == NULL) { ogs_fatal("Invalid IPv6 address"); @@ -541,7 +551,7 @@ int ogs_ipv6prefix_from_string(uint8_t *addr6, uint8_t *prefixlen, char *string) ogs_assert(prefixlen); ogs_assert(string); pv = v = ogs_strdup(string); - ogs_assert(v); + ogs_expect_or_return_val(v, OGS_ERROR); ipstr = strsep(&v, "/"); if (ipstr) diff --git a/lib/core/ogs-conv.c b/lib/core/ogs-conv.c index 5ddbb0f8e9..d0e2a7aeb4 100644 --- a/lib/core/ogs-conv.c +++ b/lib/core/ogs-conv.c @@ -190,10 +190,10 @@ char *ogs_uint64_to_string(uint64_t x) char *str, *p; str = ogs_uint64_to_0string(x); - ogs_assert(str); + ogs_expect_or_return_val(str, NULL); p = ogs_left_trimcharacter(str, '0'); - ogs_assert(p); + ogs_expect_or_return_val(p, NULL); ogs_free(str); return ogs_strdup(p); diff --git a/lib/core/ogs-epoll.c b/lib/core/ogs-epoll.c index a7859f0124..44774a2fb4 100644 --- a/lib/core/ogs-epoll.c +++ b/lib/core/ogs-epoll.c @@ -112,7 +112,7 @@ static int epoll_add(ogs_poll_t *poll) map = ogs_hash_get(context->map_hash, &poll->fd, sizeof(poll->fd)); if (!map) { map = ogs_calloc(1, sizeof(*map)); - ogs_assert(map); + ogs_expect_or_return_val(map, OGS_ERROR); op = EPOLL_CTL_ADD; ogs_hash_set(context->map_hash, &poll->fd, sizeof(poll->fd), map); diff --git a/lib/core/ogs-hash.c b/lib/core/ogs-hash.c index 4a7a1f4efa..13cec62bae 100644 --- a/lib/core/ogs-hash.c +++ b/lib/core/ogs-hash.c @@ -61,7 +61,7 @@ struct ogs_hash_t { static ogs_hash_entry_t **alloc_array(ogs_hash_t *ht, unsigned int max) { - return ogs_calloc(1, sizeof(*ht->array) * (max + 1)); + return ogs_calloc_or_assert(1, sizeof(*ht->array) * (max + 1)); } ogs_hash_t *ogs_hash_make() @@ -70,6 +70,7 @@ ogs_hash_t *ogs_hash_make() ogs_time_t now = ogs_get_monotonic_time(); ht = ogs_malloc(sizeof(ogs_hash_t)); + ogs_expect_or_return_val(ht, NULL); ht->free = NULL; ht->count = 0; @@ -85,6 +86,7 @@ ogs_hash_t *ogs_hash_make() ogs_hash_t *ogs_hash_make_custom(ogs_hashfunc_t hash_func) { ogs_hash_t *ht = ogs_hash_make(); + ogs_expect_or_return_val(ht, NULL); ht->hash_func = hash_func; return ht; } @@ -283,7 +285,7 @@ static ogs_hash_entry_t **find_entry(ogs_hash_t *ht, if ((he = ht->free) != NULL) ht->free = he->next; else - he = ogs_malloc_debug(sizeof(*he), file_line); + he = ogs_malloc_debug(sizeof(*he), file_line, true); he->next = NULL; he->hash = hash; he->key = key; diff --git a/lib/core/ogs-kqueue.c b/lib/core/ogs-kqueue.c index cb0efc1377..37bcb43d52 100644 --- a/lib/core/ogs-kqueue.c +++ b/lib/core/ogs-kqueue.c @@ -68,6 +68,7 @@ static void kqueue_init(ogs_pollset_t *pollset) context->change_list = ogs_calloc( pollset->capacity, sizeof(struct kevent)); + ogs_assert(context->change_list); context->event_list = ogs_calloc( pollset->capacity, sizeof(struct kevent)); ogs_assert(context->change_list); diff --git a/lib/core/ogs-memory.c b/lib/core/ogs-memory.c index 0869ab31cd..37fb52f0e4 100644 --- a/lib/core/ogs-memory.c +++ b/lib/core/ogs-memory.c @@ -22,7 +22,7 @@ #undef OGS_LOG_DOMAIN #define OGS_LOG_DOMAIN __ogs_mem_domain -void *ogs_malloc_debug(size_t size, const char *file_line) +void *ogs_malloc_debug(size_t size, const char *file_line, bool abort) { size_t headroom = 0; ogs_pkbuf_t *pkbuf = NULL; @@ -31,7 +31,12 @@ void *ogs_malloc_debug(size_t size, const char *file_line) headroom = sizeof(ogs_pkbuf_t *); pkbuf = ogs_pkbuf_alloc_debug(NULL, headroom + size, file_line); - ogs_assert(pkbuf); + + if (abort == true) + ogs_assert(pkbuf); + else + ogs_expect_or_return_val(pkbuf, NULL); + ogs_pkbuf_reserve(pkbuf, headroom); memcpy(pkbuf->head, &pkbuf, headroom); ogs_pkbuf_put(pkbuf, size); @@ -54,18 +59,23 @@ void ogs_free(void *ptr) ogs_pkbuf_free(pkbuf); } -void *ogs_calloc_debug(size_t nmemb, size_t size, const char *file_line) +void *ogs_calloc_debug( + size_t nmemb, size_t size, const char *file_line, bool abort) { void *ptr = NULL; - ptr = ogs_malloc_debug(nmemb * size, file_line); - ogs_assert(ptr); + ptr = ogs_malloc_debug(nmemb * size, file_line, abort); + if (abort == true) + ogs_assert(ptr); + else + ogs_expect_or_return_val(ptr, NULL); memset(ptr, 0, nmemb * size); return ptr; } -void *ogs_realloc_debug(void *ptr, size_t size, const char *file_line) +void *ogs_realloc_debug( + void *ptr, size_t size, const char *file_line, bool abort) { size_t headroom = 0; ogs_pkbuf_t *pkbuf = NULL; @@ -77,9 +87,17 @@ void *ogs_realloc_debug(void *ptr, size_t size, const char *file_line) headroom = sizeof(ogs_pkbuf_t *); memcpy(&pkbuf, (unsigned char*)ptr - headroom, headroom); - ogs_assert(pkbuf); + + if (abort == true) + ogs_assert(pkbuf); + else + ogs_expect_or_return_val(pkbuf, NULL); + cluster = pkbuf->cluster; - ogs_assert(cluster); + if (abort == true) + ogs_assert(cluster); + else + ogs_expect_or_return_val(cluster, NULL); if (!size) { ogs_pkbuf_free(pkbuf); @@ -89,8 +107,13 @@ void *ogs_realloc_debug(void *ptr, size_t size, const char *file_line) if (size > (cluster->size - headroom)) { void *new = NULL; - new = ogs_malloc_debug(size, file_line); - ogs_assert(new); + new = ogs_malloc_debug(size, file_line, abort); + + if (abort == true) + ogs_assert(new); + else + ogs_expect_or_return_val(new, NULL); + memcpy(new, ptr, pkbuf->len); ogs_pkbuf_free(pkbuf); diff --git a/lib/core/ogs-memory.h b/lib/core/ogs-memory.h index e864c252f8..43a066ec4a 100644 --- a/lib/core/ogs-memory.h +++ b/lib/core/ogs-memory.h @@ -44,13 +44,23 @@ extern "C" { memcpy((__dST), (__sRC), sizeof(*(__sRC))*sizeof(uint8_t)); \ } while(0) -#define ogs_malloc(size) ogs_malloc_debug(size, OGS_FILE_LINE) -void *ogs_malloc_debug(size_t size, const char *file_line); +#define ogs_malloc(size) ogs_malloc_debug(size, OGS_FILE_LINE, false) +#define ogs_malloc_or_assert(size) \ + ogs_malloc_debug(size, OGS_FILE_LINE, true) +void *ogs_malloc_debug(size_t size, const char *file_line, bool abort); void ogs_free(void *ptr); -#define ogs_calloc(nmemb, size) ogs_calloc_debug(nmemb, size, OGS_FILE_LINE) -void *ogs_calloc_debug(size_t nmemb, size_t size, const char *file_line); -#define ogs_realloc(ptr, size) ogs_realloc_debug(ptr, size, OGS_FILE_LINE) -void *ogs_realloc_debug(void *ptr, size_t size, const char *file_line); +#define ogs_calloc(nmemb, size) \ + ogs_calloc_debug(nmemb, size, OGS_FILE_LINE, false) +#define ogs_calloc_or_assert(nmemb, size) \ + ogs_calloc_debug(nmemb, size, OGS_FILE_LINE, true) +void *ogs_calloc_debug( + size_t nmemb, size_t size, const char *file_line, bool abort); +#define ogs_realloc(ptr, size) \ + ogs_realloc_debug(ptr, size, OGS_FILE_LINE, false) +#define ogs_realloc_or_assert(ptr, size) \ + ogs_realloc_debug(ptr, size, OGS_FILE_LINE, true) +void *ogs_realloc_debug( + void *ptr, size_t size, const char *file_line, bool abort); #ifdef __cplusplus } diff --git a/lib/core/ogs-pkbuf.c b/lib/core/ogs-pkbuf.c index 77bd7054d2..14b1c1dfc9 100644 --- a/lib/core/ogs-pkbuf.c +++ b/lib/core/ogs-pkbuf.c @@ -199,10 +199,13 @@ ogs_pkbuf_t *ogs_pkbuf_alloc_debug( ogs_thread_mutex_unlock(&pool->mutex); return NULL; } - ogs_assert(cluster); ogs_pool_alloc(&pool->pkbuf, &pkbuf); - ogs_assert(pkbuf); + if (!pkbuf) { + ogs_error("ogs_pkbuf_alloc() failed [size=%d]", size); + ogs_thread_mutex_unlock(&pool->mutex); + return NULL; + } memset(pkbuf, 0, sizeof(*pkbuf)); cluster->ref++; @@ -248,7 +251,7 @@ void ogs_pkbuf_free(ogs_pkbuf_t *pkbuf) ogs_thread_mutex_unlock(&pool->mutex); } -ogs_pkbuf_t *ogs_pkbuf_copy(ogs_pkbuf_t *pkbuf) +ogs_pkbuf_t *ogs_pkbuf_copy_debug(ogs_pkbuf_t *pkbuf, const char *file_line) { ogs_pkbuf_pool_t *pool = NULL; ogs_pkbuf_t *newbuf = NULL; @@ -288,51 +291,31 @@ static ogs_cluster_t *cluster_alloc( if (size <= OGS_CLUSTER_128_SIZE) { ogs_pool_alloc(&pool->cluster_128, (ogs_cluster_128_t**)&buffer); - if (!buffer) { - ogs_fatal("No OGS_CLUSTER_128_SIZE"); - return NULL; - } + ogs_expect_or_return_val(buffer, NULL); cluster->size = OGS_CLUSTER_128_SIZE; } else if (size <= OGS_CLUSTER_256_SIZE) { ogs_pool_alloc(&pool->cluster_256, (ogs_cluster_256_t**)&buffer); - if (!buffer) { - ogs_fatal("No OGS_CLUSTER_256_SIZE"); - return NULL; - } + ogs_expect_or_return_val(buffer, NULL); cluster->size = OGS_CLUSTER_256_SIZE; } else if (size <= OGS_CLUSTER_512_SIZE) { ogs_pool_alloc(&pool->cluster_512, (ogs_cluster_512_t**)&buffer); - if (!buffer) { - ogs_fatal("No OGS_CLUSTER_512_SIZE"); - return NULL; - } + ogs_expect_or_return_val(buffer, NULL); cluster->size = OGS_CLUSTER_512_SIZE; } else if (size <= OGS_CLUSTER_1024_SIZE) { ogs_pool_alloc(&pool->cluster_1024, (ogs_cluster_1024_t**)&buffer); - if (!buffer) { - ogs_fatal("No OGS_CLUSTER_1024_SIZE"); - return NULL; - } + ogs_expect_or_return_val(buffer, NULL); cluster->size = OGS_CLUSTER_1024_SIZE; } else if (size <= OGS_CLUSTER_2048_SIZE) { ogs_pool_alloc(&pool->cluster_2048, (ogs_cluster_2048_t**)&buffer); - if (!buffer) { - ogs_fatal("No OGS_CLUSTER_2048_SIZE"); - return NULL; - } + ogs_expect_or_return_val(buffer, NULL); cluster->size = OGS_CLUSTER_2048_SIZE; } else if (size <= OGS_CLUSTER_8192_SIZE) { ogs_pool_alloc(&pool->cluster_8192, (ogs_cluster_8192_t**)&buffer); - if (!buffer) { - ogs_fatal("No OGS_CLUSTER_8192_SIZE"); - return NULL; - } + ogs_expect_or_return_val(buffer, NULL); cluster->size = OGS_CLUSTER_8192_SIZE; } else if (size <= OGS_CLUSTER_BIG_SIZE) { ogs_pool_alloc(&pool->cluster_big, (ogs_cluster_big_t**)&buffer); - if (!buffer) { - ogs_fatal("No OGS_CLUSTER_BIG_SIZE"); - } + ogs_expect_or_return_val(buffer, NULL); cluster->size = OGS_CLUSTER_BIG_SIZE; } else { ogs_fatal("invalid size = %d", size); diff --git a/lib/core/ogs-pkbuf.h b/lib/core/ogs-pkbuf.h index c681d5617b..e7f7027b3d 100644 --- a/lib/core/ogs-pkbuf.h +++ b/lib/core/ogs-pkbuf.h @@ -84,7 +84,9 @@ void ogs_pkbuf_free(ogs_pkbuf_t *pkbuf); void *ogs_pkbuf_put_data( ogs_pkbuf_t *pkbuf, const void *data, unsigned int len); -ogs_pkbuf_t *ogs_pkbuf_copy(ogs_pkbuf_t *pkbuf); +#define ogs_pkbuf_copy(pkbuf) \ + ogs_pkbuf_copy_debug(pkbuf, OGS_FILE_LINE) +ogs_pkbuf_t *ogs_pkbuf_copy_debug(ogs_pkbuf_t *pkbuf, const char *file_line); static ogs_inline int ogs_pkbuf_tailroom(const ogs_pkbuf_t *pkbuf) { diff --git a/lib/core/ogs-poll.c b/lib/core/ogs-poll.c index efabfd25fc..7e600a0551 100644 --- a/lib/core/ogs-poll.c +++ b/lib/core/ogs-poll.c @@ -35,7 +35,7 @@ bool ogs_pollset_actions_initialized = false; ogs_pollset_t *ogs_pollset_create(unsigned int capacity) { ogs_pollset_t *pollset = ogs_calloc(1, sizeof *pollset); - ogs_assert(pollset); + ogs_expect_or_return_val(pollset, NULL); pollset->capacity = capacity; diff --git a/lib/core/ogs-queue.c b/lib/core/ogs-queue.c index 237a08c4bc..eec4fe4ff2 100644 --- a/lib/core/ogs-queue.c +++ b/lib/core/ogs-queue.c @@ -70,6 +70,7 @@ typedef struct ogs_queue_s { ogs_queue_t *ogs_queue_create(unsigned int capacity) { ogs_queue_t *queue = ogs_calloc(1, sizeof *queue); + ogs_expect_or_return_val(queue, NULL); ogs_assert(queue); ogs_thread_mutex_init(&queue->one_big_mutex); @@ -77,6 +78,7 @@ ogs_queue_t *ogs_queue_create(unsigned int capacity) ogs_thread_cond_init(&queue->not_full); queue->data = ogs_calloc(1, capacity * sizeof(void*)); + ogs_expect_or_return_val(queue->data, NULL); queue->bounds = capacity; queue->nelts = 0; queue->in = 0; diff --git a/lib/core/ogs-sockaddr.c b/lib/core/ogs-sockaddr.c index abcd234bfd..28c007d648 100644 --- a/lib/core/ogs-sockaddr.c +++ b/lib/core/ogs-sockaddr.c @@ -130,6 +130,7 @@ int ogs_addaddrinfo(ogs_sockaddr_t **sa_list, continue; new = ogs_calloc(1, sizeof(ogs_sockaddr_t)); + ogs_expect_or_return_val(new, OGS_ERROR); memcpy(&new->sa, ai->ai_addr, ai->ai_addrlen); new->ogs_sin_port = htobe16(port); @@ -203,12 +204,15 @@ int ogs_copyaddrinfo(ogs_sockaddr_t **dst, const ogs_sockaddr_t *src) for (*dst = d = NULL, s = src; s; s = s->next) { if (!d) { *dst = d = ogs_memdup(s, sizeof *s); + ogs_expect_or_return_val(*dst, OGS_ERROR); } else { d = d->next = ogs_memdup(s, sizeof *s); + ogs_expect_or_return_val(d, OGS_ERROR); } if (s->hostname) { if (s == src || s->hostname != src->hostname) { d->hostname = ogs_strdup(s->hostname); + ogs_expect_or_return_val(d->hostname, OGS_ERROR); } else { d->hostname = (*dst)->hostname; } @@ -279,6 +283,7 @@ ogs_sockaddr_t *ogs_link_local_addr_by_dev(const char *dev) continue; addr = ogs_calloc(1, sizeof(ogs_sockaddr_t)); + ogs_expect_or_return_val(addr, NULL); ogs_assert(addr); memcpy(&addr->sa, cur->ifa_addr, ogs_sockaddr_len(cur->ifa_addr)); @@ -288,6 +293,7 @@ ogs_sockaddr_t *ogs_link_local_addr_by_dev(const char *dev) freeifaddrs(iflist); #endif + ogs_error("ogs_link_local_addr_by_dev() failed"); return NULL; } diff --git a/lib/core/ogs-socket.c b/lib/core/ogs-socket.c index e3354ffabe..c892eaead5 100644 --- a/lib/core/ogs-socket.c +++ b/lib/core/ogs-socket.c @@ -55,7 +55,7 @@ ogs_sock_t *ogs_sock_create(void) ogs_sock_t *sock = NULL; sock = ogs_calloc(1, sizeof(*sock)); - ogs_assert(sock); + ogs_expect_or_return_val(sock, NULL); sock->fd = INVALID_SOCKET; diff --git a/lib/core/ogs-socknode.c b/lib/core/ogs-socknode.c index f019fe3c1d..321a9b6dbf 100644 --- a/lib/core/ogs-socknode.c +++ b/lib/core/ogs-socknode.c @@ -39,7 +39,7 @@ ogs_socknode_t *ogs_socknode_new(ogs_sockaddr_t *addr) ogs_assert(addr); node = ogs_calloc(1, sizeof(ogs_socknode_t)); - ogs_assert(node); + ogs_expect_or_return_val(node, NULL); node->addr = addr; @@ -71,12 +71,13 @@ ogs_socknode_t *ogs_socknode_add( ogs_assert(list); ogs_assert(addr); - ogs_copyaddrinfo(&dup, addr); + ogs_assert(OGS_OK == ogs_copyaddrinfo(&dup, addr)); if (family != AF_UNSPEC) ogs_filteraddrinfo(&dup, family); if (dup) { node = ogs_socknode_new(dup); + ogs_assert(node); ogs_list_add(list, node); } diff --git a/lib/core/ogs-strings.c b/lib/core/ogs-strings.c index 9b6798b3da..10758336fa 100644 --- a/lib/core/ogs-strings.c +++ b/lib/core/ogs-strings.c @@ -120,7 +120,7 @@ char *ogs_slprintf(char *str, char *last, const char *format, ...) return r; } -char *ogs_strdup_debug(const char *s, const char *file_line) +char *ogs_strdup_debug(const char *s, const char *file_line, bool abort) { char *res; size_t len; @@ -129,11 +129,13 @@ char *ogs_strdup_debug(const char *s, const char *file_line) return NULL; len = strlen(s) + 1; - res = ogs_memdup_debug(s, len, file_line); + res = ogs_memdup_debug(s, len, file_line, abort); + ogs_expect_or_return_val(res, res); return res; } -char *ogs_strndup_debug(const char *s, size_t n, const char *file_line) +char *ogs_strndup_debug( + const char *s, size_t n, const char *file_line, bool abort) { char *res; const char *end; @@ -144,20 +146,23 @@ char *ogs_strndup_debug(const char *s, size_t n, const char *file_line) end = memchr(s, '\0', n); if (end != NULL) n = end - s; - res = ogs_malloc_debug(n + 1, file_line); + res = ogs_malloc_debug(n + 1, file_line, abort); + ogs_expect_or_return_val(res, res); memcpy(res, s, n); res[n] = '\0'; return res; } -void *ogs_memdup_debug(const void *m, size_t n, const char *file_line) +void *ogs_memdup_debug( + const void *m, size_t n, const char *file_line, bool abort) { void *res; if (m == NULL) return NULL; - res = ogs_malloc_debug(n, file_line); + res = ogs_malloc_debug(n, file_line, abort); + ogs_expect_or_return_val(res, res); memcpy(res, m, n); return res; } @@ -195,7 +200,8 @@ char *ogs_cpystrn(char *dst, const char *src, size_t dst_size) * * https://github.com/babelouest/orcania.git */ -char *ogs_msprintf_debug(const char *file_line, const char *message, ...) +char *ogs_msprintf_debug( + const char *file_line, bool abort, const char *message, ...) { va_list argp, argp_cpy; size_t out_len = 0; @@ -206,7 +212,7 @@ char *ogs_msprintf_debug(const char *file_line, const char *message, ...) in some architectures, vsnprintf can modify argp */ out_len = vsnprintf(NULL, 0, message, argp); - out = ogs_malloc_debug(out_len + sizeof(char), file_line); + out = ogs_malloc_debug(out_len + sizeof(char), file_line, abort); if (out == NULL) { va_end(argp); va_end(argp_cpy); @@ -220,7 +226,8 @@ char *ogs_msprintf_debug(const char *file_line, const char *message, ...) } char *ogs_mstrcatf_debug( - char *source, const char *file_line, const char *message, ...) + char *source, const char *file_line, bool abort, + const char *message, ...) { va_list argp, argp_cpy; char *out = NULL, *message_formatted = NULL; @@ -238,7 +245,7 @@ char *ogs_mstrcatf_debug( vsnprintf(message_formatted, (message_formatted_len+sizeof(char)), message, argp_cpy); out = ogs_msprintf_debug( - file_line, "%s%s", source, message_formatted); + file_line, abort, "%s%s", source, message_formatted); ogs_free(message_formatted); ogs_free(source); } @@ -250,7 +257,7 @@ char *ogs_mstrcatf_debug( in some architectures, vsnprintf can modify argp */ out_len = vsnprintf(NULL, 0, message, argp); - out = ogs_malloc_debug(out_len+sizeof(char), file_line); + out = ogs_malloc_debug(out_len+sizeof(char), file_line, abort); if (out != NULL) { vsnprintf(out, (out_len+sizeof(char)), message, argp_cpy); } diff --git a/lib/core/ogs-strings.h b/lib/core/ogs-strings.h index f5e2940b6f..03e41d798c 100644 --- a/lib/core/ogs-strings.h +++ b/lib/core/ogs-strings.h @@ -75,12 +75,17 @@ char *ogs_vslprintf(char *str, char *last, const char *format, va_list ap) char *ogs_slprintf(char *str, char *last, const char *format, ...) OGS_GNUC_PRINTF(3, 4); -#define ogs_strdup(s) ogs_strdup_debug(s, OGS_FILE_LINE) -char *ogs_strdup_debug(const char *s, const char *file_line); -#define ogs_strndup(s, n) ogs_strndup_debug(s, n, OGS_FILE_LINE) -char *ogs_strndup_debug(const char *s, size_t n, const char *file_line); -#define ogs_memdup(m, n) ogs_memdup_debug(m, n, OGS_FILE_LINE) -void *ogs_memdup_debug(const void *m, size_t n, const char *file_line); +#define ogs_strdup(s) ogs_strdup_debug(s, OGS_FILE_LINE, false) +#define ogs_strdup_or_assert(s) ogs_strdup_debug(s, OGS_FILE_LINE, true) +char *ogs_strdup_debug(const char *s, const char *file_line, bool abort); +#define ogs_strndup(s, n) ogs_strndup_debug(s, n, OGS_FILE_LINE, false) +#define ogs_strndup_or_assert(s, n) ogs_strndup_debug(s, n, OGS_FILE_LINE, true) +char *ogs_strndup_debug + (const char *s, size_t n, const char *file_line, bool abort); +#define ogs_memdup(m, n) ogs_memdup_debug(m, n, OGS_FILE_LINE, false) +#define ogs_memdup_or_assert(m, n) ogs_memdup_debug(m, n, OGS_FILE_LINE, true) +void *ogs_memdup_debug + (const void *m, size_t n, const char *file_line, bool abort); char *ogs_cpystrn(char *dst, const char *src, size_t dst_size); @@ -94,14 +99,20 @@ char *ogs_cpystrn(char *dst, const char *src, size_t dst_size); * * https://github.com/babelouest/orcania.git */ -#define ogs_msprintf(...) ogs_msprintf_debug(OGS_FILE_LINE, __VA_ARGS__) -char *ogs_msprintf_debug(const char *file_line, const char *message, ...) - OGS_GNUC_PRINTF(2, 3); -#define ogs_mstrcatf(source, ...) \ - ogs_mstrcatf_debug(source, OGS_FILE_LINE, __VA_ARGS__) -char *ogs_mstrcatf_debug( - char *source, const char *file_line, const char *message, ...) +#define ogs_msprintf(...) ogs_msprintf_debug(OGS_FILE_LINE, false, __VA_ARGS__) +#define ogs_msprintf_or_assert(...) \ + ogs_msprintf_debug(OGS_FILE_LINE, true, __VA_ARGS__) +char *ogs_msprintf_debug + (const char *file_line, bool abort, const char *message, ...) OGS_GNUC_PRINTF(3, 4); +#define ogs_mstrcatf(source, ...) \ + ogs_mstrcatf_debug(source, OGS_FILE_LINE, false, __VA_ARGS__) +#define ogs_mstrcatf_or_assert(source, ...) \ + ogs_mstrcatf_debug(source, OGS_FILE_LINE, true, __VA_ARGS__) +char *ogs_mstrcatf_debug( + char *source, const char *file_line, bool abort, + const char *message, ...) + OGS_GNUC_PRINTF(4, 5); char *ogs_trimwhitespace(char *str); diff --git a/lib/core/ogs-thread.c b/lib/core/ogs-thread.c index c6294228c4..e9c4ab9e28 100644 --- a/lib/core/ogs-thread.c +++ b/lib/core/ogs-thread.c @@ -77,7 +77,7 @@ static void *thread_worker(void *arg) ogs_thread_t *ogs_thread_create(void (*func)(void *), void *data) { ogs_thread_t *thread = ogs_calloc(1, sizeof *thread); - ogs_assert(thread); + ogs_expect_or_return_val(thread, NULL); ogs_thread_mutex_init(&thread->mutex); ogs_thread_cond_init(&thread->cond); diff --git a/lib/core/ogs-timer.c b/lib/core/ogs-timer.c index 51cc287b55..fd0fa254d9 100644 --- a/lib/core/ogs-timer.c +++ b/lib/core/ogs-timer.c @@ -55,7 +55,7 @@ static void add_timer_node( ogs_timer_mgr_t *ogs_timer_mgr_create(unsigned int capacity) { ogs_timer_mgr_t *manager = ogs_calloc(1, sizeof *manager); - ogs_assert(manager); + ogs_expect_or_return_val(manager, NULL); ogs_pool_init(&manager->pool, capacity); diff --git a/lib/core/ogs-tlv-msg.h b/lib/core/ogs-tlv-msg.h index fd8e3ab3b5..d734c44b71 100644 --- a/lib/core/ogs-tlv-msg.h +++ b/lib/core/ogs-tlv-msg.h @@ -141,6 +141,7 @@ typedef struct ogs_tlv_int32_s { (__dST)->presence = (__sRC)->presence; \ (__dST)->len = (__sRC)->len; \ (__dST)->data = ogs_calloc((__dST)->len, sizeof(uint8_t)); \ + ogs_assert((__dST)->data); \ memcpy((__dST)->data, (__sRC)->data, (__dST)->len); \ } while(0) typedef struct ogs_tlv_octet_s { diff --git a/lib/crypt/snow-3g.c b/lib/crypt/snow-3g.c index 9fca1ce79d..c8a35e8ac5 100644 --- a/lib/crypt/snow-3g.c +++ b/lib/crypt/snow-3g.c @@ -413,7 +413,7 @@ void snow_3g_f8(u8 *key, u32 count, u32 bearer, u32 dir, u8 *data, u32 length) /* Run SNOW 3G algorithm to generate sequence of key stream bits KS*/ snow_3g_initialize(K,IV); - KS = (u32 *)ogs_malloc(4*n); + KS = (u32 *)ogs_malloc_or_assert(4*n); snow_3g_generate_key_stream(n,(u32*)KS); /* Exclusive-OR the input data with keystream to generate the output bit diff --git a/lib/crypt/zuc.c b/lib/crypt/zuc.c index 38c4609b1a..04756626f6 100644 --- a/lib/crypt/zuc.c +++ b/lib/crypt/zuc.c @@ -296,7 +296,7 @@ void zuc_eea3(u8* CK, u32 COUNT, u32 BEARER, u32 DIRECTION, u32 lastbits = (8-(LENGTH%8))%8; L = (LENGTH+31)/32; - z = (u32 *) ogs_malloc(L*sizeof(u32)); + z = (u32 *) ogs_malloc_or_assert(L*sizeof(u32)); L8 = (LENGTH+7)/8; @@ -387,7 +387,7 @@ void zuc_eia3(u8* IK, u32 COUNT, u32 BEARER, u32 DIRECTION, N = LENGTH + 64; L = (N + 31) / 32; - z = (u32 *) ogs_malloc(L*sizeof(u32)); + z = (u32 *) ogs_malloc_or_assert(L*sizeof(u32)); ZUC(IK, IV, z, L); T = 0; diff --git a/lib/dbi/ogs-mongoc.c b/lib/dbi/ogs-mongoc.c index 055eb57458..eef465f83e 100644 --- a/lib/dbi/ogs-mongoc.c +++ b/lib/dbi/ogs-mongoc.c @@ -57,6 +57,7 @@ static char *masked_db_uri(const char *db_uri) ogs_assert(db_uri); tmp = ogs_strdup(db_uri); + ogs_assert(tmp); memset(array, 0, sizeof(array)); array[0] = strtok_r(tmp, "@", &saveptr); diff --git a/lib/dbi/session.c b/lib/dbi/session.c index e5280eeb77..cf302c6380 100644 --- a/lib/dbi/session.c +++ b/lib/dbi/session.c @@ -452,6 +452,7 @@ done: utf8 = bson_iter_utf8( &child8_iter, &length); flow->description = ogs_malloc(length+1); + ogs_assert(flow->description); ogs_cpystrn((char*)flow->description, utf8, length+1); } diff --git a/lib/gtp/build.c b/lib/gtp/build.c index 7fa6799f77..160e1d46a9 100644 --- a/lib/gtp/build.c +++ b/lib/gtp/build.c @@ -68,7 +68,7 @@ ogs_pkbuf_t *ogs_gtp_build_error_indication( pkbuf = ogs_pkbuf_alloc( NULL, 100 /* enough for Error Indiciation; use smaller buffer */); - ogs_assert(pkbuf); + ogs_expect_or_return_val(pkbuf, NULL); ogs_pkbuf_reserve(pkbuf, OGS_GTPV1U_5GC_HEADER_LEN); /* diff --git a/lib/gtp/context.c b/lib/gtp/context.c index 2d8a9763ce..4e241b7704 100644 --- a/lib/gtp/context.c +++ b/lib/gtp/context.c @@ -502,7 +502,7 @@ ogs_gtp_node_t *ogs_gtp_node_new(ogs_sockaddr_t *sa_list) ogs_assert(sa_list); ogs_pool_alloc(&pool, &node); - ogs_assert(node); + ogs_expect_or_return_val(node, NULL); memset(node, 0, sizeof(ogs_gtp_node_t)); node->sa_list = sa_list; @@ -538,7 +538,7 @@ ogs_gtp_node_t *ogs_gtp_node_add_by_f_teid( ogs_assert(port); rv = ogs_gtp_f_teid_to_sockaddr(f_teid, port, &addr); - ogs_assert(rv == OGS_OK); + ogs_expect_or_return_val(rv == OGS_OK, NULL); rv = ogs_filter_ip_version( &addr, @@ -554,7 +554,7 @@ ogs_gtp_node_t *ogs_gtp_node_add_by_f_teid( ogs_assert(node); rv = ogs_gtp_f_teid_to_ip(f_teid, &node->ip); - ogs_assert(rv == OGS_OK); + ogs_expect_or_return_val(rv == OGS_OK, NULL); ogs_list_add(list, node); @@ -569,7 +569,7 @@ ogs_gtp_node_t *ogs_gtp_node_add_by_addr(ogs_list_t *list, ogs_sockaddr_t *addr) ogs_assert(list); ogs_assert(addr); - ogs_copyaddrinfo(&new, addr); + ogs_assert(OGS_OK == ogs_copyaddrinfo(&new, addr)); gnode = ogs_gtp_node_new(new); ogs_assert(gnode); @@ -646,20 +646,20 @@ ogs_gtp_node_t *ogs_gtp_node_add_by_ip( ogs_assert(port); rv = ogs_ip_to_sockaddr(ip, port, &addr); - ogs_assert(rv == OGS_OK); + ogs_expect_or_return_val(rv == OGS_OK, NULL); rv = ogs_filter_ip_version( &addr, ogs_app()->parameter.no_ipv4, ogs_app()->parameter.no_ipv6, ogs_app()->parameter.prefer_ipv4); - ogs_assert(addr); + ogs_expect_or_return_val(addr, NULL); rv = ogs_socknode_fill_scope_id_in_local(addr); - ogs_assert(rv == OGS_OK); + ogs_expect_or_return_val(rv == OGS_OK, NULL); node = ogs_gtp_node_new(addr); - ogs_assert(node); + ogs_expect_or_return_val(node, NULL); memcpy(&node->ip, ip, sizeof(*ip)); diff --git a/lib/gtp/conv.c b/lib/gtp/conv.c index 8bdb803753..deee0ef01a 100644 --- a/lib/gtp/conv.c +++ b/lib/gtp/conv.c @@ -28,12 +28,12 @@ int ogs_gtp_f_teid_to_sockaddr( ogs_assert(list); addr = ogs_calloc(1, sizeof(ogs_sockaddr_t)); - ogs_assert(addr); + ogs_expect_or_return_val(addr, OGS_ERROR); addr->ogs_sa_family = AF_INET; addr->ogs_sin_port = htobe16(port); addr6 = ogs_calloc(1, sizeof(ogs_sockaddr_t)); - ogs_assert(addr6); + ogs_expect_or_return_val(addr6, OGS_ERROR); addr6->ogs_sa_family = AF_INET6; addr6->ogs_sin_port = htobe16(port); @@ -57,7 +57,8 @@ int ogs_gtp_f_teid_to_sockaddr( } else { ogs_free(addr); ogs_free(addr6); - ogs_assert_if_reached(); + ogs_error("No IPv4 or IPv6"); + return OGS_ERROR; } return OGS_OK; @@ -84,8 +85,10 @@ int ogs_gtp_sockaddr_to_f_teid(ogs_sockaddr_t *addr, ogs_sockaddr_t *addr6, f_teid->ipv6 = 1; memcpy(f_teid->addr6, addr6->sin6.sin6_addr.s6_addr, OGS_IPV6_LEN); *len = OGS_GTP_F_TEID_IPV6_LEN; - } else - ogs_assert_if_reached(); + } else { + ogs_error("No IPv4 or IPv6"); + return OGS_ERROR; + } return OGS_OK; } @@ -110,8 +113,10 @@ int ogs_gtp_f_teid_to_ip(ogs_gtp_f_teid_t *f_teid, ogs_ip_t *ip) } else if (ip->ipv6) { memcpy(ip->addr6, f_teid->addr6, OGS_IPV6_LEN); ip->len = OGS_IPV6_LEN; - } else + } else { + ogs_error("No IPv4 or IPv6"); return OGS_ERROR; + } return OGS_OK; } @@ -134,8 +139,10 @@ int ogs_gtp_ip_to_f_teid(ogs_ip_t *ip, ogs_gtp_f_teid_t *f_teid, int *len) } else if (f_teid->ipv6) { memcpy(f_teid->addr6, ip->addr6, OGS_IPV6_LEN); *len = OGS_GTP_F_TEID_IPV6_LEN; - } else - ogs_assert_if_reached(); + } else { + ogs_error("No IPv4 or IPv6"); + return OGS_ERROR; + } return OGS_OK; } @@ -160,8 +167,10 @@ int ogs_gtp_paa_to_ip(ogs_paa_t *paa, ogs_ip_t *ip) ip->ipv4 = 0; ip->ipv6 = 1; memcpy(ip->addr6, paa->addr6, OGS_IPV6_LEN); - } else - ogs_assert_if_reached(); + } else { + ogs_error("No IPv4 or IPv6"); + return OGS_ERROR; + } return OGS_OK; } diff --git a/lib/gtp/path.c b/lib/gtp/path.c index 36781f299d..cefbe3b293 100644 --- a/lib/gtp/path.c +++ b/lib/gtp/path.c @@ -253,7 +253,7 @@ ogs_pkbuf_t *ogs_gtp_handle_echo_req(ogs_pkbuf_t *pkb) pkb_resp = ogs_pkbuf_alloc(NULL, 100 /* enough for ECHO_RSP; use smaller buffer */); - ogs_assert(pkb_resp); + ogs_expect_or_return_val(pkb_resp, NULL); ogs_pkbuf_put(pkb_resp, 100); gtph_resp = (ogs_gtp_header_t *)pkb_resp->data; diff --git a/lib/nas/5gs/conv.c b/lib/nas/5gs/conv.c index 8ae62f2e76..e58ba39702 100644 --- a/lib/nas/5gs/conv.c +++ b/lib/nas/5gs/conv.c @@ -66,23 +66,23 @@ char *ogs_nas_5gs_suci_from_mobile_identity( (ogs_nas_5gs_mobile_identity_suci_t *)mobile_identity->buffer; ogs_assert(mobile_identity_suci); - ogs_assert(mobile_identity_suci->h.supi_format == - OGS_NAS_5GS_SUPI_FORMAT_IMSI); - ogs_assert(mobile_identity_suci->protection_scheme_id == - OGS_NAS_5GS_NULL_SCHEME); + ogs_expect_or_return_val(mobile_identity_suci->h.supi_format == + OGS_NAS_5GS_SUPI_FORMAT_IMSI, NULL); + ogs_expect_or_return_val(mobile_identity_suci->protection_scheme_id == + OGS_NAS_5GS_NULL_SCHEME, NULL); suci = ogs_msprintf("suci-%d-", mobile_identity_suci->h.supi_format); - ogs_assert(suci); + ogs_expect_or_return_val(suci, NULL); ogs_nas_to_plmn_id(&plmn_id, &mobile_identity_suci->nas_plmn_id); if (ogs_plmn_id_mnc_len(&plmn_id) == 2) { suci = ogs_mstrcatf(suci, "%03d-%02d-", ogs_plmn_id_mcc(&plmn_id), ogs_plmn_id_mnc(&plmn_id)); - ogs_assert(suci); + ogs_expect_or_return_val(suci, NULL); } else { suci = ogs_mstrcatf(suci, "%03d-%03d-", ogs_plmn_id_mcc(&plmn_id), ogs_plmn_id_mnc(&plmn_id)); - ogs_assert(suci); + ogs_expect_or_return_val(suci, NULL); } memset(routing_indicator, 0, sizeof(routing_indicator)); @@ -102,7 +102,7 @@ char *ogs_nas_5gs_suci_from_mobile_identity( } } - ogs_assert(mobile_identity->length > 8); + ogs_expect_or_return_val(mobile_identity->length > 8, NULL); ogs_buffer_to_bcd(mobile_identity_suci->scheme_output, mobile_identity->length - 8, tmp); @@ -111,6 +111,7 @@ char *ogs_nas_5gs_suci_from_mobile_identity( mobile_identity_suci->protection_scheme_id, mobile_identity_suci->home_network_pki_value, tmp); + ogs_expect(suci); return suci; } diff --git a/lib/nas/5gs/decoder.c b/lib/nas/5gs/decoder.c index 7c8c270b0a..18449c1050 100644 --- a/lib/nas/5gs/decoder.c +++ b/lib/nas/5gs/decoder.c @@ -28,7 +28,7 @@ /******************************************************************************* * This file had been created by nas-message.py script v0.2.0 * Please do not modify this file but regenerate it via script. - * Created on: 2021-05-07 23:02:37.438427 by acetcom + * Created on: 2021-05-30 21:57:39.474183 by acetcom * from 24501-g41.docx ******************************************************************************/ diff --git a/lib/nas/5gs/encoder.c b/lib/nas/5gs/encoder.c index eca2dbc39b..80900edf2a 100644 --- a/lib/nas/5gs/encoder.c +++ b/lib/nas/5gs/encoder.c @@ -28,7 +28,7 @@ /******************************************************************************* * This file had been created by nas-message.py script v0.2.0 * Please do not modify this file but regenerate it via script. - * Created on: 2021-05-07 23:02:37.448758 by acetcom + * Created on: 2021-05-30 21:57:39.484594 by acetcom * from 24501-g41.docx ******************************************************************************/ @@ -2817,7 +2817,7 @@ ogs_pkbuf_t *ogs_nas_5gmm_encode(ogs_nas_5gs_message_t *message) /* The Packet Buffer(ogs_pkbuf_t) for NAS message MUST make a HEADROOM. * When calculating AES_CMAC, we need to use the headroom of the packet. */ pkbuf = ogs_pkbuf_alloc(NULL, OGS_MAX_SDU_LEN); - ogs_assert(pkbuf); + ogs_expect_or_return_val(pkbuf, NULL); ogs_pkbuf_reserve(pkbuf, OGS_NAS_HEADROOM); ogs_pkbuf_put(pkbuf, OGS_MAX_SDU_LEN-OGS_NAS_HEADROOM); @@ -2977,7 +2977,7 @@ ogs_pkbuf_t *ogs_nas_5gsm_encode(ogs_nas_5gs_message_t *message) /* The Packet Buffer(ogs_pkbuf_t) for NAS message MUST make a HEADROOM. * When calculating AES_CMAC, we need to use the headroom of the packet. */ pkbuf = ogs_pkbuf_alloc(NULL, OGS_MAX_SDU_LEN); - ogs_assert(pkbuf); + ogs_expect_or_return_val(pkbuf, NULL); ogs_pkbuf_reserve(pkbuf, OGS_NAS_HEADROOM); ogs_pkbuf_put(pkbuf, OGS_MAX_SDU_LEN-OGS_NAS_HEADROOM); diff --git a/lib/nas/5gs/ies.c b/lib/nas/5gs/ies.c index f7cc3a1e7d..1a3b2007a3 100644 --- a/lib/nas/5gs/ies.c +++ b/lib/nas/5gs/ies.c @@ -28,7 +28,7 @@ /******************************************************************************* * This file had been created by nas-message.py script v0.2.0 * Please do not modify this file but regenerate it via script. - * Created on: 2021-05-07 23:02:37.421878 by acetcom + * Created on: 2021-05-30 21:57:39.457575 by acetcom * from 24501-g41.docx ******************************************************************************/ diff --git a/lib/nas/5gs/ies.h b/lib/nas/5gs/ies.h index f1da722850..405676f347 100644 --- a/lib/nas/5gs/ies.h +++ b/lib/nas/5gs/ies.h @@ -28,7 +28,7 @@ /******************************************************************************* * This file had been created by nas-message.py script v0.2.0 * Please do not modify this file but regenerate it via script. - * Created on: 2021-05-07 23:02:37.419237 by acetcom + * Created on: 2021-05-30 21:57:39.454963 by acetcom * from 24501-g41.docx ******************************************************************************/ diff --git a/lib/nas/5gs/message.h b/lib/nas/5gs/message.h index 31abd2e141..d7d57e9d0d 100644 --- a/lib/nas/5gs/message.h +++ b/lib/nas/5gs/message.h @@ -28,7 +28,7 @@ /******************************************************************************* * This file had been created by nas-message.py script v0.2.0 * Please do not modify this file but regenerate it via script. - * Created on: 2021-05-07 23:02:37.431012 by acetcom + * Created on: 2021-05-30 21:57:39.466799 by acetcom * from 24501-g41.docx ******************************************************************************/ diff --git a/lib/nas/5gs/support/nas-message.py b/lib/nas/5gs/support/nas-message.py index 7db4b50413..35ba6e576c 100644 --- a/lib/nas/5gs/support/nas-message.py +++ b/lib/nas/5gs/support/nas-message.py @@ -854,7 +854,7 @@ f.write("""ogs_pkbuf_t *ogs_nas_5gmm_encode(ogs_nas_5gs_message_t *message) /* The Packet Buffer(ogs_pkbuf_t) for NAS message MUST make a HEADROOM. * When calculating AES_CMAC, we need to use the headroom of the packet. */ pkbuf = ogs_pkbuf_alloc(NULL, OGS_MAX_SDU_LEN); - ogs_assert(pkbuf); + ogs_expect_or_return_val(pkbuf, NULL); ogs_pkbuf_reserve(pkbuf, OGS_NAS_HEADROOM); ogs_pkbuf_put(pkbuf, OGS_MAX_SDU_LEN-OGS_NAS_HEADROOM); @@ -905,7 +905,7 @@ f.write("""ogs_pkbuf_t *ogs_nas_5gsm_encode(ogs_nas_5gs_message_t *message) /* The Packet Buffer(ogs_pkbuf_t) for NAS message MUST make a HEADROOM. * When calculating AES_CMAC, we need to use the headroom of the packet. */ pkbuf = ogs_pkbuf_alloc(NULL, OGS_MAX_SDU_LEN); - ogs_assert(pkbuf); + ogs_expect_or_return_val(pkbuf, NULL); ogs_pkbuf_reserve(pkbuf, OGS_NAS_HEADROOM); ogs_pkbuf_put(pkbuf, OGS_MAX_SDU_LEN-OGS_NAS_HEADROOM); diff --git a/lib/nas/5gs/types.c b/lib/nas/5gs/types.c index 17bd32d58e..9282f64ffb 100644 --- a/lib/nas/5gs/types.c +++ b/lib/nas/5gs/types.c @@ -19,7 +19,7 @@ #include "ogs-nas-5gs.h" -void ogs_nas_5gs_tai_list_build( +int ogs_nas_5gs_tai_list_build( ogs_nas_5gs_tracking_area_identity_list_t *target, ogs_5gs_tai0_list_t *source0, ogs_5gs_tai2_list_t *source2) { @@ -54,9 +54,9 @@ void ogs_nas_5gs_tai_list_build( size = (1 + 3 + 3 * source0->tai[i].num); if ((target->length + size) > OGS_NAS_5GS_MAX_TAI_LIST_LEN) { - ogs_warn("Overflow: Ignore remained TAI LIST(length:%d, size:%d)", + ogs_error("Overflow: Ignore remained TAI LIST(length:%d, size:%d)", target->length, size); - return; + return OGS_ERROR; } memcpy(target->buffer + target->length, &target0.tai[i], size); target->length += size; @@ -75,9 +75,9 @@ void ogs_nas_5gs_tai_list_build( size = (1 + (3 + 3) * source2->num); if ((target->length + size) > OGS_NAS_5GS_MAX_TAI_LIST_LEN) { - ogs_warn("Overflow: Ignore remained TAI LIST(length:%d, size:%d)", + ogs_error("Overflow: Ignore remained TAI LIST(length:%d, size:%d)", target->length, size); - return; + return OGS_ERROR; } for (i = 0; i < source2->num; i++) { memcpy(&target2.tai[i].plmn_id, @@ -89,6 +89,8 @@ void ogs_nas_5gs_tai_list_build( memcpy(target->buffer + target->length, &target2, size); target->length += size; } + + return OGS_OK; } void ogs_nas_build_s_nssai( @@ -329,7 +331,7 @@ int ogs_nas_parse_rejected_nssai( if (!rejected_nssai->length) { ogs_error("No NSSAI [%p:%d]", rejected_nssai->buffer, rejected_nssai->length); - return OGS_ERROR; + return 0; } i = 0; @@ -366,7 +368,7 @@ int ogs_nas_parse_rejected_nssai( return i; } -void ogs_nas_build_qos_flow_descriptions( +int ogs_nas_build_qos_flow_descriptions( ogs_nas_qos_flow_descriptions_t *flow_descriptions, ogs_nas_qos_flow_description_t *flow_description, int num_of_flow_description) @@ -381,7 +383,7 @@ void ogs_nas_build_qos_flow_descriptions( ogs_assert(num_of_flow_description); buffer = ogs_calloc(1, OGS_NAS_MAX_QOS_FLOW_DESCRIPTIONS_LEN); - ogs_assert(buffer); + ogs_expect_or_return_val(buffer, OGS_ERROR); length = 0; for (i = 0; i < num_of_flow_description; i++) { @@ -438,9 +440,11 @@ void ogs_nas_build_qos_flow_descriptions( flow_descriptions->buffer = buffer; flow_descriptions->length = length; + + return OGS_OK; } -void ogs_nas_build_qos_rules(ogs_nas_qos_rules_t *rules, +int ogs_nas_build_qos_rules(ogs_nas_qos_rules_t *rules, ogs_nas_qos_rule_t *rule, int num_of_rule) { int i, j, k; @@ -453,6 +457,7 @@ void ogs_nas_build_qos_rules(ogs_nas_qos_rules_t *rules, ogs_assert(num_of_rule); buffer = ogs_calloc(1, OGS_NAS_MAX_QOS_RULES_LEN); + ogs_expect_or_return_val(buffer, OGS_ERROR); ogs_assert(buffer); length = 0; @@ -636,4 +641,6 @@ void ogs_nas_build_qos_rules(ogs_nas_qos_rules_t *rules, rules->buffer = buffer; rules->length = length; + + return OGS_OK; } diff --git a/lib/nas/5gs/types.h b/lib/nas/5gs/types.h index fac49e5af8..5e01cddf83 100644 --- a/lib/nas/5gs/types.h +++ b/lib/nas/5gs/types.h @@ -303,7 +303,7 @@ typedef struct ogs_nas_5gs_tracking_area_identity_list_s { uint8_t buffer[OGS_NAS_5GS_MAX_TAI_LIST_LEN]; } __attribute__ ((packed)) ogs_nas_5gs_tracking_area_identity_list_t; -void ogs_nas_5gs_tai_list_build( +int ogs_nas_5gs_tai_list_build( ogs_nas_5gs_tracking_area_identity_list_t *target, ogs_5gs_tai0_list_t *source0, ogs_5gs_tai2_list_t *source2); @@ -798,7 +798,7 @@ typedef struct ogs_nas_qos_flow_descriptions_s { void *buffer; } ogs_nas_qos_flow_descriptions_t; -void ogs_nas_build_qos_flow_descriptions( +int ogs_nas_build_qos_flow_descriptions( ogs_nas_qos_flow_descriptions_t *flow_descriptions, ogs_nas_qos_flow_description_t *flow_description, int num_of_flow_description); @@ -856,7 +856,7 @@ typedef struct ogs_nas_qos_rules_s { void *buffer; } __attribute__ ((packed)) ogs_nas_qos_rules_t; -void ogs_nas_build_qos_rules(ogs_nas_qos_rules_t *rules, +int ogs_nas_build_qos_rules(ogs_nas_qos_rules_t *rules, ogs_nas_qos_rule_t *rule, int num_of_rule); /* 9.11.4.15 SM PDU DN request container diff --git a/lib/nas/common/types.h b/lib/nas/common/types.h index 8d44d73c1b..c442d7c363 100644 --- a/lib/nas/common/types.h +++ b/lib/nas/common/types.h @@ -61,6 +61,7 @@ extern "C" { OGS_NAS_CLEAR_DATA(__dST); \ (__dST)->length = (__sRC)->length; \ (__dST)->buffer = ogs_calloc((__dST)->length, sizeof(uint8_t)); \ + ogs_assert((__dST)->buffer); \ memcpy((__dST)->buffer, (__sRC)->buffer, (__dST)->length); \ } while(0) diff --git a/lib/nas/eps/decoder.c b/lib/nas/eps/decoder.c index 94b92da6e1..c07182fda4 100644 --- a/lib/nas/eps/decoder.c +++ b/lib/nas/eps/decoder.c @@ -28,7 +28,7 @@ /******************************************************************************* * This file had been created by nas-message.py script v0.1.0 * Please do not modify this file but regenerate it via script. - * Created on: 2021-05-07 23:02:21.680106 by acetcom + * Created on: 2021-05-30 21:57:00.074257 by acetcom * from 24301-g40.docx ******************************************************************************/ diff --git a/lib/nas/eps/encoder.c b/lib/nas/eps/encoder.c index ef88b08eb2..40d02f127e 100644 --- a/lib/nas/eps/encoder.c +++ b/lib/nas/eps/encoder.c @@ -28,7 +28,7 @@ /******************************************************************************* * This file had been created by nas-message.py script v0.1.0 * Please do not modify this file but regenerate it via script. - * Created on: 2021-05-07 23:02:21.691492 by acetcom + * Created on: 2021-05-30 21:57:00.085478 by acetcom * from 24301-g40.docx ******************************************************************************/ @@ -3243,7 +3243,7 @@ ogs_pkbuf_t *ogs_nas_emm_encode(ogs_nas_eps_message_t *message) /* The Packet Buffer(ogs_pkbuf_t) for NAS message MUST make a HEADROOM. * When calculating AES_CMAC, we need to use the headroom of the packet. */ pkbuf = ogs_pkbuf_alloc(NULL, OGS_MAX_SDU_LEN); - ogs_assert(pkbuf); + ogs_expect_or_return_val(pkbuf, NULL); ogs_pkbuf_reserve(pkbuf, OGS_NAS_HEADROOM); ogs_pkbuf_put(pkbuf, OGS_MAX_SDU_LEN-OGS_NAS_HEADROOM); @@ -3429,7 +3429,7 @@ ogs_pkbuf_t *ogs_nas_esm_encode(ogs_nas_eps_message_t *message) /* The Packet Buffer(ogs_pkbuf_t) for NAS message MUST make a HEADROOM. * When calculating AES_CMAC, we need to use the headroom of the packet. */ pkbuf = ogs_pkbuf_alloc(NULL, OGS_MAX_SDU_LEN); - ogs_assert(pkbuf); + ogs_expect_or_return_val(pkbuf, NULL); ogs_pkbuf_reserve(pkbuf, OGS_NAS_HEADROOM); ogs_pkbuf_put(pkbuf, OGS_MAX_SDU_LEN-OGS_NAS_HEADROOM); diff --git a/lib/nas/eps/ies.c b/lib/nas/eps/ies.c index 87d8dcb6b2..6657ba22c4 100644 --- a/lib/nas/eps/ies.c +++ b/lib/nas/eps/ies.c @@ -28,7 +28,7 @@ /******************************************************************************* * This file had been created by nas-message.py script v0.1.0 * Please do not modify this file but regenerate it via script. - * Created on: 2021-05-07 23:02:21.664083 by acetcom + * Created on: 2021-05-30 21:57:00.058358 by acetcom * from 24301-g40.docx ******************************************************************************/ diff --git a/lib/nas/eps/ies.h b/lib/nas/eps/ies.h index b7cce1a04a..9a5d445ae9 100644 --- a/lib/nas/eps/ies.h +++ b/lib/nas/eps/ies.h @@ -28,7 +28,7 @@ /******************************************************************************* * This file had been created by nas-message.py script v0.1.0 * Please do not modify this file but regenerate it via script. - * Created on: 2021-05-07 23:02:21.661736 by acetcom + * Created on: 2021-05-30 21:57:00.055906 by acetcom * from 24301-g40.docx ******************************************************************************/ diff --git a/lib/nas/eps/message.h b/lib/nas/eps/message.h index d5e9dff362..f058caa71f 100644 --- a/lib/nas/eps/message.h +++ b/lib/nas/eps/message.h @@ -28,7 +28,7 @@ /******************************************************************************* * This file had been created by nas-message.py script v0.1.0 * Please do not modify this file but regenerate it via script. - * Created on: 2021-05-07 23:02:21.671298 by acetcom + * Created on: 2021-05-30 21:57:00.065569 by acetcom * from 24301-g40.docx ******************************************************************************/ diff --git a/lib/nas/eps/support/nas-message.py b/lib/nas/eps/support/nas-message.py index acbe7400e7..00d16508d2 100644 --- a/lib/nas/eps/support/nas-message.py +++ b/lib/nas/eps/support/nas-message.py @@ -880,7 +880,7 @@ f.write("""ogs_pkbuf_t *ogs_nas_emm_encode(ogs_nas_eps_message_t *message) /* The Packet Buffer(ogs_pkbuf_t) for NAS message MUST make a HEADROOM. * When calculating AES_CMAC, we need to use the headroom of the packet. */ pkbuf = ogs_pkbuf_alloc(NULL, OGS_MAX_SDU_LEN); - ogs_assert(pkbuf); + ogs_expect_or_return_val(pkbuf, NULL); ogs_pkbuf_reserve(pkbuf, OGS_NAS_HEADROOM); ogs_pkbuf_put(pkbuf, OGS_MAX_SDU_LEN-OGS_NAS_HEADROOM); @@ -943,7 +943,7 @@ f.write("""ogs_pkbuf_t *ogs_nas_esm_encode(ogs_nas_eps_message_t *message) /* The Packet Buffer(ogs_pkbuf_t) for NAS message MUST make a HEADROOM. * When calculating AES_CMAC, we need to use the headroom of the packet. */ pkbuf = ogs_pkbuf_alloc(NULL, OGS_MAX_SDU_LEN); - ogs_assert(pkbuf); + ogs_expect_or_return_val(pkbuf, NULL); ogs_pkbuf_reserve(pkbuf, OGS_NAS_HEADROOM); ogs_pkbuf_put(pkbuf, OGS_MAX_SDU_LEN-OGS_NAS_HEADROOM); diff --git a/lib/nas/eps/types.c b/lib/nas/eps/types.c index 009efcfc2e..7dcf0bf5a9 100644 --- a/lib/nas/eps/types.c +++ b/lib/nas/eps/types.c @@ -19,7 +19,7 @@ #include "ogs-nas-eps.h" -void ogs_nas_tai_list_build(ogs_nas_tracking_area_identity_list_t *target, +int ogs_nas_tai_list_build(ogs_nas_tracking_area_identity_list_t *target, ogs_eps_tai0_list_t *source0, ogs_eps_tai2_list_t *source2) { int i = 0, j = 0, size = 0; @@ -53,9 +53,9 @@ void ogs_nas_tai_list_build(ogs_nas_tracking_area_identity_list_t *target, size = (1 + 3 + 2 * source0->tai[i].num); if ((target->length + size) > OGS_NAS_EPS_MAX_TAI_LIST_LEN) { - ogs_warn("Overflow: Ignore remained TAI LIST(length:%d, size:%d)", + ogs_error("Overflow: Ignore remained TAI LIST(length:%d, size:%d)", target->length, size); - return; + return OGS_ERROR; } memcpy(target->buffer + target->length, &target0.tai[i], size); target->length += size; @@ -74,9 +74,9 @@ void ogs_nas_tai_list_build(ogs_nas_tracking_area_identity_list_t *target, size = (1 + (3 + 2) * source2->num); if ((target->length + size) > OGS_NAS_EPS_MAX_TAI_LIST_LEN) { - ogs_warn("Overflow: Ignore remained TAI LIST(length:%d, size:%d)", + ogs_error("Overflow: Ignore remained TAI LIST(length:%d, size:%d)", target->length, size); - return; + return OGS_ERROR; } for (i = 0; i < source2->num; i++) { memcpy(&target2.tai[i].plmn_id, @@ -88,4 +88,6 @@ void ogs_nas_tai_list_build(ogs_nas_tracking_area_identity_list_t *target, memcpy(target->buffer + target->length, &target2, size); target->length += size; } + + return OGS_OK; } diff --git a/lib/nas/eps/types.h b/lib/nas/eps/types.h index 1b70bc4383..9aba2731cd 100644 --- a/lib/nas/eps/types.h +++ b/lib/nas/eps/types.h @@ -552,7 +552,7 @@ typedef struct ogs_nas_tracking_area_identity_list_s { uint8_t buffer[OGS_NAS_EPS_MAX_TAI_LIST_LEN]; } __attribute__ ((packed)) ogs_nas_tracking_area_identity_list_t; -void ogs_nas_tai_list_build(ogs_nas_tracking_area_identity_list_t *target, +int ogs_nas_tai_list_build(ogs_nas_tracking_area_identity_list_t *target, ogs_eps_tai0_list_t *source0, ogs_eps_tai2_list_t *source2); diff --git a/lib/ngap/message.c b/lib/ngap/message.c index b9eb7c8492..71f4a39d9d 100644 --- a/lib/ngap/message.c +++ b/lib/ngap/message.c @@ -31,10 +31,7 @@ ogs_pkbuf_t *ogs_ngap_encode(ogs_ngap_message_t *message) asn_fprint(stdout, &asn_DEF_NGAP_NGAP_PDU, message); pkbuf = ogs_asn_encode(&asn_DEF_NGAP_NGAP_PDU, message); - if (pkbuf == NULL) { - ogs_error("Failed to encode NGAP-PDU"); - return NULL; - } + ogs_expect_or_return_val(pkbuf, NULL); return pkbuf; } diff --git a/lib/pfcp/build.c b/lib/pfcp/build.c index 643813efc7..40f844936e 100644 --- a/lib/pfcp/build.c +++ b/lib/pfcp/build.c @@ -59,17 +59,18 @@ ogs_pkbuf_t *ogs_pfcp_cp_build_association_setup_request(uint8_t type) ogs_pfcp_association_setup_request_t *req = NULL; ogs_pfcp_node_id_t node_id; - int node_id_len = 0; + int node_id_len = 0, rv; ogs_debug("Association Setup Request"); req = &pfcp_message.pfcp_association_setup_request; memset(&pfcp_message, 0, sizeof(ogs_pfcp_message_t)); - ogs_pfcp_sockaddr_to_node_id( + rv = ogs_pfcp_sockaddr_to_node_id( ogs_pfcp_self()->pfcp_addr, ogs_pfcp_self()->pfcp_addr6, ogs_app()->parameter.prefer_ipv4, &node_id, &node_id_len); + ogs_expect_or_return_val(rv == OGS_OK, NULL); req->node_id.presence = 1; req->node_id.data = &node_id; req->node_id.len = node_id_len; @@ -91,17 +92,18 @@ ogs_pkbuf_t *ogs_pfcp_cp_build_association_setup_response(uint8_t type, ogs_pfcp_association_setup_response_t *rsp = NULL; ogs_pfcp_node_id_t node_id; - int node_id_len = 0; + int node_id_len = 0, rv; ogs_debug("Association Setup Response"); rsp = &pfcp_message.pfcp_association_setup_response; memset(&pfcp_message, 0, sizeof(ogs_pfcp_message_t)); - ogs_pfcp_sockaddr_to_node_id( + rv = ogs_pfcp_sockaddr_to_node_id( ogs_pfcp_self()->pfcp_addr, ogs_pfcp_self()->pfcp_addr6, ogs_app()->parameter.prefer_ipv4, &node_id, &node_id_len); + ogs_expect_or_return_val(rv == OGS_OK, NULL); rsp->node_id.presence = 1; rsp->node_id.data = &node_id; rsp->node_id.len = node_id_len; @@ -130,17 +132,18 @@ ogs_pkbuf_t *ogs_pfcp_up_build_association_setup_request(uint8_t type) ogs_gtpu_resource_t *resource = NULL; char infobuf[OGS_MAX_NUM_OF_GTPU_RESOURCE] [OGS_MAX_USER_PLANE_IP_RESOURCE_INFO_LEN]; - int i = 0; + int i = 0, rv; ogs_debug("Association Setup Request"); req = &pfcp_message.pfcp_association_setup_request; memset(&pfcp_message, 0, sizeof(ogs_pfcp_message_t)); - ogs_pfcp_sockaddr_to_node_id( + rv = ogs_pfcp_sockaddr_to_node_id( ogs_pfcp_self()->pfcp_addr, ogs_pfcp_self()->pfcp_addr6, ogs_app()->parameter.prefer_ipv4, &node_id, &node_id_len); + ogs_expect_or_return_val(rv == OGS_OK, NULL); req->node_id.presence = 1; req->node_id.data = &node_id; req->node_id.len = node_id_len; @@ -185,17 +188,18 @@ ogs_pkbuf_t *ogs_pfcp_up_build_association_setup_response(uint8_t type, ogs_gtpu_resource_t *resource = NULL; char infobuf[OGS_MAX_NUM_OF_GTPU_RESOURCE] [OGS_MAX_USER_PLANE_IP_RESOURCE_INFO_LEN]; - int i = 0; + int i = 0, rv; ogs_debug("Association Setup Response"); rsp = &pfcp_message.pfcp_association_setup_response; memset(&pfcp_message, 0, sizeof(ogs_pfcp_message_t)); - ogs_pfcp_sockaddr_to_node_id( + rv = ogs_pfcp_sockaddr_to_node_id( ogs_pfcp_self()->pfcp_addr, ogs_pfcp_self()->pfcp_addr6, ogs_app()->parameter.prefer_ipv4, &node_id, &node_id_len); + ogs_expect_or_return_val(rv == OGS_OK, NULL); rsp->node_id.presence = 1; rsp->node_id.data = &node_id; rsp->node_id.len = node_id_len; @@ -299,6 +303,7 @@ void ogs_pfcp_build_create_pdr( message->pdi.sdf_filter[j].presence = 1; pdrbuf[i].sdf_filter[j] = ogs_calloc(1, len); + ogs_assert(pdrbuf[i].sdf_filter[j]); ogs_pfcp_build_sdf_filter(&message->pdi.sdf_filter[j], &pfcp_sdf_filter[j], pdrbuf[i].sdf_filter[j], len); } @@ -404,6 +409,7 @@ void ogs_pfcp_build_update_pdr( message->pdi.sdf_filter[j].presence = 1; pdrbuf[i].sdf_filter[j] = ogs_calloc(1, len); + ogs_assert(pdrbuf[i].sdf_filter[j]); ogs_pfcp_build_sdf_filter(&message->pdi.sdf_filter[j], &pfcp_sdf_filter[j], pdrbuf[i].sdf_filter[j], len); } diff --git a/lib/pfcp/context.c b/lib/pfcp/context.c index 592742ac8e..7bf6e32a84 100644 --- a/lib/pfcp/context.c +++ b/lib/pfcp/context.c @@ -85,8 +85,11 @@ void ogs_pfcp_context_init(void) ogs_pool_init(&ogs_pfcp_subnet_pool, OGS_MAX_NUM_OF_SUBNET); self.object_teid_hash = ogs_hash_make(); + ogs_assert(self.object_teid_hash); self.far_f_teid_hash = ogs_hash_make(); + ogs_assert(self.far_f_teid_hash); self.far_teid_hash = ogs_hash_make(); + ogs_assert(self.far_teid_hash); context_initialized = 1; } @@ -676,7 +679,7 @@ ogs_pfcp_node_t *ogs_pfcp_node_add( ogs_assert(list); ogs_assert(addr); - ogs_copyaddrinfo(&new, addr); + ogs_assert(OGS_OK == ogs_copyaddrinfo(&new, addr)); node = ogs_pfcp_node_new(new); ogs_assert(node); @@ -752,7 +755,7 @@ ogs_gtpu_resource_t *ogs_pfcp_find_gtpu_resource(ogs_list_t *list, return NULL; } -void ogs_pfcp_setup_far_gtpu_node(ogs_pfcp_far_t *far) +int ogs_pfcp_setup_far_gtpu_node(ogs_pfcp_far_t *far) { int rv; ogs_ip_t ip; @@ -763,23 +766,25 @@ void ogs_pfcp_setup_far_gtpu_node(ogs_pfcp_far_t *far) ogs_pfcp_outer_header_creation_to_ip(&far->outer_header_creation, &ip); /* No Outer Header Creation */ - if (ip.len == 0) return; + if (ip.len == 0) return OGS_DONE; gnode = ogs_gtp_node_find_by_ip(&ogs_gtp_self()->gtpu_peer_list, &ip); if (!gnode) { gnode = ogs_gtp_node_add_by_ip( &ogs_gtp_self()->gtpu_peer_list, &ip, ogs_gtp_self()->gtpu_port); - ogs_assert(gnode); + ogs_expect_or_return_val(gnode, OGS_ERROR); rv = ogs_gtp_connect( ogs_gtp_self()->gtpu_sock, ogs_gtp_self()->gtpu_sock6, gnode); - ogs_assert(rv == OGS_OK); + ogs_expect_or_return_val(rv == OGS_OK, rv); } OGS_SETUP_GTP_NODE(far, gnode); + + return OGS_OK; } -void ogs_pfcp_setup_pdr_gtpu_node(ogs_pfcp_pdr_t *pdr) +int ogs_pfcp_setup_pdr_gtpu_node(ogs_pfcp_pdr_t *pdr) { int rv; ogs_ip_t ip; @@ -788,22 +793,25 @@ void ogs_pfcp_setup_pdr_gtpu_node(ogs_pfcp_pdr_t *pdr) ogs_assert(pdr); /* No F-TEID */ - if (pdr->f_teid_len == 0) return; + if (pdr->f_teid_len == 0) return OGS_DONE; - ogs_pfcp_f_teid_to_ip(&pdr->f_teid, &ip); + rv = ogs_pfcp_f_teid_to_ip(&pdr->f_teid, &ip); + ogs_expect_or_return_val(rv == OGS_OK, rv); gnode = ogs_gtp_node_find_by_ip(&ogs_gtp_self()->gtpu_peer_list, &ip); if (!gnode) { gnode = ogs_gtp_node_add_by_ip( &ogs_gtp_self()->gtpu_peer_list, &ip, ogs_gtp_self()->gtpu_port); - ogs_assert(gnode); + ogs_expect_or_return_val(gnode, OGS_ERROR); rv = ogs_gtp_connect( ogs_gtp_self()->gtpu_sock, ogs_gtp_self()->gtpu_sock6, gnode); - ogs_assert(rv == OGS_OK); + ogs_expect_or_return_val(rv == OGS_OK, rv); } OGS_SETUP_GTP_NODE(pdr, gnode); + + return OGS_OK; } void ogs_pfcp_sess_clear(ogs_pfcp_sess_t *sess) @@ -1577,8 +1585,8 @@ ogs_pfcp_ue_ip_t *ogs_pfcp_ue_ip_alloc( } else if (family == AF_INET6) { maxbytes = 16; } else { - ogs_fatal("Invalid family[%d]", family); - ogs_assert_if_reached(); + ogs_error("Invalid family[%d]", family); + return NULL; } if (dnn) @@ -1596,22 +1604,22 @@ ogs_pfcp_ue_ip_t *ogs_pfcp_ue_ip_alloc( else if (family == AF_INET6) ogs_error(" - addr: 2001:230:cafe::1/48"); - ogs_assert_if_reached(); return NULL; } /* if assigning a static IP, do so. If not, assign dynamically! */ if (memcmp(addr, zero, maxbytes) != 0) { ue_ip = ogs_calloc(1, sizeof(ogs_pfcp_ue_ip_t)); + ogs_expect_or_return_val(ue_ip, NULL); ue_ip->subnet = subnet; ue_ip->static_ip = true; memcpy(ue_ip->addr, addr, maxbytes); } else { ogs_pool_alloc(&subnet->pool, &ue_ip); + ogs_expect(ue_ip); } - ogs_assert(ue_ip); return ue_ip; } diff --git a/lib/pfcp/context.h b/lib/pfcp/context.h index b00d95ec8c..c48038ce3d 100644 --- a/lib/pfcp/context.h +++ b/lib/pfcp/context.h @@ -353,8 +353,8 @@ void ogs_pfcp_node_remove_all(ogs_list_t *list); ogs_gtpu_resource_t *ogs_pfcp_find_gtpu_resource(ogs_list_t *list, char *dnn, ogs_pfcp_interface_t source_interface); -void ogs_pfcp_setup_far_gtpu_node(ogs_pfcp_far_t *far); -void ogs_pfcp_setup_pdr_gtpu_node(ogs_pfcp_pdr_t *pdr); +int ogs_pfcp_setup_far_gtpu_node(ogs_pfcp_far_t *far); +int ogs_pfcp_setup_pdr_gtpu_node(ogs_pfcp_pdr_t *pdr); void ogs_pfcp_sess_clear(ogs_pfcp_sess_t *sess); diff --git a/lib/pfcp/conv.c b/lib/pfcp/conv.c index ce4dbda54a..e4c250e7a7 100644 --- a/lib/pfcp/conv.c +++ b/lib/pfcp/conv.c @@ -65,7 +65,7 @@ int ogs_pfcp_sockaddr_to_node_id( node_id->addr = addr->sin.sin_addr.s_addr; *len = OGS_IPV4_LEN + hdr_len; } else { - ogs_assert_if_reached(); + ogs_error("No IPv4 or IPv6"); return OGS_ERROR; } @@ -81,12 +81,12 @@ int ogs_pfcp_f_seid_to_sockaddr( ogs_assert(list); addr = ogs_calloc(1, sizeof(ogs_sockaddr_t)); - ogs_assert(addr); + ogs_expect_or_return_val(addr, OGS_ERROR); addr->ogs_sa_family = AF_INET; addr->ogs_sin_port = htobe16(port); addr6 = ogs_calloc(1, sizeof(ogs_sockaddr_t)); - ogs_assert(addr6); + ogs_expect_or_return_val(addr6, OGS_ERROR); addr6->ogs_sa_family = AF_INET6; addr6->ogs_sin_port = htobe16(port); @@ -110,7 +110,8 @@ int ogs_pfcp_f_seid_to_sockaddr( } else { ogs_free(addr); ogs_free(addr6); - ogs_assert_if_reached(); + ogs_error("No IPv4 or IPv6"); + return OGS_ERROR; } return OGS_OK; @@ -142,8 +143,10 @@ int ogs_pfcp_sockaddr_to_f_seid( f_seid->ipv6 = 1; memcpy(f_seid->addr6, addr6->sin6.sin6_addr.s6_addr, OGS_IPV6_LEN); *len = OGS_IPV6_LEN + hdr_len; - } else - ogs_assert_if_reached(); + } else { + ogs_error("No IPv4 or IPv6"); + return OGS_ERROR; + } return OGS_OK; } @@ -168,8 +171,10 @@ int ogs_pfcp_f_seid_to_ip(ogs_pfcp_f_seid_t *f_seid, ogs_ip_t *ip) } else if (ip->ipv6) { memcpy(ip->addr6, f_seid->addr6, OGS_IPV6_LEN); ip->len = OGS_IPV6_LEN; - } else - ogs_assert_if_reached(); + } else { + ogs_error("No IPv4 or IPv6"); + return OGS_ERROR; + } return OGS_OK; } @@ -200,8 +205,10 @@ int ogs_pfcp_sockaddr_to_f_teid( f_teid->ipv6 = 1; memcpy(f_teid->addr6, addr6->sin6.sin6_addr.s6_addr, OGS_IPV6_LEN); *len = OGS_IPV6_LEN + hdr_len; - } else - ogs_expect_or_return_val(0, OGS_ERROR); + } else { + ogs_error("No IPv4 or IPv6"); + return OGS_ERROR; + } return OGS_OK; } @@ -219,25 +226,28 @@ int ogs_pfcp_f_teid_to_sockaddr( if (f_teid->ipv4 && f_teid->ipv6) { *addr = ogs_calloc(1, sizeof(**addr)); - ogs_assert(*addr); + ogs_expect_or_return_val(*addr, OGS_ERROR); (*addr)->sin.sin_addr.s_addr = f_teid->both.addr; (*addr)->ogs_sa_family = AF_INET; *addr6 = ogs_calloc(1, sizeof(**addr6)); - ogs_assert(*addr6); + ogs_expect_or_return_val(*addr6, OGS_ERROR); memcpy((*addr6)->sin6.sin6_addr.s6_addr, f_teid->both.addr6, OGS_IPV6_LEN); (*addr6)->ogs_sa_family = AF_INET6; } else if (f_teid->ipv4) { *addr = ogs_calloc(1, sizeof(**addr)); - ogs_assert(*addr); + ogs_expect_or_return_val(*addr, OGS_ERROR); (*addr)->sin.sin_addr.s_addr = f_teid->addr; (*addr)->ogs_sa_family = AF_INET; } else if (f_teid->ipv6) { *addr6 = ogs_calloc(1, sizeof(**addr6)); - ogs_assert(*addr6); + ogs_expect_or_return_val(*addr6, OGS_ERROR); memcpy((*addr6)->sin6.sin6_addr.s6_addr, f_teid->addr6, OGS_IPV6_LEN); (*addr6)->ogs_sa_family = AF_INET6; + } else { + ogs_error("No IPv4 or IPv6"); + return OGS_ERROR; } return OGS_OK; @@ -263,8 +273,10 @@ int ogs_pfcp_f_teid_to_ip(ogs_pfcp_f_teid_t *f_teid, ogs_ip_t *ip) } else if (ip->ipv6) { memcpy(ip->addr6, f_teid->addr6, OGS_IPV6_LEN); ip->len = OGS_IPV6_LEN; - } else - ogs_assert_if_reached(); + } else { + ogs_error("No IPv4 or IPv6"); + return OGS_ERROR; + } return OGS_OK; } @@ -295,8 +307,10 @@ int ogs_pfcp_user_plane_ip_resource_info_to_f_teid( f_teid->ipv6 = 1; memcpy(f_teid->addr6, info->addr6, OGS_IPV6_LEN); *len = OGS_IPV6_LEN + hdr_len; - } else - ogs_assert_if_reached(); + } else { + ogs_error("No IPv4 or IPv6"); + return OGS_ERROR; + } return OGS_OK; } @@ -327,8 +341,10 @@ int ogs_pfcp_paa_to_ue_ip_addr( addr->ipv6 = 1; memcpy(addr->addr6, paa->addr6, OGS_IPV6_LEN); *len = OGS_IPV6_LEN + hdr_len; - } else - ogs_assert_if_reached(); + } else { + ogs_error("No IPv4 or IPv6"); + return OGS_ERROR; + } return OGS_OK; } @@ -358,13 +374,15 @@ int ogs_pfcp_ip_to_outer_header_creation(ogs_ip_t *ip, outer_header_creation->gtpu6 = 1; memcpy(outer_header_creation->addr6, ip->addr6, OGS_IPV6_LEN); *len = OGS_IPV6_LEN + hdr_len; - } else - ogs_assert_if_reached(); + } else { + ogs_error("No IPv4 or IPv6"); + return OGS_ERROR; + } return OGS_OK; } -int ogs_pfcp_outer_header_creation_to_ip( +void ogs_pfcp_outer_header_creation_to_ip( ogs_pfcp_outer_header_creation_t *outer_header_creation, ogs_ip_t *ip) { ogs_assert(outer_header_creation); @@ -393,8 +411,5 @@ int ogs_pfcp_outer_header_creation_to_ip( ip->ipv6 = 1; ip->len = OGS_IPV6_LEN; memcpy(ip->addr6, outer_header_creation->addr6, OGS_IPV6_LEN); - } else - return OGS_ERROR; - - return OGS_OK; + } } diff --git a/lib/pfcp/conv.h b/lib/pfcp/conv.h index ad8ccafa49..5ec085241f 100644 --- a/lib/pfcp/conv.h +++ b/lib/pfcp/conv.h @@ -55,7 +55,7 @@ int ogs_pfcp_paa_to_ue_ip_addr( int ogs_pfcp_ip_to_outer_header_creation(ogs_ip_t *ip, ogs_pfcp_outer_header_creation_t *outer_header_creation, int *len); -int ogs_pfcp_outer_header_creation_to_ip( +void ogs_pfcp_outer_header_creation_to_ip( ogs_pfcp_outer_header_creation_t *outer_header_creation, ogs_ip_t *ip); #ifdef __cplusplus diff --git a/lib/pfcp/handler.c b/lib/pfcp/handler.c index 4cac5f61cc..006f6546a2 100644 --- a/lib/pfcp/handler.c +++ b/lib/pfcp/handler.c @@ -19,15 +19,20 @@ #include "ogs-pfcp.h" -void ogs_pfcp_handle_heartbeat_request( +bool ogs_pfcp_handle_heartbeat_request( ogs_pfcp_node_t *node, ogs_pfcp_xact_t *xact, ogs_pfcp_heartbeat_request_t *req) { + int rv; ogs_assert(xact); - ogs_pfcp_send_heartbeat_response(xact); + + rv = ogs_pfcp_send_heartbeat_response(xact); + ogs_expect_or_return_val(rv == OGS_OK, false); + + return true; } -void ogs_pfcp_handle_heartbeat_response( +bool ogs_pfcp_handle_heartbeat_response( ogs_pfcp_node_t *node, ogs_pfcp_xact_t *xact, ogs_pfcp_heartbeat_response_t *rsp) { @@ -36,9 +41,11 @@ void ogs_pfcp_handle_heartbeat_response( ogs_timer_start(node->t_no_heartbeat, ogs_app()->time.message.pfcp.no_heartbeat_duration); + + return true; } -void ogs_pfcp_cp_handle_association_setup_request( +bool ogs_pfcp_cp_handle_association_setup_request( ogs_pfcp_node_t *node, ogs_pfcp_xact_t *xact, ogs_pfcp_association_setup_request_t *req) { @@ -81,9 +88,11 @@ void ogs_pfcp_cp_handle_association_setup_request( ogs_error("F-TEID allocation/release not supported with peer [%s]:%d", OGS_ADDR(addr, buf), OGS_PORT(addr)); } + + return true; } -void ogs_pfcp_cp_handle_association_setup_response( +bool ogs_pfcp_cp_handle_association_setup_response( ogs_pfcp_node_t *node, ogs_pfcp_xact_t *xact, ogs_pfcp_association_setup_response_t *rsp) { @@ -125,9 +134,11 @@ void ogs_pfcp_cp_handle_association_setup_response( ogs_error("F-TEID allocation/release not supported with peer [%s]:%d", OGS_ADDR(addr, buf), OGS_PORT(addr)); } + + return true; } -void ogs_pfcp_up_handle_association_setup_request( +bool ogs_pfcp_up_handle_association_setup_request( ogs_pfcp_node_t *node, ogs_pfcp_xact_t *xact, ogs_pfcp_association_setup_request_t *req) { @@ -139,9 +150,11 @@ void ogs_pfcp_up_handle_association_setup_request( ogs_pfcp_self()->cp_function_features.octet5 = req->cp_function_features.u8; } + + return true; } -void ogs_pfcp_up_handle_association_setup_response( +bool ogs_pfcp_up_handle_association_setup_response( ogs_pfcp_node_t *node, ogs_pfcp_xact_t *xact, ogs_pfcp_association_setup_response_t *rsp) { @@ -152,9 +165,11 @@ void ogs_pfcp_up_handle_association_setup_response( ogs_pfcp_self()->cp_function_features.octet5 = rsp->cp_function_features.u8; } + + return true; } -void ogs_pfcp_up_handle_pdr( +bool ogs_pfcp_up_handle_pdr( ogs_pfcp_pdr_t *pdr, ogs_pkbuf_t *recvbuf, ogs_pfcp_user_plane_report_t *report) { @@ -172,12 +187,7 @@ void ogs_pfcp_up_handle_pdr( memset(report, 0, sizeof(*report)); sendbuf = ogs_pkbuf_copy(recvbuf); - if (!sendbuf) { - ogs_fatal("Not enough packet buffer"); - ogs_assert_if_reached(); - - return; - } + ogs_expect_or_return_val(sendbuf, false); buffering = false; @@ -214,9 +224,11 @@ void ogs_pfcp_up_handle_pdr( ogs_pkbuf_free(sendbuf); } } + + return true; } -void ogs_pfcp_up_handle_error_indication( +bool ogs_pfcp_up_handle_error_indication( ogs_pfcp_far_t *far, ogs_pfcp_user_plane_report_t *report) { uint16_t len; @@ -244,10 +256,12 @@ void ogs_pfcp_up_handle_error_indication( far->hash.f_teid.key.addr, len); } else { ogs_error("Invalid Length [%d]", len); - return; + return false; } report->type.error_indication_report = 1; + + return true; } ogs_pfcp_pdr_t *ogs_pfcp_handle_create_pdr(ogs_pfcp_sess_t *sess, @@ -350,6 +364,7 @@ ogs_pfcp_pdr_t *ogs_pfcp_handle_create_pdr(ogs_pfcp_sess_t *sess, flow_description = ogs_malloc( sdf_filter.flow_description_len+1); + ogs_assert(flow_description); ogs_cpystrn(flow_description, sdf_filter.flow_description, sdf_filter.flow_description_len+1); @@ -408,6 +423,7 @@ ogs_pfcp_pdr_t *ogs_pfcp_handle_create_pdr(ogs_pfcp_sess_t *sess, message->pdi.network_instance.len); pdr->dnn = ogs_strdup(dnn); + ogs_assert(pdr->dnn); } pdr->chid = false; @@ -593,6 +609,7 @@ ogs_pfcp_pdr_t *ogs_pfcp_handle_update_pdr(ogs_pfcp_sess_t *sess, flow_description = ogs_malloc( sdf_filter.flow_description_len+1); + ogs_assert(flow_description); ogs_cpystrn(flow_description, sdf_filter.flow_description, sdf_filter.flow_description_len+1); @@ -648,6 +665,7 @@ ogs_pfcp_pdr_t *ogs_pfcp_handle_update_pdr(ogs_pfcp_sess_t *sess, if (pdr->dnn) ogs_free(pdr->dnn); pdr->dnn = ogs_strdup(dnn); + ogs_assert(pdr->dnn); } if (message->pdi.local_f_teid.presence) { diff --git a/lib/pfcp/handler.h b/lib/pfcp/handler.h index 9ca0e5efb3..3c60651e20 100644 --- a/lib/pfcp/handler.h +++ b/lib/pfcp/handler.h @@ -24,31 +24,31 @@ extern "C" { #endif -void ogs_pfcp_handle_heartbeat_request( +bool ogs_pfcp_handle_heartbeat_request( ogs_pfcp_node_t *node, ogs_pfcp_xact_t *xact, ogs_pfcp_heartbeat_request_t *req); -void ogs_pfcp_handle_heartbeat_response( +bool ogs_pfcp_handle_heartbeat_response( ogs_pfcp_node_t *node, ogs_pfcp_xact_t *xact, ogs_pfcp_heartbeat_response_t *req); -void ogs_pfcp_cp_handle_association_setup_request( +bool ogs_pfcp_cp_handle_association_setup_request( ogs_pfcp_node_t *node, ogs_pfcp_xact_t *xact, ogs_pfcp_association_setup_request_t *req); -void ogs_pfcp_cp_handle_association_setup_response( +bool ogs_pfcp_cp_handle_association_setup_response( ogs_pfcp_node_t *node, ogs_pfcp_xact_t *xact, ogs_pfcp_association_setup_response_t *req); -void ogs_pfcp_up_handle_association_setup_request( +bool ogs_pfcp_up_handle_association_setup_request( ogs_pfcp_node_t *node, ogs_pfcp_xact_t *xact, ogs_pfcp_association_setup_request_t *req); -void ogs_pfcp_up_handle_association_setup_response( +bool ogs_pfcp_up_handle_association_setup_response( ogs_pfcp_node_t *node, ogs_pfcp_xact_t *xact, ogs_pfcp_association_setup_response_t *req); -void ogs_pfcp_up_handle_pdr( +bool ogs_pfcp_up_handle_pdr( ogs_pfcp_pdr_t *pdr, ogs_pkbuf_t *recvbuf, ogs_pfcp_user_plane_report_t *report); -void ogs_pfcp_up_handle_error_indication( +bool ogs_pfcp_up_handle_error_indication( ogs_pfcp_far_t *far, ogs_pfcp_user_plane_report_t *report); ogs_pfcp_pdr_t *ogs_pfcp_handle_create_pdr(ogs_pfcp_sess_t *sess, diff --git a/lib/pfcp/path.c b/lib/pfcp/path.c index 971dd7ca83..5822f75fd8 100644 --- a/lib/pfcp/path.c +++ b/lib/pfcp/path.c @@ -120,7 +120,7 @@ int ogs_pfcp_sendto(ogs_pfcp_node_t *node, ogs_pkbuf_t *pkbuf) return OGS_OK; } -void ogs_pfcp_send_heartbeat_request(ogs_pfcp_node_t *node, +int ogs_pfcp_send_heartbeat_request(ogs_pfcp_node_t *node, void (*cb)(ogs_pfcp_xact_t *xact, void *data)) { int rv; @@ -135,16 +135,18 @@ void ogs_pfcp_send_heartbeat_request(ogs_pfcp_node_t *node, h.seid = 0; pkbuf = ogs_pfcp_build_heartbeat_request(h.type); - ogs_expect_or_return(pkbuf); + ogs_expect_or_return_val(pkbuf, OGS_ERROR); xact = ogs_pfcp_xact_local_create(node, &h, pkbuf, cb, node); - ogs_expect_or_return(xact); + ogs_expect_or_return_val(xact, OGS_ERROR); rv = ogs_pfcp_xact_commit(xact); ogs_expect(rv == OGS_OK); + + return rv; } -void ogs_pfcp_send_heartbeat_response(ogs_pfcp_xact_t *xact) +int ogs_pfcp_send_heartbeat_response(ogs_pfcp_xact_t *xact) { int rv; ogs_pkbuf_t *pkbuf = NULL; @@ -157,16 +159,18 @@ void ogs_pfcp_send_heartbeat_response(ogs_pfcp_xact_t *xact) h.seid = 0; pkbuf = ogs_pfcp_build_heartbeat_response(h.type); - ogs_expect_or_return(pkbuf); + ogs_expect_or_return_val(pkbuf, OGS_ERROR); rv = ogs_pfcp_xact_update_tx(xact, &h, pkbuf); - ogs_expect_or_return(rv == OGS_OK); + ogs_expect_or_return_val(rv == OGS_OK, OGS_ERROR); rv = ogs_pfcp_xact_commit(xact); ogs_expect(rv == OGS_OK); + + return rv; } -void ogs_pfcp_cp_send_association_setup_request(ogs_pfcp_node_t *node, +int ogs_pfcp_cp_send_association_setup_request(ogs_pfcp_node_t *node, void (*cb)(ogs_pfcp_xact_t *xact, void *data)) { int rv; @@ -181,16 +185,18 @@ void ogs_pfcp_cp_send_association_setup_request(ogs_pfcp_node_t *node, h.seid = 0; pkbuf = ogs_pfcp_cp_build_association_setup_request(h.type); - ogs_expect_or_return(pkbuf); + ogs_expect_or_return_val(pkbuf, OGS_ERROR); xact = ogs_pfcp_xact_local_create(node, &h, pkbuf, cb, node); - ogs_expect_or_return(xact); + ogs_expect_or_return_val(xact, OGS_ERROR); rv = ogs_pfcp_xact_commit(xact); ogs_expect(rv == OGS_OK); + + return rv; } -void ogs_pfcp_cp_send_association_setup_response(ogs_pfcp_xact_t *xact, +int ogs_pfcp_cp_send_association_setup_response(ogs_pfcp_xact_t *xact, uint8_t cause) { int rv; @@ -204,16 +210,18 @@ void ogs_pfcp_cp_send_association_setup_response(ogs_pfcp_xact_t *xact, h.seid = 0; pkbuf = ogs_pfcp_cp_build_association_setup_response(h.type, cause); - ogs_expect_or_return(pkbuf); + ogs_expect_or_return_val(pkbuf, OGS_ERROR); rv = ogs_pfcp_xact_update_tx(xact, &h, pkbuf); - ogs_expect_or_return(rv == OGS_OK); + ogs_expect_or_return_val(rv == OGS_OK, OGS_ERROR); rv = ogs_pfcp_xact_commit(xact); ogs_expect(rv == OGS_OK); + + return rv; } -void ogs_pfcp_up_send_association_setup_request(ogs_pfcp_node_t *node, +int ogs_pfcp_up_send_association_setup_request(ogs_pfcp_node_t *node, void (*cb)(ogs_pfcp_xact_t *xact, void *data)) { int rv; @@ -228,16 +236,18 @@ void ogs_pfcp_up_send_association_setup_request(ogs_pfcp_node_t *node, h.seid = 0; pkbuf = ogs_pfcp_up_build_association_setup_request(h.type); - ogs_expect_or_return(pkbuf); + ogs_expect_or_return_val(pkbuf, OGS_ERROR); xact = ogs_pfcp_xact_local_create(node, &h, pkbuf, cb, node); - ogs_expect_or_return(xact); + ogs_expect_or_return_val(xact, OGS_ERROR); rv = ogs_pfcp_xact_commit(xact); ogs_expect(rv == OGS_OK); + + return rv; } -void ogs_pfcp_up_send_association_setup_response(ogs_pfcp_xact_t *xact, +int ogs_pfcp_up_send_association_setup_response(ogs_pfcp_xact_t *xact, uint8_t cause) { int rv; @@ -251,13 +261,15 @@ void ogs_pfcp_up_send_association_setup_response(ogs_pfcp_xact_t *xact, h.seid = 0; pkbuf = ogs_pfcp_up_build_association_setup_response(h.type, cause); - ogs_expect_or_return(pkbuf); + ogs_expect_or_return_val(pkbuf, OGS_ERROR); rv = ogs_pfcp_xact_update_tx(xact, &h, pkbuf); - ogs_expect_or_return(rv == OGS_OK); + ogs_expect_or_return_val(rv == OGS_OK, OGS_ERROR); rv = ogs_pfcp_xact_commit(xact); ogs_expect(rv == OGS_OK); + + return rv; } void ogs_pfcp_send_g_pdu(ogs_pfcp_pdr_t *pdr, ogs_pkbuf_t *sendbuf) @@ -299,7 +311,7 @@ void ogs_pfcp_send_g_pdu(ogs_pfcp_pdr_t *pdr, ogs_pkbuf_t *sendbuf) ogs_gtp_send_user_plane(gnode, >p_hdesc, &ext_hdesc, sendbuf); } -void ogs_pfcp_send_end_marker(ogs_pfcp_pdr_t *pdr) +int ogs_pfcp_send_end_marker(ogs_pfcp_pdr_t *pdr) { ogs_gtp_node_t *gnode = NULL; ogs_pfcp_far_t *far = NULL; @@ -316,15 +328,15 @@ void ogs_pfcp_send_end_marker(ogs_pfcp_pdr_t *pdr) gnode = far->gnode; if (!gnode) { ogs_error("No GTP Node Setup"); - return; + return OGS_DONE; } if (!gnode->sock) { ogs_error("No GTP Socket Setup"); - return; + return OGS_DONE; } sendbuf = ogs_pkbuf_alloc(NULL, OGS_GTPV1U_5GC_HEADER_LEN); - ogs_assert(sendbuf); + ogs_expect_or_return_val(sendbuf, OGS_ERROR); ogs_pkbuf_reserve(sendbuf, OGS_GTPV1U_5GC_HEADER_LEN); memset(>p_hdesc, 0, sizeof(gtp_hdesc)); @@ -336,6 +348,8 @@ void ogs_pfcp_send_end_marker(ogs_pfcp_pdr_t *pdr) ext_hdesc.qos_flow_identifier = pdr->qer->qfi; ogs_gtp_send_user_plane(gnode, >p_hdesc, &ext_hdesc, sendbuf); + + return OGS_OK; } void ogs_pfcp_send_buffered_packet(ogs_pfcp_pdr_t *pdr) diff --git a/lib/pfcp/path.h b/lib/pfcp/path.h index 82efab0233..88d1bd57e7 100644 --- a/lib/pfcp/path.h +++ b/lib/pfcp/path.h @@ -64,22 +64,22 @@ int ogs_pfcp_sendto(ogs_pfcp_node_t *node, ogs_pkbuf_t *pkbuf); ogs_pkbuf_t *ogs_pfcp_handle_echo_req(ogs_pkbuf_t *pkt); -void ogs_pfcp_send_heartbeat_request(ogs_pfcp_node_t *node, +int ogs_pfcp_send_heartbeat_request(ogs_pfcp_node_t *node, void (*cb)(ogs_pfcp_xact_t *xact, void *data)); -void ogs_pfcp_send_heartbeat_response(ogs_pfcp_xact_t *xact); +int ogs_pfcp_send_heartbeat_response(ogs_pfcp_xact_t *xact); -void ogs_pfcp_cp_send_association_setup_request(ogs_pfcp_node_t *node, +int ogs_pfcp_cp_send_association_setup_request(ogs_pfcp_node_t *node, void (*cb)(ogs_pfcp_xact_t *xact, void *data)); -void ogs_pfcp_cp_send_association_setup_response(ogs_pfcp_xact_t *xact, +int ogs_pfcp_cp_send_association_setup_response(ogs_pfcp_xact_t *xact, uint8_t cause); -void ogs_pfcp_up_send_association_setup_request(ogs_pfcp_node_t *node, +int ogs_pfcp_up_send_association_setup_request(ogs_pfcp_node_t *node, void (*cb)(ogs_pfcp_xact_t *xact, void *data)); -void ogs_pfcp_up_send_association_setup_response(ogs_pfcp_xact_t *xact, +int ogs_pfcp_up_send_association_setup_response(ogs_pfcp_xact_t *xact, uint8_t cause); void ogs_pfcp_send_g_pdu(ogs_pfcp_pdr_t *pdr, ogs_pkbuf_t *sendbuf); -void ogs_pfcp_send_end_marker(ogs_pfcp_pdr_t *pdr); +int ogs_pfcp_send_end_marker(ogs_pfcp_pdr_t *pdr); void ogs_pfcp_send_buffered_packet(ogs_pfcp_pdr_t *pdr); diff --git a/lib/s1ap/message.c b/lib/s1ap/message.c index 8d08bb8dd9..aca0dca680 100644 --- a/lib/s1ap/message.c +++ b/lib/s1ap/message.c @@ -31,10 +31,7 @@ ogs_pkbuf_t *ogs_s1ap_encode(ogs_s1ap_message_t *message) asn_fprint(stdout, &asn_DEF_S1AP_S1AP_PDU, message); pkbuf = ogs_asn_encode(&asn_DEF_S1AP_S1AP_PDU, message); - if (pkbuf == NULL) { - ogs_error("Failed to encode S1AP-PDU"); - return NULL; - } + ogs_expect_or_return_val(pkbuf, NULL); return pkbuf; } diff --git a/lib/sbi/client.c b/lib/sbi/client.c index cd0eab8321..3c6dec8a9d 100644 --- a/lib/sbi/client.c +++ b/lib/sbi/client.c @@ -100,7 +100,7 @@ ogs_sbi_client_t *ogs_sbi_client_add(ogs_sockaddr_t *addr) ogs_trace("ogs_sbi_client_add()"); - ogs_copyaddrinfo(&client->node.addr, addr); + ogs_assert(OGS_OK == ogs_copyaddrinfo(&client->node.addr, addr)); ogs_list_init(&client->connection_list); @@ -220,9 +220,11 @@ static char *add_params_to_uri(CURL *easy, char *uri, ogs_hash_t *params) if (!has_params) { uri = ogs_mstrcatf(uri, "%s%s=%s", fp, key_esc, val_esc); + ogs_expect(uri); has_params = 1; } else { uri = ogs_mstrcatf(uri, "%s%s=%s", np, key_esc, val_esc); + ogs_expect(uri); } curl_free(val_esc); @@ -247,7 +249,7 @@ static connection_t *connection_add( ogs_assert(request->h.method); ogs_pool_alloc(&connection_pool, &conn); - ogs_assert(conn); + ogs_expect_or_return_val(conn, NULL); memset(conn, 0, sizeof(connection_t)); conn->client = client; @@ -255,18 +257,19 @@ static connection_t *connection_add( conn->data = data; conn->method = ogs_strdup(request->h.method); + ogs_expect_or_return_val(conn->method, NULL); conn->num_of_header = ogs_hash_count(request->http.headers); if (conn->num_of_header) { conn->headers = ogs_calloc(conn->num_of_header, sizeof(char *)); - ogs_assert(conn->headers); + ogs_expect_or_return_val(conn->headers, NULL); for (hi = ogs_hash_first(request->http.headers), i = 0; hi && i < conn->num_of_header; hi = ogs_hash_next(hi), i++) { const char *key = ogs_hash_this_key(hi); char *val = ogs_hash_this_val(hi); conn->headers[i] = ogs_msprintf("%s: %s", key, val); - ogs_assert(conn->headers[i]); + ogs_expect_or_return_val(conn->headers[i], NULL); conn->header_list = curl_slist_append( conn->header_list, conn->headers[i]); } @@ -274,7 +277,7 @@ static connection_t *connection_add( conn->timer = ogs_timer_add( ogs_app()->timer_mgr, connection_timer_expired, conn); - ogs_assert(conn->timer); + ogs_expect_or_return_val(conn->timer, NULL); ogs_list_add(&client->connection_list, conn); @@ -321,6 +324,7 @@ static connection_t *connection_add( if (ogs_hash_count(request->http.params)) { request->h.uri = add_params_to_uri(conn->easy, request->h.uri, request->http.params); + ogs_expect_or_return_val(request->h.uri, NULL); } curl_easy_setopt(conn->easy, CURLOPT_URL, request->h.uri); @@ -438,15 +442,22 @@ static void check_multi_info(ogs_sbi_client_t *client) ogs_assert(conn->method); response->h.method = ogs_strdup(conn->method); + ogs_assert(response->h.method); /* remove https://localhost:8000 */ response->h.uri = ogs_strdup(url); + ogs_assert(response->h.uri); ogs_debug("[%d:%s] %s", response->status, response->h.method, response->h.uri); - response->http.content = ogs_memdup(conn->memory, conn->size); - response->http.content_length = conn->size; + if (conn->memory) { + response->http.content = + ogs_memdup(conn->memory, conn->size); + ogs_assert(response->http.content); + response->http.content_length = conn->size; + ogs_assert(response->http.content_length); + } ogs_debug("RECEIVED[%d]", (int)response->http.content_length); if (response->http.content_length && response->http.content) @@ -473,7 +484,7 @@ static void check_multi_info(ogs_sbi_client_t *client) } } -void ogs_sbi_client_send_request( +bool ogs_sbi_client_send_request( ogs_sbi_client_t *client, ogs_sbi_client_cb_f client_cb, ogs_sbi_request_t *request, void *data) { @@ -488,9 +499,11 @@ void ogs_sbi_client_send_request( ogs_debug("[%s] %s", request->h.method, request->h.uri); conn = connection_add(client, client_cb, request, data); - ogs_assert(conn); + ogs_expect_or_return_val(conn, false); ogs_sbi_request_free(request); + + return true; } static size_t write_cb(void *contents, size_t size, size_t nmemb, void *data) @@ -503,7 +516,7 @@ static size_t write_cb(void *contents, size_t size, size_t nmemb, void *data) ogs_assert(conn); realsize = size * nmemb; - ptr = ogs_realloc(conn->memory, conn->size + realsize + 1); + ptr = ogs_realloc_or_assert(conn->memory, conn->size + realsize + 1); if(!ptr) { ogs_fatal("not enough memory (realloc returned NULL)"); return 0; @@ -532,6 +545,7 @@ static size_t header_cb(void *ptr, size_t size, size_t nmemb, void *data) /* Only copy http://xxx/xxx/xxx" from 'ptr' string */ conn->location = ogs_memdup( (char *)ptr + strlen(OGS_SBI_LOCATION) + 2, len+1); + ogs_assert(conn->location); conn->location[len] = 0; } } @@ -585,6 +599,7 @@ static void sock_set(sockinfo_t *sockinfo, curl_socket_t s, sockinfo->poll = ogs_pollset_add( ogs_app()->pollset, kind, s, event_cb, sockinfo); + ogs_assert(sockinfo->poll); } /* Initialize a new sockinfo_t structure */ diff --git a/lib/sbi/client.h b/lib/sbi/client.h index 2ba43a8df8..d3c0931ef3 100644 --- a/lib/sbi/client.h +++ b/lib/sbi/client.h @@ -68,7 +68,7 @@ ogs_sbi_client_t *ogs_sbi_client_add(ogs_sockaddr_t *addr); void ogs_sbi_client_remove(ogs_sbi_client_t *client); ogs_sbi_client_t *ogs_sbi_client_find(ogs_sockaddr_t *addr); -void ogs_sbi_client_send_request( +bool ogs_sbi_client_send_request( ogs_sbi_client_t *client, ogs_sbi_client_cb_f client_cb, ogs_sbi_request_t *request, void *data); diff --git a/lib/sbi/context.c b/lib/sbi/context.c index d7c713f251..17a9dbb404 100644 --- a/lib/sbi/context.c +++ b/lib/sbi/context.c @@ -638,11 +638,17 @@ void ogs_sbi_nf_service_add_version(ogs_sbi_nf_service_t *nf_service, if (nf_service->num_of_version < OGS_SBI_MAX_NUM_OF_SERVICE_VERSION) { nf_service->versions[nf_service->num_of_version].in_uri = ogs_strdup(in_uri); + ogs_assert(nf_service->versions[nf_service->num_of_version].in_uri); nf_service->versions[nf_service->num_of_version].full = ogs_strdup(full); - if (expiry) + ogs_assert(nf_service->versions[nf_service->num_of_version].full); + if (expiry) { nf_service->versions[nf_service->num_of_version].expiry = ogs_strdup(expiry); + ogs_assert( + nf_service->versions[nf_service->num_of_version].expiry); + + } nf_service->num_of_version++; } } @@ -839,7 +845,7 @@ void ogs_sbi_nf_instance_build_default( if (nf_instance->num_of_ipv4 < OGS_SBI_MAX_NUM_OF_IP_ADDRESS) { ogs_sockaddr_t *addr = NULL; - ogs_copyaddrinfo(&addr, advertise); + ogs_assert(OGS_OK == ogs_copyaddrinfo(&addr, advertise)); ogs_assert(addr); if (addr->ogs_sa_family == AF_INET) { @@ -904,7 +910,7 @@ ogs_sbi_nf_service_t *ogs_sbi_nf_service_build_default( if (nf_service->num_of_addr < OGS_SBI_MAX_NUM_OF_IP_ADDRESS) { int port = 0; ogs_sockaddr_t *addr = NULL; - ogs_copyaddrinfo(&addr, advertise); + ogs_assert(OGS_OK == ogs_copyaddrinfo(&addr, advertise)); ogs_assert(addr); port = OGS_PORT(addr); @@ -1132,18 +1138,27 @@ ogs_sbi_xact_t *ogs_sbi_xact_add( ogs_assert(sbi_object); ogs_pool_alloc(&xact_pool, &xact); - if (!xact) return NULL; + ogs_expect_or_return_val(xact, NULL); memset(xact, 0, sizeof(ogs_sbi_xact_t)); xact->target_nf_type = target_nf_type; xact->sbi_object = sbi_object; xact->request = (*build)(context, data); - ogs_assert(xact->request); + if (!xact->request) { + ogs_error("SBI build failed"); + ogs_pool_free(&xact_pool, xact); + return NULL; + } xact->t_response = ogs_timer_add( ogs_app()->timer_mgr, timer_cb, xact); - ogs_assert(xact->t_response); + if (!xact->t_response) { + ogs_error("ogs_timer_add() failed"); + ogs_sbi_request_free(xact->request); + ogs_pool_free(&xact_pool, xact); + return NULL; + } ogs_timer_start(xact->t_response, ogs_app()->time.message.sbi.client_wait_duration); diff --git a/lib/sbi/conv.c b/lib/sbi/conv.c index 183aea95f7..af7133840b 100644 --- a/lib/sbi/conv.c +++ b/lib/sbi/conv.c @@ -112,7 +112,7 @@ static char *url_decode(const char *str) { if (str != NULL) { char *pstr = (char*)str; - char *buf = ogs_malloc(strlen(str) + 1); + char *buf = ogs_malloc_or_assert(strlen(str) + 1); char *pbuf = buf; while (*pstr) { if (*pstr == '%') { @@ -404,11 +404,11 @@ char *ogs_sbi_s_nssai_to_string(ogs_s_nssai_t *s_nssai) sNSSAI.sd = ogs_s_nssai_sd_to_string(s_nssai->sd); item = OpenAPI_snssai_convertToJSON(&sNSSAI); - ogs_assert(item); + ogs_expect_or_return_val(item, NULL); if (sNSSAI.sd) ogs_free(sNSSAI.sd); v = cJSON_Print(item); - ogs_assert(v); + ogs_expect(v); cJSON_Delete(item); return v; @@ -446,12 +446,12 @@ OpenAPI_plmn_id_t *ogs_sbi_build_plmn_id(ogs_plmn_id_t *plmn_id) ogs_assert(plmn_id); PlmnId = ogs_calloc(1, sizeof(*PlmnId)); - ogs_assert(PlmnId); + ogs_expect_or_return_val(PlmnId, NULL); PlmnId->mcc = ogs_plmn_id_mcc_string(plmn_id); - ogs_assert(PlmnId->mcc); + ogs_expect_or_return_val(PlmnId->mcc, NULL); PlmnId->mnc = ogs_plmn_id_mnc_string(plmn_id); - ogs_assert(PlmnId->mnc); + ogs_expect_or_return_val(PlmnId->mnc, NULL); return PlmnId; } @@ -489,12 +489,12 @@ OpenAPI_plmn_id_nid_t *ogs_sbi_build_plmn_id_nid(ogs_plmn_id_t *plmn_id) ogs_assert(plmn_id); PlmnIdNid = ogs_calloc(1, sizeof(*PlmnIdNid)); - ogs_assert(PlmnIdNid); + ogs_expect_or_return_val(PlmnIdNid, NULL); PlmnIdNid->mcc = ogs_plmn_id_mcc_string(plmn_id); - ogs_assert(PlmnIdNid->mcc); + ogs_expect_or_return_val(PlmnIdNid->mcc, NULL); PlmnIdNid->mnc = ogs_plmn_id_mnc_string(plmn_id); - ogs_assert(PlmnIdNid->mnc); + ogs_expect_or_return_val(PlmnIdNid->mnc, NULL); return PlmnIdNid; } @@ -537,9 +537,9 @@ OpenAPI_guami_t *ogs_sbi_build_guami(ogs_guami_t *guami) ogs_assert(Guami); Guami->plmn_id = ogs_sbi_build_plmn_id_nid(&guami->plmn_id); - ogs_assert(Guami->plmn_id); + ogs_expect_or_return_val(Guami->plmn_id, NULL); Guami->amf_id = ogs_amf_id_to_string(&guami->amf_id); - ogs_assert(Guami->amf_id); + ogs_expect_or_return_val(Guami->amf_id, NULL); return Guami; } @@ -579,17 +579,21 @@ OpenAPI_nr_location_t *ogs_sbi_build_nr_location( ogs_assert(nr_cgi); Tai = ogs_calloc(1, sizeof(*Tai)); - ogs_assert(Tai); + ogs_expect_or_return_val(Tai, NULL); Tai->plmn_id = ogs_sbi_build_plmn_id(&tai->plmn_id); + ogs_expect_or_return_val(Tai->plmn_id, NULL); Tai->tac = ogs_uint24_to_0string(tai->tac); + ogs_expect_or_return_val(Tai->tac, NULL); Ncgi = ogs_calloc(1, sizeof(*Ncgi)); - ogs_assert(Ncgi); + ogs_expect_or_return_val(Ncgi, NULL); Ncgi->plmn_id = ogs_sbi_build_plmn_id(&nr_cgi->plmn_id); + ogs_expect_or_return_val(Ncgi->plmn_id, NULL); Ncgi->nr_cell_id = ogs_uint36_to_0string(nr_cgi->cell_id); + ogs_expect_or_return_val(Ncgi->nr_cell_id, NULL); NrLocation = ogs_calloc(1, sizeof(*NrLocation)); - ogs_assert(NrLocation); + ogs_expect_or_return_val(NrLocation, NULL); NrLocation->tai = Tai; NrLocation->ncgi = Ncgi; diff --git a/lib/sbi/message.c b/lib/sbi/message.c index 77f5176ac5..06a021448e 100644 --- a/lib/sbi/message.c +++ b/lib/sbi/message.c @@ -30,12 +30,12 @@ static char *build_json(ogs_sbi_message_t *message); static int parse_json(ogs_sbi_message_t *message, char *content_type, char *json); -static void build_content( +static bool build_content( ogs_sbi_http_message_t *http, ogs_sbi_message_t *message); static int parse_content( ogs_sbi_message_t *message, ogs_sbi_http_message_t *http); -static void build_multipart( +static bool build_multipart( ogs_sbi_http_message_t *http, ogs_sbi_message_t *message); static int parse_multipart( ogs_sbi_message_t *sbi_message, ogs_sbi_http_message_t *http); @@ -173,11 +173,13 @@ ogs_sbi_request_t *ogs_sbi_request_new(void) ogs_sbi_request_t *request = NULL; ogs_pool_alloc(&request_pool, &request); - if (!request) return NULL; + ogs_expect_or_return_val(request, NULL); memset(request, 0, sizeof(ogs_sbi_request_t)); request->http.params = ogs_hash_make(); + ogs_expect_or_return_val(request->http.params, NULL); request->http.headers = ogs_hash_make(); + ogs_expect_or_return_val(request->http.headers, NULL); return request; } @@ -187,11 +189,13 @@ ogs_sbi_response_t *ogs_sbi_response_new(void) ogs_sbi_response_t *response = NULL; ogs_pool_alloc(&response_pool, &response); - ogs_assert(response); + ogs_expect_or_return_val(response, NULL); memset(response, 0, sizeof(ogs_sbi_response_t)); response->http.params = ogs_hash_make(); + ogs_expect_or_return_val(response->http.params, NULL); response->http.headers = ogs_hash_make(); + ogs_expect_or_return_val(response->http.headers, NULL); return response; } @@ -229,21 +233,24 @@ ogs_sbi_request_t *ogs_sbi_build_request(ogs_sbi_message_t *message) ogs_assert(message); request = ogs_sbi_request_new(); - if (!request) return NULL; + ogs_expect_or_return_val(request, NULL); - ogs_assert(message->h.method); + ogs_expect_or_return_val(message->h.method, NULL); request->h.method = ogs_strdup(message->h.method); if (message->h.uri) { + ogs_expect_or_return_val(message->h.uri, NULL); request->h.uri = ogs_strdup(message->h.uri); + ogs_expect_or_return_val(request->h.uri, NULL); } else { int i; - ogs_assert(message->h.service.name); + ogs_expect_or_return_val(message->h.service.name, NULL); request->h.service.name = ogs_strdup(message->h.service.name); - ogs_assert(message->h.api.version); + ogs_expect_or_return_val(message->h.api.version, NULL); request->h.api.version = ogs_strdup(message->h.api.version); + ogs_expect_or_return_val(request->h.api.version, NULL); - ogs_assert(message->h.resource.component[0]); + ogs_expect_or_return_val(message->h.resource.component[0], NULL); for (i = 0; i < OGS_SBI_MAX_NUM_OF_RESOURCE_COMPONENT && message->h.resource.component[i]; i++) request->h.resource.component[i] = ogs_strdup( @@ -257,24 +264,24 @@ ogs_sbi_request_t *ogs_sbi_build_request(ogs_sbi_message_t *message) } if (message->param.nf_type) { char *v = OpenAPI_nf_type_ToString(message->param.nf_type); - ogs_assert(v); + ogs_expect_or_return_val(v, NULL); ogs_sbi_header_set(request->http.params, OGS_SBI_PARAM_NF_TYPE, v); } if (message->param.requester_nf_type) { char *v = OpenAPI_nf_type_ToString(message->param.requester_nf_type); - ogs_assert(v); + ogs_expect_or_return_val(v, NULL); ogs_sbi_header_set(request->http.params, OGS_SBI_PARAM_REQUESTER_NF_TYPE, v); } if (message->param.target_nf_type) { char *v = OpenAPI_nf_type_ToString(message->param.target_nf_type); - ogs_assert(v); + ogs_expect_or_return_val(v, NULL); ogs_sbi_header_set(request->http.params, OGS_SBI_PARAM_TARGET_NF_TYPE, v); } if (message->param.limit) { char *v = ogs_msprintf("%d", message->param.limit); - ogs_assert(v); + ogs_expect_or_return_val(v, NULL); ogs_sbi_header_set(request->http.params, OGS_SBI_PARAM_LIMIT, v); ogs_free(v); } @@ -293,12 +300,12 @@ ogs_sbi_request_t *ogs_sbi_build_request(ogs_sbi_message_t *message) cJSON *item = NULL; item = OpenAPI_plmn_id_convertToJSON(&plmn_id); - ogs_assert(item); + ogs_expect_or_return_val(item, NULL); if (plmn_id.mnc) ogs_free(plmn_id.mnc); if (plmn_id.mcc) ogs_free(plmn_id.mcc); v = cJSON_Print(item); - ogs_assert(v); + ogs_expect_or_return_val(v, NULL); cJSON_Delete(item); ogs_sbi_header_set(request->http.params, OGS_SBI_PARAM_PLMN_ID, v); @@ -307,11 +314,13 @@ ogs_sbi_request_t *ogs_sbi_build_request(ogs_sbi_message_t *message) } if (message->param.single_nssai_presence) { char *v = ogs_sbi_s_nssai_to_string(&message->param.s_nssai); + ogs_expect_or_return_val(v, NULL); ogs_sbi_header_set(request->http.params, OGS_SBI_PARAM_SINGLE_NSSAI, v); ogs_free(v); } if (message->param.snssai_presence) { char *v = ogs_sbi_s_nssai_to_string(&message->param.s_nssai); + ogs_expect_or_return_val(v, NULL); ogs_sbi_header_set(request->http.params, OGS_SBI_PARAM_SNSSAI, v); ogs_free(v); } @@ -326,12 +335,12 @@ ogs_sbi_request_t *ogs_sbi_build_request(ogs_sbi_message_t *message) cJSON *item = NULL; item = OpenAPI_plmn_id_convertToJSON(&plmn_id); - ogs_assert(item); + ogs_expect_or_return_val(item, NULL); if (plmn_id.mnc) ogs_free(plmn_id.mnc); if (plmn_id.mcc) ogs_free(plmn_id.mcc); v = cJSON_Print(item); - ogs_assert(v); + ogs_expect_or_return_val(v, NULL); cJSON_Delete(item); ogs_sbi_header_set(request->http.params, OGS_SBI_PARAM_PLMN_ID, v); @@ -345,8 +354,8 @@ ogs_sbi_request_t *ogs_sbi_build_request(ogs_sbi_message_t *message) char *v = NULL; cJSON *item = NULL; - ogs_assert(message->param.s_nssai.sst); - ogs_assert(message->param.roaming_indication); + ogs_expect_or_return_val(message->param.s_nssai.sst, NULL); + ogs_expect_or_return_val(message->param.roaming_indication, NULL); memset(&sNSSAI, 0, sizeof(sNSSAI)); sNSSAI.sst = message->param.s_nssai.sst; @@ -360,10 +369,10 @@ ogs_sbi_request_t *ogs_sbi_build_request(ogs_sbi_message_t *message) item = OpenAPI_slice_info_for_pdu_session_convertToJSON( &SliceInfoForPDUSession); - ogs_assert(item); + ogs_expect_or_return_val(item, NULL); v = cJSON_Print(item); - ogs_assert(v); + ogs_expect_or_return_val(v, NULL); cJSON_Delete(item); ogs_sbi_header_set(request->http.params, @@ -382,7 +391,8 @@ ogs_sbi_request_t *ogs_sbi_build_request(ogs_sbi_message_t *message) OGS_SBI_PARAM_IPV6PREFIX, message->param.ipv6prefix); } - build_content(&request->http, message); + ogs_expect_or_return_val(true == + build_content(&request->http, message), NULL); if (message->http.accept) { ogs_sbi_header_set(request->http.headers, OGS_SBI_ACCEPT, @@ -415,12 +425,13 @@ ogs_sbi_response_t *ogs_sbi_build_response( ogs_assert(message); response = ogs_sbi_response_new(); - ogs_assert(response); + ogs_expect_or_return_val(response, NULL); response->status = status; if (response->status != OGS_SBI_HTTP_STATUS_NO_CONTENT) { - build_content(&response->http, message); + ogs_expect_or_return_val(true == + build_content(&response->http, message), NULL); } if (message->http.location) { @@ -1699,14 +1710,15 @@ static int parse_content( } } -static void build_content( +static bool build_content( ogs_sbi_http_message_t *http, ogs_sbi_message_t *message) { ogs_assert(message); ogs_assert(http); if (message->num_of_part) { - build_multipart(http, message); + ogs_expect_or_return_val(true == + build_multipart(http, message), false); } else { http->content = build_json(message); if (http->content) { @@ -1720,6 +1732,8 @@ static void build_content( } } } + + return true; } typedef struct multipart_parser_data_s { @@ -1747,6 +1761,7 @@ static int on_header_field( if (data->header_field) ogs_free(data->header_field); data->header_field = ogs_strndup(at, length); + ogs_assert(data->header_field); } return 0; } @@ -1767,12 +1782,14 @@ static int on_header_value( ogs_free(data->part[data->num_of_part].content_type); data->part[data->num_of_part].content_type = ogs_strndup(at, length); + ogs_assert(data->part[data->num_of_part].content_type); break; CASE(OGS_SBI_CONTENT_ID) if (data->part[data->num_of_part].content_id) ogs_free(data->part[data->num_of_part].content_id); data->part[data->num_of_part].content_id = ogs_strndup(at, length); + ogs_assert(data->part[data->num_of_part].content_id); break; DEFAULT @@ -1915,7 +1932,8 @@ static int parse_multipart( data.part[i].content_type; http->part[http->num_of_part].pkbuf = ogs_pkbuf_alloc(NULL, data.part[i].content_length); - ogs_assert(http->part[http->num_of_part].pkbuf); + ogs_expect_or_return_val( + http->part[http->num_of_part].pkbuf, OGS_ERROR); ogs_pkbuf_put_data(http->part[http->num_of_part].pkbuf, data.part[i].content, data.part[i].content_length); @@ -1925,7 +1943,8 @@ static int parse_multipart( http->part[http->num_of_part].content_type; message->part[message->num_of_part].pkbuf = ogs_pkbuf_copy(http->part[http->num_of_part].pkbuf); - ogs_assert(message->part[message->num_of_part].pkbuf); + ogs_expect_or_return_val( + message->part[message->num_of_part].pkbuf, OGS_ERROR); http->num_of_part++; message->num_of_part++; @@ -1950,7 +1969,7 @@ static int parse_multipart( return OGS_OK; } -static void build_multipart( +static bool build_multipart( ogs_sbi_http_message_t *http, ogs_sbi_message_t *message) { int i; @@ -1970,7 +1989,7 @@ static void build_multipart( ogs_base64_encode_binary(boundary + 2, digest, 16); p = http->content = ogs_calloc(1, OGS_HUGE_LEN); - ogs_assert(p); + ogs_expect_or_return_val(p, false); last = p + OGS_HUGE_LEN; /* First boundary */ @@ -1978,7 +1997,7 @@ static void build_multipart( /* Encapsulated multipart part (application/json) */ json = build_json(message); - ogs_assert(json); + ogs_expect_or_return_val(json, false); p = ogs_slprintf(p, last, "%s\r\n\r\n%s", OGS_SBI_CONTENT_TYPE ": " OGS_SBI_CONTENT_JSON_TYPE, json); @@ -2003,11 +2022,13 @@ static void build_multipart( content_type = ogs_msprintf("%s; boundary=\"%s\"", OGS_SBI_CONTENT_MULTIPART_TYPE, boundary); - ogs_assert(content_type); + ogs_expect_or_return_val(content_type, false); ogs_sbi_header_set(http->headers, OGS_SBI_CONTENT_TYPE, content_type); ogs_free(content_type); + + return true; } static void http_message_free(ogs_sbi_http_message_t *http) diff --git a/lib/sbi/mhd-server.c b/lib/sbi/mhd-server.c index 47b2aa0721..793dc2d11a 100644 --- a/lib/sbi/mhd-server.c +++ b/lib/sbi/mhd-server.c @@ -35,7 +35,7 @@ static int server_start(ogs_sbi_server_t *server, int (*cb)(ogs_sbi_request_t *request, void *data)); static void server_stop(ogs_sbi_server_t *server); -static void server_send_response( +static bool server_send_response( ogs_sbi_stream_t *stream, ogs_sbi_response_t *response); static ogs_sbi_server_t *server_from_stream(ogs_sbi_stream_t *stream); @@ -289,7 +289,7 @@ static void server_stop(ogs_sbi_server_t *server) } } -static void server_send_response( +static bool server_send_response( ogs_sbi_stream_t *stream, ogs_sbi_response_t *response) { int ret; @@ -355,10 +355,12 @@ static void server_send_response( ret = MHD_queue_response(connection, status, mhd_response); if (ret != MHD_YES) { - ogs_fatal("MHD_queue_response_error [%d]", ret); - ogs_assert_if_reached(); + ogs_error("MHD_queue_response_error [%d]", ret); + return false; } MHD_destroy_response(mhd_response); + + return true; } static void run(short when, ogs_socket_t fd, void *data) @@ -460,7 +462,9 @@ static _MHD_Result access_handler( (MHD_KeyValueIterator)get_values, request->http.headers); request->h.method = ogs_strdup(method); + ogs_assert(request->h.method); request->h.uri = ogs_strdup(url); + ogs_assert(request->h.uri); if (ogs_sbi_header_get(request->http.headers, "Content-Length") || ogs_sbi_header_get(request->http.headers, "Transfer-Encoding")) { @@ -514,9 +518,10 @@ suspend: if (server->cb) { if (server->cb(request, sbi_sess) != OGS_OK) { ogs_warn("server callback error"); - ogs_sbi_server_send_error((ogs_sbi_stream_t *)sbi_sess, - OGS_SBI_HTTP_STATUS_INTERNAL_SERVER_ERROR, NULL, - "server callback error", NULL); + ogs_assert(true == + ogs_sbi_server_send_error((ogs_sbi_stream_t *)sbi_sess, + OGS_SBI_HTTP_STATUS_INTERNAL_SERVER_ERROR, NULL, + "server callback error", NULL)); return MHD_YES; } diff --git a/lib/sbi/nghttp2-server.c b/lib/sbi/nghttp2-server.c index b3213bdeb1..75eca267b3 100644 --- a/lib/sbi/nghttp2-server.c +++ b/lib/sbi/nghttp2-server.c @@ -33,7 +33,7 @@ static int server_start(ogs_sbi_server_t *server, int (*cb)(ogs_sbi_request_t *request, void *data)); static void server_stop(ogs_sbi_server_t *server); -static void server_send_response( +static bool server_send_response( ogs_sbi_stream_t *stream, ogs_sbi_response_t *response); static ogs_sbi_server_t *server_from_stream(ogs_sbi_stream_t *data); @@ -282,7 +282,7 @@ static ssize_t response_read_callback(nghttp2_session *session, return response->http.content_length; } -static void server_send_response( +static bool server_send_response( ogs_sbi_stream_t *stream, ogs_sbi_response_t *response) { ogs_sbi_session_t *sbi_sess = NULL; @@ -318,11 +318,11 @@ static void server_send_response( nvlen++; nva = ogs_calloc(nvlen, sizeof(nghttp2_nv)); - ogs_assert(nva); + ogs_expect_or_return_val(nva, false); i = 0; - ogs_assert(response->status < 600); + ogs_expect_or_return_val(response->status < 600, false); ogs_assert(strlen(status_string[response->status]) == 3); add_header(&nva[i++], ":status", status_string[response->status]); @@ -375,6 +375,8 @@ static void server_send_response( ogs_sbi_response_free(response); ogs_free(nva); + + return true; } static ogs_sbi_server_t *server_from_stream(ogs_sbi_stream_t *stream) @@ -397,11 +399,11 @@ static ogs_sbi_stream_t *stream_add( ogs_assert(sbi_sess); ogs_pool_alloc(&stream_pool, &stream); - ogs_assert(stream); + ogs_expect_or_return_val(stream, NULL); memset(stream, 0, sizeof(ogs_sbi_stream_t)); stream->request = ogs_sbi_request_new(); - ogs_assert(stream->request); + ogs_expect_or_return_val(stream->request, NULL); stream->stream_id = stream_id; sbi_sess->last_stream_id = stream_id; @@ -446,14 +448,14 @@ static ogs_sbi_session_t *session_add( ogs_assert(sock); ogs_pool_alloc(&session_pool, &sbi_sess); - ogs_assert(sbi_sess); + ogs_expect_or_return_val(sbi_sess, NULL); memset(sbi_sess, 0, sizeof(ogs_sbi_session_t)); sbi_sess->server = server; sbi_sess->sock = sock; sbi_sess->addr = ogs_calloc(1, sizeof(ogs_sockaddr_t)); - ogs_assert(sbi_sess->addr); + ogs_expect_or_return_val(sbi_sess->addr, NULL); memcpy(sbi_sess->addr, &sock->remote_addr, sizeof(ogs_sockaddr_t)); ogs_list_add(&server->session_list, sbi_sess); @@ -770,9 +772,10 @@ static int on_frame_recv(nghttp2_session *session, if (server->cb(request, stream) != OGS_OK) { ogs_warn("server callback error"); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_INTERNAL_SERVER_ERROR, NULL, - "server callback error", NULL); + "server callback error", NULL)); return 0; } @@ -896,6 +899,7 @@ static int on_header(nghttp2_session *session, const nghttp2_frame *frame, ogs_assert(request->h.method == NULL); request->h.method = ogs_strdup(valuestr); + ogs_assert(request->h.method); } else { @@ -1263,7 +1267,9 @@ static void session_write_to_buffer( ogs_list_add(&sbi_sess->write_queue, pkbuf); - if (!sbi_sess->poll.write) + if (!sbi_sess->poll.write) { sbi_sess->poll.write = ogs_pollset_add(ogs_app()->pollset, OGS_POLLOUT, fd, session_write_callback, sbi_sess); + ogs_assert(sbi_sess->poll.write); + } } diff --git a/lib/sbi/nnrf-build.c b/lib/sbi/nnrf-build.c index 72c4b6b7da..3ae986867b 100644 --- a/lib/sbi/nnrf-build.c +++ b/lib/sbi/nnrf-build.c @@ -34,10 +34,12 @@ OpenAPI_nf_profile_t *ogs_nnrf_nfm_build_nf_profile( int fqdn_len; char fqdn[OGS_MAX_FQDN_LEN]; + char *ipstr = NULL; + ogs_assert(nf_instance); NFProfile = ogs_calloc(1, sizeof(*NFProfile)); - ogs_assert(NFProfile); + ogs_expect_or_return_val(NFProfile, NULL); NFProfile->nf_instance_id = nf_instance->id; NFProfile->nf_type = nf_instance->nf_type; @@ -58,6 +60,7 @@ OpenAPI_nf_profile_t *ogs_nnrf_nfm_build_nf_profile( fqdn_len = ogs_fqdn_build(fqdn, nf_instance->fqdn, strlen(nf_instance->fqdn)); NFProfile->fqdn = ogs_memdup(fqdn, fqdn_len); + ogs_expect_or_return_val(NFProfile->fqdn, NULL); ogs_trace("FQDN[%s]", nf_instance->fqdn); } @@ -74,7 +77,9 @@ OpenAPI_nf_profile_t *ogs_nnrf_nfm_build_nf_profile( htobe32(nf_instance->ipv4[i]->sin.sin_addr.s_addr), nf_instance->ipv4[i]->ogs_sin_port); ogs_assert(nf_instance->ipv4[i]->ogs_sa_family == AF_INET); - OpenAPI_list_add(Ipv4AddrList, ogs_ipstrdup(nf_instance->ipv4[i])); + ipstr = ogs_ipstrdup(nf_instance->ipv4[i]); + ogs_expect_or_return_val(ipstr, NULL); + OpenAPI_list_add(Ipv4AddrList, ipstr); } } for (i = 0; i < nf_instance->num_of_ipv6; i++) { @@ -83,7 +88,9 @@ OpenAPI_nf_profile_t *ogs_nnrf_nfm_build_nf_profile( nf_instance->ipv6[i]->ogs_sa_family, nf_instance->ipv6[i]->ogs_sin_port); ogs_assert(nf_instance->ipv6[i]->ogs_sa_family == AF_INET6); - OpenAPI_list_add(Ipv6AddrList, ogs_ipstrdup(nf_instance->ipv6[i])); + ipstr = ogs_ipstrdup(nf_instance->ipv6[i]); + ogs_expect_or_return_val(ipstr, NULL); + OpenAPI_list_add(Ipv6AddrList, ipstr); } } @@ -105,9 +112,11 @@ OpenAPI_nf_profile_t *ogs_nnrf_nfm_build_nf_profile( OpenAPI_list_t *IpEndPointList = NULL; NFService = ogs_calloc(1, sizeof(*NFService)); - ogs_assert(NFService); + ogs_expect_or_return_val(NFService, NULL); NFService->service_instance_id = ogs_strdup(nf_service->id); + ogs_expect_or_return_val(NFService->service_instance_id, NULL); NFService->service_name = ogs_strdup(nf_service->name); + ogs_expect_or_return_val(NFService->service_name, NULL); VersionList = OpenAPI_list_create(); ogs_assert(VersionList); @@ -116,16 +125,25 @@ OpenAPI_nf_profile_t *ogs_nnrf_nfm_build_nf_profile( OpenAPI_nf_service_version_t *NFServiceVersion = NULL; NFServiceVersion = ogs_calloc(1, sizeof(*NFServiceVersion)); - ogs_assert(NFServiceVersion); - if (nf_service->versions[i].in_uri) + ogs_expect_or_return_val(NFServiceVersion, NULL); + if (nf_service->versions[i].in_uri) { NFServiceVersion->api_version_in_uri = ogs_strdup(nf_service->versions[i].in_uri); - if (nf_service->versions[i].full) + ogs_expect_or_return_val( + NFServiceVersion->api_version_in_uri, NULL); + } + if (nf_service->versions[i].full) { NFServiceVersion->api_full_version = ogs_strdup(nf_service->versions[i].full); - if (nf_service->versions[i].expiry) + ogs_expect_or_return_val( + NFServiceVersion->api_full_version, NULL); + } + if (nf_service->versions[i].expiry) { NFServiceVersion->expiry = ogs_strdup(nf_service->versions[i].expiry); + ogs_expect_or_return_val( + NFServiceVersion->expiry, NULL); + } OpenAPI_list_add(VersionList, NFServiceVersion); } @@ -141,6 +159,7 @@ OpenAPI_nf_profile_t *ogs_nnrf_nfm_build_nf_profile( fqdn_len = ogs_fqdn_build(fqdn, nf_service->fqdn, strlen(nf_service->fqdn)); NFService->fqdn = ogs_memdup(fqdn, fqdn_len); + ogs_expect_or_return_val(NFService->fqdn, NULL); } IpEndPointList = OpenAPI_list_create(); @@ -157,9 +176,15 @@ OpenAPI_nf_profile_t *ogs_nnrf_nfm_build_nf_profile( if (ipv4 || ipv6) { IpEndPoint = ogs_calloc(1, sizeof(*IpEndPoint)); - ogs_assert(IpEndPoint); - if (ipv4) IpEndPoint->ipv4_address = ogs_ipstrdup(ipv4); - if (ipv6) IpEndPoint->ipv6_address = ogs_ipstrdup(ipv6); + ogs_expect_or_return_val(IpEndPoint, NULL); + if (ipv4) { + IpEndPoint->ipv4_address = ogs_ipstrdup(ipv4); + ogs_expect_or_return_val(IpEndPoint->ipv4_address, NULL); + } + if (ipv6) { + IpEndPoint->ipv6_address = ogs_ipstrdup(ipv6); + ogs_expect_or_return_val(IpEndPoint->ipv6_address, NULL); + } IpEndPoint->port = nf_service->addr[i].port; OpenAPI_list_add(IpEndPointList, IpEndPoint); } @@ -318,10 +343,10 @@ ogs_sbi_request_t *ogs_nnrf_nfm_build_status_subscribe( (char *)OGS_SBI_RESOURCE_NAME_SUBSCRIPTIONS; SubscriptionData = ogs_calloc(1, sizeof(*SubscriptionData)); - ogs_assert(SubscriptionData); + ogs_expect_or_return_val(SubscriptionData, NULL); server = ogs_list_first(&ogs_sbi_self()->server_list); - ogs_assert(server); + ogs_expect_or_return_val(server, NULL); memset(&header, 0, sizeof(header)); header.service.name = (char *)OGS_SBI_SERVICE_NAME_NNRF_NFM; @@ -330,7 +355,8 @@ ogs_sbi_request_t *ogs_nnrf_nfm_build_status_subscribe( (char *)OGS_SBI_RESOURCE_NAME_NF_STATUS_NOTIFY; SubscriptionData->nf_status_notification_uri = ogs_sbi_server_uri(server, &header); - ogs_assert(SubscriptionData->nf_status_notification_uri); + ogs_expect_or_return_val( + SubscriptionData->nf_status_notification_uri, NULL); SubscriptionData->req_nf_type = subscription->req_nf_type; SubscriptionData->req_nf_instance_id = subscription->req_nf_instance_id; diff --git a/lib/sbi/nnrf-handler.c b/lib/sbi/nnrf-handler.c index 1c715da10f..2d6d387a1e 100644 --- a/lib/sbi/nnrf-handler.c +++ b/lib/sbi/nnrf-handler.c @@ -63,6 +63,9 @@ static void handle_smf_info( ogs_assert(dnn_index < OGS_MAX_NUM_OF_DNN); nf_info->smf.slice[nf_info->smf.num_of_slice]. dnn[dnn_index] = ogs_strdup(DnnSmfInfoItem->dnn); + ogs_assert( + nf_info->smf.slice[nf_info->smf.num_of_slice]. + dnn[dnn_index]); nf_info->smf.slice[nf_info->smf.num_of_slice]. num_of_dnn++; } @@ -165,32 +168,40 @@ bool ogs_sbi_nnrf_handle_nf_profile(ogs_sbi_nf_instance_t *nf_instance, if (!NFProfile) { ogs_error("No NFProfile"); if (stream) - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - message, "No NFProfile", NULL); + ogs_assert(true == + ogs_sbi_server_send_error( + stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + message, "No NFProfile", NULL)); return false; } if (!NFProfile->nf_instance_id) { ogs_error("No NFProfile.NFInstanceId"); if (stream) - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - message, "NFProfile", "No NFInstanceId"); + ogs_assert(true == + ogs_sbi_server_send_error( + stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + message, "NFProfile", "No NFInstanceId")); return false; } if (!NFProfile->nf_type) { ogs_error("No NFProfile.NFType"); if (stream) - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - message, "NFProfile", "No NFType"); + ogs_assert(true == + ogs_sbi_server_send_error( + stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + message, "NFProfile", "No NFType")); return false; } if (!NFProfile->nf_status) { ogs_error("No NFProfile.NFStatus"); if (stream) - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - message, "NFProfile", "No NFStatus"); + ogs_assert(true == + ogs_sbi_server_send_error( + stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + message, "NFProfile", "No NFStatus")); return false; } diff --git a/lib/sbi/openapi/.openapi-generator/templates/apiKey.c.mustache b/lib/sbi/openapi/.openapi-generator/templates/apiKey.c.mustache index 06f3109612..28ece5959a 100644 --- a/lib/sbi/openapi/.openapi-generator/templates/apiKey.c.mustache +++ b/lib/sbi/openapi/.openapi-generator/templates/apiKey.c.mustache @@ -5,6 +5,7 @@ OpenAPI_map_t *OpenAPI_map_create(char *key, void *value) { OpenAPI_map_t *OpenAPI_map = ogs_malloc(sizeof(OpenAPI_map_t)); + ogs_assert(OpenAPI_map); OpenAPI_map->key = key; OpenAPI_map->value = value; return OpenAPI_map; @@ -13,6 +14,7 @@ OpenAPI_map_t *OpenAPI_map_create(char *key, void *value) OpenAPI_map_t *OpenAPI_map_create_allocate(char *key, double value) { double* boolpointer = ogs_malloc(sizeof(value)); + ogs_assert(boolpointer); memcpy(boolpointer, &value, sizeof(value)); return OpenAPI_map_create(key, boolpointer); } diff --git a/lib/sbi/openapi/.openapi-generator/templates/cJSON.c.mustache b/lib/sbi/openapi/.openapi-generator/templates/cJSON.c.mustache index 09fba4d4a4..873ca2c25f 100644 --- a/lib/sbi/openapi/.openapi-generator/templates/cJSON.c.mustache +++ b/lib/sbi/openapi/.openapi-generator/templates/cJSON.c.mustache @@ -148,7 +148,7 @@ static void *internal_realloc(void *pointer, size_t size) #include "ogs-core.h" static void *internal_malloc(size_t size) { - return ogs_malloc(size); + return ogs_malloc_or_assert(size); } static void internal_free(void *pointer) { @@ -156,7 +156,7 @@ static void internal_free(void *pointer) } static void *internal_realloc(void *pointer, size_t size) { - return ogs_realloc(pointer, size); + return ogs_realloc_or_assert(pointer, size); } #endif diff --git a/lib/sbi/openapi/.openapi-generator/templates/list.c.mustache b/lib/sbi/openapi/.openapi-generator/templates/list.c.mustache index fae69f5023..31f7a7b0d3 100644 --- a/lib/sbi/openapi/.openapi-generator/templates/list.c.mustache +++ b/lib/sbi/openapi/.openapi-generator/templates/list.c.mustache @@ -6,6 +6,7 @@ static OpenAPI_lnode_t *listEntry_create(void *data) { OpenAPI_lnode_t *created = ogs_malloc(sizeof(OpenAPI_lnode_t)); + ogs_assert(created); if (created == NULL) { // TODO Malloc Failure @@ -29,6 +30,7 @@ void OpenAPI_lnode_print(OpenAPI_lnode_t *listEntry, void *additionalData) OpenAPI_list_t *OpenAPI_list_create(void) { OpenAPI_list_t *createdList = ogs_malloc(sizeof(OpenAPI_list_t)); + ogs_assert(createdList); if (createdList == NULL) { // TODO Malloc Failure diff --git a/lib/sbi/openapi/.openapi-generator/templates/list.h.mustache b/lib/sbi/openapi/.openapi-generator/templates/list.h.mustache index ae7cea128e..74ed0ffc81 100644 --- a/lib/sbi/openapi/.openapi-generator/templates/list.h.mustache +++ b/lib/sbi/openapi/.openapi-generator/templates/list.h.mustache @@ -8,7 +8,7 @@ extern "C" { #endif -#define OpenAPI_malloc(__sIZE) __sIZE == 0 ? NULL : ogs_malloc(__sIZE) +#define OpenAPI_malloc(__sIZE) __sIZE == 0 ? NULL : ogs_malloc_or_assert(__sIZE) typedef struct OpenAPI_list_s OpenAPI_list_t; diff --git a/lib/sbi/openapi/.openapi-generator/templates/model-body.mustache b/lib/sbi/openapi/.openapi-generator/templates/model-body.mustache index 5302eb48f1..72e4576631 100644 --- a/lib/sbi/openapi/.openapi-generator/templates/model-body.mustache +++ b/lib/sbi/openapi/.openapi-generator/templates/model-body.mustache @@ -594,7 +594,7 @@ OpenAPI_{{classname}}_t *OpenAPI_{{classname}}_parseFromJSON(cJSON *{{classname} ogs_error("OpenAPI_{{classname}}_parseFromJSON() failed [{{{name}}}]"); goto end; } - OpenAPI_list_add({{{name}}}List , ogs_strdup({{{name}}}_local->valuestring)); + OpenAPI_list_add({{{name}}}List , ogs_strdup_or_assert({{{name}}}_local->valuestring)); {{/isString}} {{#isNumeric}} if (!cJSON_IsNumber({{{name}}}_local)) { @@ -676,21 +676,21 @@ OpenAPI_{{classname}}_t *OpenAPI_{{classname}}_parseFromJSON(cJSON *{{classname} ogs_error("OpenAPI_{{classname}}_parseFromJSON() failed [{{{name}}}]"); goto end; } - localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string),ogs_strdup(localMapObject->valuestring)); + localMapKeyPair = OpenAPI_map_create(ogs_strdup_or_assert(localMapObject->string),ogs_strdup_or_assert(localMapObject->valuestring)); {{/isString}} {{#isBoolean}} if (!cJSON_IsBool(localMapObject)) { ogs_error("OpenAPI_{{classname}}_parseFromJSON() failed [{{{name}}}]"); goto end; } - localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string), &localMapObject->valueint); + localMapKeyPair = OpenAPI_map_create(ogs_strdup_or_assert(localMapObject->string), &localMapObject->valueint); {{/isBoolean}} {{#isNumeric}} if (!cJSON_IsNumber(localMapObject)) { ogs_error("OpenAPI_{{classname}}_parseFromJSON() failed [{{{name}}}]"); goto end; } - localMapKeyPair = OpenAPI_map_create(ogs_strdup(localMapObject->string),&localMapObject->valuedouble ); + localMapKeyPair = OpenAPI_map_create(ogs_strdup_or_assert(localMapObject->string),&localMapObject->valuedouble ); {{/isNumeric}} {{/isPrimitiveType}} {{^isPrimitiveType}} @@ -722,10 +722,10 @@ OpenAPI_{{classname}}_t *OpenAPI_{{classname}}_parseFromJSON(cJSON *{{classname} {{^required}}{{{name}}} ? {{/required}}{{{name}}}_local_nonprim{{^required}} : NULL{{/required}}{{#hasMore}},{{/hasMore}} {{/isModel}} {{#isUuid}} - {{^required}}{{{name}}} ? {{/required}}ogs_strdup({{{name}}}->valuestring){{^required}} : NULL{{/required}}{{#hasMore}},{{/hasMore}} + {{^required}}{{{name}}} ? {{/required}}ogs_strdup_or_assert({{{name}}}->valuestring){{^required}} : NULL{{/required}}{{#hasMore}},{{/hasMore}} {{/isUuid}} {{#isEmail}} - {{^required}}{{{name}}} ? {{/required}}ogs_strdup({{{name}}}->valuestring){{^required}} : NULL{{/required}}{{#hasMore}},{{/hasMore}} + {{^required}}{{{name}}} ? {{/required}}ogs_strdup_or_assert({{{name}}}->valuestring){{^required}} : NULL{{/required}}{{#hasMore}},{{/hasMore}} {{/isEmail}} {{#isFreeFormObject}} {{^required}}{{{name}}} ? {{/required}}{{{name}}}_local_object{{^required}} : NULL{{/required}}{{#hasMore}},{{/hasMore}} @@ -744,7 +744,7 @@ OpenAPI_{{classname}}_t *OpenAPI_{{classname}}_parseFromJSON(cJSON *{{classname} {{^required}}{{{name}}} ? {{/required}}{{{name}}}->valueint{{^required}} : 0{{/required}}{{#hasMore}},{{/hasMore}} {{/isBoolean}} {{#isString}} - {{^required}}{{{name}}} ? {{/required}}ogs_strdup({{{name}}}->valuestring){{^required}} : NULL{{/required}}{{#hasMore}},{{/hasMore}} + {{^required}}{{{name}}} ? {{/required}}ogs_strdup_or_assert({{{name}}}->valuestring){{^required}} : NULL{{/required}}{{#hasMore}},{{/hasMore}} {{/isString}} {{/isEnum}} {{#isByteArray}} @@ -754,10 +754,10 @@ OpenAPI_{{classname}}_t *OpenAPI_{{classname}}_parseFromJSON(cJSON *{{classname} {{^required}}{{{name}}} ? {{/required}}decoded_str_{{{name}}}{{^required}} : NULL{{/required}}{{#hasMore}},{{/hasMore}} {{/isBinary}} {{#isDate}} - {{^required}}{{{name}}} ? {{/required}}ogs_strdup({{{name}}}->valuestring){{^required}} : NULL{{/required}}{{#hasMore}},{{/hasMore}} + {{^required}}{{{name}}} ? {{/required}}ogs_strdup_or_assert({{{name}}}->valuestring){{^required}} : NULL{{/required}}{{#hasMore}},{{/hasMore}} {{/isDate}} {{#isDateTime}} - {{^required}}{{{name}}} ? {{/required}}ogs_strdup({{{name}}}->valuestring){{^required}} : NULL{{/required}}{{#hasMore}},{{/hasMore}} + {{^required}}{{{name}}} ? {{/required}}ogs_strdup_or_assert({{{name}}}->valuestring){{^required}} : NULL{{/required}}{{#hasMore}},{{/hasMore}} {{/isDateTime}} {{/isPrimitiveType}} {{/isContainer}} diff --git a/lib/sbi/openapi/.openapi-generator/templates/object-body.mustache b/lib/sbi/openapi/.openapi-generator/templates/object-body.mustache index cf94a1a8e4..b68c4bbec1 100644 --- a/lib/sbi/openapi/.openapi-generator/templates/object-body.mustache +++ b/lib/sbi/openapi/.openapi-generator/templates/object-body.mustache @@ -6,6 +6,7 @@ OpenAPI_object_t *OpenAPI_object_create(void) { OpenAPI_object_t *object = ogs_malloc(sizeof(OpenAPI_object_t)); + ogs_assert(object); return object; } diff --git a/lib/sbi/openapi/external/cJSON.c b/lib/sbi/openapi/external/cJSON.c index c9bd968b1c..7b67dfbe81 100644 --- a/lib/sbi/openapi/external/cJSON.c +++ b/lib/sbi/openapi/external/cJSON.c @@ -148,7 +148,7 @@ static void *internal_realloc(void *pointer, size_t size) #include "ogs-core.h" static void *internal_malloc(size_t size) { - return ogs_malloc(size); + return ogs_malloc_or_assert(size); } static void internal_free(void *pointer) { @@ -156,7 +156,7 @@ static void internal_free(void *pointer) } static void *internal_realloc(void *pointer, size_t size) { - return ogs_realloc(pointer, size); + return ogs_realloc_or_assert(pointer, size); } #endif diff --git a/lib/sbi/openapi/include/list.h b/lib/sbi/openapi/include/list.h index 2cce300f7a..82092be162 100644 --- a/lib/sbi/openapi/include/list.h +++ b/lib/sbi/openapi/include/list.h @@ -8,7 +8,7 @@ extern "C" { #endif -#define OpenAPI_malloc(__sIZE) __sIZE == 0 ? NULL : ogs_malloc(__sIZE) +#define OpenAPI_malloc(__sIZE) __sIZE == 0 ? NULL : ogs_malloc_or_assert(__sIZE) typedef struct OpenAPI_list_s OpenAPI_list_t; diff --git a/lib/sbi/openapi/model/acc_net_ch_id.c b/lib/sbi/openapi/model/acc_net_ch_id.c index f0d462cc56..2d35fbfee8 100644 --- a/lib/sbi/openapi/model/acc_net_ch_id.c +++ b/lib/sbi/openapi/model/acc_net_ch_id.c @@ -107,7 +107,7 @@ OpenAPI_acc_net_ch_id_t *OpenAPI_acc_net_ch_id_parseFromJSON(cJSON *acc_net_ch_i ogs_error("OpenAPI_acc_net_ch_id_parseFromJSON() failed [ref_pcc_rule_ids]"); goto end; } - OpenAPI_list_add(ref_pcc_rule_idsList, ogs_strdup(ref_pcc_rule_ids_local->valuestring)); + OpenAPI_list_add(ref_pcc_rule_idsList, ogs_strdup_or_assert(ref_pcc_rule_ids_local->valuestring)); } } diff --git a/lib/sbi/openapi/model/acc_net_charging_address.c b/lib/sbi/openapi/model/acc_net_charging_address.c index 1f1dc17639..da7252f317 100644 --- a/lib/sbi/openapi/model/acc_net_charging_address.c +++ b/lib/sbi/openapi/model/acc_net_charging_address.c @@ -80,8 +80,8 @@ OpenAPI_acc_net_charging_address_t *OpenAPI_acc_net_charging_address_parseFromJS } acc_net_charging_address_local_var = OpenAPI_acc_net_charging_address_create ( - an_charg_ipv4_addr ? ogs_strdup(an_charg_ipv4_addr->valuestring) : NULL, - an_charg_ipv6_addr ? ogs_strdup(an_charg_ipv6_addr->valuestring) : NULL + an_charg_ipv4_addr ? ogs_strdup_or_assert(an_charg_ipv4_addr->valuestring) : NULL, + an_charg_ipv6_addr ? ogs_strdup_or_assert(an_charg_ipv6_addr->valuestring) : NULL ); return acc_net_charging_address_local_var; diff --git a/lib/sbi/openapi/model/acceptable_service_info.c b/lib/sbi/openapi/model/acceptable_service_info.c index 5f90c450a1..798a105013 100644 --- a/lib/sbi/openapi/model/acceptable_service_info.c +++ b/lib/sbi/openapi/model/acceptable_service_info.c @@ -133,8 +133,8 @@ OpenAPI_acceptable_service_info_t *OpenAPI_acceptable_service_info_parseFromJSON acceptable_service_info_local_var = OpenAPI_acceptable_service_info_create ( acc_bw_med_comps ? acc_bw_med_compsList : NULL, - mar_bw_ul ? ogs_strdup(mar_bw_ul->valuestring) : NULL, - mar_bw_dl ? ogs_strdup(mar_bw_dl->valuestring) : NULL + mar_bw_ul ? ogs_strdup_or_assert(mar_bw_ul->valuestring) : NULL, + mar_bw_dl ? ogs_strdup_or_assert(mar_bw_dl->valuestring) : NULL ); return acceptable_service_info_local_var; diff --git a/lib/sbi/openapi/model/access_and_mobility_data.c b/lib/sbi/openapi/model/access_and_mobility_data.c index febe85d816..340b08080e 100644 --- a/lib/sbi/openapi/model/access_and_mobility_data.c +++ b/lib/sbi/openapi/model/access_and_mobility_data.c @@ -498,24 +498,24 @@ OpenAPI_access_and_mobility_data_t *OpenAPI_access_and_mobility_data_parseFromJS access_and_mobility_data_local_var = OpenAPI_access_and_mobility_data_create ( location ? location_local_nonprim : NULL, - location_ts ? ogs_strdup(location_ts->valuestring) : NULL, - time_zone ? ogs_strdup(time_zone->valuestring) : NULL, - time_zone_ts ? ogs_strdup(time_zone_ts->valuestring) : NULL, + location_ts ? ogs_strdup_or_assert(location_ts->valuestring) : NULL, + time_zone ? ogs_strdup_or_assert(time_zone->valuestring) : NULL, + time_zone_ts ? ogs_strdup_or_assert(time_zone_ts->valuestring) : NULL, access_type ? access_typeVariable : 0, reg_states ? reg_statesList : NULL, - reg_states_ts ? ogs_strdup(reg_states_ts->valuestring) : NULL, + reg_states_ts ? ogs_strdup_or_assert(reg_states_ts->valuestring) : NULL, conn_states ? conn_statesList : NULL, - conn_states_ts ? ogs_strdup(conn_states_ts->valuestring) : NULL, + conn_states_ts ? ogs_strdup_or_assert(conn_states_ts->valuestring) : NULL, reachability_status ? reachability_status_local_nonprim : NULL, - reachability_status_ts ? ogs_strdup(reachability_status_ts->valuestring) : NULL, + reachability_status_ts ? ogs_strdup_or_assert(reachability_status_ts->valuestring) : NULL, sms_over_nas_status ? sms_over_nas_statusVariable : 0, - sms_over_nas_status_ts ? ogs_strdup(sms_over_nas_status_ts->valuestring) : NULL, + sms_over_nas_status_ts ? ogs_strdup_or_assert(sms_over_nas_status_ts->valuestring) : NULL, roaming_status ? roaming_status->valueint : 0, - roaming_status_ts ? ogs_strdup(roaming_status_ts->valuestring) : NULL, + roaming_status_ts ? ogs_strdup_or_assert(roaming_status_ts->valuestring) : NULL, current_plmn ? current_plmn_local_nonprim : NULL, - current_plmn_ts ? ogs_strdup(current_plmn_ts->valuestring) : NULL, + current_plmn_ts ? ogs_strdup_or_assert(current_plmn_ts->valuestring) : NULL, rat_type ? rat_typeList : NULL, - rat_types_ts ? ogs_strdup(rat_types_ts->valuestring) : NULL + rat_types_ts ? ogs_strdup_or_assert(rat_types_ts->valuestring) : NULL ); return access_and_mobility_data_local_var; diff --git a/lib/sbi/openapi/model/access_and_mobility_subscription_data.c b/lib/sbi/openapi/model/access_and_mobility_subscription_data.c index 64177e937b..96057a03e3 100644 --- a/lib/sbi/openapi/model/access_and_mobility_subscription_data.c +++ b/lib/sbi/openapi/model/access_and_mobility_subscription_data.c @@ -730,7 +730,7 @@ OpenAPI_access_and_mobility_subscription_data_t *OpenAPI_access_and_mobility_sub ogs_error("OpenAPI_access_and_mobility_subscription_data_parseFromJSON() failed [gpsis]"); goto end; } - OpenAPI_list_add(gpsisList, ogs_strdup(gpsis_local->valuestring)); + OpenAPI_list_add(gpsisList, ogs_strdup_or_assert(gpsis_local->valuestring)); } } @@ -750,7 +750,7 @@ OpenAPI_access_and_mobility_subscription_data_t *OpenAPI_access_and_mobility_sub ogs_error("OpenAPI_access_and_mobility_subscription_data_parseFromJSON() failed [internal_group_ids]"); goto end; } - OpenAPI_list_add(internal_group_idsList, ogs_strdup(internal_group_ids_local->valuestring)); + OpenAPI_list_add(internal_group_idsList, ogs_strdup_or_assert(internal_group_ids_local->valuestring)); } } @@ -992,7 +992,7 @@ OpenAPI_access_and_mobility_subscription_data_t *OpenAPI_access_and_mobility_sub ogs_error("OpenAPI_access_and_mobility_subscription_data_parseFromJSON() failed [shared_am_data_ids]"); goto end; } - OpenAPI_list_add(shared_am_data_idsList, ogs_strdup(shared_am_data_ids_local->valuestring)); + OpenAPI_list_add(shared_am_data_idsList, ogs_strdup_or_assert(shared_am_data_ids_local->valuestring)); } } @@ -1023,7 +1023,7 @@ OpenAPI_access_and_mobility_subscription_data_t *OpenAPI_access_and_mobility_sub ogs_error("OpenAPI_access_and_mobility_subscription_data_parseFromJSON() failed [subscribed_dnn_list]"); goto end; } - OpenAPI_list_add(subscribed_dnn_listList, ogs_strdup(subscribed_dnn_list_local->valuestring)); + OpenAPI_list_add(subscribed_dnn_listList, ogs_strdup_or_assert(subscribed_dnn_list_local->valuestring)); } } @@ -1266,7 +1266,7 @@ OpenAPI_access_and_mobility_subscription_data_t *OpenAPI_access_and_mobility_sub } access_and_mobility_subscription_data_local_var = OpenAPI_access_and_mobility_subscription_data_create ( - supported_features ? ogs_strdup(supported_features->valuestring) : NULL, + supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL, gpsis ? gpsisList : NULL, internal_group_ids ? internal_group_idsList : NULL, shared_vn_group_data_ids ? shared_vn_group_data_idsList : NULL, @@ -1296,8 +1296,8 @@ OpenAPI_access_and_mobility_subscription_data_t *OpenAPI_access_and_mobility_sub mdt_configuration ? mdt_configuration_local_nonprim : NULL, trace_data ? trace_data_local_nonprim : NULL, cag_data ? cag_data_local_nonprim : NULL, - stn_sr ? ogs_strdup(stn_sr->valuestring) : NULL, - c_msisdn ? ogs_strdup(c_msisdn->valuestring) : NULL, + stn_sr ? ogs_strdup_or_assert(stn_sr->valuestring) : NULL, + c_msisdn ? ogs_strdup_or_assert(c_msisdn->valuestring) : NULL, nb_io_t_ue_priority ? nb_io_t_ue_priority->valuedouble : 0, nssai_inclusion_allowed ? nssai_inclusion_allowed->valueint : 0, rg_wireline_characteristics ? rg_wireline_characteristics->valueint : 0, diff --git a/lib/sbi/openapi/model/accu_usage_report.c b/lib/sbi/openapi/model/accu_usage_report.c index 31dcc047f4..06c0e0b40f 100644 --- a/lib/sbi/openapi/model/accu_usage_report.c +++ b/lib/sbi/openapi/model/accu_usage_report.c @@ -206,7 +206,7 @@ OpenAPI_accu_usage_report_t *OpenAPI_accu_usage_report_parseFromJSON(cJSON *accu } accu_usage_report_local_var = OpenAPI_accu_usage_report_create ( - ogs_strdup(ref_um_ids->valuestring), + ogs_strdup_or_assert(ref_um_ids->valuestring), vol_usage ? vol_usage->valuedouble : 0, vol_usage_uplink ? vol_usage_uplink->valuedouble : 0, vol_usage_downlink ? vol_usage_downlink->valuedouble : 0, diff --git a/lib/sbi/openapi/model/acknowledge_info.c b/lib/sbi/openapi/model/acknowledge_info.c index c6589b2430..7ec1f130d2 100644 --- a/lib/sbi/openapi/model/acknowledge_info.c +++ b/lib/sbi/openapi/model/acknowledge_info.c @@ -119,10 +119,10 @@ OpenAPI_acknowledge_info_t *OpenAPI_acknowledge_info_parseFromJSON(cJSON *acknow } acknowledge_info_local_var = OpenAPI_acknowledge_info_create ( - sor_mac_iue ? ogs_strdup(sor_mac_iue->valuestring) : NULL, - upu_mac_iue ? ogs_strdup(upu_mac_iue->valuestring) : NULL, - secured_packet ? ogs_strdup(secured_packet->valuestring) : NULL, - ogs_strdup(provisioning_time->valuestring) + sor_mac_iue ? ogs_strdup_or_assert(sor_mac_iue->valuestring) : NULL, + upu_mac_iue ? ogs_strdup_or_assert(upu_mac_iue->valuestring) : NULL, + secured_packet ? ogs_strdup_or_assert(secured_packet->valuestring) : NULL, + ogs_strdup_or_assert(provisioning_time->valuestring) ); return acknowledge_info_local_var; diff --git a/lib/sbi/openapi/model/acs_info.c b/lib/sbi/openapi/model/acs_info.c index 0b4bbe73e3..d1ff1e2ec7 100644 --- a/lib/sbi/openapi/model/acs_info.c +++ b/lib/sbi/openapi/model/acs_info.c @@ -99,9 +99,9 @@ OpenAPI_acs_info_t *OpenAPI_acs_info_parseFromJSON(cJSON *acs_infoJSON) } acs_info_local_var = OpenAPI_acs_info_create ( - acs_url ? ogs_strdup(acs_url->valuestring) : NULL, - acs_ipv4_addr ? ogs_strdup(acs_ipv4_addr->valuestring) : NULL, - acs_ipv6_addr ? ogs_strdup(acs_ipv6_addr->valuestring) : NULL + acs_url ? ogs_strdup_or_assert(acs_url->valuestring) : NULL, + acs_ipv4_addr ? ogs_strdup_or_assert(acs_ipv4_addr->valuestring) : NULL, + acs_ipv6_addr ? ogs_strdup_or_assert(acs_ipv6_addr->valuestring) : NULL ); return acs_info_local_var; diff --git a/lib/sbi/openapi/model/acs_info_rm.c b/lib/sbi/openapi/model/acs_info_rm.c index 8432f07847..4cda2459b6 100644 --- a/lib/sbi/openapi/model/acs_info_rm.c +++ b/lib/sbi/openapi/model/acs_info_rm.c @@ -99,9 +99,9 @@ OpenAPI_acs_info_rm_t *OpenAPI_acs_info_rm_parseFromJSON(cJSON *acs_info_rmJSON) } acs_info_rm_local_var = OpenAPI_acs_info_rm_create ( - acs_url ? ogs_strdup(acs_url->valuestring) : NULL, - acs_ipv4_addr ? ogs_strdup(acs_ipv4_addr->valuestring) : NULL, - acs_ipv6_addr ? ogs_strdup(acs_ipv6_addr->valuestring) : NULL + acs_url ? ogs_strdup_or_assert(acs_url->valuestring) : NULL, + acs_ipv4_addr ? ogs_strdup_or_assert(acs_ipv4_addr->valuestring) : NULL, + acs_ipv6_addr ? ogs_strdup_or_assert(acs_ipv6_addr->valuestring) : NULL ); return acs_info_rm_local_var; diff --git a/lib/sbi/openapi/model/af_event_exposure_data.c b/lib/sbi/openapi/model/af_event_exposure_data.c index 23cec2190a..e310fda950 100644 --- a/lib/sbi/openapi/model/af_event_exposure_data.c +++ b/lib/sbi/openapi/model/af_event_exposure_data.c @@ -151,7 +151,7 @@ OpenAPI_af_event_exposure_data_t *OpenAPI_af_event_exposure_data_parseFromJSON(c ogs_error("OpenAPI_af_event_exposure_data_parseFromJSON() failed [af_ids]"); goto end; } - OpenAPI_list_add(af_idsList, ogs_strdup(af_ids_local->valuestring)); + OpenAPI_list_add(af_idsList, ogs_strdup_or_assert(af_ids_local->valuestring)); } } @@ -171,7 +171,7 @@ OpenAPI_af_event_exposure_data_t *OpenAPI_af_event_exposure_data_parseFromJSON(c ogs_error("OpenAPI_af_event_exposure_data_parseFromJSON() failed [app_ids]"); goto end; } - OpenAPI_list_add(app_idsList, ogs_strdup(app_ids_local->valuestring)); + OpenAPI_list_add(app_idsList, ogs_strdup_or_assert(app_ids_local->valuestring)); } } diff --git a/lib/sbi/openapi/model/af_external.c b/lib/sbi/openapi/model/af_external.c index d0e0853e49..ccb86d1930 100644 --- a/lib/sbi/openapi/model/af_external.c +++ b/lib/sbi/openapi/model/af_external.c @@ -153,7 +153,7 @@ OpenAPI_af_external_t *OpenAPI_af_external_parseFromJSON(cJSON *af_externalJSON) } af_external_local_var = OpenAPI_af_external_create ( - af_id ? ogs_strdup(af_id->valuestring) : NULL, + af_id ? ogs_strdup_or_assert(af_id->valuestring) : NULL, allowed_geographic_area ? allowed_geographic_areaList : NULL, privacy_check_related_action ? privacy_check_related_actionVariable : 0, valid_time_period ? valid_time_period_local_nonprim : NULL diff --git a/lib/sbi/openapi/model/alternative_qos_profile.c b/lib/sbi/openapi/model/alternative_qos_profile.c index 7adb2db5eb..e7bd14f971 100644 --- a/lib/sbi/openapi/model/alternative_qos_profile.c +++ b/lib/sbi/openapi/model/alternative_qos_profile.c @@ -137,10 +137,10 @@ OpenAPI_alternative_qos_profile_t *OpenAPI_alternative_qos_profile_parseFromJSON alternative_qos_profile_local_var = OpenAPI_alternative_qos_profile_create ( index->valuedouble, - gua_fbr_dl ? ogs_strdup(gua_fbr_dl->valuestring) : NULL, - gua_fbr_ul ? ogs_strdup(gua_fbr_ul->valuestring) : NULL, + gua_fbr_dl ? ogs_strdup_or_assert(gua_fbr_dl->valuestring) : NULL, + gua_fbr_ul ? ogs_strdup_or_assert(gua_fbr_ul->valuestring) : NULL, packet_delay_budget ? packet_delay_budget->valuedouble : 0, - packet_err_rate ? ogs_strdup(packet_err_rate->valuestring) : NULL + packet_err_rate ? ogs_strdup_or_assert(packet_err_rate->valuestring) : NULL ); return alternative_qos_profile_local_var; diff --git a/lib/sbi/openapi/model/am_policy_data.c b/lib/sbi/openapi/model/am_policy_data.c index 0245efac13..a5dee24801 100644 --- a/lib/sbi/openapi/model/am_policy_data.c +++ b/lib/sbi/openapi/model/am_policy_data.c @@ -131,7 +131,7 @@ OpenAPI_am_policy_data_t *OpenAPI_am_policy_data_parseFromJSON(cJSON *am_policy_ ogs_error("OpenAPI_am_policy_data_parseFromJSON() failed [subsc_cats]"); goto end; } - OpenAPI_list_add(subsc_catsList, ogs_strdup(subsc_cats_local->valuestring)); + OpenAPI_list_add(subsc_catsList, ogs_strdup_or_assert(subsc_cats_local->valuestring)); } } diff --git a/lib/sbi/openapi/model/ambr.c b/lib/sbi/openapi/model/ambr.c index 986fc0cfda..25f249d150 100644 --- a/lib/sbi/openapi/model/ambr.c +++ b/lib/sbi/openapi/model/ambr.c @@ -82,8 +82,8 @@ OpenAPI_ambr_t *OpenAPI_ambr_parseFromJSON(cJSON *ambrJSON) } ambr_local_var = OpenAPI_ambr_create ( - ogs_strdup(uplink->valuestring), - ogs_strdup(downlink->valuestring) + ogs_strdup_or_assert(uplink->valuestring), + ogs_strdup_or_assert(downlink->valuestring) ); return ambr_local_var; diff --git a/lib/sbi/openapi/model/ambr_rm.c b/lib/sbi/openapi/model/ambr_rm.c index 8ada3b7be9..54a22cba80 100644 --- a/lib/sbi/openapi/model/ambr_rm.c +++ b/lib/sbi/openapi/model/ambr_rm.c @@ -82,8 +82,8 @@ OpenAPI_ambr_rm_t *OpenAPI_ambr_rm_parseFromJSON(cJSON *ambr_rmJSON) } ambr_rm_local_var = OpenAPI_ambr_rm_create ( - ogs_strdup(uplink->valuestring), - ogs_strdup(downlink->valuestring) + ogs_strdup_or_assert(uplink->valuestring), + ogs_strdup_or_assert(downlink->valuestring) ); return ambr_rm_local_var; diff --git a/lib/sbi/openapi/model/amf3_gpp_access_registration.c b/lib/sbi/openapi/model/amf3_gpp_access_registration.c index 7b95dd074a..7a73d97556 100644 --- a/lib/sbi/openapi/model/amf3_gpp_access_registration.c +++ b/lib/sbi/openapi/model/amf3_gpp_access_registration.c @@ -506,25 +506,25 @@ OpenAPI_amf3_gpp_access_registration_t *OpenAPI_amf3_gpp_access_registration_par } amf3_gpp_access_registration_local_var = OpenAPI_amf3_gpp_access_registration_create ( - ogs_strdup(amf_instance_id->valuestring), - supported_features ? ogs_strdup(supported_features->valuestring) : NULL, + ogs_strdup_or_assert(amf_instance_id->valuestring), + supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL, purge_flag ? purge_flag->valueint : 0, - pei ? ogs_strdup(pei->valuestring) : NULL, + pei ? ogs_strdup_or_assert(pei->valuestring) : NULL, ims_vo_ps ? ims_vo_psVariable : 0, - ogs_strdup(dereg_callback_uri->valuestring), - amf_service_name_dereg ? ogs_strdup(amf_service_name_dereg->valuestring) : NULL, - pcscf_restoration_callback_uri ? ogs_strdup(pcscf_restoration_callback_uri->valuestring) : NULL, - amf_service_name_pcscf_rest ? ogs_strdup(amf_service_name_pcscf_rest->valuestring) : NULL, + ogs_strdup_or_assert(dereg_callback_uri->valuestring), + amf_service_name_dereg ? ogs_strdup_or_assert(amf_service_name_dereg->valuestring) : NULL, + pcscf_restoration_callback_uri ? ogs_strdup_or_assert(pcscf_restoration_callback_uri->valuestring) : NULL, + amf_service_name_pcscf_rest ? ogs_strdup_or_assert(amf_service_name_pcscf_rest->valuestring) : NULL, initial_registration_ind ? initial_registration_ind->valueint : 0, guami_local_nonprim, backup_amf_info ? backup_amf_infoList : NULL, dr_flag ? dr_flag->valueint : 0, rat_typeVariable, urrp_indicator ? urrp_indicator->valueint : 0, - amf_ee_subscription_id ? ogs_strdup(amf_ee_subscription_id->valuestring) : NULL, + amf_ee_subscription_id ? ogs_strdup_or_assert(amf_ee_subscription_id->valuestring) : NULL, eps_interworking_info ? eps_interworking_info_local_nonprim : NULL, ue_srvcc_capability ? ue_srvcc_capability->valueint : 0, - registration_time ? ogs_strdup(registration_time->valuestring) : NULL, + registration_time ? ogs_strdup_or_assert(registration_time->valuestring) : NULL, vgmlc_address ? vgmlc_address_local_nonprim : NULL, context_info ? context_info_local_nonprim : NULL, no_ee_subscription_ind ? no_ee_subscription_ind->valueint : 0 diff --git a/lib/sbi/openapi/model/amf3_gpp_access_registration_modification.c b/lib/sbi/openapi/model/amf3_gpp_access_registration_modification.c index 3eff0836a0..2b983d7a0d 100644 --- a/lib/sbi/openapi/model/amf3_gpp_access_registration_modification.c +++ b/lib/sbi/openapi/model/amf3_gpp_access_registration_modification.c @@ -233,7 +233,7 @@ OpenAPI_amf3_gpp_access_registration_modification_t *OpenAPI_amf3_gpp_access_reg amf3_gpp_access_registration_modification_local_var = OpenAPI_amf3_gpp_access_registration_modification_create ( guami_local_nonprim, purge_flag ? purge_flag->valueint : 0, - pei ? ogs_strdup(pei->valuestring) : NULL, + pei ? ogs_strdup_or_assert(pei->valuestring) : NULL, ims_vo_ps ? ims_vo_psVariable : 0, backup_amf_info ? backup_amf_infoList : NULL, eps_interworking_info ? eps_interworking_info_local_nonprim : NULL, diff --git a/lib/sbi/openapi/model/amf_cond.c b/lib/sbi/openapi/model/amf_cond.c index dbbc7ccb9f..f579fd57fd 100644 --- a/lib/sbi/openapi/model/amf_cond.c +++ b/lib/sbi/openapi/model/amf_cond.c @@ -80,8 +80,8 @@ OpenAPI_amf_cond_t *OpenAPI_amf_cond_parseFromJSON(cJSON *amf_condJSON) } amf_cond_local_var = OpenAPI_amf_cond_create ( - amf_set_id ? ogs_strdup(amf_set_id->valuestring) : NULL, - amf_region_id ? ogs_strdup(amf_region_id->valuestring) : NULL + amf_set_id ? ogs_strdup_or_assert(amf_set_id->valuestring) : NULL, + amf_region_id ? ogs_strdup_or_assert(amf_region_id->valuestring) : NULL ); return amf_cond_local_var; diff --git a/lib/sbi/openapi/model/amf_event_mode.c b/lib/sbi/openapi/model/amf_event_mode.c index f23cd7aebe..1f3d0d6f17 100644 --- a/lib/sbi/openapi/model/amf_event_mode.c +++ b/lib/sbi/openapi/model/amf_event_mode.c @@ -105,7 +105,7 @@ OpenAPI_amf_event_mode_t *OpenAPI_amf_event_mode_parseFromJSON(cJSON *amf_event_ amf_event_mode_local_var = OpenAPI_amf_event_mode_create ( trigger_local_nonprim, max_reports ? max_reports->valuedouble : 0, - expiry ? ogs_strdup(expiry->valuestring) : NULL + expiry ? ogs_strdup_or_assert(expiry->valuestring) : NULL ); return amf_event_mode_local_var; diff --git a/lib/sbi/openapi/model/amf_event_subscription.c b/lib/sbi/openapi/model/amf_event_subscription.c index 4f35eea842..bb1c59fa16 100644 --- a/lib/sbi/openapi/model/amf_event_subscription.c +++ b/lib/sbi/openapi/model/amf_event_subscription.c @@ -308,15 +308,15 @@ OpenAPI_amf_event_subscription_t *OpenAPI_amf_event_subscription_parseFromJSON(c amf_event_subscription_local_var = OpenAPI_amf_event_subscription_create ( event_listList, - ogs_strdup(event_notify_uri->valuestring), - ogs_strdup(notify_correlation_id->valuestring), - ogs_strdup(nf_id->valuestring), - subs_change_notify_uri ? ogs_strdup(subs_change_notify_uri->valuestring) : NULL, - subs_change_notify_correlation_id ? ogs_strdup(subs_change_notify_correlation_id->valuestring) : NULL, - supi ? ogs_strdup(supi->valuestring) : NULL, - group_id ? ogs_strdup(group_id->valuestring) : NULL, - gpsi ? ogs_strdup(gpsi->valuestring) : NULL, - pei ? ogs_strdup(pei->valuestring) : NULL, + ogs_strdup_or_assert(event_notify_uri->valuestring), + ogs_strdup_or_assert(notify_correlation_id->valuestring), + ogs_strdup_or_assert(nf_id->valuestring), + subs_change_notify_uri ? ogs_strdup_or_assert(subs_change_notify_uri->valuestring) : NULL, + subs_change_notify_correlation_id ? ogs_strdup_or_assert(subs_change_notify_correlation_id->valuestring) : NULL, + supi ? ogs_strdup_or_assert(supi->valuestring) : NULL, + group_id ? ogs_strdup_or_assert(group_id->valuestring) : NULL, + gpsi ? ogs_strdup_or_assert(gpsi->valuestring) : NULL, + pei ? ogs_strdup_or_assert(pei->valuestring) : NULL, any_ue ? any_ue->valueint : 0, options ? options_local_nonprim : NULL ); diff --git a/lib/sbi/openapi/model/amf_info.c b/lib/sbi/openapi/model/amf_info.c index b61070e975..e4911bbcb2 100644 --- a/lib/sbi/openapi/model/amf_info.c +++ b/lib/sbi/openapi/model/amf_info.c @@ -351,8 +351,8 @@ OpenAPI_amf_info_t *OpenAPI_amf_info_parseFromJSON(cJSON *amf_infoJSON) } amf_info_local_var = OpenAPI_amf_info_create ( - ogs_strdup(amf_set_id->valuestring), - ogs_strdup(amf_region_id->valuestring), + ogs_strdup_or_assert(amf_set_id->valuestring), + ogs_strdup_or_assert(amf_region_id->valuestring), guami_listList, tai_list ? tai_listList : NULL, tai_range_list ? tai_range_listList : NULL, diff --git a/lib/sbi/openapi/model/amf_non3_gpp_access_registration.c b/lib/sbi/openapi/model/amf_non3_gpp_access_registration.c index 090af5c38a..a4e11a8596 100644 --- a/lib/sbi/openapi/model/amf_non3_gpp_access_registration.c +++ b/lib/sbi/openapi/model/amf_non3_gpp_access_registration.c @@ -412,21 +412,21 @@ OpenAPI_amf_non3_gpp_access_registration_t *OpenAPI_amf_non3_gpp_access_registra } amf_non3_gpp_access_registration_local_var = OpenAPI_amf_non3_gpp_access_registration_create ( - ogs_strdup(amf_instance_id->valuestring), - supported_features ? ogs_strdup(supported_features->valuestring) : NULL, + ogs_strdup_or_assert(amf_instance_id->valuestring), + supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL, purge_flag ? purge_flag->valueint : 0, - pei ? ogs_strdup(pei->valuestring) : NULL, + pei ? ogs_strdup_or_assert(pei->valuestring) : NULL, ims_vo_psVariable, - ogs_strdup(dereg_callback_uri->valuestring), - amf_service_name_dereg ? ogs_strdup(amf_service_name_dereg->valuestring) : NULL, - pcscf_restoration_callback_uri ? ogs_strdup(pcscf_restoration_callback_uri->valuestring) : NULL, - amf_service_name_pcscf_rest ? ogs_strdup(amf_service_name_pcscf_rest->valuestring) : NULL, + ogs_strdup_or_assert(dereg_callback_uri->valuestring), + amf_service_name_dereg ? ogs_strdup_or_assert(amf_service_name_dereg->valuestring) : NULL, + pcscf_restoration_callback_uri ? ogs_strdup_or_assert(pcscf_restoration_callback_uri->valuestring) : NULL, + amf_service_name_pcscf_rest ? ogs_strdup_or_assert(amf_service_name_pcscf_rest->valuestring) : NULL, guami_local_nonprim, backup_amf_info ? backup_amf_infoList : NULL, rat_typeVariable, urrp_indicator ? urrp_indicator->valueint : 0, - amf_ee_subscription_id ? ogs_strdup(amf_ee_subscription_id->valuestring) : NULL, - registration_time ? ogs_strdup(registration_time->valuestring) : NULL, + amf_ee_subscription_id ? ogs_strdup_or_assert(amf_ee_subscription_id->valuestring) : NULL, + registration_time ? ogs_strdup_or_assert(registration_time->valuestring) : NULL, vgmlc_address ? vgmlc_address_local_nonprim : NULL, context_info ? context_info_local_nonprim : NULL ); diff --git a/lib/sbi/openapi/model/amf_non3_gpp_access_registration_modification.c b/lib/sbi/openapi/model/amf_non3_gpp_access_registration_modification.c index b3ea95089a..3d4428f708 100644 --- a/lib/sbi/openapi/model/amf_non3_gpp_access_registration_modification.c +++ b/lib/sbi/openapi/model/amf_non3_gpp_access_registration_modification.c @@ -174,7 +174,7 @@ OpenAPI_amf_non3_gpp_access_registration_modification_t *OpenAPI_amf_non3_gpp_ac amf_non3_gpp_access_registration_modification_local_var = OpenAPI_amf_non3_gpp_access_registration_modification_create ( guami_local_nonprim, purge_flag ? purge_flag->valueint : 0, - pei ? ogs_strdup(pei->valuestring) : NULL, + pei ? ogs_strdup_or_assert(pei->valuestring) : NULL, ims_vo_ps ? ims_vo_psVariable : 0, backup_amf_info ? backup_amf_infoList : NULL ); diff --git a/lib/sbi/openapi/model/amf_status_change_subscription_data.c b/lib/sbi/openapi/model/amf_status_change_subscription_data.c index c131b3063a..67cf1cac69 100644 --- a/lib/sbi/openapi/model/amf_status_change_subscription_data.c +++ b/lib/sbi/openapi/model/amf_status_change_subscription_data.c @@ -111,7 +111,7 @@ OpenAPI_amf_status_change_subscription_data_t *OpenAPI_amf_status_change_subscri } amf_status_change_subscription_data_local_var = OpenAPI_amf_status_change_subscription_data_create ( - ogs_strdup(amf_status_uri->valuestring), + ogs_strdup_or_assert(amf_status_uri->valuestring), guami_list ? guami_listList : NULL ); diff --git a/lib/sbi/openapi/model/amf_status_info.c b/lib/sbi/openapi/model/amf_status_info.c index e38f784a03..6ea991c9a3 100644 --- a/lib/sbi/openapi/model/amf_status_info.c +++ b/lib/sbi/openapi/model/amf_status_info.c @@ -153,8 +153,8 @@ OpenAPI_amf_status_info_t *OpenAPI_amf_status_info_parseFromJSON(cJSON *amf_stat amf_status_info_local_var = OpenAPI_amf_status_info_create ( guami_listList, status_changeVariable, - target_amf_removal ? ogs_strdup(target_amf_removal->valuestring) : NULL, - target_amf_failure ? ogs_strdup(target_amf_failure->valuestring) : NULL + target_amf_removal ? ogs_strdup_or_assert(target_amf_removal->valuestring) : NULL, + target_amf_failure ? ogs_strdup_or_assert(target_amf_failure->valuestring) : NULL ); return amf_status_info_local_var; diff --git a/lib/sbi/openapi/model/amf_subscription_info.c b/lib/sbi/openapi/model/amf_subscription_info.c index 74d267a50c..e5463cac9b 100644 --- a/lib/sbi/openapi/model/amf_subscription_info.c +++ b/lib/sbi/openapi/model/amf_subscription_info.c @@ -101,9 +101,9 @@ OpenAPI_amf_subscription_info_t *OpenAPI_amf_subscription_info_parseFromJSON(cJS } amf_subscription_info_local_var = OpenAPI_amf_subscription_info_create ( - ogs_strdup(amf_instance_id->valuestring), - ogs_strdup(subscription_id->valuestring), - subs_change_notify_correlation_id ? ogs_strdup(subs_change_notify_correlation_id->valuestring) : NULL + ogs_strdup_or_assert(amf_instance_id->valuestring), + ogs_strdup_or_assert(subscription_id->valuestring), + subs_change_notify_correlation_id ? ogs_strdup_or_assert(subs_change_notify_correlation_id->valuestring) : NULL ); return amf_subscription_info_local_var; diff --git a/lib/sbi/openapi/model/an_gw_address.c b/lib/sbi/openapi/model/an_gw_address.c index 9f130125bf..ee61898d6e 100644 --- a/lib/sbi/openapi/model/an_gw_address.c +++ b/lib/sbi/openapi/model/an_gw_address.c @@ -80,8 +80,8 @@ OpenAPI_an_gw_address_t *OpenAPI_an_gw_address_parseFromJSON(cJSON *an_gw_addres } an_gw_address_local_var = OpenAPI_an_gw_address_create ( - an_gw_ipv4_addr ? ogs_strdup(an_gw_ipv4_addr->valuestring) : NULL, - an_gw_ipv6_addr ? ogs_strdup(an_gw_ipv6_addr->valuestring) : NULL + an_gw_ipv4_addr ? ogs_strdup_or_assert(an_gw_ipv4_addr->valuestring) : NULL, + an_gw_ipv6_addr ? ogs_strdup_or_assert(an_gw_ipv6_addr->valuestring) : NULL ); return an_gw_address_local_var; diff --git a/lib/sbi/openapi/model/apn_rate_status.c b/lib/sbi/openapi/model/apn_rate_status.c index 526372cd73..8bdb876080 100644 --- a/lib/sbi/openapi/model/apn_rate_status.c +++ b/lib/sbi/openapi/model/apn_rate_status.c @@ -135,7 +135,7 @@ OpenAPI_apn_rate_status_t *OpenAPI_apn_rate_status_parseFromJSON(cJSON *apn_rate apn_rate_status_local_var = OpenAPI_apn_rate_status_create ( remain_packets_ul ? remain_packets_ul->valuedouble : 0, remain_packets_dl ? remain_packets_dl->valuedouble : 0, - validity_time ? ogs_strdup(validity_time->valuestring) : NULL, + validity_time ? ogs_strdup_or_assert(validity_time->valuestring) : NULL, remain_ex_reports_ul ? remain_ex_reports_ul->valuedouble : 0, remain_ex_reports_dl ? remain_ex_reports_dl->valuedouble : 0 ); diff --git a/lib/sbi/openapi/model/app_descriptor.c b/lib/sbi/openapi/model/app_descriptor.c index 5f76dab291..5cb20b19fd 100644 --- a/lib/sbi/openapi/model/app_descriptor.c +++ b/lib/sbi/openapi/model/app_descriptor.c @@ -80,8 +80,8 @@ OpenAPI_app_descriptor_t *OpenAPI_app_descriptor_parseFromJSON(cJSON *app_descri } app_descriptor_local_var = OpenAPI_app_descriptor_create ( - os_id ? ogs_strdup(os_id->valuestring) : NULL, - app_id ? ogs_strdup(app_id->valuestring) : NULL + os_id ? ogs_strdup_or_assert(os_id->valuestring) : NULL, + app_id ? ogs_strdup_or_assert(app_id->valuestring) : NULL ); return app_descriptor_local_var; diff --git a/lib/sbi/openapi/model/app_detection_info.c b/lib/sbi/openapi/model/app_detection_info.c index 8b3297c4af..483c68eeef 100644 --- a/lib/sbi/openapi/model/app_detection_info.c +++ b/lib/sbi/openapi/model/app_detection_info.c @@ -130,8 +130,8 @@ OpenAPI_app_detection_info_t *OpenAPI_app_detection_info_parseFromJSON(cJSON *ap } app_detection_info_local_var = OpenAPI_app_detection_info_create ( - ogs_strdup(app_id->valuestring), - instance_id ? ogs_strdup(instance_id->valuestring) : NULL, + ogs_strdup_or_assert(app_id->valuestring), + instance_id ? ogs_strdup_or_assert(instance_id->valuestring) : NULL, sdf_descriptions ? sdf_descriptionsList : NULL ); diff --git a/lib/sbi/openapi/model/app_session_context_req_data.c b/lib/sbi/openapi/model/app_session_context_req_data.c index eee3acb3ca..0c769e0f2f 100644 --- a/lib/sbi/openapi/model/app_session_context_req_data.c +++ b/lib/sbi/openapi/model/app_session_context_req_data.c @@ -698,34 +698,34 @@ OpenAPI_app_session_context_req_data_t *OpenAPI_app_session_context_req_data_par } app_session_context_req_data_local_var = OpenAPI_app_session_context_req_data_create ( - af_app_id ? ogs_strdup(af_app_id->valuestring) : NULL, - af_charg_id ? ogs_strdup(af_charg_id->valuestring) : NULL, + af_app_id ? ogs_strdup_or_assert(af_app_id->valuestring) : NULL, + af_charg_id ? ogs_strdup_or_assert(af_charg_id->valuestring) : NULL, af_req_data ? af_req_dataVariable : 0, af_rout_req ? af_rout_req_local_nonprim : NULL, - asp_id ? ogs_strdup(asp_id->valuestring) : NULL, - bdt_ref_id ? ogs_strdup(bdt_ref_id->valuestring) : NULL, - dnn ? ogs_strdup(dnn->valuestring) : NULL, + asp_id ? ogs_strdup_or_assert(asp_id->valuestring) : NULL, + bdt_ref_id ? ogs_strdup_or_assert(bdt_ref_id->valuestring) : NULL, + dnn ? ogs_strdup_or_assert(dnn->valuestring) : NULL, ev_subsc ? ev_subsc_local_nonprim : NULL, - mcptt_id ? ogs_strdup(mcptt_id->valuestring) : NULL, - mc_video_id ? ogs_strdup(mc_video_id->valuestring) : NULL, + mcptt_id ? ogs_strdup_or_assert(mcptt_id->valuestring) : NULL, + mc_video_id ? ogs_strdup_or_assert(mc_video_id->valuestring) : NULL, med_components ? med_componentsList : NULL, - ip_domain ? ogs_strdup(ip_domain->valuestring) : NULL, - mps_id ? ogs_strdup(mps_id->valuestring) : NULL, - mcs_id ? ogs_strdup(mcs_id->valuestring) : NULL, + ip_domain ? ogs_strdup_or_assert(ip_domain->valuestring) : NULL, + mps_id ? ogs_strdup_or_assert(mps_id->valuestring) : NULL, + mcs_id ? ogs_strdup_or_assert(mcs_id->valuestring) : NULL, preempt_control_info ? preempt_control_infoVariable : 0, res_prio ? res_prioVariable : 0, serv_inf_status ? serv_inf_statusVariable : 0, - ogs_strdup(notif_uri->valuestring), - serv_urn ? ogs_strdup(serv_urn->valuestring) : NULL, + ogs_strdup_or_assert(notif_uri->valuestring), + serv_urn ? ogs_strdup_or_assert(serv_urn->valuestring) : NULL, slice_info ? slice_info_local_nonprim : NULL, - spon_id ? ogs_strdup(spon_id->valuestring) : NULL, + spon_id ? ogs_strdup_or_assert(spon_id->valuestring) : NULL, spon_status ? spon_statusVariable : 0, - supi ? ogs_strdup(supi->valuestring) : NULL, - gpsi ? ogs_strdup(gpsi->valuestring) : NULL, - ogs_strdup(supp_feat->valuestring), - ue_ipv4 ? ogs_strdup(ue_ipv4->valuestring) : NULL, - ue_ipv6 ? ogs_strdup(ue_ipv6->valuestring) : NULL, - ue_mac ? ogs_strdup(ue_mac->valuestring) : NULL, + supi ? ogs_strdup_or_assert(supi->valuestring) : NULL, + gpsi ? ogs_strdup_or_assert(gpsi->valuestring) : NULL, + ogs_strdup_or_assert(supp_feat->valuestring), + ue_ipv4 ? ogs_strdup_or_assert(ue_ipv4->valuestring) : NULL, + ue_ipv6 ? ogs_strdup_or_assert(ue_ipv6->valuestring) : NULL, + ue_mac ? ogs_strdup_or_assert(ue_mac->valuestring) : NULL, tsn_port_man_cont_dstt ? tsn_port_man_cont_dstt_local_nonprim : NULL, tsn_port_man_cont_nwtts ? tsn_port_man_cont_nwttsList : NULL ); diff --git a/lib/sbi/openapi/model/app_session_context_resp_data.c b/lib/sbi/openapi/model/app_session_context_resp_data.c index 1bc076c7f6..fd14abe5d4 100644 --- a/lib/sbi/openapi/model/app_session_context_resp_data.c +++ b/lib/sbi/openapi/model/app_session_context_resp_data.c @@ -132,7 +132,7 @@ OpenAPI_app_session_context_resp_data_t *OpenAPI_app_session_context_resp_data_p app_session_context_resp_data_local_var = OpenAPI_app_session_context_resp_data_create ( serv_auth_info ? serv_auth_infoVariable : 0, ue_ids ? ue_idsList : NULL, - supp_feat ? ogs_strdup(supp_feat->valuestring) : NULL + supp_feat ? ogs_strdup_or_assert(supp_feat->valuestring) : NULL ); return app_session_context_resp_data_local_var; diff --git a/lib/sbi/openapi/model/app_session_context_update_data.c b/lib/sbi/openapi/model/app_session_context_update_data.c index a875fe83d3..80d7086b95 100644 --- a/lib/sbi/openapi/model/app_session_context_update_data.c +++ b/lib/sbi/openapi/model/app_session_context_update_data.c @@ -467,21 +467,21 @@ OpenAPI_app_session_context_update_data_t *OpenAPI_app_session_context_update_da } app_session_context_update_data_local_var = OpenAPI_app_session_context_update_data_create ( - af_app_id ? ogs_strdup(af_app_id->valuestring) : NULL, + af_app_id ? ogs_strdup_or_assert(af_app_id->valuestring) : NULL, af_rout_req ? af_rout_req_local_nonprim : NULL, - asp_id ? ogs_strdup(asp_id->valuestring) : NULL, - bdt_ref_id ? ogs_strdup(bdt_ref_id->valuestring) : NULL, + asp_id ? ogs_strdup_or_assert(asp_id->valuestring) : NULL, + bdt_ref_id ? ogs_strdup_or_assert(bdt_ref_id->valuestring) : NULL, ev_subsc ? ev_subsc_local_nonprim : NULL, - mcptt_id ? ogs_strdup(mcptt_id->valuestring) : NULL, - mc_video_id ? ogs_strdup(mc_video_id->valuestring) : NULL, + mcptt_id ? ogs_strdup_or_assert(mcptt_id->valuestring) : NULL, + mc_video_id ? ogs_strdup_or_assert(mc_video_id->valuestring) : NULL, med_components ? med_componentsList : NULL, - mps_id ? ogs_strdup(mps_id->valuestring) : NULL, - mcs_id ? ogs_strdup(mcs_id->valuestring) : NULL, + mps_id ? ogs_strdup_or_assert(mps_id->valuestring) : NULL, + mcs_id ? ogs_strdup_or_assert(mcs_id->valuestring) : NULL, preempt_control_info ? preempt_control_info_local_nonprim : NULL, res_prio ? res_prioVariable : 0, serv_inf_status ? serv_inf_statusVariable : 0, sip_fork_ind ? sip_fork_indVariable : 0, - spon_id ? ogs_strdup(spon_id->valuestring) : NULL, + spon_id ? ogs_strdup_or_assert(spon_id->valuestring) : NULL, spon_status ? spon_statusVariable : 0, tsn_port_man_cont_dstt ? tsn_port_man_cont_dstt_local_nonprim : NULL, tsn_port_man_cont_nwtts ? tsn_port_man_cont_nwttsList : NULL diff --git a/lib/sbi/openapi/model/application_data_change_notif.c b/lib/sbi/openapi/model/application_data_change_notif.c index 1804e209d6..3173a672d3 100644 --- a/lib/sbi/openapi/model/application_data_change_notif.c +++ b/lib/sbi/openapi/model/application_data_change_notif.c @@ -157,7 +157,7 @@ OpenAPI_application_data_change_notif_t *OpenAPI_application_data_change_notif_p iptv_config_data ? iptv_config_data_local_nonprim : NULL, pfd_data ? pfd_data_local_nonprim : NULL, bdt_policy_data ? bdt_policy_data_local_nonprim : NULL, - ogs_strdup(res_uri->valuestring), + ogs_strdup_or_assert(res_uri->valuestring), ser_param_data ? ser_param_data_local_nonprim : NULL ); diff --git a/lib/sbi/openapi/model/application_data_subs.c b/lib/sbi/openapi/model/application_data_subs.c index ead084ee17..e93afccb3d 100644 --- a/lib/sbi/openapi/model/application_data_subs.c +++ b/lib/sbi/openapi/model/application_data_subs.c @@ -149,10 +149,10 @@ OpenAPI_application_data_subs_t *OpenAPI_application_data_subs_parseFromJSON(cJS } application_data_subs_local_var = OpenAPI_application_data_subs_create ( - ogs_strdup(notification_uri->valuestring), + ogs_strdup_or_assert(notification_uri->valuestring), data_filters ? data_filtersList : NULL, - expiry ? ogs_strdup(expiry->valuestring) : NULL, - supported_features ? ogs_strdup(supported_features->valuestring) : NULL + expiry ? ogs_strdup_or_assert(expiry->valuestring) : NULL, + supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL ); return application_data_subs_local_var; diff --git a/lib/sbi/openapi/model/area.c b/lib/sbi/openapi/model/area.c index 3d7bce1fc3..29a054a448 100644 --- a/lib/sbi/openapi/model/area.c +++ b/lib/sbi/openapi/model/area.c @@ -89,7 +89,7 @@ OpenAPI_area_t *OpenAPI_area_parseFromJSON(cJSON *areaJSON) ogs_error("OpenAPI_area_parseFromJSON() failed [tacs]"); goto end; } - OpenAPI_list_add(tacsList, ogs_strdup(tacs_local->valuestring)); + OpenAPI_list_add(tacsList, ogs_strdup_or_assert(tacs_local->valuestring)); } } @@ -104,7 +104,7 @@ OpenAPI_area_t *OpenAPI_area_parseFromJSON(cJSON *areaJSON) area_local_var = OpenAPI_area_create ( tacs ? tacsList : NULL, - area_code ? ogs_strdup(area_code->valuestring) : NULL + area_code ? ogs_strdup_or_assert(area_code->valuestring) : NULL ); return area_local_var; diff --git a/lib/sbi/openapi/model/area_scope.c b/lib/sbi/openapi/model/area_scope.c index 110bd8e665..495c3d3a00 100644 --- a/lib/sbi/openapi/model/area_scope.c +++ b/lib/sbi/openapi/model/area_scope.c @@ -152,7 +152,7 @@ OpenAPI_area_scope_t *OpenAPI_area_scope_parseFromJSON(cJSON *area_scopeJSON) ogs_error("OpenAPI_area_scope_parseFromJSON() failed [eutra_cell_id_list]"); goto end; } - OpenAPI_list_add(eutra_cell_id_listList, ogs_strdup(eutra_cell_id_list_local->valuestring)); + OpenAPI_list_add(eutra_cell_id_listList, ogs_strdup_or_assert(eutra_cell_id_list_local->valuestring)); } } @@ -172,7 +172,7 @@ OpenAPI_area_scope_t *OpenAPI_area_scope_parseFromJSON(cJSON *area_scopeJSON) ogs_error("OpenAPI_area_scope_parseFromJSON() failed [nr_cell_id_list]"); goto end; } - OpenAPI_list_add(nr_cell_id_listList, ogs_strdup(nr_cell_id_list_local->valuestring)); + OpenAPI_list_add(nr_cell_id_listList, ogs_strdup_or_assert(nr_cell_id_list_local->valuestring)); } } @@ -192,7 +192,7 @@ OpenAPI_area_scope_t *OpenAPI_area_scope_parseFromJSON(cJSON *area_scopeJSON) ogs_error("OpenAPI_area_scope_parseFromJSON() failed [tac_list]"); goto end; } - OpenAPI_list_add(tac_listList, ogs_strdup(tac_list_local->valuestring)); + OpenAPI_list_add(tac_listList, ogs_strdup_or_assert(tac_list_local->valuestring)); } } diff --git a/lib/sbi/openapi/model/atom.c b/lib/sbi/openapi/model/atom.c index fa2414b899..30a43f12c1 100644 --- a/lib/sbi/openapi/model/atom.c +++ b/lib/sbi/openapi/model/atom.c @@ -100,8 +100,8 @@ OpenAPI_atom_t *OpenAPI_atom_parseFromJSON(cJSON *atomJSON) } atom_local_var = OpenAPI_atom_create ( - ogs_strdup(attr->valuestring), - ogs_strdup(value->valuestring), + ogs_strdup_or_assert(attr->valuestring), + ogs_strdup_or_assert(value->valuestring), negative ? negative->valueint : 0 ); diff --git a/lib/sbi/openapi/model/ausf_info.c b/lib/sbi/openapi/model/ausf_info.c index edb69d2c24..d4bd4d4264 100644 --- a/lib/sbi/openapi/model/ausf_info.c +++ b/lib/sbi/openapi/model/ausf_info.c @@ -147,12 +147,12 @@ OpenAPI_ausf_info_t *OpenAPI_ausf_info_parseFromJSON(cJSON *ausf_infoJSON) ogs_error("OpenAPI_ausf_info_parseFromJSON() failed [routing_indicators]"); goto end; } - OpenAPI_list_add(routing_indicatorsList, ogs_strdup(routing_indicators_local->valuestring)); + OpenAPI_list_add(routing_indicatorsList, ogs_strdup_or_assert(routing_indicators_local->valuestring)); } } ausf_info_local_var = OpenAPI_ausf_info_create ( - group_id ? ogs_strdup(group_id->valuestring) : NULL, + group_id ? ogs_strdup_or_assert(group_id->valuestring) : NULL, supi_ranges ? supi_rangesList : NULL, routing_indicators ? routing_indicatorsList : NULL ); diff --git a/lib/sbi/openapi/model/auth_event.c b/lib/sbi/openapi/model/auth_event.c index fb5990bdf9..a55d5e68b5 100644 --- a/lib/sbi/openapi/model/auth_event.c +++ b/lib/sbi/openapi/model/auth_event.c @@ -160,11 +160,11 @@ OpenAPI_auth_event_t *OpenAPI_auth_event_parseFromJSON(cJSON *auth_eventJSON) } auth_event_local_var = OpenAPI_auth_event_create ( - ogs_strdup(nf_instance_id->valuestring), + ogs_strdup_or_assert(nf_instance_id->valuestring), success->valueint, - ogs_strdup(time_stamp->valuestring), + ogs_strdup_or_assert(time_stamp->valuestring), auth_typeVariable, - ogs_strdup(serving_network_name->valuestring), + ogs_strdup_or_assert(serving_network_name->valuestring), auth_removal_ind ? auth_removal_ind->valueint : 0 ); diff --git a/lib/sbi/openapi/model/authentication_info.c b/lib/sbi/openapi/model/authentication_info.c index dfa20e1dad..411733eced 100644 --- a/lib/sbi/openapi/model/authentication_info.c +++ b/lib/sbi/openapi/model/authentication_info.c @@ -204,14 +204,14 @@ OpenAPI_authentication_info_t *OpenAPI_authentication_info_parseFromJSON(cJSON * } authentication_info_local_var = OpenAPI_authentication_info_create ( - ogs_strdup(supi_or_suci->valuestring), - ogs_strdup(serving_network_name->valuestring), + ogs_strdup_or_assert(supi_or_suci->valuestring), + ogs_strdup_or_assert(serving_network_name->valuestring), resynchronization_info ? resynchronization_info_local_nonprim : NULL, - pei ? ogs_strdup(pei->valuestring) : NULL, + pei ? ogs_strdup_or_assert(pei->valuestring) : NULL, trace_data ? trace_data_local_nonprim : NULL, - udm_group_id ? ogs_strdup(udm_group_id->valuestring) : NULL, - routing_indicator ? ogs_strdup(routing_indicator->valuestring) : NULL, - cag_id ? ogs_strdup(cag_id->valuestring) : NULL + udm_group_id ? ogs_strdup_or_assert(udm_group_id->valuestring) : NULL, + routing_indicator ? ogs_strdup_or_assert(routing_indicator->valuestring) : NULL, + cag_id ? ogs_strdup_or_assert(cag_id->valuestring) : NULL ); return authentication_info_local_var; diff --git a/lib/sbi/openapi/model/authentication_info_request.c b/lib/sbi/openapi/model/authentication_info_request.c index 98fae48ffd..b8d79e3401 100644 --- a/lib/sbi/openapi/model/authentication_info_request.c +++ b/lib/sbi/openapi/model/authentication_info_request.c @@ -170,7 +170,7 @@ OpenAPI_authentication_info_request_t *OpenAPI_authentication_info_request_parse ogs_error("OpenAPI_authentication_info_request_parseFromJSON() failed [cell_cag_info]"); goto end; } - OpenAPI_list_add(cell_cag_infoList, ogs_strdup(cell_cag_info_local->valuestring)); + OpenAPI_list_add(cell_cag_infoList, ogs_strdup_or_assert(cell_cag_info_local->valuestring)); } } @@ -184,10 +184,10 @@ OpenAPI_authentication_info_request_t *OpenAPI_authentication_info_request_parse } authentication_info_request_local_var = OpenAPI_authentication_info_request_create ( - supported_features ? ogs_strdup(supported_features->valuestring) : NULL, - ogs_strdup(serving_network_name->valuestring), + supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL, + ogs_strdup_or_assert(serving_network_name->valuestring), resynchronization_info ? resynchronization_info_local_nonprim : NULL, - ogs_strdup(ausf_instance_id->valuestring), + ogs_strdup_or_assert(ausf_instance_id->valuestring), cell_cag_info ? cell_cag_infoList : NULL, n5gc_ind ? n5gc_ind->valueint : 0 ); diff --git a/lib/sbi/openapi/model/authentication_info_result.c b/lib/sbi/openapi/model/authentication_info_result.c index 3260b41665..5647b8d128 100644 --- a/lib/sbi/openapi/model/authentication_info_result.c +++ b/lib/sbi/openapi/model/authentication_info_result.c @@ -125,9 +125,9 @@ OpenAPI_authentication_info_result_t *OpenAPI_authentication_info_result_parseFr authentication_info_result_local_var = OpenAPI_authentication_info_result_create ( auth_typeVariable, - supported_features ? ogs_strdup(supported_features->valuestring) : NULL, + supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL, authentication_vector ? authentication_vector_local_nonprim : NULL, - supi ? ogs_strdup(supi->valuestring) : NULL + supi ? ogs_strdup_or_assert(supi->valuestring) : NULL ); return authentication_info_result_local_var; diff --git a/lib/sbi/openapi/model/authentication_subscription.c b/lib/sbi/openapi/model/authentication_subscription.c index c89a33d369..8bf4962694 100644 --- a/lib/sbi/openapi/model/authentication_subscription.c +++ b/lib/sbi/openapi/model/authentication_subscription.c @@ -276,17 +276,17 @@ OpenAPI_authentication_subscription_t *OpenAPI_authentication_subscription_parse authentication_subscription_local_var = OpenAPI_authentication_subscription_create ( authentication_methodVariable, - enc_permanent_key ? ogs_strdup(enc_permanent_key->valuestring) : NULL, - protection_parameter_id ? ogs_strdup(protection_parameter_id->valuestring) : NULL, + enc_permanent_key ? ogs_strdup_or_assert(enc_permanent_key->valuestring) : NULL, + protection_parameter_id ? ogs_strdup_or_assert(protection_parameter_id->valuestring) : NULL, sequence_number ? sequence_number_local_nonprim : NULL, - authentication_management_field ? ogs_strdup(authentication_management_field->valuestring) : NULL, - algorithm_id ? ogs_strdup(algorithm_id->valuestring) : NULL, - enc_opc_key ? ogs_strdup(enc_opc_key->valuestring) : NULL, - enc_topc_key ? ogs_strdup(enc_topc_key->valuestring) : NULL, + authentication_management_field ? ogs_strdup_or_assert(authentication_management_field->valuestring) : NULL, + algorithm_id ? ogs_strdup_or_assert(algorithm_id->valuestring) : NULL, + enc_opc_key ? ogs_strdup_or_assert(enc_opc_key->valuestring) : NULL, + enc_topc_key ? ogs_strdup_or_assert(enc_topc_key->valuestring) : NULL, vector_generation_in_hss ? vector_generation_in_hss->valueint : 0, n5gc_auth_method ? n5gc_auth_methodVariable : 0, rg_authentication_ind ? rg_authentication_ind->valueint : 0, - supi ? ogs_strdup(supi->valuestring) : NULL + supi ? ogs_strdup_or_assert(supi->valuestring) : NULL ); return authentication_subscription_local_var; diff --git a/lib/sbi/openapi/model/authentication_vector.c b/lib/sbi/openapi/model/authentication_vector.c index fc69cd23e6..3ed18e2b8b 100644 --- a/lib/sbi/openapi/model/authentication_vector.c +++ b/lib/sbi/openapi/model/authentication_vector.c @@ -199,13 +199,13 @@ OpenAPI_authentication_vector_t *OpenAPI_authentication_vector_parseFromJSON(cJS authentication_vector_local_var = OpenAPI_authentication_vector_create ( av_typeVariable, - ogs_strdup(rand->valuestring), - xres ? ogs_strdup(xres->valuestring) : NULL, - ogs_strdup(autn->valuestring), - ck_prime ? ogs_strdup(ck_prime->valuestring) : NULL, - ik_prime ? ogs_strdup(ik_prime->valuestring) : NULL, - xres_star ? ogs_strdup(xres_star->valuestring) : NULL, - kausf ? ogs_strdup(kausf->valuestring) : NULL + ogs_strdup_or_assert(rand->valuestring), + xres ? ogs_strdup_or_assert(xres->valuestring) : NULL, + ogs_strdup_or_assert(autn->valuestring), + ck_prime ? ogs_strdup_or_assert(ck_prime->valuestring) : NULL, + ik_prime ? ogs_strdup_or_assert(ik_prime->valuestring) : NULL, + xres_star ? ogs_strdup_or_assert(xres_star->valuestring) : NULL, + kausf ? ogs_strdup_or_assert(kausf->valuestring) : NULL ); return authentication_vector_local_var; diff --git a/lib/sbi/openapi/model/authorization_data.c b/lib/sbi/openapi/model/authorization_data.c index 4ab176dbe7..218fe22f03 100644 --- a/lib/sbi/openapi/model/authorization_data.c +++ b/lib/sbi/openapi/model/authorization_data.c @@ -112,7 +112,7 @@ OpenAPI_authorization_data_t *OpenAPI_authorization_data_parseFromJSON(cJSON *au authorization_data_local_var = OpenAPI_authorization_data_create ( authorization_dataList, - validity_time ? ogs_strdup(validity_time->valuestring) : NULL + validity_time ? ogs_strdup_or_assert(validity_time->valuestring) : NULL ); return authorization_data_local_var; diff --git a/lib/sbi/openapi/model/authorized_default_qos.c b/lib/sbi/openapi/model/authorized_default_qos.c index af0e490702..4a5952d7cf 100644 --- a/lib/sbi/openapi/model/authorized_default_qos.c +++ b/lib/sbi/openapi/model/authorized_default_qos.c @@ -254,10 +254,10 @@ OpenAPI_authorized_default_qos_t *OpenAPI_authorized_default_qos_parseFromJSON(c priority_level ? priority_level->valuedouble : 0, aver_window ? aver_window->valuedouble : 0, max_data_burst_vol ? max_data_burst_vol->valuedouble : 0, - maxbr_ul ? ogs_strdup(maxbr_ul->valuestring) : NULL, - maxbr_dl ? ogs_strdup(maxbr_dl->valuestring) : NULL, - gbr_ul ? ogs_strdup(gbr_ul->valuestring) : NULL, - gbr_dl ? ogs_strdup(gbr_dl->valuestring) : NULL, + maxbr_ul ? ogs_strdup_or_assert(maxbr_ul->valuestring) : NULL, + maxbr_dl ? ogs_strdup_or_assert(maxbr_dl->valuestring) : NULL, + gbr_ul ? ogs_strdup_or_assert(gbr_ul->valuestring) : NULL, + gbr_dl ? ogs_strdup_or_assert(gbr_dl->valuestring) : NULL, qnc ? qnc->valueint : 0, ext_max_data_burst_vol ? ext_max_data_burst_vol->valuedouble : 0 ); diff --git a/lib/sbi/openapi/model/authorized_network_slice_info.c b/lib/sbi/openapi/model/authorized_network_slice_info.c index 326615fd38..586618fece 100644 --- a/lib/sbi/openapi/model/authorized_network_slice_info.c +++ b/lib/sbi/openapi/model/authorized_network_slice_info.c @@ -314,7 +314,7 @@ OpenAPI_authorized_network_slice_info_t *OpenAPI_authorized_network_slice_info_p ogs_error("OpenAPI_authorized_network_slice_info_parseFromJSON() failed [candidate_amf_list]"); goto end; } - OpenAPI_list_add(candidate_amf_listList, ogs_strdup(candidate_amf_list_local->valuestring)); + OpenAPI_list_add(candidate_amf_listList, ogs_strdup_or_assert(candidate_amf_list_local->valuestring)); } } @@ -419,16 +419,16 @@ OpenAPI_authorized_network_slice_info_t *OpenAPI_authorized_network_slice_info_p authorized_network_slice_info_local_var = OpenAPI_authorized_network_slice_info_create ( allowed_nssai_list ? allowed_nssai_listList : NULL, configured_nssai ? configured_nssaiList : NULL, - target_amf_set ? ogs_strdup(target_amf_set->valuestring) : NULL, + target_amf_set ? ogs_strdup_or_assert(target_amf_set->valuestring) : NULL, candidate_amf_list ? candidate_amf_listList : NULL, rejected_nssai_in_plmn ? rejected_nssai_in_plmnList : NULL, rejected_nssai_in_ta ? rejected_nssai_in_taList : NULL, nsi_information ? nsi_information_local_nonprim : NULL, - supported_features ? ogs_strdup(supported_features->valuestring) : NULL, - nrf_amf_set ? ogs_strdup(nrf_amf_set->valuestring) : NULL, - nrf_amf_set_nf_mgt_uri ? ogs_strdup(nrf_amf_set_nf_mgt_uri->valuestring) : NULL, - nrf_amf_set_access_token_uri ? ogs_strdup(nrf_amf_set_access_token_uri->valuestring) : NULL, - target_amf_service_set ? ogs_strdup(target_amf_service_set->valuestring) : NULL + supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL, + nrf_amf_set ? ogs_strdup_or_assert(nrf_amf_set->valuestring) : NULL, + nrf_amf_set_nf_mgt_uri ? ogs_strdup_or_assert(nrf_amf_set_nf_mgt_uri->valuestring) : NULL, + nrf_amf_set_access_token_uri ? ogs_strdup_or_assert(nrf_amf_set_access_token_uri->valuestring) : NULL, + target_amf_service_set ? ogs_strdup_or_assert(target_amf_service_set->valuestring) : NULL ); return authorized_network_slice_info_local_var; diff --git a/lib/sbi/openapi/model/av5_g_he_aka.c b/lib/sbi/openapi/model/av5_g_he_aka.c index 274d4ac10b..01127abdd0 100644 --- a/lib/sbi/openapi/model/av5_g_he_aka.c +++ b/lib/sbi/openapi/model/av5_g_he_aka.c @@ -142,10 +142,10 @@ OpenAPI_av5_g_he_aka_t *OpenAPI_av5_g_he_aka_parseFromJSON(cJSON *av5_g_he_akaJS av5_g_he_aka_local_var = OpenAPI_av5_g_he_aka_create ( av_typeVariable, - ogs_strdup(rand->valuestring), - xres_star ? ogs_strdup(xres_star->valuestring) : NULL, - ogs_strdup(autn->valuestring), - kausf ? ogs_strdup(kausf->valuestring) : NULL + ogs_strdup_or_assert(rand->valuestring), + xres_star ? ogs_strdup_or_assert(xres_star->valuestring) : NULL, + ogs_strdup_or_assert(autn->valuestring), + kausf ? ogs_strdup_or_assert(kausf->valuestring) : NULL ); return av5_g_he_aka_local_var; diff --git a/lib/sbi/openapi/model/av5g_aka.c b/lib/sbi/openapi/model/av5g_aka.c index d179476b50..4dbbdddbb4 100644 --- a/lib/sbi/openapi/model/av5g_aka.c +++ b/lib/sbi/openapi/model/av5g_aka.c @@ -102,9 +102,9 @@ OpenAPI_av5g_aka_t *OpenAPI_av5g_aka_parseFromJSON(cJSON *av5g_akaJSON) } av5g_aka_local_var = OpenAPI_av5g_aka_create ( - ogs_strdup(rand->valuestring), - ogs_strdup(hxres_star->valuestring), - ogs_strdup(autn->valuestring) + ogs_strdup_or_assert(rand->valuestring), + ogs_strdup_or_assert(hxres_star->valuestring), + ogs_strdup_or_assert(autn->valuestring) ); return av5g_aka_local_var; diff --git a/lib/sbi/openapi/model/av_eap_aka_prime.c b/lib/sbi/openapi/model/av_eap_aka_prime.c index 34ef51fbb6..e4e98222be 100644 --- a/lib/sbi/openapi/model/av_eap_aka_prime.c +++ b/lib/sbi/openapi/model/av_eap_aka_prime.c @@ -161,11 +161,11 @@ OpenAPI_av_eap_aka_prime_t *OpenAPI_av_eap_aka_prime_parseFromJSON(cJSON *av_eap av_eap_aka_prime_local_var = OpenAPI_av_eap_aka_prime_create ( av_typeVariable, - ogs_strdup(rand->valuestring), - xres ? ogs_strdup(xres->valuestring) : NULL, - ogs_strdup(autn->valuestring), - ck_prime ? ogs_strdup(ck_prime->valuestring) : NULL, - ik_prime ? ogs_strdup(ik_prime->valuestring) : NULL + ogs_strdup_or_assert(rand->valuestring), + xres ? ogs_strdup_or_assert(xres->valuestring) : NULL, + ogs_strdup_or_assert(autn->valuestring), + ck_prime ? ogs_strdup_or_assert(ck_prime->valuestring) : NULL, + ik_prime ? ogs_strdup_or_assert(ik_prime->valuestring) : NULL ); return av_eap_aka_prime_local_var; diff --git a/lib/sbi/openapi/model/av_eps_aka.c b/lib/sbi/openapi/model/av_eps_aka.c index 1ecf50e94b..e06ae14140 100644 --- a/lib/sbi/openapi/model/av_eps_aka.c +++ b/lib/sbi/openapi/model/av_eps_aka.c @@ -144,10 +144,10 @@ OpenAPI_av_eps_aka_t *OpenAPI_av_eps_aka_parseFromJSON(cJSON *av_eps_akaJSON) av_eps_aka_local_var = OpenAPI_av_eps_aka_create ( av_typeVariable, - ogs_strdup(rand->valuestring), - ogs_strdup(xres->valuestring), - ogs_strdup(autn->valuestring), - ogs_strdup(kasme->valuestring) + ogs_strdup_or_assert(rand->valuestring), + ogs_strdup_or_assert(xres->valuestring), + ogs_strdup_or_assert(autn->valuestring), + ogs_strdup_or_assert(kasme->valuestring) ); return av_eps_aka_local_var; diff --git a/lib/sbi/openapi/model/av_ims_gba_eap_aka.c b/lib/sbi/openapi/model/av_ims_gba_eap_aka.c index 5f1fea98b7..595cf11450 100644 --- a/lib/sbi/openapi/model/av_ims_gba_eap_aka.c +++ b/lib/sbi/openapi/model/av_ims_gba_eap_aka.c @@ -164,11 +164,11 @@ OpenAPI_av_ims_gba_eap_aka_t *OpenAPI_av_ims_gba_eap_aka_parseFromJSON(cJSON *av av_ims_gba_eap_aka_local_var = OpenAPI_av_ims_gba_eap_aka_create ( av_typeVariable, - ogs_strdup(rand->valuestring), - ogs_strdup(xres->valuestring), - ogs_strdup(autn->valuestring), - ogs_strdup(ck->valuestring), - ogs_strdup(ik->valuestring) + ogs_strdup_or_assert(rand->valuestring), + ogs_strdup_or_assert(xres->valuestring), + ogs_strdup_or_assert(autn->valuestring), + ogs_strdup_or_assert(ck->valuestring), + ogs_strdup_or_assert(ik->valuestring) ); return av_ims_gba_eap_aka_local_var; diff --git a/lib/sbi/openapi/model/backup_amf_info.c b/lib/sbi/openapi/model/backup_amf_info.c index deb06b70a1..ccb23145d7 100644 --- a/lib/sbi/openapi/model/backup_amf_info.c +++ b/lib/sbi/openapi/model/backup_amf_info.c @@ -111,7 +111,7 @@ OpenAPI_backup_amf_info_t *OpenAPI_backup_amf_info_parseFromJSON(cJSON *backup_a } backup_amf_info_local_var = OpenAPI_backup_amf_info_create ( - ogs_strdup(backup_amf->valuestring), + ogs_strdup_or_assert(backup_amf->valuestring), guami_list ? guami_listList : NULL ); diff --git a/lib/sbi/openapi/model/bdt_data.c b/lib/sbi/openapi/model/bdt_data.c index 2e5e199e40..ce6361880b 100644 --- a/lib/sbi/openapi/model/bdt_data.c +++ b/lib/sbi/openapi/model/bdt_data.c @@ -211,13 +211,13 @@ OpenAPI_bdt_data_t *OpenAPI_bdt_data_parseFromJSON(cJSON *bdt_dataJSON) } bdt_data_local_var = OpenAPI_bdt_data_create ( - ogs_strdup(asp_id->valuestring), + ogs_strdup_or_assert(asp_id->valuestring), trans_policy_local_nonprim, - bdt_ref_id ? ogs_strdup(bdt_ref_id->valuestring) : NULL, + bdt_ref_id ? ogs_strdup_or_assert(bdt_ref_id->valuestring) : NULL, nw_area_info ? nw_area_info_local_nonprim : NULL, num_of_ues ? num_of_ues->valuedouble : 0, vol_per_ue ? vol_per_ue_local_nonprim : NULL, - dnn ? ogs_strdup(dnn->valuestring) : NULL, + dnn ? ogs_strdup_or_assert(dnn->valuestring) : NULL, snssai ? snssai_local_nonprim : NULL ); diff --git a/lib/sbi/openapi/model/bdt_policy_data.c b/lib/sbi/openapi/model/bdt_policy_data.c index d6b65b7c1b..7143866aa9 100644 --- a/lib/sbi/openapi/model/bdt_policy_data.c +++ b/lib/sbi/openapi/model/bdt_policy_data.c @@ -142,10 +142,10 @@ OpenAPI_bdt_policy_data_t *OpenAPI_bdt_policy_data_parseFromJSON(cJSON *bdt_poli } bdt_policy_data_local_var = OpenAPI_bdt_policy_data_create ( - inter_group_id ? ogs_strdup(inter_group_id->valuestring) : NULL, - supi ? ogs_strdup(supi->valuestring) : NULL, - ogs_strdup(bdt_ref_id->valuestring), - dnn ? ogs_strdup(dnn->valuestring) : NULL, + inter_group_id ? ogs_strdup_or_assert(inter_group_id->valuestring) : NULL, + supi ? ogs_strdup_or_assert(supi->valuestring) : NULL, + ogs_strdup_or_assert(bdt_ref_id->valuestring), + dnn ? ogs_strdup_or_assert(dnn->valuestring) : NULL, snssai ? snssai_local_nonprim : NULL ); diff --git a/lib/sbi/openapi/model/bdt_policy_data_patch.c b/lib/sbi/openapi/model/bdt_policy_data_patch.c index bf394fdc1c..104101c9eb 100644 --- a/lib/sbi/openapi/model/bdt_policy_data_patch.c +++ b/lib/sbi/openapi/model/bdt_policy_data_patch.c @@ -62,7 +62,7 @@ OpenAPI_bdt_policy_data_patch_t *OpenAPI_bdt_policy_data_patch_parseFromJSON(cJS } bdt_policy_data_patch_local_var = OpenAPI_bdt_policy_data_patch_create ( - ogs_strdup(bdt_ref_id->valuestring) + ogs_strdup_or_assert(bdt_ref_id->valuestring) ); return bdt_policy_data_patch_local_var; diff --git a/lib/sbi/openapi/model/binding_resp.c b/lib/sbi/openapi/model/binding_resp.c index 8c7db7c898..f4a24662da 100644 --- a/lib/sbi/openapi/model/binding_resp.c +++ b/lib/sbi/openapi/model/binding_resp.c @@ -110,7 +110,7 @@ OpenAPI_binding_resp_t *OpenAPI_binding_resp_parseFromJSON(cJSON *binding_respJS } binding_resp_local_var = OpenAPI_binding_resp_create ( - pcf_sm_fqdn ? ogs_strdup(pcf_sm_fqdn->valuestring) : NULL, + pcf_sm_fqdn ? ogs_strdup_or_assert(pcf_sm_fqdn->valuestring) : NULL, pcf_sm_ip_end_points ? pcf_sm_ip_end_pointsList : NULL ); diff --git a/lib/sbi/openapi/model/bsf_info.c b/lib/sbi/openapi/model/bsf_info.c index e12de259b9..b84083c34d 100644 --- a/lib/sbi/openapi/model/bsf_info.c +++ b/lib/sbi/openapi/model/bsf_info.c @@ -153,7 +153,7 @@ OpenAPI_bsf_info_t *OpenAPI_bsf_info_parseFromJSON(cJSON *bsf_infoJSON) ogs_error("OpenAPI_bsf_info_parseFromJSON() failed [dnn_list]"); goto end; } - OpenAPI_list_add(dnn_listList, ogs_strdup(dnn_list_local->valuestring)); + OpenAPI_list_add(dnn_listList, ogs_strdup_or_assert(dnn_list_local->valuestring)); } } @@ -173,7 +173,7 @@ OpenAPI_bsf_info_t *OpenAPI_bsf_info_parseFromJSON(cJSON *bsf_infoJSON) ogs_error("OpenAPI_bsf_info_parseFromJSON() failed [ip_domain_list]"); goto end; } - OpenAPI_list_add(ip_domain_listList, ogs_strdup(ip_domain_list_local->valuestring)); + OpenAPI_list_add(ip_domain_listList, ogs_strdup_or_assert(ip_domain_list_local->valuestring)); } } diff --git a/lib/sbi/openapi/model/cag_ack_data.c b/lib/sbi/openapi/model/cag_ack_data.c index 14bea6de7e..4169bb9284 100644 --- a/lib/sbi/openapi/model/cag_ack_data.c +++ b/lib/sbi/openapi/model/cag_ack_data.c @@ -83,7 +83,7 @@ OpenAPI_cag_ack_data_t *OpenAPI_cag_ack_data_parseFromJSON(cJSON *cag_ack_dataJS ue_update_statusVariable = OpenAPI_ue_update_status_FromString(ue_update_status->valuestring); cag_ack_data_local_var = OpenAPI_cag_ack_data_create ( - ogs_strdup(provisioning_time->valuestring), + ogs_strdup_or_assert(provisioning_time->valuestring), ue_update_statusVariable ); diff --git a/lib/sbi/openapi/model/cag_data.c b/lib/sbi/openapi/model/cag_data.c index 6e921d87e8..a31b237537 100644 --- a/lib/sbi/openapi/model/cag_data.c +++ b/lib/sbi/openapi/model/cag_data.c @@ -115,7 +115,7 @@ OpenAPI_cag_data_t *OpenAPI_cag_data_parseFromJSON(cJSON *cag_dataJSON) cag_data_local_var = OpenAPI_cag_data_create ( cag_infosList, - provisioning_time ? ogs_strdup(provisioning_time->valuestring) : NULL + provisioning_time ? ogs_strdup_or_assert(provisioning_time->valuestring) : NULL ); return cag_data_local_var; diff --git a/lib/sbi/openapi/model/cag_info.c b/lib/sbi/openapi/model/cag_info.c index 0ff719b131..c798109a3c 100644 --- a/lib/sbi/openapi/model/cag_info.c +++ b/lib/sbi/openapi/model/cag_info.c @@ -90,7 +90,7 @@ OpenAPI_cag_info_t *OpenAPI_cag_info_parseFromJSON(cJSON *cag_infoJSON) ogs_error("OpenAPI_cag_info_parseFromJSON() failed [allowed_cag_list]"); goto end; } - OpenAPI_list_add(allowed_cag_listList, ogs_strdup(allowed_cag_list_local->valuestring)); + OpenAPI_list_add(allowed_cag_listList, ogs_strdup_or_assert(allowed_cag_list_local->valuestring)); } cJSON *cag_only_indicator = cJSON_GetObjectItemCaseSensitive(cag_infoJSON, "cagOnlyIndicator"); diff --git a/lib/sbi/openapi/model/candidate_for_replacement.c b/lib/sbi/openapi/model/candidate_for_replacement.c index 45bd5c5b1b..aaa5a762d8 100644 --- a/lib/sbi/openapi/model/candidate_for_replacement.c +++ b/lib/sbi/openapi/model/candidate_for_replacement.c @@ -103,7 +103,7 @@ OpenAPI_candidate_for_replacement_t *OpenAPI_candidate_for_replacement_parseFrom ogs_error("OpenAPI_candidate_for_replacement_parseFromJSON() failed [dnns]"); goto end; } - OpenAPI_list_add(dnnsList, ogs_strdup(dnns_local->valuestring)); + OpenAPI_list_add(dnnsList, ogs_strdup_or_assert(dnns_local->valuestring)); } } diff --git a/lib/sbi/openapi/model/change_item.c b/lib/sbi/openapi/model/change_item.c index 36a8e5ddab..1b60586775 100644 --- a/lib/sbi/openapi/model/change_item.c +++ b/lib/sbi/openapi/model/change_item.c @@ -141,10 +141,10 @@ OpenAPI_change_item_t *OpenAPI_change_item_parseFromJSON(cJSON *change_itemJSON) change_item_local_var = OpenAPI_change_item_create ( opVariable, - ogs_strdup(path->valuestring), - from ? ogs_strdup(from->valuestring) : NULL, - orig_value ? ogs_strdup(orig_value->valuestring) : NULL, - new_value ? ogs_strdup(new_value->valuestring) : NULL + ogs_strdup_or_assert(path->valuestring), + from ? ogs_strdup_or_assert(from->valuestring) : NULL, + orig_value ? ogs_strdup_or_assert(orig_value->valuestring) : NULL, + new_value ? ogs_strdup_or_assert(new_value->valuestring) : NULL ); return change_item_local_var; diff --git a/lib/sbi/openapi/model/charging_data.c b/lib/sbi/openapi/model/charging_data.c index f514ffa4e5..08c6186597 100644 --- a/lib/sbi/openapi/model/charging_data.c +++ b/lib/sbi/openapi/model/charging_data.c @@ -267,7 +267,7 @@ OpenAPI_charging_data_t *OpenAPI_charging_data_parseFromJSON(cJSON *charging_dat } charging_data_local_var = OpenAPI_charging_data_create ( - ogs_strdup(chg_id->valuestring), + ogs_strdup_or_assert(chg_id->valuestring), metering_method ? metering_methodVariable : 0, offline ? offline->valueint : 0, online ? online->valueint : 0, @@ -275,10 +275,10 @@ OpenAPI_charging_data_t *OpenAPI_charging_data_parseFromJSON(cJSON *charging_dat rating_group ? rating_group->valuedouble : 0, reporting_level ? reporting_levelVariable : 0, service_id ? service_id->valuedouble : 0, - sponsor_id ? ogs_strdup(sponsor_id->valuestring) : NULL, - app_svc_prov_id ? ogs_strdup(app_svc_prov_id->valuestring) : NULL, + sponsor_id ? ogs_strdup_or_assert(sponsor_id->valuestring) : NULL, + app_svc_prov_id ? ogs_strdup_or_assert(app_svc_prov_id->valuestring) : NULL, af_charging_identifier ? af_charging_identifier->valuedouble : 0, - af_charg_id ? ogs_strdup(af_charg_id->valuestring) : NULL + af_charg_id ? ogs_strdup_or_assert(af_charg_id->valuestring) : NULL ); return charging_data_local_var; diff --git a/lib/sbi/openapi/model/charging_information.c b/lib/sbi/openapi/model/charging_information.c index cccaf8be8c..3cc25f276c 100644 --- a/lib/sbi/openapi/model/charging_information.c +++ b/lib/sbi/openapi/model/charging_information.c @@ -158,12 +158,12 @@ OpenAPI_charging_information_t *OpenAPI_charging_information_parseFromJSON(cJSON } charging_information_local_var = OpenAPI_charging_information_create ( - ogs_strdup(primary_chf_address->valuestring), - ogs_strdup(secondary_chf_address->valuestring), - primary_chf_set_id ? ogs_strdup(primary_chf_set_id->valuestring) : NULL, - primary_chf_instance_id ? ogs_strdup(primary_chf_instance_id->valuestring) : NULL, - secondary_chf_set_id ? ogs_strdup(secondary_chf_set_id->valuestring) : NULL, - secondary_chf_instance_id ? ogs_strdup(secondary_chf_instance_id->valuestring) : NULL + ogs_strdup_or_assert(primary_chf_address->valuestring), + ogs_strdup_or_assert(secondary_chf_address->valuestring), + primary_chf_set_id ? ogs_strdup_or_assert(primary_chf_set_id->valuestring) : NULL, + primary_chf_instance_id ? ogs_strdup_or_assert(primary_chf_instance_id->valuestring) : NULL, + secondary_chf_set_id ? ogs_strdup_or_assert(secondary_chf_set_id->valuestring) : NULL, + secondary_chf_instance_id ? ogs_strdup_or_assert(secondary_chf_instance_id->valuestring) : NULL ); return charging_information_local_var; diff --git a/lib/sbi/openapi/model/chf_info.c b/lib/sbi/openapi/model/chf_info.c index c5a2d41251..d450cb0e95 100644 --- a/lib/sbi/openapi/model/chf_info.c +++ b/lib/sbi/openapi/model/chf_info.c @@ -211,7 +211,7 @@ OpenAPI_chf_info_t *OpenAPI_chf_info_parseFromJSON(cJSON *chf_infoJSON) supi_range_list ? supi_range_listList : NULL, gpsi_range_list ? gpsi_range_listList : NULL, plmn_range_list ? plmn_range_listList : NULL, - group_id ? ogs_strdup(group_id->valuestring) : NULL + group_id ? ogs_strdup_or_assert(group_id->valuestring) : NULL ); return chf_info_local_var; diff --git a/lib/sbi/openapi/model/chf_service_info.c b/lib/sbi/openapi/model/chf_service_info.c index a6804cc872..abb3794b94 100644 --- a/lib/sbi/openapi/model/chf_service_info.c +++ b/lib/sbi/openapi/model/chf_service_info.c @@ -80,8 +80,8 @@ OpenAPI_chf_service_info_t *OpenAPI_chf_service_info_parseFromJSON(cJSON *chf_se } chf_service_info_local_var = OpenAPI_chf_service_info_create ( - primary_chf_service_instance ? ogs_strdup(primary_chf_service_instance->valuestring) : NULL, - secondary_chf_service_instance ? ogs_strdup(secondary_chf_service_instance->valuestring) : NULL + primary_chf_service_instance ? ogs_strdup_or_assert(primary_chf_service_instance->valuestring) : NULL, + secondary_chf_service_instance ? ogs_strdup_or_assert(secondary_chf_service_instance->valuestring) : NULL ); return chf_service_info_local_var; diff --git a/lib/sbi/openapi/model/civic_address.c b/lib/sbi/openapi/model/civic_address.c index 0ce9022750..d3bfe110d5 100644 --- a/lib/sbi/openapi/model/civic_address.c +++ b/lib/sbi/openapi/model/civic_address.c @@ -631,37 +631,37 @@ OpenAPI_civic_address_t *OpenAPI_civic_address_parseFromJSON(cJSON *civic_addres } civic_address_local_var = OpenAPI_civic_address_create ( - country ? ogs_strdup(country->valuestring) : NULL, - a1 ? ogs_strdup(a1->valuestring) : NULL, - a2 ? ogs_strdup(a2->valuestring) : NULL, - a3 ? ogs_strdup(a3->valuestring) : NULL, - a4 ? ogs_strdup(a4->valuestring) : NULL, - a5 ? ogs_strdup(a5->valuestring) : NULL, - a6 ? ogs_strdup(a6->valuestring) : NULL, - prd ? ogs_strdup(prd->valuestring) : NULL, - pod ? ogs_strdup(pod->valuestring) : NULL, - sts ? ogs_strdup(sts->valuestring) : NULL, - hno ? ogs_strdup(hno->valuestring) : NULL, - hns ? ogs_strdup(hns->valuestring) : NULL, - lmk ? ogs_strdup(lmk->valuestring) : NULL, - loc ? ogs_strdup(loc->valuestring) : NULL, - nam ? ogs_strdup(nam->valuestring) : NULL, - pc ? ogs_strdup(pc->valuestring) : NULL, - bld ? ogs_strdup(bld->valuestring) : NULL, - unit ? ogs_strdup(unit->valuestring) : NULL, - flr ? ogs_strdup(flr->valuestring) : NULL, - room ? ogs_strdup(room->valuestring) : NULL, - plc ? ogs_strdup(plc->valuestring) : NULL, - pcn ? ogs_strdup(pcn->valuestring) : NULL, - pobox ? ogs_strdup(pobox->valuestring) : NULL, - addcode ? ogs_strdup(addcode->valuestring) : NULL, - seat ? ogs_strdup(seat->valuestring) : NULL, - rd ? ogs_strdup(rd->valuestring) : NULL, - rdsec ? ogs_strdup(rdsec->valuestring) : NULL, - rdbr ? ogs_strdup(rdbr->valuestring) : NULL, - rdsubbr ? ogs_strdup(rdsubbr->valuestring) : NULL, - prm ? ogs_strdup(prm->valuestring) : NULL, - pom ? ogs_strdup(pom->valuestring) : NULL + country ? ogs_strdup_or_assert(country->valuestring) : NULL, + a1 ? ogs_strdup_or_assert(a1->valuestring) : NULL, + a2 ? ogs_strdup_or_assert(a2->valuestring) : NULL, + a3 ? ogs_strdup_or_assert(a3->valuestring) : NULL, + a4 ? ogs_strdup_or_assert(a4->valuestring) : NULL, + a5 ? ogs_strdup_or_assert(a5->valuestring) : NULL, + a6 ? ogs_strdup_or_assert(a6->valuestring) : NULL, + prd ? ogs_strdup_or_assert(prd->valuestring) : NULL, + pod ? ogs_strdup_or_assert(pod->valuestring) : NULL, + sts ? ogs_strdup_or_assert(sts->valuestring) : NULL, + hno ? ogs_strdup_or_assert(hno->valuestring) : NULL, + hns ? ogs_strdup_or_assert(hns->valuestring) : NULL, + lmk ? ogs_strdup_or_assert(lmk->valuestring) : NULL, + loc ? ogs_strdup_or_assert(loc->valuestring) : NULL, + nam ? ogs_strdup_or_assert(nam->valuestring) : NULL, + pc ? ogs_strdup_or_assert(pc->valuestring) : NULL, + bld ? ogs_strdup_or_assert(bld->valuestring) : NULL, + unit ? ogs_strdup_or_assert(unit->valuestring) : NULL, + flr ? ogs_strdup_or_assert(flr->valuestring) : NULL, + room ? ogs_strdup_or_assert(room->valuestring) : NULL, + plc ? ogs_strdup_or_assert(plc->valuestring) : NULL, + pcn ? ogs_strdup_or_assert(pcn->valuestring) : NULL, + pobox ? ogs_strdup_or_assert(pobox->valuestring) : NULL, + addcode ? ogs_strdup_or_assert(addcode->valuestring) : NULL, + seat ? ogs_strdup_or_assert(seat->valuestring) : NULL, + rd ? ogs_strdup_or_assert(rd->valuestring) : NULL, + rdsec ? ogs_strdup_or_assert(rdsec->valuestring) : NULL, + rdbr ? ogs_strdup_or_assert(rdbr->valuestring) : NULL, + rdsubbr ? ogs_strdup_or_assert(rdsubbr->valuestring) : NULL, + prm ? ogs_strdup_or_assert(prm->valuestring) : NULL, + pom ? ogs_strdup_or_assert(pom->valuestring) : NULL ); return civic_address_local_var; diff --git a/lib/sbi/openapi/model/condition_data.c b/lib/sbi/openapi/model/condition_data.c index 6988ecff81..88080f4826 100644 --- a/lib/sbi/openapi/model/condition_data.c +++ b/lib/sbi/openapi/model/condition_data.c @@ -140,9 +140,9 @@ OpenAPI_condition_data_t *OpenAPI_condition_data_parseFromJSON(cJSON *condition_ } condition_data_local_var = OpenAPI_condition_data_create ( - ogs_strdup(cond_id->valuestring), - activation_time ? ogs_strdup(activation_time->valuestring) : NULL, - deactivation_time ? ogs_strdup(deactivation_time->valuestring) : NULL, + ogs_strdup_or_assert(cond_id->valuestring), + activation_time ? ogs_strdup_or_assert(activation_time->valuestring) : NULL, + deactivation_time ? ogs_strdup_or_assert(deactivation_time->valuestring) : NULL, access_type ? access_typeVariable : 0, rat_type ? rat_typeVariable : 0 ); diff --git a/lib/sbi/openapi/model/confirmation_data.c b/lib/sbi/openapi/model/confirmation_data.c index 1888a3800a..4392b421f0 100644 --- a/lib/sbi/openapi/model/confirmation_data.c +++ b/lib/sbi/openapi/model/confirmation_data.c @@ -62,7 +62,7 @@ OpenAPI_confirmation_data_t *OpenAPI_confirmation_data_parseFromJSON(cJSON *conf } confirmation_data_local_var = OpenAPI_confirmation_data_create ( - ogs_strdup(res_star->valuestring) + ogs_strdup_or_assert(res_star->valuestring) ); return confirmation_data_local_var; diff --git a/lib/sbi/openapi/model/confirmation_data_response.c b/lib/sbi/openapi/model/confirmation_data_response.c index f991ea1588..7a6b90d5ff 100644 --- a/lib/sbi/openapi/model/confirmation_data_response.c +++ b/lib/sbi/openapi/model/confirmation_data_response.c @@ -102,8 +102,8 @@ OpenAPI_confirmation_data_response_t *OpenAPI_confirmation_data_response_parseFr confirmation_data_response_local_var = OpenAPI_confirmation_data_response_create ( auth_resultVariable, - supi ? ogs_strdup(supi->valuestring) : NULL, - kseaf ? ogs_strdup(kseaf->valuestring) : NULL + supi ? ogs_strdup_or_assert(supi->valuestring) : NULL, + kseaf ? ogs_strdup_or_assert(kseaf->valuestring) : NULL ); return confirmation_data_response_local_var; diff --git a/lib/sbi/openapi/model/context_info.c b/lib/sbi/openapi/model/context_info.c index 82c8547878..9c4bb734ef 100644 --- a/lib/sbi/openapi/model/context_info.c +++ b/lib/sbi/openapi/model/context_info.c @@ -79,7 +79,7 @@ OpenAPI_context_info_t *OpenAPI_context_info_parseFromJSON(cJSON *context_infoJS ogs_error("OpenAPI_context_info_parseFromJSON() failed [orig_headers]"); goto end; } - OpenAPI_list_add(orig_headersList, ogs_strdup(orig_headers_local->valuestring)); + OpenAPI_list_add(orig_headersList, ogs_strdup_or_assert(orig_headers_local->valuestring)); } } diff --git a/lib/sbi/openapi/model/data_change_notify.c b/lib/sbi/openapi/model/data_change_notify.c index f4987b21ae..c4ccbff17f 100644 --- a/lib/sbi/openapi/model/data_change_notify.c +++ b/lib/sbi/openapi/model/data_change_notify.c @@ -183,7 +183,7 @@ OpenAPI_data_change_notify_t *OpenAPI_data_change_notify_parseFromJSON(cJSON *da ogs_error("OpenAPI_data_change_notify_parseFromJSON() failed [original_callback_reference]"); goto end; } - OpenAPI_list_add(original_callback_referenceList, ogs_strdup(original_callback_reference_local->valuestring)); + OpenAPI_list_add(original_callback_referenceList, ogs_strdup_or_assert(original_callback_reference_local->valuestring)); } } @@ -274,7 +274,7 @@ OpenAPI_data_change_notify_t *OpenAPI_data_change_notify_parseFromJSON(cJSON *da data_change_notify_local_var = OpenAPI_data_change_notify_create ( original_callback_reference ? original_callback_referenceList : NULL, - ue_id ? ogs_strdup(ue_id->valuestring) : NULL, + ue_id ? ogs_strdup_or_assert(ue_id->valuestring) : NULL, notify_items ? notify_itemsList : NULL, sdm_subscription ? sdm_subscription_local_nonprim : NULL, additional_sdm_subscriptions ? additional_sdm_subscriptionsList : NULL, diff --git a/lib/sbi/openapi/model/data_filter.c b/lib/sbi/openapi/model/data_filter.c index 677231fdb3..06ad82fdcd 100644 --- a/lib/sbi/openapi/model/data_filter.c +++ b/lib/sbi/openapi/model/data_filter.c @@ -261,7 +261,7 @@ OpenAPI_data_filter_t *OpenAPI_data_filter_parseFromJSON(cJSON *data_filterJSON) ogs_error("OpenAPI_data_filter_parseFromJSON() failed [dnns]"); goto end; } - OpenAPI_list_add(dnnsList, ogs_strdup(dnns_local->valuestring)); + OpenAPI_list_add(dnnsList, ogs_strdup_or_assert(dnns_local->valuestring)); } } @@ -304,7 +304,7 @@ OpenAPI_data_filter_t *OpenAPI_data_filter_parseFromJSON(cJSON *data_filterJSON) ogs_error("OpenAPI_data_filter_parseFromJSON() failed [internal_group_ids]"); goto end; } - OpenAPI_list_add(internal_group_idsList, ogs_strdup(internal_group_ids_local->valuestring)); + OpenAPI_list_add(internal_group_idsList, ogs_strdup_or_assert(internal_group_ids_local->valuestring)); } } @@ -324,7 +324,7 @@ OpenAPI_data_filter_t *OpenAPI_data_filter_parseFromJSON(cJSON *data_filterJSON) ogs_error("OpenAPI_data_filter_parseFromJSON() failed [supis]"); goto end; } - OpenAPI_list_add(supisList, ogs_strdup(supis_local->valuestring)); + OpenAPI_list_add(supisList, ogs_strdup_or_assert(supis_local->valuestring)); } } @@ -344,7 +344,7 @@ OpenAPI_data_filter_t *OpenAPI_data_filter_parseFromJSON(cJSON *data_filterJSON) ogs_error("OpenAPI_data_filter_parseFromJSON() failed [app_ids]"); goto end; } - OpenAPI_list_add(app_idsList, ogs_strdup(app_ids_local->valuestring)); + OpenAPI_list_add(app_idsList, ogs_strdup_or_assert(app_ids_local->valuestring)); } } @@ -364,7 +364,7 @@ OpenAPI_data_filter_t *OpenAPI_data_filter_parseFromJSON(cJSON *data_filterJSON) ogs_error("OpenAPI_data_filter_parseFromJSON() failed [ue_ipv4s]"); goto end; } - OpenAPI_list_add(ue_ipv4sList, ogs_strdup(ue_ipv4s_local->valuestring)); + OpenAPI_list_add(ue_ipv4sList, ogs_strdup_or_assert(ue_ipv4s_local->valuestring)); } } @@ -384,7 +384,7 @@ OpenAPI_data_filter_t *OpenAPI_data_filter_parseFromJSON(cJSON *data_filterJSON) ogs_error("OpenAPI_data_filter_parseFromJSON() failed [ue_ipv6s]"); goto end; } - OpenAPI_list_add(ue_ipv6sList, ogs_strdup(ue_ipv6s_local->valuestring)); + OpenAPI_list_add(ue_ipv6sList, ogs_strdup_or_assert(ue_ipv6s_local->valuestring)); } } @@ -404,7 +404,7 @@ OpenAPI_data_filter_t *OpenAPI_data_filter_parseFromJSON(cJSON *data_filterJSON) ogs_error("OpenAPI_data_filter_parseFromJSON() failed [ue_macs]"); goto end; } - OpenAPI_list_add(ue_macsList, ogs_strdup(ue_macs_local->valuestring)); + OpenAPI_list_add(ue_macsList, ogs_strdup_or_assert(ue_macs_local->valuestring)); } } diff --git a/lib/sbi/openapi/model/datalink_reporting_configuration.c b/lib/sbi/openapi/model/datalink_reporting_configuration.c index d71047d43a..bced532356 100644 --- a/lib/sbi/openapi/model/datalink_reporting_configuration.c +++ b/lib/sbi/openapi/model/datalink_reporting_configuration.c @@ -174,7 +174,7 @@ OpenAPI_datalink_reporting_configuration_t *OpenAPI_datalink_reporting_configura datalink_reporting_configuration_local_var = OpenAPI_datalink_reporting_configuration_create ( ddd_traffic_des ? ddd_traffic_desList : NULL, - dnn ? ogs_strdup(dnn->valuestring) : NULL, + dnn ? ogs_strdup_or_assert(dnn->valuestring) : NULL, slice ? slice_local_nonprim : NULL, ddd_status_list ? ddd_status_listList : NULL ); diff --git a/lib/sbi/openapi/model/ddd_traffic_descriptor.c b/lib/sbi/openapi/model/ddd_traffic_descriptor.c index 2be0b32370..fb7379871b 100644 --- a/lib/sbi/openapi/model/ddd_traffic_descriptor.c +++ b/lib/sbi/openapi/model/ddd_traffic_descriptor.c @@ -117,10 +117,10 @@ OpenAPI_ddd_traffic_descriptor_t *OpenAPI_ddd_traffic_descriptor_parseFromJSON(c } ddd_traffic_descriptor_local_var = OpenAPI_ddd_traffic_descriptor_create ( - ipv4_addr ? ogs_strdup(ipv4_addr->valuestring) : NULL, - ipv6_addr ? ogs_strdup(ipv6_addr->valuestring) : NULL, + ipv4_addr ? ogs_strdup_or_assert(ipv4_addr->valuestring) : NULL, + ipv6_addr ? ogs_strdup_or_assert(ipv6_addr->valuestring) : NULL, port_number ? port_number->valuedouble : 0, - mac_addr ? ogs_strdup(mac_addr->valuestring) : NULL + mac_addr ? ogs_strdup_or_assert(mac_addr->valuestring) : NULL ); return ddd_traffic_descriptor_local_var; diff --git a/lib/sbi/openapi/model/ddn_failure_sub_info.c b/lib/sbi/openapi/model/ddn_failure_sub_info.c index 5db3aa30ca..cbd3504916 100644 --- a/lib/sbi/openapi/model/ddn_failure_sub_info.c +++ b/lib/sbi/openapi/model/ddn_failure_sub_info.c @@ -111,7 +111,7 @@ OpenAPI_ddn_failure_sub_info_t *OpenAPI_ddn_failure_sub_info_parseFromJSON(cJSON } ddn_failure_sub_info_local_var = OpenAPI_ddn_failure_sub_info_create ( - ogs_strdup(notify_correlation_id->valuestring), + ogs_strdup_or_assert(notify_correlation_id->valuestring), ddd_traffic_descriptor_list ? ddd_traffic_descriptor_listList : NULL ); diff --git a/lib/sbi/openapi/model/default_notification_subscription.c b/lib/sbi/openapi/model/default_notification_subscription.c index 14b208b603..db14bf507e 100644 --- a/lib/sbi/openapi/model/default_notification_subscription.c +++ b/lib/sbi/openapi/model/default_notification_subscription.c @@ -170,7 +170,7 @@ OpenAPI_default_notification_subscription_t *OpenAPI_default_notification_subscr ogs_error("OpenAPI_default_notification_subscription_parseFromJSON() failed [versions]"); goto end; } - OpenAPI_list_add(versionsList, ogs_strdup(versions_local->valuestring)); + OpenAPI_list_add(versionsList, ogs_strdup_or_assert(versions_local->valuestring)); } } @@ -185,11 +185,11 @@ OpenAPI_default_notification_subscription_t *OpenAPI_default_notification_subscr default_notification_subscription_local_var = OpenAPI_default_notification_subscription_create ( notification_typeVariable, - ogs_strdup(callback_uri->valuestring), + ogs_strdup_or_assert(callback_uri->valuestring), n1_message_class ? n1_message_classVariable : 0, n2_information_class ? n2_information_classVariable : 0, versions ? versionsList : NULL, - binding ? ogs_strdup(binding->valuestring) : NULL + binding ? ogs_strdup_or_assert(binding->valuestring) : NULL ); return default_notification_subscription_local_var; diff --git a/lib/sbi/openapi/model/default_unrelated_class.c b/lib/sbi/openapi/model/default_unrelated_class.c index 292577bac1..6bb2e5b288 100644 --- a/lib/sbi/openapi/model/default_unrelated_class.c +++ b/lib/sbi/openapi/model/default_unrelated_class.c @@ -191,7 +191,7 @@ OpenAPI_default_unrelated_class_t *OpenAPI_default_unrelated_class_parseFromJSON ogs_error("OpenAPI_default_unrelated_class_parseFromJSON() failed [code_word_list]"); goto end; } - OpenAPI_list_add(code_word_listList, ogs_strdup(code_word_list_local->valuestring)); + OpenAPI_list_add(code_word_listList, ogs_strdup_or_assert(code_word_list_local->valuestring)); } } diff --git a/lib/sbi/openapi/model/deregistration_data.c b/lib/sbi/openapi/model/deregistration_data.c index 5c7cbb87f8..781d2839e9 100644 --- a/lib/sbi/openapi/model/deregistration_data.c +++ b/lib/sbi/openapi/model/deregistration_data.c @@ -123,7 +123,7 @@ OpenAPI_deregistration_data_t *OpenAPI_deregistration_data_parseFromJSON(cJSON * dereg_reasonVariable, access_type ? access_typeVariable : 0, pdu_session_id ? pdu_session_id->valuedouble : 0, - new_smf_instance_id ? ogs_strdup(new_smf_instance_id->valuestring) : NULL + new_smf_instance_id ? ogs_strdup_or_assert(new_smf_instance_id->valuestring) : NULL ); return deregistration_data_local_var; diff --git a/lib/sbi/openapi/model/dnai_information.c b/lib/sbi/openapi/model/dnai_information.c index 92ed9ca282..84cd94f6a2 100644 --- a/lib/sbi/openapi/model/dnai_information.c +++ b/lib/sbi/openapi/model/dnai_information.c @@ -98,7 +98,7 @@ OpenAPI_dnai_information_t *OpenAPI_dnai_information_parseFromJSON(cJSON *dnai_i } dnai_information_local_var = OpenAPI_dnai_information_create ( - ogs_strdup(dnai->valuestring), + ogs_strdup_or_assert(dnai->valuestring), no_dnai_change_ind ? no_dnai_change_ind->valueint : 0, no_local_psa_change_ind ? no_local_psa_change_ind->valueint : 0 ); diff --git a/lib/sbi/openapi/model/dnn_configuration.c b/lib/sbi/openapi/model/dnn_configuration.c index 6e06baf427..017bfe8db1 100644 --- a/lib/sbi/openapi/model/dnn_configuration.c +++ b/lib/sbi/openapi/model/dnn_configuration.c @@ -528,11 +528,11 @@ OpenAPI_dnn_configuration_t *OpenAPI_dnn_configuration_parseFromJSON(cJSON *dnn_ iwk_eps_ind ? iwk_eps_ind->valueint : 0, _5g_qos_profile ? _5g_qos_profile_local_nonprim : NULL, session_ambr ? session_ambr_local_nonprim : NULL, - _3gpp_charging_characteristics ? ogs_strdup(_3gpp_charging_characteristics->valuestring) : NULL, + _3gpp_charging_characteristics ? ogs_strdup_or_assert(_3gpp_charging_characteristics->valuestring) : NULL, static_ip_address ? static_ip_addressList : NULL, up_security ? up_security_local_nonprim : NULL, pdu_session_continuity_ind ? pdu_session_continuity_indVariable : 0, - nidd_nef_id ? ogs_strdup(nidd_nef_id->valuestring) : NULL, + nidd_nef_id ? ogs_strdup_or_assert(nidd_nef_id->valuestring) : NULL, nidd_info ? nidd_info_local_nonprim : NULL, redundant_session_allowed ? redundant_session_allowed->valueint : 0, acs_info ? acs_info_local_nonprim : NULL, diff --git a/lib/sbi/openapi/model/dnn_info.c b/lib/sbi/openapi/model/dnn_info.c index a96140db2b..14ed450d4b 100644 --- a/lib/sbi/openapi/model/dnn_info.c +++ b/lib/sbi/openapi/model/dnn_info.c @@ -198,7 +198,7 @@ OpenAPI_dnn_info_t *OpenAPI_dnn_info_parseFromJSON(cJSON *dnn_infoJSON) ogs_error("OpenAPI_dnn_info_parseFromJSON() failed [smf_list]"); goto end; } - OpenAPI_list_add(smf_listList, ogs_strdup(smf_list_local->valuestring)); + OpenAPI_list_add(smf_listList, ogs_strdup_or_assert(smf_list_local->valuestring)); } } @@ -212,7 +212,7 @@ OpenAPI_dnn_info_t *OpenAPI_dnn_info_parseFromJSON(cJSON *dnn_infoJSON) } dnn_info_local_var = OpenAPI_dnn_info_create ( - ogs_strdup(dnn->valuestring), + ogs_strdup_or_assert(dnn->valuestring), default_dnn_indicator ? default_dnn_indicator->valueint : 0, lbo_roaming_allowed ? lbo_roaming_allowed->valueint : 0, iwk_eps_ind ? iwk_eps_ind->valueint : 0, diff --git a/lib/sbi/openapi/model/dnn_route_selection_descriptor.c b/lib/sbi/openapi/model/dnn_route_selection_descriptor.c index 8f37c785c9..0b9a7bde47 100644 --- a/lib/sbi/openapi/model/dnn_route_selection_descriptor.c +++ b/lib/sbi/openapi/model/dnn_route_selection_descriptor.c @@ -142,7 +142,7 @@ OpenAPI_dnn_route_selection_descriptor_t *OpenAPI_dnn_route_selection_descriptor } dnn_route_selection_descriptor_local_var = OpenAPI_dnn_route_selection_descriptor_create ( - ogs_strdup(dnn->valuestring), + ogs_strdup_or_assert(dnn->valuestring), ssc_modes ? ssc_modesList : NULL, pdu_sess_types ? pdu_sess_typesList : NULL ); diff --git a/lib/sbi/openapi/model/dnn_smf_info_item.c b/lib/sbi/openapi/model/dnn_smf_info_item.c index 2d9a4fae44..780a877854 100644 --- a/lib/sbi/openapi/model/dnn_smf_info_item.c +++ b/lib/sbi/openapi/model/dnn_smf_info_item.c @@ -62,7 +62,7 @@ OpenAPI_dnn_smf_info_item_t *OpenAPI_dnn_smf_info_item_parseFromJSON(cJSON *dnn_ } dnn_smf_info_item_local_var = OpenAPI_dnn_smf_info_item_create ( - ogs_strdup(dnn->valuestring) + ogs_strdup_or_assert(dnn->valuestring) ); return dnn_smf_info_item_local_var; diff --git a/lib/sbi/openapi/model/dnn_upf_info_item.c b/lib/sbi/openapi/model/dnn_upf_info_item.c index b513114d44..ae5e5a6895 100644 --- a/lib/sbi/openapi/model/dnn_upf_info_item.c +++ b/lib/sbi/openapi/model/dnn_upf_info_item.c @@ -169,7 +169,7 @@ OpenAPI_dnn_upf_info_item_t *OpenAPI_dnn_upf_info_item_parseFromJSON(cJSON *dnn_ ogs_error("OpenAPI_dnn_upf_info_item_parseFromJSON() failed [dnai_list]"); goto end; } - OpenAPI_list_add(dnai_listList, ogs_strdup(dnai_list_local->valuestring)); + OpenAPI_list_add(dnai_listList, ogs_strdup_or_assert(dnai_list_local->valuestring)); } } @@ -242,7 +242,7 @@ OpenAPI_dnn_upf_info_item_t *OpenAPI_dnn_upf_info_item_parseFromJSON(cJSON *dnn_ } dnn_upf_info_item_local_var = OpenAPI_dnn_upf_info_item_create ( - ogs_strdup(dnn->valuestring), + ogs_strdup_or_assert(dnn->valuestring), dnai_list ? dnai_listList : NULL, pdu_session_types ? pdu_session_typesList : NULL, ipv4_address_ranges ? ipv4_address_rangesList : NULL, diff --git a/lib/sbi/openapi/model/dynamic5_qi.c b/lib/sbi/openapi/model/dynamic5_qi.c index 8482910ce5..21a306e6c2 100644 --- a/lib/sbi/openapi/model/dynamic5_qi.c +++ b/lib/sbi/openapi/model/dynamic5_qi.c @@ -235,7 +235,7 @@ OpenAPI_dynamic5_qi_t *OpenAPI_dynamic5_qi_parseFromJSON(cJSON *dynamic5_qiJSON) resource_type_local_nonprim, priority_level->valuedouble, packet_delay_budget->valuedouble, - ogs_strdup(packet_err_rate->valuestring), + ogs_strdup_or_assert(packet_err_rate->valuestring), aver_window ? aver_window->valuedouble : 0, max_data_burst_vol ? max_data_burst_vol->valuedouble : 0, ext_max_data_burst_vol ? ext_max_data_burst_vol->valuedouble : 0, diff --git a/lib/sbi/openapi/model/eap_session.c b/lib/sbi/openapi/model/eap_session.c index 769fb076c7..b35ed12f70 100644 --- a/lib/sbi/openapi/model/eap_session.c +++ b/lib/sbi/openapi/model/eap_session.c @@ -172,11 +172,11 @@ OpenAPI_eap_session_t *OpenAPI_eap_session_parseFromJSON(cJSON *eap_sessionJSON) } eap_session_local_var = OpenAPI_eap_session_create ( - ogs_strdup(eap_payload->valuestring), - k_seaf ? ogs_strdup(k_seaf->valuestring) : NULL, + ogs_strdup_or_assert(eap_payload->valuestring), + k_seaf ? ogs_strdup_or_assert(k_seaf->valuestring) : NULL, _links ? _linksList : NULL, auth_result ? auth_resultVariable : 0, - supi ? ogs_strdup(supi->valuestring) : NULL + supi ? ogs_strdup_or_assert(supi->valuestring) : NULL ); return eap_session_local_var; diff --git a/lib/sbi/openapi/model/ec_restriction.c b/lib/sbi/openapi/model/ec_restriction.c index c5e0baa66d..46967fc1dc 100644 --- a/lib/sbi/openapi/model/ec_restriction.c +++ b/lib/sbi/openapi/model/ec_restriction.c @@ -149,10 +149,10 @@ OpenAPI_ec_restriction_t *OpenAPI_ec_restriction_parseFromJSON(cJSON *ec_restric } ec_restriction_local_var = OpenAPI_ec_restriction_create ( - ogs_strdup(af_instance_id->valuestring), + ogs_strdup_or_assert(af_instance_id->valuestring), reference_id->valuedouble, plmn_ec_infos ? plmn_ec_infosList : NULL, - mtc_provider_information ? ogs_strdup(mtc_provider_information->valuestring) : NULL + mtc_provider_information ? ogs_strdup_or_assert(mtc_provider_information->valuestring) : NULL ); return ec_restriction_local_var; diff --git a/lib/sbi/openapi/model/ecgi.c b/lib/sbi/openapi/model/ecgi.c index 8af710267a..b69a7e94e4 100644 --- a/lib/sbi/openapi/model/ecgi.c +++ b/lib/sbi/openapi/model/ecgi.c @@ -106,8 +106,8 @@ OpenAPI_ecgi_t *OpenAPI_ecgi_parseFromJSON(cJSON *ecgiJSON) ecgi_local_var = OpenAPI_ecgi_create ( plmn_id_local_nonprim, - ogs_strdup(eutra_cell_id->valuestring), - nid ? ogs_strdup(nid->valuestring) : NULL + ogs_strdup_or_assert(eutra_cell_id->valuestring), + nid ? ogs_strdup_or_assert(nid->valuestring) : NULL ); return ecgi_local_var; diff --git a/lib/sbi/openapi/model/edrx_parameters.c b/lib/sbi/openapi/model/edrx_parameters.c index 55ba3d3614..80ca2198c7 100644 --- a/lib/sbi/openapi/model/edrx_parameters.c +++ b/lib/sbi/openapi/model/edrx_parameters.c @@ -84,7 +84,7 @@ OpenAPI_edrx_parameters_t *OpenAPI_edrx_parameters_parseFromJSON(cJSON *edrx_par edrx_parameters_local_var = OpenAPI_edrx_parameters_create ( rat_typeVariable, - ogs_strdup(edrx_value->valuestring) + ogs_strdup_or_assert(edrx_value->valuestring) ); return edrx_parameters_local_var; diff --git a/lib/sbi/openapi/model/ee_profile_data.c b/lib/sbi/openapi/model/ee_profile_data.c index 79efd8ca9d..db88472a73 100644 --- a/lib/sbi/openapi/model/ee_profile_data.c +++ b/lib/sbi/openapi/model/ee_profile_data.c @@ -111,7 +111,7 @@ OpenAPI_ee_profile_data_t *OpenAPI_ee_profile_data_parseFromJSON(cJSON *ee_profi ee_profile_data_local_var = OpenAPI_ee_profile_data_create ( restricted_event_types ? restricted_event_typesList : NULL, - supported_features ? ogs_strdup(supported_features->valuestring) : NULL + supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL ); return ee_profile_data_local_var; diff --git a/lib/sbi/openapi/model/ee_subscription.c b/lib/sbi/openapi/model/ee_subscription.c index 818518a023..e81be8dd51 100644 --- a/lib/sbi/openapi/model/ee_subscription.c +++ b/lib/sbi/openapi/model/ee_subscription.c @@ -274,16 +274,16 @@ OpenAPI_ee_subscription_t *OpenAPI_ee_subscription_parseFromJSON(cJSON *ee_subsc } ee_subscription_local_var = OpenAPI_ee_subscription_create ( - ogs_strdup(callback_reference->valuestring), + ogs_strdup_or_assert(callback_reference->valuestring), monitoring_configurationsList, reporting_options ? reporting_options_local_nonprim : NULL, - supported_features ? ogs_strdup(supported_features->valuestring) : NULL, - subscription_id ? ogs_strdup(subscription_id->valuestring) : NULL, + supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL, + subscription_id ? ogs_strdup_or_assert(subscription_id->valuestring) : NULL, context_info ? context_info_local_nonprim : NULL, epc_applied_ind ? epc_applied_ind->valueint : 0, - scef_diam_host ? ogs_strdup(scef_diam_host->valuestring) : NULL, - scef_diam_realm ? ogs_strdup(scef_diam_realm->valuestring) : NULL, - notify_correlation_id ? ogs_strdup(notify_correlation_id->valuestring) : NULL + scef_diam_host ? ogs_strdup_or_assert(scef_diam_host->valuestring) : NULL, + scef_diam_realm ? ogs_strdup_or_assert(scef_diam_realm->valuestring) : NULL, + notify_correlation_id ? ogs_strdup_or_assert(notify_correlation_id->valuestring) : NULL ); return ee_subscription_local_var; diff --git a/lib/sbi/openapi/model/emergency_info.c b/lib/sbi/openapi/model/emergency_info.c index c52332103f..514fd2846b 100644 --- a/lib/sbi/openapi/model/emergency_info.c +++ b/lib/sbi/openapi/model/emergency_info.c @@ -121,9 +121,9 @@ OpenAPI_emergency_info_t *OpenAPI_emergency_info_parseFromJSON(cJSON *emergency_ } emergency_info_local_var = OpenAPI_emergency_info_create ( - pgw_fqdn ? ogs_strdup(pgw_fqdn->valuestring) : NULL, + pgw_fqdn ? ogs_strdup_or_assert(pgw_fqdn->valuestring) : NULL, pgw_ip_address ? pgw_ip_address_local_nonprim : NULL, - smf_instance_id ? ogs_strdup(smf_instance_id->valuestring) : NULL, + smf_instance_id ? ogs_strdup_or_assert(smf_instance_id->valuestring) : NULL, epdg_ind ? epdg_ind->valueint : 0 ); diff --git a/lib/sbi/openapi/model/eps_iwk_pgw.c b/lib/sbi/openapi/model/eps_iwk_pgw.c index 6023b32ddf..cca03dee22 100644 --- a/lib/sbi/openapi/model/eps_iwk_pgw.c +++ b/lib/sbi/openapi/model/eps_iwk_pgw.c @@ -82,8 +82,8 @@ OpenAPI_eps_iwk_pgw_t *OpenAPI_eps_iwk_pgw_parseFromJSON(cJSON *eps_iwk_pgwJSON) } eps_iwk_pgw_local_var = OpenAPI_eps_iwk_pgw_create ( - ogs_strdup(pgw_fqdn->valuestring), - ogs_strdup(smf_instance_id->valuestring) + ogs_strdup_or_assert(pgw_fqdn->valuestring), + ogs_strdup_or_assert(smf_instance_id->valuestring) ); return eps_iwk_pgw_local_var; diff --git a/lib/sbi/openapi/model/eth_flow_description.c b/lib/sbi/openapi/model/eth_flow_description.c index f47cdb4a80..b50294dc9a 100644 --- a/lib/sbi/openapi/model/eth_flow_description.c +++ b/lib/sbi/openapi/model/eth_flow_description.c @@ -196,7 +196,7 @@ OpenAPI_eth_flow_description_t *OpenAPI_eth_flow_description_parseFromJSON(cJSON ogs_error("OpenAPI_eth_flow_description_parseFromJSON() failed [vlan_tags]"); goto end; } - OpenAPI_list_add(vlan_tagsList, ogs_strdup(vlan_tags_local->valuestring)); + OpenAPI_list_add(vlan_tagsList, ogs_strdup_or_assert(vlan_tags_local->valuestring)); } } @@ -219,14 +219,14 @@ OpenAPI_eth_flow_description_t *OpenAPI_eth_flow_description_parseFromJSON(cJSON } eth_flow_description_local_var = OpenAPI_eth_flow_description_create ( - dest_mac_addr ? ogs_strdup(dest_mac_addr->valuestring) : NULL, - ogs_strdup(eth_type->valuestring), - f_desc ? ogs_strdup(f_desc->valuestring) : NULL, + dest_mac_addr ? ogs_strdup_or_assert(dest_mac_addr->valuestring) : NULL, + ogs_strdup_or_assert(eth_type->valuestring), + f_desc ? ogs_strdup_or_assert(f_desc->valuestring) : NULL, f_dir ? f_dirVariable : 0, - source_mac_addr ? ogs_strdup(source_mac_addr->valuestring) : NULL, + source_mac_addr ? ogs_strdup_or_assert(source_mac_addr->valuestring) : NULL, vlan_tags ? vlan_tagsList : NULL, - src_mac_addr_end ? ogs_strdup(src_mac_addr_end->valuestring) : NULL, - dest_mac_addr_end ? ogs_strdup(dest_mac_addr_end->valuestring) : NULL + src_mac_addr_end ? ogs_strdup_or_assert(src_mac_addr_end->valuestring) : NULL, + dest_mac_addr_end ? ogs_strdup_or_assert(dest_mac_addr_end->valuestring) : NULL ); return eth_flow_description_local_var; diff --git a/lib/sbi/openapi/model/eutra_location.c b/lib/sbi/openapi/model/eutra_location.c index cf17fd2c31..53cd360e34 100644 --- a/lib/sbi/openapi/model/eutra_location.c +++ b/lib/sbi/openapi/model/eutra_location.c @@ -233,9 +233,9 @@ OpenAPI_eutra_location_t *OpenAPI_eutra_location_parseFromJSON(cJSON *eutra_loca ecgi_local_nonprim, ignore_ecgi ? ignore_ecgi->valueint : 0, age_of_location_information ? age_of_location_information->valuedouble : 0, - ue_location_timestamp ? ogs_strdup(ue_location_timestamp->valuestring) : NULL, - geographical_information ? ogs_strdup(geographical_information->valuestring) : NULL, - geodetic_information ? ogs_strdup(geodetic_information->valuestring) : NULL, + ue_location_timestamp ? ogs_strdup_or_assert(ue_location_timestamp->valuestring) : NULL, + geographical_information ? ogs_strdup_or_assert(geographical_information->valuestring) : NULL, + geodetic_information ? ogs_strdup_or_assert(geodetic_information->valuestring) : NULL, global_ngenb_id ? global_ngenb_id_local_nonprim : NULL, global_e_nb_id ? global_e_nb_id_local_nonprim : NULL ); diff --git a/lib/sbi/openapi/model/events_notification.c b/lib/sbi/openapi/model/events_notification.c index 89a6ef842d..c8bf6d60a6 100644 --- a/lib/sbi/openapi/model/events_notification.c +++ b/lib/sbi/openapi/model/events_notification.c @@ -697,7 +697,7 @@ OpenAPI_events_notification_t *OpenAPI_events_notification_parseFromJSON(cJSON * an_charg_addr ? an_charg_addr_local_nonprim : NULL, an_charg_ids ? an_charg_idsList : NULL, an_gw_addr ? an_gw_addr_local_nonprim : NULL, - ogs_strdup(ev_subs_uri->valuestring), + ogs_strdup_or_assert(ev_subs_uri->valuestring), ev_notifsList, failed_resourc_alloc_reports ? failed_resourc_alloc_reportsList : NULL, no_net_loc_supp ? no_net_loc_supp->valueint : 0, @@ -708,7 +708,7 @@ OpenAPI_events_notification_t *OpenAPI_events_notification_parseFromJSON(cJSON * ran_nas_rel_causes ? ran_nas_rel_causesList : NULL, rat_type ? rat_typeVariable : 0, ue_loc ? ue_loc_local_nonprim : NULL, - ue_time_zone ? ogs_strdup(ue_time_zone->valuestring) : NULL, + ue_time_zone ? ogs_strdup_or_assert(ue_time_zone->valuestring) : NULL, usg_rep ? usg_rep_local_nonprim : NULL, tsn_bridge_info ? tsn_bridge_info_local_nonprim : NULL, tsn_port_man_cont_dstt ? tsn_port_man_cont_dstt_local_nonprim : NULL, diff --git a/lib/sbi/openapi/model/events_subsc_req_data.c b/lib/sbi/openapi/model/events_subsc_req_data.c index 2a8d10099e..3309d0108f 100644 --- a/lib/sbi/openapi/model/events_subsc_req_data.c +++ b/lib/sbi/openapi/model/events_subsc_req_data.c @@ -237,12 +237,12 @@ OpenAPI_events_subsc_req_data_t *OpenAPI_events_subsc_req_data_parseFromJSON(cJS events_subsc_req_data_local_var = OpenAPI_events_subsc_req_data_create ( eventsList, - notif_uri ? ogs_strdup(notif_uri->valuestring) : NULL, + notif_uri ? ogs_strdup_or_assert(notif_uri->valuestring) : NULL, req_qos_mon_params ? req_qos_mon_paramsList : NULL, qos_mon ? qos_mon_local_nonprim : NULL, req_ani ? req_aniVariable : 0, usg_thres ? usg_thres_local_nonprim : NULL, - notif_corre_id ? ogs_strdup(notif_corre_id->valuestring) : NULL + notif_corre_id ? ogs_strdup_or_assert(notif_corre_id->valuestring) : NULL ); return events_subsc_req_data_local_var; diff --git a/lib/sbi/openapi/model/events_subsc_req_data_rm.c b/lib/sbi/openapi/model/events_subsc_req_data_rm.c index 4600066ef2..24647eca6a 100644 --- a/lib/sbi/openapi/model/events_subsc_req_data_rm.c +++ b/lib/sbi/openapi/model/events_subsc_req_data_rm.c @@ -237,12 +237,12 @@ OpenAPI_events_subsc_req_data_rm_t *OpenAPI_events_subsc_req_data_rm_parseFromJS events_subsc_req_data_rm_local_var = OpenAPI_events_subsc_req_data_rm_create ( eventsList, - notif_uri ? ogs_strdup(notif_uri->valuestring) : NULL, + notif_uri ? ogs_strdup_or_assert(notif_uri->valuestring) : NULL, req_qos_mon_params ? req_qos_mon_paramsList : NULL, qos_mon ? qos_mon_local_nonprim : NULL, req_ani ? req_aniVariable : 0, usg_thres ? usg_thres_local_nonprim : NULL, - notif_corre_id ? ogs_strdup(notif_corre_id->valuestring) : NULL + notif_corre_id ? ogs_strdup_or_assert(notif_corre_id->valuestring) : NULL ); return events_subsc_req_data_rm_local_var; diff --git a/lib/sbi/openapi/model/expected_ue_behavior.c b/lib/sbi/openapi/model/expected_ue_behavior.c index c55ef40493..e03c04a05f 100644 --- a/lib/sbi/openapi/model/expected_ue_behavior.c +++ b/lib/sbi/openapi/model/expected_ue_behavior.c @@ -113,7 +113,7 @@ OpenAPI_expected_ue_behavior_t *OpenAPI_expected_ue_behavior_parseFromJSON(cJSON expected_ue_behavior_local_var = OpenAPI_expected_ue_behavior_create ( exp_move_trajectoryList, - ogs_strdup(validity_time->valuestring) + ogs_strdup_or_assert(validity_time->valuestring) ); return expected_ue_behavior_local_var; diff --git a/lib/sbi/openapi/model/expected_ue_behaviour.c b/lib/sbi/openapi/model/expected_ue_behaviour.c index 439a7816e4..d25f1c1f7c 100644 --- a/lib/sbi/openapi/model/expected_ue_behaviour.c +++ b/lib/sbi/openapi/model/expected_ue_behaviour.c @@ -319,7 +319,7 @@ OpenAPI_expected_ue_behaviour_t *OpenAPI_expected_ue_behaviour_parseFromJSON(cJS } expected_ue_behaviour_local_var = OpenAPI_expected_ue_behaviour_create ( - ogs_strdup(af_instance_id->valuestring), + ogs_strdup_or_assert(af_instance_id->valuestring), reference_id->valuedouble, stationary_indication ? stationary_indication_local_nonprim : NULL, communication_duration_time ? communication_duration_time->valuedouble : 0, @@ -329,8 +329,8 @@ OpenAPI_expected_ue_behaviour_t *OpenAPI_expected_ue_behaviour_parseFromJSON(cJS expected_umts ? expected_umtsList : NULL, traffic_profile ? traffic_profile_local_nonprim : NULL, battery_indication ? battery_indication_local_nonprim : NULL, - validity_time ? ogs_strdup(validity_time->valuestring) : NULL, - mtc_provider_information ? ogs_strdup(mtc_provider_information->valuestring) : NULL + validity_time ? ogs_strdup_or_assert(validity_time->valuestring) : NULL, + mtc_provider_information ? ogs_strdup_or_assert(mtc_provider_information->valuestring) : NULL ); return expected_ue_behaviour_local_var; diff --git a/lib/sbi/openapi/model/expected_ue_behaviour_data.c b/lib/sbi/openapi/model/expected_ue_behaviour_data.c index 677418b4c7..3ea01cf172 100644 --- a/lib/sbi/openapi/model/expected_ue_behaviour_data.c +++ b/lib/sbi/openapi/model/expected_ue_behaviour_data.c @@ -260,7 +260,7 @@ OpenAPI_expected_ue_behaviour_data_t *OpenAPI_expected_ue_behaviour_data_parseFr expected_umts ? expected_umtsList : NULL, traffic_profile ? traffic_profileVariable : 0, battery_indication ? battery_indication_local_nonprim : NULL, - validity_time ? ogs_strdup(validity_time->valuestring) : NULL + validity_time ? ogs_strdup_or_assert(validity_time->valuestring) : NULL ); return expected_ue_behaviour_data_local_var; diff --git a/lib/sbi/openapi/model/exposure_data_change_notification.c b/lib/sbi/openapi/model/exposure_data_change_notification.c index dc0a5c7d40..36676265a1 100644 --- a/lib/sbi/openapi/model/exposure_data_change_notification.c +++ b/lib/sbi/openapi/model/exposure_data_change_notification.c @@ -170,12 +170,12 @@ OpenAPI_exposure_data_change_notification_t *OpenAPI_exposure_data_change_notifi ogs_error("OpenAPI_exposure_data_change_notification_parseFromJSON() failed [del_resources]"); goto end; } - OpenAPI_list_add(del_resourcesList, ogs_strdup(del_resources_local->valuestring)); + OpenAPI_list_add(del_resourcesList, ogs_strdup_or_assert(del_resources_local->valuestring)); } } exposure_data_change_notification_local_var = OpenAPI_exposure_data_change_notification_create ( - ue_id ? ogs_strdup(ue_id->valuestring) : NULL, + ue_id ? ogs_strdup_or_assert(ue_id->valuestring) : NULL, access_and_mobility_data ? access_and_mobility_data_local_nonprim : NULL, pdu_session_management_data ? pdu_session_management_dataList : NULL, del_resources ? del_resourcesList : NULL diff --git a/lib/sbi/openapi/model/exposure_data_subscription.c b/lib/sbi/openapi/model/exposure_data_subscription.c index d13470cfbb..13e3f2a764 100644 --- a/lib/sbi/openapi/model/exposure_data_subscription.c +++ b/lib/sbi/openapi/model/exposure_data_subscription.c @@ -121,7 +121,7 @@ OpenAPI_exposure_data_subscription_t *OpenAPI_exposure_data_subscription_parseFr ogs_error("OpenAPI_exposure_data_subscription_parseFromJSON() failed [monitored_resource_uris]"); goto end; } - OpenAPI_list_add(monitored_resource_urisList, ogs_strdup(monitored_resource_uris_local->valuestring)); + OpenAPI_list_add(monitored_resource_urisList, ogs_strdup_or_assert(monitored_resource_uris_local->valuestring)); } cJSON *expiry = cJSON_GetObjectItemCaseSensitive(exposure_data_subscriptionJSON, "expiry"); @@ -143,10 +143,10 @@ OpenAPI_exposure_data_subscription_t *OpenAPI_exposure_data_subscription_parseFr } exposure_data_subscription_local_var = OpenAPI_exposure_data_subscription_create ( - ogs_strdup(notification_uri->valuestring), + ogs_strdup_or_assert(notification_uri->valuestring), monitored_resource_urisList, - expiry ? ogs_strdup(expiry->valuestring) : NULL, - supported_features ? ogs_strdup(supported_features->valuestring) : NULL + expiry ? ogs_strdup_or_assert(expiry->valuestring) : NULL, + supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL ); return exposure_data_subscription_local_var; diff --git a/lib/sbi/openapi/model/ext_problem_details.c b/lib/sbi/openapi/model/ext_problem_details.c index 6d581c7122..2bf79dfb66 100644 --- a/lib/sbi/openapi/model/ext_problem_details.c +++ b/lib/sbi/openapi/model/ext_problem_details.c @@ -260,15 +260,15 @@ OpenAPI_ext_problem_details_t *OpenAPI_ext_problem_details_parseFromJSON(cJSON * } ext_problem_details_local_var = OpenAPI_ext_problem_details_create ( - type ? ogs_strdup(type->valuestring) : NULL, - title ? ogs_strdup(title->valuestring) : NULL, + type ? ogs_strdup_or_assert(type->valuestring) : NULL, + title ? ogs_strdup_or_assert(title->valuestring) : NULL, status ? status->valuedouble : 0, - detail ? ogs_strdup(detail->valuestring) : NULL, - instance ? ogs_strdup(instance->valuestring) : NULL, - cause ? ogs_strdup(cause->valuestring) : NULL, + detail ? ogs_strdup_or_assert(detail->valuestring) : NULL, + instance ? ogs_strdup_or_assert(instance->valuestring) : NULL, + cause ? ogs_strdup_or_assert(cause->valuestring) : NULL, invalid_params ? invalid_paramsList : NULL, - supported_features ? ogs_strdup(supported_features->valuestring) : NULL, - target_scp ? ogs_strdup(target_scp->valuestring) : NULL, + supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL, + target_scp ? ogs_strdup_or_assert(target_scp->valuestring) : NULL, remote_error ? remote_error->valueint : 0 ); diff --git a/lib/sbi/openapi/model/ext_snssai.c b/lib/sbi/openapi/model/ext_snssai.c index 0d8b97f626..be382ae032 100644 --- a/lib/sbi/openapi/model/ext_snssai.c +++ b/lib/sbi/openapi/model/ext_snssai.c @@ -148,7 +148,7 @@ OpenAPI_ext_snssai_t *OpenAPI_ext_snssai_parseFromJSON(cJSON *ext_snssaiJSON) ext_snssai_local_var = OpenAPI_ext_snssai_create ( sst->valuedouble, - sd ? ogs_strdup(sd->valuestring) : NULL, + sd ? ogs_strdup_or_assert(sd->valuestring) : NULL, sd_ranges ? sd_rangesList : NULL, wildcard_sd ? wildcard_sd->valueint : 0 ); diff --git a/lib/sbi/openapi/model/extended_problem_details.c b/lib/sbi/openapi/model/extended_problem_details.c index 565ab67fb0..9f3d471995 100644 --- a/lib/sbi/openapi/model/extended_problem_details.c +++ b/lib/sbi/openapi/model/extended_problem_details.c @@ -265,15 +265,15 @@ OpenAPI_extended_problem_details_t *OpenAPI_extended_problem_details_parseFromJS } extended_problem_details_local_var = OpenAPI_extended_problem_details_create ( - type ? ogs_strdup(type->valuestring) : NULL, - title ? ogs_strdup(title->valuestring) : NULL, + type ? ogs_strdup_or_assert(type->valuestring) : NULL, + title ? ogs_strdup_or_assert(title->valuestring) : NULL, status ? status->valuedouble : 0, - detail ? ogs_strdup(detail->valuestring) : NULL, - instance ? ogs_strdup(instance->valuestring) : NULL, - cause ? ogs_strdup(cause->valuestring) : NULL, + detail ? ogs_strdup_or_assert(detail->valuestring) : NULL, + instance ? ogs_strdup_or_assert(instance->valuestring) : NULL, + cause ? ogs_strdup_or_assert(cause->valuestring) : NULL, invalid_params ? invalid_paramsList : NULL, - supported_features ? ogs_strdup(supported_features->valuestring) : NULL, - target_scp ? ogs_strdup(target_scp->valuestring) : NULL, + supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL, + target_scp ? ogs_strdup_or_assert(target_scp->valuestring) : NULL, acceptable_serv_info ? acceptable_serv_info_local_nonprim : NULL ); diff --git a/lib/sbi/openapi/model/flow_info.c b/lib/sbi/openapi/model/flow_info.c index e9356cadab..30b0b0cba2 100644 --- a/lib/sbi/openapi/model/flow_info.c +++ b/lib/sbi/openapi/model/flow_info.c @@ -98,7 +98,7 @@ OpenAPI_flow_info_t *OpenAPI_flow_info_parseFromJSON(cJSON *flow_infoJSON) ogs_error("OpenAPI_flow_info_parseFromJSON() failed [flow_descriptions]"); goto end; } - OpenAPI_list_add(flow_descriptionsList, ogs_strdup(flow_descriptions_local->valuestring)); + OpenAPI_list_add(flow_descriptionsList, ogs_strdup_or_assert(flow_descriptions_local->valuestring)); } } diff --git a/lib/sbi/openapi/model/flow_information.c b/lib/sbi/openapi/model/flow_information.c index 1f8fe2fe9a..3a751343e0 100644 --- a/lib/sbi/openapi/model/flow_information.c +++ b/lib/sbi/openapi/model/flow_information.c @@ -198,13 +198,13 @@ OpenAPI_flow_information_t *OpenAPI_flow_information_parseFromJSON(cJSON *flow_i } flow_information_local_var = OpenAPI_flow_information_create ( - flow_description ? ogs_strdup(flow_description->valuestring) : NULL, + flow_description ? ogs_strdup_or_assert(flow_description->valuestring) : NULL, eth_flow_description ? eth_flow_description_local_nonprim : NULL, - pack_filt_id ? ogs_strdup(pack_filt_id->valuestring) : NULL, + pack_filt_id ? ogs_strdup_or_assert(pack_filt_id->valuestring) : NULL, packet_filter_usage ? packet_filter_usage->valueint : 0, - tos_traffic_class ? ogs_strdup(tos_traffic_class->valuestring) : NULL, - spi ? ogs_strdup(spi->valuestring) : NULL, - flow_label ? ogs_strdup(flow_label->valuestring) : NULL, + tos_traffic_class ? ogs_strdup_or_assert(tos_traffic_class->valuestring) : NULL, + spi ? ogs_strdup_or_assert(spi->valuestring) : NULL, + flow_label ? ogs_strdup_or_assert(flow_label->valuestring) : NULL, flow_direction ? flow_directionVariable : 0 ); diff --git a/lib/sbi/openapi/model/frame_route_info.c b/lib/sbi/openapi/model/frame_route_info.c index 4b808bf27e..952f40aee0 100644 --- a/lib/sbi/openapi/model/frame_route_info.c +++ b/lib/sbi/openapi/model/frame_route_info.c @@ -80,8 +80,8 @@ OpenAPI_frame_route_info_t *OpenAPI_frame_route_info_parseFromJSON(cJSON *frame_ } frame_route_info_local_var = OpenAPI_frame_route_info_create ( - ipv4_mask ? ogs_strdup(ipv4_mask->valuestring) : NULL, - ipv6_prefix ? ogs_strdup(ipv6_prefix->valuestring) : NULL + ipv4_mask ? ogs_strdup_or_assert(ipv4_mask->valuestring) : NULL, + ipv6_prefix ? ogs_strdup_or_assert(ipv6_prefix->valuestring) : NULL ); return frame_route_info_local_var; diff --git a/lib/sbi/openapi/model/g_nb_id.c b/lib/sbi/openapi/model/g_nb_id.c index fd4768702a..e35fe09c10 100644 --- a/lib/sbi/openapi/model/g_nb_id.c +++ b/lib/sbi/openapi/model/g_nb_id.c @@ -82,7 +82,7 @@ OpenAPI_g_nb_id_t *OpenAPI_g_nb_id_parseFromJSON(cJSON *g_nb_idJSON) g_nb_id_local_var = OpenAPI_g_nb_id_create ( bit_length->valuedouble, - ogs_strdup(g_nb_value->valuestring) + ogs_strdup_or_assert(g_nb_value->valuestring) ); return g_nb_id_local_var; diff --git a/lib/sbi/openapi/model/gbr_qos_flow_information.c b/lib/sbi/openapi/model/gbr_qos_flow_information.c index af44572366..8f445eca41 100644 --- a/lib/sbi/openapi/model/gbr_qos_flow_information.c +++ b/lib/sbi/openapi/model/gbr_qos_flow_information.c @@ -227,10 +227,10 @@ OpenAPI_gbr_qos_flow_information_t *OpenAPI_gbr_qos_flow_information_parseFromJS } gbr_qos_flow_information_local_var = OpenAPI_gbr_qos_flow_information_create ( - ogs_strdup(max_fbr_dl->valuestring), - ogs_strdup(max_fbr_ul->valuestring), - ogs_strdup(gua_fbr_dl->valuestring), - ogs_strdup(gua_fbr_ul->valuestring), + ogs_strdup_or_assert(max_fbr_dl->valuestring), + ogs_strdup_or_assert(max_fbr_ul->valuestring), + ogs_strdup_or_assert(gua_fbr_dl->valuestring), + ogs_strdup_or_assert(gua_fbr_ul->valuestring), notif_control ? notif_controlVariable : 0, max_packet_loss_rate_dl ? max_packet_loss_rate_dl->valuedouble : 0, max_packet_loss_rate_ul ? max_packet_loss_rate_ul->valuedouble : 0, diff --git a/lib/sbi/openapi/model/global_ran_node_id.c b/lib/sbi/openapi/model/global_ran_node_id.c index 94a8aef4d7..88b15cb621 100644 --- a/lib/sbi/openapi/model/global_ran_node_id.c +++ b/lib/sbi/openapi/model/global_ran_node_id.c @@ -204,13 +204,13 @@ OpenAPI_global_ran_node_id_t *OpenAPI_global_ran_node_id_parseFromJSON(cJSON *gl global_ran_node_id_local_var = OpenAPI_global_ran_node_id_create ( plmn_id_local_nonprim, - n3_iwf_id ? ogs_strdup(n3_iwf_id->valuestring) : NULL, + n3_iwf_id ? ogs_strdup_or_assert(n3_iwf_id->valuestring) : NULL, g_nb_id ? g_nb_id_local_nonprim : NULL, - nge_nb_id ? ogs_strdup(nge_nb_id->valuestring) : NULL, - wagf_id ? ogs_strdup(wagf_id->valuestring) : NULL, - tngf_id ? ogs_strdup(tngf_id->valuestring) : NULL, - nid ? ogs_strdup(nid->valuestring) : NULL, - e_nb_id ? ogs_strdup(e_nb_id->valuestring) : NULL + nge_nb_id ? ogs_strdup_or_assert(nge_nb_id->valuestring) : NULL, + wagf_id ? ogs_strdup_or_assert(wagf_id->valuestring) : NULL, + tngf_id ? ogs_strdup_or_assert(tngf_id->valuestring) : NULL, + nid ? ogs_strdup_or_assert(nid->valuestring) : NULL, + e_nb_id ? ogs_strdup_or_assert(e_nb_id->valuestring) : NULL ); return global_ran_node_id_local_var; diff --git a/lib/sbi/openapi/model/group_identifiers.c b/lib/sbi/openapi/model/group_identifiers.c index 79535f8b25..bb24d09275 100644 --- a/lib/sbi/openapi/model/group_identifiers.c +++ b/lib/sbi/openapi/model/group_identifiers.c @@ -129,8 +129,8 @@ OpenAPI_group_identifiers_t *OpenAPI_group_identifiers_parseFromJSON(cJSON *grou } group_identifiers_local_var = OpenAPI_group_identifiers_create ( - ext_group_id ? ogs_strdup(ext_group_id->valuestring) : NULL, - int_group_id ? ogs_strdup(int_group_id->valuestring) : NULL, + ext_group_id ? ogs_strdup_or_assert(ext_group_id->valuestring) : NULL, + int_group_id ? ogs_strdup_or_assert(int_group_id->valuestring) : NULL, ue_id_list ? ue_id_listList : NULL ); diff --git a/lib/sbi/openapi/model/guami.c b/lib/sbi/openapi/model/guami.c index 7235317607..047b33b074 100644 --- a/lib/sbi/openapi/model/guami.c +++ b/lib/sbi/openapi/model/guami.c @@ -87,7 +87,7 @@ OpenAPI_guami_t *OpenAPI_guami_parseFromJSON(cJSON *guamiJSON) guami_local_var = OpenAPI_guami_create ( plmn_id_local_nonprim, - ogs_strdup(amf_id->valuestring) + ogs_strdup_or_assert(amf_id->valuestring) ); return guami_local_var; diff --git a/lib/sbi/openapi/model/hfc_node_id.c b/lib/sbi/openapi/model/hfc_node_id.c index 0682ba6cca..e360ce9f6a 100644 --- a/lib/sbi/openapi/model/hfc_node_id.c +++ b/lib/sbi/openapi/model/hfc_node_id.c @@ -62,7 +62,7 @@ OpenAPI_hfc_node_id_t *OpenAPI_hfc_node_id_parseFromJSON(cJSON *hfc_node_idJSON) } hfc_node_id_local_var = OpenAPI_hfc_node_id_create ( - ogs_strdup(hfc_n_id->valuestring) + ogs_strdup_or_assert(hfc_n_id->valuestring) ); return hfc_node_id_local_var; diff --git a/lib/sbi/openapi/model/hsmf_update_data.c b/lib/sbi/openapi/model/hsmf_update_data.c index a55e3ec155..32b59f0a73 100644 --- a/lib/sbi/openapi/model/hsmf_update_data.c +++ b/lib/sbi/openapi/model/hsmf_update_data.c @@ -1341,7 +1341,7 @@ OpenAPI_hsmf_update_data_t *OpenAPI_hsmf_update_data_parseFromJSON(cJSON *hsmf_u ogs_error("OpenAPI_hsmf_update_data_parseFromJSON() failed [dnai_list]"); goto end; } - OpenAPI_list_add(dnai_listList, ogs_strdup(dnai_list_local->valuestring)); + OpenAPI_list_add(dnai_listList, ogs_strdup_or_assert(dnai_list_local->valuestring)); } } @@ -1391,7 +1391,7 @@ OpenAPI_hsmf_update_data_t *OpenAPI_hsmf_update_data_parseFromJSON(cJSON *hsmf_u hsmf_update_data_local_var = OpenAPI_hsmf_update_data_create ( request_indicationVariable, - pei ? ogs_strdup(pei->valuestring) : NULL, + pei ? ogs_strdup_or_assert(pei->valuestring) : NULL, vcn_tunnel_info ? vcn_tunnel_info_local_nonprim : NULL, icn_tunnel_info ? icn_tunnel_info_local_nonprim : NULL, additional_cn_tunnel_info ? additional_cn_tunnel_info_local_nonprim : NULL, @@ -1400,7 +1400,7 @@ OpenAPI_hsmf_update_data_t *OpenAPI_hsmf_update_data_parseFromJSON(cJSON *hsmf_u additional_an_type ? additional_an_typeVariable : 0, rat_type ? rat_typeVariable : 0, ue_location ? ue_location_local_nonprim : NULL, - ue_time_zone ? ogs_strdup(ue_time_zone->valuestring) : NULL, + ue_time_zone ? ogs_strdup_or_assert(ue_time_zone->valuestring) : NULL, add_ue_location ? add_ue_location_local_nonprim : NULL, pause_charging ? pause_charging->valueint : 0, pti ? pti->valuedouble : 0, @@ -1430,15 +1430,15 @@ OpenAPI_hsmf_update_data_t *OpenAPI_hsmf_update_data_parseFromJSON(cJSON *hsmf_u n4_info_ext1 ? n4_info_ext1_local_nonprim : NULL, n4_info_ext2 ? n4_info_ext2_local_nonprim : NULL, presence_in_ladn ? presence_in_ladnVariable : 0, - vsmf_pdu_session_uri ? ogs_strdup(vsmf_pdu_session_uri->valuestring) : NULL, - vsmf_id ? ogs_strdup(vsmf_id->valuestring) : NULL, - v_smf_service_instance_id ? ogs_strdup(v_smf_service_instance_id->valuestring) : NULL, - ismf_pdu_session_uri ? ogs_strdup(ismf_pdu_session_uri->valuestring) : NULL, - ismf_id ? ogs_strdup(ismf_id->valuestring) : NULL, - i_smf_service_instance_id ? ogs_strdup(i_smf_service_instance_id->valuestring) : NULL, + vsmf_pdu_session_uri ? ogs_strdup_or_assert(vsmf_pdu_session_uri->valuestring) : NULL, + vsmf_id ? ogs_strdup_or_assert(vsmf_id->valuestring) : NULL, + v_smf_service_instance_id ? ogs_strdup_or_assert(v_smf_service_instance_id->valuestring) : NULL, + ismf_pdu_session_uri ? ogs_strdup_or_assert(ismf_pdu_session_uri->valuestring) : NULL, + ismf_id ? ogs_strdup_or_assert(ismf_id->valuestring) : NULL, + i_smf_service_instance_id ? ogs_strdup_or_assert(i_smf_service_instance_id->valuestring) : NULL, dl_serving_plmn_rate_ctl ? dl_serving_plmn_rate_ctl->valuedouble : 0, dnai_list ? dnai_listList : NULL, - supported_features ? ogs_strdup(supported_features->valuestring) : NULL, + supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL, roaming_charging_profile ? roaming_charging_profile_local_nonprim : NULL, mo_exp_data_counter ? mo_exp_data_counter_local_nonprim : NULL, vplmn_qos ? vplmn_qos_local_nonprim : NULL, diff --git a/lib/sbi/openapi/model/hsmf_update_error.c b/lib/sbi/openapi/model/hsmf_update_error.c index 445dfc82f8..b571aba471 100644 --- a/lib/sbi/openapi/model/hsmf_update_error.c +++ b/lib/sbi/openapi/model/hsmf_update_error.c @@ -165,10 +165,10 @@ OpenAPI_hsmf_update_error_t *OpenAPI_hsmf_update_error_parseFromJSON(cJSON *hsmf hsmf_update_error_local_var = OpenAPI_hsmf_update_error_create ( error_local_nonprim, pti ? pti->valuedouble : 0, - n1sm_cause ? ogs_strdup(n1sm_cause->valuestring) : NULL, + n1sm_cause ? ogs_strdup_or_assert(n1sm_cause->valuestring) : NULL, n1_sm_info_to_ue ? n1_sm_info_to_ue_local_nonprim : NULL, back_off_timer ? back_off_timer->valuedouble : 0, - recovery_time ? ogs_strdup(recovery_time->valuestring) : NULL + recovery_time ? ogs_strdup_or_assert(recovery_time->valuestring) : NULL ); return hsmf_update_error_local_var; diff --git a/lib/sbi/openapi/model/hsmf_updated_data.c b/lib/sbi/openapi/model/hsmf_updated_data.c index 223a7091b2..cf5ef39d6f 100644 --- a/lib/sbi/openapi/model/hsmf_updated_data.c +++ b/lib/sbi/openapi/model/hsmf_updated_data.c @@ -240,7 +240,7 @@ OpenAPI_hsmf_updated_data_t *OpenAPI_hsmf_updated_data_parseFromJSON(cJSON *hsmf ogs_error("OpenAPI_hsmf_updated_data_parseFromJSON() failed [dnai_list]"); goto end; } - OpenAPI_list_add(dnai_listList, ogs_strdup(dnai_list_local->valuestring)); + OpenAPI_list_add(dnai_listList, ogs_strdup_or_assert(dnai_list_local->valuestring)); } } @@ -304,7 +304,7 @@ OpenAPI_hsmf_updated_data_t *OpenAPI_hsmf_updated_data_parseFromJSON(cJSON *hsmf n4_info_ext1 ? n4_info_ext1_local_nonprim : NULL, n4_info_ext2 ? n4_info_ext2_local_nonprim : NULL, dnai_list ? dnai_listList : NULL, - supported_features ? ogs_strdup(supported_features->valuestring) : NULL, + supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL, roaming_charging_profile ? roaming_charging_profile_local_nonprim : NULL, up_security ? up_security_local_nonprim : NULL, max_integrity_protected_data_rate_ul ? max_integrity_protected_data_rate_ulVariable : 0, diff --git a/lib/sbi/openapi/model/hss_authentication_info_request.c b/lib/sbi/openapi/model/hss_authentication_info_request.c index 4caaaf0cbc..d4d6332b40 100644 --- a/lib/sbi/openapi/model/hss_authentication_info_request.c +++ b/lib/sbi/openapi/model/hss_authentication_info_request.c @@ -187,7 +187,7 @@ OpenAPI_hss_authentication_info_request_t *OpenAPI_hss_authentication_info_reque } hss_authentication_info_request_local_var = OpenAPI_hss_authentication_info_request_create ( - supported_features ? ogs_strdup(supported_features->valuestring) : NULL, + supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL, hss_auth_typeVariable, num_of_requested_vectors->valuedouble, requesting_node_type ? requesting_node_typeVariable : 0, diff --git a/lib/sbi/openapi/model/hss_authentication_info_result.c b/lib/sbi/openapi/model/hss_authentication_info_result.c index d995fc0b58..ee5372f98f 100644 --- a/lib/sbi/openapi/model/hss_authentication_info_result.c +++ b/lib/sbi/openapi/model/hss_authentication_info_result.c @@ -85,7 +85,7 @@ OpenAPI_hss_authentication_info_result_t *OpenAPI_hss_authentication_info_result hss_authentication_vectors_local_nonprim = OpenAPI_hss_authentication_vectors_parseFromJSON(hss_authentication_vectors); hss_authentication_info_result_local_var = OpenAPI_hss_authentication_info_result_create ( - supported_features ? ogs_strdup(supported_features->valuestring) : NULL, + supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL, hss_authentication_vectors_local_nonprim ); diff --git a/lib/sbi/openapi/model/hss_info.c b/lib/sbi/openapi/model/hss_info.c index 6e806b8bb8..fbce9463df 100644 --- a/lib/sbi/openapi/model/hss_info.c +++ b/lib/sbi/openapi/model/hss_info.c @@ -257,7 +257,7 @@ OpenAPI_hss_info_t *OpenAPI_hss_info_parseFromJSON(cJSON *hss_infoJSON) } hss_info_local_var = OpenAPI_hss_info_create ( - group_id ? ogs_strdup(group_id->valuestring) : NULL, + group_id ? ogs_strdup_or_assert(group_id->valuestring) : NULL, imsi_ranges ? imsi_rangesList : NULL, ims_private_identity_ranges ? ims_private_identity_rangesList : NULL, ims_public_identity_ranges ? ims_public_identity_rangesList : NULL, diff --git a/lib/sbi/openapi/model/id_translation_result.c b/lib/sbi/openapi/model/id_translation_result.c index c826c1b09c..a7507f6d95 100644 --- a/lib/sbi/openapi/model/id_translation_result.c +++ b/lib/sbi/openapi/model/id_translation_result.c @@ -100,9 +100,9 @@ OpenAPI_id_translation_result_t *OpenAPI_id_translation_result_parseFromJSON(cJS } id_translation_result_local_var = OpenAPI_id_translation_result_create ( - supported_features ? ogs_strdup(supported_features->valuestring) : NULL, - ogs_strdup(supi->valuestring), - gpsi ? ogs_strdup(gpsi->valuestring) : NULL + supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL, + ogs_strdup_or_assert(supi->valuestring), + gpsi ? ogs_strdup_or_assert(gpsi->valuestring) : NULL ); return id_translation_result_local_var; diff --git a/lib/sbi/openapi/model/identity_data.c b/lib/sbi/openapi/model/identity_data.c index 182cea0942..c449668d58 100644 --- a/lib/sbi/openapi/model/identity_data.c +++ b/lib/sbi/openapi/model/identity_data.c @@ -101,7 +101,7 @@ OpenAPI_identity_data_t *OpenAPI_identity_data_parseFromJSON(cJSON *identity_dat ogs_error("OpenAPI_identity_data_parseFromJSON() failed [supi_list]"); goto end; } - OpenAPI_list_add(supi_listList, ogs_strdup(supi_list_local->valuestring)); + OpenAPI_list_add(supi_listList, ogs_strdup_or_assert(supi_list_local->valuestring)); } } @@ -121,7 +121,7 @@ OpenAPI_identity_data_t *OpenAPI_identity_data_parseFromJSON(cJSON *identity_dat ogs_error("OpenAPI_identity_data_parseFromJSON() failed [gpsi_list]"); goto end; } - OpenAPI_list_add(gpsi_listList, ogs_strdup(gpsi_list_local->valuestring)); + OpenAPI_list_add(gpsi_listList, ogs_strdup_or_assert(gpsi_list_local->valuestring)); } } diff --git a/lib/sbi/openapi/model/identity_range.c b/lib/sbi/openapi/model/identity_range.c index 2b41129412..bed3e5f51e 100644 --- a/lib/sbi/openapi/model/identity_range.c +++ b/lib/sbi/openapi/model/identity_range.c @@ -99,9 +99,9 @@ OpenAPI_identity_range_t *OpenAPI_identity_range_parseFromJSON(cJSON *identity_r } identity_range_local_var = OpenAPI_identity_range_create ( - start ? ogs_strdup(start->valuestring) : NULL, - end ? ogs_strdup(end->valuestring) : NULL, - pattern ? ogs_strdup(pattern->valuestring) : NULL + start ? ogs_strdup_or_assert(start->valuestring) : NULL, + end ? ogs_strdup_or_assert(end->valuestring) : NULL, + pattern ? ogs_strdup_or_assert(pattern->valuestring) : NULL ); return identity_range_local_var; diff --git a/lib/sbi/openapi/model/imsi_range.c b/lib/sbi/openapi/model/imsi_range.c index 51605d8e41..0f0d85c0fd 100644 --- a/lib/sbi/openapi/model/imsi_range.c +++ b/lib/sbi/openapi/model/imsi_range.c @@ -99,9 +99,9 @@ OpenAPI_imsi_range_t *OpenAPI_imsi_range_parseFromJSON(cJSON *imsi_rangeJSON) } imsi_range_local_var = OpenAPI_imsi_range_create ( - start ? ogs_strdup(start->valuestring) : NULL, - end ? ogs_strdup(end->valuestring) : NULL, - pattern ? ogs_strdup(pattern->valuestring) : NULL + start ? ogs_strdup_or_assert(start->valuestring) : NULL, + end ? ogs_strdup_or_assert(end->valuestring) : NULL, + pattern ? ogs_strdup_or_assert(pattern->valuestring) : NULL ); return imsi_range_local_var; diff --git a/lib/sbi/openapi/model/indirect_data_forwarding_tunnel_info.c b/lib/sbi/openapi/model/indirect_data_forwarding_tunnel_info.c index 451282ea65..257afac535 100644 --- a/lib/sbi/openapi/model/indirect_data_forwarding_tunnel_info.c +++ b/lib/sbi/openapi/model/indirect_data_forwarding_tunnel_info.c @@ -136,9 +136,9 @@ OpenAPI_indirect_data_forwarding_tunnel_info_t *OpenAPI_indirect_data_forwarding } indirect_data_forwarding_tunnel_info_local_var = OpenAPI_indirect_data_forwarding_tunnel_info_create ( - ipv4_addr ? ogs_strdup(ipv4_addr->valuestring) : NULL, - ipv6_addr ? ogs_strdup(ipv6_addr->valuestring) : NULL, - ogs_strdup(gtp_teid->valuestring), + ipv4_addr ? ogs_strdup_or_assert(ipv4_addr->valuestring) : NULL, + ipv6_addr ? ogs_strdup_or_assert(ipv6_addr->valuestring) : NULL, + ogs_strdup_or_assert(gtp_teid->valuestring), drb_id ? drb_id->valuedouble : 0, additional_tnl_nb ? additional_tnl_nb->valuedouble : 0 ); diff --git a/lib/sbi/openapi/model/interface_upf_info_item.c b/lib/sbi/openapi/model/interface_upf_info_item.c index ae0af3390b..e380c8c196 100644 --- a/lib/sbi/openapi/model/interface_upf_info_item.c +++ b/lib/sbi/openapi/model/interface_upf_info_item.c @@ -145,7 +145,7 @@ OpenAPI_interface_upf_info_item_t *OpenAPI_interface_upf_info_item_parseFromJSON ogs_error("OpenAPI_interface_upf_info_item_parseFromJSON() failed [ipv4_endpoint_addresses]"); goto end; } - OpenAPI_list_add(ipv4_endpoint_addressesList, ogs_strdup(ipv4_endpoint_addresses_local->valuestring)); + OpenAPI_list_add(ipv4_endpoint_addressesList, ogs_strdup_or_assert(ipv4_endpoint_addresses_local->valuestring)); } } @@ -165,7 +165,7 @@ OpenAPI_interface_upf_info_item_t *OpenAPI_interface_upf_info_item_parseFromJSON ogs_error("OpenAPI_interface_upf_info_item_parseFromJSON() failed [ipv6_endpoint_addresses]"); goto end; } - OpenAPI_list_add(ipv6_endpoint_addressesList, ogs_strdup(ipv6_endpoint_addresses_local->valuestring)); + OpenAPI_list_add(ipv6_endpoint_addressesList, ogs_strdup_or_assert(ipv6_endpoint_addresses_local->valuestring)); } } @@ -191,8 +191,8 @@ OpenAPI_interface_upf_info_item_t *OpenAPI_interface_upf_info_item_parseFromJSON interface_type_local_nonprim, ipv4_endpoint_addresses ? ipv4_endpoint_addressesList : NULL, ipv6_endpoint_addresses ? ipv6_endpoint_addressesList : NULL, - endpoint_fqdn ? ogs_strdup(endpoint_fqdn->valuestring) : NULL, - network_instance ? ogs_strdup(network_instance->valuestring) : NULL + endpoint_fqdn ? ogs_strdup_or_assert(endpoint_fqdn->valuestring) : NULL, + network_instance ? ogs_strdup_or_assert(network_instance->valuestring) : NULL ); return interface_upf_info_item_local_var; diff --git a/lib/sbi/openapi/model/internal_group_id_range.c b/lib/sbi/openapi/model/internal_group_id_range.c index 5e397a13d1..8b91b08cda 100644 --- a/lib/sbi/openapi/model/internal_group_id_range.c +++ b/lib/sbi/openapi/model/internal_group_id_range.c @@ -99,9 +99,9 @@ OpenAPI_internal_group_id_range_t *OpenAPI_internal_group_id_range_parseFromJSON } internal_group_id_range_local_var = OpenAPI_internal_group_id_range_create ( - start ? ogs_strdup(start->valuestring) : NULL, - end ? ogs_strdup(end->valuestring) : NULL, - pattern ? ogs_strdup(pattern->valuestring) : NULL + start ? ogs_strdup_or_assert(start->valuestring) : NULL, + end ? ogs_strdup_or_assert(end->valuestring) : NULL, + pattern ? ogs_strdup_or_assert(pattern->valuestring) : NULL ); return internal_group_id_range_local_var; diff --git a/lib/sbi/openapi/model/invalid_param.c b/lib/sbi/openapi/model/invalid_param.c index f5ff4f020f..ecdd571277 100644 --- a/lib/sbi/openapi/model/invalid_param.c +++ b/lib/sbi/openapi/model/invalid_param.c @@ -81,8 +81,8 @@ OpenAPI_invalid_param_t *OpenAPI_invalid_param_parseFromJSON(cJSON *invalid_para } invalid_param_local_var = OpenAPI_invalid_param_create ( - ogs_strdup(param->valuestring), - reason ? ogs_strdup(reason->valuestring) : NULL + ogs_strdup_or_assert(param->valuestring), + reason ? ogs_strdup_or_assert(reason->valuestring) : NULL ); return invalid_param_local_var; diff --git a/lib/sbi/openapi/model/ip_address.c b/lib/sbi/openapi/model/ip_address.c index 9f746ad24b..5be16e8e52 100644 --- a/lib/sbi/openapi/model/ip_address.c +++ b/lib/sbi/openapi/model/ip_address.c @@ -99,9 +99,9 @@ OpenAPI_ip_address_t *OpenAPI_ip_address_parseFromJSON(cJSON *ip_addressJSON) } ip_address_local_var = OpenAPI_ip_address_create ( - ipv4_addr ? ogs_strdup(ipv4_addr->valuestring) : NULL, - ipv6_addr ? ogs_strdup(ipv6_addr->valuestring) : NULL, - ipv6_prefix ? ogs_strdup(ipv6_prefix->valuestring) : NULL + ipv4_addr ? ogs_strdup_or_assert(ipv4_addr->valuestring) : NULL, + ipv6_addr ? ogs_strdup_or_assert(ipv6_addr->valuestring) : NULL, + ipv6_prefix ? ogs_strdup_or_assert(ipv6_prefix->valuestring) : NULL ); return ip_address_local_var; diff --git a/lib/sbi/openapi/model/ip_end_point.c b/lib/sbi/openapi/model/ip_end_point.c index 31334ca16c..c34e20d1ac 100644 --- a/lib/sbi/openapi/model/ip_end_point.c +++ b/lib/sbi/openapi/model/ip_end_point.c @@ -118,8 +118,8 @@ OpenAPI_ip_end_point_t *OpenAPI_ip_end_point_parseFromJSON(cJSON *ip_end_pointJS } ip_end_point_local_var = OpenAPI_ip_end_point_create ( - ipv4_address ? ogs_strdup(ipv4_address->valuestring) : NULL, - ipv6_address ? ogs_strdup(ipv6_address->valuestring) : NULL, + ipv4_address ? ogs_strdup_or_assert(ipv4_address->valuestring) : NULL, + ipv6_address ? ogs_strdup_or_assert(ipv6_address->valuestring) : NULL, transport ? transportVariable : 0, port ? port->valuedouble : 0 ); diff --git a/lib/sbi/openapi/model/ip_multicast_address_info.c b/lib/sbi/openapi/model/ip_multicast_address_info.c index a8581886de..be0a9f45f9 100644 --- a/lib/sbi/openapi/model/ip_multicast_address_info.c +++ b/lib/sbi/openapi/model/ip_multicast_address_info.c @@ -118,10 +118,10 @@ OpenAPI_ip_multicast_address_info_t *OpenAPI_ip_multicast_address_info_parseFrom } ip_multicast_address_info_local_var = OpenAPI_ip_multicast_address_info_create ( - src_ipv4_addr ? ogs_strdup(src_ipv4_addr->valuestring) : NULL, - ipv4_mul_addr ? ogs_strdup(ipv4_mul_addr->valuestring) : NULL, - src_ipv6_addr ? ogs_strdup(src_ipv6_addr->valuestring) : NULL, - ipv6_mul_addr ? ogs_strdup(ipv6_mul_addr->valuestring) : NULL + src_ipv4_addr ? ogs_strdup_or_assert(src_ipv4_addr->valuestring) : NULL, + ipv4_mul_addr ? ogs_strdup_or_assert(ipv4_mul_addr->valuestring) : NULL, + src_ipv6_addr ? ogs_strdup_or_assert(src_ipv6_addr->valuestring) : NULL, + ipv6_mul_addr ? ogs_strdup_or_assert(ipv6_mul_addr->valuestring) : NULL ); return ip_multicast_address_info_local_var; diff --git a/lib/sbi/openapi/model/ip_sm_gw_registration.c b/lib/sbi/openapi/model/ip_sm_gw_registration.c index 1923fa4925..dba515c163 100644 --- a/lib/sbi/openapi/model/ip_sm_gw_registration.c +++ b/lib/sbi/openapi/model/ip_sm_gw_registration.c @@ -102,7 +102,7 @@ OpenAPI_ip_sm_gw_registration_t *OpenAPI_ip_sm_gw_registration_parseFromJSON(cJS } ip_sm_gw_registration_local_var = OpenAPI_ip_sm_gw_registration_create ( - ip_sm_gw_map_address ? ogs_strdup(ip_sm_gw_map_address->valuestring) : NULL, + ip_sm_gw_map_address ? ogs_strdup_or_assert(ip_sm_gw_map_address->valuestring) : NULL, ip_sm_gw_diameter_address ? ip_sm_gw_diameter_address_local_nonprim : NULL, unri_indicator ? unri_indicator->valueint : 0 ); diff --git a/lib/sbi/openapi/model/iptv_config_data.c b/lib/sbi/openapi/model/iptv_config_data.c index a4635c6809..2445604c0e 100644 --- a/lib/sbi/openapi/model/iptv_config_data.c +++ b/lib/sbi/openapi/model/iptv_config_data.c @@ -215,13 +215,13 @@ OpenAPI_iptv_config_data_t *OpenAPI_iptv_config_data_parseFromJSON(cJSON *iptv_c } iptv_config_data_local_var = OpenAPI_iptv_config_data_create ( - supi ? ogs_strdup(supi->valuestring) : NULL, - inter_group_id ? ogs_strdup(inter_group_id->valuestring) : NULL, - dnn ? ogs_strdup(dnn->valuestring) : NULL, + supi ? ogs_strdup_or_assert(supi->valuestring) : NULL, + inter_group_id ? ogs_strdup_or_assert(inter_group_id->valuestring) : NULL, + dnn ? ogs_strdup_or_assert(dnn->valuestring) : NULL, snssai ? snssai_local_nonprim : NULL, - ogs_strdup(af_app_id->valuestring), + ogs_strdup_or_assert(af_app_id->valuestring), multi_acc_ctrlsList, - ogs_strdup(supp_feat->valuestring) + ogs_strdup_or_assert(supp_feat->valuestring) ); return iptv_config_data_local_var; diff --git a/lib/sbi/openapi/model/ipv4_address_range.c b/lib/sbi/openapi/model/ipv4_address_range.c index 3462f8d174..9224878136 100644 --- a/lib/sbi/openapi/model/ipv4_address_range.c +++ b/lib/sbi/openapi/model/ipv4_address_range.c @@ -80,8 +80,8 @@ OpenAPI_ipv4_address_range_t *OpenAPI_ipv4_address_range_parseFromJSON(cJSON *ip } ipv4_address_range_local_var = OpenAPI_ipv4_address_range_create ( - start ? ogs_strdup(start->valuestring) : NULL, - end ? ogs_strdup(end->valuestring) : NULL + start ? ogs_strdup_or_assert(start->valuestring) : NULL, + end ? ogs_strdup_or_assert(end->valuestring) : NULL ); return ipv4_address_range_local_var; diff --git a/lib/sbi/openapi/model/ipv6_prefix_range.c b/lib/sbi/openapi/model/ipv6_prefix_range.c index a2ce337b0c..f48d26626e 100644 --- a/lib/sbi/openapi/model/ipv6_prefix_range.c +++ b/lib/sbi/openapi/model/ipv6_prefix_range.c @@ -80,8 +80,8 @@ OpenAPI_ipv6_prefix_range_t *OpenAPI_ipv6_prefix_range_parseFromJSON(cJSON *ipv6 } ipv6_prefix_range_local_var = OpenAPI_ipv6_prefix_range_create ( - start ? ogs_strdup(start->valuestring) : NULL, - end ? ogs_strdup(end->valuestring) : NULL + start ? ogs_strdup_or_assert(start->valuestring) : NULL, + end ? ogs_strdup_or_assert(end->valuestring) : NULL ); return ipv6_prefix_range_local_var; diff --git a/lib/sbi/openapi/model/key_amf.c b/lib/sbi/openapi/model/key_amf.c index f35ab877de..c7e703cacb 100644 --- a/lib/sbi/openapi/model/key_amf.c +++ b/lib/sbi/openapi/model/key_amf.c @@ -84,7 +84,7 @@ OpenAPI_key_amf_t *OpenAPI_key_amf_parseFromJSON(cJSON *key_amfJSON) key_amf_local_var = OpenAPI_key_amf_create ( key_typeVariable, - ogs_strdup(key_val->valuestring) + ogs_strdup_or_assert(key_val->valuestring) ); return key_amf_local_var; diff --git a/lib/sbi/openapi/model/ladn_info.c b/lib/sbi/openapi/model/ladn_info.c index bcd777fa09..946c8b6a86 100644 --- a/lib/sbi/openapi/model/ladn_info.c +++ b/lib/sbi/openapi/model/ladn_info.c @@ -82,7 +82,7 @@ OpenAPI_ladn_info_t *OpenAPI_ladn_info_parseFromJSON(cJSON *ladn_infoJSON) } ladn_info_local_var = OpenAPI_ladn_info_create ( - ogs_strdup(ladn->valuestring), + ogs_strdup_or_assert(ladn->valuestring), presence ? presenceVariable : 0 ); diff --git a/lib/sbi/openapi/model/lcs_client_group_external.c b/lib/sbi/openapi/model/lcs_client_group_external.c index 889d5a5d67..81d3bd6501 100644 --- a/lib/sbi/openapi/model/lcs_client_group_external.c +++ b/lib/sbi/openapi/model/lcs_client_group_external.c @@ -153,7 +153,7 @@ OpenAPI_lcs_client_group_external_t *OpenAPI_lcs_client_group_external_parseFrom } lcs_client_group_external_local_var = OpenAPI_lcs_client_group_external_create ( - lcs_client_group_id ? ogs_strdup(lcs_client_group_id->valuestring) : NULL, + lcs_client_group_id ? ogs_strdup_or_assert(lcs_client_group_id->valuestring) : NULL, allowed_geographic_area ? allowed_geographic_areaList : NULL, privacy_check_related_action ? privacy_check_related_actionVariable : 0, valid_time_period ? valid_time_period_local_nonprim : NULL diff --git a/lib/sbi/openapi/model/lcs_privacy.c b/lib/sbi/openapi/model/lcs_privacy.c index 930c3caf5e..91ef637605 100644 --- a/lib/sbi/openapi/model/lcs_privacy.c +++ b/lib/sbi/openapi/model/lcs_privacy.c @@ -121,10 +121,10 @@ OpenAPI_lcs_privacy_t *OpenAPI_lcs_privacy_parseFromJSON(cJSON *lcs_privacyJSON) } lcs_privacy_local_var = OpenAPI_lcs_privacy_create ( - af_instance_id ? ogs_strdup(af_instance_id->valuestring) : NULL, + af_instance_id ? ogs_strdup_or_assert(af_instance_id->valuestring) : NULL, reference_id ? reference_id->valuedouble : 0, lpi ? lpi_local_nonprim : NULL, - mtc_provider_information ? ogs_strdup(mtc_provider_information->valuestring) : NULL + mtc_provider_information ? ogs_strdup_or_assert(mtc_provider_information->valuestring) : NULL ); return lcs_privacy_local_var; diff --git a/lib/sbi/openapi/model/limit_id_to_monitoring_key.c b/lib/sbi/openapi/model/limit_id_to_monitoring_key.c index a0e0949a71..79848c78d8 100644 --- a/lib/sbi/openapi/model/limit_id_to_monitoring_key.c +++ b/lib/sbi/openapi/model/limit_id_to_monitoring_key.c @@ -99,12 +99,12 @@ OpenAPI_limit_id_to_monitoring_key_t *OpenAPI_limit_id_to_monitoring_key_parseFr ogs_error("OpenAPI_limit_id_to_monitoring_key_parseFromJSON() failed [monkey]"); goto end; } - OpenAPI_list_add(monkeyList, ogs_strdup(monkey_local->valuestring)); + OpenAPI_list_add(monkeyList, ogs_strdup_or_assert(monkey_local->valuestring)); } } limit_id_to_monitoring_key_local_var = OpenAPI_limit_id_to_monitoring_key_create ( - ogs_strdup(limit_id->valuestring), + ogs_strdup_or_assert(limit_id->valuestring), monkey ? monkeyList : NULL ); diff --git a/lib/sbi/openapi/model/link.c b/lib/sbi/openapi/model/link.c index f27b0f8a7d..29e242c159 100644 --- a/lib/sbi/openapi/model/link.c +++ b/lib/sbi/openapi/model/link.c @@ -61,7 +61,7 @@ OpenAPI_link_t *OpenAPI_link_parseFromJSON(cJSON *linkJSON) } link_local_var = OpenAPI_link_create ( - href ? ogs_strdup(href->valuestring) : NULL + href ? ogs_strdup_or_assert(href->valuestring) : NULL ); return link_local_var; diff --git a/lib/sbi/openapi/model/links_value_schema.c b/lib/sbi/openapi/model/links_value_schema.c index 0c0d9457d6..f17b8621f5 100644 --- a/lib/sbi/openapi/model/links_value_schema.c +++ b/lib/sbi/openapi/model/links_value_schema.c @@ -61,7 +61,7 @@ OpenAPI_links_value_schema_t *OpenAPI_links_value_schema_parseFromJSON(cJSON *li } links_value_schema_local_var = OpenAPI_links_value_schema_create ( - href ? ogs_strdup(href->valuestring) : NULL + href ? ogs_strdup_or_assert(href->valuestring) : NULL ); return links_value_schema_local_var; diff --git a/lib/sbi/openapi/model/lmf_info.c b/lib/sbi/openapi/model/lmf_info.c index 7e686e6b47..e8a3562190 100644 --- a/lib/sbi/openapi/model/lmf_info.c +++ b/lib/sbi/openapi/model/lmf_info.c @@ -231,7 +231,7 @@ OpenAPI_lmf_info_t *OpenAPI_lmf_info_parseFromJSON(cJSON *lmf_infoJSON) lmf_info_local_var = OpenAPI_lmf_info_create ( serving_client_types ? serving_client_typesList : NULL, - lmf_id ? ogs_strdup(lmf_id->valuestring) : NULL, + lmf_id ? ogs_strdup_or_assert(lmf_id->valuestring) : NULL, serving_access_types ? serving_access_typesList : NULL, serving_an_node_types ? serving_an_node_typesList : NULL, serving_rat_types ? serving_rat_typesList : NULL diff --git a/lib/sbi/openapi/model/location_info.c b/lib/sbi/openapi/model/location_info.c index e3eed25001..1d49ebb04a 100644 --- a/lib/sbi/openapi/model/location_info.c +++ b/lib/sbi/openapi/model/location_info.c @@ -149,10 +149,10 @@ OpenAPI_location_info_t *OpenAPI_location_info_parseFromJSON(cJSON *location_inf } location_info_local_var = OpenAPI_location_info_create ( - supi ? ogs_strdup(supi->valuestring) : NULL, - gpsi ? ogs_strdup(gpsi->valuestring) : NULL, + supi ? ogs_strdup_or_assert(supi->valuestring) : NULL, + gpsi ? ogs_strdup_or_assert(gpsi->valuestring) : NULL, registration_location_info_listList, - supported_features ? ogs_strdup(supported_features->valuestring) : NULL + supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL ); return location_info_local_var; diff --git a/lib/sbi/openapi/model/media_component.c b/lib/sbi/openapi/model/media_component.c index edbcc95c5d..c0b43f81bc 100644 --- a/lib/sbi/openapi/model/media_component.c +++ b/lib/sbi/openapi/model/media_component.c @@ -473,7 +473,7 @@ OpenAPI_media_component_t *OpenAPI_media_component_parseFromJSON(cJSON *media_co ogs_error("OpenAPI_media_component_parseFromJSON() failed [alt_ser_reqs]"); goto end; } - OpenAPI_list_add(alt_ser_reqsList, ogs_strdup(alt_ser_reqs_local->valuestring)); + OpenAPI_list_add(alt_ser_reqsList, ogs_strdup_or_assert(alt_ser_reqs_local->valuestring)); } } @@ -502,7 +502,7 @@ OpenAPI_media_component_t *OpenAPI_media_component_parseFromJSON(cJSON *media_co ogs_error("OpenAPI_media_component_parseFromJSON() failed [codecs]"); goto end; } - OpenAPI_list_add(codecsList, ogs_strdup(codecs_local->valuestring)); + OpenAPI_list_add(codecsList, ogs_strdup_or_assert(codecs_local->valuestring)); } } @@ -782,35 +782,35 @@ OpenAPI_media_component_t *OpenAPI_media_component_parseFromJSON(cJSON *media_co } media_component_local_var = OpenAPI_media_component_create ( - af_app_id ? ogs_strdup(af_app_id->valuestring) : NULL, + af_app_id ? ogs_strdup_or_assert(af_app_id->valuestring) : NULL, af_rout_req ? af_rout_req_local_nonprim : NULL, - qos_reference ? ogs_strdup(qos_reference->valuestring) : NULL, + qos_reference ? ogs_strdup_or_assert(qos_reference->valuestring) : NULL, alt_ser_reqs ? alt_ser_reqsList : NULL, cont_ver ? cont_ver->valuedouble : 0, codecs ? codecsList : NULL, des_max_latency ? des_max_latency->valuedouble : 0, des_max_loss ? des_max_loss->valuedouble : 0, - flus_id ? ogs_strdup(flus_id->valuestring) : NULL, + flus_id ? ogs_strdup_or_assert(flus_id->valuestring) : NULL, f_status ? f_statusVariable : 0, - mar_bw_dl ? ogs_strdup(mar_bw_dl->valuestring) : NULL, - mar_bw_ul ? ogs_strdup(mar_bw_ul->valuestring) : NULL, + mar_bw_dl ? ogs_strdup_or_assert(mar_bw_dl->valuestring) : NULL, + mar_bw_ul ? ogs_strdup_or_assert(mar_bw_ul->valuestring) : NULL, max_packet_loss_rate_dl ? max_packet_loss_rate_dl->valuedouble : 0, max_packet_loss_rate_ul ? max_packet_loss_rate_ul->valuedouble : 0, - max_supp_bw_dl ? ogs_strdup(max_supp_bw_dl->valuestring) : NULL, - max_supp_bw_ul ? ogs_strdup(max_supp_bw_ul->valuestring) : NULL, + max_supp_bw_dl ? ogs_strdup_or_assert(max_supp_bw_dl->valuestring) : NULL, + max_supp_bw_ul ? ogs_strdup_or_assert(max_supp_bw_ul->valuestring) : NULL, med_comp_n->valuedouble, med_sub_comps ? med_sub_compsList : NULL, med_type ? med_typeVariable : 0, - min_des_bw_dl ? ogs_strdup(min_des_bw_dl->valuestring) : NULL, - min_des_bw_ul ? ogs_strdup(min_des_bw_ul->valuestring) : NULL, - mir_bw_dl ? ogs_strdup(mir_bw_dl->valuestring) : NULL, - mir_bw_ul ? ogs_strdup(mir_bw_ul->valuestring) : NULL, + min_des_bw_dl ? ogs_strdup_or_assert(min_des_bw_dl->valuestring) : NULL, + min_des_bw_ul ? ogs_strdup_or_assert(min_des_bw_ul->valuestring) : NULL, + mir_bw_dl ? ogs_strdup_or_assert(mir_bw_dl->valuestring) : NULL, + mir_bw_ul ? ogs_strdup_or_assert(mir_bw_ul->valuestring) : NULL, preempt_cap ? preempt_capVariable : 0, preempt_vuln ? preempt_vulnVariable : 0, prio_sharing_ind ? prio_sharing_indVariable : 0, res_prio ? res_prioVariable : 0, - rr_bw ? ogs_strdup(rr_bw->valuestring) : NULL, - rs_bw ? ogs_strdup(rs_bw->valuestring) : NULL, + rr_bw ? ogs_strdup_or_assert(rr_bw->valuestring) : NULL, + rs_bw ? ogs_strdup_or_assert(rs_bw->valuestring) : NULL, sharing_key_dl ? sharing_key_dl->valuedouble : 0, sharing_key_ul ? sharing_key_ul->valuedouble : 0, tsn_qos ? tsn_qos_local_nonprim : NULL, diff --git a/lib/sbi/openapi/model/media_component_rm.c b/lib/sbi/openapi/model/media_component_rm.c index 6525be804d..419833e399 100644 --- a/lib/sbi/openapi/model/media_component_rm.c +++ b/lib/sbi/openapi/model/media_component_rm.c @@ -487,7 +487,7 @@ OpenAPI_media_component_rm_t *OpenAPI_media_component_rm_parseFromJSON(cJSON *me ogs_error("OpenAPI_media_component_rm_parseFromJSON() failed [alt_ser_reqs]"); goto end; } - OpenAPI_list_add(alt_ser_reqsList, ogs_strdup(alt_ser_reqs_local->valuestring)); + OpenAPI_list_add(alt_ser_reqsList, ogs_strdup_or_assert(alt_ser_reqs_local->valuestring)); } } @@ -516,7 +516,7 @@ OpenAPI_media_component_rm_t *OpenAPI_media_component_rm_parseFromJSON(cJSON *me ogs_error("OpenAPI_media_component_rm_parseFromJSON() failed [codecs]"); goto end; } - OpenAPI_list_add(codecsList, ogs_strdup(codecs_local->valuestring)); + OpenAPI_list_add(codecsList, ogs_strdup_or_assert(codecs_local->valuestring)); } } @@ -788,35 +788,35 @@ OpenAPI_media_component_rm_t *OpenAPI_media_component_rm_parseFromJSON(cJSON *me } media_component_rm_local_var = OpenAPI_media_component_rm_create ( - af_app_id ? ogs_strdup(af_app_id->valuestring) : NULL, + af_app_id ? ogs_strdup_or_assert(af_app_id->valuestring) : NULL, af_rout_req ? af_rout_req_local_nonprim : NULL, - qos_reference ? ogs_strdup(qos_reference->valuestring) : NULL, + qos_reference ? ogs_strdup_or_assert(qos_reference->valuestring) : NULL, alt_ser_reqs ? alt_ser_reqsList : NULL, cont_ver ? cont_ver->valuedouble : 0, codecs ? codecsList : NULL, des_max_latency ? des_max_latency->valuedouble : 0, des_max_loss ? des_max_loss->valuedouble : 0, - flus_id ? ogs_strdup(flus_id->valuestring) : NULL, + flus_id ? ogs_strdup_or_assert(flus_id->valuestring) : NULL, f_status ? f_statusVariable : 0, - mar_bw_dl ? ogs_strdup(mar_bw_dl->valuestring) : NULL, - mar_bw_ul ? ogs_strdup(mar_bw_ul->valuestring) : NULL, + mar_bw_dl ? ogs_strdup_or_assert(mar_bw_dl->valuestring) : NULL, + mar_bw_ul ? ogs_strdup_or_assert(mar_bw_ul->valuestring) : NULL, max_packet_loss_rate_dl ? max_packet_loss_rate_dl->valuedouble : 0, max_packet_loss_rate_ul ? max_packet_loss_rate_ul->valuedouble : 0, - max_supp_bw_dl ? ogs_strdup(max_supp_bw_dl->valuestring) : NULL, - max_supp_bw_ul ? ogs_strdup(max_supp_bw_ul->valuestring) : NULL, + max_supp_bw_dl ? ogs_strdup_or_assert(max_supp_bw_dl->valuestring) : NULL, + max_supp_bw_ul ? ogs_strdup_or_assert(max_supp_bw_ul->valuestring) : NULL, med_comp_n->valuedouble, med_sub_comps ? med_sub_compsList : NULL, med_type ? med_typeVariable : 0, - min_des_bw_dl ? ogs_strdup(min_des_bw_dl->valuestring) : NULL, - min_des_bw_ul ? ogs_strdup(min_des_bw_ul->valuestring) : NULL, - mir_bw_dl ? ogs_strdup(mir_bw_dl->valuestring) : NULL, - mir_bw_ul ? ogs_strdup(mir_bw_ul->valuestring) : NULL, + min_des_bw_dl ? ogs_strdup_or_assert(min_des_bw_dl->valuestring) : NULL, + min_des_bw_ul ? ogs_strdup_or_assert(min_des_bw_ul->valuestring) : NULL, + mir_bw_dl ? ogs_strdup_or_assert(mir_bw_dl->valuestring) : NULL, + mir_bw_ul ? ogs_strdup_or_assert(mir_bw_ul->valuestring) : NULL, preempt_cap ? preempt_cap_local_nonprim : NULL, preempt_vuln ? preempt_vuln_local_nonprim : NULL, prio_sharing_ind ? prio_sharing_indVariable : 0, res_prio ? res_prioVariable : 0, - rr_bw ? ogs_strdup(rr_bw->valuestring) : NULL, - rs_bw ? ogs_strdup(rs_bw->valuestring) : NULL, + rr_bw ? ogs_strdup_or_assert(rr_bw->valuestring) : NULL, + rs_bw ? ogs_strdup_or_assert(rs_bw->valuestring) : NULL, sharing_key_dl ? sharing_key_dl->valuedouble : 0, sharing_key_ul ? sharing_key_ul->valuedouble : 0, tsn_qos ? tsn_qos_local_nonprim : NULL, diff --git a/lib/sbi/openapi/model/media_sub_component.c b/lib/sbi/openapi/model/media_sub_component.c index fefb4fb3ab..f8eb0d57de 100644 --- a/lib/sbi/openapi/model/media_sub_component.c +++ b/lib/sbi/openapi/model/media_sub_component.c @@ -247,7 +247,7 @@ OpenAPI_media_sub_component_t *OpenAPI_media_sub_component_parseFromJSON(cJSON * ogs_error("OpenAPI_media_sub_component_parseFromJSON() failed [f_descs]"); goto end; } - OpenAPI_list_add(f_descsList, ogs_strdup(f_descs_local->valuestring)); + OpenAPI_list_add(f_descsList, ogs_strdup_or_assert(f_descs_local->valuestring)); } } @@ -320,9 +320,9 @@ OpenAPI_media_sub_component_t *OpenAPI_media_sub_component_parseFromJSON(cJSON * f_num->valuedouble, f_descs ? f_descsList : NULL, f_status ? f_statusVariable : 0, - mar_bw_dl ? ogs_strdup(mar_bw_dl->valuestring) : NULL, - mar_bw_ul ? ogs_strdup(mar_bw_ul->valuestring) : NULL, - tos_tr_cl ? ogs_strdup(tos_tr_cl->valuestring) : NULL, + mar_bw_dl ? ogs_strdup_or_assert(mar_bw_dl->valuestring) : NULL, + mar_bw_ul ? ogs_strdup_or_assert(mar_bw_ul->valuestring) : NULL, + tos_tr_cl ? ogs_strdup_or_assert(tos_tr_cl->valuestring) : NULL, flow_usage ? flow_usageVariable : 0, tscai_input_dl ? tscai_input_dl_local_nonprim : NULL, tscai_input_ul ? tscai_input_ul_local_nonprim : NULL diff --git a/lib/sbi/openapi/model/media_sub_component_rm.c b/lib/sbi/openapi/model/media_sub_component_rm.c index 22ca873d84..07dbbf2446 100644 --- a/lib/sbi/openapi/model/media_sub_component_rm.c +++ b/lib/sbi/openapi/model/media_sub_component_rm.c @@ -247,7 +247,7 @@ OpenAPI_media_sub_component_rm_t *OpenAPI_media_sub_component_rm_parseFromJSON(c ogs_error("OpenAPI_media_sub_component_rm_parseFromJSON() failed [f_descs]"); goto end; } - OpenAPI_list_add(f_descsList, ogs_strdup(f_descs_local->valuestring)); + OpenAPI_list_add(f_descsList, ogs_strdup_or_assert(f_descs_local->valuestring)); } } @@ -320,9 +320,9 @@ OpenAPI_media_sub_component_rm_t *OpenAPI_media_sub_component_rm_parseFromJSON(c f_num->valuedouble, f_descs ? f_descsList : NULL, f_status ? f_statusVariable : 0, - mar_bw_dl ? ogs_strdup(mar_bw_dl->valuestring) : NULL, - mar_bw_ul ? ogs_strdup(mar_bw_ul->valuestring) : NULL, - tos_tr_cl ? ogs_strdup(tos_tr_cl->valuestring) : NULL, + mar_bw_dl ? ogs_strdup_or_assert(mar_bw_dl->valuestring) : NULL, + mar_bw_ul ? ogs_strdup_or_assert(mar_bw_ul->valuestring) : NULL, + tos_tr_cl ? ogs_strdup_or_assert(tos_tr_cl->valuestring) : NULL, flow_usage ? flow_usageVariable : 0, tscai_input_dl ? tscai_input_dl_local_nonprim : NULL, tscai_input_ul ? tscai_input_ul_local_nonprim : NULL diff --git a/lib/sbi/openapi/model/mm_context.c b/lib/sbi/openapi/model/mm_context.c index 169390802d..44f036a1b8 100644 --- a/lib/sbi/openapi/model/mm_context.c +++ b/lib/sbi/openapi/model/mm_context.c @@ -337,7 +337,7 @@ OpenAPI_mm_context_t *OpenAPI_mm_context_parseFromJSON(cJSON *mm_contextJSON) ogs_error("OpenAPI_mm_context_parseFromJSON() failed [ns_instance_list]"); goto end; } - OpenAPI_list_add(ns_instance_listList, ogs_strdup(ns_instance_list_local->valuestring)); + OpenAPI_list_add(ns_instance_listList, ogs_strdup_or_assert(ns_instance_list_local->valuestring)); } } @@ -388,7 +388,7 @@ OpenAPI_mm_context_t *OpenAPI_mm_context_parseFromJSON(cJSON *mm_contextJSON) expected_u_ebehavior ? expected_u_ebehavior_local_nonprim : NULL, plmn_assi_ue_radio_cap_id ? plmn_assi_ue_radio_cap_id->valueint : 0, man_assi_ue_radio_cap_id ? man_assi_ue_radio_cap_id->valueint : 0, - ucmf_dic_entry_id ? ogs_strdup(ucmf_dic_entry_id->valuestring) : NULL + ucmf_dic_entry_id ? ogs_strdup_or_assert(ucmf_dic_entry_id->valuestring) : NULL ); return mm_context_local_var; diff --git a/lib/sbi/openapi/model/mo_exp_data_counter.c b/lib/sbi/openapi/model/mo_exp_data_counter.c index 7da05b15b1..9447dfe50b 100644 --- a/lib/sbi/openapi/model/mo_exp_data_counter.c +++ b/lib/sbi/openapi/model/mo_exp_data_counter.c @@ -81,7 +81,7 @@ OpenAPI_mo_exp_data_counter_t *OpenAPI_mo_exp_data_counter_parseFromJSON(cJSON * mo_exp_data_counter_local_var = OpenAPI_mo_exp_data_counter_create ( counter->valuedouble, - time_stamp ? ogs_strdup(time_stamp->valuestring) : NULL + time_stamp ? ogs_strdup_or_assert(time_stamp->valuestring) : NULL ); return mo_exp_data_counter_local_var; diff --git a/lib/sbi/openapi/model/model_5_g_vn_group_configuration.c b/lib/sbi/openapi/model/model_5_g_vn_group_configuration.c index 17ff8272bc..983309cda0 100644 --- a/lib/sbi/openapi/model/model_5_g_vn_group_configuration.c +++ b/lib/sbi/openapi/model/model_5_g_vn_group_configuration.c @@ -141,7 +141,7 @@ OpenAPI_model_5_g_vn_group_configuration_t *OpenAPI_model_5_g_vn_group_configura ogs_error("OpenAPI_model_5_g_vn_group_configuration_parseFromJSON() failed [members]"); goto end; } - OpenAPI_list_add(membersList, ogs_strdup(members_local->valuestring)); + OpenAPI_list_add(membersList, ogs_strdup_or_assert(members_local->valuestring)); } } @@ -185,9 +185,9 @@ OpenAPI_model_5_g_vn_group_configuration_t *OpenAPI_model_5_g_vn_group_configura _5g_vn_group_data ? _5g_vn_group_data_local_nonprim : NULL, members ? membersList : NULL, reference_id ? reference_id->valuedouble : 0, - af_instance_id ? ogs_strdup(af_instance_id->valuestring) : NULL, - internal_group_identifier ? ogs_strdup(internal_group_identifier->valuestring) : NULL, - mtc_provider_information ? ogs_strdup(mtc_provider_information->valuestring) : NULL + af_instance_id ? ogs_strdup_or_assert(af_instance_id->valuestring) : NULL, + internal_group_identifier ? ogs_strdup_or_assert(internal_group_identifier->valuestring) : NULL, + mtc_provider_information ? ogs_strdup_or_assert(mtc_provider_information->valuestring) : NULL ); return model_5_g_vn_group_configuration_local_var; diff --git a/lib/sbi/openapi/model/model_5_g_vn_group_data.c b/lib/sbi/openapi/model/model_5_g_vn_group_data.c index c7e1c517c1..57829aea37 100644 --- a/lib/sbi/openapi/model/model_5_g_vn_group_data.c +++ b/lib/sbi/openapi/model/model_5_g_vn_group_data.c @@ -216,7 +216,7 @@ OpenAPI_model_5_g_vn_group_data_t *OpenAPI_model_5_g_vn_group_data_parseFromJSON } model_5_g_vn_group_data_local_var = OpenAPI_model_5_g_vn_group_data_create ( - ogs_strdup(dnn->valuestring), + ogs_strdup_or_assert(dnn->valuestring), s_nssai_local_nonprim, pdu_session_types ? pdu_session_typesList : NULL, app_descriptors ? app_descriptorsList : NULL, diff --git a/lib/sbi/openapi/model/monitoring_configuration.c b/lib/sbi/openapi/model/monitoring_configuration.c index 9385783e9f..257833b024 100644 --- a/lib/sbi/openapi/model/monitoring_configuration.c +++ b/lib/sbi/openapi/model/monitoring_configuration.c @@ -325,8 +325,8 @@ OpenAPI_monitoring_configuration_t *OpenAPI_monitoring_configuration_parseFromJS suggested_packet_num_dl ? suggested_packet_num_dl->valuedouble : 0, pdu_session_status_cfg ? pdu_session_status_cfg_local_nonprim : NULL, reachability_for_sms_cfg ? reachability_for_sms_cfg_local_nonprim : NULL, - mtc_provider_information ? ogs_strdup(mtc_provider_information->valuestring) : NULL, - af_id ? ogs_strdup(af_id->valuestring) : NULL + mtc_provider_information ? ogs_strdup_or_assert(mtc_provider_information->valuestring) : NULL, + af_id ? ogs_strdup_or_assert(af_id->valuestring) : NULL ); return monitoring_configuration_local_var; diff --git a/lib/sbi/openapi/model/multicast_access_control.c b/lib/sbi/openapi/model/multicast_access_control.c index 5963eee2f1..b70732124b 100644 --- a/lib/sbi/openapi/model/multicast_access_control.c +++ b/lib/sbi/openapi/model/multicast_access_control.c @@ -142,10 +142,10 @@ OpenAPI_multicast_access_control_t *OpenAPI_multicast_access_control_parseFromJS acc_status_local_nonprim = OpenAPI_access_right_status_parseFromJSON(acc_status); multicast_access_control_local_var = OpenAPI_multicast_access_control_create ( - src_ipv4_addr ? ogs_strdup(src_ipv4_addr->valuestring) : NULL, - src_ipv6_addr ? ogs_strdup(src_ipv6_addr->valuestring) : NULL, - multicast_v4_addr ? ogs_strdup(multicast_v4_addr->valuestring) : NULL, - multicast_v6_addr ? ogs_strdup(multicast_v6_addr->valuestring) : NULL, + src_ipv4_addr ? ogs_strdup_or_assert(src_ipv4_addr->valuestring) : NULL, + src_ipv6_addr ? ogs_strdup_or_assert(src_ipv6_addr->valuestring) : NULL, + multicast_v4_addr ? ogs_strdup_or_assert(multicast_v4_addr->valuestring) : NULL, + multicast_v6_addr ? ogs_strdup_or_assert(multicast_v6_addr->valuestring) : NULL, acc_status_local_nonprim ); diff --git a/lib/sbi/openapi/model/n1_message_container.c b/lib/sbi/openapi/model/n1_message_container.c index 97aacaeed7..ca4f2ea03b 100644 --- a/lib/sbi/openapi/model/n1_message_container.c +++ b/lib/sbi/openapi/model/n1_message_container.c @@ -127,8 +127,8 @@ OpenAPI_n1_message_container_t *OpenAPI_n1_message_container_parseFromJSON(cJSON n1_message_container_local_var = OpenAPI_n1_message_container_create ( n1_message_classVariable, n1_message_content_local_nonprim, - nf_id ? ogs_strdup(nf_id->valuestring) : NULL, - service_instance_id ? ogs_strdup(service_instance_id->valuestring) : NULL + nf_id ? ogs_strdup_or_assert(nf_id->valuestring) : NULL, + service_instance_id ? ogs_strdup_or_assert(service_instance_id->valuestring) : NULL ); return n1_message_container_local_var; diff --git a/lib/sbi/openapi/model/n1_message_notification.c b/lib/sbi/openapi/model/n1_message_notification.c index 09aad105a2..f89adf4116 100644 --- a/lib/sbi/openapi/model/n1_message_notification.c +++ b/lib/sbi/openapi/model/n1_message_notification.c @@ -146,11 +146,11 @@ OpenAPI_n1_message_notification_t *OpenAPI_n1_message_notification_parseFromJSON } n1_message_notification_local_var = OpenAPI_n1_message_notification_create ( - n1_notify_subscription_id ? ogs_strdup(n1_notify_subscription_id->valuestring) : NULL, + n1_notify_subscription_id ? ogs_strdup_or_assert(n1_notify_subscription_id->valuestring) : NULL, n1_message_container_local_nonprim, - lcs_correlation_id ? ogs_strdup(lcs_correlation_id->valuestring) : NULL, + lcs_correlation_id ? ogs_strdup_or_assert(lcs_correlation_id->valuestring) : NULL, registration_ctxt_container ? registration_ctxt_container_local_nonprim : NULL, - new_lmf_identification ? ogs_strdup(new_lmf_identification->valuestring) : NULL + new_lmf_identification ? ogs_strdup_or_assert(new_lmf_identification->valuestring) : NULL ); return n1_message_notification_local_var; diff --git a/lib/sbi/openapi/model/n1_n2_message_transfer_req_data.c b/lib/sbi/openapi/model/n1_n2_message_transfer_req_data.c index f5c266589d..081f6e8cab 100644 --- a/lib/sbi/openapi/model/n1_n2_message_transfer_req_data.c +++ b/lib/sbi/openapi/model/n1_n2_message_transfer_req_data.c @@ -407,14 +407,14 @@ OpenAPI_n1_n2_message_transfer_req_data_t *OpenAPI_n1_n2_message_transfer_req_da skip_ind ? skip_ind->valueint : 0, last_msg_indication ? last_msg_indication->valueint : 0, pdu_session_id ? pdu_session_id->valuedouble : 0, - lcs_correlation_id ? ogs_strdup(lcs_correlation_id->valuestring) : NULL, + lcs_correlation_id ? ogs_strdup_or_assert(lcs_correlation_id->valuestring) : NULL, ppi ? ppi->valuedouble : 0, arp ? arp_local_nonprim : NULL, _5qi ? _5qi->valuedouble : 0, - n1n2_failure_txf_notif_uri ? ogs_strdup(n1n2_failure_txf_notif_uri->valuestring) : NULL, + n1n2_failure_txf_notif_uri ? ogs_strdup_or_assert(n1n2_failure_txf_notif_uri->valuestring) : NULL, smf_reallocation_ind ? smf_reallocation_ind->valueint : 0, area_of_validity ? area_of_validity_local_nonprim : NULL, - supported_features ? ogs_strdup(supported_features->valuestring) : NULL, + supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL, old_guami ? old_guami_local_nonprim : NULL, ma_accepted_ind ? ma_accepted_ind->valueint : 0, ext_buf_support ? ext_buf_support->valueint : 0, diff --git a/lib/sbi/openapi/model/n1_n2_message_transfer_rsp_data.c b/lib/sbi/openapi/model/n1_n2_message_transfer_rsp_data.c index 8f12d0b31c..67559ad6a6 100644 --- a/lib/sbi/openapi/model/n1_n2_message_transfer_rsp_data.c +++ b/lib/sbi/openapi/model/n1_n2_message_transfer_rsp_data.c @@ -83,7 +83,7 @@ OpenAPI_n1_n2_message_transfer_rsp_data_t *OpenAPI_n1_n2_message_transfer_rsp_da n1_n2_message_transfer_rsp_data_local_var = OpenAPI_n1_n2_message_transfer_rsp_data_create ( causeVariable, - supported_features ? ogs_strdup(supported_features->valuestring) : NULL + supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL ); return n1_n2_message_transfer_rsp_data_local_var; diff --git a/lib/sbi/openapi/model/n1_n2_msg_txfr_failure_notification.c b/lib/sbi/openapi/model/n1_n2_msg_txfr_failure_notification.c index b4fe7bf811..6a20f81138 100644 --- a/lib/sbi/openapi/model/n1_n2_msg_txfr_failure_notification.c +++ b/lib/sbi/openapi/model/n1_n2_msg_txfr_failure_notification.c @@ -84,7 +84,7 @@ OpenAPI_n1_n2_msg_txfr_failure_notification_t *OpenAPI_n1_n2_msg_txfr_failure_no n1_n2_msg_txfr_failure_notification_local_var = OpenAPI_n1_n2_msg_txfr_failure_notification_create ( causeVariable, - ogs_strdup(n1n2_msg_data_uri->valuestring) + ogs_strdup_or_assert(n1n2_msg_data_uri->valuestring) ); return n1_n2_msg_txfr_failure_notification_local_var; diff --git a/lib/sbi/openapi/model/n2_information_notification.c b/lib/sbi/openapi/model/n2_information_notification.c index 2f8aaecda8..958fb1aaf5 100644 --- a/lib/sbi/openapi/model/n2_information_notification.c +++ b/lib/sbi/openapi/model/n2_information_notification.c @@ -295,16 +295,16 @@ OpenAPI_n2_information_notification_t *OpenAPI_n2_information_notification_parse } n2_information_notification_local_var = OpenAPI_n2_information_notification_create ( - ogs_strdup(n2_notify_subscription_id->valuestring), + ogs_strdup_or_assert(n2_notify_subscription_id->valuestring), n2_info_container ? n2_info_container_local_nonprim : NULL, to_release_session_list ? to_release_session_listList : NULL, - lcs_correlation_id ? ogs_strdup(lcs_correlation_id->valuestring) : NULL, + lcs_correlation_id ? ogs_strdup_or_assert(lcs_correlation_id->valuestring) : NULL, notify_reason ? notify_reasonVariable : 0, smf_change_info_list ? smf_change_info_listList : NULL, ran_node_id ? ran_node_id_local_nonprim : NULL, - initial_amf_name ? ogs_strdup(initial_amf_name->valuestring) : NULL, - an_n2_i_pv4_addr ? ogs_strdup(an_n2_i_pv4_addr->valuestring) : NULL, - an_n2_i_pv6_addr ? ogs_strdup(an_n2_i_pv6_addr->valuestring) : NULL + initial_amf_name ? ogs_strdup_or_assert(initial_amf_name->valuestring) : NULL, + an_n2_i_pv4_addr ? ogs_strdup_or_assert(an_n2_i_pv4_addr->valuestring) : NULL, + an_n2_i_pv6_addr ? ogs_strdup_or_assert(an_n2_i_pv6_addr->valuestring) : NULL ); return n2_information_notification_local_var; diff --git a/lib/sbi/openapi/model/n2_information_transfer_req_data.c b/lib/sbi/openapi/model/n2_information_transfer_req_data.c index 6545b06b77..7ccb7f5bf4 100644 --- a/lib/sbi/openapi/model/n2_information_transfer_req_data.c +++ b/lib/sbi/openapi/model/n2_information_transfer_req_data.c @@ -207,7 +207,7 @@ OpenAPI_n2_information_transfer_req_data_t *OpenAPI_n2_information_transfer_req_ rat_selector ? rat_selectorVariable : 0, global_ran_node_list ? global_ran_node_listList : NULL, n2_information_local_nonprim, - supported_features ? ogs_strdup(supported_features->valuestring) : NULL + supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL ); return n2_information_transfer_req_data_local_var; diff --git a/lib/sbi/openapi/model/n2_information_transfer_rsp_data.c b/lib/sbi/openapi/model/n2_information_transfer_rsp_data.c index 852e026392..6ec6119dc0 100644 --- a/lib/sbi/openapi/model/n2_information_transfer_rsp_data.c +++ b/lib/sbi/openapi/model/n2_information_transfer_rsp_data.c @@ -107,7 +107,7 @@ OpenAPI_n2_information_transfer_rsp_data_t *OpenAPI_n2_information_transfer_rsp_ n2_information_transfer_rsp_data_local_var = OpenAPI_n2_information_transfer_rsp_data_create ( resultVariable, pws_rsp_data ? pws_rsp_data_local_nonprim : NULL, - supported_features ? ogs_strdup(supported_features->valuestring) : NULL + supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL ); return n2_information_transfer_rsp_data_local_var; diff --git a/lib/sbi/openapi/model/n2_interface_amf_info.c b/lib/sbi/openapi/model/n2_interface_amf_info.c index a4126f0115..cb0dcc9dca 100644 --- a/lib/sbi/openapi/model/n2_interface_amf_info.c +++ b/lib/sbi/openapi/model/n2_interface_amf_info.c @@ -111,7 +111,7 @@ OpenAPI_n2_interface_amf_info_t *OpenAPI_n2_interface_amf_info_parseFromJSON(cJS ogs_error("OpenAPI_n2_interface_amf_info_parseFromJSON() failed [ipv4_endpoint_address]"); goto end; } - OpenAPI_list_add(ipv4_endpoint_addressList, ogs_strdup(ipv4_endpoint_address_local->valuestring)); + OpenAPI_list_add(ipv4_endpoint_addressList, ogs_strdup_or_assert(ipv4_endpoint_address_local->valuestring)); } } @@ -131,7 +131,7 @@ OpenAPI_n2_interface_amf_info_t *OpenAPI_n2_interface_amf_info_parseFromJSON(cJS ogs_error("OpenAPI_n2_interface_amf_info_parseFromJSON() failed [ipv6_endpoint_address]"); goto end; } - OpenAPI_list_add(ipv6_endpoint_addressList, ogs_strdup(ipv6_endpoint_address_local->valuestring)); + OpenAPI_list_add(ipv6_endpoint_addressList, ogs_strdup_or_assert(ipv6_endpoint_address_local->valuestring)); } } @@ -147,7 +147,7 @@ OpenAPI_n2_interface_amf_info_t *OpenAPI_n2_interface_amf_info_parseFromJSON(cJS n2_interface_amf_info_local_var = OpenAPI_n2_interface_amf_info_create ( ipv4_endpoint_address ? ipv4_endpoint_addressList : NULL, ipv6_endpoint_address ? ipv6_endpoint_addressList : NULL, - amf_name ? ogs_strdup(amf_name->valuestring) : NULL + amf_name ? ogs_strdup_or_assert(amf_name->valuestring) : NULL ); return n2_interface_amf_info_local_var; diff --git a/lib/sbi/openapi/model/n3ga_location.c b/lib/sbi/openapi/model/n3ga_location.c index a748e7d3b4..cba797ec75 100644 --- a/lib/sbi/openapi/model/n3ga_location.c +++ b/lib/sbi/openapi/model/n3ga_location.c @@ -267,16 +267,16 @@ OpenAPI_n3ga_location_t *OpenAPI_n3ga_location_parseFromJSON(cJSON *n3ga_locatio n3ga_location_local_var = OpenAPI_n3ga_location_create ( n3gpp_tai ? n3gpp_tai_local_nonprim : NULL, - n3_iwf_id ? ogs_strdup(n3_iwf_id->valuestring) : NULL, - ue_ipv4_addr ? ogs_strdup(ue_ipv4_addr->valuestring) : NULL, - ue_ipv6_addr ? ogs_strdup(ue_ipv6_addr->valuestring) : NULL, + n3_iwf_id ? ogs_strdup_or_assert(n3_iwf_id->valuestring) : NULL, + ue_ipv4_addr ? ogs_strdup_or_assert(ue_ipv4_addr->valuestring) : NULL, + ue_ipv6_addr ? ogs_strdup_or_assert(ue_ipv6_addr->valuestring) : NULL, port_number ? port_number->valuedouble : 0, tnap_id ? tnap_id_local_nonprim : NULL, twap_id ? twap_id_local_nonprim : NULL, hfc_node_id ? hfc_node_id_local_nonprim : NULL, gli ? gli->valueint : 0, w5gban_line_type ? w5gban_line_typeVariable : 0, - gci ? ogs_strdup(gci->valuestring) : NULL + gci ? ogs_strdup_or_assert(gci->valuestring) : NULL ); return n3ga_location_local_var; diff --git a/lib/sbi/openapi/model/ncgi.c b/lib/sbi/openapi/model/ncgi.c index bafd8686ca..317fc9bb89 100644 --- a/lib/sbi/openapi/model/ncgi.c +++ b/lib/sbi/openapi/model/ncgi.c @@ -106,8 +106,8 @@ OpenAPI_ncgi_t *OpenAPI_ncgi_parseFromJSON(cJSON *ncgiJSON) ncgi_local_var = OpenAPI_ncgi_create ( plmn_id_local_nonprim, - ogs_strdup(nr_cell_id->valuestring), - nid ? ogs_strdup(nid->valuestring) : NULL + ogs_strdup_or_assert(nr_cell_id->valuestring), + nid ? ogs_strdup_or_assert(nid->valuestring) : NULL ); return ncgi_local_var; diff --git a/lib/sbi/openapi/model/nef_info.c b/lib/sbi/openapi/model/nef_info.c index 622aee92ad..a25aed05f6 100644 --- a/lib/sbi/openapi/model/nef_info.c +++ b/lib/sbi/openapi/model/nef_info.c @@ -242,12 +242,12 @@ OpenAPI_nef_info_t *OpenAPI_nef_info_parseFromJSON(cJSON *nef_infoJSON) ogs_error("OpenAPI_nef_info_parseFromJSON() failed [served_fqdn_list]"); goto end; } - OpenAPI_list_add(served_fqdn_listList, ogs_strdup(served_fqdn_list_local->valuestring)); + OpenAPI_list_add(served_fqdn_listList, ogs_strdup_or_assert(served_fqdn_list_local->valuestring)); } } nef_info_local_var = OpenAPI_nef_info_create ( - nef_id ? ogs_strdup(nef_id->valuestring) : NULL, + nef_id ? ogs_strdup_or_assert(nef_id->valuestring) : NULL, pfd_data ? pfd_data_local_nonprim : NULL, af_ee_data ? af_ee_data_local_nonprim : NULL, gpsi_ranges ? gpsi_rangesList : NULL, diff --git a/lib/sbi/openapi/model/network_node_diameter_address.c b/lib/sbi/openapi/model/network_node_diameter_address.c index 4131204f32..212ee5d59a 100644 --- a/lib/sbi/openapi/model/network_node_diameter_address.c +++ b/lib/sbi/openapi/model/network_node_diameter_address.c @@ -82,8 +82,8 @@ OpenAPI_network_node_diameter_address_t *OpenAPI_network_node_diameter_address_p } network_node_diameter_address_local_var = OpenAPI_network_node_diameter_address_create ( - ogs_strdup(name->valuestring), - ogs_strdup(realm->valuestring) + ogs_strdup_or_assert(name->valuestring), + ogs_strdup_or_assert(realm->valuestring) ); return network_node_diameter_address_local_var; diff --git a/lib/sbi/openapi/model/network_slice_cond.c b/lib/sbi/openapi/model/network_slice_cond.c index eecc543a0e..6b95214442 100644 --- a/lib/sbi/openapi/model/network_slice_cond.c +++ b/lib/sbi/openapi/model/network_slice_cond.c @@ -129,7 +129,7 @@ OpenAPI_network_slice_cond_t *OpenAPI_network_slice_cond_parseFromJSON(cJSON *ne ogs_error("OpenAPI_network_slice_cond_parseFromJSON() failed [nsi_list]"); goto end; } - OpenAPI_list_add(nsi_listList, ogs_strdup(nsi_list_local->valuestring)); + OpenAPI_list_add(nsi_listList, ogs_strdup_or_assert(nsi_list_local->valuestring)); } } diff --git a/lib/sbi/openapi/model/nf_group_cond.c b/lib/sbi/openapi/model/nf_group_cond.c index 08927bbf1d..47a7127563 100644 --- a/lib/sbi/openapi/model/nf_group_cond.c +++ b/lib/sbi/openapi/model/nf_group_cond.c @@ -107,7 +107,7 @@ OpenAPI_nf_group_cond_t *OpenAPI_nf_group_cond_parseFromJSON(cJSON *nf_group_con nf_group_cond_local_var = OpenAPI_nf_group_cond_create ( nf_typeVariable, - ogs_strdup(nf_group_id->valuestring) + ogs_strdup_or_assert(nf_group_id->valuestring) ); return nf_group_cond_local_var; diff --git a/lib/sbi/openapi/model/nf_instance_id_cond.c b/lib/sbi/openapi/model/nf_instance_id_cond.c index 5d46b3721a..b78063ff33 100644 --- a/lib/sbi/openapi/model/nf_instance_id_cond.c +++ b/lib/sbi/openapi/model/nf_instance_id_cond.c @@ -62,7 +62,7 @@ OpenAPI_nf_instance_id_cond_t *OpenAPI_nf_instance_id_cond_parseFromJSON(cJSON * } nf_instance_id_cond_local_var = OpenAPI_nf_instance_id_cond_create ( - ogs_strdup(nf_instance_id->valuestring) + ogs_strdup_or_assert(nf_instance_id->valuestring) ); return nf_instance_id_cond_local_var; diff --git a/lib/sbi/openapi/model/nf_instance_id_list_cond.c b/lib/sbi/openapi/model/nf_instance_id_list_cond.c index 582a778203..7bdc71f0b9 100644 --- a/lib/sbi/openapi/model/nf_instance_id_list_cond.c +++ b/lib/sbi/openapi/model/nf_instance_id_list_cond.c @@ -81,7 +81,7 @@ OpenAPI_nf_instance_id_list_cond_t *OpenAPI_nf_instance_id_list_cond_parseFromJS ogs_error("OpenAPI_nf_instance_id_list_cond_parseFromJSON() failed [nf_instance_id_list]"); goto end; } - OpenAPI_list_add(nf_instance_id_listList, ogs_strdup(nf_instance_id_list_local->valuestring)); + OpenAPI_list_add(nf_instance_id_listList, ogs_strdup_or_assert(nf_instance_id_list_local->valuestring)); } nf_instance_id_list_cond_local_var = OpenAPI_nf_instance_id_list_cond_create ( diff --git a/lib/sbi/openapi/model/nf_profile.c b/lib/sbi/openapi/model/nf_profile.c index 4be5bf57c6..8e29b18a3f 100644 --- a/lib/sbi/openapi/model/nf_profile.c +++ b/lib/sbi/openapi/model/nf_profile.c @@ -1471,7 +1471,7 @@ OpenAPI_nf_profile_t *OpenAPI_nf_profile_parseFromJSON(cJSON *nf_profileJSON) ogs_error("OpenAPI_nf_profile_parseFromJSON() failed [nsi_list]"); goto end; } - OpenAPI_list_add(nsi_listList, ogs_strdup(nsi_list_local->valuestring)); + OpenAPI_list_add(nsi_listList, ogs_strdup_or_assert(nsi_list_local->valuestring)); } } @@ -1509,7 +1509,7 @@ OpenAPI_nf_profile_t *OpenAPI_nf_profile_parseFromJSON(cJSON *nf_profileJSON) ogs_error("OpenAPI_nf_profile_parseFromJSON() failed [ipv4_addresses]"); goto end; } - OpenAPI_list_add(ipv4_addressesList, ogs_strdup(ipv4_addresses_local->valuestring)); + OpenAPI_list_add(ipv4_addressesList, ogs_strdup_or_assert(ipv4_addresses_local->valuestring)); } } @@ -1529,7 +1529,7 @@ OpenAPI_nf_profile_t *OpenAPI_nf_profile_parseFromJSON(cJSON *nf_profileJSON) ogs_error("OpenAPI_nf_profile_parseFromJSON() failed [ipv6_addresses]"); goto end; } - OpenAPI_list_add(ipv6_addressesList, ogs_strdup(ipv6_addresses_local->valuestring)); + OpenAPI_list_add(ipv6_addressesList, ogs_strdup_or_assert(ipv6_addresses_local->valuestring)); } } @@ -1617,7 +1617,7 @@ OpenAPI_nf_profile_t *OpenAPI_nf_profile_parseFromJSON(cJSON *nf_profileJSON) ogs_error("OpenAPI_nf_profile_parseFromJSON() failed [allowed_nf_domains]"); goto end; } - OpenAPI_list_add(allowed_nf_domainsList, ogs_strdup(allowed_nf_domains_local->valuestring)); + OpenAPI_list_add(allowed_nf_domainsList, ogs_strdup_or_assert(allowed_nf_domains_local->valuestring)); } } @@ -2198,7 +2198,7 @@ OpenAPI_nf_profile_t *OpenAPI_nf_profile_parseFromJSON(cJSON *nf_profileJSON) ogs_error("OpenAPI_nf_profile_parseFromJSON() failed [nf_set_id_list]"); goto end; } - OpenAPI_list_add(nf_set_id_listList, ogs_strdup(nf_set_id_list_local->valuestring)); + OpenAPI_list_add(nf_set_id_listList, ogs_strdup_or_assert(nf_set_id_list_local->valuestring)); } } @@ -2218,7 +2218,7 @@ OpenAPI_nf_profile_t *OpenAPI_nf_profile_parseFromJSON(cJSON *nf_profileJSON) ogs_error("OpenAPI_nf_profile_parseFromJSON() failed [serving_scope]"); goto end; } - OpenAPI_list_add(serving_scopeList, ogs_strdup(serving_scope_local->valuestring)); + OpenAPI_list_add(serving_scopeList, ogs_strdup_or_assert(serving_scope_local->valuestring)); } } @@ -2290,7 +2290,7 @@ OpenAPI_nf_profile_t *OpenAPI_nf_profile_parseFromJSON(cJSON *nf_profileJSON) ogs_error("OpenAPI_nf_profile_parseFromJSON() failed [scp_domains]"); goto end; } - OpenAPI_list_add(scp_domainsList, ogs_strdup(scp_domains_local->valuestring)); + OpenAPI_list_add(scp_domainsList, ogs_strdup_or_assert(scp_domains_local->valuestring)); } } @@ -2302,8 +2302,8 @@ OpenAPI_nf_profile_t *OpenAPI_nf_profile_parseFromJSON(cJSON *nf_profileJSON) } nf_profile_local_var = OpenAPI_nf_profile_create ( - ogs_strdup(nf_instance_id->valuestring), - nf_instance_name ? ogs_strdup(nf_instance_name->valuestring) : NULL, + ogs_strdup_or_assert(nf_instance_id->valuestring), + nf_instance_name ? ogs_strdup_or_assert(nf_instance_name->valuestring) : NULL, nf_typeVariable, nf_statusVariable, heart_beat_timer ? heart_beat_timer->valuedouble : 0, @@ -2312,8 +2312,8 @@ OpenAPI_nf_profile_t *OpenAPI_nf_profile_parseFromJSON(cJSON *nf_profileJSON) s_nssais ? s_nssaisList : NULL, per_plmn_snssai_list ? per_plmn_snssai_listList : NULL, nsi_list ? nsi_listList : NULL, - fqdn ? ogs_strdup(fqdn->valuestring) : NULL, - inter_plmn_fqdn ? ogs_strdup(inter_plmn_fqdn->valuestring) : NULL, + fqdn ? ogs_strdup_or_assert(fqdn->valuestring) : NULL, + inter_plmn_fqdn ? ogs_strdup_or_assert(inter_plmn_fqdn->valuestring) : NULL, ipv4_addresses ? ipv4_addressesList : NULL, ipv6_addresses ? ipv6_addressesList : NULL, allowed_plmns ? allowed_plmnsList : NULL, @@ -2324,8 +2324,8 @@ OpenAPI_nf_profile_t *OpenAPI_nf_profile_parseFromJSON(cJSON *nf_profileJSON) priority ? priority->valuedouble : 0, capacity ? capacity->valuedouble : 0, load ? load->valuedouble : 0, - load_time_stamp ? ogs_strdup(load_time_stamp->valuestring) : NULL, - locality ? ogs_strdup(locality->valuestring) : NULL, + load_time_stamp ? ogs_strdup_or_assert(load_time_stamp->valuestring) : NULL, + locality ? ogs_strdup_or_assert(locality->valuestring) : NULL, udr_info ? udr_info_local_nonprim : NULL, udr_info_list ? udr_info_listList : NULL, udm_info ? udm_info_local_nonprim : NULL, @@ -2352,7 +2352,7 @@ OpenAPI_nf_profile_t *OpenAPI_nf_profile_parseFromJSON(cJSON *nf_profileJSON) pcscf_info_list ? pcscf_info_listList : NULL, hss_info_list ? hss_info_listList : NULL, custom_info ? custom_info_local_object : NULL, - recovery_time ? ogs_strdup(recovery_time->valuestring) : NULL, + recovery_time ? ogs_strdup_or_assert(recovery_time->valuestring) : NULL, nf_service_persistence ? nf_service_persistence->valueint : 0, nf_services ? nf_servicesList : NULL, nf_service_list ? nf_service_listList : NULL, diff --git a/lib/sbi/openapi/model/nf_service.c b/lib/sbi/openapi/model/nf_service.c index 9e614b5bdf..da9dc94f5a 100644 --- a/lib/sbi/openapi/model/nf_service.c +++ b/lib/sbi/openapi/model/nf_service.c @@ -765,7 +765,7 @@ OpenAPI_nf_service_t *OpenAPI_nf_service_parseFromJSON(cJSON *nf_serviceJSON) ogs_error("OpenAPI_nf_service_parseFromJSON() failed [allowed_nf_domains]"); goto end; } - OpenAPI_list_add(allowed_nf_domainsList, ogs_strdup(allowed_nf_domains_local->valuestring)); + OpenAPI_list_add(allowed_nf_domainsList, ogs_strdup_or_assert(allowed_nf_domains_local->valuestring)); } } @@ -903,7 +903,7 @@ OpenAPI_nf_service_t *OpenAPI_nf_service_parseFromJSON(cJSON *nf_serviceJSON) ogs_error("OpenAPI_nf_service_parseFromJSON() failed [nf_service_set_id_list]"); goto end; } - OpenAPI_list_add(nf_service_set_id_listList, ogs_strdup(nf_service_set_id_list_local->valuestring)); + OpenAPI_list_add(nf_service_set_id_listList, ogs_strdup_or_assert(nf_service_set_id_list_local->valuestring)); } } @@ -989,15 +989,15 @@ OpenAPI_nf_service_t *OpenAPI_nf_service_parseFromJSON(cJSON *nf_serviceJSON) } nf_service_local_var = OpenAPI_nf_service_create ( - ogs_strdup(service_instance_id->valuestring), - ogs_strdup(service_name->valuestring), + ogs_strdup_or_assert(service_instance_id->valuestring), + ogs_strdup_or_assert(service_name->valuestring), versionsList, schemeVariable, nf_service_statusVariable, - fqdn ? ogs_strdup(fqdn->valuestring) : NULL, - inter_plmn_fqdn ? ogs_strdup(inter_plmn_fqdn->valuestring) : NULL, + fqdn ? ogs_strdup_or_assert(fqdn->valuestring) : NULL, + inter_plmn_fqdn ? ogs_strdup_or_assert(inter_plmn_fqdn->valuestring) : NULL, ip_end_points ? ip_end_pointsList : NULL, - api_prefix ? ogs_strdup(api_prefix->valuestring) : NULL, + api_prefix ? ogs_strdup_or_assert(api_prefix->valuestring) : NULL, default_notification_subscriptions ? default_notification_subscriptionsList : NULL, allowed_plmns ? allowed_plmnsList : NULL, allowed_snpns ? allowed_snpnsList : NULL, @@ -1009,14 +1009,14 @@ OpenAPI_nf_service_t *OpenAPI_nf_service_parseFromJSON(cJSON *nf_serviceJSON) priority ? priority->valuedouble : 0, capacity ? capacity->valuedouble : 0, load ? load->valuedouble : 0, - load_time_stamp ? ogs_strdup(load_time_stamp->valuestring) : NULL, - recovery_time ? ogs_strdup(recovery_time->valuestring) : NULL, + load_time_stamp ? ogs_strdup_or_assert(load_time_stamp->valuestring) : NULL, + recovery_time ? ogs_strdup_or_assert(recovery_time->valuestring) : NULL, chf_service_info ? chf_service_info_local_nonprim : NULL, - supported_features ? ogs_strdup(supported_features->valuestring) : NULL, + supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL, nf_service_set_id_list ? nf_service_set_id_listList : NULL, s_nssais ? s_nssaisList : NULL, per_plmn_snssai_list ? per_plmn_snssai_listList : NULL, - vendor_id ? ogs_strdup(vendor_id->valuestring) : NULL, + vendor_id ? ogs_strdup_or_assert(vendor_id->valuestring) : NULL, supported_vendor_specific_features ? supported_vendor_specific_featuresList : NULL, oauth2_required ? oauth2_required->valueint : 0 ); diff --git a/lib/sbi/openapi/model/nf_service_set_cond.c b/lib/sbi/openapi/model/nf_service_set_cond.c index 94880037da..a47f0c2aaa 100644 --- a/lib/sbi/openapi/model/nf_service_set_cond.c +++ b/lib/sbi/openapi/model/nf_service_set_cond.c @@ -62,7 +62,7 @@ OpenAPI_nf_service_set_cond_t *OpenAPI_nf_service_set_cond_parseFromJSON(cJSON * } nf_service_set_cond_local_var = OpenAPI_nf_service_set_cond_create ( - ogs_strdup(nf_service_set_id->valuestring) + ogs_strdup_or_assert(nf_service_set_id->valuestring) ); return nf_service_set_cond_local_var; diff --git a/lib/sbi/openapi/model/nf_service_version.c b/lib/sbi/openapi/model/nf_service_version.c index 1be4254e06..7214707a59 100644 --- a/lib/sbi/openapi/model/nf_service_version.c +++ b/lib/sbi/openapi/model/nf_service_version.c @@ -101,9 +101,9 @@ OpenAPI_nf_service_version_t *OpenAPI_nf_service_version_parseFromJSON(cJSON *nf } nf_service_version_local_var = OpenAPI_nf_service_version_create ( - ogs_strdup(api_version_in_uri->valuestring), - ogs_strdup(api_full_version->valuestring), - expiry ? ogs_strdup(expiry->valuestring) : NULL + ogs_strdup_or_assert(api_version_in_uri->valuestring), + ogs_strdup_or_assert(api_full_version->valuestring), + expiry ? ogs_strdup_or_assert(expiry->valuestring) : NULL ); return nf_service_version_local_var; diff --git a/lib/sbi/openapi/model/nf_set_cond.c b/lib/sbi/openapi/model/nf_set_cond.c index 7f58946ba2..7e148343ab 100644 --- a/lib/sbi/openapi/model/nf_set_cond.c +++ b/lib/sbi/openapi/model/nf_set_cond.c @@ -62,7 +62,7 @@ OpenAPI_nf_set_cond_t *OpenAPI_nf_set_cond_parseFromJSON(cJSON *nf_set_condJSON) } nf_set_cond_local_var = OpenAPI_nf_set_cond_create ( - ogs_strdup(nf_set_id->valuestring) + ogs_strdup_or_assert(nf_set_id->valuestring) ); return nf_set_cond_local_var; diff --git a/lib/sbi/openapi/model/nidd_information.c b/lib/sbi/openapi/model/nidd_information.c index 02394df1c2..a96f5fb04f 100644 --- a/lib/sbi/openapi/model/nidd_information.c +++ b/lib/sbi/openapi/model/nidd_information.c @@ -100,9 +100,9 @@ OpenAPI_nidd_information_t *OpenAPI_nidd_information_parseFromJSON(cJSON *nidd_i } nidd_information_local_var = OpenAPI_nidd_information_create ( - ogs_strdup(af_id->valuestring), - gpsi ? ogs_strdup(gpsi->valuestring) : NULL, - ext_group_id ? ogs_strdup(ext_group_id->valuestring) : NULL + ogs_strdup_or_assert(af_id->valuestring), + gpsi ? ogs_strdup_or_assert(gpsi->valuestring) : NULL, + ext_group_id ? ogs_strdup_or_assert(ext_group_id->valuestring) : NULL ); return nidd_information_local_var; diff --git a/lib/sbi/openapi/model/non_ue_n2_info_subscription_create_data.c b/lib/sbi/openapi/model/non_ue_n2_info_subscription_create_data.c index 3d4bfe4358..c8d67e6267 100644 --- a/lib/sbi/openapi/model/non_ue_n2_info_subscription_create_data.c +++ b/lib/sbi/openapi/model/non_ue_n2_info_subscription_create_data.c @@ -213,9 +213,9 @@ OpenAPI_non_ue_n2_info_subscription_create_data_t *OpenAPI_non_ue_n2_info_subscr global_ran_node_list ? global_ran_node_listList : NULL, an_type_list ? an_type_listList : NULL, n2_information_classVariable, - ogs_strdup(n2_notify_callback_uri->valuestring), - nf_id ? ogs_strdup(nf_id->valuestring) : NULL, - supported_features ? ogs_strdup(supported_features->valuestring) : NULL + ogs_strdup_or_assert(n2_notify_callback_uri->valuestring), + nf_id ? ogs_strdup_or_assert(nf_id->valuestring) : NULL, + supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL ); return non_ue_n2_info_subscription_create_data_local_var; diff --git a/lib/sbi/openapi/model/non_ue_n2_info_subscription_created_data.c b/lib/sbi/openapi/model/non_ue_n2_info_subscription_created_data.c index d0932685eb..da56baca6d 100644 --- a/lib/sbi/openapi/model/non_ue_n2_info_subscription_created_data.c +++ b/lib/sbi/openapi/model/non_ue_n2_info_subscription_created_data.c @@ -101,8 +101,8 @@ OpenAPI_non_ue_n2_info_subscription_created_data_t *OpenAPI_non_ue_n2_info_subsc } non_ue_n2_info_subscription_created_data_local_var = OpenAPI_non_ue_n2_info_subscription_created_data_create ( - ogs_strdup(n2_notify_subscription_id->valuestring), - supported_features ? ogs_strdup(supported_features->valuestring) : NULL, + ogs_strdup_or_assert(n2_notify_subscription_id->valuestring), + supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL, n2_information_class ? n2_information_classVariable : 0 ); diff --git a/lib/sbi/openapi/model/notif_condition.c b/lib/sbi/openapi/model/notif_condition.c index 8fc71e9efb..d1b9e5dd65 100644 --- a/lib/sbi/openapi/model/notif_condition.c +++ b/lib/sbi/openapi/model/notif_condition.c @@ -101,7 +101,7 @@ OpenAPI_notif_condition_t *OpenAPI_notif_condition_parseFromJSON(cJSON *notif_co ogs_error("OpenAPI_notif_condition_parseFromJSON() failed [monitored_attributes]"); goto end; } - OpenAPI_list_add(monitored_attributesList, ogs_strdup(monitored_attributes_local->valuestring)); + OpenAPI_list_add(monitored_attributesList, ogs_strdup_or_assert(monitored_attributes_local->valuestring)); } } @@ -121,7 +121,7 @@ OpenAPI_notif_condition_t *OpenAPI_notif_condition_parseFromJSON(cJSON *notif_co ogs_error("OpenAPI_notif_condition_parseFromJSON() failed [unmonitored_attributes]"); goto end; } - OpenAPI_list_add(unmonitored_attributesList, ogs_strdup(unmonitored_attributes_local->valuestring)); + OpenAPI_list_add(unmonitored_attributesList, ogs_strdup_or_assert(unmonitored_attributes_local->valuestring)); } } diff --git a/lib/sbi/openapi/model/notification_data.c b/lib/sbi/openapi/model/notification_data.c index dc9103f3ad..426c2aa2a4 100644 --- a/lib/sbi/openapi/model/notification_data.c +++ b/lib/sbi/openapi/model/notification_data.c @@ -176,7 +176,7 @@ OpenAPI_notification_data_t *OpenAPI_notification_data_parseFromJSON(cJSON *noti notification_data_local_var = OpenAPI_notification_data_create ( eventVariable, - ogs_strdup(nf_instance_uri->valuestring), + ogs_strdup_or_assert(nf_instance_uri->valuestring), nf_profile ? nf_profile_local_nonprim : NULL, profile_changes ? profile_changesList : NULL, condition_event ? condition_eventVariable : 0 diff --git a/lib/sbi/openapi/model/notification_item.c b/lib/sbi/openapi/model/notification_item.c index b61398c1ce..b9a9ac188e 100644 --- a/lib/sbi/openapi/model/notification_item.c +++ b/lib/sbi/openapi/model/notification_item.c @@ -112,7 +112,7 @@ OpenAPI_notification_item_t *OpenAPI_notification_item_parseFromJSON(cJSON *noti } notification_item_local_var = OpenAPI_notification_item_create ( - ogs_strdup(resource_id->valuestring), + ogs_strdup_or_assert(resource_id->valuestring), notif_itemsList ); diff --git a/lib/sbi/openapi/model/notify_item.c b/lib/sbi/openapi/model/notify_item.c index 89ed1b516f..5b2e4568de 100644 --- a/lib/sbi/openapi/model/notify_item.c +++ b/lib/sbi/openapi/model/notify_item.c @@ -112,7 +112,7 @@ OpenAPI_notify_item_t *OpenAPI_notify_item_parseFromJSON(cJSON *notify_itemJSON) } notify_item_local_var = OpenAPI_notify_item_create ( - ogs_strdup(resource_id->valuestring), + ogs_strdup_or_assert(resource_id->valuestring), changesList ); diff --git a/lib/sbi/openapi/model/nr_location.c b/lib/sbi/openapi/model/nr_location.c index 095dcb9b0b..57bb92fe4f 100644 --- a/lib/sbi/openapi/model/nr_location.c +++ b/lib/sbi/openapi/model/nr_location.c @@ -191,9 +191,9 @@ OpenAPI_nr_location_t *OpenAPI_nr_location_parseFromJSON(cJSON *nr_locationJSON) tai_local_nonprim, ncgi_local_nonprim, age_of_location_information ? age_of_location_information->valuedouble : 0, - ue_location_timestamp ? ogs_strdup(ue_location_timestamp->valuestring) : NULL, - geographical_information ? ogs_strdup(geographical_information->valuestring) : NULL, - geodetic_information ? ogs_strdup(geodetic_information->valuestring) : NULL, + ue_location_timestamp ? ogs_strdup_or_assert(ue_location_timestamp->valuestring) : NULL, + geographical_information ? ogs_strdup_or_assert(geographical_information->valuestring) : NULL, + geodetic_information ? ogs_strdup_or_assert(geodetic_information->valuestring) : NULL, global_gnb_id ? global_gnb_id_local_nonprim : NULL ); diff --git a/lib/sbi/openapi/model/nrppa_information.c b/lib/sbi/openapi/model/nrppa_information.c index 5840ca9306..e3f00d9a66 100644 --- a/lib/sbi/openapi/model/nrppa_information.c +++ b/lib/sbi/openapi/model/nrppa_information.c @@ -105,9 +105,9 @@ OpenAPI_nrppa_information_t *OpenAPI_nrppa_information_parseFromJSON(cJSON *nrpp } nrppa_information_local_var = OpenAPI_nrppa_information_create ( - ogs_strdup(nf_id->valuestring), + ogs_strdup_or_assert(nf_id->valuestring), nrppa_pdu_local_nonprim, - service_instance_id ? ogs_strdup(service_instance_id->valuestring) : NULL + service_instance_id ? ogs_strdup_or_assert(service_instance_id->valuestring) : NULL ); return nrppa_information_local_var; diff --git a/lib/sbi/openapi/model/nsi_information.c b/lib/sbi/openapi/model/nsi_information.c index b19585a908..7366976007 100644 --- a/lib/sbi/openapi/model/nsi_information.c +++ b/lib/sbi/openapi/model/nsi_information.c @@ -119,10 +119,10 @@ OpenAPI_nsi_information_t *OpenAPI_nsi_information_parseFromJSON(cJSON *nsi_info } nsi_information_local_var = OpenAPI_nsi_information_create ( - ogs_strdup(nrf_id->valuestring), - nsi_id ? ogs_strdup(nsi_id->valuestring) : NULL, - nrf_nf_mgt_uri ? ogs_strdup(nrf_nf_mgt_uri->valuestring) : NULL, - nrf_access_token_uri ? ogs_strdup(nrf_access_token_uri->valuestring) : NULL + ogs_strdup_or_assert(nrf_id->valuestring), + nsi_id ? ogs_strdup_or_assert(nsi_id->valuestring) : NULL, + nrf_nf_mgt_uri ? ogs_strdup_or_assert(nrf_nf_mgt_uri->valuestring) : NULL, + nrf_access_token_uri ? ogs_strdup_or_assert(nrf_access_token_uri->valuestring) : NULL ); return nsi_information_local_var; diff --git a/lib/sbi/openapi/model/nssai.c b/lib/sbi/openapi/model/nssai.c index ab055b4351..5a868a6cbb 100644 --- a/lib/sbi/openapi/model/nssai.c +++ b/lib/sbi/openapi/model/nssai.c @@ -231,10 +231,10 @@ OpenAPI_nssai_t *OpenAPI_nssai_parseFromJSON(cJSON *nssaiJSON) } nssai_local_var = OpenAPI_nssai_create ( - supported_features ? ogs_strdup(supported_features->valuestring) : NULL, + supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL, default_single_nssaisList, single_nssais ? single_nssaisList : NULL, - provisioning_time ? ogs_strdup(provisioning_time->valuestring) : NULL, + provisioning_time ? ogs_strdup_or_assert(provisioning_time->valuestring) : NULL, additional_snssai_data ? additional_snssai_dataList : NULL ); diff --git a/lib/sbi/openapi/model/nssai_ack_data.c b/lib/sbi/openapi/model/nssai_ack_data.c index 6fb4eb59c6..04fa51398b 100644 --- a/lib/sbi/openapi/model/nssai_ack_data.c +++ b/lib/sbi/openapi/model/nssai_ack_data.c @@ -83,7 +83,7 @@ OpenAPI_nssai_ack_data_t *OpenAPI_nssai_ack_data_parseFromJSON(cJSON *nssai_ack_ ue_update_statusVariable = OpenAPI_ue_update_status_FromString(ue_update_status->valuestring); nssai_ack_data_local_var = OpenAPI_nssai_ack_data_create ( - ogs_strdup(provisioning_time->valuestring), + ogs_strdup_or_assert(provisioning_time->valuestring), ue_update_statusVariable ); diff --git a/lib/sbi/openapi/model/nwdaf_cond.c b/lib/sbi/openapi/model/nwdaf_cond.c index d63f5c7962..741368106b 100644 --- a/lib/sbi/openapi/model/nwdaf_cond.c +++ b/lib/sbi/openapi/model/nwdaf_cond.c @@ -79,7 +79,7 @@ OpenAPI_nwdaf_cond_t *OpenAPI_nwdaf_cond_parseFromJSON(cJSON *nwdaf_condJSON) ogs_error("OpenAPI_nwdaf_cond_parseFromJSON() failed [analytics_ids]"); goto end; } - OpenAPI_list_add(analytics_idsList, ogs_strdup(analytics_ids_local->valuestring)); + OpenAPI_list_add(analytics_idsList, ogs_strdup_or_assert(analytics_ids_local->valuestring)); } } diff --git a/lib/sbi/openapi/model/object.c b/lib/sbi/openapi/model/object.c index cf94a1a8e4..b68c4bbec1 100644 --- a/lib/sbi/openapi/model/object.c +++ b/lib/sbi/openapi/model/object.c @@ -6,6 +6,7 @@ OpenAPI_object_t *OpenAPI_object_create(void) { OpenAPI_object_t *object = ogs_malloc(sizeof(OpenAPI_object_t)); + ogs_assert(object); return object; } diff --git a/lib/sbi/openapi/model/operator_specific_data_container.c b/lib/sbi/openapi/model/operator_specific_data_container.c index 6068eee086..db5dd409c5 100644 --- a/lib/sbi/openapi/model/operator_specific_data_container.c +++ b/lib/sbi/openapi/model/operator_specific_data_container.c @@ -145,9 +145,9 @@ OpenAPI_operator_specific_data_container_t *OpenAPI_operator_specific_data_conta operator_specific_data_container_local_var = OpenAPI_operator_specific_data_container_create ( data_typeVariable, - data_type_definition ? ogs_strdup(data_type_definition->valuestring) : NULL, - ogs_strdup(value->valuestring), - supported_features ? ogs_strdup(supported_features->valuestring) : NULL + data_type_definition ? ogs_strdup_or_assert(data_type_definition->valuestring) : NULL, + ogs_strdup_or_assert(value->valuestring), + supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL ); return operator_specific_data_container_local_var; diff --git a/lib/sbi/openapi/model/options_response.c b/lib/sbi/openapi/model/options_response.c index 4a625f48ae..cedddb5717 100644 --- a/lib/sbi/openapi/model/options_response.c +++ b/lib/sbi/openapi/model/options_response.c @@ -61,7 +61,7 @@ OpenAPI_options_response_t *OpenAPI_options_response_parseFromJSON(cJSON *option } options_response_local_var = OpenAPI_options_response_create ( - supported_features ? ogs_strdup(supported_features->valuestring) : NULL + supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL ); return options_response_local_var; diff --git a/lib/sbi/openapi/model/packet_filter_info.c b/lib/sbi/openapi/model/packet_filter_info.c index af9c58a75f..e90e762af2 100644 --- a/lib/sbi/openapi/model/packet_filter_info.c +++ b/lib/sbi/openapi/model/packet_filter_info.c @@ -157,11 +157,11 @@ OpenAPI_packet_filter_info_t *OpenAPI_packet_filter_info_parseFromJSON(cJSON *pa } packet_filter_info_local_var = OpenAPI_packet_filter_info_create ( - pack_filt_id ? ogs_strdup(pack_filt_id->valuestring) : NULL, - pack_filt_cont ? ogs_strdup(pack_filt_cont->valuestring) : NULL, - tos_traffic_class ? ogs_strdup(tos_traffic_class->valuestring) : NULL, - spi ? ogs_strdup(spi->valuestring) : NULL, - flow_label ? ogs_strdup(flow_label->valuestring) : NULL, + pack_filt_id ? ogs_strdup_or_assert(pack_filt_id->valuestring) : NULL, + pack_filt_cont ? ogs_strdup_or_assert(pack_filt_cont->valuestring) : NULL, + tos_traffic_class ? ogs_strdup_or_assert(tos_traffic_class->valuestring) : NULL, + spi ? ogs_strdup_or_assert(spi->valuestring) : NULL, + flow_label ? ogs_strdup_or_assert(flow_label->valuestring) : NULL, flow_direction ? flow_directionVariable : 0 ); diff --git a/lib/sbi/openapi/model/parameter_combination.c b/lib/sbi/openapi/model/parameter_combination.c index ca7fdfa8eb..70fdbf70ec 100644 --- a/lib/sbi/openapi/model/parameter_combination.c +++ b/lib/sbi/openapi/model/parameter_combination.c @@ -103,8 +103,8 @@ OpenAPI_parameter_combination_t *OpenAPI_parameter_combination_parseFromJSON(cJS } parameter_combination_local_var = OpenAPI_parameter_combination_create ( - supi ? ogs_strdup(supi->valuestring) : NULL, - dnn ? ogs_strdup(dnn->valuestring) : NULL, + supi ? ogs_strdup_or_assert(supi->valuestring) : NULL, + dnn ? ogs_strdup_or_assert(dnn->valuestring) : NULL, snssai ? snssai_local_nonprim : NULL ); diff --git a/lib/sbi/openapi/model/parameter_over_pc5.c b/lib/sbi/openapi/model/parameter_over_pc5.c index 3b133395e1..aac14abed0 100644 --- a/lib/sbi/openapi/model/parameter_over_pc5.c +++ b/lib/sbi/openapi/model/parameter_over_pc5.c @@ -321,7 +321,7 @@ OpenAPI_parameter_over_pc5_t *OpenAPI_parameter_over_pc5_parseFromJSON(cJSON *pa } parameter_over_pc5_local_var = OpenAPI_parameter_over_pc5_create ( - expiry ? ogs_strdup(expiry->valuestring) : NULL, + expiry ? ogs_strdup_or_assert(expiry->valuestring) : NULL, plmm_rat_served ? plmm_rat_servedList : NULL, auth_not_served ? auth_not_served->valueint : 0, radio_params_not_served ? radio_params_not_servedList : NULL, diff --git a/lib/sbi/openapi/model/parameter_over_uu.c b/lib/sbi/openapi/model/parameter_over_uu.c index 03481d8f7e..b8d3b2b5c3 100644 --- a/lib/sbi/openapi/model/parameter_over_uu.c +++ b/lib/sbi/openapi/model/parameter_over_uu.c @@ -159,7 +159,7 @@ OpenAPI_parameter_over_uu_t *OpenAPI_parameter_over_uu_parseFromJSON(cJSON *para } parameter_over_uu_local_var = OpenAPI_parameter_over_uu_create ( - expiry ? ogs_strdup(expiry->valuestring) : NULL, + expiry ? ogs_strdup_or_assert(expiry->valuestring) : NULL, ser_to_pdu_sess ? ser_to_pdu_sessList : NULL, ser_to_app_addr ? ser_to_app_addrList : NULL ); diff --git a/lib/sbi/openapi/model/patch_item.c b/lib/sbi/openapi/model/patch_item.c index 629563c40b..79b345ac16 100644 --- a/lib/sbi/openapi/model/patch_item.c +++ b/lib/sbi/openapi/model/patch_item.c @@ -122,9 +122,9 @@ OpenAPI_patch_item_t *OpenAPI_patch_item_parseFromJSON(cJSON *patch_itemJSON) patch_item_local_var = OpenAPI_patch_item_create ( opVariable, - ogs_strdup(path->valuestring), - from ? ogs_strdup(from->valuestring) : NULL, - value ? ogs_strdup(value->valuestring) : NULL + ogs_strdup_or_assert(path->valuestring), + from ? ogs_strdup_or_assert(from->valuestring) : NULL, + value ? ogs_strdup_or_assert(value->valuestring) : NULL ); return patch_item_local_var; diff --git a/lib/sbi/openapi/model/pc5_flow_bit_rates.c b/lib/sbi/openapi/model/pc5_flow_bit_rates.c index 05023943cb..a47e668cce 100644 --- a/lib/sbi/openapi/model/pc5_flow_bit_rates.c +++ b/lib/sbi/openapi/model/pc5_flow_bit_rates.c @@ -80,8 +80,8 @@ OpenAPI_pc5_flow_bit_rates_t *OpenAPI_pc5_flow_bit_rates_parseFromJSON(cJSON *pc } pc5_flow_bit_rates_local_var = OpenAPI_pc5_flow_bit_rates_create ( - gua_fbr ? ogs_strdup(gua_fbr->valuestring) : NULL, - max_fbr ? ogs_strdup(max_fbr->valuestring) : NULL + gua_fbr ? ogs_strdup_or_assert(gua_fbr->valuestring) : NULL, + max_fbr ? ogs_strdup_or_assert(max_fbr->valuestring) : NULL ); return pc5_flow_bit_rates_local_var; diff --git a/lib/sbi/openapi/model/pc5_qo_s_para.c b/lib/sbi/openapi/model/pc5_qo_s_para.c index fc4d9e2a0e..d6b372ed32 100644 --- a/lib/sbi/openapi/model/pc5_qo_s_para.c +++ b/lib/sbi/openapi/model/pc5_qo_s_para.c @@ -112,7 +112,7 @@ OpenAPI_pc5_qo_s_para_t *OpenAPI_pc5_qo_s_para_parseFromJSON(cJSON *pc5_qo_s_par pc5_qo_s_para_local_var = OpenAPI_pc5_qo_s_para_create ( pc5_qos_flow_listList, - pc5_link_ambr ? ogs_strdup(pc5_link_ambr->valuestring) : NULL + pc5_link_ambr ? ogs_strdup_or_assert(pc5_link_ambr->valuestring) : NULL ); return pc5_qo_s_para_local_var; diff --git a/lib/sbi/openapi/model/pc5_qos_mapping.c b/lib/sbi/openapi/model/pc5_qos_mapping.c index 53fa0d1856..268742ec98 100644 --- a/lib/sbi/openapi/model/pc5_qos_mapping.c +++ b/lib/sbi/openapi/model/pc5_qos_mapping.c @@ -97,7 +97,7 @@ OpenAPI_pc5_qos_mapping_t *OpenAPI_pc5_qos_mapping_parseFromJSON(cJSON *pc5_qos_ ogs_error("OpenAPI_pc5_qos_mapping_parseFromJSON() failed [ser_ids]"); goto end; } - OpenAPI_list_add(ser_idsList, ogs_strdup(ser_ids_local->valuestring)); + OpenAPI_list_add(ser_idsList, ogs_strdup_or_assert(ser_ids_local->valuestring)); } cJSON *pc5_qo_s_flow_param = cJSON_GetObjectItemCaseSensitive(pc5_qos_mappingJSON, "pc5QoSFlowParam"); diff --git a/lib/sbi/openapi/model/pcc_rule.c b/lib/sbi/openapi/model/pcc_rule.c index 3a408f44c8..17de042541 100644 --- a/lib/sbi/openapi/model/pcc_rule.c +++ b/lib/sbi/openapi/model/pcc_rule.c @@ -446,7 +446,7 @@ OpenAPI_pcc_rule_t *OpenAPI_pcc_rule_parseFromJSON(cJSON *pcc_ruleJSON) ogs_error("OpenAPI_pcc_rule_parseFromJSON() failed [ref_qos_data]"); goto end; } - OpenAPI_list_add(ref_qos_dataList, ogs_strdup(ref_qos_data_local->valuestring)); + OpenAPI_list_add(ref_qos_dataList, ogs_strdup_or_assert(ref_qos_data_local->valuestring)); } } @@ -466,7 +466,7 @@ OpenAPI_pcc_rule_t *OpenAPI_pcc_rule_parseFromJSON(cJSON *pcc_ruleJSON) ogs_error("OpenAPI_pcc_rule_parseFromJSON() failed [ref_alt_qos_params]"); goto end; } - OpenAPI_list_add(ref_alt_qos_paramsList, ogs_strdup(ref_alt_qos_params_local->valuestring)); + OpenAPI_list_add(ref_alt_qos_paramsList, ogs_strdup_or_assert(ref_alt_qos_params_local->valuestring)); } } @@ -486,7 +486,7 @@ OpenAPI_pcc_rule_t *OpenAPI_pcc_rule_parseFromJSON(cJSON *pcc_ruleJSON) ogs_error("OpenAPI_pcc_rule_parseFromJSON() failed [ref_tc_data]"); goto end; } - OpenAPI_list_add(ref_tc_dataList, ogs_strdup(ref_tc_data_local->valuestring)); + OpenAPI_list_add(ref_tc_dataList, ogs_strdup_or_assert(ref_tc_data_local->valuestring)); } } @@ -506,7 +506,7 @@ OpenAPI_pcc_rule_t *OpenAPI_pcc_rule_parseFromJSON(cJSON *pcc_ruleJSON) ogs_error("OpenAPI_pcc_rule_parseFromJSON() failed [ref_chg_data]"); goto end; } - OpenAPI_list_add(ref_chg_dataList, ogs_strdup(ref_chg_data_local->valuestring)); + OpenAPI_list_add(ref_chg_dataList, ogs_strdup_or_assert(ref_chg_data_local->valuestring)); } } @@ -526,7 +526,7 @@ OpenAPI_pcc_rule_t *OpenAPI_pcc_rule_parseFromJSON(cJSON *pcc_ruleJSON) ogs_error("OpenAPI_pcc_rule_parseFromJSON() failed [ref_chg_n3g_data]"); goto end; } - OpenAPI_list_add(ref_chg_n3g_dataList, ogs_strdup(ref_chg_n3g_data_local->valuestring)); + OpenAPI_list_add(ref_chg_n3g_dataList, ogs_strdup_or_assert(ref_chg_n3g_data_local->valuestring)); } } @@ -546,7 +546,7 @@ OpenAPI_pcc_rule_t *OpenAPI_pcc_rule_parseFromJSON(cJSON *pcc_ruleJSON) ogs_error("OpenAPI_pcc_rule_parseFromJSON() failed [ref_um_data]"); goto end; } - OpenAPI_list_add(ref_um_dataList, ogs_strdup(ref_um_data_local->valuestring)); + OpenAPI_list_add(ref_um_dataList, ogs_strdup_or_assert(ref_um_data_local->valuestring)); } } @@ -566,7 +566,7 @@ OpenAPI_pcc_rule_t *OpenAPI_pcc_rule_parseFromJSON(cJSON *pcc_ruleJSON) ogs_error("OpenAPI_pcc_rule_parseFromJSON() failed [ref_um_n3g_data]"); goto end; } - OpenAPI_list_add(ref_um_n3g_dataList, ogs_strdup(ref_um_n3g_data_local->valuestring)); + OpenAPI_list_add(ref_um_n3g_dataList, ogs_strdup_or_assert(ref_um_n3g_data_local->valuestring)); } } @@ -595,7 +595,7 @@ OpenAPI_pcc_rule_t *OpenAPI_pcc_rule_parseFromJSON(cJSON *pcc_ruleJSON) ogs_error("OpenAPI_pcc_rule_parseFromJSON() failed [ref_qos_mon]"); goto end; } - OpenAPI_list_add(ref_qos_monList, ogs_strdup(ref_qos_mon_local->valuestring)); + OpenAPI_list_add(ref_qos_monList, ogs_strdup_or_assert(ref_qos_mon_local->valuestring)); } } @@ -624,9 +624,9 @@ OpenAPI_pcc_rule_t *OpenAPI_pcc_rule_parseFromJSON(cJSON *pcc_ruleJSON) pcc_rule_local_var = OpenAPI_pcc_rule_create ( flow_infos ? flow_infosList : NULL, - app_id ? ogs_strdup(app_id->valuestring) : NULL, + app_id ? ogs_strdup_or_assert(app_id->valuestring) : NULL, cont_ver ? cont_ver->valuedouble : 0, - ogs_strdup(pcc_rule_id->valuestring), + ogs_strdup_or_assert(pcc_rule_id->valuestring), precedence ? precedence->valuedouble : 0, af_sig_protocol ? af_sig_protocolVariable : 0, app_reloc ? app_reloc->valueint : 0, @@ -637,7 +637,7 @@ OpenAPI_pcc_rule_t *OpenAPI_pcc_rule_parseFromJSON(cJSON *pcc_ruleJSON) ref_chg_n3g_data ? ref_chg_n3g_dataList : NULL, ref_um_data ? ref_um_dataList : NULL, ref_um_n3g_data ? ref_um_n3g_dataList : NULL, - ref_cond_data ? ogs_strdup(ref_cond_data->valuestring) : NULL, + ref_cond_data ? ogs_strdup_or_assert(ref_cond_data->valuestring) : NULL, ref_qos_mon ? ref_qos_monList : NULL, addr_preser_ind ? addr_preser_ind->valueint : 0, tscai_input_dl ? tscai_input_dl_local_nonprim : NULL, diff --git a/lib/sbi/openapi/model/pcf_binding.c b/lib/sbi/openapi/model/pcf_binding.c index 595139c7a5..427bc09cd8 100644 --- a/lib/sbi/openapi/model/pcf_binding.c +++ b/lib/sbi/openapi/model/pcf_binding.c @@ -420,7 +420,7 @@ OpenAPI_pcf_binding_t *OpenAPI_pcf_binding_parseFromJSON(cJSON *pcf_bindingJSON) ogs_error("OpenAPI_pcf_binding_parseFromJSON() failed [add_ipv6_prefixes]"); goto end; } - OpenAPI_list_add(add_ipv6_prefixesList, ogs_strdup(add_ipv6_prefixes_local->valuestring)); + OpenAPI_list_add(add_ipv6_prefixesList, ogs_strdup_or_assert(add_ipv6_prefixes_local->valuestring)); } } @@ -458,7 +458,7 @@ OpenAPI_pcf_binding_t *OpenAPI_pcf_binding_parseFromJSON(cJSON *pcf_bindingJSON) ogs_error("OpenAPI_pcf_binding_parseFromJSON() failed [add_mac_addrs]"); goto end; } - OpenAPI_list_add(add_mac_addrsList, ogs_strdup(add_mac_addrs_local->valuestring)); + OpenAPI_list_add(add_mac_addrsList, ogs_strdup_or_assert(add_mac_addrs_local->valuestring)); } } @@ -636,7 +636,7 @@ OpenAPI_pcf_binding_t *OpenAPI_pcf_binding_parseFromJSON(cJSON *pcf_bindingJSON) ogs_error("OpenAPI_pcf_binding_parseFromJSON() failed [ipv4_frame_route_list]"); goto end; } - OpenAPI_list_add(ipv4_frame_route_listList, ogs_strdup(ipv4_frame_route_list_local->valuestring)); + OpenAPI_list_add(ipv4_frame_route_listList, ogs_strdup_or_assert(ipv4_frame_route_list_local->valuestring)); } } @@ -656,31 +656,31 @@ OpenAPI_pcf_binding_t *OpenAPI_pcf_binding_parseFromJSON(cJSON *pcf_bindingJSON) ogs_error("OpenAPI_pcf_binding_parseFromJSON() failed [ipv6_frame_route_list]"); goto end; } - OpenAPI_list_add(ipv6_frame_route_listList, ogs_strdup(ipv6_frame_route_list_local->valuestring)); + OpenAPI_list_add(ipv6_frame_route_listList, ogs_strdup_or_assert(ipv6_frame_route_list_local->valuestring)); } } pcf_binding_local_var = OpenAPI_pcf_binding_create ( - supi ? ogs_strdup(supi->valuestring) : NULL, - gpsi ? ogs_strdup(gpsi->valuestring) : NULL, - ipv4_addr ? ogs_strdup(ipv4_addr->valuestring) : NULL, - ipv6_prefix ? ogs_strdup(ipv6_prefix->valuestring) : NULL, + supi ? ogs_strdup_or_assert(supi->valuestring) : NULL, + gpsi ? ogs_strdup_or_assert(gpsi->valuestring) : NULL, + ipv4_addr ? ogs_strdup_or_assert(ipv4_addr->valuestring) : NULL, + ipv6_prefix ? ogs_strdup_or_assert(ipv6_prefix->valuestring) : NULL, add_ipv6_prefixes ? add_ipv6_prefixesList : NULL, - ip_domain ? ogs_strdup(ip_domain->valuestring) : NULL, - mac_addr48 ? ogs_strdup(mac_addr48->valuestring) : NULL, + ip_domain ? ogs_strdup_or_assert(ip_domain->valuestring) : NULL, + mac_addr48 ? ogs_strdup_or_assert(mac_addr48->valuestring) : NULL, add_mac_addrs ? add_mac_addrsList : NULL, - ogs_strdup(dnn->valuestring), - pcf_fqdn ? ogs_strdup(pcf_fqdn->valuestring) : NULL, + ogs_strdup_or_assert(dnn->valuestring), + pcf_fqdn ? ogs_strdup_or_assert(pcf_fqdn->valuestring) : NULL, pcf_ip_end_points ? pcf_ip_end_pointsList : NULL, - pcf_diam_host ? ogs_strdup(pcf_diam_host->valuestring) : NULL, - pcf_diam_realm ? ogs_strdup(pcf_diam_realm->valuestring) : NULL, - pcf_sm_fqdn ? ogs_strdup(pcf_sm_fqdn->valuestring) : NULL, + pcf_diam_host ? ogs_strdup_or_assert(pcf_diam_host->valuestring) : NULL, + pcf_diam_realm ? ogs_strdup_or_assert(pcf_diam_realm->valuestring) : NULL, + pcf_sm_fqdn ? ogs_strdup_or_assert(pcf_sm_fqdn->valuestring) : NULL, pcf_sm_ip_end_points ? pcf_sm_ip_end_pointsList : NULL, snssai_local_nonprim, - supp_feat ? ogs_strdup(supp_feat->valuestring) : NULL, - pcf_id ? ogs_strdup(pcf_id->valuestring) : NULL, - pcf_set_id ? ogs_strdup(pcf_set_id->valuestring) : NULL, - recovery_time ? ogs_strdup(recovery_time->valuestring) : NULL, + supp_feat ? ogs_strdup_or_assert(supp_feat->valuestring) : NULL, + pcf_id ? ogs_strdup_or_assert(pcf_id->valuestring) : NULL, + pcf_set_id ? ogs_strdup_or_assert(pcf_set_id->valuestring) : NULL, + recovery_time ? ogs_strdup_or_assert(recovery_time->valuestring) : NULL, para_com ? para_com_local_nonprim : NULL, bind_level ? bind_levelVariable : 0, ipv4_frame_route_list ? ipv4_frame_route_listList : NULL, diff --git a/lib/sbi/openapi/model/pcf_binding_patch.c b/lib/sbi/openapi/model/pcf_binding_patch.c index 336b7219b0..2872582358 100644 --- a/lib/sbi/openapi/model/pcf_binding_patch.c +++ b/lib/sbi/openapi/model/pcf_binding_patch.c @@ -234,7 +234,7 @@ OpenAPI_pcf_binding_patch_t *OpenAPI_pcf_binding_patch_parseFromJSON(cJSON *pcf_ ogs_error("OpenAPI_pcf_binding_patch_parseFromJSON() failed [add_ipv6_prefixes]"); goto end; } - OpenAPI_list_add(add_ipv6_prefixesList, ogs_strdup(add_ipv6_prefixes_local->valuestring)); + OpenAPI_list_add(add_ipv6_prefixesList, ogs_strdup_or_assert(add_ipv6_prefixes_local->valuestring)); } } @@ -263,7 +263,7 @@ OpenAPI_pcf_binding_patch_t *OpenAPI_pcf_binding_patch_parseFromJSON(cJSON *pcf_ ogs_error("OpenAPI_pcf_binding_patch_parseFromJSON() failed [add_mac_addrs]"); goto end; } - OpenAPI_list_add(add_mac_addrsList, ogs_strdup(add_mac_addrs_local->valuestring)); + OpenAPI_list_add(add_mac_addrsList, ogs_strdup_or_assert(add_mac_addrs_local->valuestring)); } } @@ -327,17 +327,17 @@ OpenAPI_pcf_binding_patch_t *OpenAPI_pcf_binding_patch_parseFromJSON(cJSON *pcf_ } pcf_binding_patch_local_var = OpenAPI_pcf_binding_patch_create ( - ipv4_addr ? ogs_strdup(ipv4_addr->valuestring) : NULL, - ip_domain ? ogs_strdup(ip_domain->valuestring) : NULL, - ipv6_prefix ? ogs_strdup(ipv6_prefix->valuestring) : NULL, + ipv4_addr ? ogs_strdup_or_assert(ipv4_addr->valuestring) : NULL, + ip_domain ? ogs_strdup_or_assert(ip_domain->valuestring) : NULL, + ipv6_prefix ? ogs_strdup_or_assert(ipv6_prefix->valuestring) : NULL, add_ipv6_prefixes ? add_ipv6_prefixesList : NULL, - mac_addr48 ? ogs_strdup(mac_addr48->valuestring) : NULL, + mac_addr48 ? ogs_strdup_or_assert(mac_addr48->valuestring) : NULL, add_mac_addrs ? add_mac_addrsList : NULL, - pcf_id ? ogs_strdup(pcf_id->valuestring) : NULL, - pcf_fqdn ? ogs_strdup(pcf_fqdn->valuestring) : NULL, + pcf_id ? ogs_strdup_or_assert(pcf_id->valuestring) : NULL, + pcf_fqdn ? ogs_strdup_or_assert(pcf_fqdn->valuestring) : NULL, pcf_ip_end_points ? pcf_ip_end_pointsList : NULL, - pcf_diam_host ? ogs_strdup(pcf_diam_host->valuestring) : NULL, - pcf_diam_realm ? ogs_strdup(pcf_diam_realm->valuestring) : NULL + pcf_diam_host ? ogs_strdup_or_assert(pcf_diam_host->valuestring) : NULL, + pcf_diam_realm ? ogs_strdup_or_assert(pcf_diam_realm->valuestring) : NULL ); return pcf_binding_patch_local_var; diff --git a/lib/sbi/openapi/model/pcf_info.c b/lib/sbi/openapi/model/pcf_info.c index d0643447a5..a5bea493f8 100644 --- a/lib/sbi/openapi/model/pcf_info.c +++ b/lib/sbi/openapi/model/pcf_info.c @@ -179,7 +179,7 @@ OpenAPI_pcf_info_t *OpenAPI_pcf_info_parseFromJSON(cJSON *pcf_infoJSON) ogs_error("OpenAPI_pcf_info_parseFromJSON() failed [dnn_list]"); goto end; } - OpenAPI_list_add(dnn_listList, ogs_strdup(dnn_list_local->valuestring)); + OpenAPI_list_add(dnn_listList, ogs_strdup_or_assert(dnn_list_local->valuestring)); } } @@ -257,12 +257,12 @@ OpenAPI_pcf_info_t *OpenAPI_pcf_info_parseFromJSON(cJSON *pcf_infoJSON) } pcf_info_local_var = OpenAPI_pcf_info_create ( - group_id ? ogs_strdup(group_id->valuestring) : NULL, + group_id ? ogs_strdup_or_assert(group_id->valuestring) : NULL, dnn_list ? dnn_listList : NULL, supi_ranges ? supi_rangesList : NULL, gpsi_ranges ? gpsi_rangesList : NULL, - rx_diam_host ? ogs_strdup(rx_diam_host->valuestring) : NULL, - rx_diam_realm ? ogs_strdup(rx_diam_realm->valuestring) : NULL, + rx_diam_host ? ogs_strdup_or_assert(rx_diam_host->valuestring) : NULL, + rx_diam_realm ? ogs_strdup_or_assert(rx_diam_realm->valuestring) : NULL, v2x_support_ind ? v2x_support_ind->valueint : 0 ); diff --git a/lib/sbi/openapi/model/pcscf_info.c b/lib/sbi/openapi/model/pcscf_info.c index e1d6c45966..c47c737c38 100644 --- a/lib/sbi/openapi/model/pcscf_info.c +++ b/lib/sbi/openapi/model/pcscf_info.c @@ -173,7 +173,7 @@ OpenAPI_pcscf_info_t *OpenAPI_pcscf_info_parseFromJSON(cJSON *pcscf_infoJSON) ogs_error("OpenAPI_pcscf_info_parseFromJSON() failed [dnn_list]"); goto end; } - OpenAPI_list_add(dnn_listList, ogs_strdup(dnn_list_local->valuestring)); + OpenAPI_list_add(dnn_listList, ogs_strdup_or_assert(dnn_list_local->valuestring)); } } @@ -202,7 +202,7 @@ OpenAPI_pcscf_info_t *OpenAPI_pcscf_info_parseFromJSON(cJSON *pcscf_infoJSON) ogs_error("OpenAPI_pcscf_info_parseFromJSON() failed [gm_ipv4_addresses]"); goto end; } - OpenAPI_list_add(gm_ipv4_addressesList, ogs_strdup(gm_ipv4_addresses_local->valuestring)); + OpenAPI_list_add(gm_ipv4_addressesList, ogs_strdup_or_assert(gm_ipv4_addresses_local->valuestring)); } } @@ -222,14 +222,14 @@ OpenAPI_pcscf_info_t *OpenAPI_pcscf_info_parseFromJSON(cJSON *pcscf_infoJSON) ogs_error("OpenAPI_pcscf_info_parseFromJSON() failed [gm_ipv6_addresses]"); goto end; } - OpenAPI_list_add(gm_ipv6_addressesList, ogs_strdup(gm_ipv6_addresses_local->valuestring)); + OpenAPI_list_add(gm_ipv6_addressesList, ogs_strdup_or_assert(gm_ipv6_addresses_local->valuestring)); } } pcscf_info_local_var = OpenAPI_pcscf_info_create ( access_type ? access_typeList : NULL, dnn_list ? dnn_listList : NULL, - gm_fqdn ? ogs_strdup(gm_fqdn->valuestring) : NULL, + gm_fqdn ? ogs_strdup_or_assert(gm_fqdn->valuestring) : NULL, gm_ipv4_addresses ? gm_ipv4_addressesList : NULL, gm_ipv6_addresses ? gm_ipv6_addressesList : NULL ); diff --git a/lib/sbi/openapi/model/pcscf_restoration_notification.c b/lib/sbi/openapi/model/pcscf_restoration_notification.c index 440b90b4a1..1f3f27b62a 100644 --- a/lib/sbi/openapi/model/pcscf_restoration_notification.c +++ b/lib/sbi/openapi/model/pcscf_restoration_notification.c @@ -62,7 +62,7 @@ OpenAPI_pcscf_restoration_notification_t *OpenAPI_pcscf_restoration_notification } pcscf_restoration_notification_local_var = OpenAPI_pcscf_restoration_notification_create ( - ogs_strdup(supi->valuestring) + ogs_strdup_or_assert(supi->valuestring) ); return pcscf_restoration_notification_local_var; diff --git a/lib/sbi/openapi/model/pcscf_restoration_request_data.c b/lib/sbi/openapi/model/pcscf_restoration_request_data.c index 3d981ee4ec..0b61e1aa5c 100644 --- a/lib/sbi/openapi/model/pcscf_restoration_request_data.c +++ b/lib/sbi/openapi/model/pcscf_restoration_request_data.c @@ -160,12 +160,12 @@ OpenAPI_pcscf_restoration_request_data_t *OpenAPI_pcscf_restoration_request_data } pcscf_restoration_request_data_local_var = OpenAPI_pcscf_restoration_request_data_create ( - dnn ? ogs_strdup(dnn->valuestring) : NULL, - ip_domain ? ogs_strdup(ip_domain->valuestring) : NULL, + dnn ? ogs_strdup_or_assert(dnn->valuestring) : NULL, + ip_domain ? ogs_strdup_or_assert(ip_domain->valuestring) : NULL, slice_info ? slice_info_local_nonprim : NULL, - supi ? ogs_strdup(supi->valuestring) : NULL, - ue_ipv4 ? ogs_strdup(ue_ipv4->valuestring) : NULL, - ue_ipv6 ? ogs_strdup(ue_ipv6->valuestring) : NULL + supi ? ogs_strdup_or_assert(supi->valuestring) : NULL, + ue_ipv4 ? ogs_strdup_or_assert(ue_ipv4->valuestring) : NULL, + ue_ipv6 ? ogs_strdup_or_assert(ue_ipv6->valuestring) : NULL ); return pcscf_restoration_request_data_local_var; diff --git a/lib/sbi/openapi/model/pdu_session.c b/lib/sbi/openapi/model/pdu_session.c index a9da491f9a..18f62afe18 100644 --- a/lib/sbi/openapi/model/pdu_session.c +++ b/lib/sbi/openapi/model/pdu_session.c @@ -129,8 +129,8 @@ OpenAPI_pdu_session_t *OpenAPI_pdu_session_parseFromJSON(cJSON *pdu_sessionJSON) } pdu_session_local_var = OpenAPI_pdu_session_create ( - ogs_strdup(dnn->valuestring), - ogs_strdup(smf_instance_id->valuestring), + ogs_strdup_or_assert(dnn->valuestring), + ogs_strdup_or_assert(smf_instance_id->valuestring), plmn_id_local_nonprim, single_nssai ? single_nssai_local_nonprim : NULL ); diff --git a/lib/sbi/openapi/model/pdu_session_context.c b/lib/sbi/openapi/model/pdu_session_context.c index 8b9116334c..561d6cbca2 100644 --- a/lib/sbi/openapi/model/pdu_session_context.c +++ b/lib/sbi/openapi/model/pdu_session_context.c @@ -526,26 +526,26 @@ OpenAPI_pdu_session_context_t *OpenAPI_pdu_session_context_parseFromJSON(cJSON * pdu_session_context_local_var = OpenAPI_pdu_session_context_create ( pdu_session_id->valuedouble, - ogs_strdup(sm_context_ref->valuestring), + ogs_strdup_or_assert(sm_context_ref->valuestring), s_nssai_local_nonprim, - ogs_strdup(dnn->valuestring), + ogs_strdup_or_assert(dnn->valuestring), access_typeVariable, additional_access_type ? additional_access_typeVariable : 0, allocated_ebi_list ? allocated_ebi_listList : NULL, - hsmf_id ? ogs_strdup(hsmf_id->valuestring) : NULL, - hsmf_set_id ? ogs_strdup(hsmf_set_id->valuestring) : NULL, - hsmf_service_set_id ? ogs_strdup(hsmf_service_set_id->valuestring) : NULL, + hsmf_id ? ogs_strdup_or_assert(hsmf_id->valuestring) : NULL, + hsmf_set_id ? ogs_strdup_or_assert(hsmf_set_id->valuestring) : NULL, + hsmf_service_set_id ? ogs_strdup_or_assert(hsmf_service_set_id->valuestring) : NULL, smf_binding ? smf_bindingVariable : 0, - vsmf_id ? ogs_strdup(vsmf_id->valuestring) : NULL, - vsmf_set_id ? ogs_strdup(vsmf_set_id->valuestring) : NULL, - vsmf_service_set_id ? ogs_strdup(vsmf_service_set_id->valuestring) : NULL, + vsmf_id ? ogs_strdup_or_assert(vsmf_id->valuestring) : NULL, + vsmf_set_id ? ogs_strdup_or_assert(vsmf_set_id->valuestring) : NULL, + vsmf_service_set_id ? ogs_strdup_or_assert(vsmf_service_set_id->valuestring) : NULL, vsmf_binding ? vsmf_bindingVariable : 0, - ismf_id ? ogs_strdup(ismf_id->valuestring) : NULL, - ismf_set_id ? ogs_strdup(ismf_set_id->valuestring) : NULL, - ismf_service_set_id ? ogs_strdup(ismf_service_set_id->valuestring) : NULL, + ismf_id ? ogs_strdup_or_assert(ismf_id->valuestring) : NULL, + ismf_set_id ? ogs_strdup_or_assert(ismf_set_id->valuestring) : NULL, + ismf_service_set_id ? ogs_strdup_or_assert(ismf_service_set_id->valuestring) : NULL, ismf_binding ? ismf_bindingVariable : 0, - ns_instance ? ogs_strdup(ns_instance->valuestring) : NULL, - smf_service_instance_id ? ogs_strdup(smf_service_instance_id->valuestring) : NULL, + ns_instance ? ogs_strdup_or_assert(ns_instance->valuestring) : NULL, + smf_service_instance_id ? ogs_strdup_or_assert(smf_service_instance_id->valuestring) : NULL, ma_pdu_session ? ma_pdu_session->valueint : 0, cn_assisted_ran_para ? cn_assisted_ran_para_local_nonprim : NULL ); diff --git a/lib/sbi/openapi/model/pdu_session_create_data.c b/lib/sbi/openapi/model/pdu_session_create_data.c index 57733ec393..d1b9bb177b 100644 --- a/lib/sbi/openapi/model/pdu_session_create_data.c +++ b/lib/sbi/openapi/model/pdu_session_create_data.c @@ -1303,7 +1303,7 @@ OpenAPI_pdu_session_create_data_t *OpenAPI_pdu_session_create_data_parseFromJSON ogs_error("OpenAPI_pdu_session_create_data_parseFromJSON() failed [dnai_list]"); goto end; } - OpenAPI_list_add(dnai_listList, ogs_strdup(dnai_list_local->valuestring)); + OpenAPI_list_add(dnai_listList, ogs_strdup_or_assert(dnai_list_local->valuestring)); } } @@ -1379,21 +1379,21 @@ OpenAPI_pdu_session_create_data_t *OpenAPI_pdu_session_create_data_parseFromJSON } pdu_session_create_data_local_var = OpenAPI_pdu_session_create_data_create ( - supi ? ogs_strdup(supi->valuestring) : NULL, + supi ? ogs_strdup_or_assert(supi->valuestring) : NULL, unauthenticated_supi ? unauthenticated_supi->valueint : 0, - pei ? ogs_strdup(pei->valuestring) : NULL, + pei ? ogs_strdup_or_assert(pei->valuestring) : NULL, pdu_session_id ? pdu_session_id->valuedouble : 0, - ogs_strdup(dnn->valuestring), - selected_dnn ? ogs_strdup(selected_dnn->valuestring) : NULL, + ogs_strdup_or_assert(dnn->valuestring), + selected_dnn ? ogs_strdup_or_assert(selected_dnn->valuestring) : NULL, s_nssai ? s_nssai_local_nonprim : NULL, - vsmf_id ? ogs_strdup(vsmf_id->valuestring) : NULL, - ismf_id ? ogs_strdup(ismf_id->valuestring) : NULL, + vsmf_id ? ogs_strdup_or_assert(vsmf_id->valuestring) : NULL, + ismf_id ? ogs_strdup_or_assert(ismf_id->valuestring) : NULL, serving_network_local_nonprim, request_type ? request_typeVariable : 0, eps_bearer_id ? eps_bearer_idList : NULL, pgw_s8c_fteid ? pgw_s8c_fteid->valueint : 0, - vsmf_pdu_session_uri ? ogs_strdup(vsmf_pdu_session_uri->valuestring) : NULL, - ismf_pdu_session_uri ? ogs_strdup(ismf_pdu_session_uri->valuestring) : NULL, + vsmf_pdu_session_uri ? ogs_strdup_or_assert(vsmf_pdu_session_uri->valuestring) : NULL, + ismf_pdu_session_uri ? ogs_strdup_or_assert(ismf_pdu_session_uri->valuestring) : NULL, vcn_tunnel_info ? vcn_tunnel_info_local_nonprim : NULL, icn_tunnel_info ? icn_tunnel_info_local_nonprim : NULL, n9_forwarding_tunnel_info ? n9_forwarding_tunnel_info_local_nonprim : NULL, @@ -1402,30 +1402,30 @@ OpenAPI_pdu_session_create_data_t *OpenAPI_pdu_session_create_data_parseFromJSON additional_an_type ? additional_an_typeVariable : 0, rat_type ? rat_typeVariable : 0, ue_location ? ue_location_local_nonprim : NULL, - ue_time_zone ? ogs_strdup(ue_time_zone->valuestring) : NULL, + ue_time_zone ? ogs_strdup_or_assert(ue_time_zone->valuestring) : NULL, add_ue_location ? add_ue_location_local_nonprim : NULL, - gpsi ? ogs_strdup(gpsi->valuestring) : NULL, + gpsi ? ogs_strdup_or_assert(gpsi->valuestring) : NULL, n1_sm_info_from_ue ? n1_sm_info_from_ue_local_nonprim : NULL, unknown_n1_sm_info ? unknown_n1_sm_info_local_nonprim : NULL, - supported_features ? ogs_strdup(supported_features->valuestring) : NULL, - h_pcf_id ? ogs_strdup(h_pcf_id->valuestring) : NULL, - pcf_id ? ogs_strdup(pcf_id->valuestring) : NULL, - pcf_group_id ? ogs_strdup(pcf_group_id->valuestring) : NULL, - pcf_set_id ? ogs_strdup(pcf_set_id->valuestring) : NULL, + supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL, + h_pcf_id ? ogs_strdup_or_assert(h_pcf_id->valuestring) : NULL, + pcf_id ? ogs_strdup_or_assert(pcf_id->valuestring) : NULL, + pcf_group_id ? ogs_strdup_or_assert(pcf_group_id->valuestring) : NULL, + pcf_set_id ? ogs_strdup_or_assert(pcf_set_id->valuestring) : NULL, ho_preparation_indication ? ho_preparation_indication->valueint : 0, sel_mode ? sel_modeVariable : 0, always_on_requested ? always_on_requested->valueint : 0, - udm_group_id ? ogs_strdup(udm_group_id->valuestring) : NULL, - routing_indicator ? ogs_strdup(routing_indicator->valuestring) : NULL, + udm_group_id ? ogs_strdup_or_assert(udm_group_id->valuestring) : NULL, + routing_indicator ? ogs_strdup_or_assert(routing_indicator->valuestring) : NULL, eps_interworking_ind ? eps_interworking_indVariable : 0, - v_smf_service_instance_id ? ogs_strdup(v_smf_service_instance_id->valuestring) : NULL, - i_smf_service_instance_id ? ogs_strdup(i_smf_service_instance_id->valuestring) : NULL, - recovery_time ? ogs_strdup(recovery_time->valuestring) : NULL, + v_smf_service_instance_id ? ogs_strdup_or_assert(v_smf_service_instance_id->valuestring) : NULL, + i_smf_service_instance_id ? ogs_strdup_or_assert(i_smf_service_instance_id->valuestring) : NULL, + recovery_time ? ogs_strdup_or_assert(recovery_time->valuestring) : NULL, roaming_charging_profile ? roaming_charging_profile_local_nonprim : NULL, - charging_id ? ogs_strdup(charging_id->valuestring) : NULL, + charging_id ? ogs_strdup_or_assert(charging_id->valuestring) : NULL, old_pdu_session_id ? old_pdu_session_id->valuedouble : 0, - eps_bearer_ctx_status ? ogs_strdup(eps_bearer_ctx_status->valuestring) : NULL, - amf_nf_id ? ogs_strdup(amf_nf_id->valuestring) : NULL, + eps_bearer_ctx_status ? ogs_strdup_or_assert(eps_bearer_ctx_status->valuestring) : NULL, + amf_nf_id ? ogs_strdup_or_assert(amf_nf_id->valuestring) : NULL, guami ? guami_local_nonprim : NULL, max_integrity_protected_data_rate_ul ? max_integrity_protected_data_rate_ulVariable : 0, max_integrity_protected_data_rate_dl ? max_integrity_protected_data_rate_dlVariable : 0, diff --git a/lib/sbi/openapi/model/pdu_session_create_error.c b/lib/sbi/openapi/model/pdu_session_create_error.c index 3a566a03f9..220e5bccec 100644 --- a/lib/sbi/openapi/model/pdu_session_create_error.c +++ b/lib/sbi/openapi/model/pdu_session_create_error.c @@ -146,10 +146,10 @@ OpenAPI_pdu_session_create_error_t *OpenAPI_pdu_session_create_error_parseFromJS pdu_session_create_error_local_var = OpenAPI_pdu_session_create_error_create ( error_local_nonprim, - n1sm_cause ? ogs_strdup(n1sm_cause->valuestring) : NULL, + n1sm_cause ? ogs_strdup_or_assert(n1sm_cause->valuestring) : NULL, n1_sm_info_to_ue ? n1_sm_info_to_ue_local_nonprim : NULL, back_off_timer ? back_off_timer->valuedouble : 0, - recovery_time ? ogs_strdup(recovery_time->valuestring) : NULL + recovery_time ? ogs_strdup_or_assert(recovery_time->valuestring) : NULL ); return pdu_session_create_error_local_var; diff --git a/lib/sbi/openapi/model/pdu_session_created_data.c b/lib/sbi/openapi/model/pdu_session_created_data.c index 6e1311d539..241ca861f9 100644 --- a/lib/sbi/openapi/model/pdu_session_created_data.c +++ b/lib/sbi/openapi/model/pdu_session_created_data.c @@ -771,7 +771,7 @@ OpenAPI_pdu_session_created_data_t *OpenAPI_pdu_session_created_data_parseFromJS ogs_error("OpenAPI_pdu_session_created_data_parseFromJSON() failed [dnai_list]"); goto end; } - OpenAPI_list_add(dnai_listList, ogs_strdup(dnai_list_local->valuestring)); + OpenAPI_list_add(dnai_listList, ogs_strdup_or_assert(dnai_list_local->valuestring)); } } @@ -847,39 +847,39 @@ OpenAPI_pdu_session_created_data_t *OpenAPI_pdu_session_created_data_parseFromJS pdu_session_created_data_local_var = OpenAPI_pdu_session_created_data_create ( pdu_session_typeVariable, - ogs_strdup(ssc_mode->valuestring), + ogs_strdup_or_assert(ssc_mode->valuestring), hcn_tunnel_info ? hcn_tunnel_info_local_nonprim : NULL, cn_tunnel_info ? cn_tunnel_info_local_nonprim : NULL, additional_cn_tunnel_info ? additional_cn_tunnel_info_local_nonprim : NULL, session_ambr ? session_ambr_local_nonprim : NULL, qos_flows_setup_list ? qos_flows_setup_listList : NULL, - h_smf_instance_id ? ogs_strdup(h_smf_instance_id->valuestring) : NULL, - smf_instance_id ? ogs_strdup(smf_instance_id->valuestring) : NULL, + h_smf_instance_id ? ogs_strdup_or_assert(h_smf_instance_id->valuestring) : NULL, + smf_instance_id ? ogs_strdup_or_assert(smf_instance_id->valuestring) : NULL, pdu_session_id ? pdu_session_id->valuedouble : 0, s_nssai ? s_nssai_local_nonprim : NULL, enable_pause_charging ? enable_pause_charging->valueint : 0, - ue_ipv4_address ? ogs_strdup(ue_ipv4_address->valuestring) : NULL, - ue_ipv6_prefix ? ogs_strdup(ue_ipv6_prefix->valuestring) : NULL, + ue_ipv4_address ? ogs_strdup_or_assert(ue_ipv4_address->valuestring) : NULL, + ue_ipv6_prefix ? ogs_strdup_or_assert(ue_ipv6_prefix->valuestring) : NULL, n1_sm_info_to_ue ? n1_sm_info_to_ue_local_nonprim : NULL, eps_pdn_cnx_info ? eps_pdn_cnx_info_local_nonprim : NULL, eps_bearer_info ? eps_bearer_infoList : NULL, - supported_features ? ogs_strdup(supported_features->valuestring) : NULL, + supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL, max_integrity_protected_data_rate ? max_integrity_protected_data_rateVariable : 0, max_integrity_protected_data_rate_dl ? max_integrity_protected_data_rate_dlVariable : 0, always_on_granted ? always_on_granted->valueint : 0, - gpsi ? ogs_strdup(gpsi->valuestring) : NULL, + gpsi ? ogs_strdup_or_assert(gpsi->valuestring) : NULL, up_security ? up_security_local_nonprim : NULL, roaming_charging_profile ? roaming_charging_profile_local_nonprim : NULL, - h_smf_service_instance_id ? ogs_strdup(h_smf_service_instance_id->valuestring) : NULL, - smf_service_instance_id ? ogs_strdup(smf_service_instance_id->valuestring) : NULL, - recovery_time ? ogs_strdup(recovery_time->valuestring) : NULL, + h_smf_service_instance_id ? ogs_strdup_or_assert(h_smf_service_instance_id->valuestring) : NULL, + smf_service_instance_id ? ogs_strdup_or_assert(smf_service_instance_id->valuestring) : NULL, + recovery_time ? ogs_strdup_or_assert(recovery_time->valuestring) : NULL, dnai_list ? dnai_listList : NULL, ipv6_multi_homing_ind ? ipv6_multi_homing_ind->valueint : 0, ma_accepted_ind ? ma_accepted_ind->valueint : 0, - home_provided_charging_id ? ogs_strdup(home_provided_charging_id->valuestring) : NULL, + home_provided_charging_id ? ogs_strdup_or_assert(home_provided_charging_id->valuestring) : NULL, nef_ext_buf_support_ind ? nef_ext_buf_support_ind->valueint : 0, small_data_rate_control_enabled ? small_data_rate_control_enabled->valueint : 0, - ue_ipv6_interface_id ? ogs_strdup(ue_ipv6_interface_id->valuestring) : NULL, + ue_ipv6_interface_id ? ogs_strdup_or_assert(ue_ipv6_interface_id->valuestring) : NULL, ipv6_index ? ipv6_index->valuedouble : 0, dn_aaa_address ? dn_aaa_address_local_nonprim : NULL ); diff --git a/lib/sbi/openapi/model/pdu_session_management_data.c b/lib/sbi/openapi/model/pdu_session_management_data.c index 8512a1451d..acfa0e1777 100644 --- a/lib/sbi/openapi/model/pdu_session_management_data.c +++ b/lib/sbi/openapi/model/pdu_session_management_data.c @@ -306,7 +306,7 @@ OpenAPI_pdu_session_management_data_t *OpenAPI_pdu_session_management_data_parse ogs_error("OpenAPI_pdu_session_management_data_parseFromJSON() failed [ipv6_prefix]"); goto end; } - OpenAPI_list_add(ipv6_prefixList, ogs_strdup(ipv6_prefix_local->valuestring)); + OpenAPI_list_add(ipv6_prefixList, ogs_strdup_or_assert(ipv6_prefix_local->valuestring)); } } @@ -326,7 +326,7 @@ OpenAPI_pdu_session_management_data_t *OpenAPI_pdu_session_management_data_parse ogs_error("OpenAPI_pdu_session_management_data_parseFromJSON() failed [ipv6_addrs]"); goto end; } - OpenAPI_list_add(ipv6_addrsList, ogs_strdup(ipv6_addrs_local->valuestring)); + OpenAPI_list_add(ipv6_addrsList, ogs_strdup_or_assert(ipv6_addrs_local->valuestring)); } } @@ -370,17 +370,17 @@ OpenAPI_pdu_session_management_data_t *OpenAPI_pdu_session_management_data_parse pdu_session_management_data_local_var = OpenAPI_pdu_session_management_data_create ( pdu_session_status ? pdu_session_status_local_nonprim : NULL, - pdu_session_status_ts ? ogs_strdup(pdu_session_status_ts->valuestring) : NULL, - dnai ? ogs_strdup(dnai->valuestring) : NULL, - dnai_ts ? ogs_strdup(dnai_ts->valuestring) : NULL, + pdu_session_status_ts ? ogs_strdup_or_assert(pdu_session_status_ts->valuestring) : NULL, + dnai ? ogs_strdup_or_assert(dnai->valuestring) : NULL, + dnai_ts ? ogs_strdup_or_assert(dnai_ts->valuestring) : NULL, n6_traffic_routing_info ? n6_traffic_routing_infoList : NULL, - n6_traffic_routing_info_ts ? ogs_strdup(n6_traffic_routing_info_ts->valuestring) : NULL, - ipv4_addr ? ogs_strdup(ipv4_addr->valuestring) : NULL, + n6_traffic_routing_info_ts ? ogs_strdup_or_assert(n6_traffic_routing_info_ts->valuestring) : NULL, + ipv4_addr ? ogs_strdup_or_assert(ipv4_addr->valuestring) : NULL, ipv6_prefix ? ipv6_prefixList : NULL, ipv6_addrs ? ipv6_addrsList : NULL, pdu_sess_type ? pdu_sess_typeVariable : 0, - ip_addr_ts ? ogs_strdup(ip_addr_ts->valuestring) : NULL, - dnn ? ogs_strdup(dnn->valuestring) : NULL, + ip_addr_ts ? ogs_strdup_or_assert(ip_addr_ts->valuestring) : NULL, + dnn ? ogs_strdup_or_assert(dnn->valuestring) : NULL, pdu_session_id ? pdu_session_id->valuedouble : 0 ); diff --git a/lib/sbi/openapi/model/pdu_session_status_cfg.c b/lib/sbi/openapi/model/pdu_session_status_cfg.c index 9d17f92de5..404757ccf4 100644 --- a/lib/sbi/openapi/model/pdu_session_status_cfg.c +++ b/lib/sbi/openapi/model/pdu_session_status_cfg.c @@ -61,7 +61,7 @@ OpenAPI_pdu_session_status_cfg_t *OpenAPI_pdu_session_status_cfg_parseFromJSON(c } pdu_session_status_cfg_local_var = OpenAPI_pdu_session_status_cfg_create ( - dnn ? ogs_strdup(dnn->valuestring) : NULL + dnn ? ogs_strdup_or_assert(dnn->valuestring) : NULL ); return pdu_session_status_cfg_local_var; diff --git a/lib/sbi/openapi/model/pei_update_info.c b/lib/sbi/openapi/model/pei_update_info.c index 3b545e0b24..d947b86511 100644 --- a/lib/sbi/openapi/model/pei_update_info.c +++ b/lib/sbi/openapi/model/pei_update_info.c @@ -62,7 +62,7 @@ OpenAPI_pei_update_info_t *OpenAPI_pei_update_info_parseFromJSON(cJSON *pei_upda } pei_update_info_local_var = OpenAPI_pei_update_info_create ( - ogs_strdup(pei->valuestring) + ogs_strdup_or_assert(pei->valuestring) ); return pei_update_info_local_var; diff --git a/lib/sbi/openapi/model/pfd_change_notification.c b/lib/sbi/openapi/model/pfd_change_notification.c index 971cbb4a2c..6492a2a0b8 100644 --- a/lib/sbi/openapi/model/pfd_change_notification.c +++ b/lib/sbi/openapi/model/pfd_change_notification.c @@ -147,7 +147,7 @@ OpenAPI_pfd_change_notification_t *OpenAPI_pfd_change_notification_parseFromJSON } pfd_change_notification_local_var = OpenAPI_pfd_change_notification_create ( - ogs_strdup(application_id->valuestring), + ogs_strdup_or_assert(application_id->valuestring), removal_flag ? removal_flag->valueint : 0, partial_flag ? partial_flag->valueint : 0, pfds ? pfdsList : NULL diff --git a/lib/sbi/openapi/model/pfd_content.c b/lib/sbi/openapi/model/pfd_content.c index 436cc92a80..a6a0bc7bbf 100644 --- a/lib/sbi/openapi/model/pfd_content.c +++ b/lib/sbi/openapi/model/pfd_content.c @@ -158,7 +158,7 @@ OpenAPI_pfd_content_t *OpenAPI_pfd_content_parseFromJSON(cJSON *pfd_contentJSON) ogs_error("OpenAPI_pfd_content_parseFromJSON() failed [flow_descriptions]"); goto end; } - OpenAPI_list_add(flow_descriptionsList, ogs_strdup(flow_descriptions_local->valuestring)); + OpenAPI_list_add(flow_descriptionsList, ogs_strdup_or_assert(flow_descriptions_local->valuestring)); } } @@ -178,7 +178,7 @@ OpenAPI_pfd_content_t *OpenAPI_pfd_content_parseFromJSON(cJSON *pfd_contentJSON) ogs_error("OpenAPI_pfd_content_parseFromJSON() failed [urls]"); goto end; } - OpenAPI_list_add(urlsList, ogs_strdup(urls_local->valuestring)); + OpenAPI_list_add(urlsList, ogs_strdup_or_assert(urls_local->valuestring)); } } @@ -198,7 +198,7 @@ OpenAPI_pfd_content_t *OpenAPI_pfd_content_parseFromJSON(cJSON *pfd_contentJSON) ogs_error("OpenAPI_pfd_content_parseFromJSON() failed [domain_names]"); goto end; } - OpenAPI_list_add(domain_namesList, ogs_strdup(domain_names_local->valuestring)); + OpenAPI_list_add(domain_namesList, ogs_strdup_or_assert(domain_names_local->valuestring)); } } @@ -210,7 +210,7 @@ OpenAPI_pfd_content_t *OpenAPI_pfd_content_parseFromJSON(cJSON *pfd_contentJSON) } pfd_content_local_var = OpenAPI_pfd_content_create ( - pfd_id ? ogs_strdup(pfd_id->valuestring) : NULL, + pfd_id ? ogs_strdup_or_assert(pfd_id->valuestring) : NULL, flow_descriptions ? flow_descriptionsList : NULL, urls ? urlsList : NULL, domain_names ? domain_namesList : NULL, diff --git a/lib/sbi/openapi/model/pfd_data.c b/lib/sbi/openapi/model/pfd_data.c index c4a705e93e..9880be0229 100644 --- a/lib/sbi/openapi/model/pfd_data.c +++ b/lib/sbi/openapi/model/pfd_data.c @@ -101,7 +101,7 @@ OpenAPI_pfd_data_t *OpenAPI_pfd_data_parseFromJSON(cJSON *pfd_dataJSON) ogs_error("OpenAPI_pfd_data_parseFromJSON() failed [app_ids]"); goto end; } - OpenAPI_list_add(app_idsList, ogs_strdup(app_ids_local->valuestring)); + OpenAPI_list_add(app_idsList, ogs_strdup_or_assert(app_ids_local->valuestring)); } } @@ -121,7 +121,7 @@ OpenAPI_pfd_data_t *OpenAPI_pfd_data_parseFromJSON(cJSON *pfd_dataJSON) ogs_error("OpenAPI_pfd_data_parseFromJSON() failed [af_ids]"); goto end; } - OpenAPI_list_add(af_idsList, ogs_strdup(af_ids_local->valuestring)); + OpenAPI_list_add(af_idsList, ogs_strdup_or_assert(af_ids_local->valuestring)); } } diff --git a/lib/sbi/openapi/model/pfd_data_for_app.c b/lib/sbi/openapi/model/pfd_data_for_app.c index 1f4e78ff76..56bf4c3d1d 100644 --- a/lib/sbi/openapi/model/pfd_data_for_app.c +++ b/lib/sbi/openapi/model/pfd_data_for_app.c @@ -131,9 +131,9 @@ OpenAPI_pfd_data_for_app_t *OpenAPI_pfd_data_for_app_parseFromJSON(cJSON *pfd_da } pfd_data_for_app_local_var = OpenAPI_pfd_data_for_app_create ( - ogs_strdup(application_id->valuestring), + ogs_strdup_or_assert(application_id->valuestring), pfdsList, - caching_time ? ogs_strdup(caching_time->valuestring) : NULL + caching_time ? ogs_strdup_or_assert(caching_time->valuestring) : NULL ); return pfd_data_for_app_local_var; diff --git a/lib/sbi/openapi/model/pfd_data_for_app_ext.c b/lib/sbi/openapi/model/pfd_data_for_app_ext.c index f1514eddb4..a9a739ccdf 100644 --- a/lib/sbi/openapi/model/pfd_data_for_app_ext.c +++ b/lib/sbi/openapi/model/pfd_data_for_app_ext.c @@ -150,10 +150,10 @@ OpenAPI_pfd_data_for_app_ext_t *OpenAPI_pfd_data_for_app_ext_parseFromJSON(cJSON } pfd_data_for_app_ext_local_var = OpenAPI_pfd_data_for_app_ext_create ( - ogs_strdup(application_id->valuestring), + ogs_strdup_or_assert(application_id->valuestring), pfdsList, - caching_time ? ogs_strdup(caching_time->valuestring) : NULL, - supp_feat ? ogs_strdup(supp_feat->valuestring) : NULL + caching_time ? ogs_strdup_or_assert(caching_time->valuestring) : NULL, + supp_feat ? ogs_strdup_or_assert(supp_feat->valuestring) : NULL ); return pfd_data_for_app_ext_local_var; diff --git a/lib/sbi/openapi/model/pfd_data_for_app_ext_all_of.c b/lib/sbi/openapi/model/pfd_data_for_app_ext_all_of.c index a06c28ffa8..31febf7aa2 100644 --- a/lib/sbi/openapi/model/pfd_data_for_app_ext_all_of.c +++ b/lib/sbi/openapi/model/pfd_data_for_app_ext_all_of.c @@ -61,7 +61,7 @@ OpenAPI_pfd_data_for_app_ext_all_of_t *OpenAPI_pfd_data_for_app_ext_all_of_parse } pfd_data_for_app_ext_all_of_local_var = OpenAPI_pfd_data_for_app_ext_all_of_create ( - supp_feat ? ogs_strdup(supp_feat->valuestring) : NULL + supp_feat ? ogs_strdup_or_assert(supp_feat->valuestring) : NULL ); return pfd_data_for_app_ext_all_of_local_var; diff --git a/lib/sbi/openapi/model/pgw_info.c b/lib/sbi/openapi/model/pgw_info.c index dcf341b32e..ae7b7363af 100644 --- a/lib/sbi/openapi/model/pgw_info.c +++ b/lib/sbi/openapi/model/pgw_info.c @@ -123,8 +123,8 @@ OpenAPI_pgw_info_t *OpenAPI_pgw_info_parseFromJSON(cJSON *pgw_infoJSON) } pgw_info_local_var = OpenAPI_pgw_info_create ( - ogs_strdup(dnn->valuestring), - ogs_strdup(pgw_fqdn->valuestring), + ogs_strdup_or_assert(dnn->valuestring), + ogs_strdup_or_assert(pgw_fqdn->valuestring), plmn_id ? plmn_id_local_nonprim : NULL, epdg_ind ? epdg_ind->valueint : 0 ); diff --git a/lib/sbi/openapi/model/plmn_id.c b/lib/sbi/openapi/model/plmn_id.c index a1cb0726c0..71cdded3b8 100644 --- a/lib/sbi/openapi/model/plmn_id.c +++ b/lib/sbi/openapi/model/plmn_id.c @@ -82,8 +82,8 @@ OpenAPI_plmn_id_t *OpenAPI_plmn_id_parseFromJSON(cJSON *plmn_idJSON) } plmn_id_local_var = OpenAPI_plmn_id_create ( - ogs_strdup(mcc->valuestring), - ogs_strdup(mnc->valuestring) + ogs_strdup_or_assert(mcc->valuestring), + ogs_strdup_or_assert(mnc->valuestring) ); return plmn_id_local_var; diff --git a/lib/sbi/openapi/model/plmn_id_nid.c b/lib/sbi/openapi/model/plmn_id_nid.c index d86d09782d..869b333386 100644 --- a/lib/sbi/openapi/model/plmn_id_nid.c +++ b/lib/sbi/openapi/model/plmn_id_nid.c @@ -101,9 +101,9 @@ OpenAPI_plmn_id_nid_t *OpenAPI_plmn_id_nid_parseFromJSON(cJSON *plmn_id_nidJSON) } plmn_id_nid_local_var = OpenAPI_plmn_id_nid_create ( - ogs_strdup(mcc->valuestring), - ogs_strdup(mnc->valuestring), - nid ? ogs_strdup(nid->valuestring) : NULL + ogs_strdup_or_assert(mcc->valuestring), + ogs_strdup_or_assert(mnc->valuestring), + nid ? ogs_strdup_or_assert(nid->valuestring) : NULL ); return plmn_id_nid_local_var; diff --git a/lib/sbi/openapi/model/plmn_operator_class.c b/lib/sbi/openapi/model/plmn_operator_class.c index 3d4e9274bd..d37b7cb957 100644 --- a/lib/sbi/openapi/model/plmn_operator_class.c +++ b/lib/sbi/openapi/model/plmn_operator_class.c @@ -102,7 +102,7 @@ OpenAPI_plmn_operator_class_t *OpenAPI_plmn_operator_class_parseFromJSON(cJSON * ogs_error("OpenAPI_plmn_operator_class_parseFromJSON() failed [lcs_client_ids]"); goto end; } - OpenAPI_list_add(lcs_client_idsList, ogs_strdup(lcs_client_ids_local->valuestring)); + OpenAPI_list_add(lcs_client_idsList, ogs_strdup_or_assert(lcs_client_ids_local->valuestring)); } plmn_operator_class_local_var = OpenAPI_plmn_operator_class_create ( diff --git a/lib/sbi/openapi/model/plmn_range.c b/lib/sbi/openapi/model/plmn_range.c index 11c8ee91ab..60d5648e22 100644 --- a/lib/sbi/openapi/model/plmn_range.c +++ b/lib/sbi/openapi/model/plmn_range.c @@ -99,9 +99,9 @@ OpenAPI_plmn_range_t *OpenAPI_plmn_range_parseFromJSON(cJSON *plmn_rangeJSON) } plmn_range_local_var = OpenAPI_plmn_range_create ( - start ? ogs_strdup(start->valuestring) : NULL, - end ? ogs_strdup(end->valuestring) : NULL, - pattern ? ogs_strdup(pattern->valuestring) : NULL + start ? ogs_strdup_or_assert(start->valuestring) : NULL, + end ? ogs_strdup_or_assert(end->valuestring) : NULL, + pattern ? ogs_strdup_or_assert(pattern->valuestring) : NULL ); return plmn_range_local_var; diff --git a/lib/sbi/openapi/model/plmn_snssai.c b/lib/sbi/openapi/model/plmn_snssai.c index 8e566143b7..b5d1ba3ca3 100644 --- a/lib/sbi/openapi/model/plmn_snssai.c +++ b/lib/sbi/openapi/model/plmn_snssai.c @@ -137,7 +137,7 @@ OpenAPI_plmn_snssai_t *OpenAPI_plmn_snssai_parseFromJSON(cJSON *plmn_snssaiJSON) plmn_snssai_local_var = OpenAPI_plmn_snssai_create ( plmn_id_local_nonprim, s_nssai_listList, - nid ? ogs_strdup(nid->valuestring) : NULL + nid ? ogs_strdup_or_assert(nid->valuestring) : NULL ); return plmn_snssai_local_var; diff --git a/lib/sbi/openapi/model/policy_association.c b/lib/sbi/openapi/model/policy_association.c index 2c7069d2e6..4c48872c71 100644 --- a/lib/sbi/openapi/model/policy_association.c +++ b/lib/sbi/openapi/model/policy_association.c @@ -319,7 +319,7 @@ OpenAPI_policy_association_t *OpenAPI_policy_association_parseFromJSON(cJSON *po ue_ambr ? ue_ambr_local_nonprim : NULL, rg_tmbr ? rg_tmbr_local_nonprim : NULL, pras ? prasList : NULL, - ogs_strdup(supp_feat->valuestring) + ogs_strdup_or_assert(supp_feat->valuestring) ); return policy_association_local_var; diff --git a/lib/sbi/openapi/model/policy_association_request.c b/lib/sbi/openapi/model/policy_association_request.c index 958e039576..35d7bd887f 100644 --- a/lib/sbi/openapi/model/policy_association_request.c +++ b/lib/sbi/openapi/model/policy_association_request.c @@ -468,7 +468,7 @@ OpenAPI_policy_association_request_t *OpenAPI_policy_association_request_parseFr ogs_error("OpenAPI_policy_association_request_parseFromJSON() failed [alt_notif_ipv4_addrs]"); goto end; } - OpenAPI_list_add(alt_notif_ipv4_addrsList, ogs_strdup(alt_notif_ipv4_addrs_local->valuestring)); + OpenAPI_list_add(alt_notif_ipv4_addrsList, ogs_strdup_or_assert(alt_notif_ipv4_addrs_local->valuestring)); } } @@ -488,7 +488,7 @@ OpenAPI_policy_association_request_t *OpenAPI_policy_association_request_parseFr ogs_error("OpenAPI_policy_association_request_parseFromJSON() failed [alt_notif_ipv6_addrs]"); goto end; } - OpenAPI_list_add(alt_notif_ipv6_addrsList, ogs_strdup(alt_notif_ipv6_addrs_local->valuestring)); + OpenAPI_list_add(alt_notif_ipv6_addrsList, ogs_strdup_or_assert(alt_notif_ipv6_addrs_local->valuestring)); } } @@ -627,7 +627,7 @@ OpenAPI_policy_association_request_t *OpenAPI_policy_association_request_parseFr ogs_error("OpenAPI_policy_association_request_parseFromJSON() failed [group_ids]"); goto end; } - OpenAPI_list_add(group_idsList, ogs_strdup(group_ids_local->valuestring)); + OpenAPI_list_add(group_idsList, ogs_strdup_or_assert(group_ids_local->valuestring)); } } @@ -773,16 +773,16 @@ OpenAPI_policy_association_request_t *OpenAPI_policy_association_request_parseFr } policy_association_request_local_var = OpenAPI_policy_association_request_create ( - ogs_strdup(notification_uri->valuestring), + ogs_strdup_or_assert(notification_uri->valuestring), alt_notif_ipv4_addrs ? alt_notif_ipv4_addrsList : NULL, alt_notif_ipv6_addrs ? alt_notif_ipv6_addrsList : NULL, - ogs_strdup(supi->valuestring), - gpsi ? ogs_strdup(gpsi->valuestring) : NULL, + ogs_strdup_or_assert(supi->valuestring), + gpsi ? ogs_strdup_or_assert(gpsi->valuestring) : NULL, access_type ? access_typeVariable : 0, access_types ? access_typesList : NULL, - pei ? ogs_strdup(pei->valuestring) : NULL, + pei ? ogs_strdup_or_assert(pei->valuestring) : NULL, user_loc ? user_loc_local_nonprim : NULL, - time_zone ? ogs_strdup(time_zone->valuestring) : NULL, + time_zone ? ogs_strdup_or_assert(time_zone->valuestring) : NULL, serving_plmn ? serving_plmn_local_nonprim : NULL, rat_type ? rat_typeVariable : 0, rat_types ? rat_typesList : NULL, @@ -796,9 +796,9 @@ OpenAPI_policy_association_request_t *OpenAPI_policy_association_request_parseFr mapping_snssais ? mapping_snssaisList : NULL, n3g_allowed_snssais ? n3g_allowed_snssaisList : NULL, guami ? guami_local_nonprim : NULL, - service_name ? ogs_strdup(service_name->valuestring) : NULL, + service_name ? ogs_strdup_or_assert(service_name->valuestring) : NULL, trace_req ? trace_req_local_nonprim : NULL, - ogs_strdup(supp_feat->valuestring) + ogs_strdup_or_assert(supp_feat->valuestring) ); return policy_association_request_local_var; diff --git a/lib/sbi/openapi/model/policy_association_update_request.c b/lib/sbi/openapi/model/policy_association_update_request.c index 099ff4ac7d..e13727081b 100644 --- a/lib/sbi/openapi/model/policy_association_update_request.c +++ b/lib/sbi/openapi/model/policy_association_update_request.c @@ -418,7 +418,7 @@ OpenAPI_policy_association_update_request_t *OpenAPI_policy_association_update_r ogs_error("OpenAPI_policy_association_update_request_parseFromJSON() failed [alt_notif_ipv4_addrs]"); goto end; } - OpenAPI_list_add(alt_notif_ipv4_addrsList, ogs_strdup(alt_notif_ipv4_addrs_local->valuestring)); + OpenAPI_list_add(alt_notif_ipv4_addrsList, ogs_strdup_or_assert(alt_notif_ipv4_addrs_local->valuestring)); } } @@ -438,7 +438,7 @@ OpenAPI_policy_association_update_request_t *OpenAPI_policy_association_update_r ogs_error("OpenAPI_policy_association_update_request_parseFromJSON() failed [alt_notif_ipv6_addrs]"); goto end; } - OpenAPI_list_add(alt_notif_ipv6_addrsList, ogs_strdup(alt_notif_ipv6_addrs_local->valuestring)); + OpenAPI_list_add(alt_notif_ipv6_addrsList, ogs_strdup_or_assert(alt_notif_ipv6_addrs_local->valuestring)); } } @@ -666,7 +666,7 @@ OpenAPI_policy_association_update_request_t *OpenAPI_policy_association_update_r } policy_association_update_request_local_var = OpenAPI_policy_association_update_request_create ( - notification_uri ? ogs_strdup(notification_uri->valuestring) : NULL, + notification_uri ? ogs_strdup_or_assert(notification_uri->valuestring) : NULL, alt_notif_ipv4_addrs ? alt_notif_ipv4_addrsList : NULL, alt_notif_ipv6_addrs ? alt_notif_ipv6_addrsList : NULL, triggers ? triggersList : NULL, diff --git a/lib/sbi/openapi/model/policy_data_change_notification.c b/lib/sbi/openapi/model/policy_data_change_notification.c index 2f6e51c8c8..5b60a4a50c 100644 --- a/lib/sbi/openapi/model/policy_data_change_notification.c +++ b/lib/sbi/openapi/model/policy_data_change_notification.c @@ -398,7 +398,7 @@ OpenAPI_policy_data_change_notification_t *OpenAPI_policy_data_change_notificati ogs_error("OpenAPI_policy_data_change_notification_parseFromJSON() failed [del_resources]"); goto end; } - OpenAPI_list_add(del_resourcesList, ogs_strdup(del_resources_local->valuestring)); + OpenAPI_list_add(del_resourcesList, ogs_strdup_or_assert(del_resources_local->valuestring)); } } @@ -443,13 +443,13 @@ OpenAPI_policy_data_change_notification_t *OpenAPI_policy_data_change_notificati sponsor_connectivity_data ? sponsor_connectivity_data_local_nonprim : NULL, bdt_data ? bdt_data_local_nonprim : NULL, op_spec_data ? op_spec_data_local_nonprim : NULL, - ue_id ? ogs_strdup(ue_id->valuestring) : NULL, - sponsor_id ? ogs_strdup(sponsor_id->valuestring) : NULL, - bdt_ref_id ? ogs_strdup(bdt_ref_id->valuestring) : NULL, - usage_mon_id ? ogs_strdup(usage_mon_id->valuestring) : NULL, + ue_id ? ogs_strdup_or_assert(ue_id->valuestring) : NULL, + sponsor_id ? ogs_strdup_or_assert(sponsor_id->valuestring) : NULL, + bdt_ref_id ? ogs_strdup_or_assert(bdt_ref_id->valuestring) : NULL, + usage_mon_id ? ogs_strdup_or_assert(usage_mon_id->valuestring) : NULL, plmn_id ? plmn_id_local_nonprim : NULL, del_resources ? del_resourcesList : NULL, - notif_id ? ogs_strdup(notif_id->valuestring) : NULL, + notif_id ? ogs_strdup_or_assert(notif_id->valuestring) : NULL, reported_fragments ? reported_fragmentsList : NULL ); diff --git a/lib/sbi/openapi/model/policy_data_subscription.c b/lib/sbi/openapi/model/policy_data_subscription.c index ccd9bcdb35..a6d82f653a 100644 --- a/lib/sbi/openapi/model/policy_data_subscription.c +++ b/lib/sbi/openapi/model/policy_data_subscription.c @@ -166,7 +166,7 @@ OpenAPI_policy_data_subscription_t *OpenAPI_policy_data_subscription_parseFromJS ogs_error("OpenAPI_policy_data_subscription_parseFromJSON() failed [monitored_resource_uris]"); goto end; } - OpenAPI_list_add(monitored_resource_urisList, ogs_strdup(monitored_resource_uris_local->valuestring)); + OpenAPI_list_add(monitored_resource_urisList, ogs_strdup_or_assert(monitored_resource_uris_local->valuestring)); } cJSON *mon_res_items = cJSON_GetObjectItemCaseSensitive(policy_data_subscriptionJSON, "monResItems"); @@ -211,12 +211,12 @@ OpenAPI_policy_data_subscription_t *OpenAPI_policy_data_subscription_parseFromJS } policy_data_subscription_local_var = OpenAPI_policy_data_subscription_create ( - ogs_strdup(notification_uri->valuestring), - notif_id ? ogs_strdup(notif_id->valuestring) : NULL, + ogs_strdup_or_assert(notification_uri->valuestring), + notif_id ? ogs_strdup_or_assert(notif_id->valuestring) : NULL, monitored_resource_urisList, mon_res_items ? mon_res_itemsList : NULL, - expiry ? ogs_strdup(expiry->valuestring) : NULL, - supported_features ? ogs_strdup(supported_features->valuestring) : NULL + expiry ? ogs_strdup_or_assert(expiry->valuestring) : NULL, + supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL ); return policy_data_subscription_local_var; diff --git a/lib/sbi/openapi/model/policy_update.c b/lib/sbi/openapi/model/policy_update.c index bf6a9682a4..7f8145b593 100644 --- a/lib/sbi/openapi/model/policy_update.c +++ b/lib/sbi/openapi/model/policy_update.c @@ -287,7 +287,7 @@ OpenAPI_policy_update_t *OpenAPI_policy_update_parseFromJSON(cJSON *policy_updat } policy_update_local_var = OpenAPI_policy_update_create ( - ogs_strdup(resource_uri->valuestring), + ogs_strdup_or_assert(resource_uri->valuestring), triggers ? triggersList : NULL, serv_area_res ? serv_area_res_local_nonprim : NULL, wl_serv_area_res ? wl_serv_area_res_local_nonprim : NULL, diff --git a/lib/sbi/openapi/model/pp_active_time.c b/lib/sbi/openapi/model/pp_active_time.c index 12c961f72d..4aee206a49 100644 --- a/lib/sbi/openapi/model/pp_active_time.c +++ b/lib/sbi/openapi/model/pp_active_time.c @@ -139,10 +139,10 @@ OpenAPI_pp_active_time_t *OpenAPI_pp_active_time_parseFromJSON(cJSON *pp_active_ pp_active_time_local_var = OpenAPI_pp_active_time_create ( active_time->valuedouble, - ogs_strdup(af_instance_id->valuestring), + ogs_strdup_or_assert(af_instance_id->valuestring), reference_id->valuedouble, - validity_time ? ogs_strdup(validity_time->valuestring) : NULL, - mtc_provider_information ? ogs_strdup(mtc_provider_information->valuestring) : NULL + validity_time ? ogs_strdup_or_assert(validity_time->valuestring) : NULL, + mtc_provider_information ? ogs_strdup_or_assert(mtc_provider_information->valuestring) : NULL ); return pp_active_time_local_var; diff --git a/lib/sbi/openapi/model/pp_data.c b/lib/sbi/openapi/model/pp_data.c index eeef06c432..c86cec0df7 100644 --- a/lib/sbi/openapi/model/pp_data.c +++ b/lib/sbi/openapi/model/pp_data.c @@ -219,11 +219,11 @@ OpenAPI_pp_data_t *OpenAPI_pp_data_parseFromJSON(cJSON *pp_dataJSON) pp_data_local_var = OpenAPI_pp_data_create ( communication_characteristics ? communication_characteristics_local_nonprim : NULL, - supported_features ? ogs_strdup(supported_features->valuestring) : NULL, + supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL, expected_ue_behaviour_parameters ? expected_ue_behaviour_parameters_local_nonprim : NULL, ec_restriction ? ec_restriction_local_nonprim : NULL, acs_info ? acs_info_local_nonprim : NULL, - stn_sr ? ogs_strdup(stn_sr->valuestring) : NULL, + stn_sr ? ogs_strdup_or_assert(stn_sr->valuestring) : NULL, lcs_privacy ? lcs_privacy_local_nonprim : NULL, sor_info ? sor_info_local_nonprim : NULL ); diff --git a/lib/sbi/openapi/model/pp_dl_packet_count_ext.c b/lib/sbi/openapi/model/pp_dl_packet_count_ext.c index 3a7a77a8ee..5939078b5c 100644 --- a/lib/sbi/openapi/model/pp_dl_packet_count_ext.c +++ b/lib/sbi/openapi/model/pp_dl_packet_count_ext.c @@ -119,10 +119,10 @@ OpenAPI_pp_dl_packet_count_ext_t *OpenAPI_pp_dl_packet_count_ext_parseFromJSON(c } pp_dl_packet_count_ext_local_var = OpenAPI_pp_dl_packet_count_ext_create ( - ogs_strdup(af_instance_id->valuestring), + ogs_strdup_or_assert(af_instance_id->valuestring), reference_id->valuedouble, - validity_time ? ogs_strdup(validity_time->valuestring) : NULL, - mtc_provider_information ? ogs_strdup(mtc_provider_information->valuestring) : NULL + validity_time ? ogs_strdup_or_assert(validity_time->valuestring) : NULL, + mtc_provider_information ? ogs_strdup_or_assert(mtc_provider_information->valuestring) : NULL ); return pp_dl_packet_count_ext_local_var; diff --git a/lib/sbi/openapi/model/pp_maximum_latency.c b/lib/sbi/openapi/model/pp_maximum_latency.c index 11db752cfa..5aa6d7f0a9 100644 --- a/lib/sbi/openapi/model/pp_maximum_latency.c +++ b/lib/sbi/openapi/model/pp_maximum_latency.c @@ -139,10 +139,10 @@ OpenAPI_pp_maximum_latency_t *OpenAPI_pp_maximum_latency_parseFromJSON(cJSON *pp pp_maximum_latency_local_var = OpenAPI_pp_maximum_latency_create ( maximum_latency->valuedouble, - ogs_strdup(af_instance_id->valuestring), + ogs_strdup_or_assert(af_instance_id->valuestring), reference_id->valuedouble, - validity_time ? ogs_strdup(validity_time->valuestring) : NULL, - mtc_provider_information ? ogs_strdup(mtc_provider_information->valuestring) : NULL + validity_time ? ogs_strdup_or_assert(validity_time->valuestring) : NULL, + mtc_provider_information ? ogs_strdup_or_assert(mtc_provider_information->valuestring) : NULL ); return pp_maximum_latency_local_var; diff --git a/lib/sbi/openapi/model/pp_maximum_response_time.c b/lib/sbi/openapi/model/pp_maximum_response_time.c index 428f2bf2f1..ae2fe59173 100644 --- a/lib/sbi/openapi/model/pp_maximum_response_time.c +++ b/lib/sbi/openapi/model/pp_maximum_response_time.c @@ -139,10 +139,10 @@ OpenAPI_pp_maximum_response_time_t *OpenAPI_pp_maximum_response_time_parseFromJS pp_maximum_response_time_local_var = OpenAPI_pp_maximum_response_time_create ( maximum_response_time->valuedouble, - ogs_strdup(af_instance_id->valuestring), + ogs_strdup_or_assert(af_instance_id->valuestring), reference_id->valuedouble, - validity_time ? ogs_strdup(validity_time->valuestring) : NULL, - mtc_provider_information ? ogs_strdup(mtc_provider_information->valuestring) : NULL + validity_time ? ogs_strdup_or_assert(validity_time->valuestring) : NULL, + mtc_provider_information ? ogs_strdup_or_assert(mtc_provider_information->valuestring) : NULL ); return pp_maximum_response_time_local_var; diff --git a/lib/sbi/openapi/model/pp_subs_reg_timer.c b/lib/sbi/openapi/model/pp_subs_reg_timer.c index c3dc1c98cd..b6cec65c54 100644 --- a/lib/sbi/openapi/model/pp_subs_reg_timer.c +++ b/lib/sbi/openapi/model/pp_subs_reg_timer.c @@ -139,10 +139,10 @@ OpenAPI_pp_subs_reg_timer_t *OpenAPI_pp_subs_reg_timer_parseFromJSON(cJSON *pp_s pp_subs_reg_timer_local_var = OpenAPI_pp_subs_reg_timer_create ( subs_reg_timer->valuedouble, - ogs_strdup(af_instance_id->valuestring), + ogs_strdup_or_assert(af_instance_id->valuestring), reference_id->valuedouble, - validity_time ? ogs_strdup(validity_time->valuestring) : NULL, - mtc_provider_information ? ogs_strdup(mtc_provider_information->valuestring) : NULL + validity_time ? ogs_strdup_or_assert(validity_time->valuestring) : NULL, + mtc_provider_information ? ogs_strdup_or_assert(mtc_provider_information->valuestring) : NULL ); return pp_subs_reg_timer_local_var; diff --git a/lib/sbi/openapi/model/presence_info.c b/lib/sbi/openapi/model/presence_info.c index 0c30fe57f7..6b5db5b970 100644 --- a/lib/sbi/openapi/model/presence_info.c +++ b/lib/sbi/openapi/model/presence_info.c @@ -345,8 +345,8 @@ OpenAPI_presence_info_t *OpenAPI_presence_info_parseFromJSON(cJSON *presence_inf } presence_info_local_var = OpenAPI_presence_info_create ( - pra_id ? ogs_strdup(pra_id->valuestring) : NULL, - additional_pra_id ? ogs_strdup(additional_pra_id->valuestring) : NULL, + pra_id ? ogs_strdup_or_assert(pra_id->valuestring) : NULL, + additional_pra_id ? ogs_strdup_or_assert(additional_pra_id->valuestring) : NULL, presence_state ? presence_stateVariable : 0, tracking_area_list ? tracking_area_listList : NULL, ecgi_list ? ecgi_listList : NULL, diff --git a/lib/sbi/openapi/model/presence_info_rm.c b/lib/sbi/openapi/model/presence_info_rm.c index e49f8ee3d8..f01efabc69 100644 --- a/lib/sbi/openapi/model/presence_info_rm.c +++ b/lib/sbi/openapi/model/presence_info_rm.c @@ -345,8 +345,8 @@ OpenAPI_presence_info_rm_t *OpenAPI_presence_info_rm_parseFromJSON(cJSON *presen } presence_info_rm_local_var = OpenAPI_presence_info_rm_create ( - pra_id ? ogs_strdup(pra_id->valuestring) : NULL, - additional_pra_id ? ogs_strdup(additional_pra_id->valuestring) : NULL, + pra_id ? ogs_strdup_or_assert(pra_id->valuestring) : NULL, + additional_pra_id ? ogs_strdup_or_assert(additional_pra_id->valuestring) : NULL, presence_state ? presence_stateVariable : 0, tracking_area_list ? tracking_area_listList : NULL, ecgi_list ? ecgi_listList : NULL, diff --git a/lib/sbi/openapi/model/privacy_parameter.c b/lib/sbi/openapi/model/privacy_parameter.c index 309d6948d9..d75aa0aaff 100644 --- a/lib/sbi/openapi/model/privacy_parameter.c +++ b/lib/sbi/openapi/model/privacy_parameter.c @@ -96,7 +96,7 @@ OpenAPI_privacy_parameter_t *OpenAPI_privacy_parameter_parseFromJSON(cJSON *priv ogs_error("OpenAPI_privacy_parameter_parseFromJSON() failed [ser_ids]"); goto end; } - OpenAPI_list_add(ser_idsList, ogs_strdup(ser_ids_local->valuestring)); + OpenAPI_list_add(ser_idsList, ogs_strdup_or_assert(ser_ids_local->valuestring)); } cJSON *geographical_area = cJSON_GetObjectItemCaseSensitive(privacy_parameterJSON, "geographicalArea"); @@ -125,7 +125,7 @@ OpenAPI_privacy_parameter_t *OpenAPI_privacy_parameter_parseFromJSON(cJSON *priv privacy_parameter_local_var = OpenAPI_privacy_parameter_create ( ser_idsList, - ogs_strdup(geographical_area->valuestring), + ogs_strdup_or_assert(geographical_area->valuestring), timer->valuedouble ); diff --git a/lib/sbi/openapi/model/problem_details.c b/lib/sbi/openapi/model/problem_details.c index 5f7d743606..5cb437eb0a 100644 --- a/lib/sbi/openapi/model/problem_details.c +++ b/lib/sbi/openapi/model/problem_details.c @@ -242,15 +242,15 @@ OpenAPI_problem_details_t *OpenAPI_problem_details_parseFromJSON(cJSON *problem_ } problem_details_local_var = OpenAPI_problem_details_create ( - type ? ogs_strdup(type->valuestring) : NULL, - title ? ogs_strdup(title->valuestring) : NULL, + type ? ogs_strdup_or_assert(type->valuestring) : NULL, + title ? ogs_strdup_or_assert(title->valuestring) : NULL, status ? status->valuedouble : 0, - detail ? ogs_strdup(detail->valuestring) : NULL, - instance ? ogs_strdup(instance->valuestring) : NULL, - cause ? ogs_strdup(cause->valuestring) : NULL, + detail ? ogs_strdup_or_assert(detail->valuestring) : NULL, + instance ? ogs_strdup_or_assert(instance->valuestring) : NULL, + cause ? ogs_strdup_or_assert(cause->valuestring) : NULL, invalid_params ? invalid_paramsList : NULL, - supported_features ? ogs_strdup(supported_features->valuestring) : NULL, - target_scp ? ogs_strdup(target_scp->valuestring) : NULL + supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL, + target_scp ? ogs_strdup_or_assert(target_scp->valuestring) : NULL ); return problem_details_local_var; diff --git a/lib/sbi/openapi/model/problem_details_2.c b/lib/sbi/openapi/model/problem_details_2.c index 11bb53dbbb..5d38288a08 100644 --- a/lib/sbi/openapi/model/problem_details_2.c +++ b/lib/sbi/openapi/model/problem_details_2.c @@ -242,15 +242,15 @@ OpenAPI_problem_details_2_t *OpenAPI_problem_details_2_parseFromJSON(cJSON *prob } problem_details_2_local_var = OpenAPI_problem_details_2_create ( - type ? ogs_strdup(type->valuestring) : NULL, - title ? ogs_strdup(title->valuestring) : NULL, + type ? ogs_strdup_or_assert(type->valuestring) : NULL, + title ? ogs_strdup_or_assert(title->valuestring) : NULL, status ? status->valuedouble : 0, - detail ? ogs_strdup(detail->valuestring) : NULL, - instance ? ogs_strdup(instance->valuestring) : NULL, - cause ? ogs_strdup(cause->valuestring) : NULL, + detail ? ogs_strdup_or_assert(detail->valuestring) : NULL, + instance ? ogs_strdup_or_assert(instance->valuestring) : NULL, + cause ? ogs_strdup_or_assert(cause->valuestring) : NULL, invalid_params ? invalid_paramsList : NULL, - supported_features ? ogs_strdup(supported_features->valuestring) : NULL, - target_scp ? ogs_strdup(target_scp->valuestring) : NULL + supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL, + target_scp ? ogs_strdup_or_assert(target_scp->valuestring) : NULL ); return problem_details_2_local_var; diff --git a/lib/sbi/openapi/model/psa_information.c b/lib/sbi/openapi/model/psa_information.c index 5e1b74e5a0..98076a0188 100644 --- a/lib/sbi/openapi/model/psa_information.c +++ b/lib/sbi/openapi/model/psa_information.c @@ -119,7 +119,7 @@ OpenAPI_psa_information_t *OpenAPI_psa_information_parseFromJSON(cJSON *psa_info ogs_error("OpenAPI_psa_information_parseFromJSON() failed [dnai_list]"); goto end; } - OpenAPI_list_add(dnai_listList, ogs_strdup(dnai_list_local->valuestring)); + OpenAPI_list_add(dnai_listList, ogs_strdup_or_assert(dnai_list_local->valuestring)); } } @@ -144,8 +144,8 @@ OpenAPI_psa_information_t *OpenAPI_psa_information_parseFromJSON(cJSON *psa_info psa_information_local_var = OpenAPI_psa_information_create ( psa_ind ? psa_indVariable : 0, dnai_list ? dnai_listList : NULL, - ue_ipv6_prefix ? ogs_strdup(ue_ipv6_prefix->valuestring) : NULL, - psa_upf_id ? ogs_strdup(psa_upf_id->valuestring) : NULL + ue_ipv6_prefix ? ogs_strdup_or_assert(ue_ipv6_prefix->valuestring) : NULL, + psa_upf_id ? ogs_strdup_or_assert(psa_upf_id->valuestring) : NULL ); return psa_information_local_var; diff --git a/lib/sbi/openapi/model/ptw_parameters.c b/lib/sbi/openapi/model/ptw_parameters.c index 02516b7442..557aa32a6c 100644 --- a/lib/sbi/openapi/model/ptw_parameters.c +++ b/lib/sbi/openapi/model/ptw_parameters.c @@ -84,7 +84,7 @@ OpenAPI_ptw_parameters_t *OpenAPI_ptw_parameters_parseFromJSON(cJSON *ptw_parame ptw_parameters_local_var = OpenAPI_ptw_parameters_create ( operation_modeVariable, - ogs_strdup(ptw_value->valuestring) + ogs_strdup_or_assert(ptw_value->valuestring) ); return ptw_parameters_local_var; diff --git a/lib/sbi/openapi/model/pws_information.c b/lib/sbi/openapi/model/pws_information.c index ecfb48f92b..12318ed813 100644 --- a/lib/sbi/openapi/model/pws_information.c +++ b/lib/sbi/openapi/model/pws_information.c @@ -145,7 +145,7 @@ OpenAPI_pws_information_t *OpenAPI_pws_information_parseFromJSON(cJSON *pws_info serial_number->valuedouble, pws_container_local_nonprim, send_ran_response ? send_ran_response->valueint : 0, - omc_id ? ogs_strdup(omc_id->valuestring) : NULL + omc_id ? ogs_strdup_or_assert(omc_id->valuestring) : NULL ); return pws_information_local_var; diff --git a/lib/sbi/openapi/model/qos_characteristics.c b/lib/sbi/openapi/model/qos_characteristics.c index 9e759960a5..3b449d217d 100644 --- a/lib/sbi/openapi/model/qos_characteristics.c +++ b/lib/sbi/openapi/model/qos_characteristics.c @@ -201,7 +201,7 @@ OpenAPI_qos_characteristics_t *OpenAPI_qos_characteristics_parseFromJSON(cJSON * resource_type_local_nonprim, priority_level->valuedouble, packet_delay_budget->valuedouble, - ogs_strdup(packet_error_rate->valuestring), + ogs_strdup_or_assert(packet_error_rate->valuestring), averaging_window ? averaging_window->valuedouble : 0, max_data_burst_vol ? max_data_burst_vol->valuedouble : 0, ext_max_data_burst_vol ? ext_max_data_burst_vol->valuedouble : 0 diff --git a/lib/sbi/openapi/model/qos_data.c b/lib/sbi/openapi/model/qos_data.c index 4813aabc93..3b12bbf9d3 100644 --- a/lib/sbi/openapi/model/qos_data.c +++ b/lib/sbi/openapi/model/qos_data.c @@ -379,20 +379,20 @@ OpenAPI_qos_data_t *OpenAPI_qos_data_parseFromJSON(cJSON *qos_dataJSON) } qos_data_local_var = OpenAPI_qos_data_create ( - ogs_strdup(qos_id->valuestring), + ogs_strdup_or_assert(qos_id->valuestring), _5qi ? _5qi->valuedouble : 0, - maxbr_ul ? ogs_strdup(maxbr_ul->valuestring) : NULL, - maxbr_dl ? ogs_strdup(maxbr_dl->valuestring) : NULL, - gbr_ul ? ogs_strdup(gbr_ul->valuestring) : NULL, - gbr_dl ? ogs_strdup(gbr_dl->valuestring) : NULL, + maxbr_ul ? ogs_strdup_or_assert(maxbr_ul->valuestring) : NULL, + maxbr_dl ? ogs_strdup_or_assert(maxbr_dl->valuestring) : NULL, + gbr_ul ? ogs_strdup_or_assert(gbr_ul->valuestring) : NULL, + gbr_dl ? ogs_strdup_or_assert(gbr_dl->valuestring) : NULL, arp ? arp_local_nonprim : NULL, qnc ? qnc->valueint : 0, priority_level ? priority_level->valuedouble : 0, aver_window ? aver_window->valuedouble : 0, max_data_burst_vol ? max_data_burst_vol->valuedouble : 0, reflective_qos ? reflective_qos->valueint : 0, - sharing_key_dl ? ogs_strdup(sharing_key_dl->valuestring) : NULL, - sharing_key_ul ? ogs_strdup(sharing_key_ul->valuestring) : NULL, + sharing_key_dl ? ogs_strdup_or_assert(sharing_key_dl->valuestring) : NULL, + sharing_key_ul ? ogs_strdup_or_assert(sharing_key_ul->valuestring) : NULL, max_packet_loss_rate_dl ? max_packet_loss_rate_dl->valuedouble : 0, max_packet_loss_rate_ul ? max_packet_loss_rate_ul->valuedouble : 0, def_qos_flow_indication ? def_qos_flow_indication->valueint : 0, diff --git a/lib/sbi/openapi/model/qos_flow_usage_report.c b/lib/sbi/openapi/model/qos_flow_usage_report.c index 0e0d46cd22..6a4c8b1964 100644 --- a/lib/sbi/openapi/model/qos_flow_usage_report.c +++ b/lib/sbi/openapi/model/qos_flow_usage_report.c @@ -140,8 +140,8 @@ OpenAPI_qos_flow_usage_report_t *OpenAPI_qos_flow_usage_report_parseFromJSON(cJS qos_flow_usage_report_local_var = OpenAPI_qos_flow_usage_report_create ( qfi->valuedouble, - ogs_strdup(start_time_stamp->valuestring), - ogs_strdup(end_time_stamp->valuestring), + ogs_strdup_or_assert(start_time_stamp->valuestring), + ogs_strdup_or_assert(end_time_stamp->valuestring), downlink_volume->valuedouble, uplink_volume->valuedouble ); diff --git a/lib/sbi/openapi/model/qos_monitoring_data.c b/lib/sbi/openapi/model/qos_monitoring_data.c index a2150617e4..117bedc060 100644 --- a/lib/sbi/openapi/model/qos_monitoring_data.c +++ b/lib/sbi/openapi/model/qos_monitoring_data.c @@ -270,7 +270,7 @@ OpenAPI_qos_monitoring_data_t *OpenAPI_qos_monitoring_data_parseFromJSON(cJSON * } qos_monitoring_data_local_var = OpenAPI_qos_monitoring_data_create ( - ogs_strdup(qm_id->valuestring), + ogs_strdup_or_assert(qm_id->valuestring), req_qos_mon_params ? req_qos_mon_paramsList : NULL, rep_freqs ? rep_freqsList : NULL, rep_thresh_dl ? rep_thresh_dl->valuedouble : 0, @@ -278,8 +278,8 @@ OpenAPI_qos_monitoring_data_t *OpenAPI_qos_monitoring_data_parseFromJSON(cJSON * rep_thresh_rp ? rep_thresh_rp->valuedouble : 0, wait_time ? wait_time->valuedouble : 0, rep_period ? rep_period->valuedouble : 0, - notify_uri ? ogs_strdup(notify_uri->valuestring) : NULL, - notify_corre_id ? ogs_strdup(notify_corre_id->valuestring) : NULL + notify_uri ? ogs_strdup_or_assert(notify_uri->valuestring) : NULL, + notify_corre_id ? ogs_strdup_or_assert(notify_corre_id->valuestring) : NULL ); return qos_monitoring_data_local_var; diff --git a/lib/sbi/openapi/model/qos_notification_control_info.c b/lib/sbi/openapi/model/qos_notification_control_info.c index 3fcbacd00f..4d00c14e7e 100644 --- a/lib/sbi/openapi/model/qos_notification_control_info.c +++ b/lib/sbi/openapi/model/qos_notification_control_info.c @@ -136,7 +136,7 @@ OpenAPI_qos_notification_control_info_t *OpenAPI_qos_notification_control_info_p qos_notification_control_info_local_var = OpenAPI_qos_notification_control_info_create ( notif_type_local_nonprim, flows ? flowsList : NULL, - alt_ser_req ? ogs_strdup(alt_ser_req->valuestring) : NULL + alt_ser_req ? ogs_strdup_or_assert(alt_ser_req->valuestring) : NULL ); return qos_notification_control_info_local_var; diff --git a/lib/sbi/openapi/model/radio_parameter_not_served.c b/lib/sbi/openapi/model/radio_parameter_not_served.c index b4d57ebbd4..10c249ac11 100644 --- a/lib/sbi/openapi/model/radio_parameter_not_served.c +++ b/lib/sbi/openapi/model/radio_parameter_not_served.c @@ -130,9 +130,9 @@ OpenAPI_radio_parameter_not_served_t *OpenAPI_radio_parameter_not_served_parseFr oper_managed_local_nonprim = OpenAPI_operator_managed_parseFromJSON(oper_managed); radio_parameter_not_served_local_var = OpenAPI_radio_parameter_not_served_create ( - ogs_strdup(radio_params->valuestring), + ogs_strdup_or_assert(radio_params->valuestring), rat_local_nonprim, - ogs_strdup(geographical_area->valuestring), + ogs_strdup_or_assert(geographical_area->valuestring), oper_managed_local_nonprim ); diff --git a/lib/sbi/openapi/model/redirect_information.c b/lib/sbi/openapi/model/redirect_information.c index 47f2683593..a7660d7c3f 100644 --- a/lib/sbi/openapi/model/redirect_information.c +++ b/lib/sbi/openapi/model/redirect_information.c @@ -101,7 +101,7 @@ OpenAPI_redirect_information_t *OpenAPI_redirect_information_parseFromJSON(cJSON redirect_information_local_var = OpenAPI_redirect_information_create ( redirect_enabled ? redirect_enabled->valueint : 0, redirect_address_type ? redirect_address_typeVariable : 0, - redirect_server_address ? ogs_strdup(redirect_server_address->valuestring) : NULL + redirect_server_address ? ogs_strdup_or_assert(redirect_server_address->valuestring) : NULL ); return redirect_information_local_var; diff --git a/lib/sbi/openapi/model/ref_to_binary_data.c b/lib/sbi/openapi/model/ref_to_binary_data.c index 98c16a84b8..97a2778ccb 100644 --- a/lib/sbi/openapi/model/ref_to_binary_data.c +++ b/lib/sbi/openapi/model/ref_to_binary_data.c @@ -62,7 +62,7 @@ OpenAPI_ref_to_binary_data_t *OpenAPI_ref_to_binary_data_parseFromJSON(cJSON *re } ref_to_binary_data_local_var = OpenAPI_ref_to_binary_data_create ( - ogs_strdup(content_id->valuestring) + ogs_strdup_or_assert(content_id->valuestring) ); return ref_to_binary_data_local_var; diff --git a/lib/sbi/openapi/model/registration_context_container.c b/lib/sbi/openapi/model/registration_context_container.c index fea46ed136..51750e8093 100644 --- a/lib/sbi/openapi/model/registration_context_container.c +++ b/lib/sbi/openapi/model/registration_context_container.c @@ -457,17 +457,17 @@ OpenAPI_registration_context_container_t *OpenAPI_registration_context_container registration_context_container_local_var = OpenAPI_registration_context_container_create ( ue_context_local_nonprim, - local_time_zone ? ogs_strdup(local_time_zone->valuestring) : NULL, + local_time_zone ? ogs_strdup_or_assert(local_time_zone->valuestring) : NULL, an_typeVariable, an_n2_ap_id->valuedouble, ran_node_id_local_nonprim, - ogs_strdup(initial_amf_name->valuestring), + ogs_strdup_or_assert(initial_amf_name->valuestring), user_location_local_nonprim, - rrc_est_cause ? ogs_strdup(rrc_est_cause->valuestring) : NULL, + rrc_est_cause ? ogs_strdup_or_assert(rrc_est_cause->valuestring) : NULL, ue_context_request ? ue_context_request->valueint : 0, initial_amf_n2_ap_id ? initial_amf_n2_ap_id->valuedouble : 0, - an_n2_i_pv4_addr ? ogs_strdup(an_n2_i_pv4_addr->valuestring) : NULL, - an_n2_i_pv6_addr ? ogs_strdup(an_n2_i_pv6_addr->valuestring) : NULL, + an_n2_i_pv4_addr ? ogs_strdup_or_assert(an_n2_i_pv4_addr->valuestring) : NULL, + an_n2_i_pv6_addr ? ogs_strdup_or_assert(an_n2_i_pv6_addr->valuestring) : NULL, allowed_nssai ? allowed_nssai_local_nonprim : NULL, configured_nssai ? configured_nssaiList : NULL, rejected_nssai_in_plmn ? rejected_nssai_in_plmnList : NULL, diff --git a/lib/sbi/openapi/model/registration_location_info.c b/lib/sbi/openapi/model/registration_location_info.c index 9a4ca7c473..c0bd537392 100644 --- a/lib/sbi/openapi/model/registration_location_info.c +++ b/lib/sbi/openapi/model/registration_location_info.c @@ -149,7 +149,7 @@ OpenAPI_registration_location_info_t *OpenAPI_registration_location_info_parseFr } registration_location_info_local_var = OpenAPI_registration_location_info_create ( - ogs_strdup(amf_instance_id->valuestring), + ogs_strdup_or_assert(amf_instance_id->valuestring), plmn_id ? plmn_id_local_nonprim : NULL, vgmlc_address ? vgmlc_address_local_nonprim : NULL, access_type_listList diff --git a/lib/sbi/openapi/model/release_data.c b/lib/sbi/openapi/model/release_data.c index f2792d37b7..f821d70e2a 100644 --- a/lib/sbi/openapi/model/release_data.c +++ b/lib/sbi/openapi/model/release_data.c @@ -339,7 +339,7 @@ OpenAPI_release_data_t *OpenAPI_release_data_parseFromJSON(cJSON *release_dataJS ng_ap_cause ? ng_ap_cause_local_nonprim : NULL, _5g_mm_cause_value ? _5g_mm_cause_value->valuedouble : 0, ue_location ? ue_location_local_nonprim : NULL, - ue_time_zone ? ogs_strdup(ue_time_zone->valuestring) : NULL, + ue_time_zone ? ogs_strdup_or_assert(ue_time_zone->valuestring) : NULL, add_ue_location ? add_ue_location_local_nonprim : NULL, secondary_rat_usage_report ? secondary_rat_usage_reportList : NULL, secondary_rat_usage_info ? secondary_rat_usage_infoList : NULL, diff --git a/lib/sbi/openapi/model/report_item.c b/lib/sbi/openapi/model/report_item.c index 372ce2f69f..d946368df4 100644 --- a/lib/sbi/openapi/model/report_item.c +++ b/lib/sbi/openapi/model/report_item.c @@ -62,7 +62,7 @@ OpenAPI_report_item_t *OpenAPI_report_item_parseFromJSON(cJSON *report_itemJSON) } report_item_local_var = OpenAPI_report_item_create ( - ogs_strdup(path->valuestring) + ogs_strdup_or_assert(path->valuestring) ); return report_item_local_var; diff --git a/lib/sbi/openapi/model/reporting_options.c b/lib/sbi/openapi/model/reporting_options.c index 72f822b82c..bfa936fe59 100644 --- a/lib/sbi/openapi/model/reporting_options.c +++ b/lib/sbi/openapi/model/reporting_options.c @@ -158,7 +158,7 @@ OpenAPI_reporting_options_t *OpenAPI_reporting_options_parseFromJSON(cJSON *repo reporting_options_local_var = OpenAPI_reporting_options_create ( report_mode ? report_mode_local_nonprim : NULL, max_num_of_reports ? max_num_of_reports->valuedouble : 0, - expiry ? ogs_strdup(expiry->valuestring) : NULL, + expiry ? ogs_strdup_or_assert(expiry->valuestring) : NULL, sampling_ratio ? sampling_ratio->valuedouble : 0, guard_time ? guard_time->valuedouble : 0, report_period ? report_period->valuedouble : 0 diff --git a/lib/sbi/openapi/model/requested_qos.c b/lib/sbi/openapi/model/requested_qos.c index bc9d0ea845..7d9656e36e 100644 --- a/lib/sbi/openapi/model/requested_qos.c +++ b/lib/sbi/openapi/model/requested_qos.c @@ -100,8 +100,8 @@ OpenAPI_requested_qos_t *OpenAPI_requested_qos_parseFromJSON(cJSON *requested_qo requested_qos_local_var = OpenAPI_requested_qos_create ( _5qi->valuedouble, - gbr_ul ? ogs_strdup(gbr_ul->valuestring) : NULL, - gbr_dl ? ogs_strdup(gbr_dl->valuestring) : NULL + gbr_ul ? ogs_strdup_or_assert(gbr_ul->valuestring) : NULL, + gbr_dl ? ogs_strdup_or_assert(gbr_dl->valuestring) : NULL ); return requested_qos_local_var; diff --git a/lib/sbi/openapi/model/requested_rule_data.c b/lib/sbi/openapi/model/requested_rule_data.c index b8af8e0f44..85479aa5b9 100644 --- a/lib/sbi/openapi/model/requested_rule_data.c +++ b/lib/sbi/openapi/model/requested_rule_data.c @@ -97,7 +97,7 @@ OpenAPI_requested_rule_data_t *OpenAPI_requested_rule_data_parseFromJSON(cJSON * ogs_error("OpenAPI_requested_rule_data_parseFromJSON() failed [ref_pcc_rule_ids]"); goto end; } - OpenAPI_list_add(ref_pcc_rule_idsList, ogs_strdup(ref_pcc_rule_ids_local->valuestring)); + OpenAPI_list_add(ref_pcc_rule_idsList, ogs_strdup_or_assert(ref_pcc_rule_ids_local->valuestring)); } cJSON *req_data = cJSON_GetObjectItemCaseSensitive(requested_rule_dataJSON, "reqData"); diff --git a/lib/sbi/openapi/model/requested_usage_data.c b/lib/sbi/openapi/model/requested_usage_data.c index e51f5b6620..ca9a0c0ba2 100644 --- a/lib/sbi/openapi/model/requested_usage_data.c +++ b/lib/sbi/openapi/model/requested_usage_data.c @@ -88,7 +88,7 @@ OpenAPI_requested_usage_data_t *OpenAPI_requested_usage_data_parseFromJSON(cJSON ogs_error("OpenAPI_requested_usage_data_parseFromJSON() failed [ref_um_ids]"); goto end; } - OpenAPI_list_add(ref_um_idsList, ogs_strdup(ref_um_ids_local->valuestring)); + OpenAPI_list_add(ref_um_idsList, ogs_strdup_or_assert(ref_um_ids_local->valuestring)); } } diff --git a/lib/sbi/openapi/model/resource_item.c b/lib/sbi/openapi/model/resource_item.c index 11d86bf22b..281d3225a1 100644 --- a/lib/sbi/openapi/model/resource_item.c +++ b/lib/sbi/openapi/model/resource_item.c @@ -101,11 +101,11 @@ OpenAPI_resource_item_t *OpenAPI_resource_item_parseFromJSON(cJSON *resource_ite ogs_error("OpenAPI_resource_item_parseFromJSON() failed [items]"); goto end; } - OpenAPI_list_add(itemsList, ogs_strdup(items_local->valuestring)); + OpenAPI_list_add(itemsList, ogs_strdup_or_assert(items_local->valuestring)); } resource_item_local_var = OpenAPI_resource_item_create ( - ogs_strdup(mon_resource_uri->valuestring), + ogs_strdup_or_assert(mon_resource_uri->valuestring), itemsList ); diff --git a/lib/sbi/openapi/model/resynchronization_info.c b/lib/sbi/openapi/model/resynchronization_info.c index b0bcf9d30b..a74ecc36f9 100644 --- a/lib/sbi/openapi/model/resynchronization_info.c +++ b/lib/sbi/openapi/model/resynchronization_info.c @@ -82,8 +82,8 @@ OpenAPI_resynchronization_info_t *OpenAPI_resynchronization_info_parseFromJSON(c } resynchronization_info_local_var = OpenAPI_resynchronization_info_create ( - ogs_strdup(rand->valuestring), - ogs_strdup(auts->valuestring) + ogs_strdup_or_assert(rand->valuestring), + ogs_strdup_or_assert(auts->valuestring) ); return resynchronization_info_local_var; diff --git a/lib/sbi/openapi/model/rg_auth_ctx.c b/lib/sbi/openapi/model/rg_auth_ctx.c index 1b1fa1022c..773e534e0c 100644 --- a/lib/sbi/openapi/model/rg_auth_ctx.c +++ b/lib/sbi/openapi/model/rg_auth_ctx.c @@ -101,7 +101,7 @@ OpenAPI_rg_auth_ctx_t *OpenAPI_rg_auth_ctx_parseFromJSON(cJSON *rg_auth_ctxJSON) rg_auth_ctx_local_var = OpenAPI_rg_auth_ctx_create ( auth_resultVariable, - supi ? ogs_strdup(supi->valuestring) : NULL, + supi ? ogs_strdup_or_assert(supi->valuestring) : NULL, auth_ind ? auth_ind->valueint : 0 ); diff --git a/lib/sbi/openapi/model/rg_authentication_info.c b/lib/sbi/openapi/model/rg_authentication_info.c index 7e0098d0e3..4ab4b93741 100644 --- a/lib/sbi/openapi/model/rg_authentication_info.c +++ b/lib/sbi/openapi/model/rg_authentication_info.c @@ -81,7 +81,7 @@ OpenAPI_rg_authentication_info_t *OpenAPI_rg_authentication_info_parseFromJSON(c } rg_authentication_info_local_var = OpenAPI_rg_authentication_info_create ( - ogs_strdup(suci->valuestring), + ogs_strdup_or_assert(suci->valuestring), authenticated_ind->valueint ); diff --git a/lib/sbi/openapi/model/route_information.c b/lib/sbi/openapi/model/route_information.c index 42067fcf19..dd48299d3f 100644 --- a/lib/sbi/openapi/model/route_information.c +++ b/lib/sbi/openapi/model/route_information.c @@ -99,8 +99,8 @@ OpenAPI_route_information_t *OpenAPI_route_information_parseFromJSON(cJSON *rout } route_information_local_var = OpenAPI_route_information_create ( - ipv4_addr ? ogs_strdup(ipv4_addr->valuestring) : NULL, - ipv6_addr ? ogs_strdup(ipv6_addr->valuestring) : NULL, + ipv4_addr ? ogs_strdup_or_assert(ipv4_addr->valuestring) : NULL, + ipv6_addr ? ogs_strdup_or_assert(ipv6_addr->valuestring) : NULL, port_number->valuedouble ); diff --git a/lib/sbi/openapi/model/route_to_location.c b/lib/sbi/openapi/model/route_to_location.c index 7d2d53e8c9..c8bd30f7eb 100644 --- a/lib/sbi/openapi/model/route_to_location.c +++ b/lib/sbi/openapi/model/route_to_location.c @@ -104,9 +104,9 @@ OpenAPI_route_to_location_t *OpenAPI_route_to_location_parseFromJSON(cJSON *rout } route_to_location_local_var = OpenAPI_route_to_location_create ( - ogs_strdup(dnai->valuestring), + ogs_strdup_or_assert(dnai->valuestring), route_info ? route_info_local_nonprim : NULL, - route_prof_id ? ogs_strdup(route_prof_id->valuestring) : NULL + route_prof_id ? ogs_strdup_or_assert(route_prof_id->valuestring) : NULL ); return route_to_location_local_var; diff --git a/lib/sbi/openapi/model/rule_report.c b/lib/sbi/openapi/model/rule_report.c index 388998e1a1..d4b68f0782 100644 --- a/lib/sbi/openapi/model/rule_report.c +++ b/lib/sbi/openapi/model/rule_report.c @@ -161,7 +161,7 @@ OpenAPI_rule_report_t *OpenAPI_rule_report_parseFromJSON(cJSON *rule_reportJSON) ogs_error("OpenAPI_rule_report_parseFromJSON() failed [pcc_rule_ids]"); goto end; } - OpenAPI_list_add(pcc_rule_idsList, ogs_strdup(pcc_rule_ids_local->valuestring)); + OpenAPI_list_add(pcc_rule_idsList, ogs_strdup_or_assert(pcc_rule_ids_local->valuestring)); } cJSON *rule_status = cJSON_GetObjectItemCaseSensitive(rule_reportJSON, "ruleStatus"); diff --git a/lib/sbi/openapi/model/scheduled_communication_time.c b/lib/sbi/openapi/model/scheduled_communication_time.c index 41de7878e0..41edbefd46 100644 --- a/lib/sbi/openapi/model/scheduled_communication_time.c +++ b/lib/sbi/openapi/model/scheduled_communication_time.c @@ -123,8 +123,8 @@ OpenAPI_scheduled_communication_time_t *OpenAPI_scheduled_communication_time_par scheduled_communication_time_local_var = OpenAPI_scheduled_communication_time_create ( days_of_week ? days_of_weekList : NULL, - time_of_day_start ? ogs_strdup(time_of_day_start->valuestring) : NULL, - time_of_day_end ? ogs_strdup(time_of_day_end->valuestring) : NULL + time_of_day_start ? ogs_strdup_or_assert(time_of_day_start->valuestring) : NULL, + time_of_day_end ? ogs_strdup_or_assert(time_of_day_end->valuestring) : NULL ); return scheduled_communication_time_local_var; diff --git a/lib/sbi/openapi/model/scheduled_communication_time_rm.c b/lib/sbi/openapi/model/scheduled_communication_time_rm.c index 83d7cdd227..168ab7d8bc 100644 --- a/lib/sbi/openapi/model/scheduled_communication_time_rm.c +++ b/lib/sbi/openapi/model/scheduled_communication_time_rm.c @@ -123,8 +123,8 @@ OpenAPI_scheduled_communication_time_rm_t *OpenAPI_scheduled_communication_time_ scheduled_communication_time_rm_local_var = OpenAPI_scheduled_communication_time_rm_create ( days_of_week ? days_of_weekList : NULL, - time_of_day_start ? ogs_strdup(time_of_day_start->valuestring) : NULL, - time_of_day_end ? ogs_strdup(time_of_day_end->valuestring) : NULL + time_of_day_start ? ogs_strdup_or_assert(time_of_day_start->valuestring) : NULL, + time_of_day_end ? ogs_strdup_or_assert(time_of_day_end->valuestring) : NULL ); return scheduled_communication_time_rm_local_var; diff --git a/lib/sbi/openapi/model/scp_domain_cond.c b/lib/sbi/openapi/model/scp_domain_cond.c index 4f6ca6cf35..66e6502c8c 100644 --- a/lib/sbi/openapi/model/scp_domain_cond.c +++ b/lib/sbi/openapi/model/scp_domain_cond.c @@ -79,7 +79,7 @@ OpenAPI_scp_domain_cond_t *OpenAPI_scp_domain_cond_parseFromJSON(cJSON *scp_doma ogs_error("OpenAPI_scp_domain_cond_parseFromJSON() failed [scp_domains]"); goto end; } - OpenAPI_list_add(scp_domainsList, ogs_strdup(scp_domains_local->valuestring)); + OpenAPI_list_add(scp_domainsList, ogs_strdup_or_assert(scp_domains_local->valuestring)); } } diff --git a/lib/sbi/openapi/model/scp_domain_info.c b/lib/sbi/openapi/model/scp_domain_info.c index 4caa6ee1fd..cdb1b9d52d 100644 --- a/lib/sbi/openapi/model/scp_domain_info.c +++ b/lib/sbi/openapi/model/scp_domain_info.c @@ -169,9 +169,9 @@ OpenAPI_scp_domain_info_t *OpenAPI_scp_domain_info_parseFromJSON(cJSON *scp_doma } scp_domain_info_local_var = OpenAPI_scp_domain_info_create ( - scp_fqdn ? ogs_strdup(scp_fqdn->valuestring) : NULL, + scp_fqdn ? ogs_strdup_or_assert(scp_fqdn->valuestring) : NULL, scp_ip_end_points ? scp_ip_end_pointsList : NULL, - scp_prefix ? ogs_strdup(scp_prefix->valuestring) : NULL, + scp_prefix ? ogs_strdup_or_assert(scp_prefix->valuestring) : NULL, scp_ports ? scp_portsList : NULL ); diff --git a/lib/sbi/openapi/model/scp_info.c b/lib/sbi/openapi/model/scp_info.c index e09ba9293e..eacf9efb22 100644 --- a/lib/sbi/openapi/model/scp_info.c +++ b/lib/sbi/openapi/model/scp_info.c @@ -322,7 +322,7 @@ OpenAPI_scp_info_t *OpenAPI_scp_info_parseFromJSON(cJSON *scp_infoJSON) ogs_error("OpenAPI_scp_info_parseFromJSON() failed [address_domains]"); goto end; } - OpenAPI_list_add(address_domainsList, ogs_strdup(address_domains_local->valuestring)); + OpenAPI_list_add(address_domainsList, ogs_strdup_or_assert(address_domains_local->valuestring)); } } @@ -342,7 +342,7 @@ OpenAPI_scp_info_t *OpenAPI_scp_info_parseFromJSON(cJSON *scp_infoJSON) ogs_error("OpenAPI_scp_info_parseFromJSON() failed [ipv4_addresses]"); goto end; } - OpenAPI_list_add(ipv4_addressesList, ogs_strdup(ipv4_addresses_local->valuestring)); + OpenAPI_list_add(ipv4_addressesList, ogs_strdup_or_assert(ipv4_addresses_local->valuestring)); } } @@ -362,7 +362,7 @@ OpenAPI_scp_info_t *OpenAPI_scp_info_parseFromJSON(cJSON *scp_infoJSON) ogs_error("OpenAPI_scp_info_parseFromJSON() failed [ipv6_prefixes]"); goto end; } - OpenAPI_list_add(ipv6_prefixesList, ogs_strdup(ipv6_prefixes_local->valuestring)); + OpenAPI_list_add(ipv6_prefixesList, ogs_strdup_or_assert(ipv6_prefixes_local->valuestring)); } } @@ -428,7 +428,7 @@ OpenAPI_scp_info_t *OpenAPI_scp_info_parseFromJSON(cJSON *scp_infoJSON) ogs_error("OpenAPI_scp_info_parseFromJSON() failed [served_nf_set_id_list]"); goto end; } - OpenAPI_list_add(served_nf_set_id_listList, ogs_strdup(served_nf_set_id_list_local->valuestring)); + OpenAPI_list_add(served_nf_set_id_listList, ogs_strdup_or_assert(served_nf_set_id_list_local->valuestring)); } } @@ -457,7 +457,7 @@ OpenAPI_scp_info_t *OpenAPI_scp_info_parseFromJSON(cJSON *scp_infoJSON) scp_info_local_var = OpenAPI_scp_info_create ( scp_domain_info_list ? scp_domain_info_listList : NULL, - scp_prefix ? ogs_strdup(scp_prefix->valuestring) : NULL, + scp_prefix ? ogs_strdup_or_assert(scp_prefix->valuestring) : NULL, scp_ports ? scp_portsList : NULL, address_domains ? address_domainsList : NULL, ipv4_addresses ? ipv4_addressesList : NULL, diff --git a/lib/sbi/openapi/model/sd_range.c b/lib/sbi/openapi/model/sd_range.c index 5473e515e4..4383f531aa 100644 --- a/lib/sbi/openapi/model/sd_range.c +++ b/lib/sbi/openapi/model/sd_range.c @@ -80,8 +80,8 @@ OpenAPI_sd_range_t *OpenAPI_sd_range_parseFromJSON(cJSON *sd_rangeJSON) } sd_range_local_var = OpenAPI_sd_range_create ( - start ? ogs_strdup(start->valuestring) : NULL, - end ? ogs_strdup(end->valuestring) : NULL + start ? ogs_strdup_or_assert(start->valuestring) : NULL, + end ? ogs_strdup_or_assert(end->valuestring) : NULL ); return sd_range_local_var; diff --git a/lib/sbi/openapi/model/sdm_subs_modification.c b/lib/sbi/openapi/model/sdm_subs_modification.c index 5b03be6229..e50bc06b74 100644 --- a/lib/sbi/openapi/model/sdm_subs_modification.c +++ b/lib/sbi/openapi/model/sdm_subs_modification.c @@ -98,12 +98,12 @@ OpenAPI_sdm_subs_modification_t *OpenAPI_sdm_subs_modification_parseFromJSON(cJS ogs_error("OpenAPI_sdm_subs_modification_parseFromJSON() failed [monitored_resource_uris]"); goto end; } - OpenAPI_list_add(monitored_resource_urisList, ogs_strdup(monitored_resource_uris_local->valuestring)); + OpenAPI_list_add(monitored_resource_urisList, ogs_strdup_or_assert(monitored_resource_uris_local->valuestring)); } } sdm_subs_modification_local_var = OpenAPI_sdm_subs_modification_create ( - expires ? ogs_strdup(expires->valuestring) : NULL, + expires ? ogs_strdup_or_assert(expires->valuestring) : NULL, monitored_resource_uris ? monitored_resource_urisList : NULL ); diff --git a/lib/sbi/openapi/model/sdm_subscription.c b/lib/sbi/openapi/model/sdm_subscription.c index 6ac1900d2e..1a6423c09c 100644 --- a/lib/sbi/openapi/model/sdm_subscription.c +++ b/lib/sbi/openapi/model/sdm_subscription.c @@ -280,7 +280,7 @@ OpenAPI_sdm_subscription_t *OpenAPI_sdm_subscription_parseFromJSON(cJSON *sdm_su ogs_error("OpenAPI_sdm_subscription_parseFromJSON() failed [monitored_resource_uris]"); goto end; } - OpenAPI_list_add(monitored_resource_urisList, ogs_strdup(monitored_resource_uris_local->valuestring)); + OpenAPI_list_add(monitored_resource_urisList, ogs_strdup_or_assert(monitored_resource_uris_local->valuestring)); } cJSON *single_nssai = cJSON_GetObjectItemCaseSensitive(sdm_subscriptionJSON, "singleNssai"); @@ -348,19 +348,19 @@ OpenAPI_sdm_subscription_t *OpenAPI_sdm_subscription_parseFromJSON(cJSON *sdm_su } sdm_subscription_local_var = OpenAPI_sdm_subscription_create ( - ogs_strdup(nf_instance_id->valuestring), + ogs_strdup_or_assert(nf_instance_id->valuestring), implicit_unsubscribe ? implicit_unsubscribe->valueint : 0, - expires ? ogs_strdup(expires->valuestring) : NULL, - ogs_strdup(callback_reference->valuestring), - amf_service_name ? ogs_strdup(amf_service_name->valuestring) : NULL, + expires ? ogs_strdup_or_assert(expires->valuestring) : NULL, + ogs_strdup_or_assert(callback_reference->valuestring), + amf_service_name ? ogs_strdup_or_assert(amf_service_name->valuestring) : NULL, monitored_resource_urisList, single_nssai ? single_nssai_local_nonprim : NULL, - dnn ? ogs_strdup(dnn->valuestring) : NULL, - subscription_id ? ogs_strdup(subscription_id->valuestring) : NULL, + dnn ? ogs_strdup_or_assert(dnn->valuestring) : NULL, + subscription_id ? ogs_strdup_or_assert(subscription_id->valuestring) : NULL, plmn_id ? plmn_id_local_nonprim : NULL, immediate_report ? immediate_report->valueint : 0, report ? report_local_nonprim : NULL, - supported_features ? ogs_strdup(supported_features->valuestring) : NULL, + supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL, context_info ? context_info_local_nonprim : NULL ); diff --git a/lib/sbi/openapi/model/seaf_data.c b/lib/sbi/openapi/model/seaf_data.c index cc3ffce675..48da4fd0f3 100644 --- a/lib/sbi/openapi/model/seaf_data.c +++ b/lib/sbi/openapi/model/seaf_data.c @@ -165,7 +165,7 @@ OpenAPI_seaf_data_t *OpenAPI_seaf_data_parseFromJSON(cJSON *seaf_dataJSON) seaf_data_local_var = OpenAPI_seaf_data_create ( ng_ksi_local_nonprim, key_amf_local_nonprim, - nh ? ogs_strdup(nh->valuestring) : NULL, + nh ? ogs_strdup_or_assert(nh->valuestring) : NULL, ncc ? ncc->valuedouble : 0, key_amf_change_ind ? key_amf_change_ind->valueint : 0, key_amf_h_derivation_ind ? key_amf_h_derivation_ind->valueint : 0 diff --git a/lib/sbi/openapi/model/search_result.c b/lib/sbi/openapi/model/search_result.c index e9d3d54676..befba2437c 100644 --- a/lib/sbi/openapi/model/search_result.c +++ b/lib/sbi/openapi/model/search_result.c @@ -191,10 +191,10 @@ OpenAPI_search_result_t *OpenAPI_search_result_parseFromJSON(cJSON *search_resul search_result_local_var = OpenAPI_search_result_create ( validity_period ? validity_period->valuedouble : 0, nf_instancesList, - search_id ? ogs_strdup(search_id->valuestring) : NULL, + search_id ? ogs_strdup_or_assert(search_id->valuestring) : NULL, num_nf_inst_complete ? num_nf_inst_complete->valuedouble : 0, preferred_search ? preferred_search_local_nonprim : NULL, - nrf_supported_features ? ogs_strdup(nrf_supported_features->valuestring) : NULL + nrf_supported_features ? ogs_strdup_or_assert(nrf_supported_features->valuestring) : NULL ); return search_result_local_var; diff --git a/lib/sbi/openapi/model/sequence_number.c b/lib/sbi/openapi/model/sequence_number.c index 2f563909fe..26a41120e7 100644 --- a/lib/sbi/openapi/model/sequence_number.c +++ b/lib/sbi/openapi/model/sequence_number.c @@ -160,7 +160,7 @@ OpenAPI_sequence_number_t *OpenAPI_sequence_number_parseFromJSON(cJSON *sequence sequence_number_local_var = OpenAPI_sequence_number_create ( sqn_scheme ? sqn_schemeVariable : 0, - sqn ? ogs_strdup(sqn->valuestring) : NULL, + sqn ? ogs_strdup_or_assert(sqn->valuestring) : NULL, last_indexes ? last_indexesList : NULL, ind_length ? ind_length->valuedouble : 0, dif_sign ? dif_signVariable : 0 diff --git a/lib/sbi/openapi/model/service_application_server_address.c b/lib/sbi/openapi/model/service_application_server_address.c index d265fd140a..2a0fa97351 100644 --- a/lib/sbi/openapi/model/service_application_server_address.c +++ b/lib/sbi/openapi/model/service_application_server_address.c @@ -213,7 +213,7 @@ OpenAPI_service_application_server_address_t *OpenAPI_service_application_server ogs_error("OpenAPI_service_application_server_address_parseFromJSON() failed [ser_ids]"); goto end; } - OpenAPI_list_add(ser_idsList, ogs_strdup(ser_ids_local->valuestring)); + OpenAPI_list_add(ser_idsList, ogs_strdup_or_assert(ser_ids_local->valuestring)); } cJSON *fqdn = cJSON_GetObjectItemCaseSensitive(service_application_server_addressJSON, "fqdn"); @@ -241,7 +241,7 @@ OpenAPI_service_application_server_address_t *OpenAPI_service_application_server ogs_error("OpenAPI_service_application_server_address_parseFromJSON() failed [ipv4_addrs]"); goto end; } - OpenAPI_list_add(ipv4_addrsList, ogs_strdup(ipv4_addrs_local->valuestring)); + OpenAPI_list_add(ipv4_addrsList, ogs_strdup_or_assert(ipv4_addrs_local->valuestring)); } } @@ -261,7 +261,7 @@ OpenAPI_service_application_server_address_t *OpenAPI_service_application_server ogs_error("OpenAPI_service_application_server_address_parseFromJSON() failed [ipv6_addrs]"); goto end; } - OpenAPI_list_add(ipv6_addrsList, ogs_strdup(ipv6_addrs_local->valuestring)); + OpenAPI_list_add(ipv6_addrsList, ogs_strdup_or_assert(ipv6_addrs_local->valuestring)); } } @@ -342,13 +342,13 @@ OpenAPI_service_application_server_address_t *OpenAPI_service_application_server service_application_server_address_local_var = OpenAPI_service_application_server_address_create ( ser_idsList, - fqdn ? ogs_strdup(fqdn->valuestring) : NULL, + fqdn ? ogs_strdup_or_assert(fqdn->valuestring) : NULL, ipv4_addrs ? ipv4_addrsList : NULL, ipv6_addrs ? ipv6_addrsList : NULL, udp_port_numbers ? udp_port_numbersList : NULL, tcp_port_numbers ? tcp_port_numbersList : NULL, plmnsList, - geopraphical_area ? ogs_strdup(geopraphical_area->valuestring) : NULL + geopraphical_area ? ogs_strdup_or_assert(geopraphical_area->valuestring) : NULL ); return service_application_server_address_local_var; diff --git a/lib/sbi/openapi/model/service_id_to_frequency.c b/lib/sbi/openapi/model/service_id_to_frequency.c index a1bd7eea0b..a5457590e1 100644 --- a/lib/sbi/openapi/model/service_id_to_frequency.c +++ b/lib/sbi/openapi/model/service_id_to_frequency.c @@ -98,7 +98,7 @@ OpenAPI_service_id_to_frequency_t *OpenAPI_service_id_to_frequency_parseFromJSON ogs_error("OpenAPI_service_id_to_frequency_parseFromJSON() failed [ser_ids]"); goto end; } - OpenAPI_list_add(ser_idsList, ogs_strdup(ser_ids_local->valuestring)); + OpenAPI_list_add(ser_idsList, ogs_strdup_or_assert(ser_ids_local->valuestring)); } cJSON *frequency = cJSON_GetObjectItemCaseSensitive(service_id_to_frequencyJSON, "frequency"); @@ -125,7 +125,7 @@ OpenAPI_service_id_to_frequency_t *OpenAPI_service_id_to_frequency_parseFromJSON service_id_to_frequency_local_var = OpenAPI_service_id_to_frequency_create ( ser_idsList, frequency->valuedouble, - geographical_area ? ogs_strdup(geographical_area->valuestring) : NULL + geographical_area ? ogs_strdup_or_assert(geographical_area->valuestring) : NULL ); return service_id_to_frequency_local_var; diff --git a/lib/sbi/openapi/model/service_id_to_layer2_id.c b/lib/sbi/openapi/model/service_id_to_layer2_id.c index 8eeb98e1d7..5ce9ca8928 100644 --- a/lib/sbi/openapi/model/service_id_to_layer2_id.c +++ b/lib/sbi/openapi/model/service_id_to_layer2_id.c @@ -89,7 +89,7 @@ OpenAPI_service_id_to_layer2_id_t *OpenAPI_service_id_to_layer2_id_parseFromJSON ogs_error("OpenAPI_service_id_to_layer2_id_parseFromJSON() failed [ser_ids]"); goto end; } - OpenAPI_list_add(ser_idsList, ogs_strdup(ser_ids_local->valuestring)); + OpenAPI_list_add(ser_idsList, ogs_strdup_or_assert(ser_ids_local->valuestring)); } cJSON *des_layer2_id = cJSON_GetObjectItemCaseSensitive(service_id_to_layer2_idJSON, "desLayer2Id"); @@ -106,7 +106,7 @@ OpenAPI_service_id_to_layer2_id_t *OpenAPI_service_id_to_layer2_id_parseFromJSON service_id_to_layer2_id_local_var = OpenAPI_service_id_to_layer2_id_create ( ser_idsList, - ogs_strdup(des_layer2_id->valuestring) + ogs_strdup_or_assert(des_layer2_id->valuestring) ); return service_id_to_layer2_id_local_var; diff --git a/lib/sbi/openapi/model/service_id_to_pppr.c b/lib/sbi/openapi/model/service_id_to_pppr.c index 113adda23d..7874c7709e 100644 --- a/lib/sbi/openapi/model/service_id_to_pppr.c +++ b/lib/sbi/openapi/model/service_id_to_pppr.c @@ -88,7 +88,7 @@ OpenAPI_service_id_to_pppr_t *OpenAPI_service_id_to_pppr_parseFromJSON(cJSON *se ogs_error("OpenAPI_service_id_to_pppr_parseFromJSON() failed [ser_ids]"); goto end; } - OpenAPI_list_add(ser_idsList, ogs_strdup(ser_ids_local->valuestring)); + OpenAPI_list_add(ser_idsList, ogs_strdup_or_assert(ser_ids_local->valuestring)); } cJSON *pppr = cJSON_GetObjectItemCaseSensitive(service_id_to_ppprJSON, "pppr"); diff --git a/lib/sbi/openapi/model/service_name_cond.c b/lib/sbi/openapi/model/service_name_cond.c index 0e1bf12da0..7d4ac3a939 100644 --- a/lib/sbi/openapi/model/service_name_cond.c +++ b/lib/sbi/openapi/model/service_name_cond.c @@ -62,7 +62,7 @@ OpenAPI_service_name_cond_t *OpenAPI_service_name_cond_parseFromJSON(cJSON *serv } service_name_cond_local_var = OpenAPI_service_name_cond_create ( - ogs_strdup(service_name->valuestring) + ogs_strdup_or_assert(service_name->valuestring) ); return service_name_cond_local_var; diff --git a/lib/sbi/openapi/model/service_parameter_data.c b/lib/sbi/openapi/model/service_parameter_data.c index 2ec6dc1320..c75d2b7894 100644 --- a/lib/sbi/openapi/model/service_parameter_data.c +++ b/lib/sbi/openapi/model/service_parameter_data.c @@ -263,17 +263,17 @@ OpenAPI_service_parameter_data_t *OpenAPI_service_parameter_data_parseFromJSON(c } service_parameter_data_local_var = OpenAPI_service_parameter_data_create ( - app_id ? ogs_strdup(app_id->valuestring) : NULL, - dnn ? ogs_strdup(dnn->valuestring) : NULL, + app_id ? ogs_strdup_or_assert(app_id->valuestring) : NULL, + dnn ? ogs_strdup_or_assert(dnn->valuestring) : NULL, snssai ? snssai_local_nonprim : NULL, - inter_group_id ? ogs_strdup(inter_group_id->valuestring) : NULL, - supi ? ogs_strdup(supi->valuestring) : NULL, - ipv4_addr ? ogs_strdup(ipv4_addr->valuestring) : NULL, - ipv6_addr ? ogs_strdup(ipv6_addr->valuestring) : NULL, - mac_addr ? ogs_strdup(mac_addr->valuestring) : NULL, + inter_group_id ? ogs_strdup_or_assert(inter_group_id->valuestring) : NULL, + supi ? ogs_strdup_or_assert(supi->valuestring) : NULL, + ipv4_addr ? ogs_strdup_or_assert(ipv4_addr->valuestring) : NULL, + ipv6_addr ? ogs_strdup_or_assert(ipv6_addr->valuestring) : NULL, + mac_addr ? ogs_strdup_or_assert(mac_addr->valuestring) : NULL, param_over_pc5 ? param_over_pc5_local_nonprim : NULL, param_over_uu ? param_over_uu_local_nonprim : NULL, - supp_feat ? ogs_strdup(supp_feat->valuestring) : NULL + supp_feat ? ogs_strdup_or_assert(supp_feat->valuestring) : NULL ); return service_parameter_data_local_var; diff --git a/lib/sbi/openapi/model/service_to_pdu_session.c b/lib/sbi/openapi/model/service_to_pdu_session.c index 9ae6670e97..aee2b21fd2 100644 --- a/lib/sbi/openapi/model/service_to_pdu_session.c +++ b/lib/sbi/openapi/model/service_to_pdu_session.c @@ -147,7 +147,7 @@ OpenAPI_service_to_pdu_session_t *OpenAPI_service_to_pdu_session_parseFromJSON(c ogs_error("OpenAPI_service_to_pdu_session_parseFromJSON() failed [ser_ids]"); goto end; } - OpenAPI_list_add(ser_idsList, ogs_strdup(ser_ids_local->valuestring)); + OpenAPI_list_add(ser_idsList, ogs_strdup_or_assert(ser_ids_local->valuestring)); } cJSON *pdu_session_type = cJSON_GetObjectItemCaseSensitive(service_to_pdu_sessionJSON, "pduSessionType"); @@ -211,7 +211,7 @@ OpenAPI_service_to_pdu_session_t *OpenAPI_service_to_pdu_session_parseFromJSON(c ogs_error("OpenAPI_service_to_pdu_session_parseFromJSON() failed [dnns]"); goto end; } - OpenAPI_list_add(dnnsList, ogs_strdup(dnns_local->valuestring)); + OpenAPI_list_add(dnnsList, ogs_strdup_or_assert(dnns_local->valuestring)); } } diff --git a/lib/sbi/openapi/model/service_to_tx.c b/lib/sbi/openapi/model/service_to_tx.c index 6457c65a40..1a5e35567a 100644 --- a/lib/sbi/openapi/model/service_to_tx.c +++ b/lib/sbi/openapi/model/service_to_tx.c @@ -103,7 +103,7 @@ OpenAPI_service_to_tx_t *OpenAPI_service_to_tx_parseFromJSON(cJSON *service_to_t ogs_error("OpenAPI_service_to_tx_parseFromJSON() failed [ser_ids]"); goto end; } - OpenAPI_list_add(ser_idsList, ogs_strdup(ser_ids_local->valuestring)); + OpenAPI_list_add(ser_idsList, ogs_strdup_or_assert(ser_ids_local->valuestring)); } cJSON *tx_profile = cJSON_GetObjectItemCaseSensitive(service_to_txJSON, "txProfile"); @@ -130,7 +130,7 @@ OpenAPI_service_to_tx_t *OpenAPI_service_to_tx_parseFromJSON(cJSON *service_to_t service_to_tx_local_var = OpenAPI_service_to_tx_create ( ser_idsList, - ogs_strdup(tx_profile->valuestring), + ogs_strdup_or_assert(tx_profile->valuestring), rat_local_nonprim ); diff --git a/lib/sbi/openapi/model/service_type_unrelated_class.c b/lib/sbi/openapi/model/service_type_unrelated_class.c index 658705c892..a56a106e25 100644 --- a/lib/sbi/openapi/model/service_type_unrelated_class.c +++ b/lib/sbi/openapi/model/service_type_unrelated_class.c @@ -210,7 +210,7 @@ OpenAPI_service_type_unrelated_class_t *OpenAPI_service_type_unrelated_class_par ogs_error("OpenAPI_service_type_unrelated_class_parseFromJSON() failed [code_word_list]"); goto end; } - OpenAPI_list_add(code_word_listList, ogs_strdup(code_word_list_local->valuestring)); + OpenAPI_list_add(code_word_listList, ogs_strdup_or_assert(code_word_list_local->valuestring)); } } diff --git a/lib/sbi/openapi/model/serving_nf_identity.c b/lib/sbi/openapi/model/serving_nf_identity.c index 414f4943a0..374af5233a 100644 --- a/lib/sbi/openapi/model/serving_nf_identity.c +++ b/lib/sbi/openapi/model/serving_nf_identity.c @@ -107,7 +107,7 @@ OpenAPI_serving_nf_identity_t *OpenAPI_serving_nf_identity_parseFromJSON(cJSON * } serving_nf_identity_local_var = OpenAPI_serving_nf_identity_create ( - serv_nf_inst_id ? ogs_strdup(serv_nf_inst_id->valuestring) : NULL, + serv_nf_inst_id ? ogs_strdup_or_assert(serv_nf_inst_id->valuestring) : NULL, guami ? guami_local_nonprim : NULL, an_gw_addr ? an_gw_addr_local_nonprim : NULL ); diff --git a/lib/sbi/openapi/model/session_management_subscription_data.c b/lib/sbi/openapi/model/session_management_subscription_data.c index 3c0a86322c..1cc4f0eef2 100644 --- a/lib/sbi/openapi/model/session_management_subscription_data.c +++ b/lib/sbi/openapi/model/session_management_subscription_data.c @@ -291,7 +291,7 @@ OpenAPI_session_management_subscription_data_t *OpenAPI_session_management_subsc ogs_error("OpenAPI_session_management_subscription_data_parseFromJSON() failed [internal_group_ids]"); goto end; } - OpenAPI_list_add(internal_group_idsList, ogs_strdup(internal_group_ids_local->valuestring)); + OpenAPI_list_add(internal_group_idsList, ogs_strdup_or_assert(internal_group_ids_local->valuestring)); } } @@ -408,13 +408,13 @@ OpenAPI_session_management_subscription_data_t *OpenAPI_session_management_subsc dnn_configurations ? dnn_configurationsList : NULL, internal_group_ids ? internal_group_idsList : NULL, shared_vn_group_data_ids ? shared_vn_group_data_idsList : NULL, - shared_dnn_configurations_id ? ogs_strdup(shared_dnn_configurations_id->valuestring) : NULL, + shared_dnn_configurations_id ? ogs_strdup_or_assert(shared_dnn_configurations_id->valuestring) : NULL, odb_packet_services ? odb_packet_servicesVariable : 0, trace_data ? trace_data_local_nonprim : NULL, - shared_trace_data_id ? ogs_strdup(shared_trace_data_id->valuestring) : NULL, + shared_trace_data_id ? ogs_strdup_or_assert(shared_trace_data_id->valuestring) : NULL, expected_ue_behaviours_list ? expected_ue_behaviours_listList : NULL, suggested_packet_num_dl_list ? suggested_packet_num_dl_listList : NULL, - _3gpp_charging_characteristics ? ogs_strdup(_3gpp_charging_characteristics->valuestring) : NULL + _3gpp_charging_characteristics ? ogs_strdup_or_assert(_3gpp_charging_characteristics->valuestring) : NULL ); return session_management_subscription_data_local_var; diff --git a/lib/sbi/openapi/model/session_rule.c b/lib/sbi/openapi/model/session_rule.c index 6147268407..f6fe3f5147 100644 --- a/lib/sbi/openapi/model/session_rule.c +++ b/lib/sbi/openapi/model/session_rule.c @@ -167,10 +167,10 @@ OpenAPI_session_rule_t *OpenAPI_session_rule_parseFromJSON(cJSON *session_ruleJS session_rule_local_var = OpenAPI_session_rule_create ( auth_sess_ambr ? auth_sess_ambr_local_nonprim : NULL, auth_def_qos ? auth_def_qos_local_nonprim : NULL, - ogs_strdup(sess_rule_id->valuestring), - ref_um_data ? ogs_strdup(ref_um_data->valuestring) : NULL, - ref_um_n3g_data ? ogs_strdup(ref_um_n3g_data->valuestring) : NULL, - ref_cond_data ? ogs_strdup(ref_cond_data->valuestring) : NULL + ogs_strdup_or_assert(sess_rule_id->valuestring), + ref_um_data ? ogs_strdup_or_assert(ref_um_data->valuestring) : NULL, + ref_um_n3g_data ? ogs_strdup_or_assert(ref_um_n3g_data->valuestring) : NULL, + ref_cond_data ? ogs_strdup_or_assert(ref_cond_data->valuestring) : NULL ); return session_rule_local_var; diff --git a/lib/sbi/openapi/model/session_rule_report.c b/lib/sbi/openapi/model/session_rule_report.c index 0a7753cb18..e1bcce16c1 100644 --- a/lib/sbi/openapi/model/session_rule_report.c +++ b/lib/sbi/openapi/model/session_rule_report.c @@ -97,7 +97,7 @@ OpenAPI_session_rule_report_t *OpenAPI_session_rule_report_parseFromJSON(cJSON * ogs_error("OpenAPI_session_rule_report_parseFromJSON() failed [rule_ids]"); goto end; } - OpenAPI_list_add(rule_idsList, ogs_strdup(rule_ids_local->valuestring)); + OpenAPI_list_add(rule_idsList, ogs_strdup_or_assert(rule_ids_local->valuestring)); } cJSON *rule_status = cJSON_GetObjectItemCaseSensitive(session_rule_reportJSON, "ruleStatus"); diff --git a/lib/sbi/openapi/model/shared_data.c b/lib/sbi/openapi/model/shared_data.c index 5e84545061..3cb3efa7f8 100644 --- a/lib/sbi/openapi/model/shared_data.c +++ b/lib/sbi/openapi/model/shared_data.c @@ -310,7 +310,7 @@ OpenAPI_shared_data_t *OpenAPI_shared_data_parseFromJSON(cJSON *shared_dataJSON) } shared_data_local_var = OpenAPI_shared_data_create ( - ogs_strdup(shared_data_id->valuestring), + ogs_strdup_or_assert(shared_data_id->valuestring), shared_am_data ? shared_am_data_local_nonprim : NULL, shared_sms_subs_data ? shared_sms_subs_data_local_nonprim : NULL, shared_sms_mng_subs_data ? shared_sms_mng_subs_data_local_nonprim : NULL, diff --git a/lib/sbi/openapi/model/slrb_configurations.c b/lib/sbi/openapi/model/slrb_configurations.c index 735b86878e..d8e1367fd9 100644 --- a/lib/sbi/openapi/model/slrb_configurations.c +++ b/lib/sbi/openapi/model/slrb_configurations.c @@ -87,7 +87,7 @@ OpenAPI_slrb_configurations_t *OpenAPI_slrb_configurations_parseFromJSON(cJSON * slrb_configurations_local_var = OpenAPI_slrb_configurations_create ( pc5_qos_para_local_nonprim, - ogs_strdup(slrb->valuestring) + ogs_strdup_or_assert(slrb->valuestring) ); return slrb_configurations_local_var; diff --git a/lib/sbi/openapi/model/sm_context.c b/lib/sbi/openapi/model/sm_context.c index f9c4f4880a..3a94845b87 100644 --- a/lib/sbi/openapi/model/sm_context.c +++ b/lib/sbi/openapi/model/sm_context.c @@ -922,41 +922,41 @@ OpenAPI_sm_context_t *OpenAPI_sm_context_parseFromJSON(cJSON *sm_contextJSON) sm_context_local_var = OpenAPI_sm_context_create ( pdu_session_id->valuedouble, - ogs_strdup(dnn->valuestring), + ogs_strdup_or_assert(dnn->valuestring), s_nssai_local_nonprim, hplmn_snssai ? hplmn_snssai_local_nonprim : NULL, pdu_session_typeVariable, - gpsi ? ogs_strdup(gpsi->valuestring) : NULL, - h_smf_uri ? ogs_strdup(h_smf_uri->valuestring) : NULL, - smf_uri ? ogs_strdup(smf_uri->valuestring) : NULL, - pdu_session_ref ? ogs_strdup(pdu_session_ref->valuestring) : NULL, - pcf_id ? ogs_strdup(pcf_id->valuestring) : NULL, - pcf_group_id ? ogs_strdup(pcf_group_id->valuestring) : NULL, - pcf_set_id ? ogs_strdup(pcf_set_id->valuestring) : NULL, + gpsi ? ogs_strdup_or_assert(gpsi->valuestring) : NULL, + h_smf_uri ? ogs_strdup_or_assert(h_smf_uri->valuestring) : NULL, + smf_uri ? ogs_strdup_or_assert(smf_uri->valuestring) : NULL, + pdu_session_ref ? ogs_strdup_or_assert(pdu_session_ref->valuestring) : NULL, + pcf_id ? ogs_strdup_or_assert(pcf_id->valuestring) : NULL, + pcf_group_id ? ogs_strdup_or_assert(pcf_group_id->valuestring) : NULL, + pcf_set_id ? ogs_strdup_or_assert(pcf_set_id->valuestring) : NULL, sel_mode ? sel_modeVariable : 0, - udm_group_id ? ogs_strdup(udm_group_id->valuestring) : NULL, - routing_indicator ? ogs_strdup(routing_indicator->valuestring) : NULL, + udm_group_id ? ogs_strdup_or_assert(udm_group_id->valuestring) : NULL, + routing_indicator ? ogs_strdup_or_assert(routing_indicator->valuestring) : NULL, session_ambr_local_nonprim, qos_flows_listList, - h_smf_instance_id ? ogs_strdup(h_smf_instance_id->valuestring) : NULL, - smf_instance_id ? ogs_strdup(smf_instance_id->valuestring) : NULL, - pdu_session_smf_set_id ? ogs_strdup(pdu_session_smf_set_id->valuestring) : NULL, - pdu_session_smf_service_set_id ? ogs_strdup(pdu_session_smf_service_set_id->valuestring) : NULL, + h_smf_instance_id ? ogs_strdup_or_assert(h_smf_instance_id->valuestring) : NULL, + smf_instance_id ? ogs_strdup_or_assert(smf_instance_id->valuestring) : NULL, + pdu_session_smf_set_id ? ogs_strdup_or_assert(pdu_session_smf_set_id->valuestring) : NULL, + pdu_session_smf_service_set_id ? ogs_strdup_or_assert(pdu_session_smf_service_set_id->valuestring) : NULL, pdu_session_smf_binding ? pdu_session_smf_bindingVariable : 0, enable_pause_charging ? enable_pause_charging->valueint : 0, - ue_ipv4_address ? ogs_strdup(ue_ipv4_address->valuestring) : NULL, - ue_ipv6_prefix ? ogs_strdup(ue_ipv6_prefix->valuestring) : NULL, + ue_ipv4_address ? ogs_strdup_or_assert(ue_ipv4_address->valuestring) : NULL, + ue_ipv6_prefix ? ogs_strdup_or_assert(ue_ipv6_prefix->valuestring) : NULL, eps_pdn_cnx_info ? eps_pdn_cnx_info_local_nonprim : NULL, eps_bearer_info ? eps_bearer_infoList : NULL, max_integrity_protected_data_rate ? max_integrity_protected_data_rateVariable : 0, always_on_granted ? always_on_granted->valueint : 0, up_security ? up_security_local_nonprim : NULL, - h_smf_service_instance_id ? ogs_strdup(h_smf_service_instance_id->valuestring) : NULL, - smf_service_instance_id ? ogs_strdup(smf_service_instance_id->valuestring) : NULL, - recovery_time ? ogs_strdup(recovery_time->valuestring) : NULL, + h_smf_service_instance_id ? ogs_strdup_or_assert(h_smf_service_instance_id->valuestring) : NULL, + smf_service_instance_id ? ogs_strdup_or_assert(smf_service_instance_id->valuestring) : NULL, + recovery_time ? ogs_strdup_or_assert(recovery_time->valuestring) : NULL, forwarding_ind ? forwarding_ind->valueint : 0, psa_tunnel_info ? psa_tunnel_info_local_nonprim : NULL, - home_provided_charging_id ? ogs_strdup(home_provided_charging_id->valuestring) : NULL, + home_provided_charging_id ? ogs_strdup_or_assert(home_provided_charging_id->valuestring) : NULL, charging_info ? charging_info_local_nonprim : NULL, roaming_charging_profile ? roaming_charging_profile_local_nonprim : NULL, nef_ext_buf_support_ind ? nef_ext_buf_support_ind->valueint : 0, diff --git a/lib/sbi/openapi/model/sm_context_create_data.c b/lib/sbi/openapi/model/sm_context_create_data.c index 743bd3b1c2..5d96727045 100644 --- a/lib/sbi/openapi/model/sm_context_create_data.c +++ b/lib/sbi/openapi/model/sm_context_create_data.c @@ -1213,7 +1213,7 @@ OpenAPI_sm_context_create_data_t *OpenAPI_sm_context_create_data_parseFromJSON(c ogs_error("OpenAPI_sm_context_create_data_parseFromJSON() failed [additional_hsmf_uri]"); goto end; } - OpenAPI_list_add(additional_hsmf_uriList, ogs_strdup(additional_hsmf_uri_local->valuestring)); + OpenAPI_list_add(additional_hsmf_uriList, ogs_strdup_or_assert(additional_hsmf_uri_local->valuestring)); } } @@ -1233,7 +1233,7 @@ OpenAPI_sm_context_create_data_t *OpenAPI_sm_context_create_data_parseFromJSON(c ogs_error("OpenAPI_sm_context_create_data_parseFromJSON() failed [additional_hsmf_id]"); goto end; } - OpenAPI_list_add(additional_hsmf_idList, ogs_strdup(additional_hsmf_id_local->valuestring)); + OpenAPI_list_add(additional_hsmf_idList, ogs_strdup_or_assert(additional_hsmf_id_local->valuestring)); } } @@ -1253,7 +1253,7 @@ OpenAPI_sm_context_create_data_t *OpenAPI_sm_context_create_data_parseFromJSON(c ogs_error("OpenAPI_sm_context_create_data_parseFromJSON() failed [additional_smf_uri]"); goto end; } - OpenAPI_list_add(additional_smf_uriList, ogs_strdup(additional_smf_uri_local->valuestring)); + OpenAPI_list_add(additional_smf_uriList, ogs_strdup_or_assert(additional_smf_uri_local->valuestring)); } } @@ -1273,7 +1273,7 @@ OpenAPI_sm_context_create_data_t *OpenAPI_sm_context_create_data_parseFromJSON(c ogs_error("OpenAPI_sm_context_create_data_parseFromJSON() failed [additional_smf_id]"); goto end; } - OpenAPI_list_add(additional_smf_idList, ogs_strdup(additional_smf_id_local->valuestring)); + OpenAPI_list_add(additional_smf_idList, ogs_strdup_or_assert(additional_smf_id_local->valuestring)); } } @@ -1702,18 +1702,18 @@ OpenAPI_sm_context_create_data_t *OpenAPI_sm_context_create_data_parseFromJSON(c } sm_context_create_data_local_var = OpenAPI_sm_context_create_data_create ( - supi ? ogs_strdup(supi->valuestring) : NULL, + supi ? ogs_strdup_or_assert(supi->valuestring) : NULL, unauthenticated_supi ? unauthenticated_supi->valueint : 0, - pei ? ogs_strdup(pei->valuestring) : NULL, - gpsi ? ogs_strdup(gpsi->valuestring) : NULL, + pei ? ogs_strdup_or_assert(pei->valuestring) : NULL, + gpsi ? ogs_strdup_or_assert(gpsi->valuestring) : NULL, pdu_session_id ? pdu_session_id->valuedouble : 0, - dnn ? ogs_strdup(dnn->valuestring) : NULL, - selected_dnn ? ogs_strdup(selected_dnn->valuestring) : NULL, + dnn ? ogs_strdup_or_assert(dnn->valuestring) : NULL, + selected_dnn ? ogs_strdup_or_assert(selected_dnn->valuestring) : NULL, s_nssai ? s_nssai_local_nonprim : NULL, hplmn_snssai ? hplmn_snssai_local_nonprim : NULL, - ogs_strdup(serving_nf_id->valuestring), + ogs_strdup_or_assert(serving_nf_id->valuestring), guami ? guami_local_nonprim : NULL, - service_name ? ogs_strdup(service_name->valuestring) : NULL, + service_name ? ogs_strdup_or_assert(service_name->valuestring) : NULL, serving_network_local_nonprim, request_type ? request_typeVariable : 0, n1_sm_msg ? n1_sm_msg_local_nonprim : NULL, @@ -1722,36 +1722,36 @@ OpenAPI_sm_context_create_data_t *OpenAPI_sm_context_create_data_parseFromJSON(c rat_type ? rat_typeVariable : 0, presence_in_ladn ? presence_in_ladnVariable : 0, ue_location ? ue_location_local_nonprim : NULL, - ue_time_zone ? ogs_strdup(ue_time_zone->valuestring) : NULL, + ue_time_zone ? ogs_strdup_or_assert(ue_time_zone->valuestring) : NULL, add_ue_location ? add_ue_location_local_nonprim : NULL, - ogs_strdup(sm_context_status_uri->valuestring), - h_smf_uri ? ogs_strdup(h_smf_uri->valuestring) : NULL, - h_smf_id ? ogs_strdup(h_smf_id->valuestring) : NULL, - smf_uri ? ogs_strdup(smf_uri->valuestring) : NULL, - smf_id ? ogs_strdup(smf_id->valuestring) : NULL, + ogs_strdup_or_assert(sm_context_status_uri->valuestring), + h_smf_uri ? ogs_strdup_or_assert(h_smf_uri->valuestring) : NULL, + h_smf_id ? ogs_strdup_or_assert(h_smf_id->valuestring) : NULL, + smf_uri ? ogs_strdup_or_assert(smf_uri->valuestring) : NULL, + smf_id ? ogs_strdup_or_assert(smf_id->valuestring) : NULL, additional_hsmf_uri ? additional_hsmf_uriList : NULL, additional_hsmf_id ? additional_hsmf_idList : NULL, additional_smf_uri ? additional_smf_uriList : NULL, additional_smf_id ? additional_smf_idList : NULL, old_pdu_session_id ? old_pdu_session_id->valuedouble : 0, pdu_sessions_activate_list ? pdu_sessions_activate_listList : NULL, - ue_eps_pdn_connection ? ogs_strdup(ue_eps_pdn_connection->valuestring) : NULL, + ue_eps_pdn_connection ? ogs_strdup_or_assert(ue_eps_pdn_connection->valuestring) : NULL, ho_state ? ho_stateVariable : 0, - pcf_id ? ogs_strdup(pcf_id->valuestring) : NULL, - pcf_group_id ? ogs_strdup(pcf_group_id->valuestring) : NULL, - pcf_set_id ? ogs_strdup(pcf_set_id->valuestring) : NULL, - nrf_uri ? ogs_strdup(nrf_uri->valuestring) : NULL, - supported_features ? ogs_strdup(supported_features->valuestring) : NULL, + pcf_id ? ogs_strdup_or_assert(pcf_id->valuestring) : NULL, + pcf_group_id ? ogs_strdup_or_assert(pcf_group_id->valuestring) : NULL, + pcf_set_id ? ogs_strdup_or_assert(pcf_set_id->valuestring) : NULL, + nrf_uri ? ogs_strdup_or_assert(nrf_uri->valuestring) : NULL, + supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL, sel_mode ? sel_modeVariable : 0, backup_amf_info ? backup_amf_infoList : NULL, trace_data ? trace_data_local_nonprim : NULL, - udm_group_id ? ogs_strdup(udm_group_id->valuestring) : NULL, - routing_indicator ? ogs_strdup(routing_indicator->valuestring) : NULL, + udm_group_id ? ogs_strdup_or_assert(udm_group_id->valuestring) : NULL, + routing_indicator ? ogs_strdup_or_assert(routing_indicator->valuestring) : NULL, eps_interworking_ind ? eps_interworking_indVariable : 0, indirect_forwarding_flag ? indirect_forwarding_flag->valueint : 0, direct_forwarding_flag ? direct_forwarding_flag->valueint : 0, target_id ? target_id_local_nonprim : NULL, - eps_bearer_ctx_status ? ogs_strdup(eps_bearer_ctx_status->valuestring) : NULL, + eps_bearer_ctx_status ? ogs_strdup_or_assert(eps_bearer_ctx_status->valuestring) : NULL, cp_ciot_enabled ? cp_ciot_enabled->valueint : 0, cp_only_ind ? cp_only_ind->valueint : 0, invoke_nef ? invoke_nef->valueint : 0, @@ -1761,10 +1761,10 @@ OpenAPI_sm_context_create_data_t *OpenAPI_sm_context_create_data_parseFromJSON(c n2_sm_info_type ? n2_sm_info_typeVariable : 0, n2_sm_info_ext1 ? n2_sm_info_ext1_local_nonprim : NULL, n2_sm_info_type_ext1 ? n2_sm_info_type_ext1Variable : 0, - sm_context_ref ? ogs_strdup(sm_context_ref->valuestring) : NULL, - sm_context_smf_id ? ogs_strdup(sm_context_smf_id->valuestring) : NULL, - sm_context_smf_set_id ? ogs_strdup(sm_context_smf_set_id->valuestring) : NULL, - sm_context_smf_service_set_id ? ogs_strdup(sm_context_smf_service_set_id->valuestring) : NULL, + sm_context_ref ? ogs_strdup_or_assert(sm_context_ref->valuestring) : NULL, + sm_context_smf_id ? ogs_strdup_or_assert(sm_context_smf_id->valuestring) : NULL, + sm_context_smf_set_id ? ogs_strdup_or_assert(sm_context_smf_set_id->valuestring) : NULL, + sm_context_smf_service_set_id ? ogs_strdup_or_assert(sm_context_smf_service_set_id->valuestring) : NULL, sm_context_smf_binding ? sm_context_smf_bindingVariable : 0, up_cnx_state ? up_cnx_stateVariable : 0, small_data_rate_status ? small_data_rate_status_local_nonprim : NULL, @@ -1773,8 +1773,8 @@ OpenAPI_sm_context_create_data_t *OpenAPI_sm_context_create_data_parseFromJSON(c dl_data_waiting_ind ? dl_data_waiting_ind->valueint : 0, ddn_failure_subs ? ddn_failure_subs_local_nonprim : NULL, smf_transfer_ind ? smf_transfer_ind->valueint : 0, - old_smf_id ? ogs_strdup(old_smf_id->valuestring) : NULL, - old_sm_context_ref ? ogs_strdup(old_sm_context_ref->valuestring) : NULL, + old_smf_id ? ogs_strdup_or_assert(old_smf_id->valuestring) : NULL, + old_sm_context_ref ? ogs_strdup_or_assert(old_sm_context_ref->valuestring) : NULL, w_agf_info ? w_agf_info_local_nonprim : NULL, tngf_info ? tngf_info_local_nonprim : NULL, twif_info ? twif_info_local_nonprim : NULL diff --git a/lib/sbi/openapi/model/sm_context_create_error.c b/lib/sbi/openapi/model/sm_context_create_error.c index 5480a63627..335011caf3 100644 --- a/lib/sbi/openapi/model/sm_context_create_error.c +++ b/lib/sbi/openapi/model/sm_context_create_error.c @@ -155,7 +155,7 @@ OpenAPI_sm_context_create_error_t *OpenAPI_sm_context_create_error_parseFromJSON n1_sm_msg ? n1_sm_msg_local_nonprim : NULL, n2_sm_info ? n2_sm_info_local_nonprim : NULL, n2_sm_info_type ? n2_sm_info_typeVariable : 0, - recovery_time ? ogs_strdup(recovery_time->valuestring) : NULL + recovery_time ? ogs_strdup_or_assert(recovery_time->valuestring) : NULL ); return sm_context_create_error_local_var; diff --git a/lib/sbi/openapi/model/sm_context_created_data.c b/lib/sbi/openapi/model/sm_context_created_data.c index 7bf5c2f1c0..87490a91a1 100644 --- a/lib/sbi/openapi/model/sm_context_created_data.c +++ b/lib/sbi/openapi/model/sm_context_created_data.c @@ -367,8 +367,8 @@ OpenAPI_sm_context_created_data_t *OpenAPI_sm_context_created_data_parseFromJSON } sm_context_created_data_local_var = OpenAPI_sm_context_created_data_create ( - h_smf_uri ? ogs_strdup(h_smf_uri->valuestring) : NULL, - smf_uri ? ogs_strdup(smf_uri->valuestring) : NULL, + h_smf_uri ? ogs_strdup_or_assert(h_smf_uri->valuestring) : NULL, + smf_uri ? ogs_strdup_or_assert(smf_uri->valuestring) : NULL, pdu_session_id ? pdu_session_id->valuedouble : 0, s_nssai ? s_nssai_local_nonprim : NULL, up_cnx_state ? up_cnx_stateVariable : 0, @@ -376,12 +376,12 @@ OpenAPI_sm_context_created_data_t *OpenAPI_sm_context_created_data_parseFromJSON n2_sm_info_type ? n2_sm_info_typeVariable : 0, allocated_ebi_list ? allocated_ebi_listList : NULL, ho_state ? ho_stateVariable : 0, - gpsi ? ogs_strdup(gpsi->valuestring) : NULL, - smf_service_instance_id ? ogs_strdup(smf_service_instance_id->valuestring) : NULL, - recovery_time ? ogs_strdup(recovery_time->valuestring) : NULL, - supported_features ? ogs_strdup(supported_features->valuestring) : NULL, - selected_smf_id ? ogs_strdup(selected_smf_id->valuestring) : NULL, - selected_old_smf_id ? ogs_strdup(selected_old_smf_id->valuestring) : NULL + gpsi ? ogs_strdup_or_assert(gpsi->valuestring) : NULL, + smf_service_instance_id ? ogs_strdup_or_assert(smf_service_instance_id->valuestring) : NULL, + recovery_time ? ogs_strdup_or_assert(recovery_time->valuestring) : NULL, + supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL, + selected_smf_id ? ogs_strdup_or_assert(selected_smf_id->valuestring) : NULL, + selected_old_smf_id ? ogs_strdup_or_assert(selected_old_smf_id->valuestring) : NULL ); return sm_context_created_data_local_var; diff --git a/lib/sbi/openapi/model/sm_context_release_data.c b/lib/sbi/openapi/model/sm_context_release_data.c index fa515e0f0d..b8d2ded180 100644 --- a/lib/sbi/openapi/model/sm_context_release_data.c +++ b/lib/sbi/openapi/model/sm_context_release_data.c @@ -251,7 +251,7 @@ OpenAPI_sm_context_release_data_t *OpenAPI_sm_context_release_data_parseFromJSON ng_ap_cause ? ng_ap_cause_local_nonprim : NULL, _5g_mm_cause_value ? _5g_mm_cause_value->valuedouble : 0, ue_location ? ue_location_local_nonprim : NULL, - ue_time_zone ? ogs_strdup(ue_time_zone->valuestring) : NULL, + ue_time_zone ? ogs_strdup_or_assert(ue_time_zone->valuestring) : NULL, add_ue_location ? add_ue_location_local_nonprim : NULL, vsmf_release_only ? vsmf_release_only->valueint : 0, n2_sm_info ? n2_sm_info_local_nonprim : NULL, diff --git a/lib/sbi/openapi/model/sm_context_retrieved_data.c b/lib/sbi/openapi/model/sm_context_retrieved_data.c index d36e9b863d..86856b111d 100644 --- a/lib/sbi/openapi/model/sm_context_retrieved_data.c +++ b/lib/sbi/openapi/model/sm_context_retrieved_data.c @@ -149,7 +149,7 @@ OpenAPI_sm_context_retrieved_data_t *OpenAPI_sm_context_retrieved_data_parseFrom } sm_context_retrieved_data_local_var = OpenAPI_sm_context_retrieved_data_create ( - ogs_strdup(ue_eps_pdn_connection->valuestring), + ogs_strdup_or_assert(ue_eps_pdn_connection->valuestring), sm_context ? sm_context_local_nonprim : NULL, small_data_rate_status ? small_data_rate_status_local_nonprim : NULL, apn_rate_status ? apn_rate_status_local_nonprim : NULL, diff --git a/lib/sbi/openapi/model/sm_context_status_notification.c b/lib/sbi/openapi/model/sm_context_status_notification.c index 81cb1a5746..2df6a33691 100644 --- a/lib/sbi/openapi/model/sm_context_status_notification.c +++ b/lib/sbi/openapi/model/sm_context_status_notification.c @@ -207,7 +207,7 @@ OpenAPI_sm_context_status_notification_t *OpenAPI_sm_context_status_notification ogs_error("OpenAPI_sm_context_status_notification_parseFromJSON() failed [notify_correlation_ids_forddn_failure]"); goto end; } - OpenAPI_list_add(notify_correlation_ids_forddn_failureList, ogs_strdup(notify_correlation_ids_forddn_failure_local->valuestring)); + OpenAPI_list_add(notify_correlation_ids_forddn_failureList, ogs_strdup_or_assert(notify_correlation_ids_forddn_failure_local->valuestring)); } } @@ -253,10 +253,10 @@ OpenAPI_sm_context_status_notification_t *OpenAPI_sm_context_status_notification apn_rate_status ? apn_rate_status_local_nonprim : NULL, ddn_failure_status ? ddn_failure_status->valueint : 0, notify_correlation_ids_forddn_failure ? notify_correlation_ids_forddn_failureList : NULL, - new_smf_id ? ogs_strdup(new_smf_id->valuestring) : NULL, - new_smf_set_id ? ogs_strdup(new_smf_set_id->valuestring) : NULL, - old_smf_id ? ogs_strdup(old_smf_id->valuestring) : NULL, - old_sm_context_ref ? ogs_strdup(old_sm_context_ref->valuestring) : NULL + new_smf_id ? ogs_strdup_or_assert(new_smf_id->valuestring) : NULL, + new_smf_set_id ? ogs_strdup_or_assert(new_smf_set_id->valuestring) : NULL, + old_smf_id ? ogs_strdup_or_assert(old_smf_id->valuestring) : NULL, + old_sm_context_ref ? ogs_strdup_or_assert(old_sm_context_ref->valuestring) : NULL ); return sm_context_status_notification_local_var; diff --git a/lib/sbi/openapi/model/sm_context_update_data.c b/lib/sbi/openapi/model/sm_context_update_data.c index 72177696d4..a6b539f027 100644 --- a/lib/sbi/openapi/model/sm_context_update_data.c +++ b/lib/sbi/openapi/model/sm_context_update_data.c @@ -984,7 +984,7 @@ OpenAPI_sm_context_update_data_t *OpenAPI_sm_context_update_data_parseFromJSON(c ogs_error("OpenAPI_sm_context_update_data_parseFromJSON() failed [eps_bearer_setup]"); goto end; } - OpenAPI_list_add(eps_bearer_setupList, ogs_strdup(eps_bearer_setup_local->valuestring)); + OpenAPI_list_add(eps_bearer_setupList, ogs_strdup_or_assert(eps_bearer_setup_local->valuestring)); } } @@ -1182,7 +1182,7 @@ OpenAPI_sm_context_update_data_t *OpenAPI_sm_context_update_data_parseFromJSON(c ogs_error("OpenAPI_sm_context_update_data_parseFromJSON() failed [forwarding_bearer_contexts]"); goto end; } - OpenAPI_list_add(forwarding_bearer_contextsList, ogs_strdup(forwarding_bearer_contexts_local->valuestring)); + OpenAPI_list_add(forwarding_bearer_contextsList, ogs_strdup_or_assert(forwarding_bearer_contexts_local->valuestring)); } } @@ -1194,8 +1194,8 @@ OpenAPI_sm_context_update_data_t *OpenAPI_sm_context_update_data_parseFromJSON(c } sm_context_update_data_local_var = OpenAPI_sm_context_update_data_create ( - pei ? ogs_strdup(pei->valuestring) : NULL, - serving_nf_id ? ogs_strdup(serving_nf_id->valuestring) : NULL, + pei ? ogs_strdup_or_assert(pei->valuestring) : NULL, + serving_nf_id ? ogs_strdup_or_assert(serving_nf_id->valuestring) : NULL, guami ? guami_local_nonprim : NULL, serving_network ? serving_network_local_nonprim : NULL, backup_amf_info ? backup_amf_infoList : NULL, @@ -1205,7 +1205,7 @@ OpenAPI_sm_context_update_data_t *OpenAPI_sm_context_update_data_parseFromJSON(c rat_type ? rat_typeVariable : 0, presence_in_ladn ? presence_in_ladnVariable : 0, ue_location ? ue_location_local_nonprim : NULL, - ue_time_zone ? ogs_strdup(ue_time_zone->valuestring) : NULL, + ue_time_zone ? ogs_strdup_or_assert(ue_time_zone->valuestring) : NULL, add_ue_location ? add_ue_location_local_nonprim : NULL, up_cnx_state ? up_cnx_stateVariable : 0, ho_state ? ho_stateVariable : 0, @@ -1215,8 +1215,8 @@ OpenAPI_sm_context_update_data_t *OpenAPI_sm_context_update_data_parseFromJSON(c n2_sm_info ? n2_sm_info_local_nonprim : NULL, n2_sm_info_type ? n2_sm_info_typeVariable : 0, target_id ? target_id_local_nonprim : NULL, - target_serving_nf_id ? ogs_strdup(target_serving_nf_id->valuestring) : NULL, - sm_context_status_uri ? ogs_strdup(sm_context_status_uri->valuestring) : NULL, + target_serving_nf_id ? ogs_strdup_or_assert(target_serving_nf_id->valuestring) : NULL, + sm_context_status_uri ? ogs_strdup_or_assert(sm_context_status_uri->valuestring) : NULL, data_forwarding ? data_forwarding->valueint : 0, n9_forwarding_tunnel ? n9_forwarding_tunnel_local_nonprim : NULL, n9_dl_forwarding_tnl_list ? n9_dl_forwarding_tnl_listList : NULL, @@ -1237,7 +1237,7 @@ OpenAPI_sm_context_update_data_t *OpenAPI_sm_context_update_data_parseFromJSON(c ma_nw_upgrade_ind ? ma_nw_upgrade_ind->valueint : 0, ma_request_ind ? ma_request_ind->valueint : 0, exemption_ind ? exemption_ind_local_nonprim : NULL, - supported_features ? ogs_strdup(supported_features->valuestring) : NULL, + supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL, mo_exp_data_counter ? mo_exp_data_counter_local_nonprim : NULL, extended_nas_sm_timer_ind ? extended_nas_sm_timer_ind->valueint : 0, forwarding_f_teid ? forwarding_f_teid->valueint : 0, diff --git a/lib/sbi/openapi/model/sm_context_update_error.c b/lib/sbi/openapi/model/sm_context_update_error.c index 3ab6cf80cb..9dfd1a0fea 100644 --- a/lib/sbi/openapi/model/sm_context_update_error.c +++ b/lib/sbi/openapi/model/sm_context_update_error.c @@ -176,7 +176,7 @@ OpenAPI_sm_context_update_error_t *OpenAPI_sm_context_update_error_parseFromJSON n2_sm_info ? n2_sm_info_local_nonprim : NULL, n2_sm_info_type ? n2_sm_info_typeVariable : 0, up_cnx_state ? up_cnx_stateVariable : 0, - recovery_time ? ogs_strdup(recovery_time->valuestring) : NULL + recovery_time ? ogs_strdup_or_assert(recovery_time->valuestring) : NULL ); return sm_context_update_error_local_var; diff --git a/lib/sbi/openapi/model/sm_context_updated_data.c b/lib/sbi/openapi/model/sm_context_updated_data.c index c10a1a1845..eff51906cd 100644 --- a/lib/sbi/openapi/model/sm_context_updated_data.c +++ b/lib/sbi/openapi/model/sm_context_updated_data.c @@ -465,7 +465,7 @@ OpenAPI_sm_context_updated_data_t *OpenAPI_sm_context_updated_data_parseFromJSON ogs_error("OpenAPI_sm_context_updated_data_parseFromJSON() failed [eps_bearer_setup]"); goto end; } - OpenAPI_list_add(eps_bearer_setupList, ogs_strdup(eps_bearer_setup_local->valuestring)); + OpenAPI_list_add(eps_bearer_setupList, ogs_strdup_or_assert(eps_bearer_setup_local->valuestring)); } } @@ -578,7 +578,7 @@ OpenAPI_sm_context_updated_data_t *OpenAPI_sm_context_updated_data_parseFromJSON ogs_error("OpenAPI_sm_context_updated_data_parseFromJSON() failed [forwarding_bearer_contexts]"); goto end; } - OpenAPI_list_add(forwarding_bearer_contextsList, ogs_strdup(forwarding_bearer_contexts_local->valuestring)); + OpenAPI_list_add(forwarding_bearer_contextsList, ogs_strdup_or_assert(forwarding_bearer_contexts_local->valuestring)); } } @@ -615,11 +615,11 @@ OpenAPI_sm_context_updated_data_t *OpenAPI_sm_context_updated_data_parseFromJSON n3_ul_forwarding_tnl_list ? n3_ul_forwarding_tnl_listList : NULL, cause ? causeVariable : 0, ma_accepted_ind ? ma_accepted_ind->valueint : 0, - supported_features ? ogs_strdup(supported_features->valuestring) : NULL, + supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL, forwarding_f_teid ? forwarding_f_teid->valueint : 0, forwarding_bearer_contexts ? forwarding_bearer_contextsList : NULL, - selected_smf_id ? ogs_strdup(selected_smf_id->valuestring) : NULL, - selected_old_smf_id ? ogs_strdup(selected_old_smf_id->valuestring) : NULL + selected_smf_id ? ogs_strdup_or_assert(selected_smf_id->valuestring) : NULL, + selected_old_smf_id ? ogs_strdup_or_assert(selected_old_smf_id->valuestring) : NULL ); return sm_context_updated_data_local_var; diff --git a/lib/sbi/openapi/model/sm_policy_context_data.c b/lib/sbi/openapi/model/sm_policy_context_data.c index 9049aa4fa7..1edc04fa3d 100644 --- a/lib/sbi/openapi/model/sm_policy_context_data.c +++ b/lib/sbi/openapi/model/sm_policy_context_data.c @@ -526,7 +526,7 @@ OpenAPI_sm_policy_context_data_t *OpenAPI_sm_policy_context_data_parseFromJSON(c ogs_error("OpenAPI_sm_policy_context_data_parseFromJSON() failed [inter_grp_ids]"); goto end; } - OpenAPI_list_add(inter_grp_idsList, ogs_strdup(inter_grp_ids_local->valuestring)); + OpenAPI_list_add(inter_grp_idsList, ogs_strdup_or_assert(inter_grp_ids_local->valuestring)); } } @@ -839,27 +839,27 @@ OpenAPI_sm_policy_context_data_t *OpenAPI_sm_policy_context_data_parseFromJSON(c sm_policy_context_data_local_var = OpenAPI_sm_policy_context_data_create ( acc_net_ch_id ? acc_net_ch_id_local_nonprim : NULL, charg_entity_addr ? charg_entity_addr_local_nonprim : NULL, - gpsi ? ogs_strdup(gpsi->valuestring) : NULL, - ogs_strdup(supi->valuestring), + gpsi ? ogs_strdup_or_assert(gpsi->valuestring) : NULL, + ogs_strdup_or_assert(supi->valuestring), inter_grp_ids ? inter_grp_idsList : NULL, pdu_session_id->valuedouble, pdu_session_typeVariable, - chargingcharacteristics ? ogs_strdup(chargingcharacteristics->valuestring) : NULL, - ogs_strdup(dnn->valuestring), + chargingcharacteristics ? ogs_strdup_or_assert(chargingcharacteristics->valuestring) : NULL, + ogs_strdup_or_assert(dnn->valuestring), dnn_sel_mode ? dnn_sel_modeVariable : 0, - ogs_strdup(notification_uri->valuestring), + ogs_strdup_or_assert(notification_uri->valuestring), access_type ? access_typeVariable : 0, rat_type ? rat_typeVariable : 0, add_access_info ? add_access_info_local_nonprim : NULL, serving_network ? serving_network_local_nonprim : NULL, user_location_info ? user_location_info_local_nonprim : NULL, - ue_time_zone ? ogs_strdup(ue_time_zone->valuestring) : NULL, - pei ? ogs_strdup(pei->valuestring) : NULL, - ipv4_address ? ogs_strdup(ipv4_address->valuestring) : NULL, - ipv6_address_prefix ? ogs_strdup(ipv6_address_prefix->valuestring) : NULL, - ip_domain ? ogs_strdup(ip_domain->valuestring) : NULL, + ue_time_zone ? ogs_strdup_or_assert(ue_time_zone->valuestring) : NULL, + pei ? ogs_strdup_or_assert(pei->valuestring) : NULL, + ipv4_address ? ogs_strdup_or_assert(ipv4_address->valuestring) : NULL, + ipv6_address_prefix ? ogs_strdup_or_assert(ipv6_address_prefix->valuestring) : NULL, + ip_domain ? ogs_strdup_or_assert(ip_domain->valuestring) : NULL, subs_sess_ambr ? subs_sess_ambr_local_nonprim : NULL, - auth_prof_index ? ogs_strdup(auth_prof_index->valuestring) : NULL, + auth_prof_index ? ogs_strdup_or_assert(auth_prof_index->valuestring) : NULL, subs_def_qos ? subs_def_qos_local_nonprim : NULL, num_of_pack_filter ? num_of_pack_filter->valuedouble : 0, online ? online->valueint : 0, @@ -870,9 +870,9 @@ OpenAPI_sm_policy_context_data_t *OpenAPI_sm_policy_context_data_parseFromJSON(c slice_info_local_nonprim, qos_flow_usage ? qos_flow_usageVariable : 0, serv_nf_id ? serv_nf_id_local_nonprim : NULL, - supp_feat ? ogs_strdup(supp_feat->valuestring) : NULL, - smf_id ? ogs_strdup(smf_id->valuestring) : NULL, - recovery_time ? ogs_strdup(recovery_time->valuestring) : NULL, + supp_feat ? ogs_strdup_or_assert(supp_feat->valuestring) : NULL, + smf_id ? ogs_strdup_or_assert(smf_id->valuestring) : NULL, + recovery_time ? ogs_strdup_or_assert(recovery_time->valuestring) : NULL, ma_pdu_ind ? ma_pdu_indVariable : 0, atsss_capab ? atsss_capab_local_nonprim : NULL ); diff --git a/lib/sbi/openapi/model/sm_policy_data.c b/lib/sbi/openapi/model/sm_policy_data.c index f28191c26d..759d2b301b 100644 --- a/lib/sbi/openapi/model/sm_policy_data.c +++ b/lib/sbi/openapi/model/sm_policy_data.c @@ -221,7 +221,7 @@ OpenAPI_sm_policy_data_t *OpenAPI_sm_policy_data_parseFromJSON(cJSON *sm_policy_ sm_policy_snssai_dataList, um_data_limits ? um_data_limitsList : NULL, um_data ? um_dataList : NULL, - supp_feat ? ogs_strdup(supp_feat->valuestring) : NULL + supp_feat ? ogs_strdup_or_assert(supp_feat->valuestring) : NULL ); return sm_policy_data_local_var; diff --git a/lib/sbi/openapi/model/sm_policy_decision.c b/lib/sbi/openapi/model/sm_policy_decision.c index 8bb7dfdd84..11698f4aa4 100644 --- a/lib/sbi/openapi/model/sm_policy_decision.c +++ b/lib/sbi/openapi/model/sm_policy_decision.c @@ -967,7 +967,7 @@ OpenAPI_sm_policy_decision_t *OpenAPI_sm_policy_decision_parseFromJSON(cJSON *sm qos_mon_decs ? qos_mon_decsList : NULL, reflective_qo_s_timer ? reflective_qo_s_timer->valuedouble : 0, conds ? condsList : NULL, - revalidation_time ? ogs_strdup(revalidation_time->valuestring) : NULL, + revalidation_time ? ogs_strdup_or_assert(revalidation_time->valuestring) : NULL, offline ? offline->valueint : 0, online ? online->valueint : 0, policy_ctrl_req_triggers ? policy_ctrl_req_triggersList : NULL, @@ -978,7 +978,7 @@ OpenAPI_sm_policy_decision_t *OpenAPI_sm_policy_decision_parseFromJSON(cJSON *sm ipv6_index ? ipv6_index->valuedouble : 0, qos_flow_usage ? qos_flow_usageVariable : 0, rel_cause ? rel_causeVariable : 0, - supp_feat ? ogs_strdup(supp_feat->valuestring) : NULL, + supp_feat ? ogs_strdup_or_assert(supp_feat->valuestring) : NULL, tsn_port_man_cont_dstt ? tsn_port_man_cont_dstt_local_nonprim : NULL, tsn_port_man_cont_nwtts ? tsn_port_man_cont_nwttsList : NULL ); diff --git a/lib/sbi/openapi/model/sm_policy_delete_data.c b/lib/sbi/openapi/model/sm_policy_delete_data.c index d856d53e8f..fdb19025ed 100644 --- a/lib/sbi/openapi/model/sm_policy_delete_data.c +++ b/lib/sbi/openapi/model/sm_policy_delete_data.c @@ -245,9 +245,9 @@ OpenAPI_sm_policy_delete_data_t *OpenAPI_sm_policy_delete_data_parseFromJSON(cJS sm_policy_delete_data_local_var = OpenAPI_sm_policy_delete_data_create ( user_location_info ? user_location_info_local_nonprim : NULL, - ue_time_zone ? ogs_strdup(ue_time_zone->valuestring) : NULL, + ue_time_zone ? ogs_strdup_or_assert(ue_time_zone->valuestring) : NULL, serving_network ? serving_network_local_nonprim : NULL, - user_location_info_time ? ogs_strdup(user_location_info_time->valuestring) : NULL, + user_location_info_time ? ogs_strdup_or_assert(user_location_info_time->valuestring) : NULL, ran_nas_rel_causes ? ran_nas_rel_causesList : NULL, accu_usage_reports ? accu_usage_reportsList : NULL, pdu_sess_rel_cause ? pdu_sess_rel_causeVariable : 0 diff --git a/lib/sbi/openapi/model/sm_policy_dnn_data.c b/lib/sbi/openapi/model/sm_policy_dnn_data.c index 2bd7ee9fd5..d71cd3a06b 100644 --- a/lib/sbi/openapi/model/sm_policy_dnn_data.c +++ b/lib/sbi/openapi/model/sm_policy_dnn_data.c @@ -337,7 +337,7 @@ OpenAPI_sm_policy_dnn_data_t *OpenAPI_sm_policy_dnn_data_parseFromJSON(cJSON *sm ogs_error("OpenAPI_sm_policy_dnn_data_parseFromJSON() failed [allowed_services]"); goto end; } - OpenAPI_list_add(allowed_servicesList, ogs_strdup(allowed_services_local->valuestring)); + OpenAPI_list_add(allowed_servicesList, ogs_strdup_or_assert(allowed_services_local->valuestring)); } } @@ -357,7 +357,7 @@ OpenAPI_sm_policy_dnn_data_t *OpenAPI_sm_policy_dnn_data_parseFromJSON(cJSON *sm ogs_error("OpenAPI_sm_policy_dnn_data_parseFromJSON() failed [subsc_cats]"); goto end; } - OpenAPI_list_add(subsc_catsList, ogs_strdup(subsc_cats_local->valuestring)); + OpenAPI_list_add(subsc_catsList, ogs_strdup_or_assert(subsc_cats_local->valuestring)); } } @@ -549,11 +549,11 @@ OpenAPI_sm_policy_dnn_data_t *OpenAPI_sm_policy_dnn_data_parseFromJSON(cJSON *sm } sm_policy_dnn_data_local_var = OpenAPI_sm_policy_dnn_data_create ( - ogs_strdup(dnn->valuestring), + ogs_strdup_or_assert(dnn->valuestring), allowed_services ? allowed_servicesList : NULL, subsc_cats ? subsc_catsList : NULL, - gbr_ul ? ogs_strdup(gbr_ul->valuestring) : NULL, - gbr_dl ? ogs_strdup(gbr_dl->valuestring) : NULL, + gbr_ul ? ogs_strdup_or_assert(gbr_ul->valuestring) : NULL, + gbr_dl ? ogs_strdup_or_assert(gbr_dl->valuestring) : NULL, adc_support ? adc_support->valueint : 0, subsc_spending_limits ? subsc_spending_limits->valueint : 0, ipv4_index ? ipv4_index->valuedouble : 0, diff --git a/lib/sbi/openapi/model/sm_policy_dnn_data_patch.c b/lib/sbi/openapi/model/sm_policy_dnn_data_patch.c index 076f9b2630..e0f48a22ab 100644 --- a/lib/sbi/openapi/model/sm_policy_dnn_data_patch.c +++ b/lib/sbi/openapi/model/sm_policy_dnn_data_patch.c @@ -102,7 +102,7 @@ OpenAPI_sm_policy_dnn_data_patch_t *OpenAPI_sm_policy_dnn_data_patch_parseFromJS } sm_policy_dnn_data_patch_local_var = OpenAPI_sm_policy_dnn_data_patch_create ( - ogs_strdup(dnn->valuestring), + ogs_strdup_or_assert(dnn->valuestring), bdt_ref_ids ? bdt_ref_idsList : NULL ); diff --git a/lib/sbi/openapi/model/sm_policy_notification.c b/lib/sbi/openapi/model/sm_policy_notification.c index 9097f246c1..adb83392af 100644 --- a/lib/sbi/openapi/model/sm_policy_notification.c +++ b/lib/sbi/openapi/model/sm_policy_notification.c @@ -84,7 +84,7 @@ OpenAPI_sm_policy_notification_t *OpenAPI_sm_policy_notification_parseFromJSON(c } sm_policy_notification_local_var = OpenAPI_sm_policy_notification_create ( - resource_uri ? ogs_strdup(resource_uri->valuestring) : NULL, + resource_uri ? ogs_strdup_or_assert(resource_uri->valuestring) : NULL, sm_policy_decision ? sm_policy_decision_local_nonprim : NULL ); diff --git a/lib/sbi/openapi/model/sm_policy_update_context_data.c b/lib/sbi/openapi/model/sm_policy_update_context_data.c index b53f5ac63a..d90bca9665 100644 --- a/lib/sbi/openapi/model/sm_policy_update_context_data.c +++ b/lib/sbi/openapi/model/sm_policy_update_context_data.c @@ -1241,18 +1241,18 @@ OpenAPI_sm_policy_update_context_data_t *OpenAPI_sm_policy_update_context_data_p rel_access_info ? rel_access_info_local_nonprim : NULL, serving_network ? serving_network_local_nonprim : NULL, user_location_info ? user_location_info_local_nonprim : NULL, - ue_time_zone ? ogs_strdup(ue_time_zone->valuestring) : NULL, - rel_ipv4_address ? ogs_strdup(rel_ipv4_address->valuestring) : NULL, - ipv4_address ? ogs_strdup(ipv4_address->valuestring) : NULL, - ip_domain ? ogs_strdup(ip_domain->valuestring) : NULL, - ipv6_address_prefix ? ogs_strdup(ipv6_address_prefix->valuestring) : NULL, - rel_ipv6_address_prefix ? ogs_strdup(rel_ipv6_address_prefix->valuestring) : NULL, - add_ipv6_addr_prefixes ? ogs_strdup(add_ipv6_addr_prefixes->valuestring) : NULL, - add_rel_ipv6_addr_prefixes ? ogs_strdup(add_rel_ipv6_addr_prefixes->valuestring) : NULL, - rel_ue_mac ? ogs_strdup(rel_ue_mac->valuestring) : NULL, - ue_mac ? ogs_strdup(ue_mac->valuestring) : NULL, + ue_time_zone ? ogs_strdup_or_assert(ue_time_zone->valuestring) : NULL, + rel_ipv4_address ? ogs_strdup_or_assert(rel_ipv4_address->valuestring) : NULL, + ipv4_address ? ogs_strdup_or_assert(ipv4_address->valuestring) : NULL, + ip_domain ? ogs_strdup_or_assert(ip_domain->valuestring) : NULL, + ipv6_address_prefix ? ogs_strdup_or_assert(ipv6_address_prefix->valuestring) : NULL, + rel_ipv6_address_prefix ? ogs_strdup_or_assert(rel_ipv6_address_prefix->valuestring) : NULL, + add_ipv6_addr_prefixes ? ogs_strdup_or_assert(add_ipv6_addr_prefixes->valuestring) : NULL, + add_rel_ipv6_addr_prefixes ? ogs_strdup_or_assert(add_rel_ipv6_addr_prefixes->valuestring) : NULL, + rel_ue_mac ? ogs_strdup_or_assert(rel_ue_mac->valuestring) : NULL, + ue_mac ? ogs_strdup_or_assert(ue_mac->valuestring) : NULL, subs_sess_ambr ? subs_sess_ambr_local_nonprim : NULL, - auth_prof_index ? ogs_strdup(auth_prof_index->valuestring) : NULL, + auth_prof_index ? ogs_strdup_or_assert(auth_prof_index->valuestring) : NULL, subs_def_qos ? subs_def_qos_local_nonprim : NULL, num_of_pack_filter ? num_of_pack_filter->valuedouble : 0, accu_usage_reports ? accu_usage_reportsList : NULL, @@ -1262,7 +1262,7 @@ OpenAPI_sm_policy_update_context_data_t *OpenAPI_sm_policy_update_context_data_p sess_rule_reports ? sess_rule_reportsList : NULL, qnc_reports ? qnc_reportsList : NULL, qos_mon_reports ? qos_mon_reportsList : NULL, - user_location_info_time ? ogs_strdup(user_location_info_time->valuestring) : NULL, + user_location_info_time ? ogs_strdup_or_assert(user_location_info_time->valuestring) : NULL, rep_pra_infos ? rep_pra_infosList : NULL, ue_init_res_req ? ue_init_res_req_local_nonprim : NULL, ref_qos_indication ? ref_qos_indication->valueint : 0, diff --git a/lib/sbi/openapi/model/small_data_rate_status.c b/lib/sbi/openapi/model/small_data_rate_status.c index c5f897806b..29e476fca4 100644 --- a/lib/sbi/openapi/model/small_data_rate_status.c +++ b/lib/sbi/openapi/model/small_data_rate_status.c @@ -135,7 +135,7 @@ OpenAPI_small_data_rate_status_t *OpenAPI_small_data_rate_status_parseFromJSON(c small_data_rate_status_local_var = OpenAPI_small_data_rate_status_create ( remain_packets_ul ? remain_packets_ul->valuedouble : 0, remain_packets_dl ? remain_packets_dl->valuedouble : 0, - validity_time ? ogs_strdup(validity_time->valuestring) : NULL, + validity_time ? ogs_strdup_or_assert(validity_time->valuestring) : NULL, remain_ex_reports_ul ? remain_ex_reports_ul->valuedouble : 0, remain_ex_reports_dl ? remain_ex_reports_dl->valuedouble : 0 ); diff --git a/lib/sbi/openapi/model/small_data_rate_status_info.c b/lib/sbi/openapi/model/small_data_rate_status_info.c index 44349ed2b2..f1c2647f27 100644 --- a/lib/sbi/openapi/model/small_data_rate_status_info.c +++ b/lib/sbi/openapi/model/small_data_rate_status_info.c @@ -111,7 +111,7 @@ OpenAPI_small_data_rate_status_info_t *OpenAPI_small_data_rate_status_info_parse small_data_rate_status_info_local_var = OpenAPI_small_data_rate_status_info_create ( snssai_local_nonprim, - ogs_strdup(dnn->valuestring), + ogs_strdup_or_assert(dnn->valuestring), small_data_rate_status_local_nonprim ); diff --git a/lib/sbi/openapi/model/smf_info.c b/lib/sbi/openapi/model/smf_info.c index cdc2fcbb3d..d45dc16b4f 100644 --- a/lib/sbi/openapi/model/smf_info.c +++ b/lib/sbi/openapi/model/smf_info.c @@ -288,7 +288,7 @@ OpenAPI_smf_info_t *OpenAPI_smf_info_parseFromJSON(cJSON *smf_infoJSON) s_nssai_smf_info_listList, tai_list ? tai_listList : NULL, tai_range_list ? tai_range_listList : NULL, - pgw_fqdn ? ogs_strdup(pgw_fqdn->valuestring) : NULL, + pgw_fqdn ? ogs_strdup_or_assert(pgw_fqdn->valuestring) : NULL, access_type ? access_typeList : NULL, priority ? priority->valuedouble : 0, vsmf_support_ind ? vsmf_support_ind->valueint : 0 diff --git a/lib/sbi/openapi/model/smf_registration.c b/lib/sbi/openapi/model/smf_registration.c index bc6eed50db..aebc0720ef 100644 --- a/lib/sbi/openapi/model/smf_registration.c +++ b/lib/sbi/openapi/model/smf_registration.c @@ -341,20 +341,20 @@ OpenAPI_smf_registration_t *OpenAPI_smf_registration_parseFromJSON(cJSON *smf_re } smf_registration_local_var = OpenAPI_smf_registration_create ( - ogs_strdup(smf_instance_id->valuestring), - smf_set_id ? ogs_strdup(smf_set_id->valuestring) : NULL, - supported_features ? ogs_strdup(supported_features->valuestring) : NULL, + ogs_strdup_or_assert(smf_instance_id->valuestring), + smf_set_id ? ogs_strdup_or_assert(smf_set_id->valuestring) : NULL, + supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL, pdu_session_id->valuedouble, single_nssai_local_nonprim, - dnn ? ogs_strdup(dnn->valuestring) : NULL, + dnn ? ogs_strdup_or_assert(dnn->valuestring) : NULL, emergency_services ? emergency_services->valueint : 0, - pcscf_restoration_callback_uri ? ogs_strdup(pcscf_restoration_callback_uri->valuestring) : NULL, + pcscf_restoration_callback_uri ? ogs_strdup_or_assert(pcscf_restoration_callback_uri->valuestring) : NULL, plmn_id_local_nonprim, - pgw_fqdn ? ogs_strdup(pgw_fqdn->valuestring) : NULL, + pgw_fqdn ? ogs_strdup_or_assert(pgw_fqdn->valuestring) : NULL, epdg_ind ? epdg_ind->valueint : 0, - dereg_callback_uri ? ogs_strdup(dereg_callback_uri->valuestring) : NULL, + dereg_callback_uri ? ogs_strdup_or_assert(dereg_callback_uri->valuestring) : NULL, registration_reason ? registration_reasonVariable : 0, - registration_time ? ogs_strdup(registration_time->valuestring) : NULL, + registration_time ? ogs_strdup_or_assert(registration_time->valuestring) : NULL, context_info ? context_info_local_nonprim : NULL ); diff --git a/lib/sbi/openapi/model/smf_selection_data.c b/lib/sbi/openapi/model/smf_selection_data.c index 74b1e290b5..e83bba4182 100644 --- a/lib/sbi/openapi/model/smf_selection_data.c +++ b/lib/sbi/openapi/model/smf_selection_data.c @@ -181,7 +181,7 @@ OpenAPI_smf_selection_data_t *OpenAPI_smf_selection_data_parseFromJSON(cJSON *sm candidates ? candidatesList : NULL, snssai ? snssai_local_nonprim : NULL, mapping_snssai ? mapping_snssai_local_nonprim : NULL, - dnn ? ogs_strdup(dnn->valuestring) : NULL + dnn ? ogs_strdup_or_assert(dnn->valuestring) : NULL ); return smf_selection_data_local_var; diff --git a/lib/sbi/openapi/model/smf_selection_subscription_data.c b/lib/sbi/openapi/model/smf_selection_subscription_data.c index d0db529e98..c37d3838c8 100644 --- a/lib/sbi/openapi/model/smf_selection_subscription_data.c +++ b/lib/sbi/openapi/model/smf_selection_subscription_data.c @@ -132,9 +132,9 @@ OpenAPI_smf_selection_subscription_data_t *OpenAPI_smf_selection_subscription_da } smf_selection_subscription_data_local_var = OpenAPI_smf_selection_subscription_data_create ( - supported_features ? ogs_strdup(supported_features->valuestring) : NULL, + supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL, subscribed_snssai_infos ? subscribed_snssai_infosList : NULL, - shared_snssai_infos_id ? ogs_strdup(shared_snssai_infos_id->valuestring) : NULL + shared_snssai_infos_id ? ogs_strdup_or_assert(shared_snssai_infos_id->valuestring) : NULL ); return smf_selection_subscription_data_local_var; diff --git a/lib/sbi/openapi/model/sms_management_subscription_data.c b/lib/sbi/openapi/model/sms_management_subscription_data.c index 595debf123..7da6514968 100644 --- a/lib/sbi/openapi/model/sms_management_subscription_data.c +++ b/lib/sbi/openapi/model/sms_management_subscription_data.c @@ -222,7 +222,7 @@ OpenAPI_sms_management_subscription_data_t *OpenAPI_sms_management_subscription_ ogs_error("OpenAPI_sms_management_subscription_data_parseFromJSON() failed [shared_sms_mng_data_ids]"); goto end; } - OpenAPI_list_add(shared_sms_mng_data_idsList, ogs_strdup(shared_sms_mng_data_ids_local->valuestring)); + OpenAPI_list_add(shared_sms_mng_data_idsList, ogs_strdup_or_assert(shared_sms_mng_data_ids_local->valuestring)); } } @@ -234,7 +234,7 @@ OpenAPI_sms_management_subscription_data_t *OpenAPI_sms_management_subscription_ } sms_management_subscription_data_local_var = OpenAPI_sms_management_subscription_data_create ( - supported_features ? ogs_strdup(supported_features->valuestring) : NULL, + supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL, mt_sms_subscribed ? mt_sms_subscribed->valueint : 0, mt_sms_barring_all ? mt_sms_barring_all->valueint : 0, mt_sms_barring_roaming ? mt_sms_barring_roaming->valueint : 0, diff --git a/lib/sbi/openapi/model/sms_subscription_data.c b/lib/sbi/openapi/model/sms_subscription_data.c index 7c3270a638..6e9028b00d 100644 --- a/lib/sbi/openapi/model/sms_subscription_data.c +++ b/lib/sbi/openapi/model/sms_subscription_data.c @@ -80,7 +80,7 @@ OpenAPI_sms_subscription_data_t *OpenAPI_sms_subscription_data_parseFromJSON(cJS sms_subscription_data_local_var = OpenAPI_sms_subscription_data_create ( sms_subscribed ? sms_subscribed->valueint : 0, - shared_sms_subs_data_id ? ogs_strdup(shared_sms_subs_data_id->valuestring) : NULL + shared_sms_subs_data_id ? ogs_strdup_or_assert(shared_sms_subs_data_id->valuestring) : NULL ); return sms_subscription_data_local_var; diff --git a/lib/sbi/openapi/model/smsc_data.c b/lib/sbi/openapi/model/smsc_data.c index 10f8c5fb07..8a04213eab 100644 --- a/lib/sbi/openapi/model/smsc_data.c +++ b/lib/sbi/openapi/model/smsc_data.c @@ -84,7 +84,7 @@ OpenAPI_smsc_data_t *OpenAPI_smsc_data_parseFromJSON(cJSON *smsc_dataJSON) } smsc_data_local_var = OpenAPI_smsc_data_create ( - smsc_map_address ? ogs_strdup(smsc_map_address->valuestring) : NULL, + smsc_map_address ? ogs_strdup_or_assert(smsc_map_address->valuestring) : NULL, smsc_diameter_address ? smsc_diameter_address_local_nonprim : NULL ); diff --git a/lib/sbi/openapi/model/smsf_info.c b/lib/sbi/openapi/model/smsf_info.c index c97b66d0f0..459670bdf4 100644 --- a/lib/sbi/openapi/model/smsf_info.c +++ b/lib/sbi/openapi/model/smsf_info.c @@ -86,7 +86,7 @@ OpenAPI_smsf_info_t *OpenAPI_smsf_info_parseFromJSON(cJSON *smsf_infoJSON) plmn_id_local_nonprim = OpenAPI_plmn_id_parseFromJSON(plmn_id); smsf_info_local_var = OpenAPI_smsf_info_create ( - ogs_strdup(smsf_instance_id->valuestring), + ogs_strdup_or_assert(smsf_instance_id->valuestring), plmn_id_local_nonprim ); diff --git a/lib/sbi/openapi/model/smsf_registration.c b/lib/sbi/openapi/model/smsf_registration.c index 11cb6d97d1..9d1384a491 100644 --- a/lib/sbi/openapi/model/smsf_registration.c +++ b/lib/sbi/openapi/model/smsf_registration.c @@ -208,13 +208,13 @@ OpenAPI_smsf_registration_t *OpenAPI_smsf_registration_parseFromJSON(cJSON *smsf } smsf_registration_local_var = OpenAPI_smsf_registration_create ( - ogs_strdup(smsf_instance_id->valuestring), - smsf_set_id ? ogs_strdup(smsf_set_id->valuestring) : NULL, - supported_features ? ogs_strdup(supported_features->valuestring) : NULL, + ogs_strdup_or_assert(smsf_instance_id->valuestring), + smsf_set_id ? ogs_strdup_or_assert(smsf_set_id->valuestring) : NULL, + supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL, plmn_id_local_nonprim, - smsf_map_address ? ogs_strdup(smsf_map_address->valuestring) : NULL, + smsf_map_address ? ogs_strdup_or_assert(smsf_map_address->valuestring) : NULL, smsf_diameter_address ? smsf_diameter_address_local_nonprim : NULL, - registration_time ? ogs_strdup(registration_time->valuestring) : NULL, + registration_time ? ogs_strdup_or_assert(registration_time->valuestring) : NULL, context_info ? context_info_local_nonprim : NULL ); diff --git a/lib/sbi/openapi/model/snssai.c b/lib/sbi/openapi/model/snssai.c index 076c2e53fd..e3b7dc3856 100644 --- a/lib/sbi/openapi/model/snssai.c +++ b/lib/sbi/openapi/model/snssai.c @@ -81,7 +81,7 @@ OpenAPI_snssai_t *OpenAPI_snssai_parseFromJSON(cJSON *snssaiJSON) snssai_local_var = OpenAPI_snssai_create ( sst->valuedouble, - sd ? ogs_strdup(sd->valuestring) : NULL + sd ? ogs_strdup_or_assert(sd->valuestring) : NULL ); return snssai_local_var; diff --git a/lib/sbi/openapi/model/sor_data.c b/lib/sbi/openapi/model/sor_data.c index afe02fa47d..a6a0edc86b 100644 --- a/lib/sbi/openapi/model/sor_data.c +++ b/lib/sbi/openapi/model/sor_data.c @@ -121,10 +121,10 @@ OpenAPI_sor_data_t *OpenAPI_sor_data_parseFromJSON(cJSON *sor_dataJSON) } sor_data_local_var = OpenAPI_sor_data_create ( - ogs_strdup(provisioning_time->valuestring), + ogs_strdup_or_assert(provisioning_time->valuestring), ue_update_statusVariable, - sor_xmac_iue ? ogs_strdup(sor_xmac_iue->valuestring) : NULL, - sor_mac_iue ? ogs_strdup(sor_mac_iue->valuestring) : NULL + sor_xmac_iue ? ogs_strdup_or_assert(sor_xmac_iue->valuestring) : NULL, + sor_mac_iue ? ogs_strdup_or_assert(sor_mac_iue->valuestring) : NULL ); return sor_data_local_var; diff --git a/lib/sbi/openapi/model/sor_info.c b/lib/sbi/openapi/model/sor_info.c index 364e96550f..a881aed074 100644 --- a/lib/sbi/openapi/model/sor_info.c +++ b/lib/sbi/openapi/model/sor_info.c @@ -144,9 +144,9 @@ OpenAPI_sor_info_t *OpenAPI_sor_info_parseFromJSON(cJSON *sor_infoJSON) sor_info_local_var = OpenAPI_sor_info_create ( steering_container ? steering_container_local_nonprim : NULL, ack_ind->valueint, - sor_mac_iausf ? ogs_strdup(sor_mac_iausf->valuestring) : NULL, - countersor ? ogs_strdup(countersor->valuestring) : NULL, - ogs_strdup(provisioning_time->valuestring) + sor_mac_iausf ? ogs_strdup_or_assert(sor_mac_iausf->valuestring) : NULL, + countersor ? ogs_strdup_or_assert(countersor->valuestring) : NULL, + ogs_strdup_or_assert(provisioning_time->valuestring) ); return sor_info_local_var; diff --git a/lib/sbi/openapi/model/sponsor_connectivity_data.c b/lib/sbi/openapi/model/sponsor_connectivity_data.c index e5020791ff..9acc32881e 100644 --- a/lib/sbi/openapi/model/sponsor_connectivity_data.c +++ b/lib/sbi/openapi/model/sponsor_connectivity_data.c @@ -81,7 +81,7 @@ OpenAPI_sponsor_connectivity_data_t *OpenAPI_sponsor_connectivity_data_parseFrom ogs_error("OpenAPI_sponsor_connectivity_data_parseFromJSON() failed [asp_ids]"); goto end; } - OpenAPI_list_add(asp_idsList, ogs_strdup(asp_ids_local->valuestring)); + OpenAPI_list_add(asp_idsList, ogs_strdup_or_assert(asp_ids_local->valuestring)); } sponsor_connectivity_data_local_var = OpenAPI_sponsor_connectivity_data_create ( diff --git a/lib/sbi/openapi/model/subscription_data.c b/lib/sbi/openapi/model/subscription_data.c index bef40d397b..d243e649dc 100644 --- a/lib/sbi/openapi/model/subscription_data.c +++ b/lib/sbi/openapi/model/subscription_data.c @@ -519,22 +519,22 @@ OpenAPI_subscription_data_t *OpenAPI_subscription_data_parseFromJSON(cJSON *subs ogs_error("OpenAPI_subscription_data_parseFromJSON() failed [serving_scope]"); goto end; } - OpenAPI_list_add(serving_scopeList, ogs_strdup(serving_scope_local->valuestring)); + OpenAPI_list_add(serving_scopeList, ogs_strdup_or_assert(serving_scope_local->valuestring)); } } subscription_data_local_var = OpenAPI_subscription_data_create ( - ogs_strdup(nf_status_notification_uri->valuestring), - req_nf_instance_id ? ogs_strdup(req_nf_instance_id->valuestring) : NULL, + ogs_strdup_or_assert(nf_status_notification_uri->valuestring), + req_nf_instance_id ? ogs_strdup_or_assert(req_nf_instance_id->valuestring) : NULL, subscr_cond ? subscr_cond_local_nonprim : NULL, - subscription_id ? ogs_strdup(subscription_id->valuestring) : NULL, - validity_time ? ogs_strdup(validity_time->valuestring) : NULL, + subscription_id ? ogs_strdup_or_assert(subscription_id->valuestring) : NULL, + validity_time ? ogs_strdup_or_assert(validity_time->valuestring) : NULL, req_notif_events ? req_notif_eventsList : NULL, plmn_id ? plmn_id_local_nonprim : NULL, - nid ? ogs_strdup(nid->valuestring) : NULL, + nid ? ogs_strdup_or_assert(nid->valuestring) : NULL, notif_condition ? notif_condition_local_nonprim : NULL, req_nf_type ? req_nf_typeVariable : 0, - req_nf_fqdn ? ogs_strdup(req_nf_fqdn->valuestring) : NULL, + req_nf_fqdn ? ogs_strdup_or_assert(req_nf_fqdn->valuestring) : NULL, req_snssais ? req_snssaisList : NULL, req_per_plmn_snssais ? req_per_plmn_snssaisList : NULL, req_plmn_list ? req_plmn_listList : NULL, diff --git a/lib/sbi/openapi/model/subscription_data_subscr_cond.c b/lib/sbi/openapi/model/subscription_data_subscr_cond.c index 9e05f7543e..4b8143370b 100644 --- a/lib/sbi/openapi/model/subscription_data_subscr_cond.c +++ b/lib/sbi/openapi/model/subscription_data_subscr_cond.c @@ -351,7 +351,7 @@ OpenAPI_subscription_data_subscr_cond_t *OpenAPI_subscription_data_subscr_cond_p ogs_error("OpenAPI_subscription_data_subscr_cond_parseFromJSON() failed [nsi_list]"); goto end; } - OpenAPI_list_add(nsi_listList, ogs_strdup(nsi_list_local->valuestring)); + OpenAPI_list_add(nsi_listList, ogs_strdup_or_assert(nsi_list_local->valuestring)); } } @@ -398,7 +398,7 @@ OpenAPI_subscription_data_subscr_cond_t *OpenAPI_subscription_data_subscr_cond_p ogs_error("OpenAPI_subscription_data_subscr_cond_parseFromJSON() failed [smf_serving_area]"); goto end; } - OpenAPI_list_add(smf_serving_areaList, ogs_strdup(smf_serving_area_local->valuestring)); + OpenAPI_list_add(smf_serving_areaList, ogs_strdup_or_assert(smf_serving_area_local->valuestring)); } } @@ -426,17 +426,17 @@ OpenAPI_subscription_data_subscr_cond_t *OpenAPI_subscription_data_subscr_cond_p } subscription_data_subscr_cond_local_var = OpenAPI_subscription_data_subscr_cond_create ( - nf_instance_id ? ogs_strdup(nf_instance_id->valuestring) : NULL, + nf_instance_id ? ogs_strdup_or_assert(nf_instance_id->valuestring) : NULL, nf_type ? nf_typeVariable : 0, - service_name ? ogs_strdup(service_name->valuestring) : NULL, - amf_set_id ? ogs_strdup(amf_set_id->valuestring) : NULL, - amf_region_id ? ogs_strdup(amf_region_id->valuestring) : NULL, + service_name ? ogs_strdup_or_assert(service_name->valuestring) : NULL, + amf_set_id ? ogs_strdup_or_assert(amf_set_id->valuestring) : NULL, + amf_region_id ? ogs_strdup_or_assert(amf_region_id->valuestring) : NULL, guami_list ? guami_listList : NULL, snssai_list ? snssai_listList : NULL, nsi_list ? nsi_listList : NULL, - nf_group_id ? ogs_strdup(nf_group_id->valuestring) : NULL, - nf_set_id ? ogs_strdup(nf_set_id->valuestring) : NULL, - nf_service_set_id ? ogs_strdup(nf_service_set_id->valuestring) : NULL, + nf_group_id ? ogs_strdup_or_assert(nf_group_id->valuestring) : NULL, + nf_set_id ? ogs_strdup_or_assert(nf_set_id->valuestring) : NULL, + nf_service_set_id ? ogs_strdup_or_assert(nf_service_set_id->valuestring) : NULL, smf_serving_area ? smf_serving_areaList : NULL, tai_list ? tai_listList : NULL ); diff --git a/lib/sbi/openapi/model/subscription_data_subscriptions.c b/lib/sbi/openapi/model/subscription_data_subscriptions.c index f88f02ff84..7ea7d3b1a6 100644 --- a/lib/sbi/openapi/model/subscription_data_subscriptions.c +++ b/lib/sbi/openapi/model/subscription_data_subscriptions.c @@ -185,7 +185,7 @@ OpenAPI_subscription_data_subscriptions_t *OpenAPI_subscription_data_subscriptio ogs_error("OpenAPI_subscription_data_subscriptions_parseFromJSON() failed [monitored_resource_uris]"); goto end; } - OpenAPI_list_add(monitored_resource_urisList, ogs_strdup(monitored_resource_uris_local->valuestring)); + OpenAPI_list_add(monitored_resource_urisList, ogs_strdup_or_assert(monitored_resource_uris_local->valuestring)); } cJSON *expiry = cJSON_GetObjectItemCaseSensitive(subscription_data_subscriptionsJSON, "expiry"); @@ -223,14 +223,14 @@ OpenAPI_subscription_data_subscriptions_t *OpenAPI_subscription_data_subscriptio } subscription_data_subscriptions_local_var = OpenAPI_subscription_data_subscriptions_create ( - ue_id ? ogs_strdup(ue_id->valuestring) : NULL, - ogs_strdup(callback_reference->valuestring), - original_callback_reference ? ogs_strdup(original_callback_reference->valuestring) : NULL, + ue_id ? ogs_strdup_or_assert(ue_id->valuestring) : NULL, + ogs_strdup_or_assert(callback_reference->valuestring), + original_callback_reference ? ogs_strdup_or_assert(original_callback_reference->valuestring) : NULL, monitored_resource_urisList, - expiry ? ogs_strdup(expiry->valuestring) : NULL, + expiry ? ogs_strdup_or_assert(expiry->valuestring) : NULL, sdm_subscription ? sdm_subscription_local_nonprim : NULL, - subscription_id ? ogs_strdup(subscription_id->valuestring) : NULL, - supported_features ? ogs_strdup(supported_features->valuestring) : NULL + subscription_id ? ogs_strdup_or_assert(subscription_id->valuestring) : NULL, + supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL ); return subscription_data_subscriptions_local_var; diff --git a/lib/sbi/openapi/model/suggested_packet_num_dl.c b/lib/sbi/openapi/model/suggested_packet_num_dl.c index 00ea295006..fc9768b064 100644 --- a/lib/sbi/openapi/model/suggested_packet_num_dl.c +++ b/lib/sbi/openapi/model/suggested_packet_num_dl.c @@ -81,7 +81,7 @@ OpenAPI_suggested_packet_num_dl_t *OpenAPI_suggested_packet_num_dl_parseFromJSON suggested_packet_num_dl_local_var = OpenAPI_suggested_packet_num_dl_create ( suggested_packet_num_dl->valuedouble, - validity_time ? ogs_strdup(validity_time->valuestring) : NULL + validity_time ? ogs_strdup_or_assert(validity_time->valuestring) : NULL ); return suggested_packet_num_dl_local_var; diff --git a/lib/sbi/openapi/model/supi_range.c b/lib/sbi/openapi/model/supi_range.c index adff33704d..4233b0ff2f 100644 --- a/lib/sbi/openapi/model/supi_range.c +++ b/lib/sbi/openapi/model/supi_range.c @@ -99,9 +99,9 @@ OpenAPI_supi_range_t *OpenAPI_supi_range_parseFromJSON(cJSON *supi_rangeJSON) } supi_range_local_var = OpenAPI_supi_range_create ( - start ? ogs_strdup(start->valuestring) : NULL, - end ? ogs_strdup(end->valuestring) : NULL, - pattern ? ogs_strdup(pattern->valuestring) : NULL + start ? ogs_strdup_or_assert(start->valuestring) : NULL, + end ? ogs_strdup_or_assert(end->valuestring) : NULL, + pattern ? ogs_strdup_or_assert(pattern->valuestring) : NULL ); return supi_range_local_var; diff --git a/lib/sbi/openapi/model/tac_info.c b/lib/sbi/openapi/model/tac_info.c index ac6e3ebbd8..a903ae960c 100644 --- a/lib/sbi/openapi/model/tac_info.c +++ b/lib/sbi/openapi/model/tac_info.c @@ -81,7 +81,7 @@ OpenAPI_tac_info_t *OpenAPI_tac_info_parseFromJSON(cJSON *tac_infoJSON) ogs_error("OpenAPI_tac_info_parseFromJSON() failed [tac_list]"); goto end; } - OpenAPI_list_add(tac_listList, ogs_strdup(tac_list_local->valuestring)); + OpenAPI_list_add(tac_listList, ogs_strdup_or_assert(tac_list_local->valuestring)); } tac_info_local_var = OpenAPI_tac_info_create ( diff --git a/lib/sbi/openapi/model/tac_range.c b/lib/sbi/openapi/model/tac_range.c index c4a07d15c6..7d27f190c1 100644 --- a/lib/sbi/openapi/model/tac_range.c +++ b/lib/sbi/openapi/model/tac_range.c @@ -99,9 +99,9 @@ OpenAPI_tac_range_t *OpenAPI_tac_range_parseFromJSON(cJSON *tac_rangeJSON) } tac_range_local_var = OpenAPI_tac_range_create ( - start ? ogs_strdup(start->valuestring) : NULL, - end ? ogs_strdup(end->valuestring) : NULL, - pattern ? ogs_strdup(pattern->valuestring) : NULL + start ? ogs_strdup_or_assert(start->valuestring) : NULL, + end ? ogs_strdup_or_assert(end->valuestring) : NULL, + pattern ? ogs_strdup_or_assert(pattern->valuestring) : NULL ); return tac_range_local_var; diff --git a/lib/sbi/openapi/model/tai.c b/lib/sbi/openapi/model/tai.c index b023058b58..cc90ad45dc 100644 --- a/lib/sbi/openapi/model/tai.c +++ b/lib/sbi/openapi/model/tai.c @@ -106,8 +106,8 @@ OpenAPI_tai_t *OpenAPI_tai_parseFromJSON(cJSON *taiJSON) tai_local_var = OpenAPI_tai_create ( plmn_id_local_nonprim, - ogs_strdup(tac->valuestring), - nid ? ogs_strdup(nid->valuestring) : NULL + ogs_strdup_or_assert(tac->valuestring), + nid ? ogs_strdup_or_assert(nid->valuestring) : NULL ); return tai_local_var; diff --git a/lib/sbi/openapi/model/tai_range.c b/lib/sbi/openapi/model/tai_range.c index b1c0d06231..8c5d811d88 100644 --- a/lib/sbi/openapi/model/tai_range.c +++ b/lib/sbi/openapi/model/tai_range.c @@ -137,7 +137,7 @@ OpenAPI_tai_range_t *OpenAPI_tai_range_parseFromJSON(cJSON *tai_rangeJSON) tai_range_local_var = OpenAPI_tai_range_create ( plmn_id_local_nonprim, tac_range_listList, - nid ? ogs_strdup(nid->valuestring) : NULL + nid ? ogs_strdup_or_assert(nid->valuestring) : NULL ); return tai_range_local_var; diff --git a/lib/sbi/openapi/model/temporal_validity.c b/lib/sbi/openapi/model/temporal_validity.c index 5b0e8abdfc..93a26ed05d 100644 --- a/lib/sbi/openapi/model/temporal_validity.c +++ b/lib/sbi/openapi/model/temporal_validity.c @@ -80,8 +80,8 @@ OpenAPI_temporal_validity_t *OpenAPI_temporal_validity_parseFromJSON(cJSON *temp } temporal_validity_local_var = OpenAPI_temporal_validity_create ( - start_time ? ogs_strdup(start_time->valuestring) : NULL, - stop_time ? ogs_strdup(stop_time->valuestring) : NULL + start_time ? ogs_strdup_or_assert(start_time->valuestring) : NULL, + stop_time ? ogs_strdup_or_assert(stop_time->valuestring) : NULL ); return temporal_validity_local_var; diff --git a/lib/sbi/openapi/model/termination_info.c b/lib/sbi/openapi/model/termination_info.c index fd3581f529..fca6c373c0 100644 --- a/lib/sbi/openapi/model/termination_info.c +++ b/lib/sbi/openapi/model/termination_info.c @@ -84,7 +84,7 @@ OpenAPI_termination_info_t *OpenAPI_termination_info_parseFromJSON(cJSON *termin termination_info_local_var = OpenAPI_termination_info_create ( term_causeVariable, - ogs_strdup(res_uri->valuestring) + ogs_strdup_or_assert(res_uri->valuestring) ); return termination_info_local_var; diff --git a/lib/sbi/openapi/model/termination_notification.c b/lib/sbi/openapi/model/termination_notification.c index ec963c6d8b..4dfd1cee65 100644 --- a/lib/sbi/openapi/model/termination_notification.c +++ b/lib/sbi/openapi/model/termination_notification.c @@ -83,7 +83,7 @@ OpenAPI_termination_notification_t *OpenAPI_termination_notification_parseFromJS causeVariable = OpenAPI_sm_policy_association_release_cause_FromString(cause->valuestring); termination_notification_local_var = OpenAPI_termination_notification_create ( - ogs_strdup(resource_uri->valuestring), + ogs_strdup_or_assert(resource_uri->valuestring), causeVariable ); diff --git a/lib/sbi/openapi/model/time_window.c b/lib/sbi/openapi/model/time_window.c index 79d091d7cb..b12bc227ee 100644 --- a/lib/sbi/openapi/model/time_window.c +++ b/lib/sbi/openapi/model/time_window.c @@ -82,8 +82,8 @@ OpenAPI_time_window_t *OpenAPI_time_window_parseFromJSON(cJSON *time_windowJSON) } time_window_local_var = OpenAPI_time_window_create ( - ogs_strdup(start_time->valuestring), - ogs_strdup(stop_time->valuestring) + ogs_strdup_or_assert(start_time->valuestring), + ogs_strdup_or_assert(stop_time->valuestring) ); return time_window_local_var; diff --git a/lib/sbi/openapi/model/tnap_id.c b/lib/sbi/openapi/model/tnap_id.c index 0a7a759215..f43b156d06 100644 --- a/lib/sbi/openapi/model/tnap_id.c +++ b/lib/sbi/openapi/model/tnap_id.c @@ -98,8 +98,8 @@ OpenAPI_tnap_id_t *OpenAPI_tnap_id_parseFromJSON(cJSON *tnap_idJSON) } tnap_id_local_var = OpenAPI_tnap_id_create ( - ss_id ? ogs_strdup(ss_id->valuestring) : NULL, - bss_id ? ogs_strdup(bss_id->valuestring) : NULL, + ss_id ? ogs_strdup_or_assert(ss_id->valuestring) : NULL, + bss_id ? ogs_strdup_or_assert(bss_id->valuestring) : NULL, civic_address ? civic_address->valueint : 0 ); diff --git a/lib/sbi/openapi/model/tngf_info.c b/lib/sbi/openapi/model/tngf_info.c index beedd18c3e..51e7b9f101 100644 --- a/lib/sbi/openapi/model/tngf_info.c +++ b/lib/sbi/openapi/model/tngf_info.c @@ -111,7 +111,7 @@ OpenAPI_tngf_info_t *OpenAPI_tngf_info_parseFromJSON(cJSON *tngf_infoJSON) ogs_error("OpenAPI_tngf_info_parseFromJSON() failed [ipv4_endpoint_addresses]"); goto end; } - OpenAPI_list_add(ipv4_endpoint_addressesList, ogs_strdup(ipv4_endpoint_addresses_local->valuestring)); + OpenAPI_list_add(ipv4_endpoint_addressesList, ogs_strdup_or_assert(ipv4_endpoint_addresses_local->valuestring)); } } @@ -131,7 +131,7 @@ OpenAPI_tngf_info_t *OpenAPI_tngf_info_parseFromJSON(cJSON *tngf_infoJSON) ogs_error("OpenAPI_tngf_info_parseFromJSON() failed [ipv6_endpoint_addresses]"); goto end; } - OpenAPI_list_add(ipv6_endpoint_addressesList, ogs_strdup(ipv6_endpoint_addresses_local->valuestring)); + OpenAPI_list_add(ipv6_endpoint_addressesList, ogs_strdup_or_assert(ipv6_endpoint_addresses_local->valuestring)); } } @@ -147,7 +147,7 @@ OpenAPI_tngf_info_t *OpenAPI_tngf_info_parseFromJSON(cJSON *tngf_infoJSON) tngf_info_local_var = OpenAPI_tngf_info_create ( ipv4_endpoint_addresses ? ipv4_endpoint_addressesList : NULL, ipv6_endpoint_addresses ? ipv6_endpoint_addressesList : NULL, - endpoint_fqdn ? ogs_strdup(endpoint_fqdn->valuestring) : NULL + endpoint_fqdn ? ogs_strdup_or_assert(endpoint_fqdn->valuestring) : NULL ); return tngf_info_local_var; diff --git a/lib/sbi/openapi/model/trace_data.c b/lib/sbi/openapi/model/trace_data.c index 4de667c36a..c57412c323 100644 --- a/lib/sbi/openapi/model/trace_data.c +++ b/lib/sbi/openapi/model/trace_data.c @@ -180,13 +180,13 @@ OpenAPI_trace_data_t *OpenAPI_trace_data_parseFromJSON(cJSON *trace_dataJSON) } trace_data_local_var = OpenAPI_trace_data_create ( - ogs_strdup(trace_ref->valuestring), + ogs_strdup_or_assert(trace_ref->valuestring), trace_depthVariable, - ogs_strdup(ne_type_list->valuestring), - ogs_strdup(event_list->valuestring), - collection_entity_ipv4_addr ? ogs_strdup(collection_entity_ipv4_addr->valuestring) : NULL, - collection_entity_ipv6_addr ? ogs_strdup(collection_entity_ipv6_addr->valuestring) : NULL, - interface_list ? ogs_strdup(interface_list->valuestring) : NULL + ogs_strdup_or_assert(ne_type_list->valuestring), + ogs_strdup_or_assert(event_list->valuestring), + collection_entity_ipv4_addr ? ogs_strdup_or_assert(collection_entity_ipv4_addr->valuestring) : NULL, + collection_entity_ipv6_addr ? ogs_strdup_or_assert(collection_entity_ipv6_addr->valuestring) : NULL, + interface_list ? ogs_strdup_or_assert(interface_list->valuestring) : NULL ); return trace_data_local_var; diff --git a/lib/sbi/openapi/model/trace_data_response.c b/lib/sbi/openapi/model/trace_data_response.c index 02493e2510..ccb8460cd8 100644 --- a/lib/sbi/openapi/model/trace_data_response.c +++ b/lib/sbi/openapi/model/trace_data_response.c @@ -85,7 +85,7 @@ OpenAPI_trace_data_response_t *OpenAPI_trace_data_response_parseFromJSON(cJSON * trace_data_response_local_var = OpenAPI_trace_data_response_create ( trace_data ? trace_data_local_nonprim : NULL, - shared_trace_data_id ? ogs_strdup(shared_trace_data_id->valuestring) : NULL + shared_trace_data_id ? ogs_strdup_or_assert(shared_trace_data_id->valuestring) : NULL ); return trace_data_response_local_var; diff --git a/lib/sbi/openapi/model/traffic_control_data.c b/lib/sbi/openapi/model/traffic_control_data.c index 2240ef8e4b..546fa62327 100644 --- a/lib/sbi/openapi/model/traffic_control_data.c +++ b/lib/sbi/openapi/model/traffic_control_data.c @@ -389,13 +389,13 @@ OpenAPI_traffic_control_data_t *OpenAPI_traffic_control_data_parseFromJSON(cJSON } traffic_control_data_local_var = OpenAPI_traffic_control_data_create ( - ogs_strdup(tc_id->valuestring), + ogs_strdup_or_assert(tc_id->valuestring), flow_status ? flow_statusVariable : 0, redirect_info ? redirect_info_local_nonprim : NULL, add_redirect_info ? add_redirect_infoList : NULL, mute_notif ? mute_notif->valueint : 0, - traffic_steering_pol_id_dl ? ogs_strdup(traffic_steering_pol_id_dl->valuestring) : NULL, - traffic_steering_pol_id_ul ? ogs_strdup(traffic_steering_pol_id_ul->valuestring) : NULL, + traffic_steering_pol_id_dl ? ogs_strdup_or_assert(traffic_steering_pol_id_dl->valuestring) : NULL, + traffic_steering_pol_id_ul ? ogs_strdup_or_assert(traffic_steering_pol_id_ul->valuestring) : NULL, route_to_locs ? route_to_locsList : NULL, traff_corre_ind ? traff_corre_ind->valueint : 0, up_path_chg_event ? up_path_chg_event_local_nonprim : NULL, diff --git a/lib/sbi/openapi/model/traffic_descriptor.c b/lib/sbi/openapi/model/traffic_descriptor.c index df338f4489..9f6e9b419a 100644 --- a/lib/sbi/openapi/model/traffic_descriptor.c +++ b/lib/sbi/openapi/model/traffic_descriptor.c @@ -133,7 +133,7 @@ OpenAPI_traffic_descriptor_t *OpenAPI_traffic_descriptor_parseFromJSON(cJSON *tr } traffic_descriptor_local_var = OpenAPI_traffic_descriptor_create ( - dnn ? ogs_strdup(dnn->valuestring) : NULL, + dnn ? ogs_strdup_or_assert(dnn->valuestring) : NULL, s_nssai ? s_nssai_local_nonprim : NULL, ddd_traffic_descriptor_list ? ddd_traffic_descriptor_listList : NULL ); diff --git a/lib/sbi/openapi/model/traffic_influ_data.c b/lib/sbi/openapi/model/traffic_influ_data.c index 70c1b34142..f05fbc36d0 100644 --- a/lib/sbi/openapi/model/traffic_influ_data.c +++ b/lib/sbi/openapi/model/traffic_influ_data.c @@ -596,27 +596,27 @@ OpenAPI_traffic_influ_data_t *OpenAPI_traffic_influ_data_parseFromJSON(cJSON *tr } traffic_influ_data_local_var = OpenAPI_traffic_influ_data_create ( - up_path_chg_notif_corre_id ? ogs_strdup(up_path_chg_notif_corre_id->valuestring) : NULL, + up_path_chg_notif_corre_id ? ogs_strdup_or_assert(up_path_chg_notif_corre_id->valuestring) : NULL, app_relo_ind ? app_relo_ind->valueint : 0, - af_app_id ? ogs_strdup(af_app_id->valuestring) : NULL, - dnn ? ogs_strdup(dnn->valuestring) : NULL, + af_app_id ? ogs_strdup_or_assert(af_app_id->valuestring) : NULL, + dnn ? ogs_strdup_or_assert(dnn->valuestring) : NULL, eth_traffic_filters ? eth_traffic_filtersList : NULL, snssai ? snssai_local_nonprim : NULL, - inter_group_id ? ogs_strdup(inter_group_id->valuestring) : NULL, - supi ? ogs_strdup(supi->valuestring) : NULL, + inter_group_id ? ogs_strdup_or_assert(inter_group_id->valuestring) : NULL, + supi ? ogs_strdup_or_assert(supi->valuestring) : NULL, traffic_filters ? traffic_filtersList : NULL, traffic_routes ? traffic_routesList : NULL, traff_corre_ind ? traff_corre_ind->valueint : 0, - valid_start_time ? ogs_strdup(valid_start_time->valuestring) : NULL, - valid_end_time ? ogs_strdup(valid_end_time->valuestring) : NULL, + valid_start_time ? ogs_strdup_or_assert(valid_start_time->valuestring) : NULL, + valid_end_time ? ogs_strdup_or_assert(valid_end_time->valuestring) : NULL, temp_validities ? temp_validitiesList : NULL, nw_area_info ? nw_area_info_local_nonprim : NULL, - up_path_chg_notif_uri ? ogs_strdup(up_path_chg_notif_uri->valuestring) : NULL, + up_path_chg_notif_uri ? ogs_strdup_or_assert(up_path_chg_notif_uri->valuestring) : NULL, subscribed_events ? subscribed_eventsList : NULL, dnai_chg_type ? dnai_chg_typeVariable : 0, af_ack_ind ? af_ack_ind->valueint : 0, addr_preser_ind ? addr_preser_ind->valueint : 0, - supported_features ? ogs_strdup(supported_features->valuestring) : NULL + supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL ); return traffic_influ_data_local_var; diff --git a/lib/sbi/openapi/model/traffic_influ_data_notif.c b/lib/sbi/openapi/model/traffic_influ_data_notif.c index 4aedde6ce6..58632a6dee 100644 --- a/lib/sbi/openapi/model/traffic_influ_data_notif.c +++ b/lib/sbi/openapi/model/traffic_influ_data_notif.c @@ -84,7 +84,7 @@ OpenAPI_traffic_influ_data_notif_t *OpenAPI_traffic_influ_data_notif_parseFromJS } traffic_influ_data_notif_local_var = OpenAPI_traffic_influ_data_notif_create ( - res_uri ? ogs_strdup(res_uri->valuestring) : NULL, + res_uri ? ogs_strdup_or_assert(res_uri->valuestring) : NULL, traffic_influ_data ? traffic_influ_data_local_nonprim : NULL ); diff --git a/lib/sbi/openapi/model/traffic_influ_data_patch.c b/lib/sbi/openapi/model/traffic_influ_data_patch.c index 2a335b5df9..a635dc0436 100644 --- a/lib/sbi/openapi/model/traffic_influ_data_patch.c +++ b/lib/sbi/openapi/model/traffic_influ_data_patch.c @@ -489,21 +489,21 @@ OpenAPI_traffic_influ_data_patch_t *OpenAPI_traffic_influ_data_patch_parseFromJS } traffic_influ_data_patch_local_var = OpenAPI_traffic_influ_data_patch_create ( - up_path_chg_notif_corre_id ? ogs_strdup(up_path_chg_notif_corre_id->valuestring) : NULL, + up_path_chg_notif_corre_id ? ogs_strdup_or_assert(up_path_chg_notif_corre_id->valuestring) : NULL, app_relo_ind ? app_relo_ind->valueint : 0, - dnn ? ogs_strdup(dnn->valuestring) : NULL, + dnn ? ogs_strdup_or_assert(dnn->valuestring) : NULL, eth_traffic_filters ? eth_traffic_filtersList : NULL, snssai ? snssai_local_nonprim : NULL, - internal_group_id ? ogs_strdup(internal_group_id->valuestring) : NULL, - supi ? ogs_strdup(supi->valuestring) : NULL, + internal_group_id ? ogs_strdup_or_assert(internal_group_id->valuestring) : NULL, + supi ? ogs_strdup_or_assert(supi->valuestring) : NULL, traffic_filters ? traffic_filtersList : NULL, traffic_routes ? traffic_routesList : NULL, traff_corre_ind ? traff_corre_ind->valueint : 0, - valid_start_time ? ogs_strdup(valid_start_time->valuestring) : NULL, - valid_end_time ? ogs_strdup(valid_end_time->valuestring) : NULL, + valid_start_time ? ogs_strdup_or_assert(valid_start_time->valuestring) : NULL, + valid_end_time ? ogs_strdup_or_assert(valid_end_time->valuestring) : NULL, temp_validities ? temp_validitiesList : NULL, nw_area_info ? nw_area_info_local_nonprim : NULL, - up_path_chg_notif_uri ? ogs_strdup(up_path_chg_notif_uri->valuestring) : NULL, + up_path_chg_notif_uri ? ogs_strdup_or_assert(up_path_chg_notif_uri->valuestring) : NULL, af_ack_ind ? af_ack_ind->valueint : 0, addr_preser_ind ? addr_preser_ind->valueint : 0 ); diff --git a/lib/sbi/openapi/model/traffic_influ_sub.c b/lib/sbi/openapi/model/traffic_influ_sub.c index 398cd12c91..4cd7edd8a4 100644 --- a/lib/sbi/openapi/model/traffic_influ_sub.c +++ b/lib/sbi/openapi/model/traffic_influ_sub.c @@ -177,7 +177,7 @@ OpenAPI_traffic_influ_sub_t *OpenAPI_traffic_influ_sub_parseFromJSON(cJSON *traf ogs_error("OpenAPI_traffic_influ_sub_parseFromJSON() failed [dnns]"); goto end; } - OpenAPI_list_add(dnnsList, ogs_strdup(dnns_local->valuestring)); + OpenAPI_list_add(dnnsList, ogs_strdup_or_assert(dnns_local->valuestring)); } } @@ -220,7 +220,7 @@ OpenAPI_traffic_influ_sub_t *OpenAPI_traffic_influ_sub_parseFromJSON(cJSON *traf ogs_error("OpenAPI_traffic_influ_sub_parseFromJSON() failed [internal_group_ids]"); goto end; } - OpenAPI_list_add(internal_group_idsList, ogs_strdup(internal_group_ids_local->valuestring)); + OpenAPI_list_add(internal_group_idsList, ogs_strdup_or_assert(internal_group_ids_local->valuestring)); } } @@ -240,7 +240,7 @@ OpenAPI_traffic_influ_sub_t *OpenAPI_traffic_influ_sub_parseFromJSON(cJSON *traf ogs_error("OpenAPI_traffic_influ_sub_parseFromJSON() failed [supis]"); goto end; } - OpenAPI_list_add(supisList, ogs_strdup(supis_local->valuestring)); + OpenAPI_list_add(supisList, ogs_strdup_or_assert(supis_local->valuestring)); } } @@ -279,9 +279,9 @@ OpenAPI_traffic_influ_sub_t *OpenAPI_traffic_influ_sub_parseFromJSON(cJSON *traf snssais ? snssaisList : NULL, internal_group_ids ? internal_group_idsList : NULL, supis ? supisList : NULL, - ogs_strdup(notification_uri->valuestring), - expiry ? ogs_strdup(expiry->valuestring) : NULL, - supported_features ? ogs_strdup(supported_features->valuestring) : NULL + ogs_strdup_or_assert(notification_uri->valuestring), + expiry ? ogs_strdup_or_assert(expiry->valuestring) : NULL, + supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL ); return traffic_influ_sub_local_var; diff --git a/lib/sbi/openapi/model/transfer_mt_data_error.c b/lib/sbi/openapi/model/transfer_mt_data_error.c index 05f9c3606e..74c7ebec99 100644 --- a/lib/sbi/openapi/model/transfer_mt_data_error.c +++ b/lib/sbi/openapi/model/transfer_mt_data_error.c @@ -260,15 +260,15 @@ OpenAPI_transfer_mt_data_error_t *OpenAPI_transfer_mt_data_error_parseFromJSON(c } transfer_mt_data_error_local_var = OpenAPI_transfer_mt_data_error_create ( - type ? ogs_strdup(type->valuestring) : NULL, - title ? ogs_strdup(title->valuestring) : NULL, + type ? ogs_strdup_or_assert(type->valuestring) : NULL, + title ? ogs_strdup_or_assert(title->valuestring) : NULL, status ? status->valuedouble : 0, - detail ? ogs_strdup(detail->valuestring) : NULL, - instance ? ogs_strdup(instance->valuestring) : NULL, - cause ? ogs_strdup(cause->valuestring) : NULL, + detail ? ogs_strdup_or_assert(detail->valuestring) : NULL, + instance ? ogs_strdup_or_assert(instance->valuestring) : NULL, + cause ? ogs_strdup_or_assert(cause->valuestring) : NULL, invalid_params ? invalid_paramsList : NULL, - supported_features ? ogs_strdup(supported_features->valuestring) : NULL, - target_scp ? ogs_strdup(target_scp->valuestring) : NULL, + supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL, + target_scp ? ogs_strdup_or_assert(target_scp->valuestring) : NULL, max_waiting_time ? max_waiting_time->valuedouble : 0 ); diff --git a/lib/sbi/openapi/model/transfer_policy.c b/lib/sbi/openapi/model/transfer_policy.c index 4eadc3da8f..29d18211fb 100644 --- a/lib/sbi/openapi/model/transfer_policy.c +++ b/lib/sbi/openapi/model/transfer_policy.c @@ -142,8 +142,8 @@ OpenAPI_transfer_policy_t *OpenAPI_transfer_policy_parseFromJSON(cJSON *transfer } transfer_policy_local_var = OpenAPI_transfer_policy_create ( - max_bit_rate_dl ? ogs_strdup(max_bit_rate_dl->valuestring) : NULL, - max_bit_rate_ul ? ogs_strdup(max_bit_rate_ul->valuestring) : NULL, + max_bit_rate_dl ? ogs_strdup_or_assert(max_bit_rate_dl->valuestring) : NULL, + max_bit_rate_ul ? ogs_strdup_or_assert(max_bit_rate_ul->valuestring) : NULL, rating_group->valuedouble, rec_time_int_local_nonprim, trans_policy_id->valuedouble diff --git a/lib/sbi/openapi/model/trigger_request.c b/lib/sbi/openapi/model/trigger_request.c index fc14fbda4e..029a9b8b54 100644 --- a/lib/sbi/openapi/model/trigger_request.c +++ b/lib/sbi/openapi/model/trigger_request.c @@ -62,7 +62,7 @@ OpenAPI_trigger_request_t *OpenAPI_trigger_request_parseFromJSON(cJSON *trigger_ } trigger_request_local_var = OpenAPI_trigger_request_create ( - ogs_strdup(supi->valuestring) + ogs_strdup_or_assert(supi->valuestring) ); return trigger_request_local_var; diff --git a/lib/sbi/openapi/model/tscai_input_container.c b/lib/sbi/openapi/model/tscai_input_container.c index 4b40a6c085..473e056845 100644 --- a/lib/sbi/openapi/model/tscai_input_container.c +++ b/lib/sbi/openapi/model/tscai_input_container.c @@ -80,7 +80,7 @@ OpenAPI_tscai_input_container_t *OpenAPI_tscai_input_container_parseFromJSON(cJS tscai_input_container_local_var = OpenAPI_tscai_input_container_create ( periodicity ? periodicity->valuedouble : 0, - burst_arrival_time ? ogs_strdup(burst_arrival_time->valuestring) : NULL + burst_arrival_time ? ogs_strdup_or_assert(burst_arrival_time->valuestring) : NULL ); return tscai_input_container_local_var; diff --git a/lib/sbi/openapi/model/tsn_bridge_info.c b/lib/sbi/openapi/model/tsn_bridge_info.c index 0c127d9513..d00dbee1eb 100644 --- a/lib/sbi/openapi/model/tsn_bridge_info.c +++ b/lib/sbi/openapi/model/tsn_bridge_info.c @@ -170,8 +170,8 @@ OpenAPI_tsn_bridge_info_t *OpenAPI_tsn_bridge_info_parseFromJSON(cJSON *tsn_brid } tsn_bridge_info_local_var = OpenAPI_tsn_bridge_info_create ( - bridge_name ? ogs_strdup(bridge_name->valuestring) : NULL, - bridge_mac ? ogs_strdup(bridge_mac->valuestring) : NULL, + bridge_name ? ogs_strdup_or_assert(bridge_name->valuestring) : NULL, + bridge_mac ? ogs_strdup_or_assert(bridge_mac->valuestring) : NULL, nwtt_ports ? nwtt_portsList : NULL, dstt_port ? dstt_port_local_nonprim : NULL, dstt_resid_time ? dstt_resid_time->valuedouble : 0 diff --git a/lib/sbi/openapi/model/tsn_port_identifier.c b/lib/sbi/openapi/model/tsn_port_identifier.c index ef1863b7fc..a13870d05f 100644 --- a/lib/sbi/openapi/model/tsn_port_identifier.c +++ b/lib/sbi/openapi/model/tsn_port_identifier.c @@ -80,7 +80,7 @@ OpenAPI_tsn_port_identifier_t *OpenAPI_tsn_port_identifier_parseFromJSON(cJSON * } tsn_port_identifier_local_var = OpenAPI_tsn_port_identifier_create ( - ogs_strdup(port_mac->valuestring), + ogs_strdup_or_assert(port_mac->valuestring), port_number ? port_number->valuedouble : 0 ); diff --git a/lib/sbi/openapi/model/tunnel_info.c b/lib/sbi/openapi/model/tunnel_info.c index 34461f9ed9..eabed7179c 100644 --- a/lib/sbi/openapi/model/tunnel_info.c +++ b/lib/sbi/openapi/model/tunnel_info.c @@ -120,9 +120,9 @@ OpenAPI_tunnel_info_t *OpenAPI_tunnel_info_parseFromJSON(cJSON *tunnel_infoJSON) } tunnel_info_local_var = OpenAPI_tunnel_info_create ( - ipv4_addr ? ogs_strdup(ipv4_addr->valuestring) : NULL, - ipv6_addr ? ogs_strdup(ipv6_addr->valuestring) : NULL, - ogs_strdup(gtp_teid->valuestring), + ipv4_addr ? ogs_strdup_or_assert(ipv4_addr->valuestring) : NULL, + ipv6_addr ? ogs_strdup_or_assert(ipv6_addr->valuestring) : NULL, + ogs_strdup_or_assert(gtp_teid->valuestring), an_type ? an_typeVariable : 0 ); diff --git a/lib/sbi/openapi/model/twap_id.c b/lib/sbi/openapi/model/twap_id.c index ec8ecf0ea5..6ca3798368 100644 --- a/lib/sbi/openapi/model/twap_id.c +++ b/lib/sbi/openapi/model/twap_id.c @@ -99,8 +99,8 @@ OpenAPI_twap_id_t *OpenAPI_twap_id_parseFromJSON(cJSON *twap_idJSON) } twap_id_local_var = OpenAPI_twap_id_create ( - ogs_strdup(ss_id->valuestring), - bss_id ? ogs_strdup(bss_id->valuestring) : NULL, + ogs_strdup_or_assert(ss_id->valuestring), + bss_id ? ogs_strdup_or_assert(bss_id->valuestring) : NULL, civic_address ? civic_address->valueint : 0 ); diff --git a/lib/sbi/openapi/model/twif_info.c b/lib/sbi/openapi/model/twif_info.c index ade2896315..af0cc322cc 100644 --- a/lib/sbi/openapi/model/twif_info.c +++ b/lib/sbi/openapi/model/twif_info.c @@ -111,7 +111,7 @@ OpenAPI_twif_info_t *OpenAPI_twif_info_parseFromJSON(cJSON *twif_infoJSON) ogs_error("OpenAPI_twif_info_parseFromJSON() failed [ipv4_endpoint_addresses]"); goto end; } - OpenAPI_list_add(ipv4_endpoint_addressesList, ogs_strdup(ipv4_endpoint_addresses_local->valuestring)); + OpenAPI_list_add(ipv4_endpoint_addressesList, ogs_strdup_or_assert(ipv4_endpoint_addresses_local->valuestring)); } } @@ -131,7 +131,7 @@ OpenAPI_twif_info_t *OpenAPI_twif_info_parseFromJSON(cJSON *twif_infoJSON) ogs_error("OpenAPI_twif_info_parseFromJSON() failed [ipv6_endpoint_addresses]"); goto end; } - OpenAPI_list_add(ipv6_endpoint_addressesList, ogs_strdup(ipv6_endpoint_addresses_local->valuestring)); + OpenAPI_list_add(ipv6_endpoint_addressesList, ogs_strdup_or_assert(ipv6_endpoint_addresses_local->valuestring)); } } @@ -147,7 +147,7 @@ OpenAPI_twif_info_t *OpenAPI_twif_info_parseFromJSON(cJSON *twif_infoJSON) twif_info_local_var = OpenAPI_twif_info_create ( ipv4_endpoint_addresses ? ipv4_endpoint_addressesList : NULL, ipv6_endpoint_addresses ? ipv6_endpoint_addressesList : NULL, - endpoint_fqdn ? ogs_strdup(endpoint_fqdn->valuestring) : NULL + endpoint_fqdn ? ogs_strdup_or_assert(endpoint_fqdn->valuestring) : NULL ); return twif_info_local_var; diff --git a/lib/sbi/openapi/model/udm_info.c b/lib/sbi/openapi/model/udm_info.c index fb248f3dd3..45fbf04bba 100644 --- a/lib/sbi/openapi/model/udm_info.c +++ b/lib/sbi/openapi/model/udm_info.c @@ -271,7 +271,7 @@ OpenAPI_udm_info_t *OpenAPI_udm_info_parseFromJSON(cJSON *udm_infoJSON) ogs_error("OpenAPI_udm_info_parseFromJSON() failed [routing_indicators]"); goto end; } - OpenAPI_list_add(routing_indicatorsList, ogs_strdup(routing_indicators_local->valuestring)); + OpenAPI_list_add(routing_indicatorsList, ogs_strdup_or_assert(routing_indicators_local->valuestring)); } } @@ -299,7 +299,7 @@ OpenAPI_udm_info_t *OpenAPI_udm_info_parseFromJSON(cJSON *udm_infoJSON) } udm_info_local_var = OpenAPI_udm_info_create ( - group_id ? ogs_strdup(group_id->valuestring) : NULL, + group_id ? ogs_strdup_or_assert(group_id->valuestring) : NULL, supi_ranges ? supi_rangesList : NULL, gpsi_ranges ? gpsi_rangesList : NULL, external_group_identifiers_ranges ? external_group_identifiers_rangesList : NULL, diff --git a/lib/sbi/openapi/model/udr_info.c b/lib/sbi/openapi/model/udr_info.c index 8c59992636..95f38a6e6c 100644 --- a/lib/sbi/openapi/model/udr_info.c +++ b/lib/sbi/openapi/model/udr_info.c @@ -257,7 +257,7 @@ OpenAPI_udr_info_t *OpenAPI_udr_info_parseFromJSON(cJSON *udr_infoJSON) } udr_info_local_var = OpenAPI_udr_info_create ( - group_id ? ogs_strdup(group_id->valuestring) : NULL, + group_id ? ogs_strdup_or_assert(group_id->valuestring) : NULL, supi_ranges ? supi_rangesList : NULL, gpsi_ranges ? gpsi_rangesList : NULL, external_group_identifiers_ranges ? external_group_identifiers_rangesList : NULL, diff --git a/lib/sbi/openapi/model/udsf_info.c b/lib/sbi/openapi/model/udsf_info.c index 8b56a8f567..24c7c7e5db 100644 --- a/lib/sbi/openapi/model/udsf_info.c +++ b/lib/sbi/openapi/model/udsf_info.c @@ -150,7 +150,7 @@ OpenAPI_udsf_info_t *OpenAPI_udsf_info_parseFromJSON(cJSON *udsf_infoJSON) } udsf_info_local_var = OpenAPI_udsf_info_create ( - group_id ? ogs_strdup(group_id->valuestring) : NULL, + group_id ? ogs_strdup_or_assert(group_id->valuestring) : NULL, supi_ranges ? supi_rangesList : NULL, storage_id_ranges ? storage_id_rangesList : NULL ); diff --git a/lib/sbi/openapi/model/ue_authentication_ctx.c b/lib/sbi/openapi/model/ue_authentication_ctx.c index 1ae58a4d10..4308943809 100644 --- a/lib/sbi/openapi/model/ue_authentication_ctx.c +++ b/lib/sbi/openapi/model/ue_authentication_ctx.c @@ -162,7 +162,7 @@ OpenAPI_ue_authentication_ctx_t *OpenAPI_ue_authentication_ctx_parseFromJSON(cJS auth_typeVariable, _5g_auth_data_local_nonprim, _linksList, - serving_network_name ? ogs_strdup(serving_network_name->valuestring) : NULL + serving_network_name ? ogs_strdup_or_assert(serving_network_name->valuestring) : NULL ); return ue_authentication_ctx_local_var; diff --git a/lib/sbi/openapi/model/ue_camping_rep.c b/lib/sbi/openapi/model/ue_camping_rep.c index dcdb8eae4e..2c186aa5e4 100644 --- a/lib/sbi/openapi/model/ue_camping_rep.c +++ b/lib/sbi/openapi/model/ue_camping_rep.c @@ -175,7 +175,7 @@ OpenAPI_ue_camping_rep_t *OpenAPI_ue_camping_rep_parseFromJSON(cJSON *ue_camping serv_nf_id ? serv_nf_id_local_nonprim : NULL, serving_network ? serving_network_local_nonprim : NULL, user_location_info ? user_location_info_local_nonprim : NULL, - ue_time_zone ? ogs_strdup(ue_time_zone->valuestring) : NULL + ue_time_zone ? ogs_strdup_or_assert(ue_time_zone->valuestring) : NULL ); return ue_camping_rep_local_var; diff --git a/lib/sbi/openapi/model/ue_context.c b/lib/sbi/openapi/model/ue_context.c index 49e5a3e8bc..ec1c92149a 100644 --- a/lib/sbi/openapi/model/ue_context.c +++ b/lib/sbi/openapi/model/ue_context.c @@ -713,7 +713,7 @@ OpenAPI_ue_context_t *OpenAPI_ue_context_parseFromJSON(cJSON *ue_contextJSON) ogs_error("OpenAPI_ue_context_parseFromJSON() failed [gpsi_list]"); goto end; } - OpenAPI_list_add(gpsi_listList, ogs_strdup(gpsi_list_local->valuestring)); + OpenAPI_list_add(gpsi_listList, ogs_strdup_or_assert(gpsi_list_local->valuestring)); } } @@ -769,7 +769,7 @@ OpenAPI_ue_context_t *OpenAPI_ue_context_parseFromJSON(cJSON *ue_contextJSON) ogs_error("OpenAPI_ue_context_parseFromJSON() failed [group_list]"); goto end; } - OpenAPI_list_add(group_listList, ogs_strdup(group_list_local->valuestring)); + OpenAPI_list_add(group_listList, ogs_strdup_or_assert(group_list_local->valuestring)); } } @@ -1258,31 +1258,31 @@ OpenAPI_ue_context_t *OpenAPI_ue_context_parseFromJSON(cJSON *ue_contextJSON) } ue_context_local_var = OpenAPI_ue_context_create ( - supi ? ogs_strdup(supi->valuestring) : NULL, + supi ? ogs_strdup_or_assert(supi->valuestring) : NULL, supi_unauth_ind ? supi_unauth_ind->valueint : 0, gpsi_list ? gpsi_listList : NULL, - pei ? ogs_strdup(pei->valuestring) : NULL, - udm_group_id ? ogs_strdup(udm_group_id->valuestring) : NULL, - ausf_group_id ? ogs_strdup(ausf_group_id->valuestring) : NULL, - routing_indicator ? ogs_strdup(routing_indicator->valuestring) : NULL, + pei ? ogs_strdup_or_assert(pei->valuestring) : NULL, + udm_group_id ? ogs_strdup_or_assert(udm_group_id->valuestring) : NULL, + ausf_group_id ? ogs_strdup_or_assert(ausf_group_id->valuestring) : NULL, + routing_indicator ? ogs_strdup_or_assert(routing_indicator->valuestring) : NULL, group_list ? group_listList : NULL, drx_parameter ? drx_parameter->valueint : 0, sub_rfsp ? sub_rfsp->valuedouble : 0, used_rfsp ? used_rfsp->valuedouble : 0, sub_ue_ambr ? sub_ue_ambr_local_nonprim : NULL, - smsf_id ? ogs_strdup(smsf_id->valuestring) : NULL, + smsf_id ? ogs_strdup_or_assert(smsf_id->valuestring) : NULL, seaf_data ? seaf_data_local_nonprim : NULL, _5g_mm_capability ? _5g_mm_capability->valueint : 0, - pcf_id ? ogs_strdup(pcf_id->valuestring) : NULL, - pcf_set_id ? ogs_strdup(pcf_set_id->valuestring) : NULL, - pcf_amp_service_set_id ? ogs_strdup(pcf_amp_service_set_id->valuestring) : NULL, - pcf_uep_service_set_id ? ogs_strdup(pcf_uep_service_set_id->valuestring) : NULL, + pcf_id ? ogs_strdup_or_assert(pcf_id->valuestring) : NULL, + pcf_set_id ? ogs_strdup_or_assert(pcf_set_id->valuestring) : NULL, + pcf_amp_service_set_id ? ogs_strdup_or_assert(pcf_amp_service_set_id->valuestring) : NULL, + pcf_uep_service_set_id ? ogs_strdup_or_assert(pcf_uep_service_set_id->valuestring) : NULL, pcf_binding ? pcf_bindingVariable : 0, - pcf_am_policy_uri ? ogs_strdup(pcf_am_policy_uri->valuestring) : NULL, + pcf_am_policy_uri ? ogs_strdup_or_assert(pcf_am_policy_uri->valuestring) : NULL, am_policy_req_trigger_list ? am_policy_req_trigger_listList : NULL, - pcf_ue_policy_uri ? ogs_strdup(pcf_ue_policy_uri->valuestring) : NULL, + pcf_ue_policy_uri ? ogs_strdup_or_assert(pcf_ue_policy_uri->valuestring) : NULL, ue_policy_req_trigger_list ? ue_policy_req_trigger_listList : NULL, - hpcf_id ? ogs_strdup(hpcf_id->valuestring) : NULL, + hpcf_id ? ogs_strdup_or_assert(hpcf_id->valuestring) : NULL, restricted_rat_list ? restricted_rat_listList : NULL, forbidden_area_list ? forbidden_area_listList : NULL, service_area_restriction ? service_area_restriction_local_nonprim : NULL, @@ -1291,9 +1291,9 @@ OpenAPI_ue_context_t *OpenAPI_ue_context_parseFromJSON(cJSON *ue_contextJSON) mm_context_list ? mm_context_listList : NULL, session_context_list ? session_context_listList : NULL, trace_data ? trace_data_local_nonprim : NULL, - service_gap_expiry_time ? ogs_strdup(service_gap_expiry_time->valuestring) : NULL, - stn_sr ? ogs_strdup(stn_sr->valuestring) : NULL, - c_msisdn ? ogs_strdup(c_msisdn->valuestring) : NULL, + service_gap_expiry_time ? ogs_strdup_or_assert(service_gap_expiry_time->valuestring) : NULL, + stn_sr ? ogs_strdup_or_assert(stn_sr->valuestring) : NULL, + c_msisdn ? ogs_strdup_or_assert(c_msisdn->valuestring) : NULL, ms_classmark2 ? ms_classmark2->valueint : 0, supported_codec_list ? supported_codec_listList : NULL, small_data_rate_status_infos ? small_data_rate_status_infosList : NULL, diff --git a/lib/sbi/openapi/model/ue_context_create_data.c b/lib/sbi/openapi/model/ue_context_create_data.c index bb7d6f5af7..61a96b7bb5 100644 --- a/lib/sbi/openapi/model/ue_context_create_data.c +++ b/lib/sbi/openapi/model/ue_context_create_data.c @@ -271,10 +271,10 @@ OpenAPI_ue_context_create_data_t *OpenAPI_ue_context_create_data_parseFromJSON(c source_to_target_data_local_nonprim, pdu_session_listList, mme_control_fteid ? mme_control_fteid->valueint : 0, - n2_notify_uri ? ogs_strdup(n2_notify_uri->valuestring) : NULL, + n2_notify_uri ? ogs_strdup_or_assert(n2_notify_uri->valuestring) : NULL, ue_radio_capability ? ue_radio_capability_local_nonprim : NULL, ngap_cause ? ngap_cause_local_nonprim : NULL, - supported_features ? ogs_strdup(supported_features->valuestring) : NULL + supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL ); return ue_context_create_data_local_var; diff --git a/lib/sbi/openapi/model/ue_context_created_data.c b/lib/sbi/openapi/model/ue_context_created_data.c index 904f5de33c..7954b8f226 100644 --- a/lib/sbi/openapi/model/ue_context_created_data.c +++ b/lib/sbi/openapi/model/ue_context_created_data.c @@ -230,7 +230,7 @@ OpenAPI_ue_context_created_data_t *OpenAPI_ue_context_created_data_parseFromJSON target_to_source_data_local_nonprim, pdu_session_listList, failed_session_list ? failed_session_listList : NULL, - supported_features ? ogs_strdup(supported_features->valuestring) : NULL, + supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL, pcf_reselected_ind ? pcf_reselected_ind->valueint : 0 ); diff --git a/lib/sbi/openapi/model/ue_context_release.c b/lib/sbi/openapi/model/ue_context_release.c index ed2e43173a..9ad983378d 100644 --- a/lib/sbi/openapi/model/ue_context_release.c +++ b/lib/sbi/openapi/model/ue_context_release.c @@ -103,7 +103,7 @@ OpenAPI_ue_context_release_t *OpenAPI_ue_context_release_parseFromJSON(cJSON *ue ngap_cause_local_nonprim = OpenAPI_ng_ap_cause_parseFromJSON(ngap_cause); ue_context_release_local_var = OpenAPI_ue_context_release_create ( - supi ? ogs_strdup(supi->valuestring) : NULL, + supi ? ogs_strdup_or_assert(supi->valuestring) : NULL, unauthenticated_supi ? unauthenticated_supi->valueint : 0, ngap_cause_local_nonprim ); diff --git a/lib/sbi/openapi/model/ue_context_transfer_req_data.c b/lib/sbi/openapi/model/ue_context_transfer_req_data.c index 1bb4936d0a..5bad192320 100644 --- a/lib/sbi/openapi/model/ue_context_transfer_req_data.c +++ b/lib/sbi/openapi/model/ue_context_transfer_req_data.c @@ -153,7 +153,7 @@ OpenAPI_ue_context_transfer_req_data_t *OpenAPI_ue_context_transfer_req_data_par access_typeVariable, plmn_id ? plmn_id_local_nonprim : NULL, reg_request ? reg_request_local_nonprim : NULL, - supported_features ? ogs_strdup(supported_features->valuestring) : NULL + supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL ); return ue_context_transfer_req_data_local_var; diff --git a/lib/sbi/openapi/model/ue_context_transfer_rsp_data.c b/lib/sbi/openapi/model/ue_context_transfer_rsp_data.c index 3071b293f9..322bdd34f6 100644 --- a/lib/sbi/openapi/model/ue_context_transfer_rsp_data.c +++ b/lib/sbi/openapi/model/ue_context_transfer_rsp_data.c @@ -134,7 +134,7 @@ OpenAPI_ue_context_transfer_rsp_data_t *OpenAPI_ue_context_transfer_rsp_data_par ue_context_local_nonprim, ue_radio_capability ? ue_radio_capability_local_nonprim : NULL, ue_nbiot_radio_capability ? ue_nbiot_radio_capability_local_nonprim : NULL, - supported_features ? ogs_strdup(supported_features->valuestring) : NULL + supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL ); return ue_context_transfer_rsp_data_local_var; diff --git a/lib/sbi/openapi/model/ue_id.c b/lib/sbi/openapi/model/ue_id.c index d0401d630d..1ae5c4aacf 100644 --- a/lib/sbi/openapi/model/ue_id.c +++ b/lib/sbi/openapi/model/ue_id.c @@ -99,12 +99,12 @@ OpenAPI_ue_id_t *OpenAPI_ue_id_parseFromJSON(cJSON *ue_idJSON) ogs_error("OpenAPI_ue_id_parseFromJSON() failed [gpsi_list]"); goto end; } - OpenAPI_list_add(gpsi_listList, ogs_strdup(gpsi_list_local->valuestring)); + OpenAPI_list_add(gpsi_listList, ogs_strdup_or_assert(gpsi_list_local->valuestring)); } } ue_id_local_var = OpenAPI_ue_id_create ( - ogs_strdup(supi->valuestring), + ogs_strdup_or_assert(supi->valuestring), gpsi_list ? gpsi_listList : NULL ); diff --git a/lib/sbi/openapi/model/ue_identity_info.c b/lib/sbi/openapi/model/ue_identity_info.c index 6b1ff05518..6faab13e3f 100644 --- a/lib/sbi/openapi/model/ue_identity_info.c +++ b/lib/sbi/openapi/model/ue_identity_info.c @@ -99,9 +99,9 @@ OpenAPI_ue_identity_info_t *OpenAPI_ue_identity_info_parseFromJSON(cJSON *ue_ide } ue_identity_info_local_var = OpenAPI_ue_identity_info_create ( - gpsi ? ogs_strdup(gpsi->valuestring) : NULL, - pei ? ogs_strdup(pei->valuestring) : NULL, - supi ? ogs_strdup(supi->valuestring) : NULL + gpsi ? ogs_strdup_or_assert(gpsi->valuestring) : NULL, + pei ? ogs_strdup_or_assert(pei->valuestring) : NULL, + supi ? ogs_strdup_or_assert(supi->valuestring) : NULL ); return ue_identity_info_local_var; diff --git a/lib/sbi/openapi/model/ue_initiated_resource_request.c b/lib/sbi/openapi/model/ue_initiated_resource_request.c index d65deb08f0..57fe8beefe 100644 --- a/lib/sbi/openapi/model/ue_initiated_resource_request.c +++ b/lib/sbi/openapi/model/ue_initiated_resource_request.c @@ -173,7 +173,7 @@ OpenAPI_ue_initiated_resource_request_t *OpenAPI_ue_initiated_resource_request_p } ue_initiated_resource_request_local_var = OpenAPI_ue_initiated_resource_request_create ( - pcc_rule_id ? ogs_strdup(pcc_rule_id->valuestring) : NULL, + pcc_rule_id ? ogs_strdup_or_assert(pcc_rule_id->valuestring) : NULL, rule_opVariable, precedence ? precedence->valuedouble : 0, pack_filt_infoList, diff --git a/lib/sbi/openapi/model/ue_n1_n2_info_subscription_create_data.c b/lib/sbi/openapi/model/ue_n1_n2_info_subscription_create_data.c index 6c9d472276..7ac418613f 100644 --- a/lib/sbi/openapi/model/ue_n1_n2_info_subscription_create_data.c +++ b/lib/sbi/openapi/model/ue_n1_n2_info_subscription_create_data.c @@ -182,11 +182,11 @@ OpenAPI_ue_n1_n2_info_subscription_create_data_t *OpenAPI_ue_n1_n2_info_subscrip ue_n1_n2_info_subscription_create_data_local_var = OpenAPI_ue_n1_n2_info_subscription_create_data_create ( n2_information_class ? n2_information_classVariable : 0, - n2_notify_callback_uri ? ogs_strdup(n2_notify_callback_uri->valuestring) : NULL, + n2_notify_callback_uri ? ogs_strdup_or_assert(n2_notify_callback_uri->valuestring) : NULL, n1_message_class ? n1_message_classVariable : 0, - n1_notify_callback_uri ? ogs_strdup(n1_notify_callback_uri->valuestring) : NULL, - nf_id ? ogs_strdup(nf_id->valuestring) : NULL, - supported_features ? ogs_strdup(supported_features->valuestring) : NULL, + n1_notify_callback_uri ? ogs_strdup_or_assert(n1_notify_callback_uri->valuestring) : NULL, + nf_id ? ogs_strdup_or_assert(nf_id->valuestring) : NULL, + supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL, old_guami ? old_guami_local_nonprim : NULL ); diff --git a/lib/sbi/openapi/model/ue_n1_n2_info_subscription_created_data.c b/lib/sbi/openapi/model/ue_n1_n2_info_subscription_created_data.c index 43e1e76013..c57e4f1e21 100644 --- a/lib/sbi/openapi/model/ue_n1_n2_info_subscription_created_data.c +++ b/lib/sbi/openapi/model/ue_n1_n2_info_subscription_created_data.c @@ -81,8 +81,8 @@ OpenAPI_ue_n1_n2_info_subscription_created_data_t *OpenAPI_ue_n1_n2_info_subscri } ue_n1_n2_info_subscription_created_data_local_var = OpenAPI_ue_n1_n2_info_subscription_created_data_create ( - ogs_strdup(n1n2_notify_subscription_id->valuestring), - supported_features ? ogs_strdup(supported_features->valuestring) : NULL + ogs_strdup_or_assert(n1n2_notify_subscription_id->valuestring), + supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL ); return ue_n1_n2_info_subscription_created_data_local_var; diff --git a/lib/sbi/openapi/model/ue_policy_section.c b/lib/sbi/openapi/model/ue_policy_section.c index a768c6c02a..3dfb35956d 100644 --- a/lib/sbi/openapi/model/ue_policy_section.c +++ b/lib/sbi/openapi/model/ue_policy_section.c @@ -82,7 +82,7 @@ OpenAPI_ue_policy_section_t *OpenAPI_ue_policy_section_parseFromJSON(cJSON *ue_p ue_policy_section_local_var = OpenAPI_ue_policy_section_create ( ue_policy_section_info->valueint, - ogs_strdup(upsi->valuestring) + ogs_strdup_or_assert(upsi->valuestring) ); return ue_policy_section_local_var; diff --git a/lib/sbi/openapi/model/ue_policy_set.c b/lib/sbi/openapi/model/ue_policy_set.c index 9fec231402..9ea0d85500 100644 --- a/lib/sbi/openapi/model/ue_policy_set.c +++ b/lib/sbi/openapi/model/ue_policy_set.c @@ -252,7 +252,7 @@ OpenAPI_ue_policy_set_t *OpenAPI_ue_policy_set_parseFromJSON(cJSON *ue_policy_se ogs_error("OpenAPI_ue_policy_set_parseFromJSON() failed [subsc_cats]"); goto end; } - OpenAPI_list_add(subsc_catsList, ogs_strdup(subsc_cats_local->valuestring)); + OpenAPI_list_add(subsc_catsList, ogs_strdup_or_assert(subsc_cats_local->valuestring)); } } @@ -295,7 +295,7 @@ OpenAPI_ue_policy_set_t *OpenAPI_ue_policy_set_parseFromJSON(cJSON *ue_policy_se ogs_error("OpenAPI_ue_policy_set_parseFromJSON() failed [upsis]"); goto end; } - OpenAPI_list_add(upsisList, ogs_strdup(upsis_local->valuestring)); + OpenAPI_list_add(upsisList, ogs_strdup_or_assert(upsis_local->valuestring)); } } @@ -356,7 +356,7 @@ OpenAPI_ue_policy_set_t *OpenAPI_ue_policy_set_parseFromJSON(cJSON *ue_policy_se ogs_error("OpenAPI_ue_policy_set_parseFromJSON() failed [os_ids]"); goto end; } - OpenAPI_list_add(os_idsList, ogs_strdup(os_ids_local->valuestring)); + OpenAPI_list_add(os_idsList, ogs_strdup_or_assert(os_ids_local->valuestring)); } } @@ -367,7 +367,7 @@ OpenAPI_ue_policy_set_t *OpenAPI_ue_policy_set_parseFromJSON(cJSON *ue_policy_se upsis ? upsisList : NULL, allowed_route_sel_descs ? allowed_route_sel_descsList : NULL, andsp_ind ? andsp_ind->valueint : 0, - pei ? ogs_strdup(pei->valuestring) : NULL, + pei ? ogs_strdup_or_assert(pei->valuestring) : NULL, os_ids ? os_idsList : NULL ); diff --git a/lib/sbi/openapi/model/ue_policy_set_patch.c b/lib/sbi/openapi/model/ue_policy_set_patch.c index 0e7dbe81fc..5c2de8a735 100644 --- a/lib/sbi/openapi/model/ue_policy_set_patch.c +++ b/lib/sbi/openapi/model/ue_policy_set_patch.c @@ -172,7 +172,7 @@ OpenAPI_ue_policy_set_patch_t *OpenAPI_ue_policy_set_patch_parseFromJSON(cJSON * ogs_error("OpenAPI_ue_policy_set_patch_parseFromJSON() failed [upsis]"); goto end; } - OpenAPI_list_add(upsisList, ogs_strdup(upsis_local->valuestring)); + OpenAPI_list_add(upsisList, ogs_strdup_or_assert(upsis_local->valuestring)); } } @@ -210,7 +210,7 @@ OpenAPI_ue_policy_set_patch_t *OpenAPI_ue_policy_set_patch_parseFromJSON(cJSON * ogs_error("OpenAPI_ue_policy_set_patch_parseFromJSON() failed [os_ids]"); goto end; } - OpenAPI_list_add(os_idsList, ogs_strdup(os_ids_local->valuestring)); + OpenAPI_list_add(os_idsList, ogs_strdup_or_assert(os_ids_local->valuestring)); } } @@ -218,7 +218,7 @@ OpenAPI_ue_policy_set_patch_t *OpenAPI_ue_policy_set_patch_parseFromJSON(cJSON * ue_policy_sections ? ue_policy_sectionsList : NULL, upsis ? upsisList : NULL, andsp_ind ? andsp_ind->valueint : 0, - pei ? ogs_strdup(pei->valuestring) : NULL, + pei ? ogs_strdup_or_assert(pei->valuestring) : NULL, os_ids ? os_idsList : NULL ); diff --git a/lib/sbi/openapi/model/ulcl_bp_information.c b/lib/sbi/openapi/model/ulcl_bp_information.c index 50ff70c2e0..0398ea79e7 100644 --- a/lib/sbi/openapi/model/ulcl_bp_information.c +++ b/lib/sbi/openapi/model/ulcl_bp_information.c @@ -61,7 +61,7 @@ OpenAPI_ulcl_bp_information_t *OpenAPI_ulcl_bp_information_parseFromJSON(cJSON * } ulcl_bp_information_local_var = OpenAPI_ulcl_bp_information_create ( - ulcl_bp_upf_id ? ogs_strdup(ulcl_bp_upf_id->valuestring) : NULL + ulcl_bp_upf_id ? ogs_strdup_or_assert(ulcl_bp_upf_id->valuestring) : NULL ); return ulcl_bp_information_local_var; diff --git a/lib/sbi/openapi/model/up_path_chg_event.c b/lib/sbi/openapi/model/up_path_chg_event.c index 73edde50e8..2516492a4c 100644 --- a/lib/sbi/openapi/model/up_path_chg_event.c +++ b/lib/sbi/openapi/model/up_path_chg_event.c @@ -121,8 +121,8 @@ OpenAPI_up_path_chg_event_t *OpenAPI_up_path_chg_event_parseFromJSON(cJSON *up_p } up_path_chg_event_local_var = OpenAPI_up_path_chg_event_create ( - ogs_strdup(notification_uri->valuestring), - ogs_strdup(notif_corre_id->valuestring), + ogs_strdup_or_assert(notification_uri->valuestring), + ogs_strdup_or_assert(notif_corre_id->valuestring), dnai_chg_typeVariable, af_ack_ind ? af_ack_ind->valueint : 0 ); diff --git a/lib/sbi/openapi/model/updated_item.c b/lib/sbi/openapi/model/updated_item.c index 40f3c8c1a4..037dc0b37d 100644 --- a/lib/sbi/openapi/model/updated_item.c +++ b/lib/sbi/openapi/model/updated_item.c @@ -82,8 +82,8 @@ OpenAPI_updated_item_t *OpenAPI_updated_item_parseFromJSON(cJSON *updated_itemJS } updated_item_local_var = OpenAPI_updated_item_create ( - ogs_strdup(item->valuestring), - ogs_strdup(value->valuestring) + ogs_strdup_or_assert(item->valuestring), + ogs_strdup_or_assert(value->valuestring) ); return updated_item_local_var; diff --git a/lib/sbi/openapi/model/upf_cond.c b/lib/sbi/openapi/model/upf_cond.c index 501881f27c..608c4701e2 100644 --- a/lib/sbi/openapi/model/upf_cond.c +++ b/lib/sbi/openapi/model/upf_cond.c @@ -105,7 +105,7 @@ OpenAPI_upf_cond_t *OpenAPI_upf_cond_parseFromJSON(cJSON *upf_condJSON) ogs_error("OpenAPI_upf_cond_parseFromJSON() failed [smf_serving_area]"); goto end; } - OpenAPI_list_add(smf_serving_areaList, ogs_strdup(smf_serving_area_local->valuestring)); + OpenAPI_list_add(smf_serving_areaList, ogs_strdup_or_assert(smf_serving_area_local->valuestring)); } } diff --git a/lib/sbi/openapi/model/upf_info.c b/lib/sbi/openapi/model/upf_info.c index e02c94f9ee..da75797c08 100644 --- a/lib/sbi/openapi/model/upf_info.c +++ b/lib/sbi/openapi/model/upf_info.c @@ -317,7 +317,7 @@ OpenAPI_upf_info_t *OpenAPI_upf_info_parseFromJSON(cJSON *upf_infoJSON) ogs_error("OpenAPI_upf_info_parseFromJSON() failed [smf_serving_area]"); goto end; } - OpenAPI_list_add(smf_serving_areaList, ogs_strdup(smf_serving_area_local->valuestring)); + OpenAPI_list_add(smf_serving_areaList, ogs_strdup_or_assert(smf_serving_area_local->valuestring)); } } diff --git a/lib/sbi/openapi/model/upu_data.c b/lib/sbi/openapi/model/upu_data.c index 2b310662bd..adac8ae6f6 100644 --- a/lib/sbi/openapi/model/upu_data.c +++ b/lib/sbi/openapi/model/upu_data.c @@ -121,10 +121,10 @@ OpenAPI_upu_data_t *OpenAPI_upu_data_parseFromJSON(cJSON *upu_dataJSON) } upu_data_local_var = OpenAPI_upu_data_create ( - ogs_strdup(provisioning_time->valuestring), + ogs_strdup_or_assert(provisioning_time->valuestring), ue_update_statusVariable, - upu_xmac_iue ? ogs_strdup(upu_xmac_iue->valuestring) : NULL, - upu_mac_iue ? ogs_strdup(upu_mac_iue->valuestring) : NULL + upu_xmac_iue ? ogs_strdup_or_assert(upu_xmac_iue->valuestring) : NULL, + upu_mac_iue ? ogs_strdup_or_assert(upu_mac_iue->valuestring) : NULL ); return upu_data_local_var; diff --git a/lib/sbi/openapi/model/upu_data_2.c b/lib/sbi/openapi/model/upu_data_2.c index 81d24c8df6..129e1551f2 100644 --- a/lib/sbi/openapi/model/upu_data_2.c +++ b/lib/sbi/openapi/model/upu_data_2.c @@ -129,9 +129,9 @@ OpenAPI_upu_data_2_t *OpenAPI_upu_data_2_parseFromJSON(cJSON *upu_data_2JSON) } upu_data_2_local_var = OpenAPI_upu_data_2_create ( - sec_packet ? ogs_strdup(sec_packet->valuestring) : NULL, + sec_packet ? ogs_strdup_or_assert(sec_packet->valuestring) : NULL, default_conf_nssai ? default_conf_nssaiList : NULL, - routing_id ? ogs_strdup(routing_id->valuestring) : NULL + routing_id ? ogs_strdup_or_assert(routing_id->valuestring) : NULL ); return upu_data_2_local_var; diff --git a/lib/sbi/openapi/model/upu_info.c b/lib/sbi/openapi/model/upu_info.c index f5d8b1aa47..d2ee70b815 100644 --- a/lib/sbi/openapi/model/upu_info.c +++ b/lib/sbi/openapi/model/upu_info.c @@ -191,9 +191,9 @@ OpenAPI_upu_info_t *OpenAPI_upu_info_parseFromJSON(cJSON *upu_infoJSON) upu_data_listList, upu_reg_ind->valueint, upu_ack_ind->valueint, - upu_mac_iausf ? ogs_strdup(upu_mac_iausf->valuestring) : NULL, - counter_upu ? ogs_strdup(counter_upu->valuestring) : NULL, - ogs_strdup(provisioning_time->valuestring) + upu_mac_iausf ? ogs_strdup_or_assert(upu_mac_iausf->valuestring) : NULL, + counter_upu ? ogs_strdup_or_assert(counter_upu->valuestring) : NULL, + ogs_strdup_or_assert(provisioning_time->valuestring) ); return upu_info_local_var; diff --git a/lib/sbi/openapi/model/usage_mon_data.c b/lib/sbi/openapi/model/usage_mon_data.c index 383c459156..da788022c1 100644 --- a/lib/sbi/openapi/model/usage_mon_data.c +++ b/lib/sbi/openapi/model/usage_mon_data.c @@ -183,7 +183,7 @@ OpenAPI_usage_mon_data_t *OpenAPI_usage_mon_data_parseFromJSON(cJSON *usage_mon_ } usage_mon_data_local_var = OpenAPI_usage_mon_data_create ( - ogs_strdup(limit_id->valuestring), + ogs_strdup_or_assert(limit_id->valuestring), scopes ? scopesList : NULL, um_level ? um_level_local_nonprim : NULL, allowed_usage ? allowed_usage_local_nonprim : NULL, diff --git a/lib/sbi/openapi/model/usage_mon_data_limit.c b/lib/sbi/openapi/model/usage_mon_data_limit.c index b21b8d4a53..02718d9089 100644 --- a/lib/sbi/openapi/model/usage_mon_data_limit.c +++ b/lib/sbi/openapi/model/usage_mon_data_limit.c @@ -217,13 +217,13 @@ OpenAPI_usage_mon_data_limit_t *OpenAPI_usage_mon_data_limit_parseFromJSON(cJSON } usage_mon_data_limit_local_var = OpenAPI_usage_mon_data_limit_create ( - ogs_strdup(limit_id->valuestring), + ogs_strdup_or_assert(limit_id->valuestring), scopes ? scopesList : NULL, um_level ? um_level_local_nonprim : NULL, - start_date ? ogs_strdup(start_date->valuestring) : NULL, - end_date ? ogs_strdup(end_date->valuestring) : NULL, + start_date ? ogs_strdup_or_assert(start_date->valuestring) : NULL, + end_date ? ogs_strdup_or_assert(end_date->valuestring) : NULL, usage_limit ? usage_limit_local_nonprim : NULL, - reset_period ? ogs_strdup(reset_period->valuestring) : NULL + reset_period ? ogs_strdup_or_assert(reset_period->valuestring) : NULL ); return usage_mon_data_limit_local_var; diff --git a/lib/sbi/openapi/model/usage_mon_data_scope.c b/lib/sbi/openapi/model/usage_mon_data_scope.c index a84b4c4eb2..4c6a9c6613 100644 --- a/lib/sbi/openapi/model/usage_mon_data_scope.c +++ b/lib/sbi/openapi/model/usage_mon_data_scope.c @@ -103,7 +103,7 @@ OpenAPI_usage_mon_data_scope_t *OpenAPI_usage_mon_data_scope_parseFromJSON(cJSON ogs_error("OpenAPI_usage_mon_data_scope_parseFromJSON() failed [dnn]"); goto end; } - OpenAPI_list_add(dnnList, ogs_strdup(dnn_local->valuestring)); + OpenAPI_list_add(dnnList, ogs_strdup_or_assert(dnn_local->valuestring)); } } diff --git a/lib/sbi/openapi/model/usage_monitoring_data.c b/lib/sbi/openapi/model/usage_monitoring_data.c index e08817461b..17e15c4539 100644 --- a/lib/sbi/openapi/model/usage_monitoring_data.c +++ b/lib/sbi/openapi/model/usage_monitoring_data.c @@ -280,17 +280,17 @@ OpenAPI_usage_monitoring_data_t *OpenAPI_usage_monitoring_data_parseFromJSON(cJS ogs_error("OpenAPI_usage_monitoring_data_parseFromJSON() failed [ex_usage_pcc_rule_ids]"); goto end; } - OpenAPI_list_add(ex_usage_pcc_rule_idsList, ogs_strdup(ex_usage_pcc_rule_ids_local->valuestring)); + OpenAPI_list_add(ex_usage_pcc_rule_idsList, ogs_strdup_or_assert(ex_usage_pcc_rule_ids_local->valuestring)); } } usage_monitoring_data_local_var = OpenAPI_usage_monitoring_data_create ( - ogs_strdup(um_id->valuestring), + ogs_strdup_or_assert(um_id->valuestring), volume_threshold ? volume_threshold->valuedouble : 0, volume_threshold_uplink ? volume_threshold_uplink->valuedouble : 0, volume_threshold_downlink ? volume_threshold_downlink->valuedouble : 0, time_threshold ? time_threshold->valuedouble : 0, - monitoring_time ? ogs_strdup(monitoring_time->valuestring) : NULL, + monitoring_time ? ogs_strdup_or_assert(monitoring_time->valuestring) : NULL, next_vol_threshold ? next_vol_threshold->valuedouble : 0, next_vol_threshold_uplink ? next_vol_threshold_uplink->valuedouble : 0, next_vol_threshold_downlink ? next_vol_threshold_downlink->valuedouble : 0, diff --git a/lib/sbi/openapi/model/user_identifier.c b/lib/sbi/openapi/model/user_identifier.c index cb38fa68b4..c533415fa2 100644 --- a/lib/sbi/openapi/model/user_identifier.c +++ b/lib/sbi/openapi/model/user_identifier.c @@ -100,9 +100,9 @@ OpenAPI_user_identifier_t *OpenAPI_user_identifier_parseFromJSON(cJSON *user_ide } user_identifier_local_var = OpenAPI_user_identifier_create ( - ogs_strdup(supi->valuestring), - gpsi ? ogs_strdup(gpsi->valuestring) : NULL, - validity_time ? ogs_strdup(validity_time->valuestring) : NULL + ogs_strdup_or_assert(supi->valuestring), + gpsi ? ogs_strdup_or_assert(gpsi->valuestring) : NULL, + validity_time ? ogs_strdup_or_assert(validity_time->valuestring) : NULL ); return user_identifier_local_var; diff --git a/lib/sbi/openapi/model/v2x_context.c b/lib/sbi/openapi/model/v2x_context.c index 727426005f..f2cd4bdb18 100644 --- a/lib/sbi/openapi/model/v2x_context.c +++ b/lib/sbi/openapi/model/v2x_context.c @@ -151,8 +151,8 @@ OpenAPI_v2x_context_t *OpenAPI_v2x_context_parseFromJSON(cJSON *v2x_contextJSON) v2x_context_local_var = OpenAPI_v2x_context_create ( nr_v2x_services_auth ? nr_v2x_services_auth_local_nonprim : NULL, lte_v2x_services_auth ? lte_v2x_services_auth_local_nonprim : NULL, - nr_ue_sidelink_ambr ? ogs_strdup(nr_ue_sidelink_ambr->valuestring) : NULL, - lte_ue_sidelink_ambr ? ogs_strdup(lte_ue_sidelink_ambr->valuestring) : NULL, + nr_ue_sidelink_ambr ? ogs_strdup_or_assert(nr_ue_sidelink_ambr->valuestring) : NULL, + lte_ue_sidelink_ambr ? ogs_strdup_or_assert(lte_ue_sidelink_ambr->valuestring) : NULL, pc5_qo_s_para ? pc5_qo_s_para_local_nonprim : NULL ); diff --git a/lib/sbi/openapi/model/v2x_subscription_data.c b/lib/sbi/openapi/model/v2x_subscription_data.c index 0dc9068068..4baa7ad964 100644 --- a/lib/sbi/openapi/model/v2x_subscription_data.c +++ b/lib/sbi/openapi/model/v2x_subscription_data.c @@ -128,8 +128,8 @@ OpenAPI_v2x_subscription_data_t *OpenAPI_v2x_subscription_data_parseFromJSON(cJS v2x_subscription_data_local_var = OpenAPI_v2x_subscription_data_create ( nr_v2x_services_auth ? nr_v2x_services_auth_local_nonprim : NULL, lte_v2x_services_auth ? lte_v2x_services_auth_local_nonprim : NULL, - nr_ue_pc5_ambr ? ogs_strdup(nr_ue_pc5_ambr->valuestring) : NULL, - lte_pc5_ambr ? ogs_strdup(lte_pc5_ambr->valuestring) : NULL + nr_ue_pc5_ambr ? ogs_strdup_or_assert(nr_ue_pc5_ambr->valuestring) : NULL, + lte_pc5_ambr ? ogs_strdup_or_assert(lte_pc5_ambr->valuestring) : NULL ); return v2x_subscription_data_local_var; diff --git a/lib/sbi/openapi/model/valid_time_period.c b/lib/sbi/openapi/model/valid_time_period.c index b58bb6d001..37ae846a6d 100644 --- a/lib/sbi/openapi/model/valid_time_period.c +++ b/lib/sbi/openapi/model/valid_time_period.c @@ -80,8 +80,8 @@ OpenAPI_valid_time_period_t *OpenAPI_valid_time_period_parseFromJSON(cJSON *vali } valid_time_period_local_var = OpenAPI_valid_time_period_create ( - start_time ? ogs_strdup(start_time->valuestring) : NULL, - end_time ? ogs_strdup(end_time->valuestring) : NULL + start_time ? ogs_strdup_or_assert(start_time->valuestring) : NULL, + end_time ? ogs_strdup_or_assert(end_time->valuestring) : NULL ); return valid_time_period_local_var; diff --git a/lib/sbi/openapi/model/vendor_specific_feature.c b/lib/sbi/openapi/model/vendor_specific_feature.c index 978905821b..ff4d9ea594 100644 --- a/lib/sbi/openapi/model/vendor_specific_feature.c +++ b/lib/sbi/openapi/model/vendor_specific_feature.c @@ -82,8 +82,8 @@ OpenAPI_vendor_specific_feature_t *OpenAPI_vendor_specific_feature_parseFromJSON } vendor_specific_feature_local_var = OpenAPI_vendor_specific_feature_create ( - ogs_strdup(feature_name->valuestring), - ogs_strdup(feature_version->valuestring) + ogs_strdup_or_assert(feature_name->valuestring), + ogs_strdup_or_assert(feature_version->valuestring) ); return vendor_specific_feature_local_var; diff --git a/lib/sbi/openapi/model/vgmlc_address.c b/lib/sbi/openapi/model/vgmlc_address.c index 320a94cf01..7af2517ec1 100644 --- a/lib/sbi/openapi/model/vgmlc_address.c +++ b/lib/sbi/openapi/model/vgmlc_address.c @@ -99,9 +99,9 @@ OpenAPI_vgmlc_address_t *OpenAPI_vgmlc_address_parseFromJSON(cJSON *vgmlc_addres } vgmlc_address_local_var = OpenAPI_vgmlc_address_create ( - vgmlc_address_ipv4 ? ogs_strdup(vgmlc_address_ipv4->valuestring) : NULL, - vgmlc_address_ipv6 ? ogs_strdup(vgmlc_address_ipv6->valuestring) : NULL, - vgmlc_fqdn ? ogs_strdup(vgmlc_fqdn->valuestring) : NULL + vgmlc_address_ipv4 ? ogs_strdup_or_assert(vgmlc_address_ipv4->valuestring) : NULL, + vgmlc_address_ipv6 ? ogs_strdup_or_assert(vgmlc_address_ipv6->valuestring) : NULL, + vgmlc_fqdn ? ogs_strdup_or_assert(vgmlc_fqdn->valuestring) : NULL ); return vgmlc_address_local_var; diff --git a/lib/sbi/openapi/model/vn_group_data.c b/lib/sbi/openapi/model/vn_group_data.c index b80479bf57..d7d9e8799f 100644 --- a/lib/sbi/openapi/model/vn_group_data.c +++ b/lib/sbi/openapi/model/vn_group_data.c @@ -157,7 +157,7 @@ OpenAPI_vn_group_data_t *OpenAPI_vn_group_data_parseFromJSON(cJSON *vn_group_dat vn_group_data_local_var = OpenAPI_vn_group_data_create ( pdu_session_types ? pdu_session_types_local_nonprim : NULL, - dnn ? ogs_strdup(dnn->valuestring) : NULL, + dnn ? ogs_strdup_or_assert(dnn->valuestring) : NULL, single_nssai ? single_nssai_local_nonprim : NULL, app_descriptors ? app_descriptorsList : NULL ); diff --git a/lib/sbi/openapi/model/volume_timed_report.c b/lib/sbi/openapi/model/volume_timed_report.c index f614ca9c98..158f7ff11c 100644 --- a/lib/sbi/openapi/model/volume_timed_report.c +++ b/lib/sbi/openapi/model/volume_timed_report.c @@ -120,8 +120,8 @@ OpenAPI_volume_timed_report_t *OpenAPI_volume_timed_report_parseFromJSON(cJSON * } volume_timed_report_local_var = OpenAPI_volume_timed_report_create ( - ogs_strdup(start_time_stamp->valuestring), - ogs_strdup(end_time_stamp->valuestring), + ogs_strdup_or_assert(start_time_stamp->valuestring), + ogs_strdup_or_assert(end_time_stamp->valuestring), downlink_volume->valuedouble, uplink_volume->valuedouble ); diff --git a/lib/sbi/openapi/model/vplmn_qos.c b/lib/sbi/openapi/model/vplmn_qos.c index 2d2ddd616a..6cceb60928 100644 --- a/lib/sbi/openapi/model/vplmn_qos.c +++ b/lib/sbi/openapi/model/vplmn_qos.c @@ -185,10 +185,10 @@ OpenAPI_vplmn_qos_t *OpenAPI_vplmn_qos_parseFromJSON(cJSON *vplmn_qosJSON) _5qi ? _5qi->valuedouble : 0, arp ? arp_local_nonprim : NULL, session_ambr ? session_ambr_local_nonprim : NULL, - max_fbr_dl ? ogs_strdup(max_fbr_dl->valuestring) : NULL, - max_fbr_ul ? ogs_strdup(max_fbr_ul->valuestring) : NULL, - gua_fbr_dl ? ogs_strdup(gua_fbr_dl->valuestring) : NULL, - gua_fbr_ul ? ogs_strdup(gua_fbr_ul->valuestring) : NULL + max_fbr_dl ? ogs_strdup_or_assert(max_fbr_dl->valuestring) : NULL, + max_fbr_ul ? ogs_strdup_or_assert(max_fbr_ul->valuestring) : NULL, + gua_fbr_dl ? ogs_strdup_or_assert(gua_fbr_dl->valuestring) : NULL, + gua_fbr_ul ? ogs_strdup_or_assert(gua_fbr_ul->valuestring) : NULL ); return vplmn_qos_local_var; diff --git a/lib/sbi/openapi/model/vsmf_update_data.c b/lib/sbi/openapi/model/vsmf_update_data.c index 506e6db802..deecdfcd70 100644 --- a/lib/sbi/openapi/model/vsmf_update_data.c +++ b/lib/sbi/openapi/model/vsmf_update_data.c @@ -698,7 +698,7 @@ OpenAPI_vsmf_update_data_t *OpenAPI_vsmf_update_data_parseFromJSON(cJSON *vsmf_u ogs_error("OpenAPI_vsmf_update_data_parseFromJSON() failed [dnai_list]"); goto end; } - OpenAPI_list_add(dnai_listList, ogs_strdup(dnai_list_local->valuestring)); + OpenAPI_list_add(dnai_listList, ogs_strdup_or_assert(dnai_list_local->valuestring)); } } @@ -751,10 +751,10 @@ OpenAPI_vsmf_update_data_t *OpenAPI_vsmf_update_data_parseFromJSON(cJSON *vsmf_u pti ? pti->valuedouble : 0, n1_sm_info_to_ue ? n1_sm_info_to_ue_local_nonprim : NULL, always_on_granted ? always_on_granted->valueint : 0, - hsmf_pdu_session_uri ? ogs_strdup(hsmf_pdu_session_uri->valuestring) : NULL, - supported_features ? ogs_strdup(supported_features->valuestring) : NULL, + hsmf_pdu_session_uri ? ogs_strdup_or_assert(hsmf_pdu_session_uri->valuestring) : NULL, + supported_features ? ogs_strdup_or_assert(supported_features->valuestring) : NULL, cause ? causeVariable : 0, - n1sm_cause ? ogs_strdup(n1sm_cause->valuestring) : NULL, + n1sm_cause ? ogs_strdup_or_assert(n1sm_cause->valuestring) : NULL, back_off_timer ? back_off_timer->valuedouble : 0, ma_release_ind ? ma_release_indVariable : 0, ma_accepted_ind ? ma_accepted_ind->valueint : 0, diff --git a/lib/sbi/openapi/model/vsmf_update_error.c b/lib/sbi/openapi/model/vsmf_update_error.c index e1c2cb8687..4221613602 100644 --- a/lib/sbi/openapi/model/vsmf_update_error.c +++ b/lib/sbi/openapi/model/vsmf_update_error.c @@ -329,13 +329,13 @@ OpenAPI_vsmf_update_error_t *OpenAPI_vsmf_update_error_parseFromJSON(cJSON *vsmf vsmf_update_error_local_var = OpenAPI_vsmf_update_error_create ( error_local_nonprim, pti ? pti->valuedouble : 0, - n1sm_cause ? ogs_strdup(n1sm_cause->valuestring) : NULL, + n1sm_cause ? ogs_strdup_or_assert(n1sm_cause->valuestring) : NULL, n1_sm_info_from_ue ? n1_sm_info_from_ue_local_nonprim : NULL, unknown_n1_sm_info ? unknown_n1_sm_info_local_nonprim : NULL, failed_to_assign_ebi_list ? failed_to_assign_ebi_listList : NULL, ng_ap_cause ? ng_ap_cause_local_nonprim : NULL, _5g_mm_cause_value ? _5g_mm_cause_value->valuedouble : 0, - recovery_time ? ogs_strdup(recovery_time->valuestring) : NULL, + recovery_time ? ogs_strdup_or_assert(recovery_time->valuestring) : NULL, n4_info ? n4_info_local_nonprim : NULL, n4_info_ext1 ? n4_info_ext1_local_nonprim : NULL, n4_info_ext2 ? n4_info_ext2_local_nonprim : NULL diff --git a/lib/sbi/openapi/model/vsmf_updated_data.c b/lib/sbi/openapi/model/vsmf_updated_data.c index 4d6f390e72..5a54aa3182 100644 --- a/lib/sbi/openapi/model/vsmf_updated_data.c +++ b/lib/sbi/openapi/model/vsmf_updated_data.c @@ -663,7 +663,7 @@ OpenAPI_vsmf_updated_data_t *OpenAPI_vsmf_updated_data_parseFromJSON(cJSON *vsmf n1_sm_info_from_ue ? n1_sm_info_from_ue_local_nonprim : NULL, unknown_n1_sm_info ? unknown_n1_sm_info_local_nonprim : NULL, ue_location ? ue_location_local_nonprim : NULL, - ue_time_zone ? ogs_strdup(ue_time_zone->valuestring) : NULL, + ue_time_zone ? ogs_strdup_or_assert(ue_time_zone->valuestring) : NULL, add_ue_location ? add_ue_location_local_nonprim : NULL, assigned_ebi_list ? assigned_ebi_listList : NULL, failed_to_assign_ebi_list ? failed_to_assign_ebi_listList : NULL, diff --git a/lib/sbi/openapi/model/w_agf_info.c b/lib/sbi/openapi/model/w_agf_info.c index fa865bb6ab..72051ca79e 100644 --- a/lib/sbi/openapi/model/w_agf_info.c +++ b/lib/sbi/openapi/model/w_agf_info.c @@ -111,7 +111,7 @@ OpenAPI_w_agf_info_t *OpenAPI_w_agf_info_parseFromJSON(cJSON *w_agf_infoJSON) ogs_error("OpenAPI_w_agf_info_parseFromJSON() failed [ipv4_endpoint_addresses]"); goto end; } - OpenAPI_list_add(ipv4_endpoint_addressesList, ogs_strdup(ipv4_endpoint_addresses_local->valuestring)); + OpenAPI_list_add(ipv4_endpoint_addressesList, ogs_strdup_or_assert(ipv4_endpoint_addresses_local->valuestring)); } } @@ -131,7 +131,7 @@ OpenAPI_w_agf_info_t *OpenAPI_w_agf_info_parseFromJSON(cJSON *w_agf_infoJSON) ogs_error("OpenAPI_w_agf_info_parseFromJSON() failed [ipv6_endpoint_addresses]"); goto end; } - OpenAPI_list_add(ipv6_endpoint_addressesList, ogs_strdup(ipv6_endpoint_addresses_local->valuestring)); + OpenAPI_list_add(ipv6_endpoint_addressesList, ogs_strdup_or_assert(ipv6_endpoint_addresses_local->valuestring)); } } @@ -147,7 +147,7 @@ OpenAPI_w_agf_info_t *OpenAPI_w_agf_info_parseFromJSON(cJSON *w_agf_infoJSON) w_agf_info_local_var = OpenAPI_w_agf_info_create ( ipv4_endpoint_addresses ? ipv4_endpoint_addressesList : NULL, ipv6_endpoint_addresses ? ipv6_endpoint_addressesList : NULL, - endpoint_fqdn ? ogs_strdup(endpoint_fqdn->valuestring) : NULL + endpoint_fqdn ? ogs_strdup_or_assert(endpoint_fqdn->valuestring) : NULL ); return w_agf_info_local_var; diff --git a/lib/sbi/openapi/model/wireline_area.c b/lib/sbi/openapi/model/wireline_area.c index 6f32c13276..c37d5af5e3 100644 --- a/lib/sbi/openapi/model/wireline_area.c +++ b/lib/sbi/openapi/model/wireline_area.c @@ -132,7 +132,7 @@ OpenAPI_wireline_area_t *OpenAPI_wireline_area_parseFromJSON(cJSON *wireline_are ogs_error("OpenAPI_wireline_area_parseFromJSON() failed [hfc_n_ids]"); goto end; } - OpenAPI_list_add(hfc_n_idsList, ogs_strdup(hfc_n_ids_local->valuestring)); + OpenAPI_list_add(hfc_n_idsList, ogs_strdup_or_assert(hfc_n_ids_local->valuestring)); } } @@ -157,8 +157,8 @@ OpenAPI_wireline_area_t *OpenAPI_wireline_area_parseFromJSON(cJSON *wireline_are wireline_area_local_var = OpenAPI_wireline_area_create ( global_line_ids ? global_line_idsList : NULL, hfc_n_ids ? hfc_n_idsList : NULL, - area_code_b ? ogs_strdup(area_code_b->valuestring) : NULL, - area_code_c ? ogs_strdup(area_code_c->valuestring) : NULL + area_code_b ? ogs_strdup_or_assert(area_code_b->valuestring) : NULL, + area_code_c ? ogs_strdup_or_assert(area_code_c->valuestring) : NULL ); return wireline_area_local_var; diff --git a/lib/sbi/openapi/src/apiKey.c b/lib/sbi/openapi/src/apiKey.c index 4e50a6e381..cb7d0a80a5 100644 --- a/lib/sbi/openapi/src/apiKey.c +++ b/lib/sbi/openapi/src/apiKey.c @@ -5,6 +5,7 @@ OpenAPI_map_t *OpenAPI_map_create(char *key, void *value) { OpenAPI_map_t *OpenAPI_map = ogs_malloc(sizeof(OpenAPI_map_t)); + ogs_assert(OpenAPI_map); OpenAPI_map->key = key; OpenAPI_map->value = value; return OpenAPI_map; @@ -13,6 +14,7 @@ OpenAPI_map_t *OpenAPI_map_create(char *key, void *value) OpenAPI_map_t *OpenAPI_map_create_allocate(char *key, double value) { double* boolpointer = ogs_malloc(sizeof(value)); + ogs_assert(boolpointer); memcpy(boolpointer, &value, sizeof(value)); return OpenAPI_map_create(key, boolpointer); } diff --git a/lib/sbi/openapi/src/list.c b/lib/sbi/openapi/src/list.c index eebfb40847..6771a6e17d 100644 --- a/lib/sbi/openapi/src/list.c +++ b/lib/sbi/openapi/src/list.c @@ -6,6 +6,7 @@ static OpenAPI_lnode_t *listEntry_create(void *data) { OpenAPI_lnode_t *created = ogs_malloc(sizeof(OpenAPI_lnode_t)); + ogs_assert(created); if (created == NULL) { // TODO Malloc Failure @@ -29,6 +30,7 @@ void OpenAPI_lnode_print(OpenAPI_lnode_t *listEntry, void *additionalData) OpenAPI_list_t *OpenAPI_list_create(void) { OpenAPI_list_t *createdList = ogs_malloc(sizeof(OpenAPI_list_t)); + ogs_assert(createdList); if (createdList == NULL) { // TODO Malloc Failure diff --git a/lib/sbi/path.c b/lib/sbi/path.c index d02171d4b0..395d548ba1 100644 --- a/lib/sbi/path.c +++ b/lib/sbi/path.c @@ -20,7 +20,7 @@ #include "ogs-sbi.h" #include "ogs-app.h" -void ogs_sbi_send(ogs_sbi_nf_instance_t *nf_instance, +bool ogs_sbi_send(ogs_sbi_nf_instance_t *nf_instance, ogs_sbi_client_cb_f client_cb, ogs_sbi_xact_t *xact) { ogs_sbi_request_t *request = NULL; @@ -42,7 +42,7 @@ void ogs_sbi_send(ogs_sbi_nf_instance_t *nf_instance, ogs_error("[%s] Cannot find client [%s:%s]", nf_instance->id, request->h.service.name, request->h.api.version); - return; + return false; } } else { ogs_sockaddr_t *addr = NULL; @@ -51,23 +51,26 @@ void ogs_sbi_send(ogs_sbi_nf_instance_t *nf_instance, addr = ogs_sbi_getaddr_from_uri(request->h.uri); if (!addr) { ogs_error("[%s] Invalid URL [%s]", nf_instance->id, request->h.uri); - return; + return false; } client = ogs_sbi_client_find(addr); if (!client) { ogs_error("[%s] Cannot find client [%s:%d]", nf_instance->id, OGS_ADDR(addr, buf), OGS_PORT(addr)); ogs_freeaddrinfo(addr); - return; + return false; } ogs_freeaddrinfo(addr); } - ogs_sbi_client_send_request( - client, client_cb, request, xact); + ogs_expect_or_return_val(true == + ogs_sbi_client_send_request( + client, client_cb, request, xact), false); /* Prevent ogs_sbi_request_free() in ogs_sbi_xact_remove() */ xact->request = NULL; + + return true; } bool ogs_sbi_discover_and_send(ogs_sbi_xact_t *xact, @@ -92,8 +95,7 @@ bool ogs_sbi_discover_and_send(ogs_sbi_xact_t *xact, } if (nf_instance) { - ogs_sbi_send(nf_instance, client_cb, xact); - return true; + return ogs_sbi_send(nf_instance, client_cb, xact); } /* NRF NF-Instance */ @@ -107,9 +109,8 @@ bool ogs_sbi_discover_and_send(ogs_sbi_xact_t *xact, if (nf_instance) { ogs_warn("Try to discover [%s]", OpenAPI_nf_type_ToString(xact->target_nf_type)); - ogs_nnrf_disc_send_nf_discover(nf_instance, xact->target_nf_type, xact); - - return true; + return ogs_nnrf_disc_send_nf_discover( + nf_instance, xact->target_nf_type, xact); } ogs_error("Cannot discover [%s]", @@ -118,7 +119,7 @@ bool ogs_sbi_discover_and_send(ogs_sbi_xact_t *xact, return false; } -void ogs_nnrf_nfm_send_nf_update(ogs_sbi_nf_instance_t *nf_instance) +bool ogs_nnrf_nfm_send_nf_update(ogs_sbi_nf_instance_t *nf_instance) { ogs_sbi_request_t *request = NULL; ogs_sbi_client_t *client = NULL; @@ -128,14 +129,13 @@ void ogs_nnrf_nfm_send_nf_update(ogs_sbi_nf_instance_t *nf_instance) ogs_assert(client); request = ogs_nnrf_nfm_build_update(nf_instance); - if (!request) { - ogs_error("ogs_nnrf_nfm_send_nf_update() failed"); - return; - } - ogs_sbi_client_send_request(client, client->cb, request, nf_instance); + ogs_expect_or_return_val(request, false); + + return ogs_sbi_client_send_request( + client, client->cb, request, nf_instance); } -void ogs_nnrf_nfm_send_nf_de_register(ogs_sbi_nf_instance_t *nf_instance) +bool ogs_nnrf_nfm_send_nf_de_register(ogs_sbi_nf_instance_t *nf_instance) { ogs_sbi_request_t *request = NULL; ogs_sbi_client_t *client = NULL; @@ -145,14 +145,13 @@ void ogs_nnrf_nfm_send_nf_de_register(ogs_sbi_nf_instance_t *nf_instance) ogs_assert(client); request = ogs_nnrf_nfm_build_de_register(nf_instance); - if (!request) { - ogs_error("ogs_nnrf_nfm_send_nf_de_register() failed"); - return; - } - ogs_sbi_client_send_request(client, client->cb, request, nf_instance); + ogs_expect_or_return_val(request, false); + + return ogs_sbi_client_send_request( + client, client->cb, request, nf_instance); } -void ogs_nnrf_nfm_send_nf_status_subscribe(ogs_sbi_client_t *client, +bool ogs_nnrf_nfm_send_nf_status_subscribe(ogs_sbi_client_t *client, OpenAPI_nf_type_e req_nf_type, char *req_nf_instance_id, OpenAPI_nf_type_e subscr_cond_nf_type) { @@ -166,20 +165,20 @@ void ogs_nnrf_nfm_send_nf_status_subscribe(ogs_sbi_client_t *client, OGS_SETUP_SBI_CLIENT(subscription, client); subscription->req_nf_type = req_nf_type; - if (req_nf_instance_id) + if (req_nf_instance_id) { subscription->req_nf_instance_id = ogs_strdup(req_nf_instance_id); + ogs_expect_or_return_val(req_nf_instance_id, false); + } subscription->subscr_cond.nf_type = subscr_cond_nf_type; request = ogs_nnrf_nfm_build_status_subscribe(subscription); - if (!request) { - ogs_error("ogs_nnrf_nfm_send_nf_status_subscribe() failed"); - ogs_sbi_subscription_remove(subscription); - return; - } - ogs_sbi_client_send_request(client, client->cb, request, subscription); + ogs_expect_or_return_val(request, false); + + return ogs_sbi_client_send_request( + client, client->cb, request, subscription); } -void ogs_nnrf_nfm_send_nf_status_unsubscribe( +bool ogs_nnrf_nfm_send_nf_status_unsubscribe( ogs_sbi_subscription_t *subscription) { ogs_sbi_request_t *request = NULL; @@ -190,14 +189,13 @@ void ogs_nnrf_nfm_send_nf_status_unsubscribe( ogs_assert(client); request = ogs_nnrf_nfm_build_status_unsubscribe(subscription); - if (!request) { - ogs_error("ogs_nnrf_nfm_send_nf_status_unsubscribe() failed"); - return; - } - ogs_sbi_client_send_request(client, client->cb, request, subscription); + ogs_expect_or_return_val(request, false); + + return ogs_sbi_client_send_request( + client, client->cb, request, subscription); } -void ogs_nnrf_disc_send_nf_discover(ogs_sbi_nf_instance_t *nf_instance, +bool ogs_nnrf_disc_send_nf_discover(ogs_sbi_nf_instance_t *nf_instance, OpenAPI_nf_type_e target_nf_type, void *data) { ogs_sbi_client_t *client = NULL; @@ -210,11 +208,12 @@ void ogs_nnrf_disc_send_nf_discover(ogs_sbi_nf_instance_t *nf_instance, request = ogs_nnrf_disc_build_discover( target_nf_type, nf_instance->nf_type); - ogs_assert(request); - ogs_sbi_client_send_request(client, client->cb, request, data); + ogs_expect_or_return_val(request, false); + + return ogs_sbi_client_send_request(client, client->cb, request, data); } -void ogs_sbi_send_response(ogs_sbi_stream_t *stream, int status) +bool ogs_sbi_send_response(ogs_sbi_stream_t *stream, int status) { ogs_sbi_message_t sendmsg; ogs_sbi_response_t *response = NULL; @@ -224,6 +223,6 @@ void ogs_sbi_send_response(ogs_sbi_stream_t *stream, int status) memset(&sendmsg, 0, sizeof(sendmsg)); response = ogs_sbi_build_response(&sendmsg, status); - ogs_assert(response); - ogs_sbi_server_send_response(stream, response); + ogs_expect_or_return_val(response, false); + return ogs_sbi_server_send_response(stream, response); } diff --git a/lib/sbi/path.h b/lib/sbi/path.h index 559ea7d4e0..dbfb94716b 100644 --- a/lib/sbi/path.h +++ b/lib/sbi/path.h @@ -26,26 +26,26 @@ extern "C" { #endif -void ogs_sbi_send(ogs_sbi_nf_instance_t *nf_instance, +bool ogs_sbi_send(ogs_sbi_nf_instance_t *nf_instance, ogs_sbi_client_cb_f client_cb, ogs_sbi_xact_t *xact); bool ogs_sbi_discover_and_send(ogs_sbi_xact_t *xact, ogs_fsm_handler_t nf_state_registered, ogs_sbi_client_cb_f client_cb); -void ogs_nnrf_nfm_send_nf_update(ogs_sbi_nf_instance_t *nf_instance); -void ogs_nnrf_nfm_send_nf_de_register(ogs_sbi_nf_instance_t *nf_instance); +bool ogs_nnrf_nfm_send_nf_update(ogs_sbi_nf_instance_t *nf_instance); +bool ogs_nnrf_nfm_send_nf_de_register(ogs_sbi_nf_instance_t *nf_instance); -void ogs_nnrf_nfm_send_nf_status_subscribe(ogs_sbi_client_t *client, +bool ogs_nnrf_nfm_send_nf_status_subscribe(ogs_sbi_client_t *client, OpenAPI_nf_type_e req_nf_type, char *req_nf_instance_id, OpenAPI_nf_type_e subscr_cond_nf_type); -void ogs_nnrf_nfm_send_nf_status_unsubscribe( +bool ogs_nnrf_nfm_send_nf_status_unsubscribe( ogs_sbi_subscription_t *subscription); -void ogs_nnrf_disc_send_nf_discover(ogs_sbi_nf_instance_t *nf_instance, +bool ogs_nnrf_disc_send_nf_discover(ogs_sbi_nf_instance_t *nf_instance, OpenAPI_nf_type_e target_nf_type, void *data); #define ogs_sbi_send_http_status_no_content(__sTREAM) \ - ogs_sbi_send_response(__sTREAM, OGS_SBI_HTTP_STATUS_NO_CONTENT); -void ogs_sbi_send_response(ogs_sbi_stream_t *stream, int status); + ogs_sbi_send_response(__sTREAM, OGS_SBI_HTTP_STATUS_NO_CONTENT) +bool ogs_sbi_send_response(ogs_sbi_stream_t *stream, int status); #ifdef __cplusplus } diff --git a/lib/sbi/server.c b/lib/sbi/server.c index 6be8b22d49..20bbf149fc 100644 --- a/lib/sbi/server.c +++ b/lib/sbi/server.c @@ -63,7 +63,7 @@ ogs_sbi_server_t *ogs_sbi_server_add(ogs_sockaddr_t *addr) ogs_assert(server); memset(server, 0, sizeof(ogs_sbi_server_t)); - ogs_copyaddrinfo(&server->node.addr, addr); + ogs_assert(OGS_OK == ogs_copyaddrinfo(&server->node.addr, addr)); ogs_list_add(&ogs_sbi_self()->server_list, server); @@ -100,7 +100,7 @@ void ogs_sbi_server_set_advertise( ogs_assert(server); ogs_assert(advertise); - ogs_copyaddrinfo(&addr, advertise); + ogs_assert(OGS_OK == ogs_copyaddrinfo(&addr, advertise)); if (family != AF_UNSPEC) ogs_filteraddrinfo(&addr, family); @@ -128,13 +128,13 @@ void ogs_sbi_server_stop_all(void) ogs_sbi_server_actions.stop(server); } -void ogs_sbi_server_send_response( +bool ogs_sbi_server_send_response( ogs_sbi_stream_t *stream, ogs_sbi_response_t *response) { - ogs_sbi_server_actions.send_response(stream, response); + return ogs_sbi_server_actions.send_response(stream, response); } -void ogs_sbi_server_send_problem( +bool ogs_sbi_server_send_problem( ogs_sbi_stream_t *stream, OpenAPI_problem_details_t *problem) { ogs_sbi_message_t message; @@ -152,9 +152,11 @@ void ogs_sbi_server_send_problem( ogs_assert(response); ogs_sbi_server_send_response(stream, response); + + return true; } -void ogs_sbi_server_send_error(ogs_sbi_stream_t *stream, +bool ogs_sbi_server_send_error(ogs_sbi_stream_t *stream, int status, ogs_sbi_message_t *message, const char *title, const char *detail) { @@ -167,6 +169,7 @@ void ogs_sbi_server_send_error(ogs_sbi_stream_t *stream, if (message) { problem.type = ogs_msprintf("/%s/%s", message->h.service.name, message->h.api.version); + ogs_expect_or_return_val(problem.type, false); if (message->h.resource.component[1]) problem.instance = ogs_msprintf("/%s/%s", message->h.resource.component[0], @@ -174,6 +177,7 @@ void ogs_sbi_server_send_error(ogs_sbi_stream_t *stream, else problem.instance = ogs_msprintf("/%s", message->h.resource.component[0]); + ogs_expect_or_return_val(problem.instance, NULL); } problem.status = status; problem.title = (char*)title; @@ -185,6 +189,8 @@ void ogs_sbi_server_send_error(ogs_sbi_stream_t *stream, ogs_free(problem.type); if (problem.instance) ogs_free(problem.instance); + + return true; } ogs_sbi_server_t *ogs_sbi_server_from_stream(ogs_sbi_stream_t *stream) diff --git a/lib/sbi/server.h b/lib/sbi/server.h index 2c84f197d6..81a97919ff 100644 --- a/lib/sbi/server.h +++ b/lib/sbi/server.h @@ -53,7 +53,7 @@ typedef struct ogs_sbi_server_actions_s { int (*cb)(ogs_sbi_request_t *request, void *data)); void (*stop)(ogs_sbi_server_t *server); - void (*send_response)( + bool (*send_response)( ogs_sbi_stream_t *stream, ogs_sbi_response_t *response); ogs_sbi_server_t *(*from_stream)(ogs_sbi_stream_t *stream); @@ -73,12 +73,12 @@ int ogs_sbi_server_start_all( int (*cb)(ogs_sbi_request_t *request, void *data)); void ogs_sbi_server_stop_all(void); -void ogs_sbi_server_send_response( +bool ogs_sbi_server_send_response( ogs_sbi_stream_t *stream, ogs_sbi_response_t *response); -void ogs_sbi_server_send_error(ogs_sbi_stream_t *stream, +bool ogs_sbi_server_send_error(ogs_sbi_stream_t *stream, int status, ogs_sbi_message_t *message, const char *title, const char *detail); -void ogs_sbi_server_send_problem( +bool ogs_sbi_server_send_problem( ogs_sbi_stream_t *stream, OpenAPI_problem_details_t *problem); ogs_sbi_server_t *ogs_sbi_server_from_stream(ogs_sbi_stream_t *stream); diff --git a/lib/sbi/support/README.md b/lib/sbi/support/README.md index 6ffc11b539..db056446c7 100644 --- a/lib/sbi/support/README.md +++ b/lib/sbi/support/README.md @@ -14,10 +14,10 @@ $ cd openapi-generator $ git checkout 15d58dc89b11d17f52c2daadfae9736e442f3b1a $ mvn clean package -- VERSION: 0.69.1 +- VERSION: 0.66.1 $ git clone https://github.com/uncrustify/uncrustify.git $ cd uncrustify -$ git checkout uncrustify-0.69.1 +$ git checkout uncrustify-0.66.1 $ mkdir build $ cd build $ cmake .. diff --git a/lib/sctp/ogs-sctp.c b/lib/sctp/ogs-sctp.c index ee81c82815..d8cbe83bbe 100644 --- a/lib/sctp/ogs-sctp.c +++ b/lib/sctp/ogs-sctp.c @@ -85,6 +85,7 @@ void ogs_sctp_write_to_buffer(ogs_sctp_sock_t *sctp, ogs_pkbuf_t *pkbuf) ogs_assert(sctp->sock); sctp->poll.write = ogs_pollset_add(ogs_app()->pollset, OGS_POLLOUT, sctp->sock->fd, sctp_write_callback, sctp); + ogs_assert(sctp->poll.write); } } diff --git a/src/amf/amf-sm.c b/src/amf/amf-sm.c index 2a65afe2b8..207fd9a341 100644 --- a/src/amf/amf-sm.c +++ b/src/amf/amf-sm.c @@ -96,8 +96,10 @@ void amf_state_operational(ogs_fsm_t *s, amf_event_t *e) if (rv != OGS_OK) { /* 'sbi_message' buffer is released in ogs_sbi_parse_request() */ ogs_error("cannot parse HTTP sbi_message"); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - NULL, "cannot parse HTTP sbi_message", NULL); + ogs_assert(true == + ogs_sbi_server_send_error( + stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + NULL, "cannot parse HTTP sbi_message", NULL)); break; } @@ -112,8 +114,10 @@ void amf_state_operational(ogs_fsm_t *s, amf_event_t *e) ogs_assert(api_version); if (strcmp(sbi_message.h.api.version, api_version) != 0) { ogs_error("Not supported version [%s]", sbi_message.h.api.version); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - &sbi_message, "Not supported version", NULL); + ogs_assert(true == + ogs_sbi_server_send_error( + stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + &sbi_message, "Not supported version", NULL)); ogs_sbi_message_free(&sbi_message); break; } @@ -130,19 +134,21 @@ void amf_state_operational(ogs_fsm_t *s, amf_event_t *e) DEFAULT ogs_error("Invalid HTTP method [%s]", sbi_message.h.method); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_FORBIDDEN, &sbi_message, - "Invalid HTTP method", sbi_message.h.method); + "Invalid HTTP method", sbi_message.h.method)); END break; DEFAULT ogs_error("Invalid resource name [%s]", sbi_message.h.resource.component[0]); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, &sbi_message, "Invalid resource name", - sbi_message.h.resource.component[0]); + sbi_message.h.resource.component[0])); END break; @@ -156,38 +162,43 @@ void amf_state_operational(ogs_fsm_t *s, amf_event_t *e) rv = amf_namf_comm_handle_n1_n2_message_transfer( stream, &sbi_message); if (rv != OGS_OK) { - ogs_sbi_server_send_error(stream, - OGS_SBI_HTTP_STATUS_BAD_REQUEST, &sbi_message, - "No N1N2MessageTransferReqData", NULL); + ogs_assert(true == + ogs_sbi_server_send_error(stream, + OGS_SBI_HTTP_STATUS_BAD_REQUEST, + &sbi_message, + "No N1N2MessageTransferReqData", NULL)); } break; DEFAULT ogs_error("Invalid HTTP method [%s]", sbi_message.h.method); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_FORBIDDEN, &sbi_message, - "Invalid HTTP method", sbi_message.h.method); + "Invalid HTTP method", sbi_message.h.method)); END break; DEFAULT ogs_error("Invalid resource name [%s]", sbi_message.h.resource.component[2]); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, &sbi_message, "Invalid resource name", - sbi_message.h.resource.component[2]); + sbi_message.h.resource.component[2])); END break; DEFAULT ogs_error("Invalid resource name [%s]", sbi_message.h.resource.component[0]); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, &sbi_message, "Invalid resource name", - sbi_message.h.resource.component[0]); + sbi_message.h.resource.component[0])); END break; @@ -204,24 +215,26 @@ void amf_state_operational(ogs_fsm_t *s, amf_event_t *e) break; #endif CASE(OGS_SBI_RESOURCE_NAME_AM_POLICY_NOTIFY) - ogs_sbi_send_http_status_no_content(stream); + ogs_assert(true == ogs_sbi_send_http_status_no_content(stream)); break; DEFAULT ogs_error("Invalid resource name [%s]", sbi_message.h.resource.component[1]); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, &sbi_message, "Invalid resource name", - sbi_message.h.resource.component[1]); + sbi_message.h.resource.component[1])); END break; DEFAULT ogs_error("Invalid API name [%s]", sbi_message.h.service.name); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, &sbi_message, - "Invalid API name", sbi_message.h.resource.component[0]); + "Invalid API name", sbi_message.h.resource.component[0])); END /* In lib/sbi/server.c, notify_completed() releases 'request' buffer. */ @@ -520,9 +533,10 @@ void amf_state_operational(ogs_fsm_t *s, amf_event_t *e) subscription = e->sbi.data; ogs_assert(subscription); - ogs_nnrf_nfm_send_nf_status_subscribe(subscription->client, + ogs_assert(true == + ogs_nnrf_nfm_send_nf_status_subscribe(subscription->client, amf_self()->nf_type, subscription->req_nf_instance_id, - subscription->subscr_cond.nf_type); + subscription->subscr_cond.nf_type)); ogs_info("[%s] Subscription validity expired", subscription->id); ogs_sbi_subscription_remove(subscription); diff --git a/src/amf/context.c b/src/amf/context.c index 6ad47ad23e..fae77239d2 100644 --- a/src/amf/context.c +++ b/src/amf/context.c @@ -66,10 +66,15 @@ void amf_context_init(void) ogs_list_init(&self.amf_ue_list); self.gnb_addr_hash = ogs_hash_make(); + ogs_assert(self.gnb_addr_hash); self.gnb_id_hash = ogs_hash_make(); + ogs_assert(self.gnb_id_hash); self.guti_ue_hash = ogs_hash_make(); + ogs_assert(self.guti_ue_hash); self.suci_hash = ogs_hash_make(); + ogs_assert(self.suci_hash); self.supi_hash = ogs_hash_make(); + ogs_assert(self.supi_hash); context_initialized = 1; } diff --git a/src/amf/context.h b/src/amf/context.h index df758062fb..4c4a4244e9 100644 --- a/src/amf/context.h +++ b/src/amf/context.h @@ -509,7 +509,9 @@ typedef struct amf_sess_s { AMF_SESS_CLEAR_PAGING_INFO(__sESS) \ (__sESS)->paging.ongoing = true; \ ((__sESS)->paging.location) = ogs_strdup(__lOCATION); \ + ogs_assert((__sESS)->paging.location); \ ((__sESS)->paging.n1n2_failure_txf_notif_uri) = ogs_strdup(__uRI); \ + ogs_assert((__sESS)->paging.n1n2_failure_txf_notif_uri); \ } while(0); #define AMF_SESS_CLEAR_PAGING_INFO(__sESS) \ do { \ diff --git a/src/amf/gmm-build.c b/src/amf/gmm-build.c index cf1722658b..19f9aacfb7 100644 --- a/src/amf/gmm-build.c +++ b/src/amf/gmm-build.c @@ -97,9 +97,10 @@ ogs_pkbuf_t *gmm_build_registration_accept(amf_ue_t *amf_ue) ogs_assert(served_tai_index >= 0 && served_tai_index < OGS_MAX_NUM_OF_SERVED_TAI); - ogs_nas_5gs_tai_list_build(®istration_accept->tai_list, + ogs_assert(OGS_OK == + ogs_nas_5gs_tai_list_build(®istration_accept->tai_list, &amf_self()->served_tai[served_tai_index].list0, - &amf_self()->served_tai[served_tai_index].list2); + &amf_self()->served_tai[served_tai_index].list2)); /* Set Allowed NSSAI */ ogs_assert(amf_ue->allowed_nssai.num_of_s_nssai); diff --git a/src/amf/gmm-handler.c b/src/amf/gmm-handler.c index 2b231a6e44..10df53eee2 100644 --- a/src/amf/gmm-handler.c +++ b/src/amf/gmm-handler.c @@ -719,8 +719,9 @@ int gmm_handle_authentication_response(amf_ue_t *amf_ue, memcpy(amf_ue->xres_star, authentication_response_parameter->res, authentication_response_parameter->length); - amf_ue_sbi_discover_and_send(OpenAPI_nf_type_AUSF, amf_ue, NULL, - amf_nausf_auth_build_authenticate_confirmation); + ogs_assert(true == + amf_ue_sbi_discover_and_send(OpenAPI_nf_type_AUSF, amf_ue, NULL, + amf_nausf_auth_build_authenticate_confirmation)); return OGS_OK; } @@ -832,6 +833,7 @@ int gmm_handle_security_mode_complete(amf_ue_t *amf_ue, if (amf_ue->pei) ogs_free(amf_ue->pei); amf_ue->pei = ogs_msprintf("imeisv-%s", amf_ue->imeisv_bcd); + ogs_assert(amf_ue->pei); } else { ogs_error("[%s] Unknown IMEISV Length [%d]", amf_ue->supi, imeisv->length); @@ -999,11 +1001,13 @@ int gmm_handle_ul_nas_transport(amf_ue_t *amf_ue, if (sess->dnn) ogs_free(sess->dnn); sess->dnn = ogs_strdup(dnn->value); + ogs_assert(sess->dnn); } if (!sess->dnn) { if (selected_slice->num_of_session) { sess->dnn = ogs_strdup(selected_slice->session[0].name); + ogs_assert(sess->dnn); } } @@ -1030,12 +1034,14 @@ int gmm_handle_ul_nas_transport(amf_ue_t *amf_ue, } if (nf_instance) { - amf_sess_sbi_discover_and_send(OpenAPI_nf_type_SMF, + ogs_assert(true == + amf_sess_sbi_discover_and_send(OpenAPI_nf_type_SMF, sess, AMF_CREATE_SM_CONTEXT_NO_STATE, NULL, - amf_nsmf_pdusession_build_create_sm_context); + amf_nsmf_pdusession_build_create_sm_context)); } else { - amf_sess_sbi_discover_and_send(OpenAPI_nf_type_NSSF, - sess, 0, NULL, amf_nnssf_nsselection_build_get); + ogs_assert(true == + amf_sess_sbi_discover_and_send(OpenAPI_nf_type_NSSF, + sess, 0, NULL, amf_nnssf_nsselection_build_get)); } } else { @@ -1044,9 +1050,10 @@ int gmm_handle_ul_nas_transport(amf_ue_t *amf_ue, param.release = 1; param.cause = OpenAPI_cause_REL_DUE_TO_DUPLICATE_SESSION_ID; - amf_sess_sbi_discover_and_send(OpenAPI_nf_type_SMF, + ogs_assert(true == + amf_sess_sbi_discover_and_send(OpenAPI_nf_type_SMF, sess, AMF_UPDATE_SM_CONTEXT_DUPLICATED_PDU_SESSION_ID, - ¶m, amf_nsmf_pdusession_build_update_sm_context); + ¶m, amf_nsmf_pdusession_build_update_sm_context)); } } else { @@ -1069,9 +1076,10 @@ int gmm_handle_ul_nas_transport(amf_ue_t *amf_ue, param.ue_timezone = true; } - amf_sess_sbi_discover_and_send(OpenAPI_nf_type_SMF, + ogs_assert(true == + amf_sess_sbi_discover_and_send(OpenAPI_nf_type_SMF, sess, AMF_UPDATE_SM_CONTEXT_N1_RELEASED, ¶m, - amf_nsmf_pdusession_build_update_sm_context); + amf_nsmf_pdusession_build_update_sm_context)); if (gsm_header->message_type == OGS_NAS_5GS_PDU_SESSION_RELEASE_COMPLETE) { diff --git a/src/amf/gmm-sm.c b/src/amf/gmm-sm.c index 8beb3a8fac..52a8ddbf8a 100644 --- a/src/amf/gmm-sm.c +++ b/src/amf/gmm-sm.c @@ -207,9 +207,10 @@ static void common_register_state(ogs_fsm_t *s, amf_event_t *e) amf_sbi_send_release_all_sessions( amf_ue, AMF_RELEASE_SM_CONTEXT_NO_STATE); if (amf_sess_xact_count(amf_ue) == xact_count) { - amf_ue_sbi_discover_and_send( + ogs_assert(true == + amf_ue_sbi_discover_and_send( OpenAPI_nf_type_AUSF, amf_ue, NULL, - amf_nausf_auth_build_authenticate); + amf_nausf_auth_build_authenticate)); } OGS_FSM_TRAN(s, &gmm_state_authentication); @@ -278,8 +279,10 @@ static void common_register_state(ogs_fsm_t *s, amf_event_t *e) amf_sbi_send_release_all_sessions( amf_ue, AMF_RELEASE_SM_CONTEXT_NO_STATE); if (amf_sess_xact_count(amf_ue) == xact_count) { - amf_ue_sbi_discover_and_send(OpenAPI_nf_type_AUSF, amf_ue, NULL, - amf_nausf_auth_build_authenticate); + ogs_assert(true == + amf_ue_sbi_discover_and_send( + OpenAPI_nf_type_AUSF, amf_ue, NULL, + amf_nausf_auth_build_authenticate)); } OGS_FSM_TRAN(s, &gmm_state_authentication); @@ -345,8 +348,10 @@ static void common_register_state(ogs_fsm_t *s, amf_event_t *e) ogs_list_for_each(&amf_ue->sess_list, sess) { if (sess->paging.ongoing == true) { - amf_sbi_send_n1_n2_failure_notify( - sess, OpenAPI_n1_n2_message_transfer_cause_UE_NOT_RESPONDING); + ogs_assert(true == + amf_sbi_send_n1_n2_failure_notify( + sess, + OpenAPI_n1_n2_message_transfer_cause_UE_NOT_RESPONDING)); } } @@ -363,7 +368,7 @@ static void common_register_state(ogs_fsm_t *s, amf_event_t *e) } else { amf_ue->t3513.retry_count++; /* If t3513 is timeout, the saved pkbuf is used. */ - ngap_send_paging(amf_ue); + ogs_assert(OGS_OK == ngap_send_paging(amf_ue)); } break; @@ -488,8 +493,10 @@ void gmm_state_authentication(ogs_fsm_t *s, amf_event_t *e) case OGS_5GMM_CAUSE_NGKSI_ALREADY_IN_USE: ogs_warn("Authentication failure(ngKSI already in use)"); - amf_ue_sbi_discover_and_send(OpenAPI_nf_type_AUSF, amf_ue, NULL, - amf_nausf_auth_build_authenticate); + ogs_assert(true == + amf_ue_sbi_discover_and_send( + OpenAPI_nf_type_AUSF, amf_ue, NULL, + amf_nausf_auth_build_authenticate)); return; case OGS_5GMM_CAUSE_SYNCH_FAILURE: @@ -499,9 +506,10 @@ void gmm_state_authentication(ogs_fsm_t *s, amf_event_t *e) authentication_failure_parameter->length); break; } - amf_ue_sbi_discover_and_send(OpenAPI_nf_type_AUSF, amf_ue, + ogs_assert(true == + amf_ue_sbi_discover_and_send(OpenAPI_nf_type_AUSF, amf_ue, authentication_failure_parameter->auts, - amf_nausf_auth_build_authenticate); + amf_nausf_auth_build_authenticate)); return; default: @@ -528,8 +536,9 @@ void gmm_state_authentication(ogs_fsm_t *s, amf_event_t *e) break; } - amf_ue_sbi_discover_and_send(OpenAPI_nf_type_AUSF, amf_ue, NULL, - amf_nausf_auth_build_authenticate); + ogs_assert(true == + amf_ue_sbi_discover_and_send(OpenAPI_nf_type_AUSF, amf_ue, NULL, + amf_nausf_auth_build_authenticate)); break; case OGS_NAS_5GS_5GMM_STATUS: @@ -725,8 +734,9 @@ void gmm_state_security_mode(ogs_fsm_t *s, amf_event_t *e) ogs_kdf_nh_gnb(amf_ue->kamf, amf_ue->kgnb, amf_ue->nh); amf_ue->nhcc = 1; - amf_ue_sbi_discover_and_send(OpenAPI_nf_type_UDM, amf_ue, NULL, - amf_nudm_uecm_build_registration); + ogs_assert(true == + amf_ue_sbi_discover_and_send(OpenAPI_nf_type_UDM, amf_ue, NULL, + amf_nudm_uecm_build_registration)); if (amf_ue->nas.message_type == OGS_NAS_5GS_REGISTRATION_REQUEST) { OGS_FSM_TRAN(s, &gmm_state_initial_context_setup); @@ -756,8 +766,9 @@ void gmm_state_security_mode(ogs_fsm_t *s, amf_event_t *e) break; } - amf_ue_sbi_discover_and_send(OpenAPI_nf_type_AUSF, amf_ue, NULL, - amf_nausf_auth_build_authenticate); + ogs_assert(true == + amf_ue_sbi_discover_and_send(OpenAPI_nf_type_AUSF, amf_ue, NULL, + amf_nausf_auth_build_authenticate)); OGS_FSM_TRAN(s, &gmm_state_authentication); break; @@ -875,9 +886,11 @@ void gmm_state_initial_context_setup(ogs_fsm_t *s, amf_event_t *e) SWITCH(sbi_message->h.method) CASE(OGS_SBI_HTTP_METHOD_PUT) - amf_ue_sbi_discover_and_send(OpenAPI_nf_type_UDM, amf_ue, + ogs_assert(true == + amf_ue_sbi_discover_and_send( + OpenAPI_nf_type_UDM, amf_ue, (char *)OGS_SBI_RESOURCE_NAME_AM_DATA, - amf_nudm_sdm_build_get); + amf_nudm_sdm_build_get)); break; DEFAULT @@ -1029,8 +1042,10 @@ void gmm_state_initial_context_setup(ogs_fsm_t *s, amf_event_t *e) amf_sbi_send_release_all_sessions( amf_ue, AMF_RELEASE_SM_CONTEXT_NO_STATE); if (amf_sess_xact_count(amf_ue) == xact_count) { - amf_ue_sbi_discover_and_send(OpenAPI_nf_type_AUSF, amf_ue, NULL, - amf_nausf_auth_build_authenticate); + ogs_assert(true == + amf_ue_sbi_discover_and_send( + OpenAPI_nf_type_AUSF, amf_ue, NULL, + amf_nausf_auth_build_authenticate)); } OGS_FSM_TRAN(s, &gmm_state_authentication); break; @@ -1224,9 +1239,10 @@ void gmm_state_exception(ogs_fsm_t *s, amf_event_t *e) amf_sbi_send_release_all_sessions( amf_ue, AMF_RELEASE_SM_CONTEXT_NO_STATE); if (amf_sess_xact_count(amf_ue) == xact_count) { - amf_ue_sbi_discover_and_send( + ogs_assert(true == + amf_ue_sbi_discover_and_send( OpenAPI_nf_type_AUSF, amf_ue, NULL, - amf_nausf_auth_build_authenticate); + amf_nausf_auth_build_authenticate)); } OGS_FSM_TRAN(s, &gmm_state_authentication); diff --git a/src/amf/namf-handler.c b/src/amf/namf-handler.c index 4971c88497..aa8527e530 100644 --- a/src/amf/namf-handler.c +++ b/src/amf/namf-handler.c @@ -284,7 +284,7 @@ int amf_namf_comm_handle_n1_n2_message_transfer( AMF_SESS_STORE_N2_TRANSFER( sess, pdu_session_resource_setup_request, n2buf); - ngap_send_paging(amf_ue); + ogs_assert(OGS_OK == ngap_send_paging(amf_ue)); } else if (CM_CONNECTED(amf_ue)) { ogs_assert(OGS_OK == @@ -371,7 +371,7 @@ int amf_namf_comm_handle_n1_n2_message_transfer( response = ogs_sbi_build_response(&sendmsg, status); ogs_assert(response); - ogs_sbi_server_send_response(stream, response); + ogs_assert(true == ogs_sbi_server_send_response(stream, response)); if (sendmsg.http.location) ogs_free(sendmsg.http.location); @@ -474,7 +474,7 @@ cleanup: response = ogs_sbi_build_response(&sendmsg, status); ogs_assert(response); - ogs_sbi_server_send_response(stream, response); + ogs_assert(true == ogs_sbi_server_send_response(stream, response)); return OGS_OK; } diff --git a/src/amf/nas-path.c b/src/amf/nas-path.c index f7daa4b51f..fde2be0d7a 100644 --- a/src/amf/nas-path.c +++ b/src/amf/nas-path.c @@ -85,7 +85,7 @@ int nas_5gs_send_registration_accept(amf_ue_t *amf_ue) } amf_ue->t3550.pkbuf = ogs_pkbuf_copy(gmmbuf); - ogs_assert(amf_ue->t3550.pkbuf); + ogs_expect_or_return_val(amf_ue->t3550.pkbuf, OGS_ERROR); ogs_timer_start(amf_ue->t3550.timer, amf_timer_cfg(AMF_TIMER_T3550)->duration); } else { @@ -294,7 +294,7 @@ int nas_5gs_send_identity_request(amf_ue_t *amf_ue) } amf_ue->t3570.pkbuf = ogs_pkbuf_copy(gmmbuf); - ogs_assert(amf_ue->t3570.pkbuf); + ogs_expect_or_return_val(amf_ue->t3570.pkbuf, OGS_ERROR); ogs_timer_start(amf_ue->t3570.timer, amf_timer_cfg(AMF_TIMER_T3570)->duration); @@ -322,7 +322,7 @@ int nas_5gs_send_authentication_request(amf_ue_t *amf_ue) } amf_ue->t3560.pkbuf = ogs_pkbuf_copy(gmmbuf); - ogs_assert(amf_ue->t3560.pkbuf); + ogs_expect_or_return_val(amf_ue->t3560.pkbuf, OGS_ERROR); ogs_timer_start(amf_ue->t3560.timer, amf_timer_cfg(AMF_TIMER_T3560)->duration); @@ -368,7 +368,7 @@ int nas_5gs_send_security_mode_command(amf_ue_t *amf_ue) } amf_ue->t3560.pkbuf = ogs_pkbuf_copy(gmmbuf); - ogs_assert(amf_ue->t3560.pkbuf); + ogs_expect_or_return_val(amf_ue->t3560.pkbuf, OGS_ERROR); ogs_timer_start(amf_ue->t3560.timer, amf_timer_cfg(AMF_TIMER_T3560)->duration); @@ -393,7 +393,7 @@ int nas_5gs_send_configuration_update_command( ogs_expect_or_return_val(gmmbuf, OGS_ERROR); amf_ue->t3555.pkbuf = ogs_pkbuf_copy(gmmbuf); - ogs_assert(amf_ue->t3555.pkbuf); + ogs_expect_or_return_val(amf_ue->t3555.pkbuf, OGS_ERROR); ogs_timer_start(amf_ue->t3555.timer, amf_timer_cfg(AMF_TIMER_T3555)->duration); @@ -404,7 +404,7 @@ int nas_5gs_send_configuration_update_command( if (param->acknowledgement_requested) { amf_ue->t3555.pkbuf = ogs_pkbuf_copy(gmmbuf); - ogs_assert(amf_ue->t3555.pkbuf); + ogs_expect_or_return_val(amf_ue->t3555.pkbuf, OGS_ERROR); ogs_timer_start(amf_ue->t3555.timer, amf_timer_cfg(AMF_TIMER_T3555)->duration); } @@ -578,7 +578,7 @@ int nas_5gs_send_back_5gsm_message( ogs_assert(sess->payload_container); pbuf = ogs_pkbuf_copy(sess->payload_container); - ogs_assert(pbuf); + ogs_expect_or_return_val(pbuf, OGS_ERROR); rv = nas_5gs_send_gsm_reject(sess, sess->payload_container_type, pbuf, cause, AMF_NAS_BACKOFF_TIME); @@ -597,4 +597,4 @@ int nas_5gs_send_back_5gsm_message_from_sbi(amf_sess_t *sess, int status) ogs_expect(rv == OGS_OK); return rv; -} \ No newline at end of file +} diff --git a/src/amf/nausf-build.c b/src/amf/nausf-build.c index be90485bbb..1cc734b1d2 100644 --- a/src/amf/nausf-build.c +++ b/src/amf/nausf-build.c @@ -50,6 +50,7 @@ ogs_sbi_request_t *amf_nausf_auth_build_authenticate( AuthenticationInfo.supi_or_suci = amf_ue->suci; AuthenticationInfo.serving_network_name = ogs_serving_network_name_from_plmn_id(&amf_ue->nr_tai.plmn_id); + ogs_expect_or_return_val(AuthenticationInfo.serving_network_name, NULL); if (auts) { memset(&ResynchronizationInfo, 0, sizeof(ResynchronizationInfo)); @@ -67,7 +68,7 @@ ogs_sbi_request_t *amf_nausf_auth_build_authenticate( message.AuthenticationInfo = &AuthenticationInfo; request = ogs_sbi_build_request(&message); - ogs_assert(request); + ogs_expect(request); ogs_free(AuthenticationInfo.serving_network_name); @@ -92,7 +93,7 @@ ogs_sbi_request_t *amf_nausf_auth_build_authenticate_confirmation( message.h.uri = amf_ue->confirmation_url_for_5g_aka; ConfirmationData = ogs_calloc(1, sizeof(*ConfirmationData)); - ogs_assert(ConfirmationData); + ogs_expect_or_return_val(ConfirmationData, NULL); ogs_hex_to_ascii(amf_ue->xres_star, sizeof(amf_ue->xres_star), xres_star_string, sizeof(xres_star_string)); @@ -102,7 +103,7 @@ ogs_sbi_request_t *amf_nausf_auth_build_authenticate_confirmation( message.ConfirmationData = ConfirmationData; request = ogs_sbi_build_request(&message); - ogs_assert(request); + ogs_expect(request); ogs_free(ConfirmationData); diff --git a/src/amf/nausf-handler.c b/src/amf/nausf-handler.c index 98adc1d23a..012a225b70 100644 --- a/src/amf/nausf-handler.c +++ b/src/amf/nausf-handler.c @@ -95,6 +95,7 @@ int amf_nausf_auth_handle_authenticate( ogs_free(amf_ue->confirmation_url_for_5g_aka); amf_ue->confirmation_url_for_5g_aka = ogs_strdup(LinksValueSchemeValue->href); + ogs_assert(amf_ue->confirmation_url_for_5g_aka); ogs_ascii_to_hex(AV5G_AKA->rand, strlen(AV5G_AKA->rand), amf_ue->rand, sizeof(amf_ue->rand)); diff --git a/src/amf/nf-sm.c b/src/amf/nf-sm.c index 453f431199..5a02c12dd3 100644 --- a/src/amf/nf-sm.c +++ b/src/amf/nf-sm.c @@ -109,7 +109,7 @@ void amf_nf_state_will_register(ogs_fsm_t *s, amf_event_t *e) ogs_timer_start(nf_instance->t_registration_interval, ogs_app()->time.message.sbi.nf_register_interval); - amf_nnrf_nfm_send_nf_register(nf_instance); + ogs_assert(true == amf_nnrf_nfm_send_nf_register(nf_instance)); break; case OGS_FSM_EXIT_SIG: @@ -164,7 +164,7 @@ void amf_nf_state_will_register(ogs_fsm_t *s, amf_event_t *e) ogs_timer_start(nf_instance->t_registration_interval, ogs_app()->time.message.sbi.nf_register_interval); - amf_nnrf_nfm_send_nf_register(nf_instance); + ogs_assert(true == amf_nnrf_nfm_send_nf_register(nf_instance)); break; default: @@ -210,16 +210,21 @@ void amf_nf_state_registered(ogs_fsm_t *s, amf_event_t *e) ogs_app()->time.nf_instance.no_heartbeat_margin)); } - ogs_nnrf_nfm_send_nf_status_subscribe(client, - amf_self()->nf_type, nf_instance->id, OpenAPI_nf_type_AUSF); - ogs_nnrf_nfm_send_nf_status_subscribe(client, - amf_self()->nf_type, nf_instance->id, OpenAPI_nf_type_UDM); - ogs_nnrf_nfm_send_nf_status_subscribe(client, - amf_self()->nf_type, nf_instance->id, OpenAPI_nf_type_PCF); - ogs_nnrf_nfm_send_nf_status_subscribe(client, - amf_self()->nf_type, nf_instance->id, OpenAPI_nf_type_SMF); - ogs_nnrf_nfm_send_nf_status_subscribe(client, - amf_self()->nf_type, nf_instance->id, OpenAPI_nf_type_NSSF); + ogs_assert(true == + ogs_nnrf_nfm_send_nf_status_subscribe(client, + amf_self()->nf_type, nf_instance->id, OpenAPI_nf_type_AUSF)); + ogs_assert(true == + ogs_nnrf_nfm_send_nf_status_subscribe(client, + amf_self()->nf_type, nf_instance->id, OpenAPI_nf_type_UDM)); + ogs_assert(true == + ogs_nnrf_nfm_send_nf_status_subscribe(client, + amf_self()->nf_type, nf_instance->id, OpenAPI_nf_type_PCF)); + ogs_assert(true == + ogs_nnrf_nfm_send_nf_status_subscribe(client, + amf_self()->nf_type, nf_instance->id, OpenAPI_nf_type_SMF)); + ogs_assert(true == + ogs_nnrf_nfm_send_nf_status_subscribe(client, + amf_self()->nf_type, nf_instance->id, OpenAPI_nf_type_NSSF)); } break; @@ -234,7 +239,8 @@ void amf_nf_state_registered(ogs_fsm_t *s, amf_event_t *e) } if (!OGS_FSM_CHECK(&nf_instance->sm, amf_nf_state_exception)) { - ogs_nnrf_nfm_send_nf_de_register(nf_instance); + ogs_assert(true == + ogs_nnrf_nfm_send_nf_de_register(nf_instance)); } } break; @@ -284,7 +290,7 @@ void amf_nf_state_registered(ogs_fsm_t *s, amf_event_t *e) ogs_timer_start(nf_instance->t_heartbeat_interval, ogs_time_from_sec(nf_instance->time.heartbeat_interval)); - ogs_nnrf_nfm_send_nf_update(nf_instance); + ogs_assert(true == ogs_nnrf_nfm_send_nf_update(nf_instance)); break; case AMF_TIMER_NF_INSTANCE_NO_HEARTBEAT: diff --git a/src/amf/ngap-handler.c b/src/amf/ngap-handler.c index b05be017ec..dd1987d869 100644 --- a/src/amf/ngap-handler.c +++ b/src/amf/ngap-handler.c @@ -905,9 +905,10 @@ void ngap_handle_initial_context_setup_response( param.n2SmInfoType = OpenAPI_n2_sm_info_type_PDU_RES_SETUP_RSP; ogs_pkbuf_put_data(param.n2smbuf, transfer->buf, transfer->size); - amf_sess_sbi_discover_and_send(OpenAPI_nf_type_SMF, + ogs_assert(true == + amf_sess_sbi_discover_and_send(OpenAPI_nf_type_SMF, sess, AMF_UPDATE_SM_CONTEXT_ACTIVATED, ¶m, - amf_nsmf_pdusession_build_update_sm_context); + amf_nsmf_pdusession_build_update_sm_context)); ogs_pkbuf_free(param.n2smbuf); } @@ -1546,9 +1547,10 @@ void ngap_handle_pdu_session_resource_setup_response( param.n2SmInfoType = OpenAPI_n2_sm_info_type_PDU_RES_SETUP_RSP; ogs_pkbuf_put_data(param.n2smbuf, transfer->buf, transfer->size); - amf_sess_sbi_discover_and_send(OpenAPI_nf_type_SMF, + ogs_assert(true == + amf_sess_sbi_discover_and_send(OpenAPI_nf_type_SMF, sess, AMF_UPDATE_SM_CONTEXT_ACTIVATED, ¶m, - amf_nsmf_pdusession_build_update_sm_context); + amf_nsmf_pdusession_build_update_sm_context)); ogs_pkbuf_free(param.n2smbuf); } @@ -1719,9 +1721,10 @@ void ngap_handle_pdu_session_resource_modify_response( param.n2SmInfoType = OpenAPI_n2_sm_info_type_PDU_RES_MOD_RSP; ogs_pkbuf_put_data(param.n2smbuf, transfer->buf, transfer->size); - amf_sess_sbi_discover_and_send(OpenAPI_nf_type_SMF, + ogs_assert(true == + amf_sess_sbi_discover_and_send(OpenAPI_nf_type_SMF, sess, AMF_UPDATE_SM_CONTEXT_MODIFIED, ¶m, - amf_nsmf_pdusession_build_update_sm_context); + amf_nsmf_pdusession_build_update_sm_context)); ogs_pkbuf_free(param.n2smbuf); } @@ -1893,9 +1896,10 @@ void ngap_handle_pdu_session_resource_release_response( param.n2SmInfoType = OpenAPI_n2_sm_info_type_PDU_RES_REL_RSP; ogs_pkbuf_put_data(param.n2smbuf, transfer->buf, transfer->size); - amf_sess_sbi_discover_and_send(OpenAPI_nf_type_SMF, + ogs_assert(true == + amf_sess_sbi_discover_and_send(OpenAPI_nf_type_SMF, sess, AMF_UPDATE_SM_CONTEXT_N2_RELEASED, ¶m, - amf_nsmf_pdusession_build_update_sm_context); + amf_nsmf_pdusession_build_update_sm_context)); ogs_pkbuf_free(param.n2smbuf); } @@ -2314,9 +2318,10 @@ void ngap_handle_path_switch_request( param.n2SmInfoType = OpenAPI_n2_sm_info_type_PATH_SWITCH_REQ; ogs_pkbuf_put_data(param.n2smbuf, transfer->buf, transfer->size); - amf_sess_sbi_discover_and_send(OpenAPI_nf_type_SMF, + ogs_assert(true == + amf_sess_sbi_discover_and_send(OpenAPI_nf_type_SMF, sess, AMF_UPDATE_SM_CONTEXT_PATH_SWITCH_REQUEST, ¶m, - amf_nsmf_pdusession_build_update_sm_context); + amf_nsmf_pdusession_build_update_sm_context)); ogs_pkbuf_free(param.n2smbuf); } @@ -2629,9 +2634,10 @@ void ngap_handle_handover_required( param.hoState = OpenAPI_ho_state_PREPARING; param.TargetID = TargetID; - amf_sess_sbi_discover_and_send(OpenAPI_nf_type_SMF, + ogs_assert(true == + amf_sess_sbi_discover_and_send(OpenAPI_nf_type_SMF, sess, AMF_UPDATE_SM_CONTEXT_HANDOVER_REQUIRED, ¶m, - amf_nsmf_pdusession_build_update_sm_context); + amf_nsmf_pdusession_build_update_sm_context)); ogs_pkbuf_free(param.n2smbuf); } @@ -2852,9 +2858,10 @@ void ngap_handle_handover_request_ack( param.hoState = OpenAPI_ho_state_PREPARED; - amf_sess_sbi_discover_and_send(OpenAPI_nf_type_SMF, + ogs_assert(true == + amf_sess_sbi_discover_and_send(OpenAPI_nf_type_SMF, sess, AMF_UPDATE_SM_CONTEXT_HANDOVER_REQ_ACK, ¶m, - amf_nsmf_pdusession_build_update_sm_context); + amf_nsmf_pdusession_build_update_sm_context)); ogs_pkbuf_free(param.n2smbuf); } @@ -3096,9 +3103,10 @@ void ngap_handle_handover_cancel( param.ngApCause.group = Cause->present; param.ngApCause.value = (int)Cause->choice.radioNetwork; - amf_sess_sbi_discover_and_send(OpenAPI_nf_type_SMF, + ogs_assert(true == + amf_sess_sbi_discover_and_send(OpenAPI_nf_type_SMF, sess, AMF_UPDATE_SM_CONTEXT_HANDOVER_CANCEL, ¶m, - amf_nsmf_pdusession_build_update_sm_context); + amf_nsmf_pdusession_build_update_sm_context)); } } @@ -3375,9 +3383,10 @@ void ngap_handle_handover_notification( memset(¶m, 0, sizeof(param)); param.hoState = OpenAPI_ho_state_COMPLETED; - amf_sess_sbi_discover_and_send(OpenAPI_nf_type_SMF, + ogs_assert(true == + amf_sess_sbi_discover_and_send(OpenAPI_nf_type_SMF, sess, AMF_UPDATE_SM_CONTEXT_HANDOVER_NOTIFY, ¶m, - amf_nsmf_pdusession_build_update_sm_context); + amf_nsmf_pdusession_build_update_sm_context)); } } diff --git a/src/amf/ngap-path.c b/src/amf/ngap-path.c index dc3bb4a662..cfc2fcac21 100644 --- a/src/amf/ngap-path.c +++ b/src/amf/ngap-path.c @@ -352,7 +352,7 @@ int ngap_send_amf_ue_context_release_command( return OGS_OK; } -void ngap_send_paging(amf_ue_t *amf_ue) +int ngap_send_paging(amf_ue_t *amf_ue) { ogs_pkbuf_t *ngapbuf = NULL; amf_gnb_t *gnb = NULL; @@ -370,14 +370,14 @@ void ngap_send_paging(amf_ue_t *amf_ue) ngapbuf = amf_ue->t3513.pkbuf; } else { ngapbuf = ngap_build_paging(amf_ue); - ogs_expect_or_return(ngapbuf); + ogs_expect_or_return_val(ngapbuf, OGS_ERROR); } amf_ue->t3513.pkbuf = ogs_pkbuf_copy(ngapbuf); - ogs_assert(amf_ue->t3513.pkbuf); + ogs_expect_or_return_val(amf_ue->t3513.pkbuf, OGS_ERROR); rv = ngap_send_to_gnb(gnb, ngapbuf, amf_ue->gnb_ostream_id); - ogs_expect(rv == OGS_OK); + ogs_expect_or_return_val(rv == OGS_OK, rv); } } } @@ -386,6 +386,8 @@ void ngap_send_paging(amf_ue_t *amf_ue) /* Start T3513 */ ogs_timer_start(amf_ue->t3513.timer, amf_timer_cfg(AMF_TIMER_T3513)->duration); + + return OGS_OK; } int ngap_send_pdu_resource_setup_request( diff --git a/src/amf/ngap-path.h b/src/amf/ngap-path.h index ba9d532e93..c752fbbb31 100644 --- a/src/amf/ngap-path.h +++ b/src/amf/ngap-path.h @@ -61,7 +61,7 @@ int ngap_send_amf_ue_context_release_command( amf_ue_t *amf_ue, NGAP_Cause_PR group, long cause, uint8_t action, ogs_time_t delay); -void ngap_send_paging(amf_ue_t *amf_ue); +int ngap_send_paging(amf_ue_t *amf_ue); int ngap_send_pdu_resource_setup_request( amf_sess_t *sess, ogs_pkbuf_t *n2smbuf); @@ -95,4 +95,4 @@ int ngap_send_ng_reset_ack( } #endif -#endif /* NGAP_PATH_H */ \ No newline at end of file +#endif /* NGAP_PATH_H */ diff --git a/src/amf/nnrf-build.c b/src/amf/nnrf-build.c index 3828ea05d7..e42a9fbd8a 100644 --- a/src/amf/nnrf-build.c +++ b/src/amf/nnrf-build.c @@ -43,7 +43,7 @@ ogs_sbi_request_t *amf_nnrf_nfm_build_register( message.http.content_encoding = (char*)ogs_sbi_self()->content_encoding; NFProfile = ogs_nnrf_nfm_build_nf_profile(nf_instance); - ogs_assert(NFProfile); + ogs_expect_or_return_val(NFProfile, NULL); message.NFProfile = NFProfile; diff --git a/src/amf/nnrf-handler.c b/src/amf/nnrf-handler.c index b7f73f8ee0..aa8102501d 100644 --- a/src/amf/nnrf-handler.c +++ b/src/amf/nnrf-handler.c @@ -113,15 +113,17 @@ bool amf_nnrf_handle_nf_status_notify( NotificationData = recvmsg->NotificationData; if (!NotificationData) { ogs_error("No NotificationData"); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "No NotificationData", NULL); + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + recvmsg, "No NotificationData", NULL)); return false; } if (!NotificationData->nf_instance_uri) { ogs_error("No nfInstanceUri"); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "No nfInstanceUri", NULL); + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + recvmsg, "No nfInstanceUri", NULL)); return false; } @@ -131,15 +133,17 @@ bool amf_nnrf_handle_nf_status_notify( rv = ogs_sbi_parse_header(&message, &header); if (rv != OGS_OK) { ogs_error("Cannot parse nfInstanceUri [%s]", header.uri); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "Cannot parse nfInstanceUri", header.uri); + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + recvmsg, "Cannot parse nfInstanceUri", header.uri)); return false; } if (!message.h.resource.component[1]) { ogs_error("No nfInstanceId [%s]", header.uri); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "Cannot parse nfInstanceUri", header.uri); + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + recvmsg, "Cannot parse nfInstanceUri", header.uri)); ogs_sbi_header_free(&header); return false; } @@ -147,9 +151,10 @@ bool amf_nnrf_handle_nf_status_notify( if (NF_INSTANCE_IS_SELF(message.h.resource.component[1])) { ogs_warn("[%s] The notification is not allowed", message.h.resource.component[1]); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_FORBIDDEN, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_FORBIDDEN, recvmsg, "The notification is not allowed", - message.h.resource.component[1]); + message.h.resource.component[1])); ogs_sbi_header_free(&header); return false; } @@ -162,8 +167,10 @@ bool amf_nnrf_handle_nf_status_notify( NFProfile = NotificationData->nf_profile; if (!NFProfile) { ogs_error("No NFProfile"); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "No NFProfile", NULL); + ogs_assert(true == + ogs_sbi_server_send_error( + stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + recvmsg, "No NFProfile", NULL)); ogs_sbi_header_free(&header); return false; } @@ -200,9 +207,10 @@ bool amf_nnrf_handle_nf_status_notify( handled = ogs_sbi_client_associate(nf_instance); if (!handled) { ogs_error("[%s] Cannot associate NF EndPoint", nf_instance->id); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "Cannot find NF EndPoint", nf_instance->id); + recvmsg, "Cannot find NF EndPoint", nf_instance->id)); AMF_NF_INSTANCE_CLEAR("NRF-notify", nf_instance); ogs_sbi_header_free(&header); return false; @@ -216,9 +224,10 @@ bool amf_nnrf_handle_nf_status_notify( } else { ogs_warn("[%s] (NRF-notify) Not found", message.h.resource.component[1]); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_NOT_FOUND, - recvmsg, "Not found", message.h.resource.component[1]); + recvmsg, "Not found", message.h.resource.component[1])); ogs_sbi_header_free(&header); return false; } @@ -227,16 +236,17 @@ bool amf_nnrf_handle_nf_status_notify( NotificationData->event); ogs_error("Not supported event [%d:%s]", NotificationData->event, eventstr ? eventstr : "Unknown"); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, recvmsg, "Not supported event", - eventstr ? eventstr : "Unknown"); + eventstr ? eventstr : "Unknown")); ogs_sbi_header_free(&header); return false; } response = ogs_sbi_build_response(recvmsg, OGS_SBI_HTTP_STATUS_NO_CONTENT); ogs_assert(response); - ogs_sbi_server_send_response(stream, response); + ogs_assert(true == ogs_sbi_server_send_response(stream, response)); ogs_sbi_header_free(&header); return true; @@ -303,7 +313,7 @@ void amf_nnrf_handle_nf_discover( ogs_assert_if_reached(); } } else { - amf_sbi_send(nf_instance, xact); + ogs_assert(true == amf_sbi_send(nf_instance, xact)); } } diff --git a/src/amf/nnssf-handler.c b/src/amf/nnssf-handler.c index 6e42281332..10333b2fd3 100644 --- a/src/amf/nnssf-handler.c +++ b/src/amf/nnssf-handler.c @@ -76,6 +76,7 @@ int amf_nnssf_nsselection_handle_get( if (sess->nssf.nrf.id) ogs_free(sess->nssf.nrf.id); sess->nssf.nrf.id = ogs_strdup(NsiInformation->nrf_id); + ogs_assert(sess->nssf.nrf.id); addr = ogs_sbi_getaddr_from_uri(NsiInformation->nrf_id); if (!addr) { @@ -105,9 +106,10 @@ int amf_nnssf_nsselection_handle_get( if (sess->nssf.nsi_id) ogs_free(sess->nssf.nsi_id); sess->nssf.nsi_id = ogs_strdup(NsiInformation->nsi_id); + ogs_assert(sess->nssf.nsi_id); } - amf_sess_sbi_discover_by_nsi(OpenAPI_nf_type_SMF, sess); + ogs_assert(true == amf_sess_sbi_discover_by_nsi(OpenAPI_nf_type_SMF, sess)); return OGS_OK; } diff --git a/src/amf/npcf-build.c b/src/amf/npcf-build.c index 0a83953036..96de0f03c8 100644 --- a/src/amf/npcf-build.c +++ b/src/amf/npcf-build.c @@ -49,7 +49,7 @@ ogs_sbi_request_t *amf_npcf_am_policy_control_build_create( memset(&PolicyAssociationRequest, 0, sizeof(PolicyAssociationRequest)); server = ogs_list_first(&ogs_sbi_self()->server_list); - ogs_assert(server); + ogs_expect_or_return_val(server, NULL); memset(&header, 0, sizeof(header)); header.service.name = (char *)OGS_SBI_SERVICE_NAME_NAMF_CALLBACK; @@ -59,7 +59,7 @@ ogs_sbi_request_t *amf_npcf_am_policy_control_build_create( (char *)OGS_SBI_RESOURCE_NAME_AM_POLICY_NOTIFY; PolicyAssociationRequest.notification_uri = ogs_sbi_server_uri(server, &header); - ogs_assert(PolicyAssociationRequest.notification_uri); + ogs_expect_or_return_val(PolicyAssociationRequest.notification_uri, NULL); PolicyAssociationRequest.supi = amf_ue->supi; @@ -67,6 +67,7 @@ ogs_sbi_request_t *amf_npcf_am_policy_control_build_create( if (amf_ue->msisdn[0]) { PolicyAssociationRequest.gpsi = ogs_msprintf("%s-%s", OGS_ID_GPSI_TYPE_MSISDN, amf_ue->msisdn[0]); + ogs_assert(PolicyAssociationRequest.gpsi); } } @@ -76,16 +77,20 @@ ogs_sbi_request_t *amf_npcf_am_policy_control_build_create( memset(&ueLocation, 0, sizeof(ueLocation)); ueLocation.nr_location = ogs_sbi_build_nr_location( &amf_ue->nr_tai, &amf_ue->nr_cgi); - ogs_assert(ueLocation.nr_location); + ogs_expect_or_return_val(ueLocation.nr_location, NULL); ueLocation.nr_location->ue_location_timestamp = ogs_sbi_gmtime_string(amf_ue->ue_location_timestamp); + ogs_expect_or_return_val( + ueLocation.nr_location->ue_location_timestamp, NULL); PolicyAssociationRequest.user_loc = &ueLocation; PolicyAssociationRequest.time_zone = ogs_sbi_timezone_string(ogs_timezone()); + ogs_expect_or_return_val(PolicyAssociationRequest.time_zone, NULL); PolicyAssociationRequest.serving_plmn = ogs_sbi_build_plmn_id_nid(&amf_ue->nr_tai.plmn_id); + ogs_expect_or_return_val(PolicyAssociationRequest.serving_plmn, NULL); PolicyAssociationRequest.rat_type = amf_ue_rat_type(amf_ue); @@ -110,7 +115,7 @@ ogs_sbi_request_t *amf_npcf_am_policy_control_build_create( for (i = 0; i < amf_ue->allowed_nssai.num_of_s_nssai; i++) { struct OpenAPI_snssai_s *Snssai = ogs_calloc(1, sizeof(*Snssai)); - ogs_assert(Snssai); + ogs_expect_or_return_val(Snssai, NULL); Snssai->sst = amf_ue->allowed_nssai.s_nssai[i].sst; Snssai->sd = ogs_s_nssai_sd_to_string( @@ -125,18 +130,19 @@ ogs_sbi_request_t *amf_npcf_am_policy_control_build_create( OpenAPI_list_free(AllowedSnssais); PolicyAssociationRequest.guami = ogs_sbi_build_guami(amf_ue->guami); + ogs_expect_or_return_val(PolicyAssociationRequest.guami, NULL); PolicyAssociationRequest.service_name = (char *)OGS_SBI_SERVICE_NAME_NAMF_CALLBACK; PolicyAssociationRequest.supp_feat = ogs_uint64_to_string(amf_ue->am_policy_control_features); - ogs_assert(PolicyAssociationRequest.supp_feat); + ogs_expect_or_return_val(PolicyAssociationRequest.supp_feat, NULL); message.PolicyAssociationRequest = &PolicyAssociationRequest; request = ogs_sbi_build_request(&message); - ogs_assert(request); + ogs_expect(request); ogs_free(PolicyAssociationRequest.notification_uri); ogs_free(PolicyAssociationRequest.supp_feat); diff --git a/src/amf/npcf-handler.c b/src/amf/npcf-handler.c index ef64c2238b..da633ec137 100644 --- a/src/amf/npcf-handler.c +++ b/src/amf/npcf-handler.c @@ -99,6 +99,7 @@ int amf_npcf_am_policy_control_handle_create( if (amf_ue->policy_association_id) ogs_free(amf_ue->policy_association_id); amf_ue->policy_association_id = ogs_strdup(message.h.resource.component[1]); + ogs_assert(amf_ue->policy_association_id); OpenAPI_list_for_each(PolicyAssociation->triggers, node) { if (node->data) { diff --git a/src/amf/nsmf-build.c b/src/amf/nsmf-build.c index bfdd56d865..e2106b448b 100644 --- a/src/amf/nsmf-build.c +++ b/src/amf/nsmf-build.c @@ -55,6 +55,7 @@ ogs_sbi_request_t *amf_nsmf_pdusession_build_create_sm_context( SmContextCreateData.serving_network = ogs_sbi_build_plmn_id_nid(&amf_ue->nr_tai.plmn_id); + ogs_expect_or_return_val(SmContextCreateData.serving_network, NULL); SmContextCreateData.supi = amf_ue->supi; SmContextCreateData.pei = amf_ue->pei; @@ -62,10 +63,11 @@ ogs_sbi_request_t *amf_nsmf_pdusession_build_create_sm_context( if (amf_ue->msisdn[0]) { SmContextCreateData.gpsi = ogs_msprintf("%s-%s", OGS_ID_GPSI_TYPE_MSISDN, amf_ue->msisdn[0]); + ogs_expect_or_return_val(SmContextCreateData.gpsi, NULL); } } SmContextCreateData.pdu_session_id = sess->psi; - ogs_assert(sess->dnn); + ogs_expect_or_return_val(sess->dnn, NULL); SmContextCreateData.dnn = sess->dnn; memset(&sNssai, 0, sizeof(sNssai)); @@ -76,12 +78,12 @@ ogs_sbi_request_t *amf_nsmf_pdusession_build_create_sm_context( memset(&hplmnSnssai, 0, sizeof(hplmnSnssai)); if (sess->mapped_hplmn.sst) { hplmnSnssai.sst = sess->mapped_hplmn.sst; - hplmnSnssai.sd = ogs_s_nssai_sd_to_string( - sess->mapped_hplmn.sd); + hplmnSnssai.sd = ogs_s_nssai_sd_to_string(sess->mapped_hplmn.sd); SmContextCreateData.hplmn_snssai = &hplmnSnssai; } SmContextCreateData.guami = ogs_sbi_build_guami(amf_ue->guami); + ogs_expect_or_return_val(SmContextCreateData.guami, NULL); SmContextCreateData.an_type = amf_ue->nas.access_type; memset(&header, 0, sizeof(header)); @@ -91,9 +93,10 @@ ogs_sbi_request_t *amf_nsmf_pdusession_build_create_sm_context( header.resource.component[1] = (char *)OGS_SBI_RESOURCE_NAME_SM_CONTEXT_STATUS; header.resource.component[2] = ogs_msprintf("%d", sess->psi); + ogs_expect_or_return_val(header.resource.component[2], NULL); server = ogs_list_first(&ogs_sbi_self()->server_list); - ogs_assert(server); + ogs_expect_or_return_val(server, NULL); SmContextCreateData.sm_context_status_uri = ogs_sbi_server_uri(server, &header); @@ -105,15 +108,18 @@ ogs_sbi_request_t *amf_nsmf_pdusession_build_create_sm_context( memset(&ueLocation, 0, sizeof(ueLocation)); ueLocation.nr_location = ogs_sbi_build_nr_location( &amf_ue->nr_tai, &amf_ue->nr_cgi); - ogs_assert(ueLocation.nr_location); + ogs_expect_or_return_val(ueLocation.nr_location, NULL); ueLocation.nr_location->ue_location_timestamp = ogs_sbi_gmtime_string(amf_ue->ue_location_timestamp); + ogs_expect_or_return_val( + ueLocation.nr_location->ue_location_timestamp, NULL); SmContextCreateData.ue_location = &ueLocation; SmContextCreateData.ue_time_zone = ogs_sbi_timezone_string(ogs_timezone()); + ogs_expect_or_return_val(SmContextCreateData.ue_time_zone, NULL); pcf_nf_instance = OGS_SBI_NF_INSTANCE(&amf_ue->sbi, OpenAPI_nf_type_PCF); - ogs_assert(pcf_nf_instance); + ogs_expect_or_return_val(pcf_nf_instance, NULL); SmContextCreateData.pcf_id = pcf_nf_instance->id; message.SmContextCreateData = &SmContextCreateData; @@ -131,7 +137,7 @@ ogs_sbi_request_t *amf_nsmf_pdusession_build_create_sm_context( OGS_SBI_CONTENT_NGAP_TYPE "," OGS_SBI_CONTENT_PROBLEM_TYPE); request = ogs_sbi_build_request(&message); - ogs_assert(request); + ogs_expect(request); if (SmContextCreateData.serving_network) ogs_sbi_free_plmn_id_nid(SmContextCreateData.serving_network); @@ -204,7 +210,7 @@ ogs_sbi_request_t *amf_nsmf_pdusession_build_update_sm_context( } if (param->n2smbuf) { - ogs_assert(param->n2SmInfoType); + ogs_expect_or_return_val(param->n2SmInfoType, NULL); SmContextUpdateData.n2_sm_info_type = param->n2SmInfoType; SmContextUpdateData.n2_sm_info = &n2SmInfo; @@ -226,7 +232,7 @@ ogs_sbi_request_t *amf_nsmf_pdusession_build_update_sm_context( if (param->TargetID) { SmContextUpdateData.target_id = amf_nsmf_pdusession_build_target_id(param->TargetID); - ogs_assert(SmContextUpdateData.target_id); + ogs_expect_or_return_val(SmContextUpdateData.target_id, NULL); } if (param->ngApCause.group) { @@ -240,22 +246,25 @@ ogs_sbi_request_t *amf_nsmf_pdusession_build_update_sm_context( if (param->ue_location) { ueLocation.nr_location = ogs_sbi_build_nr_location( &amf_ue->nr_tai, &amf_ue->nr_cgi); - ogs_assert(ueLocation.nr_location); + ogs_expect_or_return_val(ueLocation.nr_location, NULL); ueLocation.nr_location->ue_location_timestamp = ogs_sbi_gmtime_string(amf_ue->ue_location_timestamp); + ogs_expect_or_return_val( + ueLocation.nr_location->ue_location_timestamp, NULL); SmContextUpdateData.ue_location = &ueLocation; } if (param->ue_timezone) { SmContextUpdateData.ue_time_zone = ogs_sbi_timezone_string(ogs_timezone()); + ogs_expect_or_return_val(SmContextUpdateData.ue_time_zone, NULL); } SmContextUpdateData.release = param->release; SmContextUpdateData.cause = param->cause; request = ogs_sbi_build_request(&message); - ogs_assert(request); + ogs_expect(request); if (ueLocation.nr_location) { if (ueLocation.nr_location->ue_location_timestamp) @@ -317,17 +326,20 @@ ogs_sbi_request_t *amf_nsmf_pdusession_build_release_sm_context( memset(&ueLocation, 0, sizeof(ueLocation)); ueLocation.nr_location = ogs_sbi_build_nr_location( &amf_ue->nr_tai, &amf_ue->nr_cgi); - ogs_assert(ueLocation.nr_location); + ogs_expect_or_return_val(ueLocation.nr_location, NULL); ueLocation.nr_location->ue_location_timestamp = ogs_sbi_gmtime_string(amf_ue->ue_location_timestamp); + ogs_expect_or_return_val( + ueLocation.nr_location->ue_location_timestamp, NULL); SmContextReleaseData.ue_location = &ueLocation; SmContextReleaseData.ue_time_zone = ogs_sbi_timezone_string(ogs_timezone()); + ogs_expect_or_return_val(SmContextReleaseData.ue_time_zone, NULL); message.SmContextReleaseData = &SmContextReleaseData; request = ogs_sbi_build_request(&message); - ogs_assert(request); + ogs_expect(request); if (ueLocation.nr_location) { if (ueLocation.nr_location->ue_location_timestamp) @@ -380,7 +392,7 @@ ogs_sbi_request_t *amf_nsmf_callback_build_n1_n2_failure_notify( message.N1N2MsgTxfrFailureNotification = &N1N2MsgTxfrFailureNotification; request = ogs_sbi_build_request(&message); - ogs_assert(request); + ogs_expect(request); return request; } @@ -426,21 +438,21 @@ OpenAPI_ng_ran_target_id_t *amf_nsmf_pdusession_build_target_id( } targetId = ogs_calloc(1, sizeof(*targetId)); - ogs_assert(targetId); + ogs_expect_or_return_val(targetId, NULL); targetId->ran_node_id = ranNodeId = ogs_calloc(1, sizeof(*ranNodeId));; - ogs_assert(ranNodeId); + ogs_expect_or_return_val(ranNodeId, NULL); memcpy(&plmn_id, globalGNB_ID->pLMNIdentity.buf, OGS_PLMN_ID_LEN); ranNodeId->plmn_id = ogs_sbi_build_plmn_id(&plmn_id); - ogs_assert(ranNodeId->plmn_id); + ogs_expect_or_return_val(ranNodeId->plmn_id, NULL); ranNodeId->g_nb_id = gNbId = ogs_calloc(1, sizeof(*gNbId)); - ogs_assert(gNbId); + ogs_expect_or_return_val(gNbId, NULL); gNbId->g_nb_value = ogs_calloc( 1, OGS_KEYSTRLEN(globalGNB_ID->gNB_ID.choice.gNB_ID.size)); - ogs_assert(gNbId->g_nb_value); + ogs_expect_or_return_val(gNbId->g_nb_value, NULL); ogs_hex_to_ascii( globalGNB_ID->gNB_ID.choice.gNB_ID.buf, globalGNB_ID->gNB_ID.choice.gNB_ID.size, @@ -449,13 +461,13 @@ OpenAPI_ng_ran_target_id_t *amf_nsmf_pdusession_build_target_id( gNbId->bit_length = 32 - globalGNB_ID->gNB_ID.choice.gNB_ID.bits_unused; targetId->tai = tai = ogs_calloc(1, sizeof(*tai));; - ogs_assert(tai); + ogs_expect_or_return_val(tai, NULL); ogs_ngap_ASN_to_5gs_tai(&targetRANNodeID->selectedTAI, &nr_tai); tai->plmn_id = ogs_sbi_build_plmn_id(&nr_tai.plmn_id); - ogs_assert(tai->plmn_id); + ogs_expect_or_return_val(tai->plmn_id, NULL); tai->tac = ogs_uint24_to_0string(nr_tai.tac); - ogs_assert(tai->tac); + ogs_expect_or_return_val(tai->tac, NULL); return targetId; } diff --git a/src/amf/nsmf-handler.c b/src/amf/nsmf-handler.c index 827210013a..61a62a6f87 100644 --- a/src/amf/nsmf-handler.c +++ b/src/amf/nsmf-handler.c @@ -100,6 +100,7 @@ int amf_nsmf_pdusession_handle_create_sm_context( if (sess->sm_context_ref) ogs_free(sess->sm_context_ref); sess->sm_context_ref = ogs_strdup(message.h.resource.component[1]); + ogs_assert(sess->sm_context_ref); ogs_sbi_header_free(&header); @@ -714,9 +715,10 @@ int amf_nsmf_pdusession_handle_release_sm_context(amf_sess_t *sess, int state) if (OGS_FSM_CHECK(&amf_ue->sm, gmm_state_authentication)) { - amf_ue_sbi_discover_and_send( + ogs_assert(true == + amf_ue_sbi_discover_and_send( OpenAPI_nf_type_AUSF, amf_ue, NULL, - amf_nausf_auth_build_authenticate); + amf_nausf_auth_build_authenticate)); } else if (OGS_FSM_CHECK(&amf_ue->sm, gmm_state_de_registered)) { diff --git a/src/amf/nudm-handler.c b/src/amf/nudm-handler.c index 19dd59976c..91ad410331 100644 --- a/src/amf/nudm-handler.c +++ b/src/amf/nudm-handler.c @@ -163,9 +163,10 @@ int amf_nudm_sdm_handle_provisioned( return OGS_ERROR; } - amf_ue_sbi_discover_and_send(OpenAPI_nf_type_UDM, amf_ue, - (char *)OGS_SBI_RESOURCE_NAME_SMF_SELECT_DATA, - amf_nudm_sdm_build_get); + ogs_assert(true == + amf_ue_sbi_discover_and_send(OpenAPI_nf_type_UDM, amf_ue, + (char *)OGS_SBI_RESOURCE_NAME_SMF_SELECT_DATA, + amf_nudm_sdm_build_get)); break; CASE(OGS_SBI_RESOURCE_NAME_SMF_SELECT_DATA) @@ -231,14 +232,16 @@ int amf_nudm_sdm_handle_provisioned( } } } - amf_ue_sbi_discover_and_send(OpenAPI_nf_type_UDM, amf_ue, - (char *)OGS_SBI_RESOURCE_NAME_UE_CONTEXT_IN_SMF_DATA, - amf_nudm_sdm_build_get); + ogs_assert(true == + amf_ue_sbi_discover_and_send(OpenAPI_nf_type_UDM, amf_ue, + (char *)OGS_SBI_RESOURCE_NAME_UE_CONTEXT_IN_SMF_DATA, + amf_nudm_sdm_build_get)); break; CASE(OGS_SBI_RESOURCE_NAME_UE_CONTEXT_IN_SMF_DATA) - amf_ue_sbi_discover_and_send(OpenAPI_nf_type_PCF, amf_ue, - NULL, amf_npcf_am_policy_control_build_create); + ogs_assert(true == + amf_ue_sbi_discover_and_send(OpenAPI_nf_type_PCF, amf_ue, + NULL, amf_npcf_am_policy_control_build_create)); break; DEFAULT diff --git a/src/amf/sbi-path.c b/src/amf/sbi-path.c index 919caba6e3..c627ca4790 100644 --- a/src/amf/sbi-path.c +++ b/src/amf/sbi-path.c @@ -114,7 +114,7 @@ void amf_sbi_close(void) ogs_sbi_server_stop_all(); } -void amf_nnrf_nfm_send_nf_register(ogs_sbi_nf_instance_t *nf_instance) +bool amf_nnrf_nfm_send_nf_register(ogs_sbi_nf_instance_t *nf_instance) { ogs_sbi_request_t *request = NULL; ogs_sbi_client_t *client = NULL; @@ -124,19 +124,18 @@ void amf_nnrf_nfm_send_nf_register(ogs_sbi_nf_instance_t *nf_instance) ogs_assert(client); request = amf_nnrf_nfm_build_register(nf_instance); - if (!request) { - ogs_error("ogs_nnrf_nfm_send_nf_register() failed"); - return; - } - ogs_sbi_client_send_request(client, client->cb, request, nf_instance); + ogs_expect_or_return_val(request, false); + + return ogs_sbi_client_send_request( + client, client->cb, request, nf_instance); } -void amf_sbi_send(ogs_sbi_nf_instance_t *nf_instance, ogs_sbi_xact_t *xact) +bool amf_sbi_send(ogs_sbi_nf_instance_t *nf_instance, ogs_sbi_xact_t *xact) { - ogs_sbi_send(nf_instance, client_cb, xact); + return ogs_sbi_send(nf_instance, client_cb, xact); } -void amf_ue_sbi_discover_and_send( +bool amf_ue_sbi_discover_and_send( OpenAPI_nf_type_e target_nf_type, amf_ue_t *amf_ue, void *data, ogs_sbi_request_t *(*build)(amf_ue_t *amf_ue, void *data)) { @@ -154,20 +153,23 @@ void amf_ue_sbi_discover_and_send( ogs_assert(OGS_OK == nas_5gs_send_gmm_reject_from_sbi( amf_ue, OGS_SBI_HTTP_STATUS_GATEWAY_TIMEOUT)); - return; + return false; } if (ogs_sbi_discover_and_send(xact, (ogs_fsm_handler_t)amf_nf_state_registered, client_cb) != true) { ogs_error("amf_ue_sbi_discover_and_send() failed"); + ogs_sbi_xact_remove(xact); ogs_assert(OGS_OK == nas_5gs_send_gmm_reject_from_sbi( amf_ue, OGS_SBI_HTTP_STATUS_GATEWAY_TIMEOUT)); - return; + return false; } + + return true; } -void amf_sess_sbi_discover_and_send(OpenAPI_nf_type_e target_nf_type, +bool amf_sess_sbi_discover_and_send(OpenAPI_nf_type_e target_nf_type, amf_sess_t *sess, int state, void *data, ogs_sbi_request_t *(*build)(amf_sess_t *sess, void *data)) { @@ -185,7 +187,7 @@ void amf_sess_sbi_discover_and_send(OpenAPI_nf_type_e target_nf_type, ogs_assert(OGS_OK == nas_5gs_send_back_5gsm_message_from_sbi( sess, OGS_SBI_HTTP_STATUS_GATEWAY_TIMEOUT)); - return; + return false; } xact->state = state; @@ -193,11 +195,14 @@ void amf_sess_sbi_discover_and_send(OpenAPI_nf_type_e target_nf_type, if (ogs_sbi_discover_and_send(xact, (ogs_fsm_handler_t)amf_nf_state_registered, client_cb) != true) { ogs_error("amf_sess_sbi_discover_and_send() failed"); + ogs_sbi_xact_remove(xact); ogs_assert(OGS_OK == nas_5gs_send_back_5gsm_message_from_sbi( sess, OGS_SBI_HTTP_STATUS_GATEWAY_TIMEOUT)); - return; + return false; } + + return true; } static int client_discover_cb(ogs_sbi_response_t *response, void *data) { @@ -262,7 +267,7 @@ cleanup: return OGS_ERROR; } -void amf_sess_sbi_discover_by_nsi( +bool amf_sess_sbi_discover_by_nsi( OpenAPI_nf_type_e target_nf_type, amf_sess_t *sess) { ogs_sbi_request_t *request = NULL; @@ -275,8 +280,9 @@ void amf_sess_sbi_discover_by_nsi( request = amf_nnrf_disc_build_discover( sess->nssf.nrf.id, target_nf_type, amf_self()->nf_type); - ogs_assert(request); - ogs_sbi_client_send_request( + ogs_expect_or_return_val(request, false); + + return ogs_sbi_client_send_request( client, client_discover_cb, request, sess); } @@ -415,7 +421,7 @@ static int client_notify_cb(ogs_sbi_response_t *response, void *data) return OGS_OK; } -void amf_sbi_send_n1_n2_failure_notify( +bool amf_sbi_send_n1_n2_failure_notify( amf_sess_t *sess, OpenAPI_n1_n2_message_transfer_cause_e cause) { ogs_sbi_request_t *request = NULL; @@ -427,6 +433,7 @@ void amf_sbi_send_n1_n2_failure_notify( ogs_assert(client); request = amf_nsmf_callback_build_n1_n2_failure_notify(sess, cause); - ogs_assert(request); - ogs_sbi_client_send_request(client, client_notify_cb, request, NULL); + ogs_expect_or_return_val(request, false); + + return ogs_sbi_client_send_request(client, client_notify_cb, request, NULL); } diff --git a/src/amf/sbi-path.h b/src/amf/sbi-path.h index 083165ab3c..ba2c41396a 100644 --- a/src/amf/sbi-path.h +++ b/src/amf/sbi-path.h @@ -34,10 +34,10 @@ extern "C" { int amf_sbi_open(void); void amf_sbi_close(void); -void amf_nnrf_nfm_send_nf_register(ogs_sbi_nf_instance_t *nf_instance); +bool amf_nnrf_nfm_send_nf_register(ogs_sbi_nf_instance_t *nf_instance); -void amf_sbi_send(ogs_sbi_nf_instance_t *nf_instance, ogs_sbi_xact_t *xact); -void amf_ue_sbi_discover_and_send(OpenAPI_nf_type_e target_nf_type, +bool amf_sbi_send(ogs_sbi_nf_instance_t *nf_instance, ogs_sbi_xact_t *xact); +bool amf_ue_sbi_discover_and_send(OpenAPI_nf_type_e target_nf_type, amf_ue_t *amf_ue, void *data, ogs_sbi_request_t *(*build)(amf_ue_t *amf_ue, void *data)); @@ -62,11 +62,11 @@ void amf_ue_sbi_discover_and_send(OpenAPI_nf_type_e target_nf_type, #define AMF_REMOVE_S1_CONTEXT_BY_LO_CONNREFUSED 51 #define AMF_REMOVE_S1_CONTEXT_BY_RESET_ALL 52 #define AMF_REMOVE_S1_CONTEXT_BY_RESET_PARTIAL 53 -void amf_sess_sbi_discover_and_send(OpenAPI_nf_type_e target_nf_type, +bool amf_sess_sbi_discover_and_send(OpenAPI_nf_type_e target_nf_type, amf_sess_t *sess, int state, void *data, ogs_sbi_request_t *(*build)(amf_sess_t *sess, void *data)); -void amf_sess_sbi_discover_by_nsi( +bool amf_sess_sbi_discover_by_nsi( OpenAPI_nf_type_e target_nf_type, amf_sess_t *sess); void amf_sbi_send_activating_session(amf_sess_t *sess, int state); @@ -80,7 +80,7 @@ void amf_sbi_send_deactivate_all_ue_in_gnb(amf_gnb_t *gnb, int state); void amf_sbi_send_release_session(amf_sess_t *sess, int state); void amf_sbi_send_release_all_sessions(amf_ue_t *amf_ue, int state); -void amf_sbi_send_n1_n2_failure_notify( +bool amf_sbi_send_n1_n2_failure_notify( amf_sess_t *sess, OpenAPI_n1_n2_message_transfer_cause_e cause); #ifdef __cplusplus diff --git a/src/ausf/ausf-sm.c b/src/ausf/ausf-sm.c index 7ba1e7b110..979c9a28a9 100644 --- a/src/ausf/ausf-sm.c +++ b/src/ausf/ausf-sm.c @@ -70,15 +70,19 @@ void ausf_state_operational(ogs_fsm_t *s, ausf_event_t *e) if (rv != OGS_OK) { /* 'message' buffer is released in ogs_sbi_parse_request() */ ogs_error("cannot parse HTTP message"); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - NULL, "cannot parse HTTP message", NULL); + ogs_assert(true == + ogs_sbi_server_send_error( + stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + NULL, "cannot parse HTTP message", NULL)); break; } if (strcmp(message.h.api.version, OGS_SBI_API_V1) != 0) { ogs_error("Not supported version [%s]", message.h.api.version); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - &message, "Not supported version", NULL); + ogs_assert(true == + ogs_sbi_server_send_error( + stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + &message, "Not supported version", NULL)); ogs_sbi_message_free(&message); break; } @@ -96,20 +100,22 @@ void ausf_state_operational(ogs_fsm_t *s, ausf_event_t *e) DEFAULT ogs_error("Invalid HTTP method [%s]", message.h.method); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_FORBIDDEN, &message, - "Invalid HTTP method", message.h.method); + "Invalid HTTP method", message.h.method)); END break; DEFAULT ogs_error("Invalid resource name [%s]", message.h.resource.component[0]); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, &message, "Unknown resource name", - message.h.resource.component[0]); + message.h.resource.component[0])); END break; @@ -138,9 +144,10 @@ void ausf_state_operational(ogs_fsm_t *s, ausf_event_t *e) if (!ausf_ue) { ogs_error("Not found [%s]", message.h.method); - ogs_sbi_server_send_error(stream, - OGS_SBI_HTTP_STATUS_NOT_FOUND, - &message, "Not found", message.h.method); + ogs_assert(true == + ogs_sbi_server_send_error( + stream, OGS_SBI_HTTP_STATUS_NOT_FOUND, + &message, "Not found", message.h.method)); break; } @@ -157,9 +164,10 @@ void ausf_state_operational(ogs_fsm_t *s, ausf_event_t *e) DEFAULT ogs_error("Invalid API name [%s]", message.h.service.name); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, &message, - "Invalid API name", message.h.resource.component[0]); + "Invalid API name", message.h.resource.component[0])); END /* In lib/sbi/server.c, notify_completed() releases 'request' buffer. */ @@ -323,9 +331,10 @@ void ausf_state_operational(ogs_fsm_t *s, ausf_event_t *e) subscription = e->sbi.data; ogs_assert(subscription); - ogs_nnrf_nfm_send_nf_status_subscribe(subscription->client, + ogs_assert(true == + ogs_nnrf_nfm_send_nf_status_subscribe(subscription->client, ausf_self()->nf_type, subscription->req_nf_instance_id, - subscription->subscr_cond.nf_type); + subscription->subscr_cond.nf_type)); ogs_info("[%s] Subscription validity expired", subscription->id); ogs_sbi_subscription_remove(subscription); @@ -341,9 +350,10 @@ void ausf_state_operational(ogs_fsm_t *s, ausf_event_t *e) ogs_sbi_xact_remove(sbi_xact); ogs_error("Cannot receive SBI message"); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_GATEWAY_TIMEOUT, NULL, - "Cannot receive SBI message", NULL); + "Cannot receive SBI message", NULL)); break; default: ogs_error("Unknown timer[%s:%d]", diff --git a/src/ausf/context.c b/src/ausf/context.c index 4d1ca80454..ca53342c13 100644 --- a/src/ausf/context.c +++ b/src/ausf/context.c @@ -40,7 +40,9 @@ void ausf_context_init(void) ogs_list_init(&self.ausf_ue_list); self.suci_hash = ogs_hash_make(); + ogs_assert(self.suci_hash); self.supi_hash = ogs_hash_make(); + ogs_assert(self.supi_hash); context_initialized = 1; } diff --git a/src/ausf/nausf-handler.c b/src/ausf/nausf-handler.c index 2698acabab..fb006e355e 100644 --- a/src/ausf/nausf-handler.c +++ b/src/ausf/nausf-handler.c @@ -34,26 +34,30 @@ bool ausf_nausf_auth_handle_authenticate(ausf_ue_t *ausf_ue, AuthenticationInfo = recvmsg->AuthenticationInfo; if (!AuthenticationInfo) { ogs_error("[%s] No AuthenticationInfo", ausf_ue->suci); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "[%s] No AuthenticationInfo", ausf_ue->suci); + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + recvmsg, "[%s] No AuthenticationInfo", ausf_ue->suci)); return false; } serving_network_name = AuthenticationInfo->serving_network_name; if (!serving_network_name) { ogs_error("[%s] No servingNetworkName", ausf_ue->suci); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "[%s] No servingNetworkName", ausf_ue->suci); + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + recvmsg, "[%s] No servingNetworkName", ausf_ue->suci)); return false; } if (ausf_ue->serving_network_name) ogs_free(ausf_ue->serving_network_name); ausf_ue->serving_network_name = ogs_strdup(serving_network_name); + ogs_assert(ausf_ue->serving_network_name); - ausf_sbi_discover_and_send(OpenAPI_nf_type_UDM, ausf_ue, stream, + ogs_assert(true == + ausf_sbi_discover_and_send(OpenAPI_nf_type_UDM, ausf_ue, stream, AuthenticationInfo->resynchronization_info, - ausf_nudm_ueau_build_get); + ausf_nudm_ueau_build_get)); return true; } @@ -72,16 +76,18 @@ bool ausf_nausf_auth_handle_authenticate_confirmation(ausf_ue_t *ausf_ue, ConfirmationData = recvmsg->ConfirmationData; if (!ConfirmationData) { ogs_error("[%s] No ConfirmationData", ausf_ue->suci); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "[%s] No ConfirmationData", ausf_ue->suci); + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + recvmsg, "[%s] No ConfirmationData", ausf_ue->suci)); return false; } res_star_string = ConfirmationData->res_star; if (!res_star_string) { ogs_error("[%s] No ConfirmationData.resStar", ausf_ue->suci); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "[%s] No ConfirmationData.resStar", ausf_ue->suci); + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + recvmsg, "[%s] No ConfirmationData.resStar", ausf_ue->suci)); return false; } @@ -97,8 +103,9 @@ bool ausf_nausf_auth_handle_authenticate_confirmation(ausf_ue_t *ausf_ue, ausf_ue->auth_result = OpenAPI_auth_result_AUTHENTICATION_SUCCESS; } - ausf_sbi_discover_and_send(OpenAPI_nf_type_UDM, ausf_ue, stream, NULL, - ausf_nudm_ueau_build_result_confirmation_inform); + ogs_assert(true == + ausf_sbi_discover_and_send(OpenAPI_nf_type_UDM, ausf_ue, stream, NULL, + ausf_nudm_ueau_build_result_confirmation_inform)); return true; } diff --git a/src/ausf/nf-sm.c b/src/ausf/nf-sm.c index 2f6353d634..e28bc1b7cc 100644 --- a/src/ausf/nf-sm.c +++ b/src/ausf/nf-sm.c @@ -109,7 +109,7 @@ void ausf_nf_state_will_register(ogs_fsm_t *s, ausf_event_t *e) ogs_timer_start(nf_instance->t_registration_interval, ogs_app()->time.message.sbi.nf_register_interval); - ausf_nnrf_nfm_send_nf_register(nf_instance); + ogs_assert(true == ausf_nnrf_nfm_send_nf_register(nf_instance)); break; case OGS_FSM_EXIT_SIG: @@ -164,7 +164,7 @@ void ausf_nf_state_will_register(ogs_fsm_t *s, ausf_event_t *e) ogs_timer_start(nf_instance->t_registration_interval, ogs_app()->time.message.sbi.nf_register_interval); - ausf_nnrf_nfm_send_nf_register(nf_instance); + ogs_assert(true == ausf_nnrf_nfm_send_nf_register(nf_instance)); break; default: @@ -210,8 +210,9 @@ void ausf_nf_state_registered(ogs_fsm_t *s, ausf_event_t *e) ogs_app()->time.nf_instance.no_heartbeat_margin)); } - ogs_nnrf_nfm_send_nf_status_subscribe(client, - ausf_self()->nf_type, nf_instance->id, OpenAPI_nf_type_UDM); + ogs_assert(true == + ogs_nnrf_nfm_send_nf_status_subscribe(client, + ausf_self()->nf_type, nf_instance->id, OpenAPI_nf_type_UDM)); } break; @@ -226,7 +227,8 @@ void ausf_nf_state_registered(ogs_fsm_t *s, ausf_event_t *e) } if (!OGS_FSM_CHECK(&nf_instance->sm, ausf_nf_state_exception)) { - ogs_nnrf_nfm_send_nf_de_register(nf_instance); + ogs_assert(true == + ogs_nnrf_nfm_send_nf_de_register(nf_instance)); } } break; @@ -276,7 +278,7 @@ void ausf_nf_state_registered(ogs_fsm_t *s, ausf_event_t *e) ogs_timer_start(nf_instance->t_heartbeat_interval, ogs_time_from_sec(nf_instance->time.heartbeat_interval)); - ogs_nnrf_nfm_send_nf_update(nf_instance); + ogs_assert(true == ogs_nnrf_nfm_send_nf_update(nf_instance)); break; case AUSF_TIMER_NF_INSTANCE_NO_HEARTBEAT: diff --git a/src/ausf/nnrf-build.c b/src/ausf/nnrf-build.c index 71dfef97e3..487db2c76f 100644 --- a/src/ausf/nnrf-build.c +++ b/src/ausf/nnrf-build.c @@ -43,7 +43,7 @@ ogs_sbi_request_t *ausf_nnrf_nfm_build_register( message.http.content_encoding = (char*)ogs_sbi_self()->content_encoding; NFProfile = ogs_nnrf_nfm_build_nf_profile(nf_instance); - ogs_assert(NFProfile); + ogs_expect_or_return_val(NFProfile, NULL); message.NFProfile = NFProfile; diff --git a/src/ausf/nnrf-handler.c b/src/ausf/nnrf-handler.c index 814741d51f..af0683c236 100644 --- a/src/ausf/nnrf-handler.c +++ b/src/ausf/nnrf-handler.c @@ -111,15 +111,17 @@ bool ausf_nnrf_handle_nf_status_notify( NotificationData = recvmsg->NotificationData; if (!NotificationData) { ogs_error("No NotificationData"); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "No NotificationData", NULL); + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + recvmsg, "No NotificationData", NULL)); return false; } if (!NotificationData->nf_instance_uri) { ogs_error("No nfInstanceUri"); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "No nfInstanceUri", NULL); + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + recvmsg, "No nfInstanceUri", NULL)); return false; } @@ -129,15 +131,17 @@ bool ausf_nnrf_handle_nf_status_notify( rv = ogs_sbi_parse_header(&message, &header); if (rv != OGS_OK) { ogs_error("Cannot parse nfInstanceUri [%s]", header.uri); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "Cannot parse nfInstanceUri", header.uri); + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + recvmsg, "Cannot parse nfInstanceUri", header.uri)); return false; } if (!message.h.resource.component[1]) { ogs_error("No nfInstanceId [%s]", header.uri); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "Cannot parse nfInstanceUri", header.uri); + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + recvmsg, "Cannot parse nfInstanceUri", header.uri)); ogs_sbi_header_free(&header); return false; } @@ -145,9 +149,10 @@ bool ausf_nnrf_handle_nf_status_notify( if (NF_INSTANCE_IS_SELF(message.h.resource.component[1])) { ogs_warn("[%s] The notification is not allowed", message.h.resource.component[1]); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_FORBIDDEN, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_FORBIDDEN, recvmsg, "The notification is not allowed", - message.h.resource.component[1]); + message.h.resource.component[1])); ogs_sbi_header_free(&header); return false; } @@ -160,8 +165,9 @@ bool ausf_nnrf_handle_nf_status_notify( NFProfile = NotificationData->nf_profile; if (!NFProfile) { ogs_error("No NFProfile"); + ogs_assert(true == ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "No NFProfile", NULL); + recvmsg, "No NFProfile", NULL)); ogs_sbi_header_free(&header); return false; } @@ -198,9 +204,10 @@ bool ausf_nnrf_handle_nf_status_notify( handled = ogs_sbi_client_associate(nf_instance); if (!handled) { ogs_error("[%s] Cannot associate NF EndPoint", nf_instance->id); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "Cannot find NF EndPoint", nf_instance->id); + recvmsg, "Cannot find NF EndPoint", nf_instance->id)); AUSF_NF_INSTANCE_CLEAR("NRF-notify", nf_instance); ogs_sbi_header_free(&header); return false; @@ -214,9 +221,10 @@ bool ausf_nnrf_handle_nf_status_notify( } else { ogs_warn("[%s] (NRF-notify) Not found", message.h.resource.component[1]); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_NOT_FOUND, - recvmsg, "Not found", message.h.resource.component[1]); + recvmsg, "Not found", message.h.resource.component[1])); ogs_sbi_header_free(&header); return false; } @@ -225,16 +233,17 @@ bool ausf_nnrf_handle_nf_status_notify( NotificationData->event); ogs_error("Not supported event [%d:%s]", NotificationData->event, eventstr ? eventstr : "Unknown"); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, recvmsg, "Not supported event", - eventstr ? eventstr : "Unknown"); + eventstr ? eventstr : "Unknown")); ogs_sbi_header_free(&header); return false; } response = ogs_sbi_build_response(recvmsg, OGS_SBI_HTTP_STATUS_NO_CONTENT); ogs_assert(response); - ogs_sbi_server_send_response(stream, response); + ogs_assert(true == ogs_sbi_server_send_response(stream, response)); ogs_sbi_header_free(&header); return true; @@ -330,6 +339,6 @@ void ausf_nnrf_handle_nf_discover( ogs_error("(NF discover) No [%s]", OpenAPI_nf_type_ToString(xact->target_nf_type)); } else { - ausf_sbi_send(nf_instance, xact); + ogs_assert(true == ausf_sbi_send(nf_instance, xact)); } } diff --git a/src/ausf/nudm-build.c b/src/ausf/nudm-build.c index 09126c257b..360d0fbd29 100644 --- a/src/ausf/nudm-build.c +++ b/src/ausf/nudm-build.c @@ -60,7 +60,7 @@ ogs_sbi_request_t *ausf_nudm_ueau_build_get(ausf_ue_t *ausf_ue, void *data) message.AuthenticationInfoRequest = &AuthenticationInfoRequest; request = ogs_sbi_build_request(&message); - ogs_assert(request); + ogs_expect_or_return_val(request, NULL); return request; } @@ -83,9 +83,10 @@ ogs_sbi_request_t *ausf_nudm_ueau_build_result_confirmation_inform( message.h.resource.component[1] = (char *)OGS_SBI_RESOURCE_NAME_AUTH_EVENTS; AuthEvent = ogs_calloc(1, sizeof(*AuthEvent)); - ogs_assert(AuthEvent); + ogs_expect_or_return_val(AuthEvent, NULL); AuthEvent->time_stamp = ogs_sbi_localtime_string(ogs_time_now()); + ogs_expect_or_return_val(AuthEvent->time_stamp, NULL); AuthEvent->nf_instance_id = ogs_sbi_self()->nf_instance_id; if (ausf_ue->auth_result == OpenAPI_auth_result_AUTHENTICATION_SUCCESS) @@ -98,7 +99,7 @@ ogs_sbi_request_t *ausf_nudm_ueau_build_result_confirmation_inform( message.AuthEvent = AuthEvent; request = ogs_sbi_build_request(&message); - ogs_assert(request); + ogs_expect_or_return_val(request, NULL); if (AuthEvent->time_stamp) ogs_free(AuthEvent->time_stamp); diff --git a/src/ausf/nudm-handler.c b/src/ausf/nudm-handler.c index 3b5b86c625..8657cd6742 100644 --- a/src/ausf/nudm-handler.c +++ b/src/ausf/nudm-handler.c @@ -60,9 +60,10 @@ bool ausf_nudm_ueau_handle_get(ausf_ue_t *ausf_ue, AuthenticationInfoResult = recvmsg->AuthenticationInfoResult; if (!AuthenticationInfoResult) { ogs_error("[%s] No AuthenticationInfoResult", ausf_ue->suci); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_INTERNAL_SERVER_ERROR, - recvmsg, "No AuthenticationInfoResult", ausf_ue->suci); + recvmsg, "No AuthenticationInfoResult", ausf_ue->suci)); return false; } @@ -71,9 +72,10 @@ bool ausf_nudm_ueau_handle_get(ausf_ue_t *ausf_ue, OpenAPI_auth_type_5G_AKA) { ogs_error("[%s] Not supported Auth Method [%d]", ausf_ue->suci, AuthenticationInfoResult->auth_type); - ogs_sbi_server_send_error(stream, - OGS_SBI_HTTP_STATUS_NOT_IMPLEMENTED, - recvmsg, "Not supported Auth Method", ausf_ue->suci); + ogs_assert(true == + ogs_sbi_server_send_error(stream, + OGS_SBI_HTTP_STATUS_NOT_IMPLEMENTED, + recvmsg, "Not supported Auth Method", ausf_ue->suci)); return false; } @@ -81,51 +83,57 @@ bool ausf_nudm_ueau_handle_get(ausf_ue_t *ausf_ue, AuthenticationInfoResult->authentication_vector; if (!AuthenticationVector) { ogs_error("[%s] No AuthenticationVector", ausf_ue->suci); - ogs_sbi_server_send_error(stream, - OGS_SBI_HTTP_STATUS_INTERNAL_SERVER_ERROR, - recvmsg, "No AuthenticationVector", ausf_ue->suci); + ogs_assert(true == + ogs_sbi_server_send_error(stream, + OGS_SBI_HTTP_STATUS_INTERNAL_SERVER_ERROR, + recvmsg, "No AuthenticationVector", ausf_ue->suci)); return false; } if (AuthenticationVector->av_type != OpenAPI_av_type_5G_HE_AKA) { ogs_error("[%s] Not supported Auth Method [%d]", ausf_ue->suci, AuthenticationVector->av_type); - ogs_sbi_server_send_error(stream, - OGS_SBI_HTTP_STATUS_FORBIDDEN, - recvmsg, "Not supported Auth Method", ausf_ue->suci); + ogs_assert(true == + ogs_sbi_server_send_error(stream, + OGS_SBI_HTTP_STATUS_FORBIDDEN, + recvmsg, "Not supported Auth Method", ausf_ue->suci)); return false; } if (!AuthenticationVector->rand) { ogs_error("[%s] No AuthenticationVector.rand", ausf_ue->suci); - ogs_sbi_server_send_error(stream, - OGS_SBI_HTTP_STATUS_INTERNAL_SERVER_ERROR, - recvmsg, "No AuthenticationVector.rand", ausf_ue->suci); + ogs_assert(true == + ogs_sbi_server_send_error(stream, + OGS_SBI_HTTP_STATUS_INTERNAL_SERVER_ERROR, + recvmsg, "No AuthenticationVector.rand", ausf_ue->suci)); return false; } if (!AuthenticationVector->xres_star) { ogs_error("[%s] No AuthenticationVector.xresStar", ausf_ue->suci); - ogs_sbi_server_send_error(stream, - OGS_SBI_HTTP_STATUS_INTERNAL_SERVER_ERROR, - recvmsg, "No AuthenticationVector.xresStar", ausf_ue->suci); + ogs_assert(true == + ogs_sbi_server_send_error(stream, + OGS_SBI_HTTP_STATUS_INTERNAL_SERVER_ERROR, + recvmsg, "No AuthenticationVector.xresStar", ausf_ue->suci)); return false; } if (!AuthenticationVector->autn) { ogs_error("[%s] No AuthenticationVector.autn", ausf_ue->suci); - ogs_sbi_server_send_error(stream, - OGS_SBI_HTTP_STATUS_INTERNAL_SERVER_ERROR, - recvmsg, "No AuthenticationVector.autn", ausf_ue->suci); + ogs_assert(true == + ogs_sbi_server_send_error(stream, + OGS_SBI_HTTP_STATUS_INTERNAL_SERVER_ERROR, + recvmsg, "No AuthenticationVector.autn", ausf_ue->suci)); return false; } if (!AuthenticationVector->kausf) { ogs_error("[%s] No AuthenticationVector.kausf", ausf_ue->suci); - ogs_sbi_server_send_error(stream, - OGS_SBI_HTTP_STATUS_INTERNAL_SERVER_ERROR, - recvmsg, "No AuthenticationVector.kausf", ausf_ue->suci); + ogs_assert(true == + ogs_sbi_server_send_error(stream, + OGS_SBI_HTTP_STATUS_INTERNAL_SERVER_ERROR, + recvmsg, "No AuthenticationVector.kausf", ausf_ue->suci)); return false; } @@ -195,7 +203,7 @@ bool ausf_nudm_ueau_handle_get(ausf_ue_t *ausf_ue, response = ogs_sbi_build_response(&sendmsg, OGS_SBI_HTTP_STATUS_CREATED); ogs_assert(response); - ogs_sbi_server_send_response(stream, response); + ogs_assert(true == ogs_sbi_server_send_response(stream, response)); OpenAPI_list_free(UeAuthenticationCtx._links); OpenAPI_map_free(LinksValueScheme); @@ -225,21 +233,24 @@ bool ausf_nudm_ueau_handle_result_confirmation_inform(ausf_ue_t *ausf_ue, AuthEvent = recvmsg->AuthEvent; if (!AuthEvent) { ogs_error("[%s] No AuthEvent", ausf_ue->suci); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "No AuthEvent", ausf_ue->suci); + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + recvmsg, "No AuthEvent", ausf_ue->suci)); return false; } if (!recvmsg->http.location) { ogs_error("[%s] No Location", ausf_ue->suci); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "No Location", ausf_ue->suci); + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + recvmsg, "No Location", ausf_ue->suci)); return false; } if (ausf_ue->auth_events_url) ogs_free(ausf_ue->auth_events_url); ausf_ue->auth_events_url = ogs_strdup(recvmsg->http.location); + ogs_assert(ausf_ue->auth_events_url); memset(&ConfirmationDataResponse, 0, sizeof(ConfirmationDataResponse)); @@ -263,7 +274,7 @@ bool ausf_nudm_ueau_handle_result_confirmation_inform(ausf_ue_t *ausf_ue, response = ogs_sbi_build_response(&sendmsg, OGS_SBI_HTTP_STATUS_OK); ogs_assert(response); - ogs_sbi_server_send_response(stream, response); + ogs_assert(true == ogs_sbi_server_send_response(stream, response)); return true; } diff --git a/src/ausf/sbi-path.c b/src/ausf/sbi-path.c index 1ed24d944f..40dacd814a 100644 --- a/src/ausf/sbi-path.c +++ b/src/ausf/sbi-path.c @@ -113,7 +113,7 @@ void ausf_sbi_close(void) ogs_sbi_server_stop_all(); } -void ausf_nnrf_nfm_send_nf_register(ogs_sbi_nf_instance_t *nf_instance) +bool ausf_nnrf_nfm_send_nf_register(ogs_sbi_nf_instance_t *nf_instance) { ogs_sbi_request_t *request = NULL; ogs_sbi_client_t *client = NULL; @@ -123,19 +123,18 @@ void ausf_nnrf_nfm_send_nf_register(ogs_sbi_nf_instance_t *nf_instance) ogs_assert(client); request = ausf_nnrf_nfm_build_register(nf_instance); - if (!request) { - ogs_error("ausf_nnrf_nfm_send_nf_register() failed"); - return; - } - ogs_sbi_client_send_request(client, client->cb, request, nf_instance); + ogs_expect_or_return_val(request, false); + + return ogs_sbi_client_send_request( + client, client->cb, request, nf_instance); } -void ausf_sbi_send(ogs_sbi_nf_instance_t *nf_instance, ogs_sbi_xact_t *xact) +bool ausf_sbi_send(ogs_sbi_nf_instance_t *nf_instance, ogs_sbi_xact_t *xact) { - ogs_sbi_send(nf_instance, client_cb, xact); + return ogs_sbi_send(nf_instance, client_cb, xact); } -void ausf_sbi_discover_and_send(OpenAPI_nf_type_e target_nf_type, +bool ausf_sbi_discover_and_send(OpenAPI_nf_type_e target_nf_type, ausf_ue_t *ausf_ue, ogs_sbi_stream_t *stream, void *data, ogs_sbi_request_t *(*build)(ausf_ue_t *ausf_ue, void *data)) { @@ -151,10 +150,11 @@ void ausf_sbi_discover_and_send(OpenAPI_nf_type_e target_nf_type, ausf_timer_sbi_client_wait_expire); if (!xact) { ogs_error("ausf_sbi_discover_and_send() failed"); - ogs_sbi_server_send_error(stream, - OGS_SBI_HTTP_STATUS_GATEWAY_TIMEOUT, NULL, - "Cannot discover", ausf_ue->suci); - return; + ogs_assert(true == + ogs_sbi_server_send_error(stream, + OGS_SBI_HTTP_STATUS_GATEWAY_TIMEOUT, NULL, + "Cannot discover", ausf_ue->suci)); + return false; } xact->assoc_stream = stream; @@ -162,9 +162,13 @@ void ausf_sbi_discover_and_send(OpenAPI_nf_type_e target_nf_type, if (ogs_sbi_discover_and_send(xact, (ogs_fsm_handler_t)ausf_nf_state_registered, client_cb) != true) { ogs_error("ausf_sbi_discover_and_send() failed"); - ogs_sbi_server_send_error(stream, - OGS_SBI_HTTP_STATUS_GATEWAY_TIMEOUT, NULL, - "Cannot discover", ausf_ue->suci); - return; + ogs_sbi_xact_remove(xact); + ogs_assert(true == + ogs_sbi_server_send_error(stream, + OGS_SBI_HTTP_STATUS_GATEWAY_TIMEOUT, NULL, + "Cannot discover", ausf_ue->suci)); + return false; } + + return true; } diff --git a/src/ausf/sbi-path.h b/src/ausf/sbi-path.h index f47a476513..f6f6552d20 100644 --- a/src/ausf/sbi-path.h +++ b/src/ausf/sbi-path.h @@ -30,10 +30,10 @@ extern "C" { int ausf_sbi_open(void); void ausf_sbi_close(void); -void ausf_nnrf_nfm_send_nf_register(ogs_sbi_nf_instance_t *nf_instance); +bool ausf_nnrf_nfm_send_nf_register(ogs_sbi_nf_instance_t *nf_instance); -void ausf_sbi_send(ogs_sbi_nf_instance_t *nf_instance, ogs_sbi_xact_t *xact); -void ausf_sbi_discover_and_send(OpenAPI_nf_type_e target_nf_type, +bool ausf_sbi_send(ogs_sbi_nf_instance_t *nf_instance, ogs_sbi_xact_t *xact); +bool ausf_sbi_discover_and_send(OpenAPI_nf_type_e target_nf_type, ausf_ue_t *ausf_ue, ogs_sbi_stream_t *stream, void *data, ogs_sbi_request_t *(*build)(ausf_ue_t *ausf_ue, void *data)); diff --git a/src/ausf/ue-sm.c b/src/ausf/ue-sm.c index c80925cd3b..38dd9665d1 100644 --- a/src/ausf/ue-sm.c +++ b/src/ausf/ue-sm.c @@ -101,9 +101,10 @@ void ausf_ue_state_operational(ogs_fsm_t *s, ausf_event_t *e) DEFAULT ogs_error("[%s] Invalid HTTP method [%s]", ausf_ue->suci, message->h.method); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_FORBIDDEN, message, - "Invalid HTTP method", message->h.method); + "Invalid HTTP method", message->h.method)); END break; @@ -128,9 +129,10 @@ void ausf_ue_state_operational(ogs_fsm_t *s, ausf_event_t *e) ogs_error("[%s] HTTP response error [%d]", ausf_ue->suci, message->res_status); } - ogs_sbi_server_send_error( - stream, message->res_status, - NULL, "HTTP response error", ausf_ue->suci); + ogs_assert(true == + ogs_sbi_server_send_error( + stream, message->res_status, + NULL, "HTTP response error", ausf_ue->suci)); break; } diff --git a/src/bsf/bsf-sm.c b/src/bsf/bsf-sm.c index 1fd8d4ef0a..e02f8b17b1 100644 --- a/src/bsf/bsf-sm.c +++ b/src/bsf/bsf-sm.c @@ -73,15 +73,19 @@ void bsf_state_operational(ogs_fsm_t *s, bsf_event_t *e) if (rv != OGS_OK) { /* 'sbi_message' buffer is released in ogs_sbi_parse_request() */ ogs_error("cannot parse HTTP sbi_message"); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - NULL, "cannot parse HTTP sbi_message", NULL); + ogs_assert(true == + ogs_sbi_server_send_error( + stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + NULL, "cannot parse HTTP sbi_message", NULL)); break; } if (strcmp(message.h.api.version, OGS_SBI_API_V1) != 0) { ogs_error("Not supported version [%s]", message.h.api.version); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - &message, "Not supported version", NULL); + ogs_assert(true == + ogs_sbi_server_send_error( + stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + &message, "Not supported version", NULL)); ogs_sbi_message_free(&message); break; } @@ -98,19 +102,21 @@ void bsf_state_operational(ogs_fsm_t *s, bsf_event_t *e) DEFAULT ogs_error("Invalid HTTP method [%s]", message.h.method); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_FORBIDDEN, &message, - "Invalid HTTP method", message.h.method); + "Invalid HTTP method", message.h.method)); END break; DEFAULT ogs_error("Invalid resource name [%s]", message.h.resource.component[0]); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, &message, "Invalid resource name", - message.h.resource.component[0]); + message.h.resource.component[0])); END break; @@ -156,9 +162,10 @@ void bsf_state_operational(ogs_fsm_t *s, bsf_event_t *e) if (!sess) { ogs_error("Not found [%s]", message.h.uri); - ogs_sbi_server_send_error(stream, - OGS_SBI_HTTP_STATUS_NOT_FOUND, - &message, "Not found", message.h.uri); + ogs_assert(true == + ogs_sbi_server_send_error(stream, + OGS_SBI_HTTP_STATUS_NOT_FOUND, + &message, "Not found", message.h.uri)); break; } @@ -168,18 +175,20 @@ void bsf_state_operational(ogs_fsm_t *s, bsf_event_t *e) DEFAULT ogs_error("Invalid resource name [%s]", message.h.resource.component[0]); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, &message, "Invalid resource name", - message.h.resource.component[0]); + message.h.resource.component[0])); END break; DEFAULT ogs_error("Invalid API name [%s]", message.h.service.name); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, &message, - "Invalid API name", message.h.service.name); + "Invalid API name", message.h.service.name)); END /* In lib/sbi/server.c, notify_completed() releases 'request' buffer. */ @@ -315,9 +324,10 @@ void bsf_state_operational(ogs_fsm_t *s, bsf_event_t *e) subscription = e->sbi.data; ogs_assert(subscription); - ogs_nnrf_nfm_send_nf_status_subscribe(subscription->client, + ogs_assert(true == + ogs_nnrf_nfm_send_nf_status_subscribe(subscription->client, bsf_self()->nf_type, subscription->req_nf_instance_id, - subscription->subscr_cond.nf_type); + subscription->subscr_cond.nf_type)); ogs_info("Subscription validity expired [%s]", subscription->id); ogs_sbi_subscription_remove(subscription); @@ -335,9 +345,10 @@ void bsf_state_operational(ogs_fsm_t *s, bsf_event_t *e) ogs_error("Cannot receive SBI message"); if (stream) { - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_GATEWAY_TIMEOUT, NULL, - "Cannot receive SBI message", NULL); + "Cannot receive SBI message", NULL)); } break; diff --git a/src/bsf/context.c b/src/bsf/context.c index be6aee19e0..169239cfb9 100644 --- a/src/bsf/context.c +++ b/src/bsf/context.c @@ -42,7 +42,9 @@ void bsf_context_init(void) ogs_pool_init(&bsf_sess_pool, ogs_app()->pool.sess); self.ipv4addr_hash = ogs_hash_make(); + ogs_assert(self.ipv4addr_hash); self.ipv6prefix_hash = ogs_hash_make(); + ogs_assert(self.ipv6prefix_hash); context_initialized = 1; } @@ -316,7 +318,7 @@ bsf_sess_t *bsf_sess_find_by_ipv6prefix(char *ipv6prefix_string) rv = ogs_ipv6prefix_from_string( ipv6prefix.addr6, &ipv6prefix.len, ipv6prefix_string); - ogs_expect_or_return_val(rv == OGS_OK, NULL); + ogs_assert(rv == OGS_OK); ogs_assert(ipv6prefix.len == OGS_IPV6_128_PREFIX_LEN); diff --git a/src/bsf/nbsf-handler.c b/src/bsf/nbsf-handler.c index 2d5d3aea06..c41e89dc50 100644 --- a/src/bsf/nbsf-handler.c +++ b/src/bsf/nbsf-handler.c @@ -51,7 +51,7 @@ bool bsf_nbsf_management_handle_pcf_binding( response = ogs_sbi_build_response( &sendmsg, OGS_SBI_HTTP_STATUS_NO_CONTENT); ogs_assert(response); - ogs_sbi_server_send_response(stream, response); + ogs_assert(true == ogs_sbi_server_send_response(stream, response)); ogs_free(sendmsg.http.location); @@ -109,6 +109,7 @@ bool bsf_nbsf_management_handle_pcf_binding( if (sess->pcf_fqdn) ogs_free(sess->pcf_fqdn); sess->pcf_fqdn = ogs_strdup(fqdn); + ogs_assert(sess->pcf_fqdn); } PcfIpEndPointList = RecvPcfBinding->pcf_ip_end_points; @@ -195,7 +196,7 @@ bool bsf_nbsf_management_handle_pcf_binding( response = ogs_sbi_build_response( &sendmsg, OGS_SBI_HTTP_STATUS_CREATED); ogs_assert(response); - ogs_sbi_server_send_response(stream, response); + ogs_assert(true == ogs_sbi_server_send_response(stream, response)); ogs_free(sendmsg.http.location); break; @@ -219,6 +220,7 @@ bool bsf_nbsf_management_handle_pcf_binding( fqdn_len = ogs_fqdn_build(fqdn, sess->pcf_fqdn, strlen(sess->pcf_fqdn)); SendPcfBinding.pcf_fqdn = ogs_memdup(fqdn, fqdn_len); + ogs_assert(SendPcfBinding.pcf_fqdn); } for (i = 0; i < sess->num_of_pcf_ip; i++) { @@ -227,7 +229,7 @@ bool bsf_nbsf_management_handle_pcf_binding( ogs_assert(sess->pcf_ip[i].addr || sess->pcf_ip[i].addr6); PcfIpEndPoint = ogs_calloc(1, sizeof(*PcfIpEndPoint)); - ogs_assert(PcfIpEndPoint); + ogs_expect_or_return_val(PcfIpEndPoint, NULL); PcfIpEndPoint->ipv4_address = sess->pcf_ip[i].addr; PcfIpEndPoint->ipv6_address = sess->pcf_ip[i].addr6; PcfIpEndPoint->port = sess->pcf_ip[i].port; @@ -247,7 +249,8 @@ bool bsf_nbsf_management_handle_pcf_binding( &sendmsg, OGS_SBI_HTTP_STATUS_OK); ogs_assert(response); - ogs_sbi_server_send_response(stream, response); + ogs_assert(true == + ogs_sbi_server_send_response(stream, response)); OpenAPI_list_for_each(SendPcfBinding.pcf_ip_end_points, node) { OpenAPI_ip_end_point_t *PcfIpEndPoint = node->data; @@ -264,7 +267,8 @@ bool bsf_nbsf_management_handle_pcf_binding( &sendmsg, OGS_SBI_HTTP_STATUS_NO_CONTENT); ogs_assert(response); - ogs_sbi_server_send_response(stream, response); + ogs_assert(true == + ogs_sbi_server_send_response(stream, response)); } break; @@ -282,7 +286,8 @@ cleanup: ogs_assert(strerror); ogs_assert(status); ogs_error("%s", strerror); - ogs_sbi_server_send_error(stream, status, recvmsg, strerror, NULL); + ogs_assert(true == + ogs_sbi_server_send_error(stream, status, recvmsg, strerror, NULL)); ogs_free(strerror); return false; diff --git a/src/bsf/nf-sm.c b/src/bsf/nf-sm.c index 9bf7d99514..0d986a4a06 100644 --- a/src/bsf/nf-sm.c +++ b/src/bsf/nf-sm.c @@ -109,7 +109,7 @@ void bsf_nf_state_will_register(ogs_fsm_t *s, bsf_event_t *e) ogs_timer_start(nf_instance->t_registration_interval, ogs_app()->time.message.sbi.nf_register_interval); - bsf_nnrf_nfm_send_nf_register(nf_instance); + ogs_assert(true == bsf_nnrf_nfm_send_nf_register(nf_instance)); break; case OGS_FSM_EXIT_SIG: @@ -164,7 +164,7 @@ void bsf_nf_state_will_register(ogs_fsm_t *s, bsf_event_t *e) ogs_timer_start(nf_instance->t_registration_interval, ogs_app()->time.message.sbi.nf_register_interval); - bsf_nnrf_nfm_send_nf_register(nf_instance); + ogs_assert(true == bsf_nnrf_nfm_send_nf_register(nf_instance)); break; default: @@ -224,7 +224,8 @@ void bsf_nf_state_registered(ogs_fsm_t *s, bsf_event_t *e) } if (!OGS_FSM_CHECK(&nf_instance->sm, bsf_nf_state_exception)) { - ogs_nnrf_nfm_send_nf_de_register(nf_instance); + ogs_assert(true == + ogs_nnrf_nfm_send_nf_de_register(nf_instance)); } } break; @@ -274,7 +275,7 @@ void bsf_nf_state_registered(ogs_fsm_t *s, bsf_event_t *e) ogs_timer_start(nf_instance->t_heartbeat_interval, ogs_time_from_sec(nf_instance->time.heartbeat_interval)); - ogs_nnrf_nfm_send_nf_update(nf_instance); + ogs_assert(true == ogs_nnrf_nfm_send_nf_update(nf_instance)); break; case BSF_TIMER_NF_INSTANCE_NO_HEARTBEAT: diff --git a/src/bsf/nnrf-build.c b/src/bsf/nnrf-build.c index 711ae4a6fe..3dd0c5ec4c 100644 --- a/src/bsf/nnrf-build.c +++ b/src/bsf/nnrf-build.c @@ -43,7 +43,7 @@ ogs_sbi_request_t *bsf_nnrf_nfm_build_register( message.http.content_encoding = (char*)ogs_sbi_self()->content_encoding; NFProfile = ogs_nnrf_nfm_build_nf_profile(nf_instance); - ogs_assert(NFProfile); + ogs_expect_or_return_val(NFProfile, NULL); message.NFProfile = NFProfile; diff --git a/src/bsf/nnrf-handler.c b/src/bsf/nnrf-handler.c index a3eb45d2f1..9066b1a801 100644 --- a/src/bsf/nnrf-handler.c +++ b/src/bsf/nnrf-handler.c @@ -111,15 +111,17 @@ bool bsf_nnrf_handle_nf_status_notify( NotificationData = recvmsg->NotificationData; if (!NotificationData) { ogs_error("No NotificationData"); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "No NotificationData", NULL); + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + recvmsg, "No NotificationData", NULL)); return false; } if (!NotificationData->nf_instance_uri) { ogs_error("No nfInstanceUri"); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "No nfInstanceUri", NULL); + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + recvmsg, "No nfInstanceUri", NULL)); return false; } @@ -129,15 +131,17 @@ bool bsf_nnrf_handle_nf_status_notify( rv = ogs_sbi_parse_header(&message, &header); if (rv != OGS_OK) { ogs_error("Cannot parse nfInstanceUri [%s]", header.uri); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "Cannot parse nfInstanceUri", header.uri); + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + recvmsg, "Cannot parse nfInstanceUri", header.uri)); return false; } if (!message.h.resource.component[1]) { ogs_error("No nfInstanceId [%s]", header.uri); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "Cannot parse nfInstanceUri", header.uri); + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + recvmsg, "Cannot parse nfInstanceUri", header.uri)); ogs_sbi_header_free(&header); return false; } @@ -145,9 +149,10 @@ bool bsf_nnrf_handle_nf_status_notify( if (NF_INSTANCE_IS_SELF(message.h.resource.component[1])) { ogs_warn("[%s] The notification is not allowed", message.h.resource.component[1]); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_FORBIDDEN, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_FORBIDDEN, recvmsg, "The notification is not allowed", - message.h.resource.component[1]); + message.h.resource.component[1])); ogs_sbi_header_free(&header); return false; } @@ -160,8 +165,10 @@ bool bsf_nnrf_handle_nf_status_notify( NFProfile = NotificationData->nf_profile; if (!NFProfile) { ogs_error("No NFProfile"); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "No NFProfile", NULL); + ogs_assert(true == + ogs_sbi_server_send_error( + stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + recvmsg, "No NFProfile", NULL)); ogs_sbi_header_free(&header); return false; } @@ -198,9 +205,10 @@ bool bsf_nnrf_handle_nf_status_notify( handled = ogs_sbi_client_associate(nf_instance); if (!handled) { ogs_error("[%s] Cannot associate NF EndPoint", nf_instance->id); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "Cannot find NF EndPoint", nf_instance->id); + recvmsg, "Cannot find NF EndPoint", nf_instance->id)); BSF_NF_INSTANCE_CLEAR("NRF-notify", nf_instance); ogs_sbi_header_free(&header); return false; @@ -214,9 +222,10 @@ bool bsf_nnrf_handle_nf_status_notify( } else { ogs_warn("[%s] (NRF-notify) Not found", message.h.resource.component[1]); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_NOT_FOUND, - recvmsg, "Not found", message.h.resource.component[1]); + recvmsg, "Not found", message.h.resource.component[1])); ogs_sbi_header_free(&header); return false; } @@ -225,16 +234,17 @@ bool bsf_nnrf_handle_nf_status_notify( NotificationData->event); ogs_error("Not supported event [%d:%s]", NotificationData->event, eventstr ? eventstr : "Unknown"); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, recvmsg, "Not supported event", - eventstr ? eventstr : "Unknown"); + eventstr ? eventstr : "Unknown")); ogs_sbi_header_free(&header); return false; } response = ogs_sbi_build_response(recvmsg, OGS_SBI_HTTP_STATUS_NO_CONTENT); ogs_assert(response); - ogs_sbi_server_send_response(stream, response); + ogs_assert(true == ogs_sbi_server_send_response(stream, response)); ogs_sbi_header_free(&header); return true; diff --git a/src/bsf/sbi-path.c b/src/bsf/sbi-path.c index 54a459a9cd..25d75e1692 100644 --- a/src/bsf/sbi-path.c +++ b/src/bsf/sbi-path.c @@ -113,7 +113,7 @@ void bsf_sbi_close(void) ogs_sbi_server_stop_all(); } -void bsf_nnrf_nfm_send_nf_register(ogs_sbi_nf_instance_t *nf_instance) +bool bsf_nnrf_nfm_send_nf_register(ogs_sbi_nf_instance_t *nf_instance) { ogs_sbi_request_t *request = NULL; ogs_sbi_client_t *client = NULL; @@ -123,19 +123,18 @@ void bsf_nnrf_nfm_send_nf_register(ogs_sbi_nf_instance_t *nf_instance) ogs_assert(client); request = bsf_nnrf_nfm_build_register(nf_instance); - if (!request) { - ogs_error("bsf_nnrf_nfm_send_nf_register() failed"); - return; - } - ogs_sbi_client_send_request(client, client->cb, request, nf_instance); + ogs_expect_or_return_val(request, false); + + return ogs_sbi_client_send_request( + client, client->cb, request, nf_instance); } -void bsf_sbi_send(ogs_sbi_nf_instance_t *nf_instance, ogs_sbi_xact_t *xact) +bool bsf_sbi_send(ogs_sbi_nf_instance_t *nf_instance, ogs_sbi_xact_t *xact) { - ogs_sbi_send(nf_instance, client_cb, xact); + return ogs_sbi_send(nf_instance, client_cb, xact); } -void bsf_sbi_discover_and_send(OpenAPI_nf_type_e target_nf_type, +bool bsf_sbi_discover_and_send(OpenAPI_nf_type_e target_nf_type, bsf_sess_t *sess, ogs_sbi_stream_t *stream, void *data, ogs_sbi_request_t *(*build)(bsf_sess_t *sess, void *data)) { @@ -152,10 +151,11 @@ void bsf_sbi_discover_and_send(OpenAPI_nf_type_e target_nf_type, bsf_timer_sbi_client_wait_expire); if (!xact) { ogs_error("bsf_sbi_discover_and_send() failed"); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_GATEWAY_TIMEOUT, NULL, - "Cannot discover", sess->dnn); - return; + "Cannot discover", sess->dnn)); + return false; } xact->assoc_stream = stream; @@ -163,11 +163,15 @@ void bsf_sbi_discover_and_send(OpenAPI_nf_type_e target_nf_type, if (ogs_sbi_discover_and_send(xact, (ogs_fsm_handler_t)bsf_nf_state_registered, client_cb) != true) { ogs_error("bsf_sbi_discover_and_send() failed"); - ogs_sbi_server_send_error(stream, + ogs_sbi_xact_remove(xact); + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_GATEWAY_TIMEOUT, NULL, - "Cannot discover", sess->dnn); - return; + "Cannot discover", sess->dnn)); + return false; } + + return true; } void bsf_sbi_send_response(ogs_sbi_stream_t *stream, int status) @@ -181,5 +185,5 @@ void bsf_sbi_send_response(ogs_sbi_stream_t *stream, int status) response = ogs_sbi_build_response(&sendmsg, status); ogs_assert(response); - ogs_sbi_server_send_response(stream, response); + ogs_assert(true == ogs_sbi_server_send_response(stream, response)); } diff --git a/src/bsf/sbi-path.h b/src/bsf/sbi-path.h index 4083747836..ab847624b0 100644 --- a/src/bsf/sbi-path.h +++ b/src/bsf/sbi-path.h @@ -29,11 +29,11 @@ extern "C" { int bsf_sbi_open(void); void bsf_sbi_close(void); -void bsf_nnrf_nfm_send_nf_register(ogs_sbi_nf_instance_t *nf_instance); +bool bsf_nnrf_nfm_send_nf_register(ogs_sbi_nf_instance_t *nf_instance); -void bsf_sbi_send(ogs_sbi_nf_instance_t *nf_instance, ogs_sbi_xact_t *xact); +bool bsf_sbi_send(ogs_sbi_nf_instance_t *nf_instance, ogs_sbi_xact_t *xact); -void bsf_sbi_discover_and_send(OpenAPI_nf_type_e target_nf_type, +bool bsf_sbi_discover_and_send(OpenAPI_nf_type_e target_nf_type, bsf_sess_t *sess, ogs_sbi_stream_t *stream, void *data, ogs_sbi_request_t *(*build)(bsf_sess_t *sess, void *data)); diff --git a/src/hss/hss-context.c b/src/hss/hss-context.c index a4741fef8d..d1458e904b 100644 --- a/src/hss/hss-context.c +++ b/src/hss/hss-context.c @@ -101,8 +101,11 @@ void hss_context_init(void) ogs_pool_init(&impu_pool, ogs_app()->pool.impu); self.imsi_hash = ogs_hash_make(); + ogs_assert(self.imsi_hash); self.impi_hash = ogs_hash_make(); + ogs_assert(self.impi_hash); self.impu_hash = ogs_hash_make(); + ogs_assert(self.impu_hash); ogs_thread_mutex_init(&self.db_lock); ogs_thread_mutex_init(&self.cx_lock); diff --git a/src/mme/emm-build.c b/src/mme/emm-build.c index 976d997088..4c404bdd7e 100644 --- a/src/mme/emm-build.c +++ b/src/mme/emm-build.c @@ -68,9 +68,10 @@ ogs_pkbuf_t *emm_build_attach_accept( ogs_debug(" SERVED_TAI_INDEX[%d]", served_tai_index); ogs_assert(served_tai_index >= 0 && served_tai_index < OGS_MAX_NUM_OF_SERVED_TAI); - ogs_nas_tai_list_build(&attach_accept->tai_list, + ogs_assert(OGS_OK == + ogs_nas_tai_list_build(&attach_accept->tai_list, &mme_self()->served_tai[served_tai_index].list0, - &mme_self()->served_tai[served_tai_index].list2); + &mme_self()->served_tai[served_tai_index].list2)); attach_accept->esm_message_container.buffer = esmbuf->data; attach_accept->esm_message_container.length = esmbuf->len; @@ -436,9 +437,10 @@ ogs_pkbuf_t *emm_build_tau_accept(mme_ue_t *mme_ue) ogs_debug(" SERVED_TAI_INDEX[%d]", served_tai_index); ogs_assert(served_tai_index >= 0 && served_tai_index < OGS_MAX_NUM_OF_SERVED_TAI); - ogs_nas_tai_list_build(&tau_accept->tai_list, + ogs_assert(OGS_OK == + ogs_nas_tai_list_build(&tau_accept->tai_list, &mme_self()->served_tai[served_tai_index].list0, - &mme_self()->served_tai[served_tai_index].list2); + &mme_self()->served_tai[served_tai_index].list2)); /* Set EPS bearer context status */ tau_accept->presencemask |= diff --git a/src/mme/emm-sm.c b/src/mme/emm-sm.c index 5dadc2904e..863b48796b 100644 --- a/src/mme/emm-sm.c +++ b/src/mme/emm-sm.c @@ -606,7 +606,7 @@ static void common_register_state(ogs_fsm_t *s, mme_event_t *e) * We don't have to set CNDomain. * So, we just set CNDomain to 0 */ - s1ap_send_paging(mme_ue, 0); + ogs_assert(OGS_OK == s1ap_send_paging(mme_ue, 0)); } break; diff --git a/src/mme/mme-context.c b/src/mme/mme-context.c index 79767cbf9d..9416a04064 100644 --- a/src/mme/mme-context.c +++ b/src/mme/mme-context.c @@ -100,9 +100,13 @@ void mme_context_init() ogs_pool_init(&self.m_tmsi, ogs_app()->max.ue); self.enb_addr_hash = ogs_hash_make(); + ogs_assert(self.enb_addr_hash); self.enb_id_hash = ogs_hash_make(); + ogs_assert(self.enb_id_hash); self.imsi_ue_hash = ogs_hash_make(); + ogs_assert(self.imsi_ue_hash); self.guti_ue_hash = ogs_hash_make(); + ogs_assert(self.guti_ue_hash); ogs_list_init(&self.mme_ue_list); diff --git a/src/mme/mme-fd-path.c b/src/mme/mme-fd-path.c index cf27f46eef..1af24fe3bf 100644 --- a/src/mme/mme-fd-path.c +++ b/src/mme/mme-fd-path.c @@ -844,6 +844,7 @@ static void mme_s6a_ula_cb(void *data, struct msg **msg) session->name = ogs_strndup( (char*)hdr->avp_value->os.data, hdr->avp_value->os.len); + ogs_assert(session->name); } else { ogs_error("no_Service-Selection"); error++; diff --git a/src/mme/mme-gtp-path.c b/src/mme/mme-gtp-path.c index b1cf34ba6b..0de49ca5e4 100644 --- a/src/mme/mme-gtp-path.c +++ b/src/mme/mme-gtp-path.c @@ -595,4 +595,4 @@ int mme_gtp_send_bearer_resource_command( ogs_expect(rv == OGS_OK); return rv; -} \ No newline at end of file +} diff --git a/src/mme/mme-s11-build.c b/src/mme/mme-s11-build.c index 7f7c27572c..3902851afb 100644 --- a/src/mme/mme-s11-build.c +++ b/src/mme/mme-s11-build.c @@ -307,7 +307,7 @@ ogs_pkbuf_t *mme_s11_build_modify_bearer_request( enb_s1u_teid.interface_type = OGS_GTP_F_TEID_S1_U_ENODEB_GTP_U; enb_s1u_teid.teid = htobe32(bearer->enb_s1u_teid); rv = ogs_gtp_ip_to_f_teid(&bearer->enb_s1u_ip, &enb_s1u_teid, &len); - ogs_assert(rv == OGS_OK); + ogs_expect_or_return_val(rv == OGS_OK, NULL); req->bearer_contexts_to_be_modified.s1_u_enodeb_f_teid.presence = 1; req->bearer_contexts_to_be_modified.s1_u_enodeb_f_teid.data = &enb_s1u_teid; req->bearer_contexts_to_be_modified.s1_u_enodeb_f_teid.len = len; @@ -426,7 +426,7 @@ ogs_pkbuf_t *mme_s11_build_create_bearer_response( enb_s1u_teid.interface_type = OGS_GTP_F_TEID_S1_U_ENODEB_GTP_U; enb_s1u_teid.teid = htobe32(bearer->enb_s1u_teid); rv = ogs_gtp_ip_to_f_teid(&bearer->enb_s1u_ip, &enb_s1u_teid, &len); - ogs_assert(rv == OGS_OK); + ogs_expect_or_return_val(rv == OGS_OK, NULL); rsp->bearer_contexts.s1_u_enodeb_f_teid.presence = 1; rsp->bearer_contexts.s1_u_enodeb_f_teid.data = &enb_s1u_teid; rsp->bearer_contexts.s1_u_enodeb_f_teid.len = len; @@ -436,7 +436,7 @@ ogs_pkbuf_t *mme_s11_build_create_bearer_response( sgw_s1u_teid.interface_type = OGS_GTP_F_TEID_S1_U_SGW_GTP_U; sgw_s1u_teid.teid = htobe32(bearer->sgw_s1u_teid); rv = ogs_gtp_ip_to_f_teid(&bearer->sgw_s1u_ip, &sgw_s1u_teid, &len); - ogs_assert(rv == OGS_OK); + ogs_expect_or_return_val(rv == OGS_OK, NULL); rsp->bearer_contexts.s4_u_sgsn_f_teid.presence = 1; rsp->bearer_contexts.s4_u_sgsn_f_teid.data = &sgw_s1u_teid; rsp->bearer_contexts.s4_u_sgsn_f_teid.len = OGS_GTP_F_TEID_IPV4_LEN; @@ -708,7 +708,7 @@ ogs_pkbuf_t *mme_s11_build_create_indirect_data_forwarding_tunnel_request( dl_teid[i].teid = htobe32(bearer->enb_dl_teid); rv = ogs_gtp_ip_to_f_teid( &bearer->enb_dl_ip, &dl_teid[i], &len); - ogs_assert(rv == OGS_OK); + ogs_expect_or_return_val(rv == OGS_OK, NULL); req->bearer_contexts[i].s1_u_enodeb_f_teid.presence = 1; req->bearer_contexts[i].s1_u_enodeb_f_teid.data = &dl_teid[i]; req->bearer_contexts[i].s1_u_enodeb_f_teid.len = len; @@ -721,7 +721,7 @@ ogs_pkbuf_t *mme_s11_build_create_indirect_data_forwarding_tunnel_request( ul_teid[i].teid = htobe32(bearer->enb_ul_teid); rv = ogs_gtp_ip_to_f_teid( &bearer->enb_ul_ip, &ul_teid[i], &len); - ogs_assert(rv == OGS_OK); + ogs_expect_or_return_val(rv == OGS_OK, NULL); req->bearer_contexts[i].s12_rnc_f_teid.presence = 1; req->bearer_contexts[i].s12_rnc_f_teid.data = &ul_teid[i]; req->bearer_contexts[i].s12_rnc_f_teid.len = len; diff --git a/src/mme/mme-s11-handler.c b/src/mme/mme-s11-handler.c index 91b2d60af3..16141f25c6 100644 --- a/src/mme/mme-s11-handler.c +++ b/src/mme/mme-s11-handler.c @@ -532,7 +532,7 @@ void mme_s11_handle_create_bearer_request( if (OGS_FSM_CHECK(&default_bearer->sm, esm_state_active)) { if (ECM_IDLE(mme_ue)) { - s1ap_send_paging(mme_ue, S1AP_CNDomain_ps); + ogs_assert(OGS_OK == s1ap_send_paging(mme_ue, S1AP_CNDomain_ps)); } else { ogs_assert(OGS_OK == nas_eps_send_activate_dedicated_bearer_context_request(bearer)); @@ -638,7 +638,7 @@ void mme_s11_handle_update_bearer_request( if (req->bearer_contexts.bearer_level_qos.presence == 1 || req->bearer_contexts.tft.presence == 1) { if (ECM_IDLE(mme_ue)) { - s1ap_send_paging(mme_ue, S1AP_CNDomain_ps); + ogs_assert(OGS_OK == s1ap_send_paging(mme_ue, S1AP_CNDomain_ps)); } else { ogs_assert(OGS_OK == nas_eps_send_modify_bearer_context_request(bearer, @@ -722,7 +722,7 @@ void mme_s11_handle_delete_bearer_request( bearer->xact = xact; if (ECM_IDLE(mme_ue)) { - s1ap_send_paging(mme_ue, S1AP_CNDomain_ps); + ogs_assert(OGS_OK == s1ap_send_paging(mme_ue, S1AP_CNDomain_ps)); } else { ogs_assert(OGS_OK == nas_eps_send_deactivate_bearer_context_request(bearer)); @@ -945,7 +945,7 @@ void mme_s11_handle_downlink_data_notification( * before step 9, the MME shall not send S1 interface paging messages */ if (ECM_IDLE(mme_ue)) { - s1ap_send_paging(mme_ue, S1AP_CNDomain_ps); + ogs_assert(OGS_OK == s1ap_send_paging(mme_ue, S1AP_CNDomain_ps)); } else if (ECM_CONNECTED(mme_ue)) { if (cause_value == OGS_GTP_CAUSE_ERROR_INDICATION_RECEIVED) { @@ -1052,7 +1052,7 @@ void mme_s11_handle_create_indirect_data_forwarding_tunnel_response( bearer->sgw_dl_teid = be32toh(teid->teid); rv = ogs_gtp_f_teid_to_ip(teid, &bearer->sgw_dl_ip); - ogs_expect_or_return(rv == OGS_OK); + ogs_assert(rv == OGS_OK); } if (rsp->bearer_contexts[i].s2b_u_epdg_f_teid_5.presence) { teid = rsp->bearer_contexts[i].s2b_u_epdg_f_teid_5.data; @@ -1060,7 +1060,7 @@ void mme_s11_handle_create_indirect_data_forwarding_tunnel_response( bearer->sgw_ul_teid = be32toh(teid->teid); rv = ogs_gtp_f_teid_to_ip(teid, &bearer->sgw_ul_ip); - ogs_expect_or_return(rv == OGS_OK); + ogs_assert(rv == OGS_OK); } } diff --git a/src/mme/nas-path.c b/src/mme/nas-path.c index a43bd82bdd..dfbf0850dd 100644 --- a/src/mme/nas-path.c +++ b/src/mme/nas-path.c @@ -113,7 +113,7 @@ int nas_eps_send_attach_accept(mme_ue_t *mme_ue) CLEAR_MME_UE_TIMER(mme_ue->t3450); mme_ue->t3450.pkbuf = ogs_pkbuf_copy(emmbuf); - ogs_assert(mme_ue->t3450.pkbuf); + ogs_expect_or_return_val(mme_ue->t3450.pkbuf, OGS_ERROR); ogs_timer_start(mme_ue->t3450.timer, mme_timer_cfg(MME_TIMER_T3450)->duration); @@ -170,7 +170,7 @@ int nas_eps_send_identity_request(mme_ue_t *mme_ue) } mme_ue->t3470.pkbuf = ogs_pkbuf_copy(emmbuf); - ogs_assert(mme_ue->t3470.pkbuf); + ogs_expect_or_return_val(mme_ue->t3470.pkbuf, OGS_ERROR); ogs_timer_start(mme_ue->t3470.timer, mme_timer_cfg(MME_TIMER_T3470)->duration); @@ -198,7 +198,7 @@ int nas_eps_send_authentication_request(mme_ue_t *mme_ue) } mme_ue->t3460.pkbuf = ogs_pkbuf_copy(emmbuf); - ogs_assert(mme_ue->t3460.pkbuf); + ogs_expect_or_return_val(mme_ue->t3460.pkbuf, OGS_ERROR); ogs_timer_start(mme_ue->t3460.timer, mme_timer_cfg(MME_TIMER_T3460)->duration); @@ -226,7 +226,7 @@ int nas_eps_send_security_mode_command(mme_ue_t *mme_ue) } mme_ue->t3460.pkbuf = ogs_pkbuf_copy(emmbuf); - ogs_assert(mme_ue->t3460.pkbuf); + ogs_expect_or_return_val(mme_ue->t3460.pkbuf, OGS_ERROR); ogs_timer_start(mme_ue->t3460.timer, mme_timer_cfg(MME_TIMER_T3460)->duration); @@ -331,7 +331,7 @@ int nas_eps_send_esm_information_request(mme_bearer_t *bearer) } bearer->t3489.pkbuf = ogs_pkbuf_copy(esmbuf); - ogs_assert(bearer->t3489.pkbuf); + ogs_expect_or_return_val(bearer->t3489.pkbuf, OGS_ERROR); ogs_timer_start(bearer->t3489.timer, mme_timer_cfg(MME_TIMER_T3489)->duration); @@ -512,7 +512,7 @@ int nas_eps_send_tau_accept( if (mme_ue->next.m_tmsi) { CLEAR_MME_UE_TIMER(mme_ue->t3450); mme_ue->t3450.pkbuf = ogs_pkbuf_copy(emmbuf); - ogs_assert(mme_ue->t3450.pkbuf); + ogs_expect_or_return_val(mme_ue->t3450.pkbuf, OGS_ERROR); ogs_timer_start(mme_ue->t3450.timer, mme_timer_cfg(MME_TIMER_T3450)->duration); } diff --git a/src/mme/s1ap-handler.c b/src/mme/s1ap-handler.c index 7e6d571991..44acad2fc3 100644 --- a/src/mme/s1ap-handler.c +++ b/src/mme/s1ap-handler.c @@ -1456,7 +1456,7 @@ void s1ap_handle_ue_context_release_action(enb_ue_t *enb_ue) ogs_expect_or_return(mme_ue); mme_ue_deassociate(mme_ue); - s1ap_send_paging(mme_ue, S1AP_CNDomain_ps); + ogs_assert(OGS_OK == s1ap_send_paging(mme_ue, S1AP_CNDomain_ps)); break; default: ogs_error("Invalid Action[%d]", enb_ue->ue_ctx_rel_action); diff --git a/src/mme/s1ap-path.c b/src/mme/s1ap-path.c index e80cfc7afa..719130f285 100644 --- a/src/mme/s1ap-path.c +++ b/src/mme/s1ap-path.c @@ -334,7 +334,7 @@ int s1ap_send_ue_context_release_command( return rv; } -void s1ap_send_paging(mme_ue_t *mme_ue, S1AP_CNDomain_t cn_domain) +int s1ap_send_paging(mme_ue_t *mme_ue, S1AP_CNDomain_t cn_domain) { ogs_pkbuf_t *s1apbuf = NULL; mme_enb_t *enb = NULL; @@ -352,14 +352,14 @@ void s1ap_send_paging(mme_ue_t *mme_ue, S1AP_CNDomain_t cn_domain) s1apbuf = mme_ue->t3413.pkbuf; } else { s1apbuf = s1ap_build_paging(mme_ue, cn_domain); - ogs_expect_or_return(s1apbuf); + ogs_expect_or_return_val(s1apbuf, OGS_ERROR); } mme_ue->t3413.pkbuf = ogs_pkbuf_copy(s1apbuf); - ogs_assert(mme_ue->t3413.pkbuf); + ogs_expect_or_return_val(mme_ue->t3413.pkbuf, OGS_ERROR); rv = s1ap_send_to_enb(enb, s1apbuf, mme_ue->enb_ostream_id); - ogs_expect(rv == OGS_OK); + ogs_expect_or_return_val(rv == OGS_OK, rv); } } } @@ -367,6 +367,8 @@ void s1ap_send_paging(mme_ue_t *mme_ue, S1AP_CNDomain_t cn_domain) /* Start T3413 */ ogs_timer_start(mme_ue->t3413.timer, mme_timer_cfg(MME_TIMER_T3413)->duration); + + return OGS_OK; } int s1ap_send_mme_configuration_transfer( @@ -592,4 +594,4 @@ int s1ap_send_s1_reset_ack( ogs_expect(rv == OGS_OK); return rv; -} \ No newline at end of file +} diff --git a/src/mme/s1ap-path.h b/src/mme/s1ap-path.h index bf3e195662..8e6eeb99a1 100644 --- a/src/mme/s1ap-path.h +++ b/src/mme/s1ap-path.h @@ -56,7 +56,7 @@ int s1ap_send_ue_context_release_command( enb_ue_t *enb_ue, S1AP_Cause_PR group, long cause, uint8_t action, ogs_time_t duration); -void s1ap_send_paging(mme_ue_t *mme_ue, S1AP_CNDomain_t cn_domain); +int s1ap_send_paging(mme_ue_t *mme_ue, S1AP_CNDomain_t cn_domain); int s1ap_send_mme_configuration_transfer( mme_enb_t *target_enb, diff --git a/src/mme/sgsap-build.c b/src/mme/sgsap-build.c index b4dd54c517..ff0fc24e49 100644 --- a/src/mme/sgsap-build.c +++ b/src/mme/sgsap-build.c @@ -58,7 +58,11 @@ ogs_pkbuf_t *sgsap_build_location_update_request(mme_ue_t *mme_ue) ogs_tlv_add(root, SGSAP_IE_LAI_TYPE, SGSAP_IE_LAI_LEN, 0, &lai); pkbuf = ogs_pkbuf_alloc(NULL, OGS_MAX_SDU_LEN); - ogs_assert(pkbuf); + if (!pkbuf) { + ogs_error("ogs_pkbuf_alloc() failed"); + ogs_tlv_free_all(root); + return NULL; + } ogs_pkbuf_put_u8(pkbuf, SGSAP_LOCATION_UPDATE_REQUEST); ogs_pkbuf_put(pkbuf, OGS_MAX_SDU_LEN-1); @@ -86,7 +90,11 @@ ogs_pkbuf_t *sgsap_build_tmsi_reallocation_complete(mme_ue_t *mme_ue) &mme_ue->nas_mobile_identity_imsi); pkbuf = ogs_pkbuf_alloc(NULL, OGS_MAX_SDU_LEN); - ogs_assert(pkbuf); + if (!pkbuf) { + ogs_error("ogs_pkbuf_alloc() failed"); + ogs_tlv_free_all(root); + return NULL; + } ogs_pkbuf_put_u8(pkbuf, SGSAP_TMSI_REALLOCATION_COMPLETE); ogs_pkbuf_put(pkbuf, OGS_MAX_SDU_LEN-1); @@ -163,7 +171,11 @@ ogs_pkbuf_t *sgsap_build_detach_indication(mme_ue_t *mme_ue) ogs_debug(" INDICATION[%d]", indication); pkbuf = ogs_pkbuf_alloc(NULL, OGS_MAX_SDU_LEN); - ogs_assert(pkbuf); + if (!pkbuf) { + ogs_error("ogs_pkbuf_alloc() failed"); + ogs_tlv_free_all(root); + return NULL; + } ogs_pkbuf_put_u8(pkbuf, type); ogs_pkbuf_put(pkbuf, OGS_MAX_SDU_LEN-1); @@ -192,7 +204,11 @@ ogs_pkbuf_t *sgsap_build_mo_csfb_indication(mme_ue_t *mme_ue) &mme_ue->nas_mobile_identity_imsi); pkbuf = ogs_pkbuf_alloc(NULL, OGS_MAX_SDU_LEN); - ogs_assert(pkbuf); + if (!pkbuf) { + ogs_error("ogs_pkbuf_alloc() failed"); + ogs_tlv_free_all(root); + return NULL; + } ogs_pkbuf_put_u8(pkbuf, SGSAP_MO_CSFB_INDICIATION); ogs_pkbuf_put(pkbuf, OGS_MAX_SDU_LEN-1); @@ -223,7 +239,11 @@ ogs_pkbuf_t *sgsap_build_paging_reject( ogs_debug(" CAUSE[%d]", sgs_cause); pkbuf = ogs_pkbuf_alloc(NULL, OGS_MAX_SDU_LEN); - ogs_assert(pkbuf); + if (!pkbuf) { + ogs_error("ogs_pkbuf_alloc() failed"); + ogs_tlv_free_all(root); + return NULL; + } ogs_pkbuf_put_u8(pkbuf, SGSAP_PAGING_REJECT); ogs_pkbuf_put(pkbuf, OGS_MAX_SDU_LEN-1); @@ -258,7 +278,11 @@ ogs_pkbuf_t *sgsap_build_service_request(mme_ue_t *mme_ue, uint8_t emm_mode) SGSAP_IE_UE_EMM_MODE_LEN, 0, &emm_mode); pkbuf = ogs_pkbuf_alloc(NULL, OGS_MAX_SDU_LEN); - ogs_assert(pkbuf); + if (!pkbuf) { + ogs_error("ogs_pkbuf_alloc() failed"); + ogs_tlv_free_all(root); + return NULL; + } ogs_pkbuf_put_u8(pkbuf, SGSAP_SERVICE_REQUEST); ogs_pkbuf_put(pkbuf, OGS_MAX_SDU_LEN-1); @@ -288,7 +312,11 @@ ogs_pkbuf_t *sgsap_build_reset_ack(mme_vlr_t *vlr) root = ogs_tlv_add(NULL, SGSAP_IE_MME_NAME_TYPE, mme_name_len, 0, mme_name); pkbuf = ogs_pkbuf_alloc(NULL, OGS_MAX_SDU_LEN); - ogs_assert(pkbuf); + if (!pkbuf) { + ogs_error("ogs_pkbuf_alloc() failed"); + ogs_tlv_free_all(root); + return NULL; + } ogs_pkbuf_put_u8(pkbuf, SGSAP_RESET_ACK); ogs_pkbuf_put(pkbuf, OGS_MAX_SDU_LEN-1); @@ -323,7 +351,11 @@ ogs_pkbuf_t *sgsap_build_uplink_unidata(mme_ue_t *mme_ue, nas_message_container->length, 0, nas_message_container->buffer); pkbuf = ogs_pkbuf_alloc(NULL, OGS_MAX_SDU_LEN); - ogs_assert(pkbuf); + if (!pkbuf) { + ogs_error("ogs_pkbuf_alloc() failed"); + ogs_tlv_free_all(root); + return NULL; + } ogs_pkbuf_put_u8(pkbuf, SGSAP_UPLINK_UNITDATA); ogs_pkbuf_put(pkbuf, OGS_MAX_SDU_LEN-1); @@ -355,7 +387,11 @@ ogs_pkbuf_t *sgsap_build_ue_unreachable(mme_ue_t *mme_ue, uint8_t sgs_cause) SGSAP_IE_SGS_CAUSE_LEN, 0, &sgs_cause); pkbuf = ogs_pkbuf_alloc(NULL, OGS_MAX_SDU_LEN); - ogs_assert(pkbuf); + if (!pkbuf) { + ogs_error("ogs_pkbuf_alloc() failed"); + ogs_tlv_free_all(root); + return NULL; + } ogs_pkbuf_put_u8(pkbuf, SGSAP_UE_UNREACHABLE); ogs_pkbuf_put(pkbuf, OGS_MAX_SDU_LEN-1); diff --git a/src/mme/sgsap-handler.c b/src/mme/sgsap-handler.c index d0e96107a6..326f907bda 100644 --- a/src/mme/sgsap-handler.c +++ b/src/mme/sgsap-handler.c @@ -330,11 +330,13 @@ void sgsap_handle_paging_request(mme_vlr_t *vlr, ogs_pkbuf_t *pkbuf) if (ECM_IDLE(mme_ue)) { if (CS_CALL_SERVICE_INDICATOR(mme_ue)) { /* UE will respond Extended Service Request in PS CNDomain*/ - s1ap_send_paging(mme_ue, S1AP_CNDomain_cs); + ogs_assert(OGS_OK == + s1ap_send_paging(mme_ue, S1AP_CNDomain_cs)); } else if (SMS_SERVICE_INDICATOR(mme_ue)) { /* UE will respond Service Request in PS CNDomain*/ - s1ap_send_paging(mme_ue, S1AP_CNDomain_ps); + ogs_assert(OGS_OK == + s1ap_send_paging(mme_ue, S1AP_CNDomain_ps)); } else goto paging_reject; diff --git a/src/mme/sgsap-sctp.c b/src/mme/sgsap-sctp.c index 9fb1f8288c..bf7385ec9c 100644 --- a/src/mme/sgsap-sctp.c +++ b/src/mme/sgsap-sctp.c @@ -54,6 +54,7 @@ ogs_sock_t *sgsap_client(mme_vlr_t *vlr) vlr->addr = &sock->remote_addr; vlr->poll = ogs_pollset_add(ogs_app()->pollset, OGS_POLLIN, sock->fd, lksctp_recv_handler, sock); + ogs_assert(vlr->poll); #endif ogs_info("sgsap client() [%s]:%d", OGS_ADDR(vlr->addr, buf), OGS_PORT(vlr->addr)); diff --git a/src/nrf/nf-sm.c b/src/nrf/nf-sm.c index cf7fea636a..cf8d342db0 100644 --- a/src/nrf/nf-sm.c +++ b/src/nrf/nf-sm.c @@ -128,28 +128,31 @@ void nrf_nf_state_will_register(ogs_fsm_t *s, nrf_event_t *e) DEFAULT ogs_error("[%s] Invalid HTTP method [%s]", nf_instance->id, message->h.method); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_MEHTOD_NOT_ALLOWED, message, - "Invalid HTTP method", message->h.method); + "Invalid HTTP method", message->h.method)); END break; DEFAULT ogs_error("[%s] Invalid resource name [%s]", nf_instance->id, message->h.resource.component[0]); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_MEHTOD_NOT_ALLOWED, message, "Invalid resource name", - message->h.resource.component[0]); + message->h.resource.component[0])); END break; DEFAULT ogs_error("[%s] Invalid API name [%s]", nf_instance->id, message->h.service.name); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_MEHTOD_NOT_ALLOWED, message, - "Invalid resource name", message->h.service.name); + "Invalid resource name", message->h.service.name)); END OGS_FSM_TRAN(s, nrf_nf_state_registered); @@ -158,9 +161,10 @@ void nrf_nf_state_will_register(ogs_fsm_t *s, nrf_event_t *e) default: ogs_error("[%s] Unknown event %s", nf_instance->id, nrf_event_get_name(e)); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_INTERNAL_SERVER_ERROR, - message, "Unknown event", nrf_event_get_name(e)); + message, "Unknown event", nrf_event_get_name(e))); OGS_FSM_TRAN(s, nrf_nf_state_exception); break; } @@ -194,8 +198,9 @@ void nrf_nf_state_registered(ogs_fsm_t *s, nrf_event_t *e) ogs_app()->time.nf_instance.no_heartbeat_margin)); } - nrf_nnrf_nfm_send_nf_status_notify_all( - OpenAPI_notification_event_type_NF_REGISTERED, nf_instance); + ogs_assert(true == + nrf_nnrf_nfm_send_nf_status_notify_all( + OpenAPI_notification_event_type_NF_REGISTERED, nf_instance)); break; case OGS_FSM_EXIT_SIG: @@ -204,8 +209,9 @@ void nrf_nf_state_registered(ogs_fsm_t *s, nrf_event_t *e) ogs_timer_stop(nf_instance->t_no_heartbeat); } - nrf_nnrf_nfm_send_nf_status_notify_all( - OpenAPI_notification_event_type_NF_DEREGISTERED, nf_instance); + ogs_assert(true == + nrf_nnrf_nfm_send_nf_status_notify_all( + OpenAPI_notification_event_type_NF_DEREGISTERED, nf_instance)); break; case NRF_EVT_SBI_SERVER: @@ -241,44 +247,49 @@ void nrf_nf_state_registered(ogs_fsm_t *s, nrf_event_t *e) response = ogs_sbi_build_response( message, OGS_SBI_HTTP_STATUS_NO_CONTENT); ogs_assert(response); - ogs_sbi_server_send_response(stream, response); + ogs_assert(true == + ogs_sbi_server_send_response(stream, response)); OGS_FSM_TRAN(s, nrf_nf_state_de_registered); break; DEFAULT ogs_error("[%s] Invalid HTTP method [%s]", nf_instance->id, message->h.method); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_MEHTOD_NOT_ALLOWED, message, - "Invalid HTTP method", message->h.method); + "Invalid HTTP method", message->h.method)); END break; DEFAULT ogs_error("[%s] Invalid resource name [%s]", nf_instance->id, message->h.resource.component[0]); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_MEHTOD_NOT_ALLOWED, message, "Invalid resource name", - message->h.resource.component[0]); + message->h.resource.component[0])); END break; DEFAULT ogs_error("[%s] Invalid API name [%s]", nf_instance->id, message->h.service.name); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_MEHTOD_NOT_ALLOWED, message, - "Invalid resource name", message->h.service.name); + "Invalid resource name", message->h.service.name)); END break; default: ogs_error("[%s] Unknown event %s", nf_instance->id, nrf_event_get_name(e)); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_INTERNAL_SERVER_ERROR, - message, "Unknown event", nrf_event_get_name(e)); + message, "Unknown event", nrf_event_get_name(e))); OGS_FSM_TRAN(s, nrf_nf_state_exception); break; } diff --git a/src/nrf/nnrf-build.c b/src/nrf/nnrf-build.c index c2ca6306c3..c2142d7f62 100644 --- a/src/nrf/nnrf-build.c +++ b/src/nrf/nnrf-build.c @@ -44,12 +44,12 @@ ogs_sbi_request_t *nrf_nnrf_nfm_build_nf_status_notify( message.http.accept = (char *)OGS_SBI_CONTENT_PROBLEM_TYPE; NotificationData = ogs_calloc(1, sizeof(*NotificationData)); - ogs_assert(NotificationData); + ogs_expect_or_return_val(NotificationData, NULL); NotificationData->event = event; server = ogs_list_first(&ogs_sbi_self()->server_list); - ogs_assert(server); + ogs_expect_or_return_val(server, NULL); memset(&header, 0, sizeof(header)); header.service.name = (char *)OGS_SBI_SERVICE_NAME_NNRF_NFM; @@ -58,17 +58,17 @@ ogs_sbi_request_t *nrf_nnrf_nfm_build_nf_status_notify( header.resource.component[1] = nf_instance->id; NotificationData->nf_instance_uri = ogs_sbi_server_uri(server, &header); - ogs_assert(NotificationData->nf_instance_uri); + ogs_expect_or_return_val(NotificationData->nf_instance_uri, NULL); if (event != OpenAPI_notification_event_type_NF_DEREGISTERED) { - ogs_assert(nf_instance->nf_profile); + ogs_expect_or_return_val(nf_instance->nf_profile, NULL); NotificationData->nf_profile = nf_instance->nf_profile; } message.NotificationData = NotificationData; request = ogs_sbi_build_request(&message); - ogs_assert(request); + ogs_expect_or_return_val(request, NULL); ogs_free(NotificationData->nf_instance_uri); ogs_free(NotificationData); diff --git a/src/nrf/nnrf-handler.c b/src/nrf/nnrf-handler.c index 42f7e887b2..ee88751d79 100644 --- a/src/nrf/nnrf-handler.c +++ b/src/nrf/nnrf-handler.c @@ -35,8 +35,9 @@ bool nrf_nnrf_handle_nf_register(ogs_sbi_nf_instance_t *nf_instance, NFProfile = recvmsg->NFProfile; if (!NFProfile) { ogs_error("No NFProfile"); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "No NFProfile", NULL); + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + recvmsg, "No NFProfile", NULL)); return false; } @@ -98,7 +99,7 @@ bool nrf_nnrf_handle_nf_register(ogs_sbi_nf_instance_t *nf_instance, } ogs_assert(response); - ogs_sbi_server_send_response(stream, response); + ogs_assert(true == ogs_sbi_server_send_response(stream, response)); return true; } @@ -122,17 +123,20 @@ bool nrf_nnrf_handle_nf_update(ogs_sbi_nf_instance_t *nf_instance, CASE(OGS_SBI_HTTP_METHOD_PATCH) PatchItemList = recvmsg->PatchItemList; if (!PatchItemList) { - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "No PatchItemList Array", NULL); + ogs_assert(true == + ogs_sbi_server_send_error( + stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + recvmsg, "No PatchItemList Array", NULL)); return false; } OpenAPI_list_for_each(PatchItemList, node) { OpenAPI_patch_item_t *patch_item = node->data; if (!patch_item) { - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "No PatchItemList", NULL); + recvmsg, "No PatchItemList", NULL)); return false; } } @@ -140,7 +144,7 @@ bool nrf_nnrf_handle_nf_update(ogs_sbi_nf_instance_t *nf_instance, response = ogs_sbi_build_response( recvmsg, OGS_SBI_HTTP_STATUS_NO_CONTENT); ogs_assert(response); - ogs_sbi_server_send_response(stream, response); + ogs_assert(true == ogs_sbi_server_send_response(stream, response)); break; DEFAULT @@ -171,14 +175,17 @@ bool nrf_nnrf_handle_nf_status_subscribe( SubscriptionData = recvmsg->SubscriptionData; if (!SubscriptionData) { - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "No SubscriptionData", NULL); + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + recvmsg, "No SubscriptionData", NULL)); return false; } if (!SubscriptionData->nf_status_notification_uri) { - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "No SubscriptionData", "NFStatusNotificationURL"); + ogs_assert(true == + ogs_sbi_server_send_error( + stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + recvmsg, "No SubscriptionData", "NFStatusNotificationURL")); return false; } @@ -190,9 +197,11 @@ bool nrf_nnrf_handle_nf_status_subscribe( ogs_sbi_subscription_set_id(subscription, id); ogs_assert(subscription->id); - if (SubscriptionData->req_nf_instance_id) + if (SubscriptionData->req_nf_instance_id) { subscription->req_nf_instance_id = ogs_strdup(SubscriptionData->req_nf_instance_id); + ogs_expect_or_return_val(subscription->req_nf_instance_id, NULL); + } if (SubscriptionData->subscription_id) { ogs_warn("[%s] NF should not send SubscriptionID", @@ -200,6 +209,7 @@ bool nrf_nnrf_handle_nf_status_subscribe( ogs_free(SubscriptionData->subscription_id); } SubscriptionData->subscription_id = ogs_strdup(subscription->id); + ogs_expect_or_return_val(SubscriptionData->subscription_id, NULL); SubscrCond = SubscriptionData->subscr_cond; if (SubscrCond) { @@ -212,8 +222,10 @@ bool nrf_nnrf_handle_nf_status_subscribe( addr = ogs_sbi_getaddr_from_uri(subscription->notification_uri); if (!addr) { - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "Invalid URI", subscription->notification_uri); + ogs_assert(true == + ogs_sbi_server_send_error( + stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + recvmsg, "Invalid URI", subscription->notification_uri)); ogs_sbi_subscription_remove(subscription); return false; } @@ -231,6 +243,7 @@ bool nrf_nnrf_handle_nf_status_subscribe( SubscriptionData->validity_time = ogs_sbi_localtime_string( ogs_time_now() + ogs_time_from_sec( subscription->time.validity_duration)); + ogs_assert(SubscriptionData->validity_time); subscription->t_validity = ogs_timer_add(ogs_app()->timer_mgr, nrf_timer_subscription_validity, subscription); @@ -244,7 +257,7 @@ bool nrf_nnrf_handle_nf_status_subscribe( response = ogs_sbi_build_response(recvmsg, status); ogs_assert(response); - ogs_sbi_server_send_response(stream, response); + ogs_assert(true == ogs_sbi_server_send_response(stream, response)); return true; } @@ -264,12 +277,13 @@ bool nrf_nnrf_handle_nf_status_unsubscribe( response = ogs_sbi_build_response( recvmsg, OGS_SBI_HTTP_STATUS_NO_CONTENT); ogs_assert(response); - ogs_sbi_server_send_response(stream, response); + ogs_assert(true == ogs_sbi_server_send_response(stream, response)); } else { ogs_error("Not found [%s]", recvmsg->h.resource.component[1]); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_NOT_FOUND, - recvmsg, "Not found", recvmsg->h.resource.component[1]); + recvmsg, "Not found", recvmsg->h.resource.component[1])); } return true; @@ -308,8 +322,9 @@ bool nrf_nnrf_handle_nf_list_retrieval( if (!recvmsg->param.limit || (recvmsg->param.limit && i < recvmsg->param.limit)) { - OpenAPI_list_add(links->items, - ogs_msprintf("%s/%s", links->self, nf_instance->id)); + char *str = ogs_msprintf("%s/%s", links->self, nf_instance->id); + ogs_assert(str); + OpenAPI_list_add(links->items, str); } i++; @@ -323,7 +338,7 @@ bool nrf_nnrf_handle_nf_list_retrieval( response = ogs_sbi_build_response(&sendmsg, OGS_SBI_HTTP_STATUS_OK); ogs_assert(response); - ogs_sbi_server_send_response(stream, response); + ogs_assert(true == ogs_sbi_server_send_response(stream, response)); OpenAPI_list_for_each(links->items, node) { if (!node->data) continue; @@ -350,9 +365,10 @@ bool nrf_nnrf_handle_nf_profile_retrieval( nf_instance = ogs_sbi_nf_instance_find(recvmsg->h.resource.component[1]); if (!nf_instance) { ogs_error("Not found [%s]", recvmsg->h.resource.component[1]); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_NOT_FOUND, - recvmsg, "Not found", recvmsg->h.resource.component[1]); + recvmsg, "Not found", recvmsg->h.resource.component[1])); return false; } @@ -363,7 +379,7 @@ bool nrf_nnrf_handle_nf_profile_retrieval( response = ogs_sbi_build_response(&sendmsg, OGS_SBI_HTTP_STATUS_OK); ogs_assert(response); - ogs_sbi_server_send_response(stream, response); + ogs_assert(true == ogs_sbi_server_send_response(stream, response)); return true; } @@ -383,14 +399,16 @@ bool nrf_nnrf_handle_nf_discover( if (!recvmsg->param.target_nf_type) { ogs_error("No target-nf-type [%s]", recvmsg->h.uri); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "No target-nf-type", NULL); + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + recvmsg, "No target-nf-type", NULL)); return false; } if (!recvmsg->param.requester_nf_type) { ogs_error("No requester-nf-type [%s]", recvmsg->h.uri); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "No requester-nf-type", NULL); + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + recvmsg, "No requester-nf-type", NULL)); return false; } @@ -438,10 +456,11 @@ bool nrf_nnrf_handle_nf_discover( sendmsg.SearchResult = SearchResult; sendmsg.http.cache_control = ogs_msprintf("max-age=%d", SearchResult->validity_period); + ogs_assert(sendmsg.http.cache_control); response = ogs_sbi_build_response(&sendmsg, OGS_SBI_HTTP_STATUS_OK); ogs_assert(response); - ogs_sbi_server_send_response(stream, response); + ogs_assert(true == ogs_sbi_server_send_response(stream, response)); OpenAPI_list_free(SearchResult->nf_instances); diff --git a/src/nrf/nrf-sm.c b/src/nrf/nrf-sm.c index 15f1fba61f..a69dbba4e9 100644 --- a/src/nrf/nrf-sm.c +++ b/src/nrf/nrf-sm.c @@ -68,15 +68,19 @@ void nrf_state_operational(ogs_fsm_t *s, nrf_event_t *e) if (rv != OGS_OK) { /* 'message' buffer is released in ogs_sbi_parse_request() */ ogs_error("cannot parse HTTP message"); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - NULL, "cannot parse HTTP message", NULL); + ogs_assert(true == + ogs_sbi_server_send_error( + stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + NULL, "cannot parse HTTP message", NULL)); break; } if (strcmp(message.h.api.version, OGS_SBI_API_V1) != 0) { ogs_error("Not supported version [%s]", message.h.api.version); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - &message, "Not supported version", NULL); + ogs_assert(true == + ogs_sbi_server_send_error( + stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + &message, "Not supported version", NULL)); ogs_sbi_message_free(&message); break; } @@ -109,10 +113,11 @@ void nrf_state_operational(ogs_fsm_t *s, nrf_event_t *e) DEFAULT ogs_warn("Not found [%s]", message.h.resource.component[1]); - ogs_sbi_server_send_error(stream, - OGS_SBI_HTTP_STATUS_NOT_FOUND, - &message, "Not found", - message.h.resource.component[1]); + ogs_assert(true == + ogs_sbi_server_send_error(stream, + OGS_SBI_HTTP_STATUS_NOT_FOUND, + &message, "Not found", + message.h.resource.component[1])); END } @@ -152,19 +157,21 @@ void nrf_state_operational(ogs_fsm_t *s, nrf_event_t *e) DEFAULT ogs_error("Invalid HTTP method [%s]", message.h.method); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_FORBIDDEN, &message, - "Invalid HTTP method", message.h.method); + "Invalid HTTP method", message.h.method)); END break; DEFAULT ogs_error("Invalid resource name [%s]", message.h.resource.component[0]); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, &message, "Invalid resource name", - message.h.resource.component[0]); + message.h.resource.component[0])); END break; @@ -181,9 +188,10 @@ void nrf_state_operational(ogs_fsm_t *s, nrf_event_t *e) DEFAULT ogs_error("Invalid HTTP method [%s]", message.h.method); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_FORBIDDEN, &message, - "Invalid HTTP method", message.h.method); + "Invalid HTTP method", message.h.method)); END break; @@ -191,18 +199,20 @@ void nrf_state_operational(ogs_fsm_t *s, nrf_event_t *e) DEFAULT ogs_error("Invalid resource name [%s]", message.h.resource.component[0]); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, &message, "Invalid resource name", - message.h.resource.component[0]); + message.h.resource.component[0])); END break; DEFAULT ogs_error("Invalid API name [%s]", message.h.service.name); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, &message, - "Invalid API name", message.h.resource.component[0]); + "Invalid API name", message.h.resource.component[0])); END /* In lib/sbi/server.c, notify_completed() releases 'request' buffer. */ diff --git a/src/nrf/sbi-path.c b/src/nrf/sbi-path.c index fab9309276..e16d19ccaf 100644 --- a/src/nrf/sbi-path.c +++ b/src/nrf/sbi-path.c @@ -80,7 +80,7 @@ void nrf_sbi_close(void) ogs_sbi_server_stop_all(); } -void nrf_nnrf_nfm_send_nf_status_notify(ogs_sbi_subscription_t *subscription, +bool nrf_nnrf_nfm_send_nf_status_notify(ogs_sbi_subscription_t *subscription, OpenAPI_notification_event_type_e event, ogs_sbi_nf_instance_t *nf_instance) { @@ -93,11 +93,12 @@ void nrf_nnrf_nfm_send_nf_status_notify(ogs_sbi_subscription_t *subscription, request = nrf_nnrf_nfm_build_nf_status_notify( client, subscription, event, nf_instance); - ogs_assert(request); - ogs_sbi_client_send_request(client, client_notify_cb, request, NULL); + ogs_expect_or_return_val(request, false); + + return ogs_sbi_client_send_request(client, client_notify_cb, request, NULL); } -void nrf_nnrf_nfm_send_nf_status_notify_all( +bool nrf_nnrf_nfm_send_nf_status_notify_all( OpenAPI_notification_event_type_e event, ogs_sbi_nf_instance_t *nf_instance) { @@ -114,6 +115,11 @@ void nrf_nnrf_nfm_send_nf_status_notify_all( subscription->subscr_cond.nf_type != nf_instance->nf_type) continue; - nrf_nnrf_nfm_send_nf_status_notify(subscription, event, nf_instance); + ogs_expect_or_return_val(true == + nrf_nnrf_nfm_send_nf_status_notify( + subscription, event, nf_instance), + false); } + + return true; } diff --git a/src/nrf/sbi-path.h b/src/nrf/sbi-path.h index 7dd5db3aae..5f5e05c22e 100644 --- a/src/nrf/sbi-path.h +++ b/src/nrf/sbi-path.h @@ -30,10 +30,10 @@ extern "C" { int nrf_sbi_open(void); void nrf_sbi_close(void); -void nrf_nnrf_nfm_send_nf_status_notify(ogs_sbi_subscription_t *subscription, +bool nrf_nnrf_nfm_send_nf_status_notify(ogs_sbi_subscription_t *subscription, OpenAPI_notification_event_type_e event, ogs_sbi_nf_instance_t *nf_instance); -void nrf_nnrf_nfm_send_nf_status_notify_all( +bool nrf_nnrf_nfm_send_nf_status_notify_all( OpenAPI_notification_event_type_e event, ogs_sbi_nf_instance_t *nf_instance); diff --git a/src/nssf/context.c b/src/nssf/context.c index 39e2e0330b..7dac31af9c 100644 --- a/src/nssf/context.c +++ b/src/nssf/context.c @@ -290,7 +290,7 @@ nssf_nsi_t *nssf_nsi_add(ogs_sockaddr_t *addr, uint8_t sst, ogs_uint24_t sd) nsi->nsi_id = ogs_msprintf("%d", (int)ogs_pool_index(&nssf_nsi_pool, nsi)); ogs_assert(nsi->nsi_id); - ogs_copyaddrinfo(&nsi->addr, addr); + ogs_assert(OGS_OK == ogs_copyaddrinfo(&nsi->addr, addr)); nsi->s_nssai.sst = sst; nsi->s_nssai.sd.v = sd.v; diff --git a/src/nssf/nf-sm.c b/src/nssf/nf-sm.c index bde5aa1d66..7a598967c1 100644 --- a/src/nssf/nf-sm.c +++ b/src/nssf/nf-sm.c @@ -109,7 +109,7 @@ void nssf_nf_state_will_register(ogs_fsm_t *s, nssf_event_t *e) ogs_timer_start(nf_instance->t_registration_interval, ogs_app()->time.message.sbi.nf_register_interval); - nssf_nnrf_nfm_send_nf_register(nf_instance); + ogs_assert(true == nssf_nnrf_nfm_send_nf_register(nf_instance)); break; case OGS_FSM_EXIT_SIG: @@ -164,7 +164,7 @@ void nssf_nf_state_will_register(ogs_fsm_t *s, nssf_event_t *e) ogs_timer_start(nf_instance->t_registration_interval, ogs_app()->time.message.sbi.nf_register_interval); - nssf_nnrf_nfm_send_nf_register(nf_instance); + ogs_assert(true == nssf_nnrf_nfm_send_nf_register(nf_instance)); break; default: @@ -223,7 +223,8 @@ void nssf_nf_state_registered(ogs_fsm_t *s, nssf_event_t *e) } if (!OGS_FSM_CHECK(&nf_instance->sm, nssf_nf_state_exception)) { - ogs_nnrf_nfm_send_nf_de_register(nf_instance); + ogs_assert(true == + ogs_nnrf_nfm_send_nf_de_register(nf_instance)); } } break; @@ -273,7 +274,7 @@ void nssf_nf_state_registered(ogs_fsm_t *s, nssf_event_t *e) ogs_timer_start(nf_instance->t_heartbeat_interval, ogs_time_from_sec(nf_instance->time.heartbeat_interval)); - ogs_nnrf_nfm_send_nf_update(nf_instance); + ogs_assert(true == ogs_nnrf_nfm_send_nf_update(nf_instance)); break; case NSSF_TIMER_NF_INSTANCE_NO_HEARTBEAT: diff --git a/src/nssf/nnrf-build.c b/src/nssf/nnrf-build.c index b2b1cd74f0..97ce8eddb3 100644 --- a/src/nssf/nnrf-build.c +++ b/src/nssf/nnrf-build.c @@ -43,7 +43,7 @@ ogs_sbi_request_t *nssf_nnrf_nfm_build_register( message.http.content_encoding = (char*)ogs_sbi_self()->content_encoding; NFProfile = ogs_nnrf_nfm_build_nf_profile(nf_instance); - ogs_assert(NFProfile); + ogs_expect_or_return_val(NFProfile, NULL); message.NFProfile = NFProfile; diff --git a/src/nssf/nnrf-handler.c b/src/nssf/nnrf-handler.c index 1eab071650..eb2933479e 100644 --- a/src/nssf/nnrf-handler.c +++ b/src/nssf/nnrf-handler.c @@ -111,15 +111,17 @@ bool nssf_nnrf_handle_nf_status_notify( NotificationData = recvmsg->NotificationData; if (!NotificationData) { ogs_error("No NotificationData"); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "No NotificationData", NULL); + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + recvmsg, "No NotificationData", NULL)); return false; } if (!NotificationData->nf_instance_uri) { ogs_error("No nfInstanceUri"); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "No nfInstanceUri", NULL); + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + recvmsg, "No nfInstanceUri", NULL)); return false; } @@ -129,15 +131,17 @@ bool nssf_nnrf_handle_nf_status_notify( rv = ogs_sbi_parse_header(&message, &header); if (rv != OGS_OK) { ogs_error("Cannot parse nfInstanceUri [%s]", header.uri); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "Cannot parse nfInstanceUri", header.uri); + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + recvmsg, "Cannot parse nfInstanceUri", header.uri)); return false; } if (!message.h.resource.component[1]) { ogs_error("No nfInstanceId [%s]", header.uri); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "Cannot parse nfInstanceUri", header.uri); + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + recvmsg, "Cannot parse nfInstanceUri", header.uri)); ogs_sbi_header_free(&header); return false; } @@ -145,9 +149,10 @@ bool nssf_nnrf_handle_nf_status_notify( if (NF_INSTANCE_IS_SELF(message.h.resource.component[1])) { ogs_warn("[%s] The notification is not allowed", message.h.resource.component[1]); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_FORBIDDEN, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_FORBIDDEN, recvmsg, "The notification is not allowed", - message.h.resource.component[1]); + message.h.resource.component[1])); ogs_sbi_header_free(&header); return false; } @@ -160,8 +165,9 @@ bool nssf_nnrf_handle_nf_status_notify( NFProfile = NotificationData->nf_profile; if (!NFProfile) { ogs_error("No NFProfile"); + ogs_assert(true == ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "No NFProfile", NULL); + recvmsg, "No NFProfile", NULL)); ogs_sbi_header_free(&header); return false; } @@ -198,9 +204,10 @@ bool nssf_nnrf_handle_nf_status_notify( handled = ogs_sbi_client_associate(nf_instance); if (!handled) { ogs_error("[%s] Cannot associate NF EndPoint", nf_instance->id); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "Cannot find NF EndPoint", nf_instance->id); + recvmsg, "Cannot find NF EndPoint", nf_instance->id)); NSSF_NF_INSTANCE_CLEAR("NRF-notify", nf_instance); ogs_sbi_header_free(&header); return false; @@ -214,9 +221,10 @@ bool nssf_nnrf_handle_nf_status_notify( } else { ogs_warn("[%s] (NRF-notify) Not found", message.h.resource.component[1]); - ogs_sbi_server_send_error(stream, - OGS_SBI_HTTP_STATUS_NOT_FOUND, - recvmsg, "Not found", message.h.resource.component[1]); + ogs_assert(true == + ogs_sbi_server_send_error(stream, + OGS_SBI_HTTP_STATUS_NOT_FOUND, + recvmsg, "Not found", message.h.resource.component[1])); ogs_sbi_header_free(&header); return false; } @@ -225,16 +233,17 @@ bool nssf_nnrf_handle_nf_status_notify( NotificationData->event); ogs_error("Not supported event [%d:%s]", NotificationData->event, eventstr ? eventstr : "Unknown"); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, recvmsg, "Not supported event", - eventstr ? eventstr : "Unknown"); + eventstr ? eventstr : "Unknown")); ogs_sbi_header_free(&header); return false; } response = ogs_sbi_build_response(recvmsg, OGS_SBI_HTTP_STATUS_NO_CONTENT); ogs_assert(response); - ogs_sbi_server_send_response(stream, response); + ogs_assert(true == ogs_sbi_server_send_response(stream, response)); ogs_sbi_header_free(&header); return true; diff --git a/src/nssf/nnssf-handler.c b/src/nssf/nnssf-handler.c index f5df9ec62e..b18f44d740 100644 --- a/src/nssf/nnssf-handler.c +++ b/src/nssf/nnssf-handler.c @@ -76,7 +76,7 @@ bool nssf_nnrf_nsselection_handle_get( response = ogs_sbi_build_response(&sendmsg, OGS_SBI_HTTP_STATUS_OK); ogs_assert(response); - ogs_sbi_server_send_response(stream, response); + ogs_assert(true == ogs_sbi_server_send_response(stream, response)); if (NsiInformation.nrf_id) ogs_free(NsiInformation.nrf_id); diff --git a/src/nssf/nssf-sm.c b/src/nssf/nssf-sm.c index e80c1fa923..da53d93830 100644 --- a/src/nssf/nssf-sm.c +++ b/src/nssf/nssf-sm.c @@ -71,8 +71,10 @@ void nssf_state_operational(ogs_fsm_t *s, nssf_event_t *e) if (rv != OGS_OK) { /* 'message' buffer is released in ogs_sbi_parse_request() */ ogs_error("cannot parse HTTP message"); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - NULL, "cannot parse HTTP message", NULL); + ogs_assert(true == + ogs_sbi_server_send_error( + stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + NULL, "cannot parse HTTP message", NULL)); break; } @@ -86,8 +88,10 @@ void nssf_state_operational(ogs_fsm_t *s, nssf_event_t *e) if (strcmp(message.h.api.version, api_version) != 0) { ogs_error("Not supported version [%s]", message.h.api.version); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - &message, "Not supported version", NULL); + ogs_assert(true == + ogs_sbi_server_send_error( + stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + &message, "Not supported version", NULL)); ogs_sbi_message_free(&message); break; } @@ -104,27 +108,30 @@ void nssf_state_operational(ogs_fsm_t *s, nssf_event_t *e) DEFAULT ogs_error("Invalid HTTP method [%s]", message.h.method); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_FORBIDDEN, - &message, "Invalid HTTP method", message.h.method); + &message, "Invalid HTTP method", message.h.method)); END break; DEFAULT ogs_error("Invalid resource name [%s]", message.h.resource.component[0]); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, &message, "Unknown resource name", - message.h.resource.component[0]); + message.h.resource.component[0])); END break; DEFAULT ogs_error("Invalid API name [%s]", message.h.service.name); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, &message, - "Invalid API name", message.h.resource.component[0]); + "Invalid API name", message.h.resource.component[0])); END /* In lib/sbi/server.c, notify_completed() releases 'request' buffer. */ @@ -235,9 +242,10 @@ void nssf_state_operational(ogs_fsm_t *s, nssf_event_t *e) subscription = e->sbi.data; ogs_assert(subscription); - ogs_nnrf_nfm_send_nf_status_subscribe(subscription->client, + ogs_assert(true == + ogs_nnrf_nfm_send_nf_status_subscribe(subscription->client, nssf_self()->nf_type, subscription->req_nf_instance_id, - subscription->subscr_cond.nf_type); + subscription->subscr_cond.nf_type)); ogs_info("[%s] Subscription validity expired", subscription->id); ogs_sbi_subscription_remove(subscription); diff --git a/src/nssf/sbi-path.c b/src/nssf/sbi-path.c index b43f33a30c..1d18d59e82 100644 --- a/src/nssf/sbi-path.c +++ b/src/nssf/sbi-path.c @@ -113,7 +113,7 @@ void nssf_sbi_close(void) ogs_sbi_server_stop_all(); } -void nssf_nnrf_nfm_send_nf_register(ogs_sbi_nf_instance_t *nf_instance) +bool nssf_nnrf_nfm_send_nf_register(ogs_sbi_nf_instance_t *nf_instance) { ogs_sbi_request_t *request = NULL; ogs_sbi_client_t *client = NULL; @@ -123,9 +123,8 @@ void nssf_nnrf_nfm_send_nf_register(ogs_sbi_nf_instance_t *nf_instance) ogs_assert(client); request = nssf_nnrf_nfm_build_register(nf_instance); - if (!request) { - ogs_error("nssf_nnrf_nfm_send_nf_register() failed"); - return; - } - ogs_sbi_client_send_request(client, client->cb, request, nf_instance); + ogs_expect_or_return_val(request, false); + + return ogs_sbi_client_send_request( + client, client->cb, request, nf_instance); } diff --git a/src/nssf/sbi-path.h b/src/nssf/sbi-path.h index 8efd71871f..c1414bad49 100644 --- a/src/nssf/sbi-path.h +++ b/src/nssf/sbi-path.h @@ -29,7 +29,7 @@ extern "C" { int nssf_sbi_open(void); void nssf_sbi_close(void); -void nssf_nnrf_nfm_send_nf_register(ogs_sbi_nf_instance_t *nf_instance); +bool nssf_nnrf_nfm_send_nf_register(ogs_sbi_nf_instance_t *nf_instance); #ifdef __cplusplus } diff --git a/src/pcf/am-sm.c b/src/pcf/am-sm.c index 3a5a9b7fed..c1d29ef0f4 100644 --- a/src/pcf/am-sm.c +++ b/src/pcf/am-sm.c @@ -76,9 +76,10 @@ void pcf_am_state_operational(ogs_fsm_t *s, pcf_event_t *e) DEFAULT ogs_error("[%s] Invalid HTTP method [%s]", pcf_ue->supi, message->h.method); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_FORBIDDEN, message, - "Invalid HTTP method", message->h.method); + "Invalid HTTP method", message->h.method)); END break; @@ -104,8 +105,10 @@ void pcf_am_state_operational(ogs_fsm_t *s, pcf_event_t *e) ogs_error("[%s] HTTP response error [%d]", pcf_ue->supi, message->res_status); } - ogs_sbi_server_send_error(stream, message->res_status, - NULL, "HTTP response error", pcf_ue->supi); + ogs_assert(true == + ogs_sbi_server_send_error( + stream, message->res_status, + NULL, "HTTP response error", pcf_ue->supi)); break; } @@ -129,9 +132,10 @@ void pcf_am_state_operational(ogs_fsm_t *s, pcf_event_t *e) DEFAULT ogs_error("[%s] Invalid API name [%s]", pcf_ue->supi, message->h.service.name); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, message, - "Invalid API name", message->h.resource.component[0]); + "Invalid API name", message->h.resource.component[0])); END break; diff --git a/src/pcf/context.c b/src/pcf/context.c index 4fa017b2f8..2d130a3caf 100644 --- a/src/pcf/context.c +++ b/src/pcf/context.c @@ -47,8 +47,11 @@ void pcf_context_init(void) ogs_list_init(&self.pcf_ue_list); self.supi_hash = ogs_hash_make(); + ogs_assert(self.supi_hash); self.ipv4addr_hash = ogs_hash_make(); + ogs_assert(self.ipv4addr_hash); self.ipv6prefix_hash = ogs_hash_make(); + ogs_assert(self.ipv6prefix_hash); context_initialized = 1; } @@ -465,7 +468,7 @@ pcf_sess_t *pcf_sess_find_by_ipv6prefix(char *ipv6prefix_string) rv = ogs_ipv6prefix_from_string( ipv6prefix.addr6, &ipv6prefix.len, ipv6prefix_string); - ogs_expect_or_return_val(rv == OGS_OK, NULL); + ogs_assert(rv == OGS_OK); ogs_assert(ipv6prefix.len == OGS_IPV6_128_PREFIX_LEN); diff --git a/src/pcf/nbsf-build.c b/src/pcf/nbsf-build.c index 42aa325515..48cbabecee 100644 --- a/src/pcf/nbsf-build.c +++ b/src/pcf/nbsf-build.c @@ -57,19 +57,20 @@ ogs_sbi_request_t *pcf_nbsf_management_build_register( PcfBinding.ipv4_addr = sess->ipv4addr_string; PcfBinding.ipv6_prefix = sess->ipv6prefix_string; - ogs_assert(sess->dnn); + ogs_expect_or_return_val(sess->dnn, NULL); PcfBinding.dnn = sess->dnn; nf_instance = ogs_sbi_nf_instance_find(ogs_sbi_self()->nf_instance_id); - ogs_assert(nf_instance); + ogs_expect_or_return_val(nf_instance, NULL); nf_service = ogs_list_first(&nf_instance->nf_service_list); - ogs_assert(nf_service); + ogs_expect_or_return_val(nf_service, NULL); if (strlen(nf_service->fqdn)) { memset(fqdn, 0, sizeof(fqdn)); fqdn_len = ogs_fqdn_build(fqdn, nf_service->fqdn, strlen(nf_service->fqdn)); PcfBinding.pcf_fqdn = ogs_memdup(fqdn, fqdn_len); + ogs_expect_or_return_val(PcfBinding.pcf_fqdn, NULL); } PcfIpEndPointList = OpenAPI_list_create(); @@ -86,9 +87,16 @@ ogs_sbi_request_t *pcf_nbsf_management_build_register( if (ipv4 || ipv6) { IpEndPoint = ogs_calloc(1, sizeof(*IpEndPoint)); - ogs_assert(IpEndPoint); - if (ipv4) IpEndPoint->ipv4_address = ogs_ipstrdup(ipv4); - if (ipv6) IpEndPoint->ipv6_address = ogs_ipstrdup(ipv6); + ogs_expect_or_return_val(IpEndPoint, NULL); + if (ipv4) { + IpEndPoint->ipv4_address = ogs_ipstrdup(ipv4); + ogs_expect_or_return_val(IpEndPoint->ipv4_address, NULL); + } + if (ipv6) { + IpEndPoint->ipv6_address = ogs_ipstrdup(ipv6); + ogs_expect_or_return_val(IpEndPoint->ipv6_address, NULL); + + } IpEndPoint->port = nf_service->addr[i].port; OpenAPI_list_add(PcfIpEndPointList, IpEndPoint); } @@ -99,7 +107,7 @@ ogs_sbi_request_t *pcf_nbsf_management_build_register( else OpenAPI_list_free(PcfIpEndPointList); - ogs_assert(sess->s_nssai.sst); + ogs_expect_or_return_val(sess->s_nssai.sst, NULL); memset(&sNssai, 0, sizeof(sNssai)); sNssai.sst = sess->s_nssai.sst; sNssai.sd = ogs_s_nssai_sd_to_string(sess->s_nssai.sd); @@ -107,12 +115,13 @@ ogs_sbi_request_t *pcf_nbsf_management_build_register( if (sess->management_features) { PcfBinding.supp_feat = ogs_uint64_to_string(sess->management_features); + ogs_expect_or_return_val(PcfBinding.supp_feat, NULL); } message.PcfBinding = &PcfBinding; request = ogs_sbi_build_request(&message); - ogs_assert(request); + ogs_expect(request); if (sNssai.sd) ogs_free(sNssai.sd); @@ -159,7 +168,7 @@ ogs_sbi_request_t *pcf_nbsf_management_build_de_register( message.h.resource.component[1] = sess->binding_id; request = ogs_sbi_build_request(&message); - ogs_assert(request); + ogs_expect(request); return request; } diff --git a/src/pcf/nbsf-handler.c b/src/pcf/nbsf-handler.c index 15b4f01666..b6ce9a4145 100644 --- a/src/pcf/nbsf-handler.c +++ b/src/pcf/nbsf-handler.c @@ -110,6 +110,7 @@ bool pcf_nbsf_management_handle_register( if (sess->binding_id) ogs_free(sess->binding_id); sess->binding_id = ogs_strdup(message.h.resource.component[1]); + ogs_assert(sess->binding_id); ogs_sbi_header_free(&header); @@ -385,6 +386,7 @@ bool pcf_nbsf_management_handle_register( if (sess->smpolicycontrol_features) { SmPolicyDecision.supp_feat = ogs_uint64_to_string(sess->smpolicycontrol_features); + ogs_assert(SmPolicyDecision.supp_feat); } memset(&header, 0, sizeof(header)); @@ -400,7 +402,7 @@ bool pcf_nbsf_management_handle_register( response = ogs_sbi_build_response( &sendmsg, OGS_SBI_HTTP_STATUS_CREATED); ogs_assert(response); - ogs_sbi_server_send_response(stream, response); + ogs_assert(true == ogs_sbi_server_send_response(stream, response)); ogs_free(sendmsg.http.location); @@ -478,7 +480,8 @@ cleanup: ogs_assert(strerror); ogs_assert(status); ogs_error("%s", strerror); - ogs_sbi_server_send_error(stream, status, recvmsg, strerror, NULL); + ogs_assert(true == + ogs_sbi_server_send_error(stream, status, recvmsg, strerror, NULL)); ogs_free(strerror); ogs_session_data_free(&session_data); @@ -500,7 +503,7 @@ bool pcf_nbsf_management_handle_de_register( response = ogs_sbi_build_response( &sendmsg, OGS_SBI_HTTP_STATUS_NO_CONTENT); ogs_assert(response); - ogs_sbi_server_send_response(stream, response); + ogs_assert(true == ogs_sbi_server_send_response(stream, response)); return true; } diff --git a/src/pcf/nf-sm.c b/src/pcf/nf-sm.c index 96071c530a..6861d883ba 100644 --- a/src/pcf/nf-sm.c +++ b/src/pcf/nf-sm.c @@ -109,7 +109,7 @@ void pcf_nf_state_will_register(ogs_fsm_t *s, pcf_event_t *e) ogs_timer_start(nf_instance->t_registration_interval, ogs_app()->time.message.sbi.nf_register_interval); - pcf_nnrf_nfm_send_nf_register(nf_instance); + ogs_assert(true == pcf_nnrf_nfm_send_nf_register(nf_instance)); break; case OGS_FSM_EXIT_SIG: @@ -164,7 +164,7 @@ void pcf_nf_state_will_register(ogs_fsm_t *s, pcf_event_t *e) ogs_timer_start(nf_instance->t_registration_interval, ogs_app()->time.message.sbi.nf_register_interval); - pcf_nnrf_nfm_send_nf_register(nf_instance); + ogs_assert(true == pcf_nnrf_nfm_send_nf_register(nf_instance)); break; default: @@ -210,10 +210,12 @@ void pcf_nf_state_registered(ogs_fsm_t *s, pcf_event_t *e) ogs_app()->time.nf_instance.no_heartbeat_margin)); } - ogs_nnrf_nfm_send_nf_status_subscribe(client, - pcf_self()->nf_type, nf_instance->id, OpenAPI_nf_type_BSF); - ogs_nnrf_nfm_send_nf_status_subscribe(client, - pcf_self()->nf_type, nf_instance->id, OpenAPI_nf_type_UDR); + ogs_assert(true == + ogs_nnrf_nfm_send_nf_status_subscribe(client, + pcf_self()->nf_type, nf_instance->id, OpenAPI_nf_type_BSF)); + ogs_assert(true == + ogs_nnrf_nfm_send_nf_status_subscribe(client, + pcf_self()->nf_type, nf_instance->id, OpenAPI_nf_type_UDR)); } break; @@ -228,7 +230,8 @@ void pcf_nf_state_registered(ogs_fsm_t *s, pcf_event_t *e) } if (!OGS_FSM_CHECK(&nf_instance->sm, pcf_nf_state_exception)) { - ogs_nnrf_nfm_send_nf_de_register(nf_instance); + ogs_assert(true == + ogs_nnrf_nfm_send_nf_de_register(nf_instance)); } } break; @@ -278,7 +281,7 @@ void pcf_nf_state_registered(ogs_fsm_t *s, pcf_event_t *e) ogs_timer_start(nf_instance->t_heartbeat_interval, ogs_time_from_sec(nf_instance->time.heartbeat_interval)); - ogs_nnrf_nfm_send_nf_update(nf_instance); + ogs_assert(true == ogs_nnrf_nfm_send_nf_update(nf_instance)); break; case PCF_TIMER_NF_INSTANCE_NO_HEARTBEAT: diff --git a/src/pcf/nnrf-build.c b/src/pcf/nnrf-build.c index de35b75d81..2be877fd78 100644 --- a/src/pcf/nnrf-build.c +++ b/src/pcf/nnrf-build.c @@ -43,7 +43,7 @@ ogs_sbi_request_t *pcf_nnrf_nfm_build_register( message.http.content_encoding = (char*)ogs_sbi_self()->content_encoding; NFProfile = ogs_nnrf_nfm_build_nf_profile(nf_instance); - ogs_assert(NFProfile); + ogs_expect_or_return_val(NFProfile, NULL); message.NFProfile = NFProfile; diff --git a/src/pcf/nnrf-handler.c b/src/pcf/nnrf-handler.c index 7b2115732f..b1b880ee49 100644 --- a/src/pcf/nnrf-handler.c +++ b/src/pcf/nnrf-handler.c @@ -111,15 +111,17 @@ bool pcf_nnrf_handle_nf_status_notify( NotificationData = recvmsg->NotificationData; if (!NotificationData) { ogs_error("No NotificationData"); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "No NotificationData", NULL); + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + recvmsg, "No NotificationData", NULL)); return false; } if (!NotificationData->nf_instance_uri) { ogs_error("No nfInstanceUri"); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "No nfInstanceUri", NULL); + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + recvmsg, "No nfInstanceUri", NULL)); return false; } @@ -129,15 +131,17 @@ bool pcf_nnrf_handle_nf_status_notify( rv = ogs_sbi_parse_header(&message, &header); if (rv != OGS_OK) { ogs_error("Cannot parse nfInstanceUri [%s]", header.uri); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "Cannot parse nfInstanceUri", header.uri); + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + recvmsg, "Cannot parse nfInstanceUri", header.uri)); return false; } if (!message.h.resource.component[1]) { ogs_error("No nfInstanceId [%s]", header.uri); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "Cannot parse nfInstanceUri", header.uri); + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + recvmsg, "Cannot parse nfInstanceUri", header.uri)); ogs_sbi_header_free(&header); return false; } @@ -145,9 +149,10 @@ bool pcf_nnrf_handle_nf_status_notify( if (NF_INSTANCE_IS_SELF(message.h.resource.component[1])) { ogs_warn("[%s] The notification is not allowed", message.h.resource.component[1]); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_FORBIDDEN, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_FORBIDDEN, recvmsg, "The notification is not allowed", - message.h.resource.component[1]); + message.h.resource.component[1])); ogs_sbi_header_free(&header); return false; } @@ -160,8 +165,10 @@ bool pcf_nnrf_handle_nf_status_notify( NFProfile = NotificationData->nf_profile; if (!NFProfile) { ogs_error("No NFProfile"); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "No NFProfile", NULL); + ogs_assert(true == + ogs_sbi_server_send_error( + stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + recvmsg, "No NFProfile", NULL)); ogs_sbi_header_free(&header); return false; } @@ -198,9 +205,10 @@ bool pcf_nnrf_handle_nf_status_notify( handled = ogs_sbi_client_associate(nf_instance); if (!handled) { ogs_error("[%s] Cannot associate NF EndPoint", nf_instance->id); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "Cannot find NF EndPoint", nf_instance->id); + recvmsg, "Cannot find NF EndPoint", nf_instance->id)); PCF_NF_INSTANCE_CLEAR("NRF-notify", nf_instance); ogs_sbi_header_free(&header); return false; @@ -214,9 +222,10 @@ bool pcf_nnrf_handle_nf_status_notify( } else { ogs_warn("[%s] (NRF-notify) Not found", message.h.resource.component[1]); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_NOT_FOUND, - recvmsg, "Not found", message.h.resource.component[1]); + recvmsg, "Not found", message.h.resource.component[1])); ogs_sbi_header_free(&header); return false; } @@ -225,16 +234,17 @@ bool pcf_nnrf_handle_nf_status_notify( NotificationData->event); ogs_error("Not supported event [%d:%s]", NotificationData->event, eventstr ? eventstr : "Unknown"); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, recvmsg, "Not supported event", - eventstr ? eventstr : "Unknown"); + eventstr ? eventstr : "Unknown")); ogs_sbi_header_free(&header); return false; } response = ogs_sbi_build_response(recvmsg, OGS_SBI_HTTP_STATUS_NO_CONTENT); ogs_assert(response); - ogs_sbi_server_send_response(stream, response); + ogs_assert(true == ogs_sbi_server_send_response(stream, response)); ogs_sbi_header_free(&header); return true; @@ -365,6 +375,6 @@ void pcf_nnrf_handle_nf_discover( ogs_assert_if_reached(); } } else { - pcf_sbi_send(nf_instance, xact); + ogs_assert(true == pcf_sbi_send(nf_instance, xact)); } } diff --git a/src/pcf/npcf-handler.c b/src/pcf/npcf-handler.c index 642901509a..cafcea14dc 100644 --- a/src/pcf/npcf-handler.c +++ b/src/pcf/npcf-handler.c @@ -39,29 +39,33 @@ bool pcf_npcf_am_policy_contrtol_handle_create(pcf_ue_t *pcf_ue, PolicyAssociationRequest = message->PolicyAssociationRequest; if (!PolicyAssociationRequest) { ogs_error("[%s] No PolicyAssociationRequest", pcf_ue->supi); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - message, "[%s] No PolicyAssociationRequest", pcf_ue->supi); + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + message, "[%s] No PolicyAssociationRequest", pcf_ue->supi)); return false; } if (!PolicyAssociationRequest->notification_uri) { ogs_error("[%s] No notificationUri", pcf_ue->supi); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - message, "No notificationUri", pcf_ue->supi); + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + message, "No notificationUri", pcf_ue->supi)); return false; } if (!PolicyAssociationRequest->supi) { ogs_error("[%s] No supi", pcf_ue->supi); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - message, "No supi", pcf_ue->supi); + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + message, "No supi", pcf_ue->supi)); return false; } if (!PolicyAssociationRequest->supp_feat) { ogs_error("[%s] No suppFeat", pcf_ue->supi); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - message, "No suppFeat", pcf_ue->supi); + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + message, "No suppFeat", pcf_ue->supi)); return false; } @@ -69,8 +73,9 @@ bool pcf_npcf_am_policy_contrtol_handle_create(pcf_ue_t *pcf_ue, if (!addr) { ogs_error("[%s] Invalid URI [%s]", pcf_ue->supi, PolicyAssociationRequest->notification_uri); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - message, "[%s] Invalid URI", pcf_ue->supi); + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + message, "[%s] Invalid URI", pcf_ue->supi)); return false; } @@ -78,6 +83,7 @@ bool pcf_npcf_am_policy_contrtol_handle_create(pcf_ue_t *pcf_ue, ogs_free(pcf_ue->notification_uri); pcf_ue->notification_uri = ogs_strdup( PolicyAssociationRequest->notification_uri); + ogs_assert(pcf_ue->notification_uri); client = ogs_sbi_client_find(addr); if (!client) { @@ -101,6 +107,7 @@ bool pcf_npcf_am_policy_contrtol_handle_create(pcf_ue_t *pcf_ue, if (pcf_ue->pei) ogs_free(pcf_ue->pei); pcf_ue->pei = ogs_strdup(PolicyAssociationRequest->pei); + ogs_assert(pcf_ue->pei); Guami = PolicyAssociationRequest->guami; if (Guami && Guami->amf_id && @@ -120,8 +127,9 @@ bool pcf_npcf_am_policy_contrtol_handle_create(pcf_ue_t *pcf_ue, pcf_ue->subscribed_ue_ambr = OpenAPI_ambr_copy( pcf_ue->subscribed_ue_ambr, PolicyAssociationRequest->ue_ambr); - pcf_ue_sbi_discover_and_send(OpenAPI_nf_type_UDR, pcf_ue, stream, NULL, - pcf_nudr_dr_build_query_am_data); + ogs_assert(true == + pcf_ue_sbi_discover_and_send(OpenAPI_nf_type_UDR, pcf_ue, stream, NULL, + pcf_nudr_dr_build_query_am_data)); return true; } @@ -234,10 +242,12 @@ bool pcf_npcf_smpolicycontrtol_handle_create(pcf_sess_t *sess, if (sess->dnn) ogs_free(sess->dnn); sess->dnn = ogs_strdup(SmPolicyContextData->dnn); + ogs_assert(sess->dnn); if (sess->notification_uri) ogs_free(sess->notification_uri); sess->notification_uri = ogs_strdup(SmPolicyContextData->notification_uri); + ogs_assert(sess->notification_uri); client = ogs_sbi_client_find(addr); if (!client) { @@ -267,8 +277,9 @@ bool pcf_npcf_smpolicycontrtol_handle_create(pcf_sess_t *sess, sess->subscribed_default_qos = OpenAPI_subscribed_default_qos_copy( sess->subscribed_default_qos, SmPolicyContextData->subs_def_qos); - pcf_sess_sbi_discover_and_send(OpenAPI_nf_type_UDR, sess, stream, NULL, - pcf_nudr_dr_build_query_sm_data); + ogs_assert(true == + pcf_sess_sbi_discover_and_send(OpenAPI_nf_type_UDR, sess, stream, NULL, + pcf_nudr_dr_build_query_sm_data)); return true; @@ -276,7 +287,8 @@ cleanup: ogs_assert(status); ogs_assert(strerror); ogs_error("%s", strerror); - ogs_sbi_server_send_error(stream, status, message, strerror, NULL); + ogs_assert(true == + ogs_sbi_server_send_error(stream, status, message, strerror, NULL)); ogs_free(strerror); return false; @@ -304,8 +316,9 @@ bool pcf_npcf_smpolicycontrtol_handle_delete(pcf_sess_t *sess, goto cleanup; } - pcf_sess_sbi_discover_and_send(OpenAPI_nf_type_BSF, sess, stream, NULL, - pcf_nbsf_management_build_de_register); + ogs_assert(true == + pcf_sess_sbi_discover_and_send(OpenAPI_nf_type_BSF, sess, stream, NULL, + pcf_nbsf_management_build_de_register)); return true; @@ -313,7 +326,8 @@ cleanup: ogs_assert(status); ogs_assert(strerror); ogs_error("%s", strerror); - ogs_sbi_server_send_error(stream, status, message, strerror, NULL); + ogs_assert(true == + ogs_sbi_server_send_error(stream, status, message, strerror, NULL)); ogs_free(strerror); return false; @@ -473,13 +487,13 @@ bool pcf_npcf_policyauthorization_handle_create(pcf_sess_t *sess, response = ogs_sbi_build_response(&sendmsg, OGS_SBI_HTTP_STATUS_CREATED); ogs_assert(response); - ogs_sbi_server_send_response(stream, response); + ogs_assert(true == ogs_sbi_server_send_response(stream, response)); ogs_free(sendmsg.http.location); #if 0 - pcf_sbi_send_smpolicycontrol_notify(sess); - pcf_sbi_send_am_policy_control_notify(pcf_ue); + ogs_assert(true == pcf_sbi_send_smpolicycontrol_notify(sess)); + ogs_assert(true == pcf_sbi_send_am_policy_control_notify(pcf_ue)); #endif ogs_ims_data_free(&ims_data); @@ -490,7 +504,8 @@ cleanup: ogs_assert(status); ogs_assert(strerror); ogs_error("%s", strerror); - ogs_sbi_server_send_error(stream, status, recvmsg, strerror, NULL); + ogs_assert(true == + ogs_sbi_server_send_error(stream, status, recvmsg, strerror, NULL)); ogs_free(strerror); ogs_ims_data_free(&ims_data); diff --git a/src/pcf/nudr-handler.c b/src/pcf/nudr-handler.c index 496cdaa3f6..b79c19bed4 100644 --- a/src/pcf/nudr-handler.c +++ b/src/pcf/nudr-handler.c @@ -132,7 +132,7 @@ bool pcf_nudr_dr_handle_query_am_data( response = ogs_sbi_build_response( &sendmsg, OGS_SBI_HTTP_STATUS_CREATED); ogs_assert(response); - ogs_sbi_server_send_response(stream, response); + ogs_assert(true == ogs_sbi_server_send_response(stream, response)); ogs_free(sendmsg.http.location); @@ -158,7 +158,8 @@ cleanup: ogs_assert(strerror); ogs_assert(status); ogs_error("%s", strerror); - ogs_sbi_server_send_error(stream, status, recvmsg, strerror, NULL); + ogs_assert(true == + ogs_sbi_server_send_error(stream, status, recvmsg, strerror, NULL)); ogs_free(strerror); ogs_subscription_data_free(&subscription_data); @@ -192,8 +193,10 @@ bool pcf_nudr_dr_handle_query_sm_data( goto cleanup; } - pcf_sess_sbi_discover_and_send(OpenAPI_nf_type_BSF, sess, stream, NULL, - pcf_nbsf_management_build_register); + ogs_assert(true == + pcf_sess_sbi_discover_and_send( + OpenAPI_nf_type_BSF, sess, stream, NULL, + pcf_nbsf_management_build_register)); return true; @@ -206,7 +209,8 @@ cleanup: ogs_assert(strerror); ogs_assert(status); ogs_error("%s", strerror); - ogs_sbi_server_send_error(stream, status, recvmsg, strerror, NULL); + ogs_assert(true == + ogs_sbi_server_send_error(stream, status, recvmsg, strerror, NULL)); ogs_free(strerror); return false; diff --git a/src/pcf/pcf-sm.c b/src/pcf/pcf-sm.c index 6fdd656b80..78600903b7 100644 --- a/src/pcf/pcf-sm.c +++ b/src/pcf/pcf-sm.c @@ -75,15 +75,19 @@ void pcf_state_operational(ogs_fsm_t *s, pcf_event_t *e) if (rv != OGS_OK) { /* 'message' buffer is released in ogs_sbi_parse_request() */ ogs_error("cannot parse HTTP message"); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - NULL, "cannot parse HTTP message", NULL); + ogs_assert(true == + ogs_sbi_server_send_error( + stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + NULL, "cannot parse HTTP message", NULL)); break; } if (strcmp(message.h.api.version, OGS_SBI_API_V1) != 0) { ogs_error("Not supported version [%s]", message.h.api.version); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - &message, "Not supported version", NULL); + ogs_assert(true == + ogs_sbi_server_send_error( + stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + &message, "Not supported version", NULL)); ogs_sbi_message_free(&message); break; } @@ -100,19 +104,21 @@ void pcf_state_operational(ogs_fsm_t *s, pcf_event_t *e) DEFAULT ogs_error("Invalid HTTP method [%s]", message.h.method); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_FORBIDDEN, &message, - "Invalid HTTP method", message.h.method); + "Invalid HTTP method", message.h.method)); END break; DEFAULT ogs_error("Invalid resource name [%s]", message.h.resource.component[0]); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, &message, "Unknown resource name", - message.h.resource.component[0]); + message.h.resource.component[0])); END break; @@ -136,9 +142,10 @@ void pcf_state_operational(ogs_fsm_t *s, pcf_event_t *e) if (!pcf_ue) { ogs_error("Not found [%s]", message.h.method); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_NOT_FOUND, - &message, "Not found", message.h.method); + &message, "Not found", message.h.method)); break; } @@ -186,9 +193,10 @@ void pcf_state_operational(ogs_fsm_t *s, pcf_event_t *e) if (!sess) { ogs_error("Not found [%s]", message.h.uri); - ogs_sbi_server_send_error(stream, - OGS_SBI_HTTP_STATUS_NOT_FOUND, - &message, "Not found", message.h.uri); + ogs_assert(true == + ogs_sbi_server_send_error(stream, + OGS_SBI_HTTP_STATUS_NOT_FOUND, + &message, "Not found", message.h.uri)); break; } @@ -233,9 +241,10 @@ void pcf_state_operational(ogs_fsm_t *s, pcf_event_t *e) if (!sess) { ogs_error("Not found [%s]", message.h.uri); - ogs_sbi_server_send_error(stream, - OGS_SBI_HTTP_STATUS_NOT_FOUND, - &message, "Not found", message.h.uri); + ogs_assert(true == + ogs_sbi_server_send_error(stream, + OGS_SBI_HTTP_STATUS_NOT_FOUND, + &message, "Not found", message.h.uri)); break; } @@ -253,9 +262,10 @@ void pcf_state_operational(ogs_fsm_t *s, pcf_event_t *e) DEFAULT ogs_error("Invalid API name [%s]", message.h.service.name); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, &message, - "Invalid API name", message.h.service.name); + "Invalid API name", message.h.service.name)); END /* In lib/sbi/server.c, notify_completed() releases 'request' buffer. */ @@ -511,9 +521,10 @@ void pcf_state_operational(ogs_fsm_t *s, pcf_event_t *e) subscription = e->sbi.data; ogs_assert(subscription); - ogs_nnrf_nfm_send_nf_status_subscribe(subscription->client, + ogs_assert(true == + ogs_nnrf_nfm_send_nf_status_subscribe(subscription->client, pcf_self()->nf_type, subscription->req_nf_instance_id, - subscription->subscr_cond.nf_type); + subscription->subscr_cond.nf_type)); ogs_info("[%s] Subscription validity expired", subscription->id); ogs_sbi_subscription_remove(subscription); @@ -556,9 +567,10 @@ void pcf_state_operational(ogs_fsm_t *s, pcf_event_t *e) } ogs_error("Cannot receive SBI message"); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_GATEWAY_TIMEOUT, NULL, - "Cannot receive SBI message", NULL); + "Cannot receive SBI message", NULL)); break; default: diff --git a/src/pcf/sbi-path.c b/src/pcf/sbi-path.c index ac4478127f..2a47664afd 100644 --- a/src/pcf/sbi-path.c +++ b/src/pcf/sbi-path.c @@ -119,7 +119,7 @@ void pcf_sbi_close(void) ogs_sbi_server_stop_all(); } -void pcf_nnrf_nfm_send_nf_register(ogs_sbi_nf_instance_t *nf_instance) +bool pcf_nnrf_nfm_send_nf_register(ogs_sbi_nf_instance_t *nf_instance) { ogs_sbi_request_t *request = NULL; ogs_sbi_client_t *client = NULL; @@ -129,16 +129,15 @@ void pcf_nnrf_nfm_send_nf_register(ogs_sbi_nf_instance_t *nf_instance) ogs_assert(client); request = pcf_nnrf_nfm_build_register(nf_instance); - if (!request) { - ogs_error("ogs_nnrf_nfm_send_nf_register() failed"); - return; - } - ogs_sbi_client_send_request(client, client->cb, request, nf_instance); + ogs_expect_or_return_val(request, false); + + return ogs_sbi_client_send_request( + client, client->cb, request, nf_instance); } -void pcf_sbi_send(ogs_sbi_nf_instance_t *nf_instance, ogs_sbi_xact_t *xact) +bool pcf_sbi_send(ogs_sbi_nf_instance_t *nf_instance, ogs_sbi_xact_t *xact) { - ogs_sbi_send(nf_instance, client_cb, xact); + return ogs_sbi_send(nf_instance, client_cb, xact); } static bool pcf_sbi_discover_and_send(OpenAPI_nf_type_e target_nf_type, @@ -155,40 +154,52 @@ static bool pcf_sbi_discover_and_send(OpenAPI_nf_type_e target_nf_type, xact = ogs_sbi_xact_add(target_nf_type, sbi_object, build, context, data, pcf_timer_sbi_client_wait_expire); - if (!xact) return false; + ogs_expect_or_return_val(xact, false); xact->assoc_stream = stream; - return ogs_sbi_discover_and_send(xact, - (ogs_fsm_handler_t)pcf_nf_state_registered, client_cb); + if (ogs_sbi_discover_and_send(xact, + (ogs_fsm_handler_t)pcf_nf_state_registered, client_cb) != true) { + ogs_error("ogs_sbi_discover_and_send() failed"); + ogs_sbi_xact_remove(xact); + return false; + } + + return true; } -void pcf_ue_sbi_discover_and_send(OpenAPI_nf_type_e target_nf_type, +bool pcf_ue_sbi_discover_and_send(OpenAPI_nf_type_e target_nf_type, pcf_ue_t *pcf_ue, ogs_sbi_stream_t *stream, void *data, ogs_sbi_request_t *(*build)(pcf_ue_t *pcf_ue, void *data)) { if (pcf_sbi_discover_and_send(target_nf_type, &pcf_ue->sbi, stream, (ogs_sbi_build_f)build, pcf_ue, data) != true) { ogs_error("pcf_ue_sbi_discover_and_send() failed"); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_GATEWAY_TIMEOUT, NULL, - "Cannot discover", pcf_ue->supi); - return; + "Cannot discover", pcf_ue->supi)); + return false; } + + return true; } -void pcf_sess_sbi_discover_and_send(OpenAPI_nf_type_e target_nf_type, +bool pcf_sess_sbi_discover_and_send(OpenAPI_nf_type_e target_nf_type, pcf_sess_t *sess, ogs_sbi_stream_t *stream, void *data, ogs_sbi_request_t *(*build)(pcf_sess_t *sess, void *data)) { if (pcf_sbi_discover_and_send(target_nf_type, &sess->sbi, stream, (ogs_sbi_build_f)build, sess, data) != true) { ogs_error("pcf_sess_sbi_discover_and_send() failed"); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_GATEWAY_TIMEOUT, NULL, - "Cannot discover", NULL); - return; + "Cannot discover", NULL)); + return false; } + + return true; } static int client_notify_cb(ogs_sbi_response_t *response, void *data) @@ -216,7 +227,7 @@ static int client_notify_cb(ogs_sbi_response_t *response, void *data) return OGS_OK; } -void pcf_sbi_send_am_policy_control_notify(pcf_ue_t *pcf_ue) +bool pcf_sbi_send_am_policy_control_notify(pcf_ue_t *pcf_ue) { ogs_sbi_request_t *request = NULL; ogs_sbi_client_t *client = NULL; @@ -226,11 +237,11 @@ void pcf_sbi_send_am_policy_control_notify(pcf_ue_t *pcf_ue) ogs_assert(client); request = pcf_namf_callback_build_am_policy_control(pcf_ue, NULL); - ogs_assert(request); - ogs_sbi_client_send_request(client, client_notify_cb, request, NULL); + ogs_expect_or_return_val(request, false); + return ogs_sbi_client_send_request(client, client_notify_cb, request, NULL); } -void pcf_sbi_send_smpolicycontrol_notify(pcf_sess_t *sess) +bool pcf_sbi_send_smpolicycontrol_notify(pcf_sess_t *sess) { ogs_sbi_request_t *request = NULL; ogs_sbi_client_t *client = NULL; @@ -240,6 +251,6 @@ void pcf_sbi_send_smpolicycontrol_notify(pcf_sess_t *sess) ogs_assert(client); request = pcf_nsmf_callback_build_smpolicycontrol(sess, NULL); - ogs_assert(request); - ogs_sbi_client_send_request(client, client_notify_cb, request, NULL); + ogs_expect_or_return_val(request, false); + return ogs_sbi_client_send_request(client, client_notify_cb, request, NULL); } diff --git a/src/pcf/sbi-path.h b/src/pcf/sbi-path.h index d455adb6d3..fdd46f0ee3 100644 --- a/src/pcf/sbi-path.h +++ b/src/pcf/sbi-path.h @@ -33,18 +33,18 @@ extern "C" { int pcf_sbi_open(void); void pcf_sbi_close(void); -void pcf_nnrf_nfm_send_nf_register(ogs_sbi_nf_instance_t *nf_instance); +bool pcf_nnrf_nfm_send_nf_register(ogs_sbi_nf_instance_t *nf_instance); -void pcf_sbi_send(ogs_sbi_nf_instance_t *nf_instance, ogs_sbi_xact_t *xact); -void pcf_ue_sbi_discover_and_send(OpenAPI_nf_type_e target_nf_type, +bool pcf_sbi_send(ogs_sbi_nf_instance_t *nf_instance, ogs_sbi_xact_t *xact); +bool pcf_ue_sbi_discover_and_send(OpenAPI_nf_type_e target_nf_type, pcf_ue_t *pcf_ue, ogs_sbi_stream_t *stream, void *data, ogs_sbi_request_t *(*build)(pcf_ue_t *pcf_ue, void *data)); -void pcf_sess_sbi_discover_and_send(OpenAPI_nf_type_e target_nf_type, +bool pcf_sess_sbi_discover_and_send(OpenAPI_nf_type_e target_nf_type, pcf_sess_t *sess, ogs_sbi_stream_t *stream, void *data, ogs_sbi_request_t *(*build)(pcf_sess_t *sess, void *data)); -void pcf_sbi_send_am_policy_control_notify(pcf_ue_t *pcf_ue); -void pcf_sbi_send_smpolicycontrol_notify(pcf_sess_t *sess); +bool pcf_sbi_send_am_policy_control_notify(pcf_ue_t *pcf_ue); +bool pcf_sbi_send_smpolicycontrol_notify(pcf_sess_t *sess); #ifdef __cplusplus } diff --git a/src/pcf/sm-sm.c b/src/pcf/sm-sm.c index 296c64af7f..32f988bd0c 100644 --- a/src/pcf/sm-sm.c +++ b/src/pcf/sm-sm.c @@ -94,9 +94,10 @@ void pcf_sm_state_operational(ogs_fsm_t *s, pcf_event_t *e) DEFAULT ogs_error("[%s:%d] Invalid HTTP URI [%s]", pcf_ue->supi, sess->psi, message->h.uri); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_FORBIDDEN, message, - "Invalid HTTP method", message->h.uri); + "Invalid HTTP method", message->h.uri)); END } break; @@ -113,9 +114,10 @@ void pcf_sm_state_operational(ogs_fsm_t *s, pcf_event_t *e) DEFAULT ogs_error("[%s:%d] Invalid HTTP URI [%s]", pcf_ue->supi, sess->psi, message->h.uri); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_FORBIDDEN, message, - "Invalid HTTP method", message->h.uri); + "Invalid HTTP method", message->h.uri)); END } break; @@ -149,8 +151,10 @@ void pcf_sm_state_operational(ogs_fsm_t *s, pcf_event_t *e) ogs_error("[%s:%d] HTTP response error [%d]", pcf_ue->supi, sess->psi, message->res_status); } - ogs_sbi_server_send_error(stream, message->res_status, - NULL, "HTTP response error", pcf_ue->supi); + ogs_assert(true == + ogs_sbi_server_send_error( + stream, message->res_status, + NULL, "HTTP response error", pcf_ue->supi)); break; } @@ -183,9 +187,10 @@ void pcf_sm_state_operational(ogs_fsm_t *s, pcf_event_t *e) OGS_SBI_HTTP_STATUS_NO_CONTENT) { ogs_error("[%s:%d] HTTP response error [%d]", pcf_ue->supi, sess->psi, message->res_status); - ogs_sbi_server_send_error(stream, - message->res_status, - NULL, "HTTP response error", pcf_ue->supi); + ogs_assert(true == + ogs_sbi_server_send_error(stream, + message->res_status, + NULL, "HTTP response error", pcf_ue->supi)); OGS_FSM_TRAN(s, pcf_sm_state_exception); break; } diff --git a/src/pcrf/pcrf-context.c b/src/pcrf/pcrf-context.c index d4e064358a..6f0ea7b3d9 100644 --- a/src/pcrf/pcrf-context.c +++ b/src/pcrf/pcrf-context.c @@ -51,6 +51,7 @@ void pcrf_context_init(void) ogs_thread_mutex_init(&self.hash_lock); self.ip_hash = ogs_hash_make(); + ogs_assert(self.ip_hash); context_initialized = 1; } diff --git a/src/pcrf/pcrf-gx-path.c b/src/pcrf/pcrf-gx-path.c index eee46b05bb..65ee685400 100644 --- a/src/pcrf/pcrf-gx-path.c +++ b/src/pcrf/pcrf-gx-path.c @@ -77,12 +77,12 @@ static __inline__ struct sess_state *new_state(os0_t sid) ogs_thread_mutex_lock(&sess_state_mutex); ogs_pool_alloc(&sess_state_pool, &new); - ogs_assert(new); + ogs_expect_or_return_val(new, NULL); memset(new, 0, sizeof(*new)); ogs_thread_mutex_unlock(&sess_state_mutex); new->sid = (os0_t)ogs_strdup((char *)sid); - ogs_assert(new->sid); + ogs_expect_or_return_val(new->sid, NULL); ogs_list_init(&new->rx_list); @@ -98,12 +98,12 @@ static struct rx_sess_state *add_rx_state(struct sess_state *gx, os0_t sid) ogs_thread_mutex_lock(&sess_state_mutex); ogs_pool_alloc(&rx_sess_state_pool, &new); - ogs_assert(new); + ogs_expect_or_return_val(new, NULL); memset(new, 0, sizeof(*new)); ogs_thread_mutex_unlock(&sess_state_mutex); new->sid = (os0_t)ogs_strdup((char *)sid); - ogs_assert(new->sid); + ogs_expect_or_return_val(new->sid, NULL); new->gx = gx; @@ -1366,6 +1366,7 @@ static int flow_rx_to_gx(ogs_flow_t *rx_flow, ogs_flow_t *gx_flow) "permit out", strlen("permit out"))) { gx_flow->direction = OGS_FLOW_DOWNLINK_ONLY; gx_flow->description = ogs_strdup(rx_flow->description); + ogs_assert(gx_flow->description); } else if (!strncmp(rx_flow->description, "permit in", strlen("permit in"))) { @@ -1375,6 +1376,7 @@ static int flow_rx_to_gx(ogs_flow_t *rx_flow, ogs_flow_t *gx_flow) * 'permit out' in Gx Diameter */ len = strlen(rx_flow->description)+2; gx_flow->description = ogs_malloc(len); + ogs_assert(gx_flow->description); strcpy(gx_flow->description, "permit out"); from_str = strstr(&rx_flow->description[strlen("permit in")], "from"); ogs_assert(from_str); diff --git a/src/pcrf/pcrf-rx-path.c b/src/pcrf/pcrf-rx-path.c index 73c4022d29..7b6882654c 100644 --- a/src/pcrf/pcrf-rx-path.c +++ b/src/pcrf/pcrf-rx-path.c @@ -51,12 +51,12 @@ static __inline__ struct sess_state *new_state(os0_t sid) ogs_thread_mutex_lock(&sess_state_mutex); ogs_pool_alloc(&sess_state_pool, &new); - ogs_assert(new); + ogs_expect_or_return_val(new, NULL); memset(new, 0, sizeof(*new)); ogs_thread_mutex_unlock(&sess_state_mutex); new->rx_sid = (os0_t)ogs_strdup((char *)sid); - ogs_assert(new->rx_sid); + ogs_expect_or_return_val(new->rx_sid, NULL); return new; } @@ -318,11 +318,15 @@ static int pcrf_rx_aar_cb( struct msg **msg, struct avp *avp, // Test for no port if (to_port != NULL) { flow->description = ogs_malloc(len - - strlen(to_str) + strlen("to any") + - strlen(to_str) + + strlen("to any") + strlen(to_port) + 1); + ogs_assert(flow->description); } else { flow->description = ogs_malloc(len - - strlen(to_str) + strlen("to any") + 1); + - strlen(to_str) + + strlen("to any") + 1); + ogs_assert(flow->description); } } @@ -339,22 +343,28 @@ static int pcrf_rx_aar_cb( struct msg **msg, struct avp *avp, from_ip = strstr(from_str, " "); if (from_ip != NULL) { - // Exclude the starting whitespace + /* Exclude the starting whitespace */ from_ip += 1; from_port = strstr(from_ip, " "); - // Test for no port + whether from_port is at "to" - // without any from port + /* Test for no port + + * whether from_port is at "to" + * without any from port */ if (from_port != NULL && strncmp(from_port, " to", 3)) { flow->description = ogs_malloc( - len - strlen(from_str) + strlen(to_str) + len - strlen(from_str) + + strlen(to_str) + strlen("from any") + 1 - + (strlen(from_port) - strlen(to_str))); + + (strlen(from_port) - + strlen(to_str))); + ogs_assert(flow->description); } else { flow->description = ogs_malloc( - len - strlen(from_str) + strlen(to_str) + len - strlen(from_str) + + strlen(to_str) + strlen("from any ") + 1); + ogs_assert(flow->description); } } @@ -377,6 +387,7 @@ static int pcrf_rx_aar_cb( struct msg **msg, struct avp *avp, } else { flow->description = ogs_malloc( hdr->avp_value->os.len+1); + ogs_assert(flow->description); ogs_cpystrn( flow->description, (char*)hdr->avp_value->os.data, diff --git a/src/sgwc/context.c b/src/sgwc/context.c index 878e697d9b..2355a59751 100644 --- a/src/sgwc/context.c +++ b/src/sgwc/context.c @@ -51,6 +51,7 @@ void sgwc_context_init(void) ogs_pool_init(&sgwc_tunnel_pool, ogs_app()->pool.tunnel); self.imsi_ue_hash = ogs_hash_make(); + ogs_assert(self.imsi_ue_hash); ogs_list_init(&self.sgw_ue_list); @@ -675,8 +676,10 @@ sgwc_tunnel_t *sgwc_tunnel_add( ogs_assert(pdr); pdr->src_if = src_if; - if (sess->session.name) + if (sess->session.name) { pdr->apn = ogs_strdup(sess->session.name); + ogs_assert(pdr->apn); + } pdr->outer_header_removal_len = 1; if (sess->session.session_type == OGS_PDU_SESSION_TYPE_IPV4) { @@ -728,9 +731,13 @@ sgwc_tunnel_t *sgwc_tunnel_add( tunnel->local_teid = tunnel->index; } else { if (sess->pfcp_node->addr.ogs_sa_family == AF_INET) - ogs_copyaddrinfo(&tunnel->local_addr, &sess->pfcp_node->addr); + ogs_assert(OGS_OK == + ogs_copyaddrinfo( + &tunnel->local_addr, &sess->pfcp_node->addr)); else if (sess->pfcp_node->addr.ogs_sa_family == AF_INET6) - ogs_copyaddrinfo(&tunnel->local_addr6, &sess->pfcp_node->addr); + ogs_assert(OGS_OK == + ogs_copyaddrinfo( + &tunnel->local_addr6, &sess->pfcp_node->addr)); else ogs_assert_if_reached(); diff --git a/src/sgwc/pfcp-path.c b/src/sgwc/pfcp-path.c index 2c38f03f19..218281f4f1 100644 --- a/src/sgwc/pfcp-path.c +++ b/src/sgwc/pfcp-path.c @@ -225,7 +225,7 @@ int sgwc_pfcp_send_session_establishment_request( xact->assoc_xact = gtp_xact; if (gtpbuf) { xact->gtpbuf = ogs_pkbuf_copy(gtpbuf); - ogs_assert(xact->gtpbuf); + ogs_expect_or_return_val(xact->gtpbuf, OGS_ERROR); } rv = ogs_pfcp_xact_commit(xact); @@ -259,7 +259,7 @@ int sgwc_pfcp_send_sess_modification_request( xact->modify_flags = flags | OGS_PFCP_MODIFY_SESSION; if (gtpbuf) { xact->gtpbuf = ogs_pkbuf_copy(gtpbuf); - ogs_assert(xact->gtpbuf); + ogs_expect_or_return_val(xact->gtpbuf, OGS_ERROR); } rv = ogs_pfcp_xact_commit(xact); @@ -296,7 +296,7 @@ int sgwc_pfcp_send_bearer_modification_request( xact->modify_flags = flags; if (gtpbuf) { xact->gtpbuf = ogs_pkbuf_copy(gtpbuf); - ogs_assert(xact->gtpbuf); + ogs_expect_or_return_val(xact->gtpbuf, OGS_ERROR); } rv = ogs_pfcp_xact_commit(xact); @@ -328,7 +328,7 @@ int sgwc_pfcp_send_session_deletion_request( xact->assoc_xact = gtp_xact; if (gtpbuf) { xact->gtpbuf = ogs_pkbuf_copy(gtpbuf); - ogs_assert(xact->gtpbuf); + ogs_expect_or_return_val(xact->gtpbuf, OGS_ERROR); } rv = ogs_pfcp_xact_commit(xact); @@ -360,4 +360,4 @@ int sgwc_pfcp_send_session_report_response( ogs_expect(rv == OGS_OK); return rv; -} \ No newline at end of file +} diff --git a/src/sgwc/pfcp-sm.c b/src/sgwc/pfcp-sm.c index 2af69bf61f..c962759ae1 100644 --- a/src/sgwc/pfcp-sm.c +++ b/src/sgwc/pfcp-sm.c @@ -188,12 +188,14 @@ void sgwc_pfcp_state_associated(ogs_fsm_t *s, sgwc_event_t *e) switch (message->h.type) { case OGS_PFCP_HEARTBEAT_REQUEST_TYPE: - ogs_pfcp_handle_heartbeat_request(node, xact, - &message->pfcp_heartbeat_request); + ogs_assert(true == + ogs_pfcp_handle_heartbeat_request(node, xact, + &message->pfcp_heartbeat_request)); break; case OGS_PFCP_HEARTBEAT_RESPONSE_TYPE: - ogs_pfcp_handle_heartbeat_response(node, xact, - &message->pfcp_heartbeat_response); + ogs_assert(true == + ogs_pfcp_handle_heartbeat_response(node, xact, + &message->pfcp_heartbeat_response)); break; case OGS_PFCP_ASSOCIATION_SETUP_REQUEST_TYPE: ogs_warn("PFCP[REQ] has already been associated"); @@ -261,7 +263,8 @@ void sgwc_pfcp_state_associated(ogs_fsm_t *s, sgwc_event_t *e) node = e->pfcp_node; ogs_assert(node); - ogs_pfcp_send_heartbeat_request(node, node_timeout); + ogs_assert(OGS_OK == + ogs_pfcp_send_heartbeat_request(node, node_timeout)); break; default: ogs_error("Unknown timer[%s:%d]", diff --git a/src/sgwc/s11-handler.c b/src/sgwc/s11-handler.c index 81526b0d53..df2a3b2e24 100644 --- a/src/sgwc/s11-handler.c +++ b/src/sgwc/s11-handler.c @@ -396,8 +396,9 @@ void sgwc_s11_handle_modify_bearer_request( far->apply_action = OGS_PFCP_APPLY_ACTION_FORW; - ogs_pfcp_ip_to_outer_header_creation(&dl_tunnel->remote_ip, - &far->outer_header_creation, &far->outer_header_creation_len); + ogs_assert(OGS_OK == + ogs_pfcp_ip_to_outer_header_creation(&dl_tunnel->remote_ip, + &far->outer_header_creation, &far->outer_header_creation_len)); far->outer_header_creation.teid = dl_tunnel->remote_teid; ogs_debug(" MME_S11_TEID[%d] SGW_S11_TEID[%d]", @@ -622,8 +623,9 @@ void sgwc_s11_handle_create_bearer_response( far->apply_action = OGS_PFCP_APPLY_ACTION_FORW; - ogs_pfcp_ip_to_outer_header_creation(&dl_tunnel->remote_ip, - &far->outer_header_creation, &far->outer_header_creation_len); + ogs_assert(OGS_OK == + ogs_pfcp_ip_to_outer_header_creation(&dl_tunnel->remote_ip, + &far->outer_header_creation, &far->outer_header_creation_len)); far->outer_header_creation.teid = dl_tunnel->remote_teid; decoded = ogs_gtp_parse_uli(&uli, &rsp->user_location_information); @@ -1005,8 +1007,11 @@ void sgwc_s11_handle_create_indirect_data_forwarding_tunnel_request( far->apply_action = OGS_PFCP_APPLY_ACTION_FORW; - ogs_pfcp_ip_to_outer_header_creation(&tunnel->remote_ip, - &far->outer_header_creation, &far->outer_header_creation_len); + ogs_assert(OGS_OK == + ogs_pfcp_ip_to_outer_header_creation( + &tunnel->remote_ip, + &far->outer_header_creation, + &far->outer_header_creation_len)); far->outer_header_creation.teid = tunnel->remote_teid; ogs_debug(" SGW_DL_TEID[%d] ENB_DL_TEID[%d]", @@ -1037,8 +1042,11 @@ void sgwc_s11_handle_create_indirect_data_forwarding_tunnel_request( far->apply_action = OGS_PFCP_APPLY_ACTION_FORW; - ogs_pfcp_ip_to_outer_header_creation(&tunnel->remote_ip, - &far->outer_header_creation, &far->outer_header_creation_len); + ogs_assert(OGS_OK == + ogs_pfcp_ip_to_outer_header_creation( + &tunnel->remote_ip, + &far->outer_header_creation, + &far->outer_header_creation_len)); far->outer_header_creation.teid = tunnel->remote_teid; ogs_debug(" SGW_UL_TEID[%d] ENB_UL_TEID[%d]", diff --git a/src/sgwc/s5c-handler.c b/src/sgwc/s5c-handler.c index c21c029960..29318248b1 100644 --- a/src/sgwc/s5c-handler.c +++ b/src/sgwc/s5c-handler.c @@ -211,8 +211,9 @@ void sgwc_s5c_handle_create_session_response( far->apply_action = OGS_PFCP_APPLY_ACTION_FORW; - ogs_pfcp_ip_to_outer_header_creation(&ul_tunnel->remote_ip, - &far->outer_header_creation, &far->outer_header_creation_len); + ogs_assert(OGS_OK == + ogs_pfcp_ip_to_outer_header_creation(&ul_tunnel->remote_ip, + &far->outer_header_creation, &far->outer_header_creation_len)); far->outer_header_creation.teid = ul_tunnel->remote_teid; /* Receive Control Plane(UL) : PGW-S5C */ @@ -382,8 +383,9 @@ void sgwc_s5c_handle_create_bearer_request( far->apply_action = OGS_PFCP_APPLY_ACTION_FORW; - ogs_pfcp_ip_to_outer_header_creation(&ul_tunnel->remote_ip, - &far->outer_header_creation, &far->outer_header_creation_len); + ogs_assert(OGS_OK == + ogs_pfcp_ip_to_outer_header_creation(&ul_tunnel->remote_ip, + &far->outer_header_creation, &far->outer_header_creation_len)); far->outer_header_creation.teid = ul_tunnel->remote_teid; ogs_assert(OGS_OK == diff --git a/src/sgwc/sxa-build.c b/src/sgwc/sxa-build.c index a14557f2db..ecdc3e6874 100644 --- a/src/sgwc/sxa-build.c +++ b/src/sgwc/sxa-build.c @@ -30,7 +30,7 @@ ogs_pkbuf_t *sgwc_sxa_build_session_establishment_request( ogs_pfcp_far_t *far = NULL; ogs_pfcp_urr_t *urr = NULL; ogs_pfcp_qer_t *qer = NULL; - int i; + int i, rv; ogs_pfcp_node_id_t node_id; ogs_pfcp_f_seid_t f_seid; @@ -43,18 +43,20 @@ ogs_pkbuf_t *sgwc_sxa_build_session_establishment_request( memset(&pfcp_message, 0, sizeof(ogs_pfcp_message_t)); /* Node ID */ - ogs_pfcp_sockaddr_to_node_id( + rv = ogs_pfcp_sockaddr_to_node_id( ogs_pfcp_self()->pfcp_addr, ogs_pfcp_self()->pfcp_addr6, ogs_app()->parameter.prefer_ipv4, &node_id, &len); + ogs_expect_or_return_val(rv == OGS_OK, NULL); req->node_id.presence = 1; req->node_id.data = &node_id; req->node_id.len = len; /* F-SEID */ - ogs_pfcp_sockaddr_to_f_seid( + rv = ogs_pfcp_sockaddr_to_f_seid( ogs_pfcp_self()->pfcp_addr, ogs_pfcp_self()->pfcp_addr6, &f_seid, &len); + ogs_expect_or_return_val(rv == OGS_OK, NULL); f_seid.seid = htobe64(sess->sgwc_sxa_seid); req->cp_f_seid.presence = 1; req->cp_f_seid.data = &f_seid; diff --git a/src/sgwc/sxa-handler.c b/src/sgwc/sxa-handler.c index 6c75c1ad6a..dc32a006b2 100644 --- a/src/sgwc/sxa-handler.c +++ b/src/sgwc/sxa-handler.c @@ -211,7 +211,7 @@ void sgwc_sxa_handle_session_establishment_response( ogs_assert(far); if (pdr->src_if == OGS_PFCP_INTERFACE_CP_FUNCTION) - ogs_pfcp_setup_pdr_gtpu_node(pdr); + ogs_assert(OGS_ERROR != ogs_pfcp_setup_pdr_gtpu_node(pdr)); if (far->dst_if == OGS_PFCP_INTERFACE_CP_FUNCTION) ogs_pfcp_far_teid_hash_set(far); @@ -226,9 +226,10 @@ void sgwc_sxa_handle_session_establishment_response( if (tunnel->local_addr6) ogs_freeaddrinfo(tunnel->local_addr6); - ogs_pfcp_f_teid_to_sockaddr( + ogs_assert(OGS_OK == + ogs_pfcp_f_teid_to_sockaddr( &pdr->f_teid, pdr->f_teid_len, - &tunnel->local_addr, &tunnel->local_addr6); + &tunnel->local_addr, &tunnel->local_addr6)); tunnel->local_teid = pdr->f_teid.teid; } } @@ -430,7 +431,7 @@ void sgwc_sxa_handle_session_modification_response( ogs_assert(far); if (pdr->src_if == OGS_PFCP_INTERFACE_CP_FUNCTION) - ogs_pfcp_setup_pdr_gtpu_node(pdr); + ogs_assert(OGS_ERROR != ogs_pfcp_setup_pdr_gtpu_node(pdr)); if (far->dst_if == OGS_PFCP_INTERFACE_CP_FUNCTION) ogs_pfcp_far_teid_hash_set(far); @@ -445,9 +446,10 @@ void sgwc_sxa_handle_session_modification_response( if (tunnel->local_addr6) ogs_freeaddrinfo(tunnel->local_addr6); - ogs_pfcp_f_teid_to_sockaddr( + ogs_assert(OGS_OK == + ogs_pfcp_f_teid_to_sockaddr( &pdr->f_teid, pdr->f_teid_len, - &tunnel->local_addr, &tunnel->local_addr6); + &tunnel->local_addr, &tunnel->local_addr6)); tunnel->local_teid = pdr->f_teid.teid; } } @@ -630,7 +632,7 @@ void sgwc_sxa_handle_session_modification_response( rv = ogs_gtp_sockaddr_to_f_teid( ul_tunnel->local_addr, ul_tunnel->local_addr6, &sgw_s1u_teid, &len); - ogs_expect(rv == OGS_OK); + ogs_assert(rv == OGS_OK); gtp_req->bearer_contexts.s1_u_enodeb_f_teid.presence = 1; gtp_req->bearer_contexts.s1_u_enodeb_f_teid.data = &sgw_s1u_teid; gtp_req->bearer_contexts.s1_u_enodeb_f_teid.len = len; @@ -677,7 +679,7 @@ void sgwc_sxa_handle_session_modification_response( rv = ogs_gtp_sockaddr_to_f_teid( dl_tunnel->local_addr, dl_tunnel->local_addr6, &sgw_s5u_teid, &len); - ogs_expect(rv == OGS_OK); + ogs_assert(rv == OGS_OK); gtp_rsp->bearer_contexts.s5_s8_u_sgw_f_teid.presence = 1; gtp_rsp->bearer_contexts.s5_s8_u_sgw_f_teid.data = &sgw_s5u_teid; gtp_rsp->bearer_contexts.s5_s8_u_sgw_f_teid.len = len; @@ -766,7 +768,7 @@ void sgwc_sxa_handle_session_modification_response( rv = ogs_gtp_sockaddr_to_f_teid( tunnel->local_addr, tunnel->local_addr6, &rsp_dl_teid[i], &len); - ogs_expect(rv == OGS_OK); + ogs_assert(rv == OGS_OK); gtp_rsp->bearer_contexts[i]. s4_u_sgsn_f_teid.presence = 1; gtp_rsp->bearer_contexts[i]. @@ -787,7 +789,7 @@ void sgwc_sxa_handle_session_modification_response( rv = ogs_gtp_sockaddr_to_f_teid( tunnel->local_addr, tunnel->local_addr6, &rsp_ul_teid[i], &len); - ogs_expect(rv == OGS_OK); + ogs_assert(rv == OGS_OK); gtp_rsp->bearer_contexts[i]. s2b_u_epdg_f_teid_5.presence = 1; gtp_rsp->bearer_contexts[i]. @@ -853,7 +855,7 @@ void sgwc_sxa_handle_session_modification_response( rv = ogs_gtp_sockaddr_to_f_teid( ogs_gtp_self()->gtpc_addr, ogs_gtp_self()->gtpc_addr6, &sgw_s11_teid, &len); - ogs_expect(rv == OGS_OK); + ogs_assert(rv == OGS_OK); gtp_rsp->sender_f_teid_for_control_plane.presence = 1; gtp_rsp->sender_f_teid_for_control_plane.data = &sgw_s11_teid; gtp_rsp->sender_f_teid_for_control_plane.len = len; @@ -866,7 +868,7 @@ void sgwc_sxa_handle_session_modification_response( rv = ogs_gtp_sockaddr_to_f_teid( ul_tunnel->local_addr, ul_tunnel->local_addr6, &sgw_s1u_teid, &len); - ogs_expect(rv == OGS_OK); + ogs_assert(rv == OGS_OK); gtp_rsp->bearer_contexts_created.s1_u_enodeb_f_teid.presence = 1; gtp_rsp->bearer_contexts_created.s1_u_enodeb_f_teid.data = &sgw_s1u_teid; diff --git a/src/sgwu/context.c b/src/sgwu/context.c index b5e3dc2692..62b4796b7c 100644 --- a/src/sgwu/context.c +++ b/src/sgwu/context.c @@ -45,6 +45,7 @@ void sgwu_context_init(void) ogs_pool_init(&sgwu_sess_pool, ogs_app()->pool.sess); self.sess_hash = ogs_hash_make(); + ogs_assert(self.sess_hash); context_initialized = 1; } diff --git a/src/sgwu/gtp-path.c b/src/sgwu/gtp-path.c index e32990090a..c523e3e3c5 100644 --- a/src/sgwu/gtp-path.c +++ b/src/sgwu/gtp-path.c @@ -71,6 +71,7 @@ static void _gtpv1_u_recv_cb(short when, ogs_socket_t fd, void *data) ogs_debug("[RECV] Echo Request from [%s]", OGS_ADDR(&from, buf)); echo_rsp = ogs_gtp_handle_echo_req(pkbuf); + ogs_expect(echo_rsp); if (echo_rsp) { ssize_t sent; @@ -133,7 +134,8 @@ static void _gtpv1_u_recv_cb(short when, ogs_socket_t fd, void *data) far = ogs_pfcp_far_find_by_error_indication(pkbuf); if (far) { - ogs_pfcp_up_handle_error_indication(far, &report); + ogs_assert(true == + ogs_pfcp_up_handle_error_indication(far, &report)); if (report.type.error_indication_report) { ogs_assert(far->sess); @@ -206,7 +208,7 @@ static void _gtpv1_u_recv_cb(short when, ogs_socket_t fd, void *data) } ogs_assert(pdr); - ogs_pfcp_up_handle_pdr(pdr, pkbuf, &report); + ogs_assert(true == ogs_pfcp_up_handle_pdr(pdr, pkbuf, &report)); if (report.type.downlink_data_report) { ogs_assert(pdr->sess); @@ -273,4 +275,4 @@ int sgwu_gtp_open(void) void sgwu_gtp_close(void) { ogs_socknode_remove_all(&ogs_gtp_self()->gtpu_list); -} \ No newline at end of file +} diff --git a/src/sgwu/pfcp-sm.c b/src/sgwu/pfcp-sm.c index 2e55b6f833..5eb64079a6 100644 --- a/src/sgwu/pfcp-sm.c +++ b/src/sgwu/pfcp-sm.c @@ -184,12 +184,14 @@ void sgwu_pfcp_state_associated(ogs_fsm_t *s, sgwu_event_t *e) switch (message->h.type) { case OGS_PFCP_HEARTBEAT_REQUEST_TYPE: - ogs_pfcp_handle_heartbeat_request(node, xact, - &message->pfcp_heartbeat_request); + ogs_assert(true == + ogs_pfcp_handle_heartbeat_request(node, xact, + &message->pfcp_heartbeat_request)); break; case OGS_PFCP_HEARTBEAT_RESPONSE_TYPE: - ogs_pfcp_handle_heartbeat_response(node, xact, - &message->pfcp_heartbeat_response); + ogs_assert(true == + ogs_pfcp_handle_heartbeat_response(node, xact, + &message->pfcp_heartbeat_response)); break; case OGS_PFCP_ASSOCIATION_SETUP_REQUEST_TYPE: ogs_warn("PFCP[REQ] has already been associated"); @@ -236,7 +238,8 @@ void sgwu_pfcp_state_associated(ogs_fsm_t *s, sgwu_event_t *e) node = e->pfcp_node; ogs_assert(node); - ogs_pfcp_send_heartbeat_request(node, node_timeout); + ogs_assert(OGS_OK == + ogs_pfcp_send_heartbeat_request(node, node_timeout)); break; default: ogs_error("Unknown timer[%s:%d]", diff --git a/src/sgwu/sxa-build.c b/src/sgwu/sxa-build.c index 16df936772..f26d16d83d 100644 --- a/src/sgwu/sxa-build.c +++ b/src/sgwu/sxa-build.c @@ -26,7 +26,7 @@ ogs_pkbuf_t *sgwu_sxa_build_session_establishment_response(uint8_t type, ogs_pfcp_session_establishment_response_t *rsp = NULL; ogs_pkbuf_t *pkbuf = NULL; - int i = 0; + int i = 0, rv; ogs_pfcp_node_id_t node_id; ogs_pfcp_f_seid_t f_seid; @@ -38,10 +38,11 @@ ogs_pkbuf_t *sgwu_sxa_build_session_establishment_response(uint8_t type, memset(&pfcp_message, 0, sizeof(ogs_pfcp_message_t)); /* Node ID */ - ogs_pfcp_sockaddr_to_node_id( + rv = ogs_pfcp_sockaddr_to_node_id( ogs_pfcp_self()->pfcp_addr, ogs_pfcp_self()->pfcp_addr6, ogs_app()->parameter.prefer_ipv4, &node_id, &len); + ogs_expect_or_return_val(rv == OGS_OK, NULL); rsp->node_id.presence = 1; rsp->node_id.data = &node_id; rsp->node_id.len = len; @@ -51,9 +52,10 @@ ogs_pkbuf_t *sgwu_sxa_build_session_establishment_response(uint8_t type, rsp->cause.u8 = OGS_PFCP_CAUSE_REQUEST_ACCEPTED; /* F-SEID */ - ogs_pfcp_sockaddr_to_f_seid( + rv = ogs_pfcp_sockaddr_to_f_seid( ogs_pfcp_self()->pfcp_addr, ogs_pfcp_self()->pfcp_addr6, &f_seid, &len); + ogs_expect_or_return_val(rv == OGS_OK, NULL); f_seid.seid = htobe64(sess->sgwu_sxa_seid); rsp->up_f_seid.presence = 1; rsp->up_f_seid.data = &f_seid; diff --git a/src/sgwu/sxa-handler.c b/src/sgwu/sxa-handler.c index 901c0653aa..bdc35fe57c 100644 --- a/src/sgwu/sxa-handler.c +++ b/src/sgwu/sxa-handler.c @@ -81,7 +81,7 @@ void sgwu_sxa_handle_session_establishment_request( /* Setup GTP Node */ ogs_list_for_each(&sess->pfcp.far_list, far) { - ogs_pfcp_setup_far_gtpu_node(far); + ogs_assert(OGS_ERROR != ogs_pfcp_setup_far_gtpu_node(far)); if (far->gnode) ogs_pfcp_far_f_teid_hash_set(far); } @@ -120,8 +120,9 @@ void sgwu_sxa_handle_session_establishment_request( &ogs_gtp_self()->gtpu_resource_list, pdr->apn, OGS_PFCP_INTERFACE_ACCESS); if (resource) { - ogs_pfcp_user_plane_ip_resource_info_to_f_teid( - &resource->info, &pdr->f_teid, &pdr->f_teid_len); + ogs_assert(OGS_OK == + ogs_pfcp_user_plane_ip_resource_info_to_f_teid( + &resource->info, &pdr->f_teid, &pdr->f_teid_len)); if (resource->info.teidri) pdr->f_teid.teid = OGS_PFCP_GTPU_INDEX_TO_TEID( pdr->index, resource->info.teidri, @@ -227,7 +228,7 @@ void sgwu_sxa_handle_session_modification_request( ogs_list_for_each(&sess->pfcp.pdr_list, pdr) { far = pdr->far; if (far && far->smreq_flags.send_end_marker_packets) - ogs_pfcp_send_end_marker(pdr); + ogs_assert(OGS_ERROR != ogs_pfcp_send_end_marker(pdr)); } /* Clear PFCPSMReq-Flags */ ogs_list_for_each(&sess->pfcp.far_list, far) @@ -285,7 +286,7 @@ void sgwu_sxa_handle_session_modification_request( /* Setup GTP Node */ ogs_list_for_each(&sess->pfcp.far_list, far) { - ogs_pfcp_setup_far_gtpu_node(far); + ogs_assert(OGS_ERROR != ogs_pfcp_setup_far_gtpu_node(far)); if (far->gnode) ogs_pfcp_far_f_teid_hash_set(far); } @@ -324,8 +325,9 @@ void sgwu_sxa_handle_session_modification_request( &ogs_gtp_self()->gtpu_resource_list, pdr->apn, OGS_PFCP_INTERFACE_ACCESS); if (resource) { - ogs_pfcp_user_plane_ip_resource_info_to_f_teid( - &resource->info, &pdr->f_teid, &pdr->f_teid_len); + ogs_assert(OGS_OK == + ogs_pfcp_user_plane_ip_resource_info_to_f_teid( + &resource->info, &pdr->f_teid, &pdr->f_teid_len)); if (resource->info.teidri) pdr->f_teid.teid = OGS_PFCP_GTPU_INDEX_TO_TEID( pdr->index, resource->info.teidri, diff --git a/src/smf/binding.c b/src/smf/binding.c index d7ff6dc6c3..ddbd5bfe41 100644 --- a/src/smf/binding.c +++ b/src/smf/binding.c @@ -193,12 +193,14 @@ void smf_bearer_binding(smf_sess_t *sess) bearer->pgw_s5u_teid = bearer->index; } else { if (sess->pfcp_node->addr.ogs_sa_family == AF_INET) - ogs_copyaddrinfo(&bearer->pgw_s5u_addr, - &sess->pfcp_node->addr); + ogs_assert(OGS_OK == + ogs_copyaddrinfo(&bearer->pgw_s5u_addr, + &sess->pfcp_node->addr)); else if (sess->pfcp_node->addr.ogs_sa_family == AF_INET6) - ogs_copyaddrinfo(&bearer->pgw_s5u_addr6, - &sess->pfcp_node->addr); + ogs_assert(OGS_OK == + ogs_copyaddrinfo(&bearer->pgw_s5u_addr6, + &sess->pfcp_node->addr)); else ogs_assert_if_reached(); @@ -282,6 +284,7 @@ void smf_bearer_binding(smf_sess_t *sess) pf->direction = flow->direction; pf->flow_description = ogs_strdup(flow->description); + ogs_assert(pf->flow_description); rv = ogs_ipfw_compile_rule( &pf->ipfw_rule, pf->flow_description); @@ -401,7 +404,7 @@ void smf_bearer_binding(smf_sess_t *sess) } } -void smf_gtp_send_create_bearer_request(smf_bearer_t *bearer) +int smf_gtp_send_create_bearer_request(smf_bearer_t *bearer) { int rv; @@ -423,14 +426,16 @@ void smf_gtp_send_create_bearer_request(smf_bearer_t *bearer) encode_traffic_flow_template(&tft, bearer, OGS_GTP_TFT_CODE_CREATE_NEW_TFT); pkbuf = smf_s5c_build_create_bearer_request(h.type, bearer, &tft); - ogs_expect_or_return(pkbuf); + ogs_expect_or_return_val(pkbuf, OGS_ERROR); xact = ogs_gtp_xact_local_create( sess->gnode, &h, pkbuf, bearer_timeout, bearer); - ogs_expect_or_return(xact); + ogs_expect_or_return_val(xact, OGS_ERROR); rv = ogs_gtp_xact_commit(xact); ogs_expect(rv == OGS_OK); + + return rv; } void smf_qos_flow_binding(smf_sess_t *sess, ogs_sbi_stream_t *stream) @@ -576,6 +581,7 @@ void smf_qos_flow_binding(smf_sess_t *sess, ogs_sbi_stream_t *stream) pf->direction = flow->direction; pf->flow_description = ogs_strdup(flow->description); + ogs_assert(pf->flow_description); rv = ogs_ipfw_compile_rule( &pf->ipfw_rule, pf->flow_description); diff --git a/src/smf/binding.h b/src/smf/binding.h index 3b28be4df0..45ffaab0c7 100644 --- a/src/smf/binding.h +++ b/src/smf/binding.h @@ -27,7 +27,7 @@ extern "C" { #endif void smf_bearer_binding(smf_sess_t *sess); -void smf_gtp_send_create_bearer_request(smf_bearer_t *bearer); +int smf_gtp_send_create_bearer_request(smf_bearer_t *bearer); void smf_qos_flow_binding(smf_sess_t *sess, ogs_sbi_stream_t *stream); diff --git a/src/smf/context.c b/src/smf/context.c index eeeb01f012..65809f49c2 100644 --- a/src/smf/context.c +++ b/src/smf/context.c @@ -62,10 +62,16 @@ void smf_context_init(void) ogs_pool_init(&smf_pf_pool, ogs_app()->pool.bearer * OGS_MAX_NUM_OF_PF); self.supi_hash = ogs_hash_make(); + ogs_assert(self.supi_hash); self.imsi_hash = ogs_hash_make(); + ogs_assert(self.imsi_hash); self.ipv4_hash = ogs_hash_make(); + ogs_assert(self.ipv4_hash); self.ipv6_hash = ogs_hash_make(); + ogs_assert(self.ipv6_hash); self.n1n2message_hash = ogs_hash_make(); + ogs_assert(self.n1n2message_hash); + context_initialized = 1; } @@ -534,9 +540,13 @@ int smf_context_parse_config(void) ogs_assert(num_of_dnn < OGS_MAX_NUM_OF_DNN); - for (i = 0; i < num_of_dnn; i++) + for (i = 0; i < num_of_dnn; i++) { smf_info->slice[num_of_slice]. dnn[i] = ogs_strdup(dnn[i]); + ogs_assert( + smf_info->slice[num_of_slice]. + dnn[i]); + } smf_info->slice[num_of_slice]. num_of_dnn = num_of_dnn; @@ -1551,8 +1561,10 @@ smf_bearer_t *smf_qos_flow_add(smf_sess_t *sess) dl_pdr->src_if = OGS_PFCP_INTERFACE_CORE; - if (sess->session.name) + if (sess->session.name) { dl_pdr->apn = ogs_strdup(sess->session.name); + ogs_assert(dl_pdr->apn); + } ul_pdr = ogs_pfcp_pdr_add(&sess->pfcp); ogs_assert(ul_pdr); @@ -1560,8 +1572,10 @@ smf_bearer_t *smf_qos_flow_add(smf_sess_t *sess) ul_pdr->src_if = OGS_PFCP_INTERFACE_ACCESS; - if (sess->session.name) + if (sess->session.name) { ul_pdr->apn = ogs_strdup(sess->session.name); + ogs_assert(ul_pdr->apn); + } ul_pdr->outer_header_removal_len = 1; if (sess->session.session_type == OGS_PDU_SESSION_TYPE_IPV4) { @@ -1683,10 +1697,11 @@ void smf_sess_create_indirect_data_forwarding(smf_sess_t *sess) pdr->f_teid.teid = sess->upf_n3_teid; } - ogs_pfcp_ip_to_outer_header_creation( - &sess->handover.gnb_dl_ip, - &far->outer_header_creation, - &far->outer_header_creation_len); + ogs_assert(OGS_OK == + ogs_pfcp_ip_to_outer_header_creation( + &sess->handover.gnb_dl_ip, + &far->outer_header_creation, + &far->outer_header_creation_len)); far->outer_header_creation.teid = sess->handover.gnb_dl_teid; /* Indirect Data Forwarding PDRs is set to highest precedence @@ -1881,6 +1896,7 @@ smf_bearer_t *smf_bearer_add(smf_sess_t *sess) ogs_assert(sess->session.name); dl_pdr->apn = ogs_strdup(sess->session.name); + ogs_assert(dl_pdr->apn); ul_pdr = ogs_pfcp_pdr_add(&sess->pfcp); ogs_assert(ul_pdr); @@ -1890,6 +1906,7 @@ smf_bearer_t *smf_bearer_add(smf_sess_t *sess) ogs_assert(sess->session.name); ul_pdr->apn = ogs_strdup(sess->session.name); + ogs_assert(ul_pdr->apn); ul_pdr->outer_header_removal_len = 1; if (sess->session.session_type == OGS_PDU_SESSION_TYPE_IPV4) { diff --git a/src/smf/fd-path.c b/src/smf/fd-path.c index 322da49094..d8101a7ba0 100644 --- a/src/smf/fd-path.c +++ b/src/smf/fd-path.c @@ -50,11 +50,11 @@ static __inline__ struct sess_state *new_state(os0_t sid) ogs_thread_mutex_lock(&sess_state_mutex); ogs_pool_alloc(&sess_state_pool, &new); - ogs_assert(new); + ogs_expect_or_return_val(new, NULL); ogs_thread_mutex_unlock(&sess_state_mutex); new->gx_sid = (os0_t)ogs_strdup((char *)sid); - ogs_assert(new->gx_sid); + ogs_expect_or_return_val(new->gx_sid, NULL); return new; } @@ -1169,6 +1169,7 @@ static int decode_pcc_rule_definition( ret = fd_msg_avp_hdr(avpch3, &hdr); ogs_assert(ret == 0); flow->description = ogs_malloc(hdr->avp_value->os.len+1); + ogs_assert(flow->description); ogs_cpystrn(flow->description, (char*)hdr->avp_value->os.data, hdr->avp_value->os.len+1); diff --git a/src/smf/gsm-build.c b/src/smf/gsm-build.c index f8c75c8565..0fcbff271f 100644 --- a/src/smf/gsm-build.c +++ b/src/smf/gsm-build.c @@ -26,7 +26,7 @@ ogs_pkbuf_t *gsm_build_pdu_session_establishment_accept(smf_sess_t *sess) { ogs_pkbuf_t *pkbuf = NULL; smf_bearer_t *qos_flow = NULL; - int num_of_param; + int num_of_param, rv; ogs_nas_5gs_message_t message; ogs_nas_5gs_pdu_session_establishment_accept_t * @@ -131,8 +131,9 @@ ogs_pkbuf_t *gsm_build_pdu_session_establishment_accept(smf_sess_t *sess) qos_rule[0].flow.segregation = 0; qos_rule[0].flow.identifier = qos_flow->qfi; - ogs_nas_build_qos_rules(authorized_qos_rules, qos_rule, 1); - ogs_assert(authorized_qos_rules->length); + rv = ogs_nas_build_qos_rules(authorized_qos_rules, qos_rule, 1); + ogs_expect_or_return_val(rv == OGS_OK, NULL); + ogs_expect_or_return_val(authorized_qos_rules->length, NULL); /* Session-AMBR */ session_ambr->length = 6; @@ -156,7 +157,7 @@ ogs_pkbuf_t *gsm_build_pdu_session_establishment_accept(smf_sess_t *sess) } else if (pdu_address->pdn_type == OGS_PDU_SESSION_TYPE_IPV4V6) { pdu_address->both.addr = sess->session.paa.both.addr; memcpy(pdu_address->both.addr6, - sess->session.paa.both.addr6+(OGS_IPV6_LEN>>1), OGS_IPV6_LEN>>1); + sess->session.paa.both.addr6+(OGS_IPV6_LEN>>1), OGS_IPV6_LEN>>1); pdu_address->length = OGS_NAS_PDU_ADDRESS_IPV4V6_LEN; } else { ogs_error("Unexpected PDN Type %u", pdu_address->pdn_type); @@ -200,9 +201,10 @@ ogs_pkbuf_t *gsm_build_pdu_session_establishment_accept(smf_sess_t *sess) pdu_session_establishment_accept->presencemask |= OGS_NAS_5GS_PDU_SESSION_ESTABLISHMENT_ACCEPT_AUTHORIZED_QOS_FLOW_DESCRIPTIONS_PRESENT; - ogs_nas_build_qos_flow_descriptions( + rv = ogs_nas_build_qos_flow_descriptions( authorized_qos_flow_descriptions, qos_flow_description, 1); - ogs_assert(authorized_qos_flow_descriptions->length); + ogs_expect_or_return_val(rv == OGS_OK, NULL); + ogs_expect_or_return_val(authorized_qos_flow_descriptions->length, NULL); /* Extended protocol configuration options */ if (sess->nas.ue_pco.buffer && sess->nas.ue_pco.length) { @@ -279,7 +281,7 @@ ogs_pkbuf_t *gsm_build_qos_flow_modification_command( ogs_pkbuf_t *pkbuf = NULL; smf_sess_t *sess = NULL; ogs_pfcp_pdr_t *dl_pdr = NULL; - int num_of_param; + int num_of_param, rv; ogs_nas_5gs_message_t message; ogs_nas_5gs_pdu_session_modification_command_t @@ -327,8 +329,9 @@ ogs_pkbuf_t *gsm_build_qos_flow_modification_command( pdu_session_modification_command->presencemask |= OGS_NAS_5GS_PDU_SESSION_MODIFICATION_COMMAND_AUTHORIZED_QOS_RULES_PRESENT; - ogs_nas_build_qos_rules(authorized_qos_rules, qos_rule, 1); - ogs_assert(authorized_qos_rules->length); + rv = ogs_nas_build_qos_rules(authorized_qos_rules, qos_rule, 1); + ogs_expect_or_return_val(rv == OGS_OK, NULL); + ogs_expect_or_return_val(authorized_qos_rules->length, NULL); /* QoS flow descriptions */ memset(&qos_flow_description, 0, sizeof(qos_flow_description)); @@ -390,9 +393,10 @@ ogs_pkbuf_t *gsm_build_qos_flow_modification_command( pdu_session_modification_command->presencemask |= OGS_NAS_5GS_PDU_SESSION_MODIFICATION_COMMAND_AUTHORIZED_QOS_FLOW_DESCRIPTIONS_PRESENT; - ogs_nas_build_qos_flow_descriptions( + rv = ogs_nas_build_qos_flow_descriptions( authorized_qos_flow_descriptions, qos_flow_description, 1); - ogs_assert(authorized_qos_flow_descriptions->length); + ogs_expect_or_return_val(rv == OGS_OK, NULL); + ogs_expect_or_return_val(authorized_qos_flow_descriptions->length, NULL); pkbuf = ogs_nas_5gs_plain_encode(&message); ogs_assert(pkbuf); diff --git a/src/smf/gsm-handler.c b/src/smf/gsm-handler.c index b71de8277b..475fb500de 100644 --- a/src/smf/gsm-handler.c +++ b/src/smf/gsm-handler.c @@ -64,9 +64,10 @@ int gsm_handle_pdu_session_establishment_request( extended_protocol_configuration_options); } - smf_sbi_discover_and_send(OpenAPI_nf_type_UDM, sess, stream, + ogs_assert(true == + smf_sbi_discover_and_send(OpenAPI_nf_type_UDM, sess, stream, 0, (char *)OGS_SBI_RESOURCE_NAME_SM_DATA, - smf_nudm_sdm_build_get); + smf_nudm_sdm_build_get)); return OGS_OK; } diff --git a/src/smf/gsm-sm.c b/src/smf/gsm-sm.c index 00ed74832b..d026fe9756 100644 --- a/src/smf/gsm-sm.c +++ b/src/smf/gsm-sm.c @@ -92,9 +92,10 @@ void smf_gsm_state_operational(ogs_fsm_t *s, smf_event_t *e) DEFAULT ogs_error("Invalid API name [%s]", sbi_message->h.service.name); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, sbi_message, - "Invalid API name", sbi_message->h.service.name); + "Invalid API name", sbi_message->h.service.name)); END break; @@ -120,8 +121,10 @@ void smf_gsm_state_operational(ogs_fsm_t *s, smf_event_t *e) ogs_assert(strerror); ogs_error("%s", strerror); - ogs_sbi_server_send_error(stream, sbi_message->res_status, - sbi_message, strerror, NULL); + ogs_assert(true == + ogs_sbi_server_send_error( + stream, sbi_message->res_status, + sbi_message, strerror, NULL)); ogs_free(strerror); OGS_FSM_TRAN(s, smf_gsm_state_exception); @@ -141,9 +144,10 @@ void smf_gsm_state_operational(ogs_fsm_t *s, smf_event_t *e) ogs_assert(strerror); ogs_error("%s", strerror); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - sbi_message, strerror, NULL); + sbi_message, strerror, NULL)); ogs_free(strerror); OGS_FSM_TRAN(s, smf_gsm_state_exception); END @@ -167,9 +171,10 @@ void smf_gsm_state_operational(ogs_fsm_t *s, smf_event_t *e) ogs_assert(strerror); ogs_error("%s", strerror); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, sbi_message->res_status, - sbi_message, strerror, NULL); + sbi_message, strerror, NULL)); ogs_free(strerror); break; } @@ -188,9 +193,10 @@ void smf_gsm_state_operational(ogs_fsm_t *s, smf_event_t *e) ogs_assert(strerror); ogs_error("%s", strerror); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, sbi_message->res_status, - sbi_message, strerror, NULL); + sbi_message, strerror, NULL)); ogs_free(strerror); break; } @@ -207,9 +213,10 @@ void smf_gsm_state_operational(ogs_fsm_t *s, smf_event_t *e) ogs_assert(strerror); ogs_error("%s", strerror); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - sbi_message, strerror, NULL); + sbi_message, strerror, NULL)); ogs_free(strerror); END } @@ -222,9 +229,10 @@ void smf_gsm_state_operational(ogs_fsm_t *s, smf_event_t *e) ogs_assert(strerror); ogs_error("%s", strerror); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - sbi_message, strerror, NULL); + sbi_message, strerror, NULL)); ogs_free(strerror); END break; @@ -273,7 +281,7 @@ void smf_gsm_state_operational(ogs_fsm_t *s, smf_event_t *e) break; case OGS_NAS_5GS_PDU_SESSION_MODIFICATION_COMPLETE: - ogs_sbi_send_http_status_no_content(stream); + ogs_assert(true == ogs_sbi_send_http_status_no_content(stream)); break; case OGS_NAS_5GS_PDU_SESSION_RELEASE_REQUEST: @@ -288,14 +296,15 @@ void smf_gsm_state_operational(ogs_fsm_t *s, smf_event_t *e) param.ran_nas_release.ngap_cause.value = NGAP_CauseNas_normal_release; - smf_sbi_discover_and_send(OpenAPI_nf_type_PCF, sess, stream, + ogs_assert(true == + smf_sbi_discover_and_send(OpenAPI_nf_type_PCF, sess, stream, OGS_PFCP_DELETE_TRIGGER_UE_REQUESTED, ¶m, - smf_npcf_smpolicycontrol_build_delete); + smf_npcf_smpolicycontrol_build_delete)); } break; case OGS_NAS_5GS_PDU_SESSION_RELEASE_COMPLETE: - ogs_sbi_send_http_status_no_content(stream); + ogs_assert(true == ogs_sbi_send_http_status_no_content(stream)); /* * Race condition for PDU session release complete @@ -320,8 +329,9 @@ void smf_gsm_state_operational(ogs_fsm_t *s, smf_event_t *e) ogs_assert(strerror); ogs_error("%s", strerror); - ogs_sbi_server_send_error(stream, - OGS_SBI_HTTP_STATUS_BAD_REQUEST, NULL, strerror, NULL); + ogs_assert(true == + ogs_sbi_server_send_error(stream, + OGS_SBI_HTTP_STATUS_BAD_REQUEST, NULL, strerror, NULL)); ogs_free(strerror); } break; @@ -365,12 +375,12 @@ void smf_gsm_state_operational(ogs_fsm_t *s, smf_event_t *e) sess->ngap_state.pdu_session_resource_release = SMF_NGAP_STATE_NONE; if (ngap_state == SMF_NGAP_STATE_DELETE_TRIGGER_UE_REQUESTED) { - ogs_sbi_send_http_status_no_content(stream); + ogs_assert(true == ogs_sbi_send_http_status_no_content(stream)); } else if (ngap_state == SMF_NGAP_STATE_ERROR_INDICATION_RECEIVED_FROM_5G_AN) { smf_n1_n2_message_transfer_param_t param; - ogs_sbi_send_http_status_no_content(stream); + ogs_assert(true == ogs_sbi_send_http_status_no_content(stream)); memset(¶m, 0, sizeof(param)); param.state = SMF_NETWORK_TRIGGERED_SERVICE_REQUEST; diff --git a/src/smf/gtp-path.c b/src/smf/gtp-path.c index a69c7a6f86..b0a8bd623e 100644 --- a/src/smf/gtp-path.c +++ b/src/smf/gtp-path.c @@ -130,6 +130,7 @@ static void _gtpv1_u_recv_cb(short when, ogs_socket_t fd, void *data) ogs_debug("[RECV] Echo Request from [%s]", OGS_ADDR(&from, buf)); echo_rsp = ogs_gtp_handle_echo_req(pkbuf); + ogs_expect(echo_rsp); if (echo_rsp) { ssize_t sent; @@ -446,4 +447,4 @@ static void send_router_advertisement(smf_sess_t *sess, uint8_t *ip6_dst) } ogs_pkbuf_free(pkbuf); -} \ No newline at end of file +} diff --git a/src/smf/gx-handler.c b/src/smf/gx-handler.c index ec241aab44..250e35593c 100644 --- a/src/smf/gx-handler.c +++ b/src/smf/gx-handler.c @@ -153,8 +153,11 @@ void smf_gx_handle_cca_initial_request( dl_far->apply_action = OGS_PFCP_APPLY_ACTION_FORW; /* Set Outer Header Creation to the Default DL FAR */ - ogs_pfcp_ip_to_outer_header_creation(&bearer->sgw_s5u_ip, - &dl_far->outer_header_creation, &dl_far->outer_header_creation_len); + ogs_assert(OGS_OK == + ogs_pfcp_ip_to_outer_header_creation( + &bearer->sgw_s5u_ip, + &dl_far->outer_header_creation, + &dl_far->outer_header_creation_len)); dl_far->outer_header_creation.teid = bearer->sgw_s5u_teid; /* Setup PDR */ @@ -168,17 +171,19 @@ void smf_gx_handle_cca_initial_request( ogs_assert(up2cp_pdr); /* Set UE IP Address to the Default DL PDR */ - ogs_pfcp_paa_to_ue_ip_addr(&sess->session.paa, - &dl_pdr->ue_ip_addr, &dl_pdr->ue_ip_addr_len); + ogs_assert(OGS_OK == + ogs_pfcp_paa_to_ue_ip_addr(&sess->session.paa, + &dl_pdr->ue_ip_addr, &dl_pdr->ue_ip_addr_len)); dl_pdr->ue_ip_addr.sd = OGS_PFCP_UE_IP_DST; /* Set UE-to-CP Flow-Description and Outer-Header-Creation */ up2cp_pdr->flow_description[up2cp_pdr->num_of_flow++] = (char *)"permit out 58 from ff02::2/128 to assigned"; - ogs_pfcp_ip_to_outer_header_creation( + ogs_assert(OGS_OK == + ogs_pfcp_ip_to_outer_header_creation( &ogs_gtp_self()->gtpu_ip, &up2cp_far->outer_header_creation, - &up2cp_far->outer_header_creation_len); + &up2cp_far->outer_header_creation_len)); up2cp_far->outer_header_creation.teid = sess->index; /* Set F-TEID */ @@ -219,10 +224,13 @@ void smf_gx_handle_cca_initial_request( bearer->pgw_s5u_teid = bearer->index; } else { if (sess->pfcp_node->addr.ogs_sa_family == AF_INET) - ogs_copyaddrinfo(&bearer->pgw_s5u_addr, &sess->pfcp_node->addr); + ogs_assert(OGS_OK == + ogs_copyaddrinfo( + &bearer->pgw_s5u_addr, &sess->pfcp_node->addr)); else if (sess->pfcp_node->addr.ogs_sa_family == AF_INET6) - ogs_copyaddrinfo( - &bearer->pgw_s5u_addr6, &sess->pfcp_node->addr); + ogs_assert(OGS_OK == + ogs_copyaddrinfo( + &bearer->pgw_s5u_addr6, &sess->pfcp_node->addr)); else ogs_assert_if_reached(); diff --git a/src/smf/n4-build.c b/src/smf/n4-build.c index 0aa7b28b29..5fb1aae7f7 100644 --- a/src/smf/n4-build.c +++ b/src/smf/n4-build.c @@ -31,7 +31,7 @@ ogs_pkbuf_t *smf_n4_build_session_establishment_request( ogs_pfcp_far_t *far = NULL; ogs_pfcp_urr_t *urr = NULL; ogs_pfcp_qer_t *qer = NULL; - int i; + int i, rv; ogs_pfcp_node_id_t node_id; ogs_pfcp_f_seid_t f_seid; @@ -44,18 +44,20 @@ ogs_pkbuf_t *smf_n4_build_session_establishment_request( memset(&pfcp_message, 0, sizeof(ogs_pfcp_message_t)); /* Node ID */ - ogs_pfcp_sockaddr_to_node_id( + rv = ogs_pfcp_sockaddr_to_node_id( ogs_pfcp_self()->pfcp_addr, ogs_pfcp_self()->pfcp_addr6, ogs_app()->parameter.prefer_ipv4, &node_id, &len); + ogs_expect_or_return_val(rv == OGS_OK, NULL); req->node_id.presence = 1; req->node_id.data = &node_id; req->node_id.len = len; /* F-SEID */ - ogs_pfcp_sockaddr_to_f_seid( + rv = ogs_pfcp_sockaddr_to_f_seid( ogs_pfcp_self()->pfcp_addr, ogs_pfcp_self()->pfcp_addr6, &f_seid, &len); + ogs_expect_or_return_val(rv == OGS_OK, NULL); f_seid.seid = htobe64(sess->smf_n4_seid); req->cp_f_seid.presence = 1; req->cp_f_seid.data = &f_seid; diff --git a/src/smf/n4-handler.c b/src/smf/n4-handler.c index 7ebea49e04..4d9c085e83 100644 --- a/src/smf/n4-handler.c +++ b/src/smf/n4-handler.c @@ -173,13 +173,14 @@ void smf_5gc_n4_handle_session_establishment_response( if (sess->upf_n3_addr6) ogs_freeaddrinfo(sess->upf_n3_addr6); - ogs_pfcp_f_teid_to_sockaddr( + ogs_assert(OGS_OK == + ogs_pfcp_f_teid_to_sockaddr( &pdr->f_teid, pdr->f_teid_len, - &sess->upf_n3_addr, &sess->upf_n3_addr6); + &sess->upf_n3_addr, &sess->upf_n3_addr6)); sess->upf_n3_teid = pdr->f_teid.teid; } } else if (pdr->src_if == OGS_PFCP_INTERFACE_CP_FUNCTION) { - ogs_pfcp_setup_pdr_gtpu_node(pdr); + ogs_assert(OGS_ERROR != ogs_pfcp_setup_pdr_gtpu_node(pdr)); } } @@ -284,9 +285,10 @@ void smf_5gc_n4_handle_session_modification_response( if (sess->upf_n3_addr6) ogs_freeaddrinfo(sess->upf_n3_addr6); - ogs_pfcp_f_teid_to_sockaddr( + ogs_assert(OGS_OK == + ogs_pfcp_f_teid_to_sockaddr( &pdr->f_teid, pdr->f_teid_len, - &sess->upf_n3_addr, &sess->upf_n3_addr6); + &sess->upf_n3_addr, &sess->upf_n3_addr6)); sess->upf_n3_teid = pdr->f_teid.teid; } else if (far->dst_if == OGS_PFCP_INTERFACE_ACCESS) { if (sess->handover.upf_dl_addr) @@ -294,15 +296,16 @@ void smf_5gc_n4_handle_session_modification_response( if (sess->handover.upf_dl_addr6) ogs_freeaddrinfo(sess->handover.upf_dl_addr6); - ogs_pfcp_f_teid_to_sockaddr( + ogs_assert(OGS_OK == + ogs_pfcp_f_teid_to_sockaddr( &pdr->f_teid, pdr->f_teid_len, &sess->handover.upf_dl_addr, - &sess->handover.upf_dl_addr6); + &sess->handover.upf_dl_addr6)); sess->handover.upf_dl_teid = pdr->f_teid.teid; } } } else if (pdr->src_if == OGS_PFCP_INTERFACE_CP_FUNCTION) { - ogs_pfcp_setup_pdr_gtpu_node(pdr); + ogs_assert(OGS_ERROR != ogs_pfcp_setup_pdr_gtpu_node(pdr)); } } @@ -351,7 +354,7 @@ void smf_5gc_n4_handle_session_modification_response( } else { sess->paging.ue_requested_pdu_session_establishment_done = true; - ogs_sbi_send_http_status_no_content(stream); + ogs_assert(true == ogs_sbi_send_http_status_no_content(stream)); } } else if (flags & OGS_PFCP_MODIFY_DEACTIVATE) { @@ -471,7 +474,8 @@ void smf_5gc_n4_handle_session_deletion_response( if (status != OGS_SBI_HTTP_STATUS_OK) { char *strerror = ogs_msprintf( "PFCP Cause [%d] : Not Accepted", rsp->cause.u8); - ogs_sbi_server_send_error(stream, status, NULL, NULL, NULL); + ogs_assert(true == + ogs_sbi_server_send_error(stream, status, NULL, NULL, NULL)); ogs_free(strerror); return; } @@ -499,7 +503,7 @@ void smf_5gc_n4_handle_session_deletion_response( response = ogs_sbi_build_response( &sendmsg, OGS_SBI_HTTP_STATUS_NO_CONTENT); ogs_assert(response); - ogs_sbi_server_send_response(stream, response); + ogs_assert(true == ogs_sbi_server_send_response(stream, response)); SMF_SESS_CLEAR(sess); } @@ -586,14 +590,15 @@ void smf_epc_n4_handle_session_establishment_response( if (bearer->pgw_s5u_addr) ogs_freeaddrinfo(bearer->pgw_s5u_addr6); - ogs_pfcp_f_teid_to_sockaddr( + ogs_assert(OGS_OK == + ogs_pfcp_f_teid_to_sockaddr( &pdr->f_teid, pdr->f_teid_len, - &bearer->pgw_s5u_addr, &bearer->pgw_s5u_addr6); + &bearer->pgw_s5u_addr, &bearer->pgw_s5u_addr6)); bearer->pgw_s5u_teid = pdr->f_teid.teid; } } } else if (pdr->src_if == OGS_PFCP_INTERFACE_CP_FUNCTION) { - ogs_pfcp_setup_pdr_gtpu_node(pdr); + ogs_assert(OGS_ERROR != ogs_pfcp_setup_pdr_gtpu_node(pdr)); } } @@ -695,13 +700,14 @@ void smf_epc_n4_handle_session_modification_response( if (bearer->pgw_s5u_addr) ogs_freeaddrinfo(bearer->pgw_s5u_addr6); - ogs_pfcp_f_teid_to_sockaddr( + ogs_assert(OGS_OK == + ogs_pfcp_f_teid_to_sockaddr( &pdr->f_teid, pdr->f_teid_len, - &bearer->pgw_s5u_addr, &bearer->pgw_s5u_addr6); + &bearer->pgw_s5u_addr, &bearer->pgw_s5u_addr6)); bearer->pgw_s5u_teid = pdr->f_teid.teid; } } else if (pdr->src_if == OGS_PFCP_INTERFACE_CP_FUNCTION) { - ogs_pfcp_setup_pdr_gtpu_node(pdr); + ogs_assert(OGS_ERROR != ogs_pfcp_setup_pdr_gtpu_node(pdr)); } } @@ -714,7 +720,7 @@ void smf_epc_n4_handle_session_modification_response( smf_bearer_remove(bearer); } else if (flags & OGS_PFCP_MODIFY_CREATE) { - smf_gtp_send_create_bearer_request(bearer); + ogs_assert(OGS_OK == smf_gtp_send_create_bearer_request(bearer)); } else if (flags & OGS_PFCP_MODIFY_ACTIVATE) { /* Nothing */ diff --git a/src/smf/namf-handler.c b/src/smf/namf-handler.c index fc39af785b..62544a2079 100644 --- a/src/smf/namf-handler.c +++ b/src/smf/namf-handler.c @@ -172,22 +172,25 @@ bool smf_namf_comm_handler_n1_n2_message_transfer_failure_notify( N1N2MsgTxfrFailureNotification = recvmsg->N1N2MsgTxfrFailureNotification; if (!N1N2MsgTxfrFailureNotification) { ogs_error("No N1N2MsgTxfrFailureNotification"); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "No N1N2MsgTxfrFailureNotification", NULL); + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + recvmsg, "No N1N2MsgTxfrFailureNotification", NULL)); return false; } if (!N1N2MsgTxfrFailureNotification->cause) { ogs_error("No Cause"); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "No Cause", NULL); + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + recvmsg, "No Cause", NULL)); return false; } if (!N1N2MsgTxfrFailureNotification->n1n2_msg_data_uri) { ogs_error("No n1n2MsgDataUri"); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "No n1n2MsgDataUri", NULL); + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + recvmsg, "No n1n2MsgDataUri", NULL)); return false; } @@ -195,8 +198,10 @@ bool smf_namf_comm_handler_n1_n2_message_transfer_failure_notify( N1N2MsgTxfrFailureNotification->n1n2_msg_data_uri); if (!sess) { ogs_error("Not found"); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_NOT_FOUND, - recvmsg, N1N2MsgTxfrFailureNotification->n1n2_msg_data_uri, NULL); + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_NOT_FOUND, + recvmsg, N1N2MsgTxfrFailureNotification->n1n2_msg_data_uri, + NULL)); return false; } @@ -214,6 +219,6 @@ bool smf_namf_comm_handler_n1_n2_message_transfer_failure_notify( * Procedure for pause of charging at SMF is specified in clause 4.4.4. */ - ogs_sbi_send_http_status_no_content(stream); + ogs_assert(true == ogs_sbi_send_http_status_no_content(stream)); return true; } diff --git a/src/smf/nf-sm.c b/src/smf/nf-sm.c index 1476fe6c11..fa0d4c51b8 100644 --- a/src/smf/nf-sm.c +++ b/src/smf/nf-sm.c @@ -109,7 +109,7 @@ void smf_nf_state_will_register(ogs_fsm_t *s, smf_event_t *e) ogs_timer_start(nf_instance->t_registration_interval, ogs_app()->time.message.sbi.nf_register_interval); - smf_nnrf_nfm_send_nf_register(nf_instance); + ogs_assert(true == smf_nnrf_nfm_send_nf_register(nf_instance)); break; case OGS_FSM_EXIT_SIG: @@ -164,7 +164,7 @@ void smf_nf_state_will_register(ogs_fsm_t *s, smf_event_t *e) ogs_timer_start(nf_instance->t_registration_interval, ogs_app()->time.message.sbi.nf_register_interval); - smf_nnrf_nfm_send_nf_register(nf_instance); + ogs_assert(true == smf_nnrf_nfm_send_nf_register(nf_instance)); break; default: @@ -211,14 +211,18 @@ void smf_nf_state_registered(ogs_fsm_t *s, smf_event_t *e) ogs_app()->time.nf_instance.no_heartbeat_margin)); } - ogs_nnrf_nfm_send_nf_status_subscribe(client, - smf_self()->nf_type, nf_instance->id, OpenAPI_nf_type_AMF); - ogs_nnrf_nfm_send_nf_status_subscribe(client, - smf_self()->nf_type, nf_instance->id, OpenAPI_nf_type_UDM); - ogs_nnrf_nfm_send_nf_status_subscribe(client, - smf_self()->nf_type, nf_instance->id, OpenAPI_nf_type_PCF); - ogs_nnrf_nfm_send_nf_status_subscribe(client, - smf_self()->nf_type, nf_instance->id, OpenAPI_nf_type_UPF); + ogs_assert(true == + ogs_nnrf_nfm_send_nf_status_subscribe(client, + smf_self()->nf_type, nf_instance->id, OpenAPI_nf_type_AMF)); + ogs_assert(true == + ogs_nnrf_nfm_send_nf_status_subscribe(client, + smf_self()->nf_type, nf_instance->id, OpenAPI_nf_type_UDM)); + ogs_assert(true == + ogs_nnrf_nfm_send_nf_status_subscribe(client, + smf_self()->nf_type, nf_instance->id, OpenAPI_nf_type_PCF)); + ogs_assert(true == + ogs_nnrf_nfm_send_nf_status_subscribe(client, + smf_self()->nf_type, nf_instance->id, OpenAPI_nf_type_UPF)); } break; @@ -233,7 +237,8 @@ void smf_nf_state_registered(ogs_fsm_t *s, smf_event_t *e) } if (!OGS_FSM_CHECK(&nf_instance->sm, smf_nf_state_exception)) { - ogs_nnrf_nfm_send_nf_de_register(nf_instance); + ogs_assert(true == + ogs_nnrf_nfm_send_nf_de_register(nf_instance)); } } break; @@ -283,7 +288,7 @@ void smf_nf_state_registered(ogs_fsm_t *s, smf_event_t *e) ogs_timer_start(nf_instance->t_heartbeat_interval, ogs_time_from_sec(nf_instance->time.heartbeat_interval)); - ogs_nnrf_nfm_send_nf_update(nf_instance); + ogs_assert(true == ogs_nnrf_nfm_send_nf_update(nf_instance)); break; case SMF_TIMER_NF_INSTANCE_NO_HEARTBEAT: diff --git a/src/smf/ngap-handler.c b/src/smf/ngap-handler.c index ad306fcb75..bb35d822ea 100644 --- a/src/smf/ngap-handler.c +++ b/src/smf/ngap-handler.c @@ -122,10 +122,11 @@ int ngap_handle_pdu_session_resource_setup_response_transfer( } dl_far->apply_action = OGS_PFCP_APPLY_ACTION_FORW; - ogs_pfcp_ip_to_outer_header_creation( - &sess->gnb_n3_ip, - &dl_far->outer_header_creation, - &dl_far->outer_header_creation_len); + ogs_assert(OGS_OK == + ogs_pfcp_ip_to_outer_header_creation( + &sess->gnb_n3_ip, + &dl_far->outer_header_creation, + &dl_far->outer_header_creation_len)); dl_far->outer_header_creation.teid = sess->gnb_n3_teid; } else { ogs_error("[%s:%d] No QoS flow", smf_ue->supi, sess->psi); @@ -144,7 +145,7 @@ int ngap_handle_pdu_session_resource_setup_response_transfer( 0)); } else { /* ACTIVATED Is NOT Included in RESPONSE */ - ogs_sbi_send_http_status_no_content(stream); + ogs_assert(true == ogs_sbi_send_http_status_no_content(stream)); } rv = OGS_OK; @@ -218,10 +219,11 @@ int ngap_handle_pdu_session_resource_modify_response_transfer( ogs_assert(dl_far); dl_far->apply_action = OGS_PFCP_APPLY_ACTION_FORW; - ogs_pfcp_ip_to_outer_header_creation( + ogs_assert(OGS_OK == + ogs_pfcp_ip_to_outer_header_creation( &sess->gnb_n3_ip, &dl_far->outer_header_creation, - &dl_far->outer_header_creation_len); + &dl_far->outer_header_creation_len)); dl_far->outer_header_creation.teid = sess->gnb_n3_teid; ogs_assert(OGS_OK == @@ -327,10 +329,11 @@ int ngap_handle_path_switch_request_transfer( } dl_far->apply_action = OGS_PFCP_APPLY_ACTION_FORW; - ogs_pfcp_ip_to_outer_header_creation( + ogs_assert(OGS_OK == + ogs_pfcp_ip_to_outer_header_creation( &sess->gnb_n3_ip, &dl_far->outer_header_creation, - &dl_far->outer_header_creation_len); + &dl_far->outer_header_creation_len)); dl_far->outer_header_creation.teid = sess->gnb_n3_teid; } else { ogs_error("[%s:%d] No QoS flow", smf_ue->supi, sess->psi); @@ -351,7 +354,7 @@ int ngap_handle_path_switch_request_transfer( 0)); } else { /* ACTIVATED Is NOT Included in RESPONSE */ - ogs_sbi_send_http_status_no_content(stream); + ogs_assert(true == ogs_sbi_send_http_status_no_content(stream)); } rv = OGS_OK; diff --git a/src/smf/nnrf-build.c b/src/smf/nnrf-build.c index a6a476713e..07bf52f342 100644 --- a/src/smf/nnrf-build.c +++ b/src/smf/nnrf-build.c @@ -82,7 +82,7 @@ ogs_sbi_request_t *smf_nnrf_nfm_build_register( } SmfInfo = ogs_calloc(1, sizeof(*SmfInfo)); - ogs_assert(SmfInfo); + ogs_expect_or_return_val(SmfInfo, NULL); sNssaiSmfInfoList = OpenAPI_list_create(); ogs_assert(sNssaiSmfInfoList); @@ -93,7 +93,7 @@ ogs_sbi_request_t *smf_nnrf_nfm_build_register( for (j = 0; j < nf_info->smf.slice[i].num_of_dnn; j++) { DnnSmfInfoItem = ogs_calloc(1, sizeof(*DnnSmfInfoItem)); - ogs_assert(DnnSmfInfoItem); + ogs_expect_or_return_val(DnnSmfInfoItem, NULL); DnnSmfInfoItem->dnn = nf_info->smf.slice[i].dnn[j]; OpenAPI_list_add(DnnSmfInfoList, DnnSmfInfoItem); @@ -102,18 +102,18 @@ ogs_sbi_request_t *smf_nnrf_nfm_build_register( if (!DnnSmfInfoList->count) { OpenAPI_list_free(DnnSmfInfoList); - ogs_fatal("CHECK CONFIGURATION: No DNN"); - ogs_assert_if_reached(); + ogs_error("CHECK CONFIGURATION: No DNN"); + ogs_expect_or_return_val(0, NULL); } sNssaiSmfInfoItem = ogs_calloc(1, sizeof(*sNssaiSmfInfoItem)); - ogs_assert(sNssaiSmfInfoItem); + ogs_expect_or_return_val(sNssaiSmfInfoItem, NULL); sNssaiSmfInfoItem->dnn_smf_info_list = DnnSmfInfoList; sNssaiSmfInfoItem->s_nssai = sNssai = ogs_calloc(1, sizeof(*sNssai)); - ogs_assert(sNssai); + ogs_expect_or_return_val(sNssai, NULL); sNssai->sst = nf_info->smf.slice[i].s_nssai.sst; sNssai->sd = ogs_s_nssai_sd_to_string(nf_info->smf.slice[i].s_nssai.sd); @@ -131,10 +131,12 @@ ogs_sbi_request_t *smf_nnrf_nfm_build_register( for (i = 0; i < nf_info->smf.num_of_nr_tai; i++) { TaiItem = ogs_calloc(1, sizeof(*TaiItem)); - ogs_assert(TaiItem); + ogs_expect_or_return_val(TaiItem, NULL); TaiItem->plmn_id = ogs_sbi_build_plmn_id( &nf_info->smf.nr_tai[i].plmn_id); + ogs_expect_or_return_val(TaiItem->plmn_id, NULL); TaiItem->tac = ogs_uint24_to_0string(nf_info->smf.nr_tai[i].tac); + ogs_expect_or_return_val(TaiItem->tac, NULL); OpenAPI_list_add(TaiList, TaiItem); } @@ -154,14 +156,14 @@ ogs_sbi_request_t *smf_nnrf_nfm_build_register( for (j = 0; j < nf_info->smf.nr_tai_range[i].num_of_tac_range; j++) { TacRangeItem = ogs_calloc(1, sizeof(*TacRangeItem)); - ogs_assert(TacRangeItem); + ogs_expect_or_return_val(TacRangeItem, NULL); TacRangeItem->start = ogs_uint24_to_0string( nf_info->smf.nr_tai_range[i].start[j]); - ogs_assert(TacRangeItem->start); + ogs_expect_or_return_val(TacRangeItem->start, NULL); TacRangeItem->end = ogs_uint24_to_0string(nf_info->smf.nr_tai_range[i].end[j]); - ogs_assert(TacRangeItem->end); + ogs_expect_or_return_val(TacRangeItem->end, NULL); OpenAPI_list_add(TacRangeList, TacRangeItem); } @@ -169,15 +171,16 @@ ogs_sbi_request_t *smf_nnrf_nfm_build_register( if (!TacRangeList->count) { OpenAPI_list_free(TacRangeList); - ogs_fatal("CHECK CONFIGURATION: No Start/End in TacRange"); - ogs_assert_if_reached(); + ogs_error("CHECK CONFIGURATION: No Start/End in TacRange"); + ogs_expect_or_return_val(0, NULL); } TaiRangeItem = ogs_calloc(1, sizeof(*TaiRangeItem)); - ogs_assert(TaiRangeItem); + ogs_expect_or_return_val(TaiRangeItem, NULL); TaiRangeItem->plmn_id = ogs_sbi_build_plmn_id( &nf_info->smf.nr_tai_range[i].plmn_id); + ogs_expect_or_return_val(TaiRangeItem->plmn_id, NULL); TaiRangeItem->tac_range_list = TacRangeList; @@ -197,7 +200,7 @@ ogs_sbi_request_t *smf_nnrf_nfm_build_register( } NFProfile = ogs_nnrf_nfm_build_nf_profile(nf_instance); - ogs_assert(NFProfile); + ogs_expect_or_return_val(NFProfile, NULL); if (SmfInfoList->count == 1) { NFProfile->smf_info = SmfInfo; diff --git a/src/smf/nnrf-handler.c b/src/smf/nnrf-handler.c index 550ea4958d..b20f0f7d93 100644 --- a/src/smf/nnrf-handler.c +++ b/src/smf/nnrf-handler.c @@ -111,15 +111,17 @@ bool smf_nnrf_handle_nf_status_notify( NotificationData = recvmsg->NotificationData; if (!NotificationData) { ogs_error("No NotificationData"); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "No NotificationData", NULL); + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + recvmsg, "No NotificationData", NULL)); return false; } if (!NotificationData->nf_instance_uri) { ogs_error("No nfInstanceUri"); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "No nfInstanceUri", NULL); + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + recvmsg, "No nfInstanceUri", NULL)); return false; } @@ -129,15 +131,17 @@ bool smf_nnrf_handle_nf_status_notify( rv = ogs_sbi_parse_header(&message, &header); if (rv != OGS_OK) { ogs_error("Cannot parse nfInstanceUri [%s]", header.uri); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "Cannot parse nfInstanceUri", header.uri); + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + recvmsg, "Cannot parse nfInstanceUri", header.uri)); return false; } if (!message.h.resource.component[1]) { ogs_error("No nfInstanceId [%s]", header.uri); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "Cannot parse nfInstanceUri", header.uri); + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + recvmsg, "Cannot parse nfInstanceUri", header.uri)); ogs_sbi_header_free(&header); return false; } @@ -145,9 +149,10 @@ bool smf_nnrf_handle_nf_status_notify( if (NF_INSTANCE_IS_SELF(message.h.resource.component[1])) { ogs_warn("[%s] The notification is not allowed", message.h.resource.component[1]); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_FORBIDDEN, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_FORBIDDEN, recvmsg, "The notification is not allowed", - message.h.resource.component[1]); + message.h.resource.component[1])); ogs_sbi_header_free(&header); return false; } @@ -160,8 +165,10 @@ bool smf_nnrf_handle_nf_status_notify( NFProfile = NotificationData->nf_profile; if (!NFProfile) { ogs_error("No NFProfile"); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "No NFProfile", NULL); + ogs_assert(true == + ogs_sbi_server_send_error( + stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + recvmsg, "No NFProfile", NULL)); ogs_sbi_header_free(&header); return false; } @@ -198,9 +205,10 @@ bool smf_nnrf_handle_nf_status_notify( handled = ogs_sbi_client_associate(nf_instance); if (!handled) { ogs_error("[%s] Cannot associate NF EndPoint", nf_instance->id); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "Cannot find NF EndPoint", nf_instance->id); + recvmsg, "Cannot find NF EndPoint", nf_instance->id)); SMF_NF_INSTANCE_CLEAR("NRF-notify", nf_instance); ogs_sbi_header_free(&header); return false; @@ -214,9 +222,10 @@ bool smf_nnrf_handle_nf_status_notify( } else { ogs_warn("[%s] (NRF-notify) Not found", message.h.resource.component[1]); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_NOT_FOUND, - recvmsg, "Not found", message.h.resource.component[1]); + recvmsg, "Not found", message.h.resource.component[1])); ogs_sbi_header_free(&header); return false; } @@ -225,16 +234,17 @@ bool smf_nnrf_handle_nf_status_notify( NotificationData->event); ogs_error("Not supported event [%d:%s]", NotificationData->event, eventstr ? eventstr : "Unknown"); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, recvmsg, "Not supported event", - eventstr ? eventstr : "Unknown"); + eventstr ? eventstr : "Unknown")); ogs_sbi_header_free(&header); return false; } response = ogs_sbi_build_response(recvmsg, OGS_SBI_HTTP_STATUS_NO_CONTENT); ogs_assert(response); - ogs_sbi_server_send_response(stream, response); + ogs_assert(true == ogs_sbi_server_send_response(stream, response)); ogs_sbi_header_free(&header); return true; @@ -330,6 +340,6 @@ void smf_nnrf_handle_nf_discover( ogs_error("(NF discover) No [%s]", OpenAPI_nf_type_ToString(xact->target_nf_type)); } else { - smf_sbi_send(nf_instance, xact); + ogs_assert(true == smf_sbi_send(nf_instance, xact)); } } diff --git a/src/smf/npcf-build.c b/src/smf/npcf-build.c index 572151e6d9..cc1df5a1bd 100644 --- a/src/smf/npcf-build.c +++ b/src/smf/npcf-build.c @@ -69,13 +69,16 @@ ogs_sbi_request_t *smf_npcf_smpolicycontrol_build_create( SmPolicyContextData.notification_uri = ogs_sbi_server_uri(server, &header); ogs_assert(SmPolicyContextData.notification_uri); - if (sess->ipv4) + if (sess->ipv4) { SmPolicyContextData.ipv4_address = ogs_ipv4_to_string(sess->ipv4->addr[0]); + ogs_expect_or_return_val(SmPolicyContextData.ipv4_address, NULL); + } if (sess->ipv6) { SmPolicyContextData.ipv6_address_prefix = ogs_ipv6prefix_to_string( (uint8_t *)sess->ipv6->addr, OGS_IPV6_128_PREFIX_LEN); + ogs_expect_or_return_val(SmPolicyContextData.ipv6_address_prefix, NULL); } memset(&SubsSessAmbr, 0, sizeof(SubsSessAmbr)); @@ -121,6 +124,7 @@ ogs_sbi_request_t *smf_npcf_smpolicycontrol_build_create( if (sess->smpolicycontrol_features) { SmPolicyContextData.supp_feat = ogs_uint64_to_string(sess->smpolicycontrol_features); + ogs_expect_or_return_val(SmPolicyContextData.supp_feat, NULL); } memset(&sNssai, 0, sizeof(sNssai)); @@ -131,7 +135,7 @@ ogs_sbi_request_t *smf_npcf_smpolicycontrol_build_create( message.SmPolicyContextData = &SmPolicyContextData; request = ogs_sbi_build_request(&message); - ogs_assert(request); + ogs_expect(request); ogs_free(SmPolicyContextData.notification_uri); if (SmPolicyContextData.gpsi) @@ -219,27 +223,31 @@ ogs_sbi_request_t *smf_npcf_smpolicycontrol_build_delete( if (param->ue_location) { ueLocation.nr_location = ogs_sbi_build_nr_location( &sess->nr_tai, &sess->nr_cgi); - ogs_assert(ueLocation.nr_location); + ogs_expect_or_return_val(ueLocation.nr_location, NULL); ueLocation.nr_location->ue_location_timestamp = ogs_sbi_gmtime_string(sess->ue_location_timestamp); + ogs_expect_or_return_val( + ueLocation.nr_location->ue_location_timestamp, NULL); SmPolicyDeleteData.user_location_info = &ueLocation; } if (param->ue_timezone) { SmPolicyDeleteData.ue_time_zone = ogs_sbi_timezone_string(ogs_timezone()); + ogs_expect_or_return_val(SmPolicyDeleteData.ue_time_zone, NULL); } } SmPolicyDeleteData.serving_network = ogs_sbi_build_plmn_id_nid(&sess->plmn_id); + ogs_expect_or_return_val(SmPolicyDeleteData.serving_network, NULL); SmPolicyDeleteData.ran_nas_rel_causes = ranNasRelCauseList; message.SmPolicyDeleteData = &SmPolicyDeleteData; request = ogs_sbi_build_request(&message); - ogs_assert(request); + ogs_expect(request); if (ueLocation.nr_location) { if (ueLocation.nr_location->ue_location_timestamp) diff --git a/src/smf/npcf-handler.c b/src/smf/npcf-handler.c index 0533a1afcf..6029955aa1 100644 --- a/src/smf/npcf-handler.c +++ b/src/smf/npcf-handler.c @@ -94,6 +94,7 @@ bool smf_npcf_smpolicycontrol_handle_create( if (sess->policy_association_id) ogs_free(sess->policy_association_id); sess->policy_association_id = ogs_strdup(message.h.resource.component[1]); + ogs_assert(sess->policy_association_id); ogs_sbi_header_free(&header); @@ -267,6 +268,7 @@ bool smf_npcf_smpolicycontrol_handle_create( pcc_rule->type = OGS_PCC_RULE_TYPE_INSTALL; pcc_rule->id = ogs_strdup(PccRule->pcc_rule_id); + ogs_assert(pcc_rule->id); pcc_rule->precedence = PccRule->precedence; if (PccRule->flow_infos) { @@ -296,6 +298,7 @@ bool smf_npcf_smpolicycontrol_handle_create( flow->description = ogs_strdup(FlowInformation->flow_description); + ogs_assert(flow->description); pcc_rule->num_of_flow++; } @@ -404,8 +407,9 @@ bool smf_npcf_smpolicycontrol_handle_create( up2cp_far = sess->up2cp_far; ogs_assert(up2cp_far); - ogs_pfcp_paa_to_ue_ip_addr(&sess->session.paa, - &dl_pdr->ue_ip_addr, &dl_pdr->ue_ip_addr_len); + ogs_assert(OGS_OK == + ogs_pfcp_paa_to_ue_ip_addr(&sess->session.paa, + &dl_pdr->ue_ip_addr, &dl_pdr->ue_ip_addr_len)); dl_pdr->ue_ip_addr.sd = OGS_PFCP_UE_IP_DST; ogs_info("UE SUPI[%s] DNN[%s] IPv4[%s] IPv6[%s]", @@ -416,10 +420,11 @@ bool smf_npcf_smpolicycontrol_handle_create( /* Set UE-to-CP Flow-Description and Outer-Header-Creation */ up2cp_pdr->flow_description[up2cp_pdr->num_of_flow++] = (char *)"permit out 58 from ff02::2/128 to assigned"; - ogs_pfcp_ip_to_outer_header_creation( + ogs_assert(OGS_OK == + ogs_pfcp_ip_to_outer_header_creation( &ogs_gtp_self()->gtpu_ip, &up2cp_far->outer_header_creation, - &up2cp_far->outer_header_creation_len); + &up2cp_far->outer_header_creation_len)); up2cp_far->outer_header_creation.teid = sess->index; /* Set UPF-N3 TEID & ADDR to the Default UL PDR */ @@ -460,9 +465,13 @@ bool smf_npcf_smpolicycontrol_handle_create( sess->upf_n3_teid = sess->index; } else { if (sess->pfcp_node->addr.ogs_sa_family == AF_INET) - ogs_copyaddrinfo(&sess->upf_n3_addr, &sess->pfcp_node->addr); + ogs_assert(OGS_OK == + ogs_copyaddrinfo( + &sess->upf_n3_addr, &sess->pfcp_node->addr)); else if (sess->pfcp_node->addr.ogs_sa_family == AF_INET6) - ogs_copyaddrinfo(&sess->upf_n3_addr6, &sess->pfcp_node->addr); + ogs_assert(OGS_OK == + ogs_copyaddrinfo( + &sess->upf_n3_addr6, &sess->pfcp_node->addr)); else ogs_assert_if_reached(); @@ -503,8 +512,9 @@ cleanup: ogs_assert(strerror); ogs_error("%s", strerror); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, strerror, NULL); + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + recvmsg, strerror, NULL)); ogs_free(strerror); return false; diff --git a/src/smf/nsmf-handler.c b/src/smf/nsmf-handler.c index a775b6111e..c5ab8b3d7d 100644 --- a/src/smf/nsmf-handler.c +++ b/src/smf/nsmf-handler.c @@ -174,6 +174,7 @@ bool smf_nsmf_handle_create_sm_context( ogs_free(sess->sm_context_status_uri); sess->sm_context_status_uri = ogs_strdup(SmContextCreateData->sm_context_status_uri); + ogs_assert(sess->sm_context_status_uri); client = ogs_sbi_client_find(addr); if (!client) { @@ -187,11 +188,13 @@ bool smf_nsmf_handle_create_sm_context( if (SmContextCreateData->dnn) { if (sess->session.name) ogs_free(sess->session.name); sess->session.name = ogs_strdup(SmContextCreateData->dnn); + ogs_assert(sess->session.name); } if (SmContextCreateData->pcf_id) { if (sess->pcf_id) ogs_free(sess->pcf_id); sess->pcf_id = ogs_strdup(SmContextCreateData->pcf_id); + ogs_assert(sess->pcf_id); } /* @@ -434,7 +437,7 @@ bool smf_nsmf_handle_update_sm_context( response = ogs_sbi_build_response(&sendmsg, OGS_SBI_HTTP_STATUS_OK); ogs_assert(response); - ogs_sbi_server_send_response(stream, response); + ogs_assert(true == ogs_sbi_server_send_response(stream, response)); for (i = 0; i < sendmsg.num_of_part; i++) if (sendmsg.part[i].pkbuf) @@ -481,10 +484,11 @@ bool smf_nsmf_handle_update_sm_context( } dl_far->apply_action = OGS_PFCP_APPLY_ACTION_FORW; - ogs_pfcp_ip_to_outer_header_creation( + ogs_assert(OGS_OK == + ogs_pfcp_ip_to_outer_header_creation( &sess->gnb_n3_ip, &dl_far->outer_header_creation, - &dl_far->outer_header_creation_len); + &dl_far->outer_header_creation_len)); dl_far->outer_header_creation.teid = sess->gnb_n3_teid; } dl_far->handover.prepared = false; @@ -555,9 +559,10 @@ bool smf_nsmf_handle_update_sm_context( param.ue_location = true; param.ue_timezone = true; - smf_sbi_discover_and_send(OpenAPI_nf_type_PCF, sess, stream, + ogs_assert(true == + smf_sbi_discover_and_send(OpenAPI_nf_type_PCF, sess, stream, OGS_PFCP_DELETE_TRIGGER_AMF_UPDATE_SM_CONTEXT, ¶m, - smf_npcf_smpolicycontrol_build_delete); + smf_npcf_smpolicycontrol_build_delete)); } else { ogs_error("[%s:%d] No UpdateData", smf_ue->supi, sess->psi); smf_sbi_send_sm_context_update_error(stream, @@ -621,9 +626,10 @@ bool smf_nsmf_handle_release_sm_context( SmContextReleaseData->_5g_mm_cause_value; } - smf_sbi_discover_and_send(OpenAPI_nf_type_PCF, sess, stream, + ogs_assert(true == + smf_sbi_discover_and_send(OpenAPI_nf_type_PCF, sess, stream, OGS_PFCP_DELETE_TRIGGER_AMF_RELEASE_SM_CONTEXT, ¶m, - smf_npcf_smpolicycontrol_build_delete); + smf_npcf_smpolicycontrol_build_delete)); return true; } diff --git a/src/smf/nudm-handler.c b/src/smf/nudm-handler.c index 749c545575..206bbed34e 100644 --- a/src/smf/nudm-handler.c +++ b/src/smf/nudm-handler.c @@ -230,6 +230,7 @@ bool smf_nudm_sdm_handle_get(smf_sess_t *sess, ogs_sbi_stream_t *stream, /* Succeeded to get PDU Session */ if (!sess->session.name) sess->session.name = ogs_strdup(dnnConfigurationMap->key); + ogs_assert(sess->session.name); break; } @@ -238,6 +239,7 @@ bool smf_nudm_sdm_handle_get(smf_sess_t *sess, ogs_sbi_stream_t *stream, if (!sess->session.name) { strerror = ogs_msprintf("[%s:%d] No dnnConfiguration", smf_ue->supi, sess->psi); + ogs_assert(strerror); return false; } @@ -266,12 +268,13 @@ bool smf_nudm_sdm_handle_get(smf_sess_t *sess, ogs_sbi_stream_t *stream, response = ogs_sbi_build_response(&sendmsg, OGS_SBI_HTTP_STATUS_CREATED); ogs_assert(response); - ogs_sbi_server_send_response(stream, response); + ogs_assert(true == ogs_sbi_server_send_response(stream, response)); ogs_free(sendmsg.http.location); - smf_sbi_discover_and_send(OpenAPI_nf_type_PCF, sess, stream, - 0, NULL, smf_npcf_smpolicycontrol_build_create); + ogs_assert(true == + smf_sbi_discover_and_send(OpenAPI_nf_type_PCF, sess, stream, + 0, NULL, smf_npcf_smpolicycontrol_build_create)); return true; @@ -279,8 +282,9 @@ cleanup: ogs_assert(strerror); ogs_error("%s", strerror); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, strerror, NULL); + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + recvmsg, strerror, NULL)); ogs_free(strerror); return false; diff --git a/src/smf/pfcp-path.c b/src/smf/pfcp-path.c index f4bd006a7d..c932e177d3 100644 --- a/src/smf/pfcp-path.c +++ b/src/smf/pfcp-path.c @@ -204,8 +204,9 @@ static void sess_5gc_timeout(ogs_pfcp_xact_t *xact, void *data) ogs_assert(strerror); ogs_error("%s", strerror); - ogs_sbi_server_send_error(stream, - OGS_SBI_HTTP_STATUS_GATEWAY_TIMEOUT, NULL, strerror, NULL); + ogs_assert(true == + ogs_sbi_server_send_error(stream, + OGS_SBI_HTTP_STATUS_GATEWAY_TIMEOUT, NULL, strerror, NULL)); ogs_free(strerror); break; default: diff --git a/src/smf/pfcp-sm.c b/src/smf/pfcp-sm.c index 48ed885052..2665755495 100644 --- a/src/smf/pfcp-sm.c +++ b/src/smf/pfcp-sm.c @@ -190,12 +190,14 @@ void smf_pfcp_state_associated(ogs_fsm_t *s, smf_event_t *e) switch (message->h.type) { case OGS_PFCP_HEARTBEAT_REQUEST_TYPE: - ogs_pfcp_handle_heartbeat_request(node, xact, - &message->pfcp_heartbeat_request); + ogs_assert(true == + ogs_pfcp_handle_heartbeat_request(node, xact, + &message->pfcp_heartbeat_request)); break; case OGS_PFCP_HEARTBEAT_RESPONSE_TYPE: - ogs_pfcp_handle_heartbeat_response(node, xact, - &message->pfcp_heartbeat_response); + ogs_assert(true == + ogs_pfcp_handle_heartbeat_response(node, xact, + &message->pfcp_heartbeat_response)); break; case OGS_PFCP_ASSOCIATION_SETUP_REQUEST_TYPE: ogs_warn("PFCP[REQ] has already been associated"); @@ -272,7 +274,8 @@ void smf_pfcp_state_associated(ogs_fsm_t *s, smf_event_t *e) node = e->pfcp_node; ogs_assert(node); - ogs_pfcp_send_heartbeat_request(node, node_timeout); + ogs_assert(OGS_OK == + ogs_pfcp_send_heartbeat_request(node, node_timeout)); break; default: ogs_error("Unknown timer[%s:%d]", diff --git a/src/smf/s5c-build.c b/src/smf/s5c-build.c index e401e4c230..666053b751 100644 --- a/src/smf/s5c-build.c +++ b/src/smf/s5c-build.c @@ -68,7 +68,7 @@ ogs_pkbuf_t *smf_s5c_build_create_session_response( rv = ogs_gtp_sockaddr_to_f_teid( ogs_gtp_self()->gtpc_addr, ogs_gtp_self()->gtpc_addr6, &smf_s5c_teid, &len); - ogs_assert(rv == OGS_OK); + ogs_expect_or_return_val(rv == OGS_OK, NULL); rsp->pgw_s5_s8__s2a_s2b_f_teid_for_pmip_based_interface_or_for_gtp_based_control_plane_interface. presence = 1; rsp->pgw_s5_s8__s2a_s2b_f_teid_for_pmip_based_interface_or_for_gtp_based_control_plane_interface. @@ -147,7 +147,7 @@ ogs_pkbuf_t *smf_s5c_build_create_session_response( ogs_assert(bearer->pgw_s5u_addr || bearer->pgw_s5u_addr6); rv = ogs_gtp_sockaddr_to_f_teid( bearer->pgw_s5u_addr, bearer->pgw_s5u_addr6, &pgw_s5u_teid, &len); - ogs_assert(rv == OGS_OK); + ogs_expect_or_return_val(rv == OGS_OK, NULL); rsp->bearer_contexts_created.s5_s8_u_sgw_f_teid.presence = 1; rsp->bearer_contexts_created.s5_s8_u_sgw_f_teid.data = &pgw_s5u_teid; rsp->bearer_contexts_created.s5_s8_u_sgw_f_teid.len = len; @@ -243,7 +243,7 @@ ogs_pkbuf_t *smf_s5c_build_create_bearer_request( ogs_assert(bearer->pgw_s5u_addr || bearer->pgw_s5u_addr6); rv = ogs_gtp_sockaddr_to_f_teid( bearer->pgw_s5u_addr, bearer->pgw_s5u_addr6, &pgw_s5u_teid, &len); - ogs_assert(rv == OGS_OK); + ogs_expect_or_return_val(rv == OGS_OK, NULL); req->bearer_contexts.s5_s8_u_sgw_f_teid.presence = 1; req->bearer_contexts.s5_s8_u_sgw_f_teid.data = &pgw_s5u_teid; req->bearer_contexts.s5_s8_u_sgw_f_teid.len = len; diff --git a/src/smf/s5c-handler.c b/src/smf/s5c-handler.c index 9e35241495..2ddba2d65a 100644 --- a/src/smf/s5c-handler.c +++ b/src/smf/s5c-handler.c @@ -149,9 +149,10 @@ void smf_s5c_handle_create_session_request( /* UE IP Address */ ogs_assert(req->pdn_address_allocation.data); sess->session.session_type = req->pdn_type.u8; - ogs_gtp_paa_to_ip( + rv = ogs_gtp_paa_to_ip( (ogs_paa_t *)req->pdn_address_allocation.data, &sess->session.ue_ip); + ogs_assert(rv == OGS_OK); smf_sess_set_ue_ip(sess); @@ -377,8 +378,11 @@ void smf_s5c_handle_create_bearer_response( dl_far->apply_action = OGS_PFCP_APPLY_ACTION_FORW; - ogs_pfcp_ip_to_outer_header_creation(&bearer->sgw_s5u_ip, - &dl_far->outer_header_creation, &dl_far->outer_header_creation_len); + ogs_assert(OGS_OK == + ogs_pfcp_ip_to_outer_header_creation( + &bearer->sgw_s5u_ip, + &dl_far->outer_header_creation, + &dl_far->outer_header_creation_len)); dl_far->outer_header_creation.teid = bearer->sgw_s5u_teid; ogs_assert(OGS_OK == @@ -811,9 +815,11 @@ void smf_s5c_handle_bearer_resource_command( ogs_ipfw_copy_and_swap(&tmp, &pf->ipfw_rule); pf->flow_description = ogs_ipfw_encode_flow_description(&tmp); + ogs_assert(pf->flow_description); } else { pf->flow_description = ogs_ipfw_encode_flow_description(&pf->ipfw_rule); + ogs_assert(pf->flow_description); } } @@ -878,9 +884,11 @@ void smf_s5c_handle_bearer_resource_command( ogs_ipfw_copy_and_swap(&tmp, &pf->ipfw_rule); pf->flow_description = ogs_ipfw_encode_flow_description(&tmp); + ogs_assert(pf->flow_description); } else { pf->flow_description = ogs_ipfw_encode_flow_description(&pf->ipfw_rule); + ogs_assert(pf->flow_description); } tft_update = 1; diff --git a/src/smf/sbi-path.c b/src/smf/sbi-path.c index 6d1fbb0d26..a13d533eef 100644 --- a/src/smf/sbi-path.c +++ b/src/smf/sbi-path.c @@ -115,7 +115,7 @@ void smf_sbi_close(void) ogs_sbi_server_stop_all(); } -void smf_nnrf_nfm_send_nf_register(ogs_sbi_nf_instance_t *nf_instance) +bool smf_nnrf_nfm_send_nf_register(ogs_sbi_nf_instance_t *nf_instance) { ogs_sbi_request_t *request = NULL; ogs_sbi_client_t *client = NULL; @@ -125,19 +125,17 @@ void smf_nnrf_nfm_send_nf_register(ogs_sbi_nf_instance_t *nf_instance) ogs_assert(client); request = smf_nnrf_nfm_build_register(nf_instance); - if (!request) { - ogs_error("smf_nnrf_nfm_send_nf_register() failed"); - return; - } - ogs_sbi_client_send_request(client, client->cb, request, nf_instance); + ogs_expect_or_return_val(request, false); + return ogs_sbi_client_send_request( + client, client->cb, request, nf_instance); } -void smf_sbi_send(ogs_sbi_nf_instance_t *nf_instance, ogs_sbi_xact_t *xact) +bool smf_sbi_send(ogs_sbi_nf_instance_t *nf_instance, ogs_sbi_xact_t *xact) { - ogs_sbi_send(nf_instance, client_cb, xact); + return ogs_sbi_send(nf_instance, client_cb, xact); } -void smf_sbi_discover_and_send(OpenAPI_nf_type_e target_nf_type, +bool smf_sbi_discover_and_send(OpenAPI_nf_type_e target_nf_type, smf_sess_t *sess, ogs_sbi_stream_t *stream, int state, void *data, ogs_sbi_request_t *(*build)(smf_sess_t *sess, void *data)) { @@ -158,10 +156,11 @@ void smf_sbi_discover_and_send(OpenAPI_nf_type_e target_nf_type, smf_timer_sbi_client_wait_expire); if (!xact) { ogs_error("smf_sbi_discover_and_send() failed"); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_GATEWAY_TIMEOUT, NULL, - "Cannot discover", smf_ue->supi); - return; + "Cannot discover", smf_ue->supi)); + return false; } xact->state = state; @@ -170,11 +169,15 @@ void smf_sbi_discover_and_send(OpenAPI_nf_type_e target_nf_type, if (ogs_sbi_discover_and_send(xact, (ogs_fsm_handler_t)smf_nf_state_registered, client_cb) != true) { ogs_error("smf_sbi_discover_and_send() failed"); - ogs_sbi_server_send_error(stream, + ogs_sbi_xact_remove(xact); + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_GATEWAY_TIMEOUT, NULL, - "Cannot discover", smf_ue->supi); - return; + "Cannot discover", smf_ue->supi)); + return false; } + + return true; } void smf_namf_comm_send_n1_n2_message_transfer( @@ -241,8 +244,7 @@ void smf_sbi_send_sm_context_create_error( response = ogs_sbi_build_response(&sendmsg, problem.status); ogs_assert(response); - - ogs_sbi_server_send_response(stream, response); + ogs_assert(true == ogs_sbi_server_send_response(stream, response)); if (n1smbuf) ogs_pkbuf_free(n1smbuf); @@ -314,8 +316,7 @@ void smf_sbi_send_sm_context_updated_data( response = ogs_sbi_build_response(&sendmsg, OGS_SBI_HTTP_STATUS_OK); ogs_assert(response); - - ogs_sbi_server_send_response(stream, response); + ogs_assert(true == ogs_sbi_server_send_response(stream, response)); for (i = 0; i < sendmsg.num_of_part; i++) ogs_pkbuf_free(sendmsg.part[i].pkbuf); @@ -371,8 +372,7 @@ void smf_sbi_send_sm_context_update_error( response = ogs_sbi_build_response(&sendmsg, problem.status); ogs_assert(response); - - ogs_sbi_server_send_response(stream, response); + ogs_assert(true == ogs_sbi_server_send_response(stream, response)); if (n1smbuf) ogs_pkbuf_free(n1smbuf); @@ -406,7 +406,7 @@ static int client_notify_cb(ogs_sbi_response_t *response, void *data) return OGS_OK; } -void smf_sbi_send_sm_context_status_notify(smf_sess_t *sess) +bool smf_sbi_send_sm_context_status_notify(smf_sess_t *sess) { ogs_sbi_request_t *request = NULL; ogs_sbi_client_t *client = NULL; @@ -416,6 +416,6 @@ void smf_sbi_send_sm_context_status_notify(smf_sess_t *sess) ogs_assert(client); request = smf_namf_callback_build_sm_context_status(sess, NULL); - ogs_assert(request); - ogs_sbi_client_send_request(client, client_notify_cb, request, NULL); + ogs_expect_or_return_val(request, false); + return ogs_sbi_client_send_request(client, client_notify_cb, request, NULL); } diff --git a/src/smf/sbi-path.h b/src/smf/sbi-path.h index d7196f097b..333dde30a8 100644 --- a/src/smf/sbi-path.h +++ b/src/smf/sbi-path.h @@ -34,11 +34,11 @@ extern "C" { int smf_sbi_open(void); void smf_sbi_close(void); -void smf_nnrf_nfm_send_nf_register(ogs_sbi_nf_instance_t *nf_instance); +bool smf_nnrf_nfm_send_nf_register(ogs_sbi_nf_instance_t *nf_instance); -void smf_sbi_send(ogs_sbi_nf_instance_t *nf_instance, ogs_sbi_xact_t *xact); +bool smf_sbi_send(ogs_sbi_nf_instance_t *nf_instance, ogs_sbi_xact_t *xact); -void smf_sbi_discover_and_send(OpenAPI_nf_type_e target_nf_type, +bool smf_sbi_discover_and_send(OpenAPI_nf_type_e target_nf_type, smf_sess_t *sess, ogs_sbi_stream_t *stream, int state, void *data, ogs_sbi_request_t *(*build)(smf_sess_t *sess, void *data)); @@ -78,7 +78,7 @@ void smf_sbi_send_sm_context_update_error( int status, const char *title, const char *detail, ogs_pkbuf_t *n1smbuf, ogs_pkbuf_t *n2smbuf); -void smf_sbi_send_sm_context_status_notify(smf_sess_t *sess); +bool smf_sbi_send_sm_context_status_notify(smf_sess_t *sess); #ifdef __cplusplus } diff --git a/src/smf/smf-sm.c b/src/smf/smf-sm.c index 167afee7f0..e7cfa361de 100644 --- a/src/smf/smf-sm.c +++ b/src/smf/smf-sm.c @@ -249,8 +249,10 @@ void smf_state_operational(ogs_fsm_t *s, smf_event_t *e) if (rv != OGS_OK) { /* 'sbi_message' buffer is released in ogs_sbi_parse_request() */ ogs_error("cannot parse HTTP sbi_message"); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - NULL, "cannot parse HTTP sbi_message", NULL); + ogs_assert(true == + ogs_sbi_server_send_error( + stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + NULL, "cannot parse HTTP sbi_message", NULL)); break; } @@ -265,8 +267,10 @@ void smf_state_operational(ogs_fsm_t *s, smf_event_t *e) ogs_assert(api_version); if (strcmp(sbi_message.h.api.version, api_version) != 0) { ogs_error("Not supported version [%s]", sbi_message.h.api.version); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - &sbi_message, "Not supported version", NULL); + ogs_assert(true == + ogs_sbi_server_send_error( + stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + &sbi_message, "Not supported version", NULL)); ogs_sbi_message_free(&sbi_message); break; } @@ -283,19 +287,21 @@ void smf_state_operational(ogs_fsm_t *s, smf_event_t *e) DEFAULT ogs_error("Invalid HTTP method [%s]", sbi_message.h.method); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_FORBIDDEN, &sbi_message, - "Invalid HTTP method", sbi_message.h.method); + "Invalid HTTP method", sbi_message.h.method)); END break; DEFAULT ogs_error("Invalid resource name [%s]", sbi_message.h.resource.component[0]); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, &sbi_message, "Invalid resource name", - sbi_message.h.resource.component[0]); + sbi_message.h.resource.component[0])); END break; @@ -337,9 +343,10 @@ void smf_state_operational(ogs_fsm_t *s, smf_event_t *e) DEFAULT ogs_error("Invalid HTTP method [%s]", sbi_message.h.method); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, &sbi_message, - "Invalid HTTP method", sbi_message.h.method); + "Invalid HTTP method", sbi_message.h.method)); break; END @@ -361,10 +368,11 @@ void smf_state_operational(ogs_fsm_t *s, smf_event_t *e) DEFAULT ogs_error("Invalid resource name [%s]", sbi_message.h.resource.component[0]); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, &sbi_message, "Invalid resource name", - sbi_message.h.resource.component[0]); + sbi_message.h.resource.component[0])); END break; @@ -375,23 +383,25 @@ void smf_state_operational(ogs_fsm_t *s, smf_event_t *e) stream, &sbi_message); break; CASE(OGS_SBI_RESOURCE_NAME_SM_POLICY_NOTIFY) - ogs_sbi_send_http_status_no_content(stream); + ogs_assert(true == ogs_sbi_send_http_status_no_content(stream)); break; DEFAULT ogs_error("Invalid resource name [%s]", sbi_message.h.resource.component[0]); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, &sbi_message, "Invalid resource name", - sbi_message.h.resource.component[0]); + sbi_message.h.resource.component[0])); END break; DEFAULT ogs_error("Invalid API name [%s]", sbi_message.h.service.name); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, &sbi_message, - "Invalid API name", sbi_message.h.service.name); + "Invalid API name", sbi_message.h.service.name)); END /* In lib/sbi/server.c, notify_completed() releases 'request' buffer. */ @@ -572,9 +582,10 @@ void smf_state_operational(ogs_fsm_t *s, smf_event_t *e) subscription = e->sbi.data; ogs_assert(subscription); - ogs_nnrf_nfm_send_nf_status_subscribe(subscription->client, + ogs_assert(true == + ogs_nnrf_nfm_send_nf_status_subscribe(subscription->client, smf_self()->nf_type, subscription->req_nf_instance_id, - subscription->subscr_cond.nf_type); + subscription->subscr_cond.nf_type)); ogs_info("Subscription validity expired [%s]", subscription->id); ogs_sbi_subscription_remove(subscription); @@ -592,9 +603,10 @@ void smf_state_operational(ogs_fsm_t *s, smf_event_t *e) ogs_error("Cannot receive SBI message"); if (stream) { - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_GATEWAY_TIMEOUT, NULL, - "Cannot receive SBI message", NULL); + "Cannot receive SBI message", NULL)); } break; @@ -604,7 +616,7 @@ void smf_state_operational(ogs_fsm_t *s, smf_event_t *e) sess = smf_sess_cycle(sess); ogs_assert(sess); - smf_sbi_send_sm_context_status_notify(sess); + ogs_assert(true == smf_sbi_send_sm_context_status_notify(sess)); SMF_SESS_CLEAR(sess); break; diff --git a/src/udm/context.c b/src/udm/context.c index c2489f8c42..ca28255455 100644 --- a/src/udm/context.c +++ b/src/udm/context.c @@ -40,7 +40,9 @@ void udm_context_init(void) ogs_list_init(&self.udm_ue_list); self.suci_hash = ogs_hash_make(); + ogs_assert(self.suci_hash); self.supi_hash = ogs_hash_make(); + ogs_assert(self.supi_hash); context_initialized = 1; } diff --git a/src/udm/nf-sm.c b/src/udm/nf-sm.c index ee601e7d80..581bbf13db 100644 --- a/src/udm/nf-sm.c +++ b/src/udm/nf-sm.c @@ -109,7 +109,7 @@ void udm_nf_state_will_register(ogs_fsm_t *s, udm_event_t *e) ogs_timer_start(nf_instance->t_registration_interval, ogs_app()->time.message.sbi.nf_register_interval); - udm_nnrf_nfm_send_nf_register(nf_instance); + ogs_assert(true == udm_nnrf_nfm_send_nf_register(nf_instance)); break; case OGS_FSM_EXIT_SIG: @@ -164,7 +164,7 @@ void udm_nf_state_will_register(ogs_fsm_t *s, udm_event_t *e) ogs_timer_start(nf_instance->t_registration_interval, ogs_app()->time.message.sbi.nf_register_interval); - udm_nnrf_nfm_send_nf_register(nf_instance); + ogs_assert(true == udm_nnrf_nfm_send_nf_register(nf_instance)); break; default: @@ -210,8 +210,9 @@ void udm_nf_state_registered(ogs_fsm_t *s, udm_event_t *e) ogs_app()->time.nf_instance.no_heartbeat_margin)); } - ogs_nnrf_nfm_send_nf_status_subscribe(client, - udm_self()->nf_type, nf_instance->id, OpenAPI_nf_type_UDR); + ogs_assert(true == + ogs_nnrf_nfm_send_nf_status_subscribe(client, + udm_self()->nf_type, nf_instance->id, OpenAPI_nf_type_UDR)); } break; @@ -226,7 +227,8 @@ void udm_nf_state_registered(ogs_fsm_t *s, udm_event_t *e) } if (!OGS_FSM_CHECK(&nf_instance->sm, udm_nf_state_exception)) { - ogs_nnrf_nfm_send_nf_de_register(nf_instance); + ogs_assert(true == + ogs_nnrf_nfm_send_nf_de_register(nf_instance)); } } break; @@ -276,7 +278,7 @@ void udm_nf_state_registered(ogs_fsm_t *s, udm_event_t *e) ogs_timer_start(nf_instance->t_heartbeat_interval, ogs_time_from_sec(nf_instance->time.heartbeat_interval)); - ogs_nnrf_nfm_send_nf_update(nf_instance); + ogs_assert(true == ogs_nnrf_nfm_send_nf_update(nf_instance)); break; case UDM_TIMER_NF_INSTANCE_NO_HEARTBEAT: diff --git a/src/udm/nnrf-build.c b/src/udm/nnrf-build.c index 155c95fc9e..0ccd9d84e0 100644 --- a/src/udm/nnrf-build.c +++ b/src/udm/nnrf-build.c @@ -43,7 +43,7 @@ ogs_sbi_request_t *udm_nnrf_nfm_build_register( message.http.content_encoding = (char*)ogs_sbi_self()->content_encoding; NFProfile = ogs_nnrf_nfm_build_nf_profile(nf_instance); - ogs_assert(NFProfile); + ogs_expect_or_return_val(NFProfile, NULL); message.NFProfile = NFProfile; diff --git a/src/udm/nnrf-handler.c b/src/udm/nnrf-handler.c index 62cf919f6d..3726a37a64 100644 --- a/src/udm/nnrf-handler.c +++ b/src/udm/nnrf-handler.c @@ -111,15 +111,17 @@ bool udm_nnrf_handle_nf_status_notify( NotificationData = recvmsg->NotificationData; if (!NotificationData) { ogs_error("No NotificationData"); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "No NotificationData", NULL); + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + recvmsg, "No NotificationData", NULL)); return false; } if (!NotificationData->nf_instance_uri) { ogs_error("No nfInstanceUri"); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "No nfInstanceUri", NULL); + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + recvmsg, "No nfInstanceUri", NULL)); return false; } @@ -129,15 +131,17 @@ bool udm_nnrf_handle_nf_status_notify( rv = ogs_sbi_parse_header(&message, &header); if (rv != OGS_OK) { ogs_error("Cannot parse nfInstanceUri [%s]", header.uri); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "Cannot parse nfInstanceUri", header.uri); + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + recvmsg, "Cannot parse nfInstanceUri", header.uri)); return false; } if (!message.h.resource.component[1]) { ogs_error("No nfInstanceId [%s]", header.uri); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "Cannot parse nfInstanceUri", header.uri); + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + recvmsg, "Cannot parse nfInstanceUri", header.uri)); ogs_sbi_header_free(&header); return false; } @@ -145,9 +149,10 @@ bool udm_nnrf_handle_nf_status_notify( if (NF_INSTANCE_IS_SELF(message.h.resource.component[1])) { ogs_warn("[%s] The notification is not allowed", message.h.resource.component[1]); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_FORBIDDEN, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_FORBIDDEN, recvmsg, "The notification is not allowed", - message.h.resource.component[1]); + message.h.resource.component[1])); ogs_sbi_header_free(&header); return false; } @@ -160,8 +165,10 @@ bool udm_nnrf_handle_nf_status_notify( NFProfile = NotificationData->nf_profile; if (!NFProfile) { ogs_error("No NFProfile"); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "No NFProfile", NULL); + ogs_assert(true == + ogs_sbi_server_send_error( + stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + recvmsg, "No NFProfile", NULL)); ogs_sbi_header_free(&header); return false; } @@ -198,9 +205,10 @@ bool udm_nnrf_handle_nf_status_notify( handled = ogs_sbi_client_associate(nf_instance); if (!handled) { ogs_error("[%s] Cannot associate NF EndPoint", nf_instance->id); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "Cannot find NF EndPoint", nf_instance->id); + recvmsg, "Cannot find NF EndPoint", nf_instance->id)); UDM_NF_INSTANCE_CLEAR("NRF-notify", nf_instance); ogs_sbi_header_free(&header); return false; @@ -214,9 +222,10 @@ bool udm_nnrf_handle_nf_status_notify( } else { ogs_warn("[%s] (NRF-notify) Not found", message.h.resource.component[1]); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_NOT_FOUND, - recvmsg, "Not found", message.h.resource.component[1]); + recvmsg, "Not found", message.h.resource.component[1])); ogs_sbi_header_free(&header); return false; } @@ -225,16 +234,17 @@ bool udm_nnrf_handle_nf_status_notify( NotificationData->event); ogs_error("Not supported event [%d:%s]", NotificationData->event, eventstr ? eventstr : "Unknown"); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, recvmsg, "Not supported event", - eventstr ? eventstr : "Unknown"); + eventstr ? eventstr : "Unknown")); ogs_sbi_header_free(&header); return false; } response = ogs_sbi_build_response(recvmsg, OGS_SBI_HTTP_STATUS_NO_CONTENT); ogs_assert(response); - ogs_sbi_server_send_response(stream, response); + ogs_assert(true == ogs_sbi_server_send_response(stream, response)); ogs_sbi_header_free(&header); return true; @@ -330,6 +340,6 @@ void udm_nnrf_handle_nf_discover( ogs_error("(NF discover) No [%s]", OpenAPI_nf_type_ToString(xact->target_nf_type)); } else { - udm_sbi_send(nf_instance, xact); + ogs_assert(true == udm_sbi_send(nf_instance, xact)); } } diff --git a/src/udm/nudm-handler.c b/src/udm/nudm-handler.c index 8b0c0d1d29..572fe3a03c 100644 --- a/src/udm/nudm-handler.c +++ b/src/udm/nudm-handler.c @@ -36,40 +36,46 @@ bool udm_nudm_ueau_handle_get( AuthenticationInfoRequest = recvmsg->AuthenticationInfoRequest; if (!AuthenticationInfoRequest) { ogs_error("[%s] No AuthenticationInfoRequest", udm_ue->suci); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "No AuthenticationInfoRequest", udm_ue->suci); + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + recvmsg, "No AuthenticationInfoRequest", udm_ue->suci)); return false; } serving_network_name = AuthenticationInfoRequest->serving_network_name; if (!AuthenticationInfoRequest) { ogs_error("[%s] No servingNetworkName", udm_ue->suci); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "No servingNetworkName", udm_ue->suci); + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + recvmsg, "No servingNetworkName", udm_ue->suci)); return false; } if (udm_ue->serving_network_name) ogs_free(udm_ue->serving_network_name); udm_ue->serving_network_name = ogs_strdup(serving_network_name); + ogs_assert(udm_ue->serving_network_name); ausf_instance_id = AuthenticationInfoRequest->ausf_instance_id; if (!AuthenticationInfoRequest) { ogs_error("[%s] No ausfInstanceId", udm_ue->suci); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "No ausfInstanceId", udm_ue->suci); + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + recvmsg, "No ausfInstanceId", udm_ue->suci)); return false; } if (udm_ue->ausf_instance_id) ogs_free(udm_ue->ausf_instance_id); udm_ue->ausf_instance_id = ogs_strdup(ausf_instance_id); + ogs_assert(udm_ue->ausf_instance_id); ResynchronizationInfo = AuthenticationInfoRequest->resynchronization_info; if (!ResynchronizationInfo) { - udm_sbi_discover_and_send(OpenAPI_nf_type_UDR, udm_ue, stream, NULL, - udm_nudr_dr_build_authentication_subscription); + ogs_assert(true == udm_sbi_discover_and_send( + OpenAPI_nf_type_UDR, udm_ue, stream, NULL, + udm_nudr_dr_build_authentication_subscription)); } else { uint8_t rand[OGS_RAND_LEN]; @@ -80,17 +86,19 @@ bool udm_nudm_ueau_handle_get( if (!ResynchronizationInfo->rand) { ogs_error("[%s] No RAND", udm_ue->suci); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "No RAND", udm_ue->suci); + recvmsg, "No RAND", udm_ue->suci)); return false; } if (!ResynchronizationInfo->auts) { ogs_error("[%s] No AUTS", udm_ue->suci); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "No AUTS", udm_ue->suci); + recvmsg, "No AUTS", udm_ue->suci)); return false; } @@ -106,9 +114,10 @@ bool udm_nudm_ueau_handle_get( ogs_log_hexdump(OGS_LOG_ERROR, udm_ue->rand, sizeof(udm_ue)->rand); ogs_log_hexdump(OGS_LOG_ERROR, rand, sizeof(rand)); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "Invalid RAND", udm_ue->suci); + recvmsg, "Invalid RAND", udm_ue->suci)); return false; } @@ -120,9 +129,10 @@ bool udm_nudm_ueau_handle_get( ogs_log_hexdump(OGS_LOG_ERROR, mac_s, OGS_MAC_S_LEN); ogs_log_hexdump(OGS_LOG_ERROR, auts + OGS_SQN_LEN, OGS_MAC_S_LEN); ogs_log_hexdump(OGS_LOG_ERROR, sqn_ms, OGS_SQN_LEN); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_UNAUTHORIZED, - recvmsg, "Re-sync MAC failed", udm_ue->suci); + recvmsg, "Re-sync MAC failed", udm_ue->suci)); return false; } @@ -151,9 +161,10 @@ bool udm_nudm_ueau_handle_get( ogs_uint64_to_buffer(sqn, OGS_SQN_LEN, udm_ue->sqn); - udm_sbi_discover_and_send(OpenAPI_nf_type_UDR, + ogs_assert(true == + udm_sbi_discover_and_send(OpenAPI_nf_type_UDR, udm_ue, stream, udm_ue->sqn, - udm_nudr_dr_build_authentication_subscription); + udm_nudr_dr_build_authentication_subscription)); } return true; @@ -171,51 +182,58 @@ bool udm_nudm_ueau_handle_result_confirmation_inform( AuthEvent = message->AuthEvent; if (!AuthEvent) { ogs_error("[%s] No AuthEvent", udm_ue->suci); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - message, "No AuthEvent", udm_ue->suci); + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + message, "No AuthEvent", udm_ue->suci)); return false; } if (!AuthEvent->nf_instance_id) { ogs_error("[%s] No nfInstanceId", udm_ue->suci); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - message, "No nfInstanceId", udm_ue->suci); + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + message, "No nfInstanceId", udm_ue->suci)); return false; } if (!AuthEvent->success) { ogs_error("[%s] No success", udm_ue->suci); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - message, "No success", udm_ue->suci); + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + message, "No success", udm_ue->suci)); return false; } if (!AuthEvent->time_stamp) { ogs_error("[%s] No timeStamp", udm_ue->suci); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - message, "No timeStamp", udm_ue->suci); + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + message, "No timeStamp", udm_ue->suci)); return false; } if (!AuthEvent->auth_type) { ogs_error("[%s] No authType", udm_ue->suci); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - message, "No authType", udm_ue->suci); + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + message, "No authType", udm_ue->suci)); return false; } if (!AuthEvent->serving_network_name) { ogs_error("[%s] No servingNetworkName", udm_ue->suci); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - message, "No servingNetworkName", udm_ue->suci); + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + message, "No servingNetworkName", udm_ue->suci)); return false; } udm_ue->auth_event = OpenAPI_auth_event_copy( udm_ue->auth_event, message->AuthEvent); - udm_sbi_discover_and_send(OpenAPI_nf_type_UDR, udm_ue, stream, NULL, - udm_nudr_dr_build_update_authentication_status); + ogs_assert(true == + udm_sbi_discover_and_send(OpenAPI_nf_type_UDR, udm_ue, stream, NULL, + udm_nudr_dr_build_update_authentication_status)); return true; } @@ -233,58 +251,66 @@ bool udm_nudm_uecm_handle_registration( Amf3GppAccessRegistration = message->Amf3GppAccessRegistration; if (!Amf3GppAccessRegistration) { ogs_error("[%s] No Amf3GppAccessRegistration", udm_ue->supi); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - message, "No Amf3GppAccessRegistration", udm_ue->supi); + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + message, "No Amf3GppAccessRegistration", udm_ue->supi)); return false; } if (!Amf3GppAccessRegistration->dereg_callback_uri) { ogs_error("[%s] No dregCallbackUri", udm_ue->supi); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - message, "No dregCallbackUri", udm_ue->supi); + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + message, "No dregCallbackUri", udm_ue->supi)); return false; } Guami = Amf3GppAccessRegistration->guami; if (!Guami) { ogs_error("[%s] No Guami", udm_ue->supi); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - message, "No Guami", udm_ue->supi); + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + message, "No Guami", udm_ue->supi)); return false; } if (!Guami->amf_id) { ogs_error("[%s] No Guami.AmfId", udm_ue->supi); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - message, "No Guami.AmfId", udm_ue->supi); + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + message, "No Guami.AmfId", udm_ue->supi)); return false; } if (!Guami->plmn_id) { ogs_error("[%s] No PlmnId", udm_ue->supi); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - message, "No PlmnId", udm_ue->supi); + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + message, "No PlmnId", udm_ue->supi)); return false; } if (!Guami->plmn_id->mnc) { ogs_error("[%s] No PlmnId.Mnc", udm_ue->supi); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - message, "No PlmnId.Mnc", udm_ue->supi); + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + message, "No PlmnId.Mnc", udm_ue->supi)); return false; } if (!Guami->plmn_id->mcc) { ogs_error("[%s] No PlmnId.Mcc", udm_ue->supi); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - message, "No PlmnId.Mcc", udm_ue->supi); + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + message, "No PlmnId.Mcc", udm_ue->supi)); return false; } if (!Amf3GppAccessRegistration->rat_type) { ogs_error("[%s] No RatType", udm_ue->supi); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - message, "No RatType", udm_ue->supi); + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + message, "No RatType", udm_ue->supi)); return false; } @@ -292,6 +318,7 @@ bool udm_nudm_uecm_handle_registration( ogs_free(udm_ue->dereg_callback_uri); udm_ue->dereg_callback_uri = ogs_strdup( Amf3GppAccessRegistration->dereg_callback_uri); + ogs_assert(udm_ue->dereg_callback_uri); ogs_sbi_parse_guami(&udm_ue->guami, Guami); @@ -302,8 +329,9 @@ bool udm_nudm_uecm_handle_registration( udm_ue->amf_3gpp_access_registration, message->Amf3GppAccessRegistration); - udm_sbi_discover_and_send(OpenAPI_nf_type_UDR, udm_ue, stream, NULL, - udm_nudr_dr_build_update_amf_context); + ogs_assert(true == + udm_sbi_discover_and_send(OpenAPI_nf_type_UDR, udm_ue, stream, NULL, + udm_nudr_dr_build_update_amf_context)); return true; } diff --git a/src/udm/nudr-handler.c b/src/udm/nudr-handler.c index 5a86159ca5..d71e307955 100644 --- a/src/udm/nudr-handler.c +++ b/src/udm/nudr-handler.c @@ -86,8 +86,9 @@ bool udm_nudr_dr_handle_subscription_authentication( ogs_warn("%s", strerror); else ogs_error("%s", strerror); - ogs_sbi_server_send_error( - stream, recvmsg->res_status, recvmsg, strerror, NULL); + ogs_assert(true == + ogs_sbi_server_send_error( + stream, recvmsg->res_status, recvmsg, strerror, NULL)); ogs_free(strerror); return false; } @@ -95,9 +96,11 @@ bool udm_nudr_dr_handle_subscription_authentication( AuthenticationSubscription = recvmsg->AuthenticationSubscription; if (!AuthenticationSubscription) { ogs_error("[%s] No AuthenticationSubscription", udm_ue->suci); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_INTERNAL_SERVER_ERROR, - recvmsg, "No AuthenticationSubscription", udm_ue->suci); + recvmsg, "No AuthenticationSubscription", + udm_ue->suci)); return false; } @@ -106,47 +109,53 @@ bool udm_nudr_dr_handle_subscription_authentication( ogs_error("[%s] Not supported Auth Method [%d]", udm_ue->suci, AuthenticationSubscription->authentication_method); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_FORBIDDEN, - recvmsg, "Not supported Auth Method", udm_ue->suci); + recvmsg, "Not supported Auth Method", udm_ue->suci)); return false; } if (!AuthenticationSubscription->enc_permanent_key) { ogs_error("[%s] No encPermanentKey", udm_ue->suci); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_INTERNAL_SERVER_ERROR, - recvmsg, "No encPermanentKey", udm_ue->suci); + recvmsg, "No encPermanentKey", udm_ue->suci)); return false; } if (!AuthenticationSubscription->enc_opc_key) { ogs_error("[%s] No encPermanentKey", udm_ue->suci); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_INTERNAL_SERVER_ERROR, - recvmsg, "No encPermanentKey", udm_ue->suci); + recvmsg, "No encPermanentKey", udm_ue->suci)); return false; } if (!AuthenticationSubscription->authentication_management_field) { ogs_error("[%s] No authenticationManagementField", udm_ue->suci); + ogs_assert(true == + ogs_sbi_server_send_error(stream, + OGS_SBI_HTTP_STATUS_INTERNAL_SERVER_ERROR, + recvmsg, "No authenticationManagementField", udm_ue->suci)); + return false; + } + if (!AuthenticationSubscription->sequence_number) { + ogs_error("[%s] No SequenceNumber", udm_ue->suci); + ogs_assert(true == ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_INTERNAL_SERVER_ERROR, - recvmsg, "No authenticationManagementField", udm_ue->suci); - return false; - } - if (!AuthenticationSubscription->sequence_number) { - ogs_error("[%s] No SequenceNumber", udm_ue->suci); - ogs_sbi_server_send_error(stream, - OGS_SBI_HTTP_STATUS_INTERNAL_SERVER_ERROR, - recvmsg, "No SequenceNumber", udm_ue->suci); + recvmsg, "No SequenceNumber", udm_ue->suci)); return false; } if (!AuthenticationSubscription->sequence_number->sqn) { ogs_error("[%s] No SequenceNumber.sqn", udm_ue->suci); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_INTERNAL_SERVER_ERROR, - recvmsg, "No SequenceNumber.sqn", udm_ue->suci); + recvmsg, "No SequenceNumber.sqn", udm_ue->suci)); return false; } @@ -178,8 +187,9 @@ bool udm_nudr_dr_handle_subscription_authentication( ogs_assert(strerror); ogs_error("%s", strerror); - ogs_sbi_server_send_error( - stream, recvmsg->res_status, recvmsg, strerror, NULL); + ogs_assert(true == + ogs_sbi_server_send_error( + stream, recvmsg->res_status, recvmsg, strerror, NULL)); ogs_free(strerror); return false; } @@ -241,15 +251,16 @@ bool udm_nudr_dr_handle_subscription_authentication( response = ogs_sbi_build_response(&sendmsg, OGS_SBI_HTTP_STATUS_OK); ogs_assert(response); - ogs_sbi_server_send_response(stream, response); + ogs_assert(true == ogs_sbi_server_send_response(stream, response)); break; DEFAULT ogs_error("Invalid HTTP method [%s]", recvmsg->h.method); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_FORBIDDEN, recvmsg, - "Invalid HTTP method", recvmsg->h.method); + "Invalid HTTP method", recvmsg->h.method)); return false; END break; @@ -263,8 +274,9 @@ bool udm_nudr_dr_handle_subscription_authentication( ogs_assert(strerror); ogs_error("%s", strerror); - ogs_sbi_server_send_error( - stream, recvmsg->res_status, recvmsg, strerror, NULL); + ogs_assert(true == + ogs_sbi_server_send_error( + stream, recvmsg->res_status, recvmsg, strerror, NULL)); ogs_free(strerror); return false; } @@ -272,43 +284,55 @@ bool udm_nudr_dr_handle_subscription_authentication( AuthEvent = udm_ue->auth_event; if (!AuthEvent) { ogs_error("[%s] No AuthEvent", udm_ue->suci); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "No AuthEvent", udm_ue->suci); + ogs_assert(true == + ogs_sbi_server_send_error( + stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + recvmsg, "No AuthEvent", udm_ue->suci)); return false; } if (!AuthEvent->nf_instance_id) { ogs_error("[%s] No nfInstanceId", udm_ue->suci); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "No nfInstanceId", udm_ue->suci); + ogs_assert(true == + ogs_sbi_server_send_error( + stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + recvmsg, "No nfInstanceId", udm_ue->suci)); return false; } if (!AuthEvent->success) { ogs_error("[%s] No success", udm_ue->suci); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "No success", udm_ue->suci); + ogs_assert(true == + ogs_sbi_server_send_error( + stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + recvmsg, "No success", udm_ue->suci)); return false; } if (!AuthEvent->time_stamp) { ogs_error("[%s] No timeStamp", udm_ue->suci); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "No timeStamp", udm_ue->suci); + ogs_assert(true == + ogs_sbi_server_send_error( + stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + recvmsg, "No timeStamp", udm_ue->suci)); return false; } if (!AuthEvent->auth_type) { ogs_error("[%s] No authType", udm_ue->suci); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "No authType", udm_ue->suci); + ogs_assert(true == + ogs_sbi_server_send_error( + stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + recvmsg, "No authType", udm_ue->suci)); return false; } if (!AuthEvent->serving_network_name) { ogs_error("[%s] No servingNetworkName", udm_ue->suci); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "No servingNetworkName", udm_ue->suci); + ogs_assert(true == + ogs_sbi_server_send_error( + stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + recvmsg, "No servingNetworkName", udm_ue->suci)); return false; } @@ -329,7 +353,7 @@ bool udm_nudr_dr_handle_subscription_authentication( response = ogs_sbi_build_response(&sendmsg, OGS_SBI_HTTP_STATUS_CREATED); ogs_assert(response); - ogs_sbi_server_send_response(stream, response); + ogs_assert(true == ogs_sbi_server_send_response(stream, response)); ogs_free(sendmsg.http.location); OpenAPI_auth_event_free(sendmsg.AuthEvent); @@ -341,8 +365,10 @@ bool udm_nudr_dr_handle_subscription_authentication( ogs_assert(strerror); ogs_error("%s", strerror); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, strerror, NULL); + ogs_assert(true == + ogs_sbi_server_send_error( + stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + recvmsg, strerror, NULL)); ogs_free(strerror); return false; END @@ -374,8 +400,9 @@ bool udm_nudr_dr_handle_subscription_context( if (recvmsg->res_status != OGS_SBI_HTTP_STATUS_NO_CONTENT) { ogs_error("[%s] HTTP response error [%d]", udm_ue->supi, recvmsg->res_status); - ogs_sbi_server_send_error(stream, recvmsg->res_status, - NULL, "HTTP response error", udm_ue->supi); + ogs_assert(true == + ogs_sbi_server_send_error(stream, recvmsg->res_status, + NULL, "HTTP response error", udm_ue->supi)); return false; } @@ -386,65 +413,83 @@ bool udm_nudr_dr_handle_subscription_context( if (!Amf3GppAccessRegistration) { ogs_error("[%s] No Amf3GppAccessRegistration", udm_ue->supi); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "No Amf3GppAccessRegistration", udm_ue->supi); + ogs_assert(true == + ogs_sbi_server_send_error( + stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + recvmsg, "No Amf3GppAccessRegistration", udm_ue->supi)); return false; } if (!Amf3GppAccessRegistration->amf_instance_id) { ogs_error("[%s] No amfInstanceId", udm_ue->supi); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "No amfInstanceId", udm_ue->supi); + ogs_assert(true == + ogs_sbi_server_send_error( + stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + recvmsg, "No amfInstanceId", udm_ue->supi)); return false; } if (!Amf3GppAccessRegistration->dereg_callback_uri) { ogs_error("[%s] No dregCallbackUri", udm_ue->supi); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "No dregCallbackUri", udm_ue->supi); + ogs_assert(true == + ogs_sbi_server_send_error( + stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + recvmsg, "No dregCallbackUri", udm_ue->supi)); return false; } Guami = Amf3GppAccessRegistration->guami; if (!Guami) { ogs_error("[%s] No Guami", udm_ue->supi); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "No Guami", udm_ue->supi); + ogs_assert(true == + ogs_sbi_server_send_error( + stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + recvmsg, "No Guami", udm_ue->supi)); return false; } if (!Guami->amf_id) { ogs_error("[%s] No Guami.AmfId", udm_ue->supi); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "No Guami.AmfId", udm_ue->supi); + ogs_assert(true == + ogs_sbi_server_send_error( + stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + recvmsg, "No Guami.AmfId", udm_ue->supi)); return false; } if (!Guami->plmn_id) { ogs_error("[%s] No PlmnId", udm_ue->supi); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "No PlmnId", udm_ue->supi); + ogs_assert(true == + ogs_sbi_server_send_error( + stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + recvmsg, "No PlmnId", udm_ue->supi)); return false; } if (!Guami->plmn_id->mnc) { ogs_error("[%s] No PlmnId.Mnc", udm_ue->supi); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "No PlmnId.Mnc", udm_ue->supi); + ogs_assert(true == + ogs_sbi_server_send_error( + stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + recvmsg, "No PlmnId.Mnc", udm_ue->supi)); return false; } if (!Guami->plmn_id->mcc) { ogs_error("[%s] No PlmnId.Mcc", udm_ue->supi); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "No PlmnId.Mcc", udm_ue->supi); + ogs_assert(true == + ogs_sbi_server_send_error( + stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + recvmsg, "No PlmnId.Mcc", udm_ue->supi)); return false; } if (!Amf3GppAccessRegistration->rat_type) { ogs_error("[%s] No RatType", udm_ue->supi); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "No RatType", udm_ue->supi); + ogs_assert(true == + ogs_sbi_server_send_error( + stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + recvmsg, "No RatType", udm_ue->supi)); return false; } @@ -476,7 +521,7 @@ bool udm_nudr_dr_handle_subscription_context( response = ogs_sbi_build_response(&sendmsg, status); ogs_assert(response); - ogs_sbi_server_send_response(stream, response); + ogs_assert(true == ogs_sbi_server_send_response(stream, response)); ogs_free(sendmsg.http.location); OpenAPI_amf3_gpp_access_registration_free( @@ -489,8 +534,10 @@ bool udm_nudr_dr_handle_subscription_context( ogs_assert(strerror); ogs_error("%s", strerror); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, strerror, NULL); + ogs_assert(true == + ogs_sbi_server_send_error( + stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + recvmsg, strerror, NULL)); ogs_free(strerror); return false; END @@ -524,9 +571,11 @@ bool udm_nudr_dr_handle_subscription_provisioned( if (!AccessAndMobilitySubscriptionData) { ogs_error("[%s] No AccessAndMobilitySubscriptionData", udm_ue->supi); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + ogs_assert(true == + ogs_sbi_server_send_error( + stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, recvmsg, "No AccessAndMobilitySubscriptionData", - udm_ue->supi); + udm_ue->supi)); return false; } @@ -539,7 +588,7 @@ bool udm_nudr_dr_handle_subscription_provisioned( response = ogs_sbi_build_response(&sendmsg, recvmsg->res_status); ogs_assert(response); - ogs_sbi_server_send_response(stream, response); + ogs_assert(true == ogs_sbi_server_send_response(stream, response)); OpenAPI_access_and_mobility_subscription_data_free( sendmsg.AccessAndMobilitySubscriptionData); @@ -551,9 +600,11 @@ bool udm_nudr_dr_handle_subscription_provisioned( SmfSelectionSubscriptionData = recvmsg->SmfSelectionSubscriptionData; if (!SmfSelectionSubscriptionData) { ogs_error("[%s] No SmfSelectionSubscriptionData", udm_ue->supi); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + ogs_assert(true == + ogs_sbi_server_send_error( + stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, recvmsg, "No SmfSelectionSubscriptionData", - udm_ue->supi); + udm_ue->supi)); return false; } @@ -569,7 +620,7 @@ bool udm_nudr_dr_handle_subscription_provisioned( response = ogs_sbi_build_response(&sendmsg, recvmsg->res_status); ogs_assert(response); - ogs_sbi_server_send_response(stream, response); + ogs_assert(true == ogs_sbi_server_send_response(stream, response)); OpenAPI_smf_selection_subscription_data_free( sendmsg.SmfSelectionSubscriptionData); @@ -584,9 +635,11 @@ bool udm_nudr_dr_handle_subscription_provisioned( if (!SessionManagementSubscriptionData) { ogs_error("[%s] No SessionManagementSubscriptionData", udm_ue->supi); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + ogs_assert(true == + ogs_sbi_server_send_error( + stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, recvmsg, "No SessionManagementSubscriptionData", - udm_ue->supi); + udm_ue->supi)); return false; } @@ -599,7 +652,7 @@ bool udm_nudr_dr_handle_subscription_provisioned( response = ogs_sbi_build_response(&sendmsg, recvmsg->res_status); ogs_assert(response); - ogs_sbi_server_send_response(stream, response); + ogs_assert(true == ogs_sbi_server_send_response(stream, response)); OpenAPI_session_management_subscription_data_free( sendmsg.SessionManagementSubscriptionData); @@ -612,8 +665,10 @@ bool udm_nudr_dr_handle_subscription_provisioned( ogs_assert(strerror); ogs_error("%s", strerror); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, strerror, NULL); + ogs_assert(true == + ogs_sbi_server_send_error( + stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + recvmsg, strerror, NULL)); ogs_free(strerror); return false; END diff --git a/src/udm/sbi-path.c b/src/udm/sbi-path.c index 19206b0266..e763fcc969 100644 --- a/src/udm/sbi-path.c +++ b/src/udm/sbi-path.c @@ -123,7 +123,7 @@ void udm_sbi_close(void) ogs_sbi_server_stop_all(); } -void udm_nnrf_nfm_send_nf_register(ogs_sbi_nf_instance_t *nf_instance) +bool udm_nnrf_nfm_send_nf_register(ogs_sbi_nf_instance_t *nf_instance) { ogs_sbi_request_t *request = NULL; ogs_sbi_client_t *client = NULL; @@ -133,19 +133,17 @@ void udm_nnrf_nfm_send_nf_register(ogs_sbi_nf_instance_t *nf_instance) ogs_assert(client); request = udm_nnrf_nfm_build_register(nf_instance); - if (!request) { - ogs_error("udm_nnrf_nfm_send_nf_register() failed"); - return; - } - ogs_sbi_client_send_request(client, client->cb, request, nf_instance); + ogs_expect_or_return_val(request, false); + return ogs_sbi_client_send_request( + client, client->cb, request, nf_instance); } -void udm_sbi_send(ogs_sbi_nf_instance_t *nf_instance, ogs_sbi_xact_t *xact) +bool udm_sbi_send(ogs_sbi_nf_instance_t *nf_instance, ogs_sbi_xact_t *xact) { - ogs_sbi_send(nf_instance, client_cb, xact); + return ogs_sbi_send(nf_instance, client_cb, xact); } -void udm_sbi_discover_and_send(OpenAPI_nf_type_e target_nf_type, +bool udm_sbi_discover_and_send(OpenAPI_nf_type_e target_nf_type, udm_ue_t *udm_ue, ogs_sbi_stream_t *stream, void *data, ogs_sbi_request_t *(*build)(udm_ue_t *udm_ue, void *data)) { @@ -161,10 +159,11 @@ void udm_sbi_discover_and_send(OpenAPI_nf_type_e target_nf_type, udm_timer_sbi_client_wait_expire); if (!xact) { ogs_error("udm_sbi_discover_and_send() failed"); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_GATEWAY_TIMEOUT, NULL, - "Cannot discover", udm_ue->suci); - return; + "Cannot discover", udm_ue->suci)); + return false; } xact->assoc_stream = stream; @@ -172,9 +171,13 @@ void udm_sbi_discover_and_send(OpenAPI_nf_type_e target_nf_type, if (ogs_sbi_discover_and_send(xact, (ogs_fsm_handler_t)udm_nf_state_registered, client_cb) != true) { ogs_error("udm_sbi_discover_and_send() failed"); - ogs_sbi_server_send_error(stream, + ogs_sbi_xact_remove(xact); + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_GATEWAY_TIMEOUT, NULL, - "Cannot discover", udm_ue->suci); - return; + "Cannot discover", udm_ue->suci)); + return false; } + + return true; } diff --git a/src/udm/sbi-path.h b/src/udm/sbi-path.h index 371a16ad01..984d12bb49 100644 --- a/src/udm/sbi-path.h +++ b/src/udm/sbi-path.h @@ -30,10 +30,10 @@ extern "C" { int udm_sbi_open(void); void udm_sbi_close(void); -void udm_nnrf_nfm_send_nf_register(ogs_sbi_nf_instance_t *nf_instance); +bool udm_nnrf_nfm_send_nf_register(ogs_sbi_nf_instance_t *nf_instance); -void udm_sbi_send(ogs_sbi_nf_instance_t *nf_instance, ogs_sbi_xact_t *xact); -void udm_sbi_discover_and_send(OpenAPI_nf_type_e target_nf_type, +bool udm_sbi_send(ogs_sbi_nf_instance_t *nf_instance, ogs_sbi_xact_t *xact); +bool udm_sbi_discover_and_send(OpenAPI_nf_type_e target_nf_type, udm_ue_t *udm_ue, ogs_sbi_stream_t *stream, void *data, ogs_sbi_request_t *(*build)(udm_ue_t *udm_ue, void *data)); diff --git a/src/udm/udm-sm.c b/src/udm/udm-sm.c index 46d4d836bb..ea7c0762fb 100644 --- a/src/udm/udm-sm.c +++ b/src/udm/udm-sm.c @@ -71,8 +71,10 @@ void udm_state_operational(ogs_fsm_t *s, udm_event_t *e) if (rv != OGS_OK) { /* 'message' buffer is released in ogs_sbi_parse_request() */ ogs_error("cannot parse HTTP message"); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - NULL, "cannot parse HTTP message", NULL); + ogs_assert(true == + ogs_sbi_server_send_error( + stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + NULL, "cannot parse HTTP message", NULL)); break; } @@ -86,8 +88,10 @@ void udm_state_operational(ogs_fsm_t *s, udm_event_t *e) if (strcmp(message.h.api.version, api_version) != 0) { ogs_error("Not supported version [%s]", message.h.api.version); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - &message, "Not supported version", NULL); + ogs_assert(true == + ogs_sbi_server_send_error( + stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + &message, "Not supported version", NULL)); ogs_sbi_message_free(&message); break; } @@ -105,19 +109,21 @@ void udm_state_operational(ogs_fsm_t *s, udm_event_t *e) DEFAULT ogs_error("Invalid HTTP method [%s]", message.h.method); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_FORBIDDEN, &message, - "Invalid HTTP method", message.h.method); + "Invalid HTTP method", message.h.method)); END break; DEFAULT ogs_error("Invalid resource name [%s]", message.h.resource.component[0]); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, &message, "Unknown resource name", - message.h.resource.component[0]); + message.h.resource.component[0])); END break; @@ -126,17 +132,19 @@ void udm_state_operational(ogs_fsm_t *s, udm_event_t *e) CASE(OGS_SBI_SERVICE_NAME_NUDM_SDM) if (!message.h.resource.component[0]) { ogs_error("Not found [%s]", message.h.method); - ogs_sbi_server_send_error(stream, - OGS_SBI_HTTP_STATUS_NOT_FOUND, - &message, "Not found", message.h.method); + ogs_assert(true == + ogs_sbi_server_send_error(stream, + OGS_SBI_HTTP_STATUS_NOT_FOUND, + &message, "Not found", message.h.method)); break; } if (!message.h.resource.component[1]) { ogs_error("Invalid resource name [%s]", message.h.method); - ogs_sbi_server_send_error(stream, - OGS_SBI_HTTP_STATUS_BAD_REQUEST, - &message, "Invalid resource name", message.h.method); + ogs_assert(true == + ogs_sbi_server_send_error(stream, + OGS_SBI_HTTP_STATUS_BAD_REQUEST, + &message, "Invalid resource name", message.h.method)); break; } @@ -160,9 +168,10 @@ void udm_state_operational(ogs_fsm_t *s, udm_event_t *e) if (!udm_ue) { ogs_error("Not found [%s]", message.h.method); - ogs_sbi_server_send_error(stream, - OGS_SBI_HTTP_STATUS_NOT_FOUND, - &message, "Not found", message.h.method); + ogs_assert(true == + ogs_sbi_server_send_error(stream, + OGS_SBI_HTTP_STATUS_NOT_FOUND, + &message, "Not found", message.h.method)); break; } @@ -179,9 +188,10 @@ void udm_state_operational(ogs_fsm_t *s, udm_event_t *e) DEFAULT ogs_error("Invalid API name [%s]", message.h.service.name); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, &message, - "Invalid API name", message.h.service.name); + "Invalid API name", message.h.service.name)); END /* In lib/sbi/server.c, notify_completed() releases 'request' buffer. */ @@ -362,9 +372,10 @@ void udm_state_operational(ogs_fsm_t *s, udm_event_t *e) subscription = e->sbi.data; ogs_assert(subscription); - ogs_nnrf_nfm_send_nf_status_subscribe(subscription->client, + ogs_assert(true == + ogs_nnrf_nfm_send_nf_status_subscribe(subscription->client, udm_self()->nf_type, subscription->req_nf_instance_id, - subscription->subscr_cond.nf_type); + subscription->subscr_cond.nf_type)); ogs_info("[%s] Subscription validity expired", subscription->id); ogs_sbi_subscription_remove(subscription); @@ -380,9 +391,10 @@ void udm_state_operational(ogs_fsm_t *s, udm_event_t *e) ogs_sbi_xact_remove(sbi_xact); ogs_error("Cannot receive SBI message"); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_GATEWAY_TIMEOUT, NULL, - "Cannot receive SBI message", NULL); + "Cannot receive SBI message", NULL)); break; default: diff --git a/src/udm/ue-sm.c b/src/udm/ue-sm.c index 1886f198aa..7439875b0b 100644 --- a/src/udm/ue-sm.c +++ b/src/udm/ue-sm.c @@ -76,18 +76,20 @@ void udm_ue_state_operational(ogs_fsm_t *s, udm_event_t *e) DEFAULT ogs_error("[%s] Invalid resource name [%s]", udm_ue->suci, message->h.resource.component[1]); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, message, - "Invalid resource name", message->h.method); + "Invalid resource name", message->h.method)); END break; DEFAULT ogs_error("[%s] Invalid HTTP method [%s]", udm_ue->suci, message->h.method); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_FORBIDDEN, message, - "Invalid HTTP method", message->h.method); + "Invalid HTTP method", message->h.method)); END break; @@ -102,17 +104,19 @@ void udm_ue_state_operational(ogs_fsm_t *s, udm_event_t *e) DEFAULT ogs_error("[%s] Invalid resource name [%s]", udm_ue->suci, message->h.resource.component[1]); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, message, - "Invalid HTTP method", message->h.method); + "Invalid HTTP method", message->h.method)); END break; DEFAULT ogs_error("[%s] Invalid HTTP method [%s]", udm_ue->suci, message->h.method); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_FORBIDDEN, message, - "Invalid HTTP method", message->h.method); + "Invalid HTTP method", message->h.method)); END break; @@ -123,9 +127,10 @@ void udm_ue_state_operational(ogs_fsm_t *s, udm_event_t *e) CASE(OGS_SBI_RESOURCE_NAME_AM_DATA) CASE(OGS_SBI_RESOURCE_NAME_SMF_SELECT_DATA) CASE(OGS_SBI_RESOURCE_NAME_SM_DATA) - udm_sbi_discover_and_send( - OpenAPI_nf_type_UDR, udm_ue, stream, message, - udm_nudr_dr_build_query_subscription_provisioned); + ogs_assert(true == + udm_sbi_discover_and_send( + OpenAPI_nf_type_UDR, udm_ue, stream, message, + udm_nudr_dr_build_query_subscription_provisioned)); break; CASE(OGS_SBI_RESOURCE_NAME_UE_CONTEXT_IN_SMF_DATA) @@ -136,25 +141,28 @@ void udm_ue_state_operational(ogs_fsm_t *s, udm_event_t *e) DEFAULT ogs_error("[%s] Invalid resource name [%s]", udm_ue->suci, message->h.resource.component[1]); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, message, - "Invalid resource name", message->h.method); + "Invalid resource name", message->h.method)); END break; DEFAULT ogs_error("[%s] Invalid HTTP method [%s]", udm_ue->supi, message->h.method); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_NOT_FOUND, message, - "Invalid HTTP method", message->h.method); + "Invalid HTTP method", message->h.method)); END break; DEFAULT ogs_error("Invalid API name [%s]", message->h.service.name); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, message, - "Invalid API name", message->h.service.name); + "Invalid API name", message->h.service.name)); END break; @@ -205,9 +213,10 @@ void udm_ue_state_operational(ogs_fsm_t *s, udm_event_t *e) DEFAULT ogs_error("Invalid API name [%s]", message->h.service.name); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, message, - "Invalid API name", message->h.resource.component[0]); + "Invalid API name", message->h.resource.component[0])); END break; diff --git a/src/udr/nf-sm.c b/src/udr/nf-sm.c index 17712bc3a4..fd6d6cbef6 100644 --- a/src/udr/nf-sm.c +++ b/src/udr/nf-sm.c @@ -109,7 +109,7 @@ void udr_nf_state_will_register(ogs_fsm_t *s, udr_event_t *e) ogs_timer_start(nf_instance->t_registration_interval, ogs_app()->time.message.sbi.nf_register_interval); - udr_nnrf_nfm_send_nf_register(nf_instance); + ogs_assert(true == udr_nnrf_nfm_send_nf_register(nf_instance)); break; case OGS_FSM_EXIT_SIG: @@ -164,7 +164,7 @@ void udr_nf_state_will_register(ogs_fsm_t *s, udr_event_t *e) ogs_timer_start(nf_instance->t_registration_interval, ogs_app()->time.message.sbi.nf_register_interval); - udr_nnrf_nfm_send_nf_register(nf_instance); + ogs_assert(true == udr_nnrf_nfm_send_nf_register(nf_instance)); break; default: @@ -223,7 +223,8 @@ void udr_nf_state_registered(ogs_fsm_t *s, udr_event_t *e) } if (!OGS_FSM_CHECK(&nf_instance->sm, udr_nf_state_exception)) { - ogs_nnrf_nfm_send_nf_de_register(nf_instance); + ogs_assert(true == + ogs_nnrf_nfm_send_nf_de_register(nf_instance)); } } break; @@ -273,7 +274,7 @@ void udr_nf_state_registered(ogs_fsm_t *s, udr_event_t *e) ogs_timer_start(nf_instance->t_heartbeat_interval, ogs_time_from_sec(nf_instance->time.heartbeat_interval)); - ogs_nnrf_nfm_send_nf_update(nf_instance); + ogs_assert(true == ogs_nnrf_nfm_send_nf_update(nf_instance)); break; case UDR_TIMER_NF_INSTANCE_NO_HEARTBEAT: diff --git a/src/udr/nnrf-build.c b/src/udr/nnrf-build.c index 080c07f63a..c02bbb0b90 100644 --- a/src/udr/nnrf-build.c +++ b/src/udr/nnrf-build.c @@ -43,7 +43,7 @@ ogs_sbi_request_t *udr_nnrf_nfm_build_register( message.http.content_encoding = (char*)ogs_sbi_self()->content_encoding; NFProfile = ogs_nnrf_nfm_build_nf_profile(nf_instance); - ogs_assert(NFProfile); + ogs_expect_or_return_val(NFProfile, NULL); message.NFProfile = NFProfile; diff --git a/src/udr/nnrf-handler.c b/src/udr/nnrf-handler.c index c481c6e238..182f9d723a 100644 --- a/src/udr/nnrf-handler.c +++ b/src/udr/nnrf-handler.c @@ -111,15 +111,17 @@ bool udr_nnrf_handle_nf_status_notify( NotificationData = recvmsg->NotificationData; if (!NotificationData) { ogs_error("No NotificationData"); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "No NotificationData", NULL); + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + recvmsg, "No NotificationData", NULL)); return false; } if (!NotificationData->nf_instance_uri) { ogs_error("No nfInstanceUri"); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "No nfInstanceUri", NULL); + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + recvmsg, "No nfInstanceUri", NULL)); return false; } @@ -129,15 +131,17 @@ bool udr_nnrf_handle_nf_status_notify( rv = ogs_sbi_parse_header(&message, &header); if (rv != OGS_OK) { ogs_error("Cannot parse nfInstanceUri [%s]", header.uri); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "Cannot parse nfInstanceUri", header.uri); + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + recvmsg, "Cannot parse nfInstanceUri", header.uri)); return false; } if (!message.h.resource.component[1]) { ogs_error("No nfInstanceId [%s]", header.uri); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "Cannot parse nfInstanceUri", header.uri); + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + recvmsg, "Cannot parse nfInstanceUri", header.uri)); ogs_sbi_header_free(&header); return false; } @@ -145,9 +149,10 @@ bool udr_nnrf_handle_nf_status_notify( if (NF_INSTANCE_IS_SELF(message.h.resource.component[1])) { ogs_warn("[%s] The notification is not allowed", message.h.resource.component[1]); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_FORBIDDEN, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_FORBIDDEN, recvmsg, "The notification is not allowed", - message.h.resource.component[1]); + message.h.resource.component[1])); ogs_sbi_header_free(&header); return false; } @@ -160,8 +165,10 @@ bool udr_nnrf_handle_nf_status_notify( NFProfile = NotificationData->nf_profile; if (!NFProfile) { ogs_error("No NFProfile"); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "No NFProfile", NULL); + ogs_assert(true == + ogs_sbi_server_send_error( + stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + recvmsg, "No NFProfile", NULL)); ogs_sbi_header_free(&header); return false; } @@ -198,9 +205,10 @@ bool udr_nnrf_handle_nf_status_notify( handled = ogs_sbi_client_associate(nf_instance); if (!handled) { ogs_error("[%s] Cannot associate NF EndPoint", nf_instance->id); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "Cannot find NF EndPoint", nf_instance->id); + recvmsg, "Cannot find NF EndPoint", nf_instance->id)); UDR_NF_INSTANCE_CLEAR("NRF-notify", nf_instance); ogs_sbi_header_free(&header); return false; @@ -214,9 +222,10 @@ bool udr_nnrf_handle_nf_status_notify( } else { ogs_warn("[%s] (NRF-notify) Not found", message.h.resource.component[1]); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_NOT_FOUND, - recvmsg, "Not found", message.h.resource.component[1]); + recvmsg, "Not found", message.h.resource.component[1])); ogs_sbi_header_free(&header); return false; } @@ -225,16 +234,17 @@ bool udr_nnrf_handle_nf_status_notify( NotificationData->event); ogs_error("Not supported event [%d:%s]", NotificationData->event, eventstr ? eventstr : "Unknown"); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, recvmsg, "Not supported event", - eventstr ? eventstr : "Unknown"); + eventstr ? eventstr : "Unknown")); ogs_sbi_header_free(&header); return false; } response = ogs_sbi_build_response(recvmsg, OGS_SBI_HTTP_STATUS_NO_CONTENT); ogs_assert(response); - ogs_sbi_server_send_response(stream, response); + ogs_assert(true == ogs_sbi_server_send_response(stream, response)); ogs_sbi_header_free(&header); return true; diff --git a/src/udr/nudr-handler.c b/src/udr/nudr-handler.c index 735340c21a..5717595b73 100644 --- a/src/udr/nudr-handler.c +++ b/src/udr/nudr-handler.c @@ -49,24 +49,27 @@ bool udr_nudr_dr_handle_subscription_authentication( supi = recvmsg->h.resource.component[1]; if (!supi) { ogs_error("No SUPI"); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "No SUPI", NULL); + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + recvmsg, "No SUPI", NULL)); return false; } if (strncmp(supi, OGS_ID_SUPI_TYPE_IMSI, strlen(OGS_ID_SUPI_TYPE_IMSI)) != 0) { ogs_error("[%s] Unknown SUPI Type", supi); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_FORBIDDEN, - recvmsg, "Unknwon SUPI Type", supi); + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_FORBIDDEN, + recvmsg, "Unknwon SUPI Type", supi)); return false; } rv = ogs_dbi_auth_info(supi, &auth_info); if (rv != OGS_OK) { ogs_warn("[%s] Cannot find SUPI in DB", supi); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_NOT_FOUND, - recvmsg, "Cannot find SUPI Type", supi); + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_NOT_FOUND, + recvmsg, "Cannot find SUPI Type", supi)); return false; } @@ -112,7 +115,7 @@ bool udr_nudr_dr_handle_subscription_authentication( response = ogs_sbi_build_response( &sendmsg, OGS_SBI_HTTP_STATUS_OK); ogs_assert(response); - ogs_sbi_server_send_response(stream, response); + ogs_assert(true == ogs_sbi_server_send_response(stream, response)); return true; @@ -123,9 +126,10 @@ bool udr_nudr_dr_handle_subscription_authentication( PatchItemList = recvmsg->PatchItemList; if (!PatchItemList) { - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "No PatchItemList Array", NULL); + recvmsg, "No PatchItemList Array", NULL)); return false; } @@ -137,9 +141,10 @@ bool udr_nudr_dr_handle_subscription_authentication( } if (!sqn_string) { - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "No PatchItemList", NULL); + recvmsg, "No PatchItemList", NULL)); return false; } @@ -150,18 +155,20 @@ bool udr_nudr_dr_handle_subscription_authentication( rv = ogs_dbi_update_sqn(supi, sqn); if (rv != OGS_OK) { ogs_fatal("[%s] Cannot update SQN", supi); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_INTERNAL_SERVER_ERROR, - recvmsg, "Cannot update SQN", supi); + recvmsg, "Cannot update SQN", supi)); return false; } rv = ogs_dbi_increment_sqn(supi); if (rv != OGS_OK) { ogs_fatal("[%s] Cannot increment SQN", supi); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_INTERNAL_SERVER_ERROR, - recvmsg, "Cannot increment SQN", supi); + recvmsg, "Cannot increment SQN", supi)); return false; } @@ -170,15 +177,16 @@ bool udr_nudr_dr_handle_subscription_authentication( response = ogs_sbi_build_response( &sendmsg, OGS_SBI_HTTP_STATUS_NO_CONTENT); ogs_assert(response); - ogs_sbi_server_send_response(stream, response); + ogs_assert(true == ogs_sbi_server_send_response(stream, response)); return true; DEFAULT ogs_error("Invalid HTTP method [%s]", recvmsg->h.method); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_MEHTOD_NOT_ALLOWED, - recvmsg, "Invalid HTTP method", recvmsg->h.method); + recvmsg, "Invalid HTTP method", recvmsg->h.method)); END break; @@ -190,9 +198,10 @@ bool udr_nudr_dr_handle_subscription_authentication( AuthEvent = recvmsg->AuthEvent; if (!AuthEvent) { ogs_error("[%s] No AuthEvent", supi); - ogs_sbi_server_send_error( + ogs_assert(true == + ogs_sbi_server_send_error( stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "No AuthEvent", supi); + recvmsg, "No AuthEvent", supi)); return false; } @@ -200,34 +209,37 @@ bool udr_nudr_dr_handle_subscription_authentication( rv = ogs_dbi_increment_sqn(supi); if (rv != OGS_OK) { ogs_fatal("[%s] Cannot increment SQN", supi); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_INTERNAL_SERVER_ERROR, - recvmsg, "Cannot increment SQN", supi); + recvmsg, "Cannot increment SQN", supi)); return false; } response = ogs_sbi_build_response( &sendmsg, OGS_SBI_HTTP_STATUS_NO_CONTENT); ogs_assert(response); - ogs_sbi_server_send_response(stream, response); + ogs_assert(true == ogs_sbi_server_send_response(stream, response)); return true; DEFAULT ogs_error("Invalid HTTP method [%s]", recvmsg->h.method); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_MEHTOD_NOT_ALLOWED, - recvmsg, "Invalid HTTP method", recvmsg->h.method); + recvmsg, "Invalid HTTP method", recvmsg->h.method)); END break; DEFAULT ogs_error("Invalid resource name [%s]", recvmsg->h.resource.component[3]); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_MEHTOD_NOT_ALLOWED, recvmsg, "Unknown resource name", - recvmsg->h.resource.component[3]); + recvmsg->h.resource.component[3])); END return false; @@ -247,16 +259,18 @@ bool udr_nudr_dr_handle_subscription_context( supi = recvmsg->h.resource.component[1]; if (!supi) { ogs_error("No SUPI"); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "No SUPI", NULL); + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + recvmsg, "No SUPI", NULL)); return false; } if (strncmp(supi, OGS_ID_SUPI_TYPE_IMSI, strlen(OGS_ID_SUPI_TYPE_IMSI)) != 0) { ogs_error("[%s] Unknown SUPI Type", supi); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_FORBIDDEN, - recvmsg, "Unknwon SUPI Type", supi); + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_FORBIDDEN, + recvmsg, "Unknwon SUPI Type", supi)); return false; } @@ -269,9 +283,10 @@ bool udr_nudr_dr_handle_subscription_context( Amf3GppAccessRegistration = recvmsg->Amf3GppAccessRegistration; if (!Amf3GppAccessRegistration) { ogs_error("[%s] No Amf3GppAccessRegistration", supi); - ogs_sbi_server_send_error( + ogs_assert(true == + ogs_sbi_server_send_error( stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "No Amf3GppAccessRegistration", supi); + recvmsg, "No Amf3GppAccessRegistration", supi)); return false; } @@ -280,25 +295,27 @@ bool udr_nudr_dr_handle_subscription_context( response = ogs_sbi_build_response( &sendmsg, OGS_SBI_HTTP_STATUS_NO_CONTENT); ogs_assert(response); - ogs_sbi_server_send_response(stream, response); + ogs_assert(true == ogs_sbi_server_send_response(stream, response)); return true; DEFAULT ogs_error("Invalid HTTP method [%s]", recvmsg->h.method); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_MEHTOD_NOT_ALLOWED, - recvmsg, "Invalid HTTP method", recvmsg->h.method); + recvmsg, "Invalid HTTP method", recvmsg->h.method)); END break; DEFAULT ogs_error("Invalid resource name [%s]", recvmsg->h.resource.component[3]); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_MEHTOD_NOT_ALLOWED, recvmsg, "Unknown resource name", - recvmsg->h.resource.component[3]); + recvmsg->h.resource.component[3])); END return false; @@ -443,7 +460,7 @@ bool udr_nudr_dr_handle_subscription_provisioned( response = ogs_sbi_build_response(&sendmsg, OGS_SBI_HTTP_STATUS_OK); ogs_assert(response); - ogs_sbi_server_send_response(stream, response); + ogs_assert(true == ogs_sbi_server_send_response(stream, response)); OpenAPI_list_for_each(GpsiList, node) { if (node->data) ogs_free(node->data); @@ -528,6 +545,7 @@ bool udr_nudr_dr_handle_subscription_provisioned( ogs_sbi_s_nssai_to_string(&slice_data->s_nssai), SubscribedSnssaiInfo); ogs_assert(SubscribedSnssaiInfoMap); + ogs_assert(SubscribedSnssaiInfoMap->key); OpenAPI_list_add(SubscribedSnssaiInfoList, SubscribedSnssaiInfoMap); } @@ -543,7 +561,7 @@ bool udr_nudr_dr_handle_subscription_provisioned( response = ogs_sbi_build_response(&sendmsg, OGS_SBI_HTTP_STATUS_OK); ogs_assert(response); - ogs_sbi_server_send_response(stream, response); + ogs_assert(true == ogs_sbi_server_send_response(stream, response)); SubscribedSnssaiInfoList = SmfSelectionSubscriptionData.subscribed_snssai_infos; @@ -732,12 +750,16 @@ bool udr_nudr_dr_handle_subscription_provisioned( ipAddress = ogs_calloc(1, sizeof(*ipAddress)); ogs_assert(ipAddress); - if (session->ue_ip.ipv4) + if (session->ue_ip.ipv4) { ipAddress->ipv4_addr = ogs_ipv4_to_string(session->ue_ip.addr); - if (session->ue_ip.ipv6) + ogs_assert(ipAddress->ipv4_addr); + } + if (session->ue_ip.ipv6) { ipAddress->ipv6_addr = ogs_ipv6addr_to_string(session->ue_ip.addr6); + ogs_assert(ipAddress->ipv6_addr); + } if (ipAddress->ipv4_addr || ipAddress->ipv6_addr) OpenAPI_list_add(staticIpAddress, ipAddress); @@ -769,7 +791,7 @@ bool udr_nudr_dr_handle_subscription_provisioned( response = ogs_sbi_build_response(&sendmsg, OGS_SBI_HTTP_STATUS_OK); ogs_assert(response); - ogs_sbi_server_send_response(stream, response); + ogs_assert(true == ogs_sbi_server_send_response(stream, response)); if (singleNSSAI.sd) ogs_free(singleNSSAI.sd); @@ -850,7 +872,8 @@ cleanup: ogs_assert(strerror); ogs_assert(status); ogs_error("%s", strerror); - ogs_sbi_server_send_error(stream, status, recvmsg, strerror, NULL); + ogs_assert(true == + ogs_sbi_server_send_error(stream, status, recvmsg, strerror, NULL)); ogs_free(strerror); ogs_subscription_data_free(&subscription_data); @@ -915,7 +938,8 @@ bool udr_nudr_dr_handle_policy_data( response = ogs_sbi_build_response( &sendmsg, OGS_SBI_HTTP_STATUS_OK); ogs_assert(response); - ogs_sbi_server_send_response(stream, response); + ogs_assert(true == + ogs_sbi_server_send_response(stream, response)); break; @@ -997,6 +1021,7 @@ bool udr_nudr_dr_handle_policy_data( ogs_sbi_s_nssai_to_string(&recvmsg->param.s_nssai), SmPolicySnssaiData); ogs_assert(SmPolicySnssaiDataMap); + ogs_assert(SmPolicySnssaiDataMap->key); SmPolicySnssaiDataList = OpenAPI_list_create(); ogs_assert(SmPolicySnssaiDataList); @@ -1016,7 +1041,8 @@ bool udr_nudr_dr_handle_policy_data( response = ogs_sbi_build_response( &sendmsg, OGS_SBI_HTTP_STATUS_OK); ogs_assert(response); - ogs_sbi_server_send_response(stream, response); + ogs_assert(true == + ogs_sbi_server_send_response(stream, response)); SmPolicySnssaiDataList = SmPolicyData.sm_policy_snssai_data; OpenAPI_list_for_each(SmPolicySnssaiDataList, node) { @@ -1090,7 +1116,8 @@ cleanup: ogs_assert(strerror); ogs_assert(status); ogs_error("%s", strerror); - ogs_sbi_server_send_error(stream, status, recvmsg, strerror, NULL); + ogs_assert(true == + ogs_sbi_server_send_error(stream, status, recvmsg, strerror, NULL)); ogs_free(strerror); ogs_subscription_data_free(&subscription_data); diff --git a/src/udr/sbi-path.c b/src/udr/sbi-path.c index 98f256b375..976b07134f 100644 --- a/src/udr/sbi-path.c +++ b/src/udr/sbi-path.c @@ -113,7 +113,7 @@ void udr_sbi_close(void) ogs_sbi_server_stop_all(); } -void udr_nnrf_nfm_send_nf_register(ogs_sbi_nf_instance_t *nf_instance) +bool udr_nnrf_nfm_send_nf_register(ogs_sbi_nf_instance_t *nf_instance) { ogs_sbi_request_t *request = NULL; ogs_sbi_client_t *client = NULL; @@ -123,9 +123,6 @@ void udr_nnrf_nfm_send_nf_register(ogs_sbi_nf_instance_t *nf_instance) ogs_assert(client); request = udr_nnrf_nfm_build_register(nf_instance); - if (!request) { - ogs_error("udr_nnrf_nfm_send_nf_register() failed"); - return; - } - ogs_sbi_client_send_request(client, client->cb, request, nf_instance); + ogs_expect_or_return_val(request, false); + return ogs_sbi_client_send_request(client, client->cb, request, nf_instance); } diff --git a/src/udr/sbi-path.h b/src/udr/sbi-path.h index 79c3c2101f..16dfa33f71 100644 --- a/src/udr/sbi-path.h +++ b/src/udr/sbi-path.h @@ -29,7 +29,7 @@ extern "C" { int udr_sbi_open(void); void udr_sbi_close(void); -void udr_nnrf_nfm_send_nf_register(ogs_sbi_nf_instance_t *nf_instance); +bool udr_nnrf_nfm_send_nf_register(ogs_sbi_nf_instance_t *nf_instance); #ifdef __cplusplus } diff --git a/src/udr/udr-sm.c b/src/udr/udr-sm.c index e96a7b0657..950ef00eeb 100644 --- a/src/udr/udr-sm.c +++ b/src/udr/udr-sm.c @@ -70,15 +70,19 @@ void udr_state_operational(ogs_fsm_t *s, udr_event_t *e) if (rv != OGS_OK) { /* 'message' buffer is released in ogs_sbi_parse_request() */ ogs_error("cannot parse HTTP message"); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - NULL, "cannot parse HTTP message", NULL); + ogs_assert(true == + ogs_sbi_server_send_error( + stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + NULL, "cannot parse HTTP message", NULL)); break; } if (strcmp(message.h.api.version, OGS_SBI_API_V1) != 0) { ogs_error("Not supported version [%s]", message.h.api.version); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - &message, "Not supported version", NULL); + ogs_assert(true == + ogs_sbi_server_send_error( + stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + &message, "Not supported version", NULL)); ogs_sbi_message_free(&message); break; } @@ -96,19 +100,21 @@ void udr_state_operational(ogs_fsm_t *s, udr_event_t *e) DEFAULT ogs_error("Invalid HTTP method [%s]", message.h.method); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_FORBIDDEN, - &message, "Invalid HTTP method", message.h.method); + &message, "Invalid HTTP method", message.h.method)); END break; DEFAULT ogs_error("Invalid resource name [%s]", message.h.resource.component[0]); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, &message, "Unknown resource name", - message.h.resource.component[0]); + message.h.resource.component[0])); END break; @@ -136,19 +142,21 @@ void udr_state_operational(ogs_fsm_t *s, udr_event_t *e) DEFAULT ogs_error("Invalid HTTP method [%s]", message.h.method); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_FORBIDDEN, &message, "Invalid HTTP method", - message.h.method); + message.h.method)); END break; DEFAULT ogs_error("Invalid resource name [%s]", message.h.resource.component[2]); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, &message, "Unknown resource name", - message.h.resource.component[2]); + message.h.resource.component[2])); END END break; @@ -160,18 +168,20 @@ void udr_state_operational(ogs_fsm_t *s, udr_event_t *e) DEFAULT ogs_error("Invalid resource name [%s]", message.h.resource.component[0]); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, &message, "Unknown resource name", - message.h.resource.component[0]); + message.h.resource.component[0])); END break; DEFAULT ogs_error("Invalid API name [%s]", message.h.service.name); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, &message, - "Invalid API name", message.h.resource.component[0]); + "Invalid API name", message.h.resource.component[0])); END /* In lib/sbi/server.c, notify_completed() releases 'request' buffer. */ @@ -282,9 +292,10 @@ void udr_state_operational(ogs_fsm_t *s, udr_event_t *e) subscription = e->sbi.data; ogs_assert(subscription); - ogs_nnrf_nfm_send_nf_status_subscribe(subscription->client, + ogs_assert(true == + ogs_nnrf_nfm_send_nf_status_subscribe(subscription->client, udr_self()->nf_type, subscription->req_nf_instance_id, - subscription->subscr_cond.nf_type); + subscription->subscr_cond.nf_type)); ogs_info("[%s] Subscription validity expired", subscription->id); ogs_sbi_subscription_remove(subscription); diff --git a/src/upf/context.c b/src/upf/context.c index 7505027454..688fca28e6 100644 --- a/src/upf/context.c +++ b/src/upf/context.c @@ -45,8 +45,11 @@ void upf_context_init(void) ogs_pool_init(&upf_sess_pool, ogs_app()->pool.sess); self.sess_hash = ogs_hash_make(); + ogs_assert(self.sess_hash); self.ipv4_hash = ogs_hash_make(); + ogs_assert(self.ipv4_hash); self.ipv6_hash = ogs_hash_make(); + ogs_assert(self.ipv6_hash); context_initialized = 1; } diff --git a/src/upf/gtp-path.c b/src/upf/gtp-path.c index c00acf7a1b..016b2dd807 100644 --- a/src/upf/gtp-path.c +++ b/src/upf/gtp-path.c @@ -69,7 +69,8 @@ static uint16_t _get_eth_type(uint8_t *data, uint len) { return 0; } -static void _gtpv1_tun_recv_common_cb(short when, ogs_socket_t fd, bool has_eth, void *data) +static void _gtpv1_tun_recv_common_cb( + short when, ogs_socket_t fd, bool has_eth, void *data) { ogs_pkbuf_t *recvbuf = NULL; @@ -95,17 +96,20 @@ static void _gtpv1_tun_recv_common_cb(short when, ogs_socket_t fd, bool has_eth, ogs_assert(replybuf); ogs_pkbuf_reserve(replybuf, OGS_TUN_MAX_HEADROOM); ogs_pkbuf_put(replybuf, OGS_MAX_PKT_LEN-OGS_TUN_MAX_HEADROOM); - arp_reply(replybuf->data, recvbuf->data, recvbuf->len, proxy_mac_addr); + arp_reply(replybuf->data, recvbuf->data, recvbuf->len, + proxy_mac_addr); ogs_debug("[SEND] reply to ARP request"); } else { goto cleanup; } - } else if (eth_type == ETHERTYPE_IPV6 && is_nd_req(recvbuf->data, recvbuf->len)) { + } else if (eth_type == ETHERTYPE_IPV6 && + is_nd_req(recvbuf->data, recvbuf->len)) { replybuf = ogs_pkbuf_alloc(packet_pool, OGS_MAX_PKT_LEN); ogs_assert(replybuf); ogs_pkbuf_reserve(replybuf, OGS_TUN_MAX_HEADROOM); ogs_pkbuf_put(replybuf, OGS_MAX_PKT_LEN-OGS_TUN_MAX_HEADROOM); - nd_reply(replybuf->data, recvbuf->data, recvbuf->len, proxy_mac_addr); + nd_reply(replybuf->data, recvbuf->data, recvbuf->len, + proxy_mac_addr); ogs_debug("[SEND] reply to ND solicit"); } if (replybuf) { @@ -167,7 +171,7 @@ static void _gtpv1_tun_recv_common_cb(short when, ogs_socket_t fd, bool has_eth, goto cleanup; } - ogs_pfcp_up_handle_pdr(pdr, recvbuf, &report); + ogs_assert(true == ogs_pfcp_up_handle_pdr(pdr, recvbuf, &report)); if (report.type.downlink_data_report) { ogs_assert(pdr->sess); @@ -186,11 +190,13 @@ cleanup: ogs_pkbuf_free(recvbuf); } -static void _gtpv1_tun_recv_cb(short when, ogs_socket_t fd, void *data) { +static void _gtpv1_tun_recv_cb(short when, ogs_socket_t fd, void *data) +{ _gtpv1_tun_recv_common_cb(when, fd, false, data); } -static void _gtpv1_tun_recv_eth_cb(short when, ogs_socket_t fd, void *data) { +static void _gtpv1_tun_recv_eth_cb(short when, ogs_socket_t fd, void *data) +{ _gtpv1_tun_recv_common_cb(when, fd, true, data); } @@ -242,6 +248,7 @@ static void _gtpv1_u_recv_cb(short when, ogs_socket_t fd, void *data) ogs_debug("[RECV] Echo Request from [%s]", OGS_ADDR(&from, buf)); echo_rsp = ogs_gtp_handle_echo_req(pkbuf); + ogs_expect(echo_rsp); if (echo_rsp) { ssize_t sent; @@ -304,7 +311,8 @@ static void _gtpv1_u_recv_cb(short when, ogs_socket_t fd, void *data) far = ogs_pfcp_far_find_by_error_indication(pkbuf); if (far) { - ogs_pfcp_up_handle_error_indication(far, &report); + ogs_assert(true == + ogs_pfcp_up_handle_error_indication(far, &report)); if (report.type.error_indication_report) { ogs_assert(far->sess); @@ -431,7 +439,7 @@ static void _gtpv1_u_recv_cb(short when, ogs_socket_t fd, void *data) ogs_warn("ogs_tun_write() failed"); } else if (far->dst_if == OGS_PFCP_INTERFACE_ACCESS) { - ogs_pfcp_up_handle_pdr(pdr, pkbuf, &report); + ogs_assert(true == ogs_pfcp_up_handle_pdr(pdr, pkbuf, &report)); if (report.type.downlink_data_report) { ogs_error("Indirect Data Fowarding Buffered"); @@ -457,7 +465,7 @@ static void _gtpv1_u_recv_cb(short when, ogs_socket_t fd, void *data) goto cleanup; } - ogs_pfcp_up_handle_pdr(pdr, pkbuf, &report); + ogs_assert(true == ogs_pfcp_up_handle_pdr(pdr, pkbuf, &report)); ogs_assert(report.type.downlink_data_report == 0); @@ -565,9 +573,11 @@ int upf_gtp_open(void) _get_dev_mac_addr(dev->ifname, dev->mac_addr); dev->poll = ogs_pollset_add(ogs_app()->pollset, OGS_POLLIN, dev->fd, _gtpv1_tun_recv_eth_cb, NULL); + ogs_assert(dev->poll); } else { dev->poll = ogs_pollset_add(ogs_app()->pollset, OGS_POLLIN, dev->fd, _gtpv1_tun_recv_cb, NULL); + ogs_assert(dev->poll); } ogs_assert(dev->poll); @@ -641,7 +651,8 @@ static void upf_gtp_handle_multicast(ogs_pkbuf_t *recvbuf) ogs_list_for_each(&sess->pfcp.pdr_list, pdr) { if (pdr->src_if == OGS_PFCP_INTERFACE_CORE) { - ogs_pfcp_up_handle_pdr(pdr, recvbuf, &report); + ogs_assert(true == + ogs_pfcp_up_handle_pdr(pdr, recvbuf, &report)); break; } } diff --git a/src/upf/n4-handler.c b/src/upf/n4-handler.c index 15dc5ef29e..38750c93c7 100644 --- a/src/upf/n4-handler.c +++ b/src/upf/n4-handler.c @@ -82,7 +82,7 @@ void upf_n4_handle_session_establishment_request( /* Setup GTP Node */ ogs_list_for_each(&sess->pfcp.far_list, far) { - ogs_pfcp_setup_far_gtpu_node(far); + ogs_assert(OGS_ERROR != ogs_pfcp_setup_far_gtpu_node(far)); if (far->gnode) ogs_pfcp_far_f_teid_hash_set(far); } @@ -125,8 +125,9 @@ void upf_n4_handle_session_establishment_request( &ogs_gtp_self()->gtpu_resource_list, pdr->dnn, OGS_PFCP_INTERFACE_ACCESS); if (resource) { - ogs_pfcp_user_plane_ip_resource_info_to_f_teid( - &resource->info, &pdr->f_teid, &pdr->f_teid_len); + ogs_assert(OGS_OK == + ogs_pfcp_user_plane_ip_resource_info_to_f_teid( + &resource->info, &pdr->f_teid, &pdr->f_teid_len)); if (resource->info.teidri) pdr->f_teid.teid = OGS_PFCP_GTPU_INDEX_TO_TEID( pdr->index, resource->info.teidri, @@ -240,7 +241,7 @@ void upf_n4_handle_session_modification_request( ogs_list_for_each(&sess->pfcp.pdr_list, pdr) { far = pdr->far; if (far && far->smreq_flags.send_end_marker_packets) - ogs_pfcp_send_end_marker(pdr); + ogs_assert(OGS_ERROR != ogs_pfcp_send_end_marker(pdr)); } /* Clear PFCPSMReq-Flags */ ogs_list_for_each(&sess->pfcp.far_list, far) @@ -298,7 +299,7 @@ void upf_n4_handle_session_modification_request( /* Setup GTP Node */ ogs_list_for_each(&sess->pfcp.far_list, far) { - ogs_pfcp_setup_far_gtpu_node(far); + ogs_assert(OGS_ERROR != ogs_pfcp_setup_far_gtpu_node(far)); if (far->gnode) ogs_pfcp_far_f_teid_hash_set(far); } @@ -337,8 +338,9 @@ void upf_n4_handle_session_modification_request( &ogs_gtp_self()->gtpu_resource_list, pdr->dnn, OGS_PFCP_INTERFACE_ACCESS); if (resource) { - ogs_pfcp_user_plane_ip_resource_info_to_f_teid( - &resource->info, &pdr->f_teid, &pdr->f_teid_len); + ogs_assert(OGS_OK == + ogs_pfcp_user_plane_ip_resource_info_to_f_teid( + &resource->info, &pdr->f_teid, &pdr->f_teid_len)); if (resource->info.teidri) pdr->f_teid.teid = OGS_PFCP_GTPU_INDEX_TO_TEID( pdr->index, resource->info.teidri, diff --git a/src/upf/pfcp-sm.c b/src/upf/pfcp-sm.c index 2b8ac7d192..82eeb05add 100644 --- a/src/upf/pfcp-sm.c +++ b/src/upf/pfcp-sm.c @@ -189,12 +189,14 @@ void upf_pfcp_state_associated(ogs_fsm_t *s, upf_event_t *e) switch (message->h.type) { case OGS_PFCP_HEARTBEAT_REQUEST_TYPE: - ogs_pfcp_handle_heartbeat_request(node, xact, - &message->pfcp_heartbeat_request); + ogs_assert(true == + ogs_pfcp_handle_heartbeat_request(node, xact, + &message->pfcp_heartbeat_request)); break; case OGS_PFCP_HEARTBEAT_RESPONSE_TYPE: - ogs_pfcp_handle_heartbeat_response(node, xact, - &message->pfcp_heartbeat_response); + ogs_assert(true == + ogs_pfcp_handle_heartbeat_response(node, xact, + &message->pfcp_heartbeat_response)); break; case OGS_PFCP_ASSOCIATION_SETUP_REQUEST_TYPE: ogs_warn("PFCP[REQ] has already been associated"); @@ -241,7 +243,8 @@ void upf_pfcp_state_associated(ogs_fsm_t *s, upf_event_t *e) node = e->pfcp_node; ogs_assert(node); - ogs_pfcp_send_heartbeat_request(node, node_timeout); + ogs_assert(OGS_OK == + ogs_pfcp_send_heartbeat_request(node, node_timeout)); break; default: ogs_error("Unknown timer[%s:%d]", diff --git a/tests/af/af-sm.c b/tests/af/af-sm.c index 1bf03c3b24..2ec316739a 100644 --- a/tests/af/af-sm.c +++ b/tests/af/af-sm.c @@ -74,15 +74,19 @@ void af_state_operational(ogs_fsm_t *s, af_event_t *e) if (rv != OGS_OK) { /* 'sbi_message' buffer is released in ogs_sbi_parse_request() */ ogs_error("cannot parse HTTP sbi_message"); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - NULL, "cannot parse HTTP sbi_message", NULL); + ogs_assert(true == + ogs_sbi_server_send_error( + stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + NULL, "cannot parse HTTP sbi_message", NULL)); break; } if (strcmp(message.h.api.version, OGS_SBI_API_V1) != 0) { ogs_error("Not supported version [%s]", message.h.api.version); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - &message, "Not supported version", NULL); + ogs_assert(true == + ogs_sbi_server_send_error( + stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + &message, "Not supported version", NULL)); ogs_sbi_message_free(&message); break; } @@ -99,27 +103,30 @@ void af_state_operational(ogs_fsm_t *s, af_event_t *e) DEFAULT ogs_error("Invalid HTTP method [%s]", message.h.method); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_FORBIDDEN, &message, - "Invalid HTTP method", message.h.method); + "Invalid HTTP method", message.h.method)); END break; DEFAULT ogs_error("Invalid resource name [%s]", message.h.resource.component[0]); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, &message, "Invalid resource name", - message.h.resource.component[0]); + message.h.resource.component[0])); END break; DEFAULT ogs_error("Invalid API name [%s]", message.h.service.name); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, &message, - "Invalid API name", message.h.service.name); + "Invalid API name", message.h.service.name)); END /* In lib/sbi/server.c, notify_completed() releases 'request' buffer. */ @@ -305,9 +312,10 @@ void af_state_operational(ogs_fsm_t *s, af_event_t *e) subscription = e->sbi.data; ogs_assert(subscription); - ogs_nnrf_nfm_send_nf_status_subscribe(subscription->client, + ogs_assert(true == + ogs_nnrf_nfm_send_nf_status_subscribe(subscription->client, af_self()->nf_type, subscription->req_nf_instance_id, - subscription->subscr_cond.nf_type); + subscription->subscr_cond.nf_type)); ogs_info("Subscription validity expired [%s]", subscription->id); ogs_sbi_subscription_remove(subscription); @@ -325,9 +333,10 @@ void af_state_operational(ogs_fsm_t *s, af_event_t *e) ogs_error("Cannot receive SBI message"); if (stream) { - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_GATEWAY_TIMEOUT, NULL, - "Cannot receive SBI message", NULL); + "Cannot receive SBI message", NULL)); } break; diff --git a/tests/af/context.c b/tests/af/context.c index 0b6ae35e6e..9fb83f49d0 100644 --- a/tests/af/context.c +++ b/tests/af/context.c @@ -41,9 +41,13 @@ void af_context_init(void) ogs_pool_init(&af_sess_pool, ogs_app()->pool.sess); self.supi_hash = ogs_hash_make(); + ogs_assert(self.supi_hash); self.ipv4_hash = ogs_hash_make(); + ogs_assert(self.ipv4_hash); self.ipv6_hash = ogs_hash_make(); + ogs_assert(self.ipv6_hash); self.pcf_app_session_id_hash = ogs_hash_make(); + ogs_assert(self.pcf_app_session_id_hash); context_initialized = 1; } @@ -134,6 +138,7 @@ af_sess_t *af_sess_add_by_ue_address(ogs_ip_t *ue_address) sess->af_app_session_id = ogs_msprintf("%d", (int)ogs_pool_index(&af_sess_pool, sess)); + ogs_assert(sess->af_app_session_id); if (ue_address->ipv4) { sess->ipv4addr = ogs_ipv4_to_string(ue_address->addr); @@ -145,6 +150,7 @@ af_sess_t *af_sess_add_by_ue_address(ogs_ip_t *ue_address) ogs_expect_or_return_val(sess->ipv6addr, NULL); sess->ipv6prefix = ogs_ipv6prefix_to_string( ue_address->addr6, OGS_IPV6_128_PREFIX_LEN); + ogs_expect_or_return_val(sess->ipv6prefix, NULL); } OGS_SBI_FEATURES_SET(sess->policyauthorization_features, diff --git a/tests/af/nbsf-handler.c b/tests/af/nbsf-handler.c index f2505e4112..f8400ab88b 100644 --- a/tests/af/nbsf-handler.c +++ b/tests/af/nbsf-handler.c @@ -110,11 +110,13 @@ void af_nbsf_management_handle_pcf_binding( if (sess->supi) ogs_free(sess->supi); sess->supi = ogs_strdup(PcfBinding->supi); + ogs_assert(sess->supi); } if (PcfBinding->gpsi) { if (sess->gpsi) ogs_free(sess->gpsi); sess->gpsi = ogs_strdup(PcfBinding->gpsi); + ogs_assert(sess->gpsi); } af_sess_associate_pcf_client(sess); diff --git a/tests/af/nf-sm.c b/tests/af/nf-sm.c index 6bfbbe2d03..910d84f573 100644 --- a/tests/af/nf-sm.c +++ b/tests/af/nf-sm.c @@ -109,7 +109,7 @@ void af_nf_state_will_register(ogs_fsm_t *s, af_event_t *e) ogs_timer_start(nf_instance->t_registration_interval, ogs_app()->time.message.sbi.nf_register_interval); - af_nnrf_nfm_send_nf_register(nf_instance); + ogs_assert(true == af_nnrf_nfm_send_nf_register(nf_instance)); break; case OGS_FSM_EXIT_SIG: @@ -164,7 +164,7 @@ void af_nf_state_will_register(ogs_fsm_t *s, af_event_t *e) ogs_timer_start(nf_instance->t_registration_interval, ogs_app()->time.message.sbi.nf_register_interval); - af_nnrf_nfm_send_nf_register(nf_instance); + ogs_assert(true == af_nnrf_nfm_send_nf_register(nf_instance)); break; default: @@ -211,8 +211,9 @@ void af_nf_state_registered(ogs_fsm_t *s, af_event_t *e) ogs_app()->time.nf_instance.no_heartbeat_margin)); } - ogs_nnrf_nfm_send_nf_status_subscribe(client, - af_self()->nf_type, nf_instance->id, OpenAPI_nf_type_BSF); + ogs_assert(true == + ogs_nnrf_nfm_send_nf_status_subscribe(client, + af_self()->nf_type, nf_instance->id, OpenAPI_nf_type_BSF)); } break; @@ -227,7 +228,8 @@ void af_nf_state_registered(ogs_fsm_t *s, af_event_t *e) } if (!OGS_FSM_CHECK(&nf_instance->sm, af_nf_state_exception)) { - ogs_nnrf_nfm_send_nf_de_register(nf_instance); + ogs_assert(true == + ogs_nnrf_nfm_send_nf_de_register(nf_instance)); } } break; @@ -277,7 +279,7 @@ void af_nf_state_registered(ogs_fsm_t *s, af_event_t *e) ogs_timer_start(nf_instance->t_heartbeat_interval, ogs_time_from_sec(nf_instance->time.heartbeat_interval)); - ogs_nnrf_nfm_send_nf_update(nf_instance); + ogs_assert(true == ogs_nnrf_nfm_send_nf_update(nf_instance)); break; case AF_TIMER_NF_INSTANCE_NO_HEARTBEAT: diff --git a/tests/af/nnrf-build.c b/tests/af/nnrf-build.c index 001a1d4109..d0068d5834 100644 --- a/tests/af/nnrf-build.c +++ b/tests/af/nnrf-build.c @@ -43,7 +43,7 @@ ogs_sbi_request_t *af_nnrf_nfm_build_register( message.http.content_encoding = (char*)ogs_sbi_self()->content_encoding; NFProfile = ogs_nnrf_nfm_build_nf_profile(nf_instance); - ogs_assert(NFProfile); + ogs_expect_or_return_val(NFProfile, NULL); message.NFProfile = NFProfile; diff --git a/tests/af/nnrf-handler.c b/tests/af/nnrf-handler.c index 7d8377fe5e..7192f12327 100644 --- a/tests/af/nnrf-handler.c +++ b/tests/af/nnrf-handler.c @@ -111,15 +111,17 @@ bool af_nnrf_handle_nf_status_notify( NotificationData = recvmsg->NotificationData; if (!NotificationData) { ogs_error("No NotificationData"); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "No NotificationData", NULL); + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + recvmsg, "No NotificationData", NULL)); return false; } if (!NotificationData->nf_instance_uri) { ogs_error("No nfInstanceUri"); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "No nfInstanceUri", NULL); + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + recvmsg, "No nfInstanceUri", NULL)); return false; } @@ -129,15 +131,17 @@ bool af_nnrf_handle_nf_status_notify( rv = ogs_sbi_parse_header(&message, &header); if (rv != OGS_OK) { ogs_error("Cannot parse nfInstanceUri [%s]", header.uri); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "Cannot parse nfInstanceUri", header.uri); + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + recvmsg, "Cannot parse nfInstanceUri", header.uri)); return false; } if (!message.h.resource.component[1]) { ogs_error("No nfInstanceId [%s]", header.uri); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "Cannot parse nfInstanceUri", header.uri); + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + recvmsg, "Cannot parse nfInstanceUri", header.uri)); ogs_sbi_header_free(&header); return false; } @@ -145,9 +149,10 @@ bool af_nnrf_handle_nf_status_notify( if (NF_INSTANCE_IS_SELF(message.h.resource.component[1])) { ogs_warn("[%s] The notification is not allowed", message.h.resource.component[1]); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_FORBIDDEN, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_FORBIDDEN, recvmsg, "The notification is not allowed", - message.h.resource.component[1]); + message.h.resource.component[1])); ogs_sbi_header_free(&header); return false; } @@ -160,8 +165,10 @@ bool af_nnrf_handle_nf_status_notify( NFProfile = NotificationData->nf_profile; if (!NFProfile) { ogs_error("No NFProfile"); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "No NFProfile", NULL); + ogs_assert(true == + ogs_sbi_server_send_error( + stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + recvmsg, "No NFProfile", NULL)); ogs_sbi_header_free(&header); return false; } @@ -198,9 +205,10 @@ bool af_nnrf_handle_nf_status_notify( handled = ogs_sbi_client_associate(nf_instance); if (!handled) { ogs_error("[%s] Cannot associate NF EndPoint", nf_instance->id); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, - recvmsg, "Cannot find NF EndPoint", nf_instance->id); + recvmsg, "Cannot find NF EndPoint", nf_instance->id)); AF_NF_INSTANCE_CLEAR("NRF-notify", nf_instance); ogs_sbi_header_free(&header); return false; @@ -214,9 +222,10 @@ bool af_nnrf_handle_nf_status_notify( } else { ogs_warn("[%s] (NRF-notify) Not found", message.h.resource.component[1]); - ogs_sbi_server_send_error(stream, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_NOT_FOUND, - recvmsg, "Not found", message.h.resource.component[1]); + recvmsg, "Not found", message.h.resource.component[1])); ogs_sbi_header_free(&header); return false; } @@ -225,16 +234,17 @@ bool af_nnrf_handle_nf_status_notify( NotificationData->event); ogs_error("Not supported event [%d:%s]", NotificationData->event, eventstr ? eventstr : "Unknown"); - ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, + ogs_assert(true == + ogs_sbi_server_send_error(stream, OGS_SBI_HTTP_STATUS_BAD_REQUEST, recvmsg, "Not supported event", - eventstr ? eventstr : "Unknown"); + eventstr ? eventstr : "Unknown")); ogs_sbi_header_free(&header); return false; } response = ogs_sbi_build_response(recvmsg, OGS_SBI_HTTP_STATUS_NO_CONTENT); ogs_assert(response); - ogs_sbi_server_send_response(stream, response); + ogs_assert(true == ogs_sbi_server_send_response(stream, response)); ogs_sbi_header_free(&header); return true; diff --git a/tests/af/npcf-build.c b/tests/af/npcf-build.c index 291c1752bc..5adc196292 100644 --- a/tests/af/npcf-build.c +++ b/tests/af/npcf-build.c @@ -64,7 +64,7 @@ ogs_sbi_request_t *af_npcf_policyauthorization_build_create( memset(&AscReqData, 0, sizeof(AscReqData)); server = ogs_list_first(&ogs_sbi_self()->server_list); - ogs_assert(server); + ogs_expect_or_return_val(server, NULL); memset(&header, 0, sizeof(header)); header.service.name = (char *)OGS_SBI_SERVICE_NAME_NPCF_POLICYAUTHORIZATION; @@ -73,7 +73,7 @@ ogs_sbi_request_t *af_npcf_policyauthorization_build_create( header.resource.component[1] = (char *)sess->af_app_session_id; header.resource.component[2] = (char *)OGS_SBI_RESOURCE_NAME_NOTIFY; AscReqData.notif_uri = ogs_sbi_server_uri(server, &header); - ogs_assert(AscReqData.notif_uri); + ogs_expect_or_return_val(AscReqData.notif_uri, NULL); AscReqData.supp_feat = ogs_uint64_to_string(sess->policyauthorization_features); @@ -104,7 +104,7 @@ ogs_sbi_request_t *af_npcf_policyauthorization_build_create( ogs_assert(MediaComponentList); MediaComponent = ogs_calloc(1, sizeof(*MediaComponent)); - ogs_assert(MediaComponent); + ogs_expect_or_return_val(MediaComponent, NULL); MediaComponent->med_comp_n = (++i); MediaComponent->f_status = OpenAPI_flow_status_ENABLED; @@ -138,6 +138,7 @@ ogs_sbi_request_t *af_npcf_policyauthorization_build_create( MediaComponentMap = OpenAPI_map_create( ogs_msprintf("%d", MediaComponent->med_comp_n), MediaComponent); ogs_assert(MediaComponentMap); + ogs_assert(MediaComponentMap->key); OpenAPI_list_add(MediaComponentList, MediaComponentMap); @@ -150,7 +151,7 @@ ogs_sbi_request_t *af_npcf_policyauthorization_build_create( /* Sub Component #1 */ SubComponent = ogs_calloc(1, sizeof(*SubComponent)); - ogs_assert(SubComponent); + ogs_expect_or_return_val(SubComponent, NULL); SubComponent->f_num = (++j); SubComponent->flow_usage = OpenAPI_flow_usage_NO_INFO; @@ -158,6 +159,7 @@ ogs_sbi_request_t *af_npcf_policyauthorization_build_create( SubComponentMap = OpenAPI_map_create( ogs_msprintf("%d", SubComponent->f_num), SubComponent); ogs_assert(SubComponentMap); + ogs_assert(SubComponentMap->key); OpenAPI_list_add(SubComponentList, SubComponentMap); @@ -173,7 +175,7 @@ ogs_sbi_request_t *af_npcf_policyauthorization_build_create( /* Sub Component #2 */ SubComponent = ogs_calloc(1, sizeof(*SubComponent)); - ogs_assert(SubComponent); + ogs_expect_or_return_val(SubComponent, NULL); SubComponent->f_num = (++j); SubComponent->flow_usage = OpenAPI_flow_usage_NO_INFO; @@ -181,6 +183,7 @@ ogs_sbi_request_t *af_npcf_policyauthorization_build_create( SubComponentMap = OpenAPI_map_create( ogs_msprintf("%d", SubComponent->f_num), SubComponent); ogs_assert(SubComponentMap); + ogs_assert(SubComponentMap->key); OpenAPI_list_add(SubComponentList, SubComponentMap); @@ -198,7 +201,7 @@ ogs_sbi_request_t *af_npcf_policyauthorization_build_create( MediaComponent->med_sub_comps = SubComponentList; request = ogs_sbi_build_request(&message); - ogs_assert(request); + ogs_expect_or_return_val(request, NULL); ogs_free(AscReqData.notif_uri); diff --git a/tests/af/sbi-path.c b/tests/af/sbi-path.c index 9803023195..b87912b284 100644 --- a/tests/af/sbi-path.c +++ b/tests/af/sbi-path.c @@ -113,7 +113,7 @@ void af_sbi_close(void) ogs_sbi_server_stop_all(); } -void af_nnrf_nfm_send_nf_register(ogs_sbi_nf_instance_t *nf_instance) +bool af_nnrf_nfm_send_nf_register(ogs_sbi_nf_instance_t *nf_instance) { ogs_sbi_request_t *request = NULL; ogs_sbi_client_t *client = NULL; @@ -123,11 +123,9 @@ void af_nnrf_nfm_send_nf_register(ogs_sbi_nf_instance_t *nf_instance) ogs_assert(client); request = af_nnrf_nfm_build_register(nf_instance); - if (!request) { - ogs_error("af_nnrf_nfm_send_nf_register() failed"); - return; - } - ogs_sbi_client_send_request(client, client->cb, request, nf_instance); + ogs_expect_or_return_val(request, false); + return ogs_sbi_client_send_request( + client, client->cb, request, nf_instance); } void af_sbi_send(ogs_sbi_nf_instance_t *nf_instance, ogs_sbi_xact_t *xact) diff --git a/tests/af/sbi-path.h b/tests/af/sbi-path.h index 73effe823f..e398b1f3dc 100644 --- a/tests/af/sbi-path.h +++ b/tests/af/sbi-path.h @@ -31,7 +31,7 @@ extern "C" { int af_sbi_open(void); void af_sbi_close(void); -void af_nnrf_nfm_send_nf_register(ogs_sbi_nf_instance_t *nf_instance); +bool af_nnrf_nfm_send_nf_register(ogs_sbi_nf_instance_t *nf_instance); void af_sbi_send(ogs_sbi_nf_instance_t *nf_instance, ogs_sbi_xact_t *xact); diff --git a/tests/common/context.c b/tests/common/context.c index 968a380e49..e22d31801e 100644 --- a/tests/common/context.c +++ b/tests/common/context.c @@ -798,9 +798,11 @@ void test_ue_set_mobile_identity_suci(test_ue_t *test_ue, if (test_ue->supi) ogs_free(test_ue->supi); test_ue->supi = ogs_supi_from_suci(test_ue->suci); + ogs_assert(test_ue->supi); if (test_ue->imsi) ogs_free(test_ue->imsi); test_ue->imsi = ogs_id_get_value(test_ue->supi); + ogs_assert(test_ue->imsi); } static void test_ue_set_mobile_identity_imsi(test_ue_t *test_ue) diff --git a/tests/common/gmm-build.c b/tests/common/gmm-build.c index caea65b644..4a77a08136 100644 --- a/tests/common/gmm-build.c +++ b/tests/common/gmm-build.c @@ -442,6 +442,7 @@ ogs_pkbuf_t *testgmm_build_authentication_response(test_ue_t *test_ue) res, ck, ik, ak, NULL); serving_network_name = ogs_serving_network_name_from_plmn_id(&test_self()->nr_tai.plmn_id); + ogs_assert(serving_network_name); ogs_kdf_xres_star( ck, ik, serving_network_name, test_ue->rand, res, 8, diff --git a/tests/common/gtpu.c b/tests/common/gtpu.c index 773098976a..0e17bb9baf 100644 --- a/tests/common/gtpu.c +++ b/tests/common/gtpu.c @@ -29,14 +29,18 @@ ogs_socknode_t *test_gtpu_server(int index, int family) if (index == 1) { if (family == AF_INET6) - ogs_copyaddrinfo(&addr, test_self()->gnb1_addr6); + ogs_assert(OGS_OK == + ogs_copyaddrinfo(&addr, test_self()->gnb1_addr6)); else - ogs_copyaddrinfo(&addr, test_self()->gnb1_addr); + ogs_assert(OGS_OK == + ogs_copyaddrinfo(&addr, test_self()->gnb1_addr)); } else if (index == 2) { if (family == AF_INET6) - ogs_copyaddrinfo(&addr, test_self()->gnb2_addr6); + ogs_assert(OGS_OK == + ogs_copyaddrinfo(&addr, test_self()->gnb2_addr6)); else - ogs_copyaddrinfo(&addr, test_self()->gnb2_addr); + ogs_assert(OGS_OK == + ogs_copyaddrinfo(&addr, test_self()->gnb2_addr)); } else ogs_assert_if_reached(); diff --git a/tests/common/sctp.c b/tests/common/sctp.c index aaabc0e59d..ce66983ceb 100644 --- a/tests/common/sctp.c +++ b/tests/common/sctp.c @@ -107,9 +107,11 @@ ogs_socknode_t *tests1ap_client(int family) ogs_socknode_t *node = NULL; if (family == AF_INET6) - ogs_copyaddrinfo(&addr, test_self()->s1ap_addr6); + ogs_assert(OGS_OK == + ogs_copyaddrinfo(&addr, test_self()->s1ap_addr6)); else - ogs_copyaddrinfo(&addr, test_self()->s1ap_addr); + ogs_assert(OGS_OK == + ogs_copyaddrinfo(&addr, test_self()->s1ap_addr)); ogs_assert(addr); @@ -129,9 +131,11 @@ ogs_socknode_t *testngap_client(int family) ogs_socknode_t *node = NULL; if (family == AF_INET6) - ogs_copyaddrinfo(&addr, test_self()->ngap_addr6); + ogs_assert(OGS_OK == + ogs_copyaddrinfo(&addr, test_self()->ngap_addr6)); else - ogs_copyaddrinfo(&addr, test_self()->ngap_addr); + ogs_assert(OGS_OK == + ogs_copyaddrinfo(&addr, test_self()->ngap_addr)); ogs_assert(addr); diff --git a/tests/core/memory-test.c b/tests/core/memory-test.c index ec0d8a9cfb..18f5df40f4 100644 --- a/tests/core/memory-test.c +++ b/tests/core/memory-test.c @@ -31,11 +31,11 @@ static void test2_func(abts_case *tc, void *data) { char *ptr = ogs_calloc(2, 10); int i; + ABTS_PTR_NOTNULL(tc, ptr); for (i = 0; i < 2*10; i++) { ABTS_INT_EQUAL(tc, 0, ptr[i]); } - ABTS_PTR_NOTNULL(tc, ptr); ogs_free(ptr); } diff --git a/tests/unit/security-test.c b/tests/unit/security-test.c index 454471e52f..937e59a47d 100644 --- a/tests/unit/security-test.c +++ b/tests/unit/security-test.c @@ -219,6 +219,7 @@ static void security_test6(abts_case *tc, void *data) ogs_pkbuf_t *pkbuf = NULL; m = ogs_calloc(m_len, sizeof(uint8_t)); + ABTS_PTR_NOTNULL(tc, m); memcpy(m, &count, sizeof(uint32_t)); m[4] = ((0x1a << 3) | (1 << 2)); memcpy(m+8, OGS_HEX(_message, strlen(_message), message), msg_len); diff --git a/tests/volte/diameter-rx-path.c b/tests/volte/diameter-rx-path.c index 58d711f1a1..3320c35fcc 100644 --- a/tests/volte/diameter-rx-path.c +++ b/tests/volte/diameter-rx-path.c @@ -42,8 +42,9 @@ static __inline__ struct sess_state *new_state(os0_t sid) struct sess_state *new = NULL; new = ogs_calloc(1, sizeof(*new)); + ogs_expect_or_return_val(new, NULL); new->sid = (os0_t)ogs_strdup((char *)sid); - ogs_assert(new->sid); + ogs_expect_or_return_val(new->sid, NULL); return new; }