Merge branch 'fix_rhel_8' into 'develop'

Fix rhel 8

See merge request oai/cn5g/oai-cn5g-smf!61

src/common/3gpp_29.244.h

@@ -445,7 +445,7 @@ struct fteid_s {
            (v4 == f.v4) and (v6 == f.v6);
   }
 
-  bool operator=(const struct fteid_s& f) {
+  fteid_s& operator=(const struct fteid_s& f) {
     v4                  = f.v4;
     v6                  = f.v6;
     chid                = f.chid;
@@ -458,6 +458,7 @@ struct fteid_s {
     // ipv6_address.s6_addr32[1] = f.ipv6_address.s6_addr32[1];
     // ipv6_address.s6_addr32[2] = f.ipv6_address.s6_addr32[2];
     // ipv6_address.s6_addr32[3] = f.ipv6_address.s6_addr32[3];
+    return *this;
   }
 
   std::string toString() const {

src/common/3gpp_29.502.h

@@ -98,6 +98,7 @@ static const std::vector<std::string> pdu_session_application_error_e2str = {
 
 // 6.1.6.3.12 Enumeration: N2SmInfoType @3GPP TS 29.502 V16.0.0
 enum class n2_sm_info_type_e {
+  UNKNOWN_TYPE       = 0,
   PDU_RES_SETUP_REQ  = 1,   // PDU Session Resource Setup Request Transfer
   PDU_RES_SETUP_RSP  = 2,   // PDU Session Resource Setup Response Transfer
   PDU_RES_SETUP_FAIL = 3,   // PDU Session Resource Setup Unsuccessful Transfer

src/common/smf.h

@@ -233,6 +233,7 @@ typedef struct nf_service_version_s {
   nf_service_version_s& operator=(const nf_service_version_s& s) {
     api_version_in_uri = s.api_version_in_uri;
     api_full_version   = s.api_full_version;
+    return *this;
   }
 
   std::string to_string() const {
@@ -248,7 +249,7 @@ typedef struct nf_service_version_s {
 } nf_service_version_t;
 
 typedef struct ip_endpoint_s {
-  //struct in6_addr  ipv6_address;
+  // struct in6_addr  ipv6_address;
   struct in_addr ipv4_address;
   std::string transport;  // TCP
   unsigned int port;
@@ -323,8 +324,7 @@ typedef struct patch_item_s {
   }
 } patch_item_t;
 
-
-//TODO: move to 23.003
+// TODO: move to 23.003
 typedef struct guami_5g_s {
   plmn_t plmn;
   std::string amf_id;

src/nas/mm/msg/mm_msg.c

@@ -46,8 +46,8 @@ static int _fivegmm_msg_encode_header(
  */
 int fivegmm_msg_encode(MM_msg* msg, uint8_t* buffer, uint32_t len) {
   // OAILOG_FUNC_IN (LOG_NAS_EMM);
-  int header_result;
-  int encode_result;
+  int header_result = 0;
+  int encode_result = 0;
 
   /*
    * First encode the EMM message header

src/oai_smf/CMakeLists.txt

@@ -124,6 +124,9 @@ if (CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
   add_boolean_option(LOG_OAI_MINIMAL True "Thread safe logging API, log only levels above NOTICE")
   SET(ASAN asan)
 endif()
+if (CMAKE_BUILD_TYPE STREQUAL "Release")
+  SET(ASAN asan)
+endif()
 if (CMAKE_BUILD_TYPE STREQUAL "Debug")
   add_boolean_option(LOG_OAI True "Thread safe logging API")
   SET(ASAN asan)

src/smf_app/smf_app.cpp

@@ -1271,6 +1271,7 @@ evsub_id_t smf_app::handle_event_exposure_subscription(
     ss.get()->ev_type = i.smf_event;
     add_event_subscription(evsub_id, i.smf_event, ss);
   }
+  return evsub_id;
 }
 
 //------------------------------------------------------------------------------
@@ -1634,6 +1635,7 @@ n2_sm_info_type_e smf_app::n2_sm_info_type_str2e(
       return static_cast<n2_sm_info_type_e>(i);
     }
   }
+  return n2_sm_info_type_e::UNKNOWN_TYPE;
 }
 
 //---------------------------------------------------------------------------------------------

src/smf_app/smf_profile.hpp

@@ -80,6 +80,7 @@ class nf_profile : public std::enable_shared_from_this<nf_profile> {
     nf_type          = s.nf_type;
     nf_instance_name = s.nf_instance_name;
     nf_status        = s.nf_status;
+    return *this;
   }
   // nf_profile(nf_profile &b) = delete;
 
@@ -317,6 +318,7 @@ class smf_profile : public nf_profile {
     custom_info      = s.custom_info;
     smf_info         = s.smf_info;
     nf_services      = s.nf_services;
+    return *this;
   }
   // smf_profile(smf_profile &b) = delete;
 
@@ -435,6 +437,7 @@ class upf_profile : public nf_profile {
     nf_status        = s.nf_status;
     // custom_info = s.custom_info;
     upf_info = s.upf_info;
+    return *this;
   }
   // upf_profile(upf_profile &b) = delete;