cppcheck fixes (2)

openair3/S1AP/s1ap_common.h

@@ -90,6 +90,7 @@ extern int asn1_xer_print;
 # define S1AP_DEBUG(x, args...) do { fprintf(stdout, "[S1AP][D]"x, ##args); } while(0)
 #endif
 
+
 #define S1AP_FIND_PROTOCOLIE_BY_ID(IE_TYPE, ie, container, IE_ID, mandatory) \
   do {\
     IE_TYPE **ptr; \
@@ -102,15 +103,17 @@ extern int asn1_xer_print;
         break; \
       } \
     } \
-    if (mandatory) DevAssert(ie != NULL); \
+    if (ie == NULL ) { \
+      S1AP_ERROR("S1AP_FIND_PROTOCOLIE_BY_ID: %s %d: ie is NULL\n",__FILE__,__LINE__);\
+      if (mandatory)  _Assert_Exit_ \
+    } \
   } while(0)
-
 /** \brief Function callback prototype.
  **/
 typedef int (*s1ap_message_decoded_callback)(
-  uint32_t         assoc_id,
-  uint32_t         stream,
-  S1AP_S1AP_PDU_t *pdu
+    uint32_t         assoc_id,
+    uint32_t         stream,
+    S1AP_S1AP_PDU_t *pdu
 );
 
 /** \brief Handle criticality

openair3/S1AP/s1ap_eNB_overload.c

@@ -47,60 +47,60 @@ int s1ap_eNB_handle_overload_start(uint32_t         assoc_id,
                                    uint32_t         stream,
                                    S1AP_S1AP_PDU_t *pdu)
 {
-  s1ap_eNB_mme_data_t     *mme_desc_p;
-  S1AP_OverloadStart_t    *container;
-  S1AP_OverloadStartIEs_t *ie;
-
-  DevAssert(pdu != NULL);
-
-  container = &pdu->choice.initiatingMessage.value.choice.OverloadStart;
-
-  S1AP_FIND_PROTOCOLIE_BY_ID(S1AP_OverloadStartIEs_t, ie, container,
-                             S1AP_ProtocolIE_ID_id_OverloadResponse, true);
-
-  DevCheck(ie->value.choice.OverloadResponse.present ==
-           S1AP_OverloadResponse_PR_overloadAction,
-           S1AP_OverloadResponse_PR_overloadAction, 0, 0);
-
-  /* Non UE-associated signalling -> stream 0 */
-  DevCheck(stream == 0, stream, 0, 0);
-
-  if ((mme_desc_p = s1ap_eNB_get_MME(NULL, assoc_id, 0)) == NULL) {
-    /* No MME context associated */
-    return -1;
-  }
-
-  /* Mark the MME as overloaded and set the overload state according to
-   * the value received.
-   */
-  mme_desc_p->state = S1AP_ENB_OVERLOAD;
-  mme_desc_p->overload_state =
-    ie->value.choice.OverloadResponse.choice.overloadAction;
-
-  return 0;
+    s1ap_eNB_mme_data_t     *mme_desc_p;
+    S1AP_OverloadStart_t    *container;
+    S1AP_OverloadStartIEs_t *ie;
+
+    DevAssert(pdu != NULL);
+
+    container = &pdu->choice.initiatingMessage.value.choice.OverloadStart;
+
+    S1AP_FIND_PROTOCOLIE_BY_ID(S1AP_OverloadStartIEs_t, ie, container,
+                               S1AP_ProtocolIE_ID_id_OverloadResponse, true);
+    if (ie != NULL) {
+        DevCheck(ie->value.choice.OverloadResponse.present ==
+                 S1AP_OverloadResponse_PR_overloadAction,
+                 S1AP_OverloadResponse_PR_overloadAction, 0, 0);
+    }
+    /* Non UE-associated signalling -> stream 0 */
+    DevCheck(stream == 0, stream, 0, 0);
+
+    if ((mme_desc_p = s1ap_eNB_get_MME(NULL, assoc_id, 0)) == NULL) {
+        /* No MME context associated */
+        return -1;
+    }
+
+    /* Mark the MME as overloaded and set the overload state according to
+     * the value received.
+     */
+    mme_desc_p->state = S1AP_ENB_OVERLOAD;
+    mme_desc_p->overload_state =
+        ie->value.choice.OverloadResponse.choice.overloadAction;
+
+    return 0;
 }
 
 int s1ap_eNB_handle_overload_stop(uint32_t         assoc_id,
                                   uint32_t         stream,
                                   S1AP_S1AP_PDU_t *pdu)
 {
-  /* We received Overload stop message, meaning that the MME is no more
-   * overloaded. This is an empty message, with only message header and no
-   * Information Element.
-   */
-  DevAssert(pdu != NULL);
+    /* We received Overload stop message, meaning that the MME is no more
+     * overloaded. This is an empty message, with only message header and no
+     * Information Element.
+     */
+    DevAssert(pdu != NULL);
 
-  s1ap_eNB_mme_data_t *mme_desc_p;
+    s1ap_eNB_mme_data_t *mme_desc_p;
 
-  /* Non UE-associated signalling -> stream 0 */
-  DevCheck(stream == 0, stream, 0, 0);
+    /* Non UE-associated signalling -> stream 0 */
+    DevCheck(stream == 0, stream, 0, 0);
 
-  if ((mme_desc_p = s1ap_eNB_get_MME(NULL, assoc_id, 0)) == NULL) {
-    /* No MME context associated */
-    return -1;
-  }
+    if ((mme_desc_p = s1ap_eNB_get_MME(NULL, assoc_id, 0)) == NULL) {
+        /* No MME context associated */
+        return -1;
+    }
 
-  mme_desc_p->state = S1AP_ENB_STATE_CONNECTED;
-  mme_desc_p->overload_state = S1AP_NO_OVERLOAD;
-  return 0;
+    mme_desc_p->state = S1AP_ENB_STATE_CONNECTED;
+    mme_desc_p->overload_state = S1AP_NO_OVERLOAD;
+    return 0;
 }

openair3/S1AP/s1ap_eNB_trace.c

@@ -42,107 +42,108 @@ void s1ap_eNB_generate_trace_failure(struct s1ap_eNB_ue_context_s *ue_desc_p,
                                      S1AP_E_UTRAN_Trace_ID_t      *trace_id,
                                      S1AP_Cause_t                 *cause_p)
 {
-  S1AP_S1AP_PDU_t                     pdu;
-  S1AP_TraceFailureIndication_t      *out;
-  S1AP_TraceFailureIndicationIEs_t   *ie;
-  uint8_t                            *buffer = NULL;
-  uint32_t                            length;
-
-  DevAssert(ue_desc_p != NULL);
-  DevAssert(trace_id  != NULL);
-  DevAssert(cause_p   != NULL);
-
-  /* Prepare the S1AP message to encode */
-  memset(&pdu, 0, sizeof(pdu));
-  pdu.present = S1AP_S1AP_PDU_PR_initiatingMessage;
-  pdu.choice.initiatingMessage.procedureCode = S1AP_ProcedureCode_id_TraceFailureIndication;
-  pdu.choice.initiatingMessage.criticality = S1AP_Criticality_ignore;
-  pdu.choice.initiatingMessage.value.present = S1AP_InitiatingMessage__value_PR_TraceFailureIndication;
-  out = &pdu.choice.initiatingMessage.value.choice.TraceFailureIndication;
-
-  /* mandatory */
-  ie = (S1AP_TraceFailureIndicationIEs_t *)calloc(1, sizeof(S1AP_TraceFailureIndicationIEs_t));
-  ie->id = S1AP_ProtocolIE_ID_id_MME_UE_S1AP_ID;
-  ie->criticality = S1AP_Criticality_reject;
-  ie->value.present = S1AP_TraceFailureIndicationIEs__value_PR_MME_UE_S1AP_ID;
-  ie->value.choice.MME_UE_S1AP_ID = ue_desc_p->mme_ue_s1ap_id;
-  ASN_SEQUENCE_ADD(&out->protocolIEs.list, ie);
-
-  /* mandatory */
-  ie = (S1AP_TraceFailureIndicationIEs_t *)calloc(1, sizeof(S1AP_TraceFailureIndicationIEs_t));
-  ie->id = S1AP_ProtocolIE_ID_id_eNB_UE_S1AP_ID;
-  ie->criticality = S1AP_Criticality_reject;
-  ie->value.present = S1AP_TraceFailureIndicationIEs__value_PR_ENB_UE_S1AP_ID;
-  ie->value.choice.ENB_UE_S1AP_ID = ue_desc_p->eNB_ue_s1ap_id;
-  ASN_SEQUENCE_ADD(&out->protocolIEs.list, ie);
-
-  /* mandatory */
-  ie = (S1AP_TraceFailureIndicationIEs_t *)calloc(1, sizeof(S1AP_TraceFailureIndicationIEs_t));
-  ie->id = S1AP_ProtocolIE_ID_id_E_UTRAN_Trace_ID;
-  ie->criticality = S1AP_Criticality_ignore;
-  ie->value.present = S1AP_TraceFailureIndicationIEs__value_PR_E_UTRAN_Trace_ID;
-  memcpy(&ie->value.choice.E_UTRAN_Trace_ID, trace_id, sizeof(S1AP_E_UTRAN_Trace_ID_t));
-  ASN_SEQUENCE_ADD(&out->protocolIEs.list, ie);
-
-  /* mandatory */
-  ie = (S1AP_TraceFailureIndicationIEs_t *)calloc(1, sizeof(S1AP_TraceFailureIndicationIEs_t));
-  ie->id = S1AP_ProtocolIE_ID_id_Cause;
-  ie->criticality = S1AP_Criticality_ignore;
-  ie->value.present = S1AP_TraceFailureIndicationIEs__value_PR_Cause;
-  memcpy(&ie->value.choice.Cause, cause_p, sizeof(S1AP_Cause_t));
-  ASN_SEQUENCE_ADD(&out->protocolIEs.list, ie);
-
-  if (s1ap_eNB_encode_pdu(&pdu, &buffer, &length) < 0) {
-    return;
-  }
-
-  s1ap_eNB_itti_send_sctp_data_req(ue_desc_p->mme_ref->s1ap_eNB_instance->instance,
-                                   ue_desc_p->mme_ref->assoc_id, buffer,
-                                   length, ue_desc_p->tx_stream);
+    S1AP_S1AP_PDU_t                     pdu;
+    S1AP_TraceFailureIndication_t      *out;
+    S1AP_TraceFailureIndicationIEs_t   *ie;
+    uint8_t                            *buffer = NULL;
+    uint32_t                            length;
+
+    DevAssert(ue_desc_p != NULL);
+    DevAssert(trace_id  != NULL);
+    DevAssert(cause_p   != NULL);
+
+    /* Prepare the S1AP message to encode */
+    memset(&pdu, 0, sizeof(pdu));
+    pdu.present = S1AP_S1AP_PDU_PR_initiatingMessage;
+    pdu.choice.initiatingMessage.procedureCode = S1AP_ProcedureCode_id_TraceFailureIndication;
+    pdu.choice.initiatingMessage.criticality = S1AP_Criticality_ignore;
+    pdu.choice.initiatingMessage.value.present = S1AP_InitiatingMessage__value_PR_TraceFailureIndication;
+    out = &pdu.choice.initiatingMessage.value.choice.TraceFailureIndication;
+
+    /* mandatory */
+    ie = (S1AP_TraceFailureIndicationIEs_t *)calloc(1, sizeof(S1AP_TraceFailureIndicationIEs_t));
+    ie->id = S1AP_ProtocolIE_ID_id_MME_UE_S1AP_ID;
+    ie->criticality = S1AP_Criticality_reject;
+    ie->value.present = S1AP_TraceFailureIndicationIEs__value_PR_MME_UE_S1AP_ID;
+    ie->value.choice.MME_UE_S1AP_ID = ue_desc_p->mme_ue_s1ap_id;
+    ASN_SEQUENCE_ADD(&out->protocolIEs.list, ie);
+
+    /* mandatory */
+    ie = (S1AP_TraceFailureIndicationIEs_t *)calloc(1, sizeof(S1AP_TraceFailureIndicationIEs_t));
+    ie->id = S1AP_ProtocolIE_ID_id_eNB_UE_S1AP_ID;
+    ie->criticality = S1AP_Criticality_reject;
+    ie->value.present = S1AP_TraceFailureIndicationIEs__value_PR_ENB_UE_S1AP_ID;
+    ie->value.choice.ENB_UE_S1AP_ID = ue_desc_p->eNB_ue_s1ap_id;
+    ASN_SEQUENCE_ADD(&out->protocolIEs.list, ie);
+
+    /* mandatory */
+    ie = (S1AP_TraceFailureIndicationIEs_t *)calloc(1, sizeof(S1AP_TraceFailureIndicationIEs_t));
+    ie->id = S1AP_ProtocolIE_ID_id_E_UTRAN_Trace_ID;
+    ie->criticality = S1AP_Criticality_ignore;
+    ie->value.present = S1AP_TraceFailureIndicationIEs__value_PR_E_UTRAN_Trace_ID;
+    memcpy(&ie->value.choice.E_UTRAN_Trace_ID, trace_id, sizeof(S1AP_E_UTRAN_Trace_ID_t));
+    ASN_SEQUENCE_ADD(&out->protocolIEs.list, ie);
+
+    /* mandatory */
+    ie = (S1AP_TraceFailureIndicationIEs_t *)calloc(1, sizeof(S1AP_TraceFailureIndicationIEs_t));
+    ie->id = S1AP_ProtocolIE_ID_id_Cause;
+    ie->criticality = S1AP_Criticality_ignore;
+    ie->value.present = S1AP_TraceFailureIndicationIEs__value_PR_Cause;
+    memcpy(&ie->value.choice.Cause, cause_p, sizeof(S1AP_Cause_t));
+    ASN_SEQUENCE_ADD(&out->protocolIEs.list, ie);
+
+    if (s1ap_eNB_encode_pdu(&pdu, &buffer, &length) < 0) {
+        return;
+    }
+
+    s1ap_eNB_itti_send_sctp_data_req(ue_desc_p->mme_ref->s1ap_eNB_instance->instance,
+                                     ue_desc_p->mme_ref->assoc_id, buffer,
+                                     length, ue_desc_p->tx_stream);
 }
 
 int s1ap_eNB_handle_trace_start(uint32_t         assoc_id,
                                 uint32_t         stream,
                                 S1AP_S1AP_PDU_t *pdu)
 {
-  S1AP_TraceStart_t            *container;
-  S1AP_TraceStartIEs_t         *ie;
-  struct s1ap_eNB_ue_context_s *ue_desc_p;
-  struct s1ap_eNB_mme_data_s   *mme_ref_p;
-
-  DevAssert(pdu != NULL);
-
-  container = &pdu->choice.initiatingMessage.value.choice.TraceStart;
-
-  S1AP_FIND_PROTOCOLIE_BY_ID(S1AP_TraceStartIEs_t, ie, container,
-                             S1AP_ProtocolIE_ID_id_eNB_UE_S1AP_ID, TRUE);
-  mme_ref_p = s1ap_eNB_get_MME(NULL, assoc_id, 0);
-  DevAssert(mme_ref_p != NULL);
-
-  if ((ue_desc_p = s1ap_eNB_get_ue_context(mme_ref_p->s1ap_eNB_instance,
-                                           ie->value.choice.ENB_UE_S1AP_ID)) == NULL) {
-    /* Could not find context associated with this eNB_ue_s1ap_id -> generate
-     * trace failure indication.
-     */
-    S1AP_E_UTRAN_Trace_ID_t trace_id;
-    S1AP_Cause_t cause;
-    memset(&trace_id, 0, sizeof(S1AP_E_UTRAN_Trace_ID_t));
-    memset(&cause, 0, sizeof(S1AP_Cause_t));
-    cause.present = S1AP_Cause_PR_radioNetwork;
-    cause.choice.radioNetwork = S1AP_CauseRadioNetwork_unknown_pair_ue_s1ap_id;
-    s1ap_eNB_generate_trace_failure(ue_desc_p, &trace_id, &cause);
-  }
-
-  return 0;
+    S1AP_TraceStart_t            *container;
+    S1AP_TraceStartIEs_t         *ie;
+    struct s1ap_eNB_ue_context_s *ue_desc_p;
+    struct s1ap_eNB_mme_data_s   *mme_ref_p;
+
+    DevAssert(pdu != NULL);
+
+    container = &pdu->choice.initiatingMessage.value.choice.TraceStart;
+
+    S1AP_FIND_PROTOCOLIE_BY_ID(S1AP_TraceStartIEs_t, ie, container,
+                               S1AP_ProtocolIE_ID_id_eNB_UE_S1AP_ID, TRUE);
+    mme_ref_p = s1ap_eNB_get_MME(NULL, assoc_id, 0);
+    DevAssert(mme_ref_p != NULL);
+
+    ue_desc_p = s1ap_eNB_get_ue_context(mme_ref_p->s1ap_eNB_instance,
+                                        ie->value.choice.ENB_UE_S1AP_ID);
+    if (ue_desc_p == NULL) {
+        /* Could not find context associated with this eNB_ue_s1ap_id -> generate
+         * trace failure indication.
+         */
+        S1AP_E_UTRAN_Trace_ID_t trace_id;
+        S1AP_Cause_t cause;
+        memset(&trace_id, 0, sizeof(S1AP_E_UTRAN_Trace_ID_t));
+        memset(&cause, 0, sizeof(S1AP_Cause_t));
+        cause.present = S1AP_Cause_PR_radioNetwork;
+        cause.choice.radioNetwork = S1AP_CauseRadioNetwork_unknown_pair_ue_s1ap_id;
+        s1ap_eNB_generate_trace_failure(NULL, &trace_id, &cause);
+    }
+
+    return 0;
 }
 
 int s1ap_eNB_handle_deactivate_trace(uint32_t         assoc_id,
                                      uint32_t         stream,
                                      S1AP_S1AP_PDU_t *message_p)
 {
-  //     S1AP_DeactivateTraceIEs_t *deactivate_trace_p;
-  //
-  //     deactivate_trace_p = &message_p->msg.deactivateTraceIEs;
+    //     S1AP_DeactivateTraceIEs_t *deactivate_trace_p;
+    //
+    //     deactivate_trace_p = &message_p->msg.deactivateTraceIEs;
 
-  return 0;
+    return 0;
 }