Added comments to show MRDC and free() hacks

openair2/RRC/LTE/rrc_UE.c

@@ -1714,7 +1714,7 @@ rrc_ue_process_nrueCapabilityEnquiry(
   OCTET_STRING_fromBuf(&ue_CapabilityRAT_Container.ue_CapabilityRAT_Container,
                        (const char *)nrue_cap_info->mesg,
                        nrue_cap_info->mesg_len);
-
+  # if(1) //Melissa: This is a hack. The MRDC capabilites should be filled in the NR UE
   NR_UE_CapabilityRAT_Container_t ue_CapabilityRAT_Container_mrdc;
   memset(&ue_CapabilityRAT_Container_mrdc, 0, sizeof(ue_CapabilityRAT_Container_mrdc));
   uint8_t buffer_mrdc[RRC_BUF_SIZE];
@@ -1733,7 +1733,7 @@ rrc_ue_process_nrueCapabilityEnquiry(
   OCTET_STRING_fromBuf(&ue_CapabilityRAT_Container_mrdc.ue_CapabilityRAT_Container,
                        (const char *)buffer_mrdc,
                        (enc_rval_mrdc.encoded + 7) / 8);
-
+  #endif
 
   ue_cap->criticalExtensions.present           = LTE_UECapabilityInformation__criticalExtensions_PR_c1;
   ue_cap->criticalExtensions.choice.c1.present = LTE_UECapabilityInformation__criticalExtensions__c1_PR_ueCapabilityInformation_r8;

openair2/X2AP/x2ap_eNB_generate_messages.c

@@ -1731,7 +1731,9 @@ int x2ap_eNB_generate_ENDC_x2_SgNB_addition_request(
         X2AP_ERROR("Failed to encode ENDC X2 SgNB_addition request message\n");
         return -1;
     }
-	//free(ie->value.choice.MeNBtoSgNBContainer.buf);
+    # if 0 //Melissa: This is a hack becasue we are trying to access this after free.
+	free(ie->value.choice.MeNBtoSgNBContainer.buf);
+    #endif
     MSC_LOG_TX_MESSAGE (MSC_X2AP_SRC_ENB, MSC_X2AP_TARGET_ENB, NULL, 0, "0 X2Setup/initiatingMessage assoc_id %u", x2ap_eNB_data_p->assoc_id);
 
     x2ap_eNB_itti_send_sctp_data_req(instance_p->instance, x2ap_eNB_data_p->assoc_id, buffer, len, 0);