final round of warning fixes to compile nr softmodems

openair3/NAS/COMMON/IES/TrafficFlowTemplate.h

@@ -96,7 +96,11 @@ typedef struct {
  * and "no TFT operation" shall be empty.
  * ---------------------------------------------------------------
  */
-typedef struct {} NoPacketFilter;
+typedef struct {
+  // This dummy element is to avoid CLANG warning: empty struct has size 0 in C, size 1 in C++
+  // To be removed if the structure is filled
+  uint32_t dummy;
+} NoPacketFilter;
 
 typedef NoPacketFilter DeleteExistingTft;
 typedef NoPacketFilter NoTftOperation;
@@ -155,7 +159,9 @@ typedef union {
  */
 
 typedef struct {
-  /* TODO */
+  // This dummy element is to avoid CLANG warning: empty struct has size 0 in C, size 1 in C++
+  // To be removed if the structure is filled
+  uint32_t dummy;
 } ParameterList;
 
 /*

openair3/NAS/UE/API/USER/at_command.h

@@ -160,7 +160,11 @@ typedef enum {
 
 /* CGSN AT command type */
 #define AT_COMMAND_CGSN_MASK  AT_COMMAND_NO_PARAM
-typedef struct at_cgsn_s {} at_cgsn_t;
+typedef struct at_cgsn_s {
+  // This dummy element is to avoid CLANG warning: empty struct has size 0 in C, size 1 in C++
+  // To be removed if the structure is filled
+  uint32_t dummy;
+} at_cgsn_t;
 
 /* CGMI: Request manufacturer identification
  * -----------------------------------------
@@ -172,7 +176,11 @@ typedef struct at_cgsn_s {} at_cgsn_t;
 
 /* CGMI AT command type */
 #define AT_COMMAND_CGMI_MASK  AT_COMMAND_NO_PARAM
-typedef struct at_cgmi_s {} at_cgmi_t;
+typedef struct at_cgmi_s {
+  // This dummy element is to avoid CLANG warning: empty struct has size 0 in C, size 1 in C++
+  // To be removed if the structure is filled
+  uint32_t dummy;
+} at_cgmi_t;
 
 /* CGMM: Request model identification
  * ----------------------------------
@@ -184,7 +192,11 @@ typedef struct at_cgmi_s {} at_cgmi_t;
 
 /* CGMM AT command type */
 #define AT_COMMAND_CGMM_MASK  AT_COMMAND_NO_PARAM
-typedef struct at_cgmm_s {} at_cgmm_t;
+typedef struct at_cgmm_s {
+  // This dummy element is to avoid CLANG warning: empty struct has size 0 in C, size 1 in C++
+  // To be removed if the structure is filled
+  uint32_t dummy;
+} at_cgmm_t;
 
 /* CGMR: Request revision identification
  * -------------------------------------
@@ -197,7 +209,11 @@ typedef struct at_cgmm_s {} at_cgmm_t;
 
 /* CGMR AT command type */
 #define AT_COMMAND_CGMR_MASK  AT_COMMAND_NO_PARAM
-typedef struct at_cgmr_s {} at_cgmr_t;
+typedef struct at_cgmr_s {
+  // This dummy element is to avoid CLANG warning: empty struct has size 0 in C, size 1 in C++
+  // To be removed if the structure is filled
+  uint32_t dummy;
+} at_cgmr_t;
 
 /* CIMI: Request International Mobile Subscriber Identity
  * ------------------------------------------------------
@@ -210,7 +226,11 @@ typedef struct at_cgmr_s {} at_cgmr_t;
 
 /* CIMI AT command type */
 #define AT_COMMAND_CIMI_MASK  AT_COMMAND_NO_PARAM
-typedef struct at_cimi_s {} at_cimi_t;
+typedef struct at_cimi_s {
+  // This dummy element is to avoid CLANG warning: empty struct has size 0 in C, size 1 in C++
+  // To be removed if the structure is filled
+  uint32_t dummy;
+} at_cimi_t;
 
 /*
  * ==============================================
@@ -288,7 +308,11 @@ typedef struct {
 
 /* CSQ AT command type */
 #define AT_COMMAND_CSQ_MASK AT_COMMAND_NO_PARAM
-typedef struct at_csq_s {} at_csq_t;
+typedef struct at_csq_s {
+  // This dummy element is to avoid CLANG warning: empty struct has size 0 in C, size 1 in C++
+  // To be removed if the structure is filled
+  uint32_t dummy;
+} at_csq_t;
 
 /* CESQ: Extented signal quality
  * -----------------------------
@@ -299,7 +323,11 @@ typedef struct at_csq_s {} at_csq_t;
 
 /* CESQ AT command type */
 #define AT_COMMAND_CESQ_MASK  AT_COMMAND_NO_PARAM
-typedef struct at_cesq_s {} at_cesq_t;
+typedef struct at_cesq_s {
+  // This dummy element is to avoid CLANG warning: empty struct has size 0 in C, size 1 in C++
+  // To be removed if the structure is filled
+  uint32_t dummy;
+} at_cesq_t;
 
 /* CLAC: List all available AT commands
  * ------------------------------------
@@ -310,7 +338,11 @@ typedef struct at_cesq_s {} at_cesq_t;
 
 /* CLAC AT command type */
 #define AT_COMMAND_CLAC_MASK  AT_COMMAND_NO_PARAM
-typedef struct at_clac_s {} at_clac_t;
+typedef struct at_clac_s {
+  // This dummy element is to avoid CLANG warning: empty struct has size 0 in C, size 1 in C++
+  // To be removed if the structure is filled
+  uint32_t dummy;
+} at_clac_t;
 
 /*
  * =========================
@@ -363,7 +395,11 @@ typedef struct {
 
 /* CNUM AT command type */
 #define AT_COMMAND_CNUM_MASK  AT_COMMAND_NO_PARAM
-typedef struct at_cnum_s {} at_cnum_t;
+typedef struct at_cnum_s {
+  // This dummy element is to avoid CLANG warning: empty struct has size 0 in C, size 1 in C++
+  // To be removed if the structure is filled
+  uint32_t dummy;
+} at_cnum_t;
 
 /* CLCK: Facility lock
  * -------------------

openair3/NGAP/ngap_gNB_context_management_procedures.c

@@ -188,8 +188,31 @@ int ngap_ue_context_release_req(instance_t instance,
     ie->criticality = NGAP_Criticality_ignore;
     ie->value.present = NGAP_UEContextReleaseRequest_IEs__value_PR_Cause;
     DevAssert(ue_release_req_p->cause <= NGAP_Cause_PR_choice_ExtensionS);
-    ie->value.choice.Cause.present = ue_release_req_p->cause;
-    ie->value.choice.Cause.choice.misc = ue_release_req_p->cause_value;
+    switch(ue_release_req_p->cause){
+      case NGAP_CAUSE_RADIO_NETWORK:
+	ie->value.choice.Cause.present = NGAP_Cause_PR_radioNetwork;
+	ie->value.choice.Cause.choice.radioNetwork = ue_release_req_p->cause_value;
+	break;
+      case NGAP_CAUSE_TRANSPORT:
+	ie->value.choice.Cause.present = NGAP_Cause_PR_transport;
+	ie->value.choice.Cause.choice.transport = ue_release_req_p->cause_value;
+	break;
+      case NGAP_CAUSE_NAS:
+	ie->value.choice.Cause.present = NGAP_Cause_PR_nas;
+	ie->value.choice.Cause.choice.nas = ue_release_req_p->cause_value;
+	break;
+      case NGAP_CAUSE_PROTOCOL:
+	ie->value.choice.Cause.present = NGAP_Cause_PR_protocol;
+	ie->value.choice.Cause.choice.protocol = ue_release_req_p->cause_value;
+	break;
+      case NGAP_CAUSE_MISC:
+	ie->value.choice.Cause.present = NGAP_Cause_PR_misc;
+	ie->value.choice.Cause.choice.misc = ue_release_req_p->cause_value;
+	break;
+      default:
+        NGAP_WARN("Received NG Error indication cause NGAP_Cause_PR_choice_Extensions\n");
+        break;
+    }
   }
 
   if (ngap_gNB_encode_pdu(&pdu, &buffer, &length) < 0) {

openair3/NGAP/ngap_gNB_nas_procedures.c

@@ -665,25 +665,29 @@ int ngap_gNB_initial_ctxt_resp(instance_t instance, ngap_initial_context_setup_r
       item->pDUSessionID = initial_ctxt_resp_p->pdusessions_failed[i].pdusession_id;
 
       /* cause */
-      pdusessionUnTransfer.cause.present = initial_ctxt_resp_p->pdusessions_failed[i].cause;
-      switch (pdusessionUnTransfer.cause.present) {
+      switch(initial_ctxt_resp_p->pdusessions_failed[i].cause) {
         case NGAP_CAUSE_RADIO_NETWORK:
+          pdusessionUnTransfer.cause.present = NGAP_Cause_PR_radioNetwork;
           pdusessionUnTransfer.cause.choice.radioNetwork = initial_ctxt_resp_p->pdusessions_failed[i].cause_value;
           break;
 
         case NGAP_CAUSE_TRANSPORT:
+          pdusessionUnTransfer.cause.present = NGAP_Cause_PR_transport;
           pdusessionUnTransfer.cause.choice.transport = initial_ctxt_resp_p->pdusessions_failed[i].cause_value;
           break;
 
         case NGAP_CAUSE_NAS:
+          pdusessionUnTransfer.cause.present = NGAP_Cause_PR_nas;
           pdusessionUnTransfer.cause.choice.nas = initial_ctxt_resp_p->pdusessions_failed[i].cause_value;
           break;
 
         case NGAP_CAUSE_PROTOCOL:
+          pdusessionUnTransfer.cause.present = NGAP_Cause_PR_protocol;
           pdusessionUnTransfer.cause.choice.protocol = initial_ctxt_resp_p->pdusessions_failed[i].cause_value;
           break;
 
         case NGAP_CAUSE_MISC:
+          pdusessionUnTransfer.cause.present = NGAP_Cause_PR_misc;
           pdusessionUnTransfer.cause.choice.misc = initial_ctxt_resp_p->pdusessions_failed[i].cause_value;
           break;
 
@@ -928,25 +932,29 @@ int ngap_gNB_pdusession_setup_resp(instance_t instance, ngap_pdusession_setup_re
       item->pDUSessionID = pdusession_failed->pdusession_id;
 
       /* cause */
-      pdusessionUnTransfer_p.cause.present = pdusession_failed->cause;
-      switch (pdusessionUnTransfer_p.cause.present) {
+      switch(pdusession_failed->cause) {
         case NGAP_CAUSE_RADIO_NETWORK:
+          pdusessionUnTransfer_p.cause.present = NGAP_Cause_PR_radioNetwork;
           pdusessionUnTransfer_p.cause.choice.radioNetwork = pdusession_failed->cause_value;
           break;
 
         case NGAP_CAUSE_TRANSPORT:
+          pdusessionUnTransfer_p.cause.present = NGAP_Cause_PR_transport;
           pdusessionUnTransfer_p.cause.choice.transport = pdusession_failed->cause_value;
           break;
 
         case NGAP_CAUSE_NAS:
+          pdusessionUnTransfer_p.cause.present = NGAP_Cause_PR_nas;
           pdusessionUnTransfer_p.cause.choice.nas = pdusession_failed->cause_value;
           break;
 
         case NGAP_CAUSE_PROTOCOL:
+          pdusessionUnTransfer_p.cause.present = NGAP_Cause_PR_protocol;
           pdusessionUnTransfer_p.cause.choice.protocol = pdusession_failed->cause_value;
           break;
 
         case NGAP_CAUSE_MISC:
+          pdusessionUnTransfer_p.cause.present = NGAP_Cause_PR_misc;
           pdusessionUnTransfer_p.cause.choice.misc = pdusession_failed->cause_value;
           break;
 
@@ -954,7 +962,6 @@ int ngap_gNB_pdusession_setup_resp(instance_t instance, ngap_pdusession_setup_re
           default:
           break;
       }
-
       NGAP_DEBUG("pdusession setup response: failed pdusession ID %ld\n", item->pDUSessionID);
 
       asn_encode_to_new_buffer_result_t res = asn_encode_to_new_buffer(NULL, ATS_ALIGNED_CANONICAL_PER, &asn_DEF_NGAP_PDUSessionResourceSetupUnsuccessfulTransfer, &pdusessionUnTransfer_p);
@@ -1087,26 +1094,30 @@ int ngap_gNB_pdusession_modify_resp(instance_t instance, ngap_pdusession_modify_
       item->pDUSessionID = pdusession_modify_resp_p->pdusessions_failed[i].pdusession_id;
 
       NGAP_PDUSessionResourceModifyUnsuccessfulTransfer_t pdusessionTransfer = {0};
-      pdusessionTransfer.cause.present = pdusession_modify_resp_p->pdusessions_failed[i].cause;
 
-      switch (pdusessionTransfer.cause.present) {
+      switch(pdusession_modify_resp_p->pdusessions_failed[i].cause) {
       case NGAP_CAUSE_RADIO_NETWORK:
-          pdusessionTransfer.cause.choice.radioNetwork = pdusession_modify_resp_p->pdusessions_failed[i].cause_value;
+        pdusessionTransfer.cause.present = NGAP_Cause_PR_radioNetwork;
+        pdusessionTransfer.cause.choice.radioNetwork = pdusession_modify_resp_p->pdusessions_failed[i].cause_value;
         break;
 
       case NGAP_CAUSE_TRANSPORT:
+        pdusessionTransfer.cause.present = NGAP_Cause_PR_transport;
         pdusessionTransfer.cause.choice.transport = pdusession_modify_resp_p->pdusessions_failed[i].cause_value;
         break;
 
       case NGAP_CAUSE_NAS:
+        pdusessionTransfer.cause.present = NGAP_Cause_PR_nas;
         pdusessionTransfer.cause.choice.nas = pdusession_modify_resp_p->pdusessions_failed[i].cause_value;
         break;
 
       case NGAP_CAUSE_PROTOCOL:
+        pdusessionTransfer.cause.present = NGAP_Cause_PR_protocol;
         pdusessionTransfer.cause.choice.protocol = pdusession_modify_resp_p->pdusessions_failed[i].cause_value;
         break;
 
       case NGAP_CAUSE_MISC:
+        pdusessionTransfer.cause.present = NGAP_Cause_PR_misc;
         pdusessionTransfer.cause.choice.misc = pdusession_modify_resp_p->pdusessions_failed[i].cause_value;
         break;