Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
dyyu
openairinterface5G
Commits
e2995204
Commit
e2995204
authored
Jan 31, 2014
by
winckel
Browse files
Fixed some warnings.
git-svn-id:
http://svn.eurecom.fr/openair4G/trunk@4996
818b1a75-f10b-46b9-bf7c-635c3b92a50f
parent
b794516d
Changes
4
Hide whitespace changes
Inline
Side-by-side
openair-cn/NAS/EURECOM-NAS/src/emm/msg/emm_msg.c
View file @
e2995204
...
...
@@ -212,7 +212,7 @@ int emm_msg_decode(EMM_msg *msg, uint8_t *buffer, uint32_t len)
}
else
{
#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_log
,
msg
,
len_log
,
down_link
);
nas_itti_plain_msg
(
(
char
*
)
buffer_log
,
(
nas_message_t
*
)
msg
,
len_log
,
down_link
);
#endif
}
LOG_FUNC_RETURN
(
header_result
+
decode_result
);
...
...
@@ -381,7 +381,7 @@ int emm_msg_encode(EMM_msg *msg, uint8_t *buffer, uint32_t len)
"(%d)"
,
msg
->
header
.
message_type
,
encode_result
);
}
else
{
#if ((defined(EPC_BUILD) && defined(NAS_MME)) || (defined(ENABLE_NAS_UE_LOGGING) && defined(UE_BUILD) && defined(NAS_UE)))
nas_itti_plain_msg
(
buffer_log
,
msg
,
header_result
+
encode_result
,
down_link
);
nas_itti_plain_msg
(
(
char
*
)
buffer_log
,
(
nas_message_t
*
)
msg
,
header_result
+
encode_result
,
down_link
);
#endif
}
LOG_FUNC_RETURN
(
header_result
+
encode_result
);
...
...
openair-cn/NAS/EURECOM-NAS/src/esm/msg/esm_msg.c
View file @
e2995204
...
...
@@ -174,7 +174,7 @@ int esm_msg_decode(ESM_msg *msg, uint8_t *buffer, uint32_t len)
}
else
{
#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_log
,
msg
,
len_log
,
down_link
);
nas_itti_plain_msg
(
(
char
*
)
buffer_log
,
(
nas_message_t
*
)
msg
,
len_log
,
down_link
);
#endif
}
...
...
@@ -297,16 +297,16 @@ int esm_msg_encode(ESM_msg *msg, uint8_t *buffer, uint32_t len)
break
;
default:
LOG_TRACE
(
ERROR
,
"ESM-MSG - Unexpected message type: 0x%x"
,
msg
->
header
.
message_type
);
encode_result
=
TLV_ENCODE_WRONG_MESSAGE_TYPE
;
msg
->
header
.
message_type
);
encode_result
=
TLV_ENCODE_WRONG_MESSAGE_TYPE
;
}
if
(
encode_result
<
0
)
{
LOG_TRACE
(
ERROR
,
"ESM-MSG - Failed to encode L3 ESM message 0x%x "
"(%d)"
,
msg
->
header
.
message_type
,
encode_result
);
LOG_TRACE
(
ERROR
,
"ESM-MSG - Failed to encode L3 ESM message 0x%x "
"(%d)"
,
msg
->
header
.
message_type
,
encode_result
);
}
else
{
#if ((defined(EPC_BUILD) && defined(NAS_MME)) || (defined(ENABLE_NAS_UE_LOGGING) && defined(UE_BUILD) && defined(NAS_UE)))
nas_itti_plain_msg
(
buffer_log
,
msg
,
header_result
+
encode_result
,
down_link
);
nas_itti_plain_msg
(
(
char
*
)
buffer_log
,
(
nas_message_t
*
)
msg
,
header_result
+
encode_result
,
down_link
);
#endif
}
...
...
openair-cn/NAS/nas_itti_messaging.c
View file @
e2995204
...
...
@@ -116,7 +116,7 @@ static int _nas_find_message_index(const UInt8_t message_id, const UInt8_t *mess
return
(
1
);
}
int
nas_itti_plain_msg
(
const
char
*
buffer
,
const
nas_message_t
*
msg
,
const
int
length
,
const
int
down_link
)
int
nas_itti_plain_msg
(
const
char
*
buffer
,
const
nas_message_t
*
msg
,
const
int
length
,
const
int
down_link
)
{
MessageDef
*
message_p
;
int
data_length
=
length
<
NAS_DATA_LENGHT_MAX
?
length
:
NAS_DATA_LENGHT_MAX
;
...
...
@@ -173,7 +173,7 @@ int nas_itti_plain_msg(const char* buffer, const nas_message_t* msg, const int l
return
EXIT_FAILURE
;
}
int
nas_itti_protected_msg
(
const
char
*
buffer
,
const
nas_message_t
*
msg
,
const
int
length
,
const
int
down_link
)
int
nas_itti_protected_msg
(
const
char
*
buffer
,
const
nas_message_t
*
msg
,
const
int
length
,
const
int
down_link
)
{
MessageDef
*
message_p
=
NULL
;
...
...
openair-cn/NAS/nas_itti_messaging.h
View file @
e2995204
...
...
@@ -38,9 +38,9 @@
#define NAS_ITTI_MESSAGING_H_
# if ((defined(EPC_BUILD) && defined(NAS_MME)) || (defined(ENABLE_NAS_UE_LOGGING) && defined(UE_BUILD) && defined(NAS_UE)))
int
nas_itti_plain_msg
(
const
char
*
buffer
,
const
nas_message_t
*
msg
,
const
int
length
,
const
int
instance
);
int
nas_itti_plain_msg
(
const
char
*
buffer
,
const
nas_message_t
*
msg
,
const
int
length
,
const
int
instance
);
int
nas_itti_protected_msg
(
const
char
*
buffer
,
const
nas_message_t
*
msg
,
const
int
length
,
const
int
instance
);
int
nas_itti_protected_msg
(
const
char
*
buffer
,
const
nas_message_t
*
msg
,
const
int
length
,
const
int
instance
);
# endif
# if defined(EPC_BUILD) && defined(NAS_MME)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment