cmhi
/
secgateway
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Mod aaa-12 修改静态路由check逻辑 

RCA：
SOL：
修改人：tongyebin
检视人：
This commit is contained in:
tongyebin 2019-08-30 10:56:19 +08:00
parent 30ec3fac77
commit 562d5c3b6a
1 changed files with 31 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
Platform/user/configm/config-server/static_routing_config/static_routing_config.c
View File

@ -1043,28 +1043,6 @@ ret_code routing_config_chk(uint source, uint *config_type,
{
return RET_CHKERR;
}
else if(conf_buff->version == IPV4_VERSION)
{
int a = -1,b = -1,c = -1,d = -1;
int a1 = -1,b1 = -1,c1 = -1,d1 = -1;
sscanf(conf_buff->destip,"%d.%d.%d.%d",&a,&b,&c,&d);
if(a<0 || a>255 || b<0 || b>255 || c<0 || c>255 || d<0 |d>255)
{
rpc_log_info("ip address wrong:%d %d %d %d\n",a,b,c,d);
return RET_INPUTERR;
}
if(strcmp(conf_buff->gateway,"") != 0)
{
sscanf(conf_buff->gateway,"%d.%d.%d.%d",&a1,&b1,&c1,&d1);
if(a1<0 || a1>255 || b1<0 || b1>255 || c1<0 || c1>255 || d1<0 |d1>255)
{
rpc_log_info("gateway address wrong:%d %d %d %d\n",a1,b1,c1,d1);
return RET_INPUTERR;
}
}
}
else if(strcmp(conf_buff->gateway,"") == 0 && strcmp(conf_buff->dev,"") == 0)
{
@ -1072,23 +1050,44 @@ ret_code routing_config_chk(uint source, uint *config_type,
return RET_CHKERR;
}
}
else if ((*config_type == CM_CONFIG_GET_ALL))
else if(conf_buff->version == IPV4_VERSION)
{
if ((*output_len)<(ROUTING_TABLE_MAX_NUMBER * sizeof(routing_t)))
{
rpc_log_info("getall check error\n");
return RET_CHKERR;
}
}
int a = -1,b = -1,c = -1,d = -1;
int a1 = -1,b1 = -1,c1 = -1,d1 = -1;
sscanf(conf_buff->destip,"%d.%d.%d.%d",&a,&b,&c,&d);
if(a<0 || a>255 || b<0 || b>255 || c<0 || c>255 || d<0 |d>255)
{
rpc_log_info("ip address wrong:%d %d %d %d\n",a,b,c,d);
return RET_CHKERR;
}
if(strcmp(conf_buff->gateway,"") != 0)
{
sscanf(conf_buff->gateway,"%d.%d.%d.%d",&a1,&b1,&c1,&d1);
if(a1<0 || a1>255 || b1<0 || b1>255 || c1<0 || c1>255 || d1<0 |d1>255)
{
rpc_log_info("gateway address wrong:%d %d %d %d\n",a1,b1,c1,d1);
return RET_CHKERR;
}
}
}
}
else if ((*config_type == CM_CONFIG_GET_ALL))
{
if ((*output_len)<(ROUTING_TABLE_MAX_NUMBER * sizeof(routing_t)))
{
rpc_log_info("getall check error\n");
return RET_CHKERR;
}
}
else
{
return RET_CHKERR;
}
if(conf_length <= CM_BUFF_SIZE)
{