fix(f1ap): Do not send optional hardcoded fields in UE context setup request

openair2/F1AP/f1ap_cu_ue_context_management.c

@@ -273,27 +273,27 @@ int CU_send_UE_CONTEXT_SETUP_REQUEST(sctp_assoc_t assoc_id, f1ap_ue_context_setu
         f1ap_ue_context_setup_req->cu_to_du_rrc_information->measConfig_length);
     }
   }
-  
 
-  /* mandatory */
-  /* c7. Candidate_SpCell_List */
-  asn1cSequenceAdd(out->protocolIEs.list, F1AP_UEContextSetupRequestIEs_t, ie7);
-  ie7->id                             = F1AP_ProtocolIE_ID_id_Candidate_SpCell_List;  //90
-  ie7->criticality                    = F1AP_Criticality_ignore;
-  ie7->value.present                  = F1AP_UEContextSetupRequestIEs__value_PR_Candidate_SpCell_List;
-
-  for (int i=0;   i<1;  i++) {
-    asn1cSequenceAdd(ie7->value.choice.Candidate_SpCell_List.list,F1AP_Candidate_SpCell_ItemIEs_t, candidate_spCell_item_ies);
-    candidate_spCell_item_ies->id            = F1AP_ProtocolIE_ID_id_Candidate_SpCell_Item; // 91
-    candidate_spCell_item_ies->criticality = F1AP_Criticality_ignore;
-    candidate_spCell_item_ies->value.present = F1AP_Candidate_SpCell_ItemIEs__value_PR_Candidate_SpCell_Item;
-    /* 7.1 Candidate_SpCell_Item */
-    F1AP_Candidate_SpCell_Item_t *candidate_spCell_item=
-      &candidate_spCell_item_ies->value.choice.Candidate_SpCell_Item;
-    /* - candidate_SpCell_ID */
-    //FixMe: first cell ???
-    addnRCGI(candidate_spCell_item->candidate_SpCell_ID,f1ap_ue_context_setup_req);
-    /* TODO add correct mcc/mnc */
+  /* optional */
+  if (0) {
+    /* c7. Candidate_SpCell_List */
+    asn1cSequenceAdd(out->protocolIEs.list, F1AP_UEContextSetupRequestIEs_t, ie7);
+    ie7->id = F1AP_ProtocolIE_ID_id_Candidate_SpCell_List; // 90
+    ie7->criticality = F1AP_Criticality_ignore;
+    ie7->value.present = F1AP_UEContextSetupRequestIEs__value_PR_Candidate_SpCell_List;
+
+    for (int i = 0; i < 1; i++) {
+      asn1cSequenceAdd(ie7->value.choice.Candidate_SpCell_List.list, F1AP_Candidate_SpCell_ItemIEs_t, candidate_spCell_item_ies);
+      candidate_spCell_item_ies->id = F1AP_ProtocolIE_ID_id_Candidate_SpCell_Item; // 91
+      candidate_spCell_item_ies->criticality = F1AP_Criticality_ignore;
+      candidate_spCell_item_ies->value.present = F1AP_Candidate_SpCell_ItemIEs__value_PR_Candidate_SpCell_Item;
+      /* 7.1 Candidate_SpCell_Item */
+      F1AP_Candidate_SpCell_Item_t *candidate_spCell_item = &candidate_spCell_item_ies->value.choice.Candidate_SpCell_Item;
+      /* - candidate_SpCell_ID */
+      // FixMe: first cell ???
+      addnRCGI(candidate_spCell_item->candidate_SpCell_ID, f1ap_ue_context_setup_req);
+      /* TODO add correct mcc/mnc */
+    }
   }
 
   /* optional */
@@ -335,32 +335,33 @@ int CU_send_UE_CONTEXT_SETUP_REQUEST(sctp_assoc_t assoc_id, f1ap_ue_context_setu
                          strlen("asdsa1d32sa1d31asd31as"));
   }
 
-  /* mandatory */
-  /* c10. SCell_ToBeSetup_List */
-  asn1cSequenceAdd(out->protocolIEs.list, F1AP_UEContextSetupRequestIEs_t, ie10);
-  ie10->id                             = F1AP_ProtocolIE_ID_id_SCell_ToBeSetup_List;
-  ie10->criticality                    = F1AP_Criticality_ignore;
-  ie10->value.present                  = F1AP_UEContextSetupRequestIEs__value_PR_SCell_ToBeSetup_List;
-
-  for (int i=0; i<1; i++) {
-    //
-    asn1cSequenceAdd(ie10->value.choice.SCell_ToBeSetup_List.list, F1AP_SCell_ToBeSetup_ItemIEs_t, scell_toBeSetup_item_ies);
-    scell_toBeSetup_item_ies->id            = F1AP_ProtocolIE_ID_id_SCell_ToBeSetup_Item; //53
-    scell_toBeSetup_item_ies->criticality   = F1AP_Criticality_ignore;
-    scell_toBeSetup_item_ies->value.present = F1AP_SCell_ToBeSetup_ItemIEs__value_PR_SCell_ToBeSetup_Item;
-    /* 10.1 SCell_ToBeSetup_Item */
-    F1AP_SCell_ToBeSetup_Item_t *scell_toBeSetup_item=&scell_toBeSetup_item_ies->value.choice.SCell_ToBeSetup_Item;
-    /* 10.1.1 sCell_ID */
-    addnRCGI(scell_toBeSetup_item->sCell_ID, f1ap_ue_context_setup_req);
-    /* TODO correct MCC/MNC */
-    /* 10.1.2 sCellIndex */
-    scell_toBeSetup_item->sCellIndex = 3;  // issue here
+  /* optional */
+  if (0) {
+    /* c10. SCell_ToBeSetup_List */
+    asn1cSequenceAdd(out->protocolIEs.list, F1AP_UEContextSetupRequestIEs_t, ie10);
+    ie10->id = F1AP_ProtocolIE_ID_id_SCell_ToBeSetup_List;
+    ie10->criticality = F1AP_Criticality_ignore;
+    ie10->value.present = F1AP_UEContextSetupRequestIEs__value_PR_SCell_ToBeSetup_List;
+
+    for (int i = 0; i < 1; i++) {
+      asn1cSequenceAdd(ie10->value.choice.SCell_ToBeSetup_List.list, F1AP_SCell_ToBeSetup_ItemIEs_t, scell_toBeSetup_item_ies);
+      scell_toBeSetup_item_ies->id = F1AP_ProtocolIE_ID_id_SCell_ToBeSetup_Item; // 53
+      scell_toBeSetup_item_ies->criticality = F1AP_Criticality_ignore;
+      scell_toBeSetup_item_ies->value.present = F1AP_SCell_ToBeSetup_ItemIEs__value_PR_SCell_ToBeSetup_Item;
+      /* 10.1 SCell_ToBeSetup_Item */
+      F1AP_SCell_ToBeSetup_Item_t *scell_toBeSetup_item = &scell_toBeSetup_item_ies->value.choice.SCell_ToBeSetup_Item;
+      /* 10.1.1 sCell_ID */
+      addnRCGI(scell_toBeSetup_item->sCell_ID, f1ap_ue_context_setup_req);
+      /* TODO correct MCC/MNC */
+      /* 10.1.2 sCellIndex */
+      scell_toBeSetup_item->sCellIndex = 3; // issue here
 
-    /* OPTIONAL */
-    /* 10.1.3 sCellULConfigured*/
-    if (0) {
-      asn1cCallocOne(scell_toBeSetup_item->sCellULConfigured,
-                     F1AP_CellULConfigured_ul_and_sul); // enum
+      /* OPTIONAL */
+      /* 10.1.3 sCellULConfigured*/
+      if (0) {
+        asn1cCallocOne(scell_toBeSetup_item->sCellULConfigured,
+                       F1AP_CellULConfigured_ul_and_sul); // enum
+      }
     }
   }