Skip to content

O
OpenXG-RAN
Commit f3bd3ec4 authored by Robert Schmidt's avatar Robert Schmidt
Browse files
Options

Merge remote-tracking branch... 

Merge remote-tracking branch 'origin/add-registration-accept-inside-nas-downlink' into integration_2023_w38
parents 3ad4c850 4219839e
Hide whitespace changes
Inline Side-by-side
Showing with 50 additions and 32 deletions
openair3/NAS/NR_UE/nr_nas_msg_sim.c
View file @ f3bd3ec4
...@@ -980,16 +980,14 @@ void *nas_nrue_task(void *args_p) ...@@ -980,16 +980,14 @@ void *nas_nrue_task(void *args_p)
LOG_I(NAS, "[UE] Received REGISTRATION ACCEPT message\n"); LOG_I(NAS, "[UE] Received REGISTRATION ACCEPT message\n");
decodeRegistrationAccept(pdu_buffer, NAS_CONN_ESTABLI_CNF(msg_p).nasMsg.length, nas); decodeRegistrationAccept(pdu_buffer, NAS_CONN_ESTABLI_CNF(msg_p).nasMsg.length, nas);
as_nas_info_t initialNasMsg; as_nas_info_t initialNasMsg = {0};
memset(&initialNasMsg, 0, sizeof(as_nas_info_t));
generateRegistrationComplete(nas, &initialNasMsg, NULL); generateRegistrationComplete(nas, &initialNasMsg, NULL);
if (initialNasMsg.length > 0) { if (initialNasMsg.length > 0) {
send_nas_uplink_data_req(instance, &initialNasMsg); send_nas_uplink_data_req(instance, &initialNasMsg);
LOG_I(NAS, "Send NAS_UPLINK_DATA_REQ message(RegistrationComplete)\n"); LOG_I(NAS, "Send NAS_UPLINK_DATA_REQ message(RegistrationComplete)\n");
} }
as_nas_info_t pduEstablishMsg; as_nas_info_t pduEstablishMsg = {0};
memset(&pduEstablishMsg, 0, sizeof(as_nas_info_t));
generatePduSessionEstablishRequest(nas, &pduEstablishMsg); generatePduSessionEstablishRequest(nas, &pduEstablishMsg);
if (pduEstablishMsg.length > 0) { if (pduEstablishMsg.length > 0) {
send_nas_uplink_data_req(instance, &pduEstablishMsg); send_nas_uplink_data_req(instance, &pduEstablishMsg);
...@@ -1060,37 +1058,57 @@ void *nas_nrue_task(void *args_p) ...@@ -1060,37 +1058,57 @@ void *nas_nrue_task(void *args_p)
case FGS_DOWNLINK_NAS_TRANSPORT: case FGS_DOWNLINK_NAS_TRANSPORT:
decodeDownlinkNASTransport(&initialNasMsg, pdu_buffer); decodeDownlinkNASTransport(&initialNasMsg, pdu_buffer);
break; break;
case REGISTRATION_ACCEPT:
LOG_I(NAS, "[UE] Received REGISTRATION ACCEPT message\n");
decodeRegistrationAccept(pdu_buffer, NAS_DOWNLINK_DATA_IND(msg_p).nasMsg.length, nas);
as_nas_info_t initialNasMsg = {0};
generateRegistrationComplete(nas, &initialNasMsg, NULL);
if (initialNasMsg.length > 0) {
send_nas_uplink_data_req(instance, &initialNasMsg);
LOG_I(NAS, "Send NAS_UPLINK_DATA_REQ message(RegistrationComplete)\n");
}
as_nas_info_t pduEstablishMsg = {0};
generatePduSessionEstablishRequest(nas, &pduEstablishMsg);
if (pduEstablishMsg.length > 0) {
send_nas_uplink_data_req(instance, &pduEstablishMsg);
LOG_I(NAS, "Send NAS_UPLINK_DATA_REQ message(PduSessionEstablishRequest)\n");
}
break;
case FGS_DEREGISTRATION_ACCEPT: case FGS_DEREGISTRATION_ACCEPT:
LOG_I(NAS, "received deregistration accept\n"); LOG_I(NAS, "received deregistration accept\n");
break; break;
case FGS_PDU_SESSION_ESTABLISHMENT_ACC: case FGS_PDU_SESSION_ESTABLISHMENT_ACC: {
{ uint8_t offset = 0;
uint8_t offset = 0; uint8_t *payload_container = pdu_buffer;
uint8_t *payload_container = pdu_buffer; offset += SECURITY_PROTECTED_5GS_NAS_MESSAGE_HEADER_LENGTH;
offset += SECURITY_PROTECTED_5GS_NAS_MESSAGE_HEADER_LENGTH; uint32_t payload_container_length = htons(((dl_nas_transport_t *)(pdu_buffer + offset))->payload_container_length);
uint32_t payload_container_length = htons(((dl_nas_transport_t *)(pdu_buffer + offset))->payload_container_length); if ((payload_container_length >= PAYLOAD_CONTAINER_LENGTH_MIN)
if ((payload_container_length >= PAYLOAD_CONTAINER_LENGTH_MIN) && && (payload_container_length <= PAYLOAD_CONTAINER_LENGTH_MAX))
(payload_container_length <= PAYLOAD_CONTAINER_LENGTH_MAX)) offset += (PLAIN_5GS_NAS_MESSAGE_HEADER_LENGTH + 3);
offset += (PLAIN_5GS_NAS_MESSAGE_HEADER_LENGTH + 3); if (offset < NAS_CONN_ESTABLI_CNF(msg_p).nasMsg.length)
if (offset < NAS_CONN_ESTABLI_CNF(msg_p).nasMsg.length) payload_container = pdu_buffer + offset;
payload_container = pdu_buffer + offset;
while (offset < payload_container_length) {
while(offset < payload_container_length) { if (*(payload_container + offset) == 0x29) { // PDU address IEI
if (*(payload_container + offset) == 0x29) { // PDU address IEI if ((*(payload_container + offset + 1) == 0x05) && (*(payload_container + offset + 2) == 0x01)) { // IPV4
if ((*(payload_container+offset+1) == 0x05) && (*(payload_container +offset+2) == 0x01)) { // IPV4 nas_getparams();
nas_getparams(); sprintf(baseNetAddress, "%d.%d", *(payload_container + offset + 3), *(payload_container + offset + 4));
sprintf(baseNetAddress, "%d.%d", *(payload_container+offset+3), *(payload_container+offset+4)); int third_octet = *(payload_container + offset + 5);
int third_octet = *(payload_container+offset+5); int fourth_octet = *(payload_container + offset + 6);
int fourth_octet = *(payload_container+offset+6); LOG_I(NAS,
LOG_I(NAS, "Received PDU Session Establishment Accept, UE IP: %d.%d.%d.%d\n", "Received PDU Session Establishment Accept, UE IP: %d.%d.%d.%d\n",
*(payload_container+offset+3), *(payload_container+offset+4), *(payload_container + offset + 3),
*(payload_container+offset+5), *(payload_container+offset+6)); *(payload_container + offset + 4),
nas_config(1,third_octet,fourth_octet,"oaitun_ue"); *(payload_container + offset + 5),
break; *(payload_container + offset + 6));
} nas_config(1, third_octet, fourth_octet, "oaitun_ue");
} break;
offset++; }
} }
offset++;
}
} }
break; break;
default: default:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment