From 772e8737203af26c31a61343439e04c56d60a2d1 Mon Sep 17 00:00:00 2001
From: Masayuki Harada <masayuki.harada@jp.fujitsu.com>
Date: Thu, 21 Oct 2021 19:45:42 +0900
Subject: [PATCH] Add some comment and logs.

---
 openair2/RRC/NR/rrc_gNB_NGAP.c    | 13 ++++++-------
 openair3/NGAP/ngap_gNB_handlers.c | 19 ++++++++++++-------
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/openair2/RRC/NR/rrc_gNB_NGAP.c b/openair2/RRC/NR/rrc_gNB_NGAP.c
index 46d3b01bf0..051c282f10 100644
--- a/openair2/RRC/NR/rrc_gNB_NGAP.c
+++ b/openair2/RRC/NR/rrc_gNB_NGAP.c
@@ -1158,7 +1158,8 @@ rrc_gNB_process_NGAP_PDUSESSION_MODIFY_REQ(
         if (is_treated[i] == TRUE) {
           continue;
         }
-
+        
+        //Check same PDU session ID to handle multiple pdu session id
         for (j = i+1; j < nb_pdusessions_tomodify; j++) {
           if (is_treated[j] == FALSE &&
               NGAP_PDUSESSION_MODIFY_REQ(msg_p).pdusession_modify_params[j].pdusession_id == 
@@ -1175,9 +1176,8 @@ rrc_gNB_process_NGAP_PDUSESSION_MODIFY_REQ(
             is_treated[j] = TRUE;
           }
         }
-
+        // handle multiple pdu session id case
         if (is_treated[i] == TRUE) {
-          // handle multiple pdu session id
           LOG_D(NR_RRC, "handle multiple pdu session id \n");
           ue_context_p->ue_context.modify_pdusession[i].status              = PDU_SESSION_STATUS_NEW;
           ue_context_p->ue_context.modify_pdusession[i].param.pdusession_id = 
@@ -1188,6 +1188,7 @@ rrc_gNB_process_NGAP_PDUSESSION_MODIFY_REQ(
           continue;
         }
 
+        // Check pdu session ID is established
         for (j = 0; j < NR_NB_RB_MAX -3; j++) {
           if (ue_context_p->ue_context.pduSession[j].param.pdusession_id == 
             NGAP_PDUSESSION_MODIFY_REQ(msg_p).pdusession_modify_params[i].pdusession_id) {
@@ -1223,8 +1224,8 @@ rrc_gNB_process_NGAP_PDUSESSION_MODIFY_REQ(
           }
         }
 
+        // handle Unknown pdu session ID
         if (is_treated[i] == FALSE) {
-          // handle Unknown pdu session ID
           LOG_D(NR_RRC, "handle Unknown pdu session ID \n");
           ue_context_p->ue_context.modify_pdusession[i].status              = PDU_SESSION_STATUS_NEW;
           ue_context_p->ue_context.modify_pdusession[i].param.pdusession_id = 
@@ -1245,9 +1246,7 @@ rrc_gNB_process_NGAP_PDUSESSION_MODIFY_REQ(
       if (0 == rrc_gNB_modify_dedicatedRRCReconfiguration(&ctxt, ue_context_p)) {
         return (0);
       }
-    }
-
-    { // modify failed
+    } else { // all pdu modification failed
       LOG_I(NR_RRC, "pdu session modify failed, fill NGAP_PDUSESSION_MODIFY_RESP with the pdu session information that failed to modify \n");
       uint8_t nb_of_pdu_sessions_failed = 0;
       MessageDef *msg_fail_p = NULL;
diff --git a/openair3/NGAP/ngap_gNB_handlers.c b/openair3/NGAP/ngap_gNB_handlers.c
index fab7620f02..b468dce629 100644
--- a/openair3/NGAP/ngap_gNB_handlers.c
+++ b/openair3/NGAP/ngap_gNB_handlers.c
@@ -1630,13 +1630,6 @@ int ngap_gNB_handle_pdusession_modify_request(uint32_t               assoc_id,
     return -1;
   }
 
-  /* PDUSession Resource modify request = UE-related procedure -> stream != 0 */
-//   if (stream == 0) {
-//     NGAP_ERROR("[SCTP %d] Received UE-related procedure on stream (%d)\n",
-//                assoc_id, stream);
-//     return -1;
-//   }
-
   ue_desc_p->rx_stream = stream;
 
   if (ue_desc_p->amf_ue_ngap_id != amf_ue_ngap_id) {
@@ -1718,14 +1711,20 @@ int ngap_gNB_handle_pdusession_modify_request(uint32_t               assoc_id,
         switch(pdusessionTransfer_ies->id) {
           /* optional PDUSessionAggregateMaximumBitRate */
           case NGAP_ProtocolIE_ID_id_PDUSessionAggregateMaximumBitRate:
+            // TODO
+            NGAP_ERROR("Cant' handle NGAP_ProtocolIE_ID_id_PDUSessionAggregateMaximumBitRate\n");
             break;
         
           /* optional UL-NGU-UP-TNLModifyList */
           case NGAP_ProtocolIE_ID_id_UL_NGU_UP_TNLModifyList:
+            // TODO
+            NGAP_ERROR("Cant' handle NGAP_ProtocolIE_ID_id_UL_NGU_UP_TNLModifyList\n");
             break;
             
           /* optional NetworkInstance */
           case NGAP_ProtocolIE_ID_id_NetworkInstance:
+            // TODO
+            NGAP_ERROR("Cant' handle NGAP_ProtocolIE_ID_id_NetworkInstance\n");
             break;
 
           /* optional QosFlowAddOrModifyRequestList */
@@ -1764,14 +1763,20 @@ int ngap_gNB_handle_pdusession_modify_request(uint32_t               assoc_id,
 
           /* optional QosFlowToReleaseList */
           case NGAP_ProtocolIE_ID_id_QosFlowToReleaseList:
+            // TODO
+            NGAP_ERROR("Cant' handle NGAP_ProtocolIE_ID_id_QosFlowToReleaseList\n");
             break;
 
           /* optional AdditionalUL-NGU-UP-TNLInformation */
           case NGAP_ProtocolIE_ID_id_AdditionalUL_NGU_UP_TNLInformation:
+            // TODO
+            NGAP_ERROR("Cant' handle NGAP_ProtocolIE_ID_id_AdditionalUL_NGU_UP_TNLInformation\n");
             break;
 
           /* optional CommonNetworkInstance */
           case NGAP_ProtocolIE_ID_id_CommonNetworkInstance:
+            // TODO
+            NGAP_ERROR("Cant' handle NGAP_ProtocolIE_ID_id_CommonNetworkInstance\n");
             break;
             
           default: