From 4bfe3b47b6ade4275b8adff019dffce82873ec0e Mon Sep 17 00:00:00 2001 From: winckel <winckel@eurecom.fr> Date: Wed, 29 Jan 2014 10:49:24 +0000 Subject: [PATCH] Corrected NAS direction for UE message logging. git-svn-id: http://svn.eurecom.fr/openair4G/trunk@4983 818b1a75-f10b-46b9-bf7c-635c3b92a50f --- .../EURECOM-NAS/src/api/network/nas_message.c | 26 ++++++++++++++++--- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/openair-cn/NAS/EURECOM-NAS/src/api/network/nas_message.c b/openair-cn/NAS/EURECOM-NAS/src/api/network/nas_message.c index da498586f7..eacc63760d 100644 --- a/openair-cn/NAS/EURECOM-NAS/src/api/network/nas_message.c +++ b/openair-cn/NAS/EURECOM-NAS/src/api/network/nas_message.c @@ -224,6 +224,15 @@ int nas_message_decode(const char* const buffer, nas_message_t* msg, int length) LOG_FUNC_IN; int bytes; +#if ((defined(EPC_BUILD) && defined(NAS_MME)) || (defined(ENABLE_NAS_UE_LOGGING) && defined(UE_BUILD) && defined(NAS_UE))) + int down_link; + +# if ((defined(EPC_BUILD) && defined(NAS_MME))) + down_link = 0; +# else + down_link = 1; +# endif +#endif /* Decode the header */ int size = _nas_message_header_decode(buffer, &msg->header, length); @@ -248,7 +257,7 @@ int nas_message_decode(const char* const buffer, nas_message_t* msg, int length) &msg->plain, length - size); #if ((defined(EPC_BUILD) && defined(NAS_MME)) || (defined(ENABLE_NAS_UE_LOGGING) && defined(UE_BUILD) && defined(NAS_UE))) /* Message has been decoded and security header removed, handle it has a plain message */ - nas_itti_plain_msg(buffer, msg, length, 0); + nas_itti_plain_msg(buffer, msg, length, down_link); #endif } else { @@ -256,7 +265,7 @@ int nas_message_decode(const char* const buffer, nas_message_t* msg, int length) bytes = _nas_message_plain_decode(buffer, &msg->header, &msg->plain, length); #if ((defined(EPC_BUILD) && defined(NAS_MME)) || (defined(ENABLE_NAS_UE_LOGGING) && defined(UE_BUILD) && defined(NAS_UE))) - nas_itti_plain_msg(buffer, msg, length, 0); + nas_itti_plain_msg(buffer, msg, length, down_link); #endif } @@ -291,6 +300,15 @@ int nas_message_encode(char* buffer, const nas_message_t* const msg, int length) LOG_FUNC_IN; int bytes; +#if ((defined(EPC_BUILD) && defined(NAS_MME)) || (defined(ENABLE_NAS_UE_LOGGING) && defined(UE_BUILD) && defined(NAS_UE))) + int down_link; + +# if ((defined(EPC_BUILD) && defined(NAS_MME))) + down_link = 1; +# else + down_link = 0; +# endif +#endif /* Encode the header */ int size = _nas_message_header_encode(buffer, &msg->header, length); @@ -314,7 +332,7 @@ int nas_message_encode(char* buffer, const nas_message_t* const msg, int length) *(UInt32_t*)(buffer + sizeof(UInt8_t)) = mac; } #if ((defined(EPC_BUILD) && defined(NAS_MME)) || (defined(ENABLE_NAS_UE_LOGGING) && defined(UE_BUILD) && defined(NAS_UE))) - nas_itti_protected_msg(buffer, msg, length, 1); + nas_itti_protected_msg(buffer, msg, length, down_link); #endif } else { @@ -322,7 +340,7 @@ int nas_message_encode(char* buffer, const nas_message_t* const msg, int length) bytes = _nas_message_plain_encode(buffer, &msg->header, &msg->plain, length); #if ((defined(EPC_BUILD) && defined(NAS_MME)) || (defined(ENABLE_NAS_UE_LOGGING) && defined(UE_BUILD) && defined(NAS_UE))) - nas_itti_plain_msg(buffer, msg, length, 1); + nas_itti_plain_msg(buffer, msg, length, down_link); #endif } -- GitLab