From 902bfbe3123e9beb29dbf5d0fb1c440cc6348dbf Mon Sep 17 00:00:00 2001 From: zhanglianghy Date: Sat, 6 Jul 2019 14:16:31 +0800 Subject: [PATCH] =?UTF-8?q?MOD=20aaa-12=20=E9=85=8D=E7=BD=AE=E4=BC=A0?= =?UTF-8?q?=E5=85=A5=E5=8F=82=E6=95=B0=E4=BF=AE=E6=94=B9=E4=B8=BAjson?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F=20SOL=20=20=E9=85=8D=E7=BD=AE=E4=BC=A0?= =?UTF-8?q?=E5=85=A5=E5=8F=82=E6=95=B0=E4=BF=AE=E6=94=B9=E4=B8=BAjson?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F=20=E4=BF=AE=E6=94=B9=E4=BA=BA=EF=BC=9Azhangl?= =?UTF-8?q?iang=20=E6=A3=80=E8=A7=86=E4=BA=BA=EF=BC=9Azhangliang?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Platform/user/configm/config-server/include/ipconfig.h | 4 ++-- Platform/user/configm/config-server/ipconfig/ipconfig.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Platform/user/configm/config-server/include/ipconfig.h b/Platform/user/configm/config-server/include/ipconfig.h index 14f978890..0a49263a7 100644 --- a/Platform/user/configm/config-server/include/ipconfig.h +++ b/Platform/user/configm/config-server/include/ipconfig.h @@ -13,7 +13,7 @@ #include #define MAX_IF_NUM 32 -#define DOT_IP_IF_NUM 32 +#define DOT_IP_STR 32 #define INTERFACE_NAMSIZ 20 /* Max bit/byte length of IPv4 address. */ @@ -72,7 +72,7 @@ struct _ip_config_string { int config_type; char ifname[INTERFACE_NAMSIZ]; int family; - char ipaddr[IP_STR_LEN]; + char ipaddr[DOT_IP_STR]; int prefixlen; }; diff --git a/Platform/user/configm/config-server/ipconfig/ipconfig.c b/Platform/user/configm/config-server/ipconfig/ipconfig.c index 3f99dc1cb..c71511b4f 100644 --- a/Platform/user/configm/config-server/ipconfig/ipconfig.c +++ b/Platform/user/configm/config-server/ipconfig/ipconfig.c @@ -212,7 +212,7 @@ ret_code ip_config_format_json(ip_config_t *config_buff, pointer output, int *ou ip_config->prefixlen = config_buff->prefixlen; strncpy(ip_config->ifname, config_buff->ifname, INTERFACE_NAMSIZ); - strncpy(ip_config->ipaddr, inet_ntoa(config_buff->prefix), DOT_IP_LEN); + strncpy(ip_config->ipaddr, inet_ntoa(config_buff->prefix), DOT_IP_STR); /* create Student JSON object */ s2j_create_json_obj(json_obj); @@ -260,7 +260,7 @@ ret_code ip_config_format_json_array(ip_config_t *config_buff, int count, pointe ip_config->family = AF_INET; ip_config->prefixlen = config_buff[i].prefixlen; strncpy(ip_config->ifname, config_buff[i].ifname, INTERFACE_NAMSIZ); - strncpy(ip_config->ipaddr, inet_ntoa(config_buff[i].prefix), DOT_IP_LEN); + strncpy(ip_config->ipaddr, inet_ntoa(config_buff[i].prefix), DOT_IP_STR); /* create Student JSON object */ s2j_create_json_obj(json_obj);