Commit 07656305 authored by Siddharth Rana's avatar Siddharth Rana Committed by Vijay Chadachan

Rebasing from 3GPP_TTCN_System_Simulator Commit cb6c8eaf097bf6d6c2cdfb4f1e4e684e287e31c8

parent 62d14b23
......@@ -498,6 +498,11 @@ int32_t write_file_matlab(const char *fname, const char *vname, void *data, int
LOG_SS_PKT(PKT, _string, buf, len); \
} } while(0)
# define LOG_NAS_P(lvl, _string, buf, len) do { \
if(g_log->log_component[PKT].level >= lvl) { \
LOG_SS_NAS_PKT(PKT, _string, buf, len); \
} } while(0)
# define LOG_MAC_P(lvl, _string, sfn, sf, mac_pack_info, buf, len) do { \
if(g_log->log_component[PKT].level >= lvl) { \
LOG_SS_MAC_PKT(PKT, _string, sfn, sf, mac_pack_info, buf, len); \
......
......@@ -64,6 +64,12 @@
g_log->sf, _string, buf, len); \
} while(0)
#define LOG_SS_NAS_PKT(component, _string, buf, len) do { \
tracepoint(SSeNB, SS_PKT, \
"SS-NR-NAS-PDU", -1, g_log->sfn, \
g_log->sf, _string, buf, len); \
} while(0)
#define LOG_SS_MAC_PKT(component, _string, sfn, sf, mac_pack_info, buf, len) do { \
tracepoint(SSeNB, SS_MAC_PKT, \
"SS-MAC-PDU", -1, sfn, sf, \
......
......@@ -395,6 +395,11 @@ rrc_gNB_send_NGAP_NAS_FIRST_REQ(
/* Forward NAS message */
NGAP_NAS_FIRST_REQ(message_p).nas_pdu.buffer = rrcSetupComplete->dedicatedNAS_Message.buf;
NGAP_NAS_FIRST_REQ(message_p).nas_pdu.length = rrcSetupComplete->dedicatedNAS_Message.size;
if(RC.ss.mode == SS_GNB)
{
LOG_NAS_P(OAILOG_INFO, "NR_NAS_PDU", rrcSetupComplete->dedicatedNAS_Message.buf, rrcSetupComplete->dedicatedNAS_Message.size);
}
// extract_imsi(NGAP_NAS_FIRST_REQ (message_p).nas_pdu.buffer,
// NGAP_NAS_FIRST_REQ (message_p).nas_pdu.length,
// ue_context_pP);
......@@ -560,6 +565,10 @@ rrc_gNB_process_NGAP_INITIAL_CONTEXT_SETUP_REQ(
ue_context_p->ue_context.nas_pdu_flag = NGAP_INITIAL_CONTEXT_SETUP_REQ(msg_p).nas_pdu_flag;
ue_context_p->ue_context.nas_pdu.length = NGAP_INITIAL_CONTEXT_SETUP_REQ(msg_p).nas_pdu.length;
ue_context_p->ue_context.nas_pdu.buffer = NGAP_INITIAL_CONTEXT_SETUP_REQ(msg_p).nas_pdu.buffer;
if(RC.ss.mode == SS_GNB)
{
LOG_NAS_P(OAILOG_INFO, "NR_NAS_PDU", NGAP_INITIAL_CONTEXT_SETUP_REQ(msg_p).nas_pdu.buffer, NGAP_INITIAL_CONTEXT_SETUP_REQ(msg_p).nas_pdu.length);
}
}
/* security */
......@@ -780,6 +789,11 @@ rrc_gNB_process_NGAP_DOWNLINK_NAS(
NGAP_NAS_NON_DELIVERY_IND (msg_fail_p).gNB_ue_ngap_id = gNB_ue_ngap_id;
NGAP_NAS_NON_DELIVERY_IND (msg_fail_p).nas_pdu.length = NGAP_DOWNLINK_NAS (msg_p).nas_pdu.length;
NGAP_NAS_NON_DELIVERY_IND (msg_fail_p).nas_pdu.buffer = NGAP_DOWNLINK_NAS (msg_p).nas_pdu.buffer;
if(RC.ss.mode == SS_GNB)
{
LOG_NAS_P(OAILOG_INFO, "NR_NAS_PDU", NGAP_DOWNLINK_NAS (msg_p).nas_pdu.buffer, NGAP_DOWNLINK_NAS (msg_p).nas_pdu.length);
}
// TODO add failure cause when defined!
itti_send_msg_to_task (TASK_NGAP, instance, msg_fail_p);
return (-1);
......@@ -791,6 +805,10 @@ rrc_gNB_process_NGAP_DOWNLINK_NAS(
ue_context_p->ue_context.gNB_ue_ngap_id = NGAP_DOWNLINK_NAS (msg_p).gNB_ue_ngap_id;
}
if(RC.ss.mode == SS_GNB)
{
LOG_NAS_P(OAILOG_INFO, "NR_NAS_PDU", NGAP_DOWNLINK_NAS (msg_p).nas_pdu.buffer, NGAP_DOWNLINK_NAS (msg_p).nas_pdu.length);
}
/* Create message for PDCP (DLInformationTransfer_t) */
length = do_NR_DLInformationTransfer (
instance,
......@@ -863,6 +881,10 @@ rrc_gNB_send_NGAP_UPLINK_NAS(
NGAP_UPLINK_NAS (msg_p).gNB_ue_ngap_id = ue_context_pP->ue_context.gNB_ue_ngap_id;
NGAP_UPLINK_NAS (msg_p).nas_pdu.length = pdu_length;
NGAP_UPLINK_NAS (msg_p).nas_pdu.buffer = pdu_buffer;
if(RC.ss.mode == SS_GNB)
{
LOG_NAS_P(OAILOG_INFO, "NR_NAS_PDU", pdu_buffer, pdu_length);
}
// extract_imsi(NGAP_UPLINK_NAS (msg_p).nas_pdu.buffer,
// NGAP_UPLINK_NAS (msg_p).nas_pdu.length,
// ue_context_pP);
......@@ -1170,6 +1192,11 @@ rrc_gNB_process_NGAP_PDUSESSION_MODIFY_REQ(
NGAP_PDUSESSION_MODIFY_REQ(msg_p).pdusession_modify_params[i].nas_pdu.buffer;
ue_context_p->ue_context.modify_pdusession[i].param.nas_pdu.length =
NGAP_PDUSESSION_MODIFY_REQ(msg_p).pdusession_modify_params[i].nas_pdu.length;
if(RC.ss.mode == SS_GNB)
{
LOG_NAS_P(OAILOG_INFO, "NR_NAS_PDU", NGAP_PDUSESSION_MODIFY_REQ(msg_p).pdusession_modify_params[i].nas_pdu.buffer,
NGAP_PDUSESSION_MODIFY_REQ(msg_p).pdusession_modify_params[i].nas_pdu.length);
}
}
// Save new pdu session parameters, qos, upf addr, teid
for (qos_flow_index = 0; qos_flow_index < NGAP_PDUSESSION_MODIFY_REQ(msg_p).pdusession_modify_params[i].nb_qos; qos_flow_index++) {
......@@ -1676,6 +1703,10 @@ rrc_gNB_process_NGAP_PDUSESSION_RELEASE_COMMAND(
if(pdusession_release_drb > 0) {
//TODO RRCReconfiguration To UE
LOG_I(NR_RRC, "Send RRCReconfiguration To UE \n");
if(RC.ss.mode == SS_GNB)
{
LOG_NAS_P(OAILOG_INFO, "NR_NAS_PDU", NGAP_PDUSESSION_RELEASE_COMMAND (msg_p).nas_pdu.buffer, NGAP_PDUSESSION_RELEASE_COMMAND (msg_p).nas_pdu.length);
}
rrc_gNB_generate_dedicatedRRCReconfiguration_release(&ctxt, ue_context_p, xid, NGAP_PDUSESSION_RELEASE_COMMAND (msg_p).nas_pdu.length, NGAP_PDUSESSION_RELEASE_COMMAND (msg_p).nas_pdu.buffer);
} else {
//gtp tunnel delete
......
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