nas_rrc task

executables/nr-uesoftmodem.c

@@ -786,6 +786,16 @@ int main( int argc, char **argv ) {
   // wait for end of program
   printf("TYPE <CTRL-C> TO TERMINATE\n");
 
+  MessageDef  *msg_p;
+  msg_p = itti_alloc_new_message(TASK_RRC_UE, NAS_CELL_SELECTION_CNF);
+  NAS_CELL_SELECTION_CNF (msg_p).errCode = AS_SUCCESS;
+  NAS_CELL_SELECTION_CNF (msg_p).cellID = 0;
+  NAS_CELL_SELECTION_CNF (msg_p).tac = 0;
+  NAS_CELL_SELECTION_CNF (msg_p).rat = 0xFF;
+  NAS_CELL_SELECTION_CNF (msg_p).rsrq = 0;
+  NAS_CELL_SELECTION_CNF (msg_p).rsrp = 0;
+  itti_send_msg_to_task(TASK_NAS_UE, 0, msg_p);
+
   while(true)
     sleep(3600);
 

openair2/RRC/NR/MESSAGES/asn1_msg.c

@@ -1260,3 +1260,16 @@ int do_DLInformationTransfer_NR (void * p) {
 	return 0;
 }
 
+
+uint8_t do_NR_ULInformationTransfer(uint8_t **buffer, uint32_t pdu_length, uint8_t *pdu_buffer) {
+  ssize_t encoded;
+  NR_UL_DCCH_Message_t ul_dcch_msg;
+  memset(&ul_dcch_msg, 0, sizeof(NR_UL_DCCH_Message_t));
+  ul_dcch_msg.message.present           = NR_UL_DCCH_MessageType_PR_c1;
+  ul_dcch_msg.message.choice.c1->present = NR_UL_DCCH_MessageType__c1_PR_ulInformationTransfer;
+  ul_dcch_msg.message.choice.c1->choice.ulInformationTransfer->criticalExtensions.present = NR_ULInformationTransfer__criticalExtensions_PR_ulInformationTransfer;
+  ul_dcch_msg.message.choice.c1->choice.ulInformationTransfer->criticalExtensions.choice.ulInformationTransfer->dedicatedNAS_Message->size = pdu_length;
+  ul_dcch_msg.message.choice.c1->choice.ulInformationTransfer->criticalExtensions.choice.ulInformationTransfer->dedicatedNAS_Message->buf = pdu_buffer;
+  encoded = uper_encode_to_new_buffer (&asn_DEF_NR_UL_DCCH_Message, NULL, (void *) &ul_dcch_msg, (void **) buffer);
+  return encoded;
+}
\ No newline at end of file

openair2/RRC/NR/MESSAGES/asn1_msg.h

@@ -126,3 +126,9 @@ uint8_t do_NR_RRCReconfigurationComplete(
                         uint8_t *buffer,
                         const uint8_t Transaction_id
                       );
+
+uint8_t do_NR_ULInformationTransfer(
+                        uint8_t **buffer, 
+                        uint32_t pdu_length, 
+                        uint8_t *pdu_buffer
+                      );

openair2/RRC/NR_UE/rrc_UE.c

@@ -1529,7 +1529,25 @@ int8_t nr_rrc_ue_decode_NR_DL_DCCH_Message(
           
           case NR_DL_DCCH_MessageType__c1_PR_rrcReestablishment:
           case NR_DL_DCCH_MessageType__c1_PR_securityModeCommand:
-          case NR_DL_DCCH_MessageType__c1_PR_dlInformationTransfer:
+          case NR_DL_DCCH_MessageType__c1_PR_dlInformationTransfer: {
+          //不对应
+          //NR_UL_DCCH_MessageType__c1_PR_ulInformationTransfer=8
+            if(nr_dl_dcch_msg->message.choice.c1->choice.dlInformationTransfer->criticalExtensions.present == NR_DLInformationTransfer__criticalExtensions_PR_dlInformationTransfer){
+              uint32_t pdu_length;
+              uint8_t *pdu_buffer;
+              MessageDef *msg_p;
+              pdu_length = nr_dl_dcch_msg->message.choice.c1->choice.dlInformationTransfer->criticalExtensions.choice.dlInformationTransfer->dedicatedNAS_Message->size;
+              pdu_buffer = nr_dl_dcch_msg->message.choice.c1->choice.dlInformationTransfer->criticalExtensions.choice.dlInformationTransfer->dedicatedNAS_Message->buf;
+              msg_p = itti_alloc_new_message(TASK_RRC_UE, NAS_DOWNLINK_DATA_IND);
+              // NAS_DOWNLINK_DATA_IND(msg_p).UEid = ctxt_pP->module_id; // TODO set the UEid to something else ?
+              NAS_DOWNLINK_DATA_IND(msg_p).UEid = 0;
+              NAS_DOWNLINK_DATA_IND(msg_p).nasMsg.length = pdu_length;
+              NAS_DOWNLINK_DATA_IND(msg_p).nasMsg.data = pdu_buffer;
+              // itti_send_msg_to_task(TASK_NAS_UE, ctxt_pP->instance, msg_p);
+              itti_send_msg_to_task(TASK_NAS_UE, 0, msg_p);
+              }
+            break;
+            }
           case NR_DL_DCCH_MessageType__c1_PR_ueCapabilityEnquiry:
           case NR_DL_DCCH_MessageType__c1_PR_counterCheck:
           case NR_DL_DCCH_MessageType__c1_PR_mobilityFromNRCommand:
@@ -2445,7 +2463,7 @@ void *rrc_nrue_task( void *args_p ) {
         uint8_t *buffer;
         LOG_D(RRC, "[UE %d] Received %s: UEid %d\n", ue_mod_id, ITTI_MSG_NAME (msg_p), NAS_UPLINK_DATA_REQ (msg_p).UEid);
         /* Create message for PDCP (ULInformationTransfer_t) */
-        length = do_ULInformationTransfer(&buffer, NAS_UPLINK_DATA_REQ (msg_p).nasMsg.length, NAS_UPLINK_DATA_REQ (msg_p).nasMsg.data);//QUES:
+        length = do_NR_ULInformationTransfer(&buffer, NAS_UPLINK_DATA_REQ (msg_p).nasMsg.length, NAS_UPLINK_DATA_REQ (msg_p).nasMsg.data);//QUES:
         break;
       }