fix some errors and warnings.

openair2/COMMON/ngap_messages_types.h

@@ -738,10 +738,19 @@ typedef struct ngap_ue_release_command_s {
 
 //-------------------------------------------------------------------------------------------//
 // NGAP <-- RRC messages
+typedef struct pdusession_release_s {
+  /* Unique pdusession_id for the UE. */
+  uint8_t                     pdusession_id;
+} pdusession_release_t;
+
 typedef struct ngap_ue_release_req_s {
-  uint32_t  gNB_ue_ngap_id;
-  ngap_Cause_t  cause;
-  long          cause_value;
+  uint32_t             gNB_ue_ngap_id;
+  /* Number of pdusession resource in the list */
+  uint8_t              nb_of_pdusessions;
+  /* list of pdusession resource by RRC layers */
+  pdusession_release_t pdusessions[NGAP_MAX_PDUSESSION];
+  ngap_Cause_t         cause;
+  long                 cause_value;
 } ngap_ue_release_req_t, ngap_ue_release_resp_t;
 
 typedef struct ngap_pdusession_modify_req_s {
@@ -775,11 +784,6 @@ typedef struct ngap_pdusession_modify_resp_s {
   pdusession_failed_t pdusessions_failed[NGAP_MAX_PDUSESSION];
 } ngap_pdusession_modify_resp_t;
 
-typedef struct pdusession_release_s {
-  /* Unique pdusession_id for the UE. */
-  uint8_t                     pdusession_id;
-} pdusession_release_t;
-
 typedef struct ngap_pdusession_release_command_s {
   /* AMF UE id  */
   uint64_t                       amf_ue_ngap_id:40;

openair2/RRC/NR/rrc_gNB_NGAP.c

@@ -848,7 +848,7 @@ rrc_gNB_send_NGAP_PDUSESSION_SETUP_RESP(
     ue_context_pP->ue_context.pdusession[i].xid = -1;
   }
 
-  return 0;
+  return;
 }
 
 //------------------------------------------------------------------------------
@@ -945,4 +945,4 @@ rrc_gNB_process_NGAP_PDUSESSION_SETUP_REQ(
     rrc_gNB_send_NGAP_PDUSESSION_SETUP_RESP(&ctxt, ue_context_p, 0);
     return(0);
   }
-}
\ No newline at end of file
+}

openair3/NGAP/ngap_gNB_context_management_procedures.c

@@ -49,6 +49,7 @@
 #include "ngap_gNB_nas_procedures.h"
 #include "ngap_gNB_management_procedures.h"
 #include "ngap_gNB_context_management_procedures.h"
+#include "NGAP_PDUSessionResourceItemCxtRelReq.h"
 #include "msc.h"
 
 
@@ -203,6 +204,21 @@ int ngap_ue_context_release_req(instance_t instance,
   ie->value.choice.RAN_UE_NGAP_ID = ue_release_req_p->gNB_ue_ngap_id;
   ASN_SEQUENCE_ADD(&out->protocolIEs.list, ie);
 
+  /* optional */
+  if (ue_release_req_p->nb_of_pdusessions > 0) {
+    ie = (NGAP_UEContextReleaseRequest_IEs_t *)calloc(1, sizeof(NGAP_UEContextReleaseRequest_IEs_t));
+    ie->id = NGAP_ProtocolIE_ID_id_RAN_UE_NGAP_ID;
+    ie->criticality = NGAP_Criticality_reject;
+    ie->value.present = NGAP_UEContextReleaseRequest_IEs__value_PR_PDUSessionResourceListCxtRelReq;
+    for (int i = 0; i < ue_release_req_p->nb_of_pdusessions; i++) {
+      NGAP_PDUSessionResourceItemCxtRelReq_t     *item;
+      item = (NGAP_PDUSessionResourceItemCxtRelReq_t *)calloc(1,sizeof(NGAP_PDUSessionResourceItemCxtRelReq_t));
+      item->pDUSessionID = ue_release_req_p->pdusessions[i].pdusession_id;
+      ASN_SEQUENCE_ADD(&ie->value.choice.PDUSessionResourceListCxtRelReq.list, item);
+    }
+    ASN_SEQUENCE_ADD(&out->protocolIEs.list, ie);
+  }
+
   /* mandatory */
   ie = (NGAP_UEContextReleaseRequest_IEs_t *)calloc(1, sizeof(NGAP_UEContextReleaseRequest_IEs_t));
   ie->id = NGAP_ProtocolIE_ID_id_Cause;

openair3/NGAP/ngap_gNB_nas_procedures.c

@@ -1069,10 +1069,10 @@ int ngap_gNB_pdusession_setup_resp(instance_t instance,
               ass_qos_item_p->qosFlowIdentifier = pdusession_setup_resp_p->pdusessions[i].associated_qos_flows[j].qfi;
 
               /* qosFlowMappingIndication */
-              if(pdusession_setup_resp_p->pdusessions[i].associated_qos_flows[j].qos_flow_mapping_ind != QOSFLOW_MAPPING_INDICATION_NON) {
-                ass_qos_item_p->qosFlowMappingIndication = malloc(sizeof(*ass_qos_item_p->qosFlowMappingIndication));
-                *ass_qos_item_p->qosFlowMappingIndication = pdusession_setup_resp_p->pdusessions[i].associated_qos_flows[j].qos_flow_mapping_ind;
-              }
+              //if(pdusession_setup_resp_p->pdusessions[i].associated_qos_flows[j].qos_flow_mapping_ind != QOSFLOW_MAPPING_INDICATION_NON) {
+              //  ass_qos_item_p->qosFlowMappingIndication = malloc(sizeof(*ass_qos_item_p->qosFlowMappingIndication));
+              //  *ass_qos_item_p->qosFlowMappingIndication = pdusession_setup_resp_p->pdusessions[i].associated_qos_flows[j].qos_flow_mapping_ind;
+              //}
               ASN_SEQUENCE_ADD(&pdusessionTransfer_p->dLQosFlowPerTNLInformation.associatedQosFlowList.list, ass_qos_item_p);
             }
 
@@ -1080,7 +1080,7 @@ int ngap_gNB_pdusession_setup_resp(instance_t instance,
 //            res = asn_encode_to_new_buffer(NULL, ATS_ALIGNED_CANONICAL_PER, &asn_DEF_NGAP_PDUSessionResourceSetupResponseTransfer, pdusessionTransfer_p);
 //            item->pDUSessionResourceSetupResponseTransfer.buf = res.buffer;
 //            item->pDUSessionResourceSetupResponseTransfer.size = res.result.encoded;
-            char buffer[100];
+            uint8_t buffer[100];
             asn_enc_rval_t  enc_rval = aper_encode_to_buffer(&asn_DEF_NGAP_PDUSessionResourceSetupResponseTransfer, 
                                         NULL, 
                                         pdusessionTransfer_p, 
@@ -1089,7 +1089,7 @@ int ngap_gNB_pdusession_setup_resp(instance_t instance,
             item->pDUSessionResourceSetupResponseTransfer.buf = buffer;
             item->pDUSessionResourceSetupResponseTransfer.size = enc_rval.encoded;
 
-            //ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_NGAP_PDUSessionResourceSetupResponseTransfer, pdusessionTransfer_p);
+            ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_NGAP_PDUSessionResourceSetupResponseTransfer, pdusessionTransfer_p);
 
             ASN_SEQUENCE_ADD(&ie->value.choice.PDUSessionResourceSetupListSURes.list, item);
         }