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

Merge branch 'master' of http://git.komect.net/ISG/secogateway

This commit is contained in:
dongxiancun 2019-09-04 17:52:52 +08:00
parent 1cbc01c83c 497ef6ec46
commit c443bd5e68
2 changed files with 8 additions and 11 deletions
Platform/user
configm/config-server/static_routing_config
static_routing_config.c
database
database.c

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

@ -855,19 +855,18 @@ ret_code get_all_from_file (pointer output, int *output_len)
switch(flag){
case 1:
sscanf(buff,"%*s%*s%*s%*s%[^/]/%d%*s%s%*s%s%*s%d",destip,&netmask,gateway,dev, &metric);
sscanf(buff,"%*s%*s%*s%*s %[^/]/%d%*s%s%*s%s%*s%d",destip,&netmask,gateway,dev, &metric);
break;
case 2:
sscanf(buff,"%*s%*s%*s%*s%[^/]/%d%*s%s%*s%d",destip,&netmask,gateway,&metric);
sscanf(buff,"%*s%*s%*s%*s %[^/]/%d%*s%s%*s%d",destip,&netmask,gateway,&metric);
break;
case 3:
sscanf(buff,"%*s%*s%*s%*s%[^/]/%d%*s%s%*s%d",destip,&netmask,dev,&metric);
sscanf(buff,"%*s%*s%*s%*s %[^/]/%d%*s%s%*s%d",destip,&netmask,dev,&metric);
break;
default:
ret = RET_ERR;
}
ipv6_count
++;
ipv6_count++;
}
}
else if (strstr(buff,"default") != NULL)
@ -876,7 +875,6 @@ ret_code get_all_from_file (pointer output, int *output_len)
switch(flag){
case 1:
sscanf(buff,"%*s%*s%*s%*s%s%*s%s%*s%d",gateway,dev, &metric);
rpc_log_info("check3: %s %s %d\n", gateway,dev,metric);
break;
case 2:
sscanf(buff,"%*s%*s%*s%*s%s%*s%d",gateway, &metric);
@ -897,13 +895,13 @@ ret_code get_all_from_file (pointer output, int *output_len)
version = IPV4_VERSION;
switch(flag){
case 1:
sscanf(buff,"%*s%*s%*s%[^/]/%d%*s%s%*s%s%*s%d",destip,&netmask,gateway,dev, &metric);
sscanf(buff,"%*s%*s%*s %[^/]/%d%*s%s%*s%s%*s%d",destip,&netmask,gateway,dev, &metric);
break;
case 2:
sscanf(buff,"%*s%*s%*s%[^/]/%d%*s%s%*s%d",destip,&netmask,gateway,&metric);
sscanf(buff,"%*s%*s%*s %[^/]/%d%*s%s%*s%d",destip,&netmask,gateway,&metric);
break;
case 3:
sscanf(buff,"%*s%*s%*s%[^/]/%d%*s%s%*s%d",destip,&netmask,dev,&metric);
sscanf(buff,"%*s%*s%*s %[^/]/%d%*s%s%*s%d",destip,&netmask,dev,&metric);
break;
default:
ret = RET_ERR;
@ -919,7 +917,6 @@ ret_code get_all_from_file (pointer output, int *output_len)
buff_total[count].metric = metric;
count ++;
rpc_log_info("check4: ipv4 count %d total count %d\n", ipv4_count,count);
version = 0;
memset(destip,0,IP_MAX_LENGTH);

2
Platform/user/database/database.c
View File

@ -92,7 +92,7 @@ void * connect_database (int module_id)
SQLSetConnectAttr( hdbc, SQL_ATTR_ODBC_CURSORS, (SQLPOINTER)SQL_CUR_USE_ODBC, 0 );
ret = SQLConnect( hdbc, "mysql", SQL_NTS, "", SQL_NTS, "", SQL_NTS );
ret = SQLConnect( hdbc, "meng", SQL_NTS, "", SQL_NTS, "", SQL_NTS );
if (ret != SQL_SUCCESS)
{
return NULL;