spacesSSSSSSSS

git-svn-id: http://svn.eurecom.fr/openair4G/trunk@5291 818b1a75-f10b-46b9-bf7c-635c3b92a50f
This commit is contained in:
Lionel Gauthier
2014-04-24 15:05:27 +00:00
parent 43723e23c5
commit 996752e951
+21 -19
View File
@@ -274,28 +274,30 @@ boolean_t pdcp_data_req(
#if defined(ENABLE_SECURITY) #if defined(ENABLE_SECURITY)
if ((pdcp_p->security_activated != 0) && if ((pdcp_p->security_activated != 0) &&
(((pdcp_p->cipheringAlgorithm) != 0) || (((pdcp_p->cipheringAlgorithm) != 0) ||
((pdcp_p->integrityProtAlgorithm) != 0))) { ((pdcp_p->integrityProtAlgorithm) != 0))) {
if (enb_flagP == ENB_FLAG_NO) if (enb_flagP == ENB_FLAG_NO)
start_meas(&eNB_pdcp_stats[enb_mod_idP].apply_security); start_meas(&eNB_pdcp_stats[enb_mod_idP].apply_security);
else else
start_meas(&UE_pdcp_stats[ue_mod_idP].apply_security); start_meas(&UE_pdcp_stats[ue_mod_idP].apply_security);
pdcp_apply_security(pdcp_p, rb_idP % maxDRB, pdcp_apply_security(pdcp_p,
pdcp_header_len, current_sn, pdcp_pdu_p->data, rb_idP % maxDRB,
sdu_buffer_sizeP); pdcp_header_len,
if (enb_flagP == ENB_FLAG_NO) current_sn,
stop_meas(&eNB_pdcp_stats[enb_mod_idP].apply_security); pdcp_pdu_p->data,
else sdu_buffer_sizeP);
stop_meas(&UE_pdcp_stats[ue_mod_idP].apply_security);
if (enb_flagP == ENB_FLAG_NO)
stop_meas(&eNB_pdcp_stats[enb_mod_idP].apply_security);
else
stop_meas(&UE_pdcp_stats[ue_mod_idP].apply_security);
} }
LOG_D(PDCP,"MAC_I is %02x.%02x.%02x.%02x\n",
LOG_D(PDCP,"MAC_I is %02x.%02x.%02x.%02x\n", pdcp_pdu_p->data[pdcp_header_len + sdu_buffer_sizeP ],
pdcp_pdu_p->data[pdcp_header_len + sdu_buffer_sizeP ], pdcp_pdu_p->data[pdcp_header_len + sdu_buffer_sizeP +1],
pdcp_pdu_p->data[pdcp_header_len + sdu_buffer_sizeP +1], pdcp_pdu_p->data[pdcp_header_len + sdu_buffer_sizeP +2],
pdcp_pdu_p->data[pdcp_header_len + sdu_buffer_sizeP +2], pdcp_pdu_p->data[pdcp_header_len + sdu_buffer_sizeP +3]);
pdcp_pdu_p->data[pdcp_header_len + sdu_buffer_sizeP +3]);
#endif #endif
/* Print octets of outgoing data in hexadecimal form */ /* Print octets of outgoing data in hexadecimal form */