Commit 8f425f9e authored by Yangxiong Peng's avatar Yangxiong Peng Committed by jperaldi

Issue#28: Support of LTTCNG on new 4G repository 4G_Oai4Test_Delivery from Firecell

parent 674ff9d2
...@@ -323,6 +323,8 @@ uint8_t do_MIB(rrc_eNB_carrier_data_t *carrier, uint32_t N_RB_DL, uint32_t phich ...@@ -323,6 +323,8 @@ uint8_t do_MIB(rrc_eNB_carrier_data_t *carrier, uint32_t N_RB_DL, uint32_t phich
(void *)mib, (void *)mib,
carrier->MIB, carrier->MIB,
24); 24);
LOG_P(RRC, "BCCH_BCH_Message", (uint8_t *)carrier->MIB, 24);
AssertFatal (enc_rval.encoded > 0, "ASN1 message encoding failed (%s, %lu)!\n", AssertFatal (enc_rval.encoded > 0, "ASN1 message encoding failed (%s, %lu)!\n",
enc_rval.failed_type->name, enc_rval.encoded); enc_rval.failed_type->name, enc_rval.encoded);
...@@ -1215,6 +1217,8 @@ uint8_t do_SIB1(rrc_eNB_carrier_data_t *carrier, ...@@ -1215,6 +1217,8 @@ uint8_t do_SIB1(rrc_eNB_carrier_data_t *carrier,
(void *)bcch_message, (void *)bcch_message,
buffer, buffer,
100); 100);
LOG_P(RRC, "BCCH_DL_SCH_Message", (uint8_t *)buffer, 100);
AssertFatal (enc_rval.encoded > 0, "ASN1 message encoding failed (%s, %lu)!\n", AssertFatal (enc_rval.encoded > 0, "ASN1 message encoding failed (%s, %lu)!\n",
enc_rval.failed_type->name, enc_rval.encoded); enc_rval.failed_type->name, enc_rval.encoded);
LOG_D(RRC,"[eNB] SystemInformationBlockType1 Encoded %zd bits (%zd bytes)\n",enc_rval.encoded,(enc_rval.encoded+7)/8); LOG_D(RRC,"[eNB] SystemInformationBlockType1 Encoded %zd bits (%zd bytes)\n",enc_rval.encoded,(enc_rval.encoded+7)/8);
...@@ -2849,7 +2853,7 @@ do_RRCConnectionSetup( ...@@ -2849,7 +2853,7 @@ do_RRCConnectionSetup(
(void *)&dl_ccch_msg, (void *)&dl_ccch_msg,
buffer, buffer,
100); 100);
LOG_P(RRC, "DL_CCCH_Message", buffer, 100);
if(enc_rval.encoded == -1) { if(enc_rval.encoded == -1) {
LOG_I(RRC, "[eNB AssertFatal]ASN1 message encoding failed (%s, %lu)!\n", LOG_I(RRC, "[eNB AssertFatal]ASN1 message encoding failed (%s, %lu)!\n",
enc_rval.failed_type->name, enc_rval.encoded); enc_rval.failed_type->name, enc_rval.encoded);
......
...@@ -673,6 +673,9 @@ static int rrc_eNB_process_SS_PAGING_IND(MessageDef *msg_p, const char *msg_name ...@@ -673,6 +673,9 @@ static int rrc_eNB_process_SS_PAGING_IND(MessageDef *msg_p, const char *msg_name
LOG_I(RRC, "do_Paging error"); LOG_I(RRC, "do_Paging error");
return -1; return -1;
} }
LOG_P(RRC, "PCCH_Message", buffer, length);
message_buffer = itti_malloc(TASK_RRC_ENB, TASK_PDCP_ENB, length); message_buffer = itti_malloc(TASK_RRC_ENB, TASK_PDCP_ENB, length);
/* Uses a new buffer to avoid issue with PDCP buffer content that could be changed by PDCP (asynchronous message handling). */ /* Uses a new buffer to avoid issue with PDCP buffer content that could be changed by PDCP (asynchronous message handling). */
memcpy(message_buffer, buffer, length); memcpy(message_buffer, buffer, length);
...@@ -7736,6 +7739,7 @@ rrc_eNB_decode_ccch( ...@@ -7736,6 +7739,7 @@ rrc_eNB_decode_ccch(
PROTOCOL_RRC_CTXT_UE_ARGS(ctxt_pP)); PROTOCOL_RRC_CTXT_UE_ARGS(ctxt_pP));
return -1; return -1;
} }
//LOG_P(RRC, "UL CCCH:", buffer, buffer_length);
if (ul_ccch_msg->message.present == LTE_UL_CCCH_MessageType_PR_c1) { if (ul_ccch_msg->message.present == LTE_UL_CCCH_MessageType_PR_c1) {
switch (ul_ccch_msg->message.choice.c1.present) { switch (ul_ccch_msg->message.choice.c1.present) {
...@@ -8481,12 +8485,14 @@ rrc_eNB_decode_dcch( ...@@ -8481,12 +8485,14 @@ rrc_eNB_decode_dcch(
0, 0,
0); 0);
{ {
LOG_A (RRC, "UL-DCCH: ");
for (i = 0; i < sdu_sizeP; i++) { for (i = 0; i < sdu_sizeP; i++) {
LOG_T(RRC, "%x.", Rx_sdu[i]); LOG_T(RRC, "%x.", Rx_sdu[i]);
} }
LOG_T(RRC, "\n"); LOG_T(RRC, "\n");
} }
//LOG_P(RRC, "UL DCCH:", Rx_sdu, sdu_sizeP);
if ((dec_rval.code != RC_OK) && (dec_rval.consumed == 0)) { if ((dec_rval.code != RC_OK) && (dec_rval.consumed == 0)) {
LOG_E(RRC, PROTOCOL_RRC_CTXT_UE_FMT" Failed to decode UL-DCCH (%zu bytes)\n", LOG_E(RRC, PROTOCOL_RRC_CTXT_UE_FMT" Failed to decode UL-DCCH (%zu bytes)\n",
...@@ -9048,6 +9054,7 @@ rrc_eNB_decode_dcch( ...@@ -9048,6 +9054,7 @@ rrc_eNB_decode_dcch(
if ( LOG_DEBUGFLAG(DEBUG_ASN1) ) { if ( LOG_DEBUGFLAG(DEBUG_ASN1) ) {
xer_fprint(stdout, &asn_DEF_LTE_UE_EUTRA_Capability, ue_context_p->ue_context.UE_Capability); xer_fprint(stdout, &asn_DEF_LTE_UE_EUTRA_Capability, ue_context_p->ue_context.UE_Capability);
} }
//LOG_P(RRC, "UE_EUTRA_Capability:", ul_dcch_msg->message.choice.c1.choice.ueCapabilityInformation.criticalExtensions.choice.c1.choice.ueCapabilityInformation_r8.ue_CapabilityRAT_ContainerList.list.array[eutra_index]->ueCapabilityRAT_Container.buf, ul_dcch_msg->message.choice.c1.choice.ueCapabilityInformation.criticalExtensions.choice.c1.choice.ueCapabilityInformation_r8.ue_CapabilityRAT_ContainerList.list.array[eutra_index]->ueCapabilityRAT_Container.size);
if ((dec_rval.code != RC_OK) && (dec_rval.consumed == 0)) { if ((dec_rval.code != RC_OK) && (dec_rval.consumed == 0)) {
LOG_E(RRC, PROTOCOL_RRC_CTXT_UE_FMT" Failed to decode UE capabilities (%zu bytes)\n", LOG_E(RRC, PROTOCOL_RRC_CTXT_UE_FMT" Failed to decode UE capabilities (%zu bytes)\n",
......
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
#include "assertions.h" #include "assertions.h"
#include "common/utils/system.h" #include "common/utils/system.h"
#include "common/utils/LOG/ss-log.h"
#include "queue.h" #include "queue.h"
#include "sctp_common.h" #include "sctp_common.h"
...@@ -80,7 +81,7 @@ typedef enum ...@@ -80,7 +81,7 @@ typedef enum
static unsigned char *buffer = NULL; static unsigned char *buffer = NULL;
static const size_t size = 16 * 1024; static const size_t size = 16 * 1024;
uint8_t lttng_sdu[SDU_SIZE];
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
/* /*
...@@ -146,6 +147,8 @@ static void ss_send_srb_data(ss_rrc_pdu_ind_t *pdu_ind) ...@@ -146,6 +147,8 @@ static void ss_send_srb_data(ss_rrc_pdu_ind_t *pdu_ind)
pdu_ind->sdu_size, pdu_ind->sdu_size,
0, 0,
0); 0);
memcpy(lttng_sdu, pdu_ind->sdu, pdu_ind->sdu_size);
LOG_P(RRC, "UL_CCCH_Message", lttng_sdu, pdu_ind->sdu_size);
xer_fprint(stdout, &asn_DEF_LTE_UL_CCCH_Message, (void *)ul_ccch_msg); xer_fprint(stdout, &asn_DEF_LTE_UL_CCCH_Message, (void *)ul_ccch_msg);
ind.RrcPdu.d = RRC_MSG_Indication_Type_Ccch; ind.RrcPdu.d = RRC_MSG_Indication_Type_Ccch;
...@@ -164,6 +167,8 @@ static void ss_send_srb_data(ss_rrc_pdu_ind_t *pdu_ind) ...@@ -164,6 +167,8 @@ static void ss_send_srb_data(ss_rrc_pdu_ind_t *pdu_ind)
0); 0);
xer_fprint(stdout, &asn_DEF_LTE_UL_DCCH_Message, (void *)ul_dcch_msg); xer_fprint(stdout, &asn_DEF_LTE_UL_DCCH_Message, (void *)ul_dcch_msg);
memcpy(lttng_sdu, pdu_ind->sdu, pdu_ind->sdu_size);
LOG_P(RRC, "UL_DCCH_Message", lttng_sdu, pdu_ind->sdu_size);
ind.RrcPdu.d = RRC_MSG_Indication_Type_Dcch; ind.RrcPdu.d = RRC_MSG_Indication_Type_Dcch;
ind.RrcPdu.v.Dcch.d = pdu_ind->sdu_size; ind.RrcPdu.v.Dcch.d = pdu_ind->sdu_size;
ind.RrcPdu.v.Dcch.v = pdu_ind->sdu; ind.RrcPdu.v.Dcch.v = pdu_ind->sdu;
...@@ -227,6 +232,8 @@ static void ss_task_handle_rrc_pdu_req(struct EUTRA_RRC_PDU_REQ *req) ...@@ -227,6 +232,8 @@ static void ss_task_handle_rrc_pdu_req(struct EUTRA_RRC_PDU_REQ *req)
SS_RRC_PDU_REQ(message_p).sdu_size,0,0); SS_RRC_PDU_REQ(message_p).sdu_size,0,0);
xer_fprint(stdout,&asn_DEF_LTE_DL_CCCH_Message,(void *)dl_ccch_msg); xer_fprint(stdout,&asn_DEF_LTE_DL_CCCH_Message,(void *)dl_ccch_msg);
memcpy(lttng_sdu, SS_RRC_PDU_REQ(message_p).sdu, SS_RRC_PDU_REQ(message_p).sdu_size);
LOG_P(RRC, "DL_CCCH_Message", lttng_sdu, SS_RRC_PDU_REQ(message_p).sdu_size);
} }
else else
{ {
...@@ -239,6 +246,9 @@ static void ss_task_handle_rrc_pdu_req(struct EUTRA_RRC_PDU_REQ *req) ...@@ -239,6 +246,9 @@ static void ss_task_handle_rrc_pdu_req(struct EUTRA_RRC_PDU_REQ *req)
SS_RRC_PDU_REQ(message_p).sdu_size,0,0); SS_RRC_PDU_REQ(message_p).sdu_size,0,0);
xer_fprint(stdout,&asn_DEF_LTE_DL_DCCH_Message,(void *)dl_dcch_msg); xer_fprint(stdout,&asn_DEF_LTE_DL_DCCH_Message,(void *)dl_dcch_msg);
memcpy(lttng_sdu, SS_RRC_PDU_REQ(message_p).sdu, SS_RRC_PDU_REQ(message_p).sdu_size);
LOG_P(RRC, "DL_DCCH_Message", lttng_sdu, SS_RRC_PDU_REQ(message_p).sdu_size);
} }
LOG_A(ENB_SS, "[SS_SRB][EUTRA_RRC_PDU_REQ] sending to TASK_RRC_ENB: {srb: %d, ch: %s, qty: %d rnti %d}\n", LOG_A(ENB_SS, "[SS_SRB][EUTRA_RRC_PDU_REQ] sending to TASK_RRC_ENB: {srb: %d, ch: %s, qty: %d rnti %d}\n",
......
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