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 45dec9794..e81c29c1d 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 @@ -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); diff --git a/Platform/user/database/database.c b/Platform/user/database/database.c index 310db7282..c619ca937 100644 --- a/Platform/user/database/database.c +++ b/Platform/user/database/database.c @@ -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;