Commit 611a7b37 authored by winckel's avatar winckel

Modify NAS log point format to cope with possible non printable first character in APN.

git-svn-id: http://svn.eurecom.fr/openair4G/trunk@4928 818b1a75-f10b-46b9-bf7c-635c3b92a50f
parent 7ede66ea
...@@ -31,6 +31,7 @@ Description Defines the PDN connectivity ESM procedure executed by the ...@@ -31,6 +31,7 @@ Description Defines the PDN connectivity ESM procedure executed by the
#include <stdlib.h> // malloc, free #include <stdlib.h> // malloc, free
#include <string.h> // memset, memcpy, memcmp #include <string.h> // memset, memcpy, memcmp
#include <ctype.h> // isprint
#include "esm_proc.h" #include "esm_proc.h"
#include "commonDef.h" #include "commonDef.h"
...@@ -233,7 +234,7 @@ int esm_proc_pdn_connectivity(int cid, int is_to_define, ...@@ -233,7 +234,7 @@ int esm_proc_pdn_connectivity(int cid, int is_to_define,
"already exists", "already exists",
(_esm_data.pdn[pid].data->type != ESM_PDN_TYPE_IPV4)? (_esm_data.pdn[pid].data->type != ESM_PDN_TYPE_IPV4)?
(_esm_data.pdn[pid].data->type != ESM_PDN_TYPE_IPV6)? (_esm_data.pdn[pid].data->type != ESM_PDN_TYPE_IPV6)?
"IPv4v6" : "IPv6" : "IPv4", apn->value); "IPv4v6" : "IPv6" : "IPv4", apn->value);
LOG_FUNC_RETURN (RETURNerror); LOG_FUNC_RETURN (RETURNerror);
} }
} }
...@@ -349,11 +350,18 @@ int esm_proc_pdn_connectivity_accept(int pti, esm_proc_pdn_type_t pdn_type, ...@@ -349,11 +350,18 @@ int esm_proc_pdn_connectivity_accept(int pti, esm_proc_pdn_type_t pdn_type,
{ {
LOG_FUNC_IN; LOG_FUNC_IN;
int rc; int rc;
int pid = RETURNerror; int pid = RETURNerror;
char apn_first_char[4];
if (isprint(apn->value[0])) {
apn_first_char[0] = '\0';
} else {
sprintf (apn_first_char, "%02X", apn->value[0]);
}
LOG_TRACE(INFO, "ESM-PROC - PDN connectivity accepted by the network " LOG_TRACE(INFO, "ESM-PROC - PDN connectivity accepted by the network "
"(pti=%d) APN = %s, IP address = %s", pti, apn->value, "(pti=%d) APN = %s\"%s\", IP address = %s", pti, apn_first_char, isprint(apn->value[0]) ? &apn->value[0] : &apn->value[1],
(pdn_type == ESM_PDN_TYPE_IPV4)? esm_data_get_ipv4_addr(pdn_addr) : (pdn_type == ESM_PDN_TYPE_IPV4)? esm_data_get_ipv4_addr(pdn_addr) :
(pdn_type == ESM_PDN_TYPE_IPV6)? esm_data_get_ipv6_addr(pdn_addr) : (pdn_type == ESM_PDN_TYPE_IPV6)? esm_data_get_ipv6_addr(pdn_addr) :
esm_data_get_ipv4v6_addr(pdn_addr)); esm_data_get_ipv4v6_addr(pdn_addr));
......
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