From d2aff196b3a36c10931d4dc21e4c7a08686f2c0c Mon Sep 17 00:00:00 2001
From: tongyebin <tongyebin@cmhi.chinamobile.com>
Date: Fri, 20 Sep 2019 16:24:00 +0800
Subject: [PATCH] =?UTF-8?q?Mod=20aaa-12=20=E4=BF=AE=E6=94=B9=E9=9D=99?=
=?UTF-8?q?=E6=80=81=E8=B7=AF=E7=94=B1=E9=9D=99=E6=80=81=E6=A3=80=E6=9F=A5?=
=?UTF-8?q?=E8=AD=A6=E5=91=8A=20SOL=20=E4=BF=AE=E6=94=B9=E4=BA=BA=EF=BC=9A?=
=?UTF-8?q?tongyebin=20=E6=A3=80=E8=A7=86=E4=BA=BA=EF=BC=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../static_routing_config/static_routing_config.c | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/Platform/user/configm/config-server/static_routing_config/static_routing_config.c b/Platform/user/configm/config-server/static_routing_config/static_routing_config.c
index bcb840d2d..bf56f9604 100644
--- a/Platform/user/configm/config-server/static_routing_config/static_routing_config.c
+++ b/Platform/user/configm/config-server/static_routing_config/static_routing_config.c
@@ -30,6 +30,11 @@ extern int conf_file_write(char *conf_path, char *sum_buf);
ret_code routing_to_json(int count, routing_t *buff_total, pointer output, int *output_len)
{
+ if (NULL == buff_total)
+ {
+ return RET_EMPTY_STRING;
+ }
+
ret_code ret = RET_OK;
char *json_routing;
@@ -658,7 +663,7 @@ ret_code routing_add(routing_t *conf_buff)
char string[STRING_LENGTH] = {0};
uint version_t = conf_buff->version;
uint netmask_t = conf_buff->netmask;
- char route_type[10] = {0};
+ //char route_type[10] = {0};
ret_code ret = RET_OK;
char
*destip_t = conf_buff->destip;
char *gw_t = conf_buff->gateway;
@@ -677,7 +682,8 @@ ret_code routing_add(routing_t *conf_buff)
rpc_log_info("flag: %d\n",flag);
if(version_t == IPV4_VERSION)
- {
+ {
+ char route_type[10] = {0};
if (netmask_t > IPV4_MIN_NETMASK && netmask_t < IPV4_MAX_NETMASK)
{
strcpy(route_type,"-net");
@@ -746,7 +752,7 @@ ret_code routing_del(routing_t *conf_buff)
char string_del[STRING_LENGTH] = {0};
uint version_t = conf_buff->version;
uint netmask_t = conf_buff->netmask;
- char route_type[10] = {0};
+ //char route_type[10] = {0};
ret_code ret = RET_OK;
char *destip_t = conf_buff->destip;
char *gw_t = conf_buff->gateway;
@@ -758,6 +764,7 @@ ret_code routing_del(routing_t *conf_buff)
if(version_t == IPV4_VERSION)
{
+ char route_type[10] = {0};
if (netmask_t > IPV4_MIN_NETMASK && netmask_t < IPV4_MAX_NETMASK)
{
strcpy(route_type,"-net");
@@ -1204,7 +1211,7 @@ ret_code routing_config_proc(uint source, uint config_type,
uint conf_type = config_type;
routing_t conf_buff = {0};
routing_t *routing_conf = &conf_buff;
- int flag = 0;
+ //int flag = 0;
if(NULL == input)
{