bfd健康检查的dst ip与g_vxlan封装报文的dst ip保持一致, 并删除debug的代码

This commit is contained in:
luwenpeng
2023-03-02 11:06:23 +08:00
parent cc397f4f08
commit 8b265517bb
6 changed files with 3 additions and 258 deletions

View File

@@ -880,25 +880,9 @@ static void sf_param_new_cb(int table_id, const char *key, const char *table_lin
}
LOG_DEBUG("%s: parse sf profile: %d, health_check->method: %s", LOG_TAG_POLICY, param->sf_profile_id, item->valuestring);
if (param->sf_health_check.method == HEALTH_CHECK_METHOD_BFD || param->sf_health_check.method == HEALTH_CHECK_METHOD_IN_BAND_BFD)
if (param->sf_health_check.method == HEALTH_CHECK_METHOD_BFD && param->sf_connectivity.method == PACKAGE_METHOD_VXLAN_G)
{
item = cJSON_GetObjectItem(root2, "address");
if (!item || !cJSON_IsString(item))
{
LOG_ERROR("%s: unexpected sf profile: (invalid health_check->address param) %s", LOG_TAG_POLICY, table_line);
goto error_out;
}
memcpy(param->sf_health_check.address, item->valuestring, strlen(item->valuestring));
LOG_DEBUG("%s: parse sf profile: %d, health_check->address: %s", LOG_TAG_POLICY, param->sf_profile_id, item->valuestring);
item = cJSON_GetObjectItem(root2, "port");
if (!item || !cJSON_IsString(item))
{
LOG_ERROR("%s: unexpected sf profile: (invalid health_check->port param) %s", LOG_TAG_POLICY, table_line);
goto error_out;
}
param->sf_health_check.port = atoi(item->valuestring);
LOG_DEBUG("%s: parse sf profile: %d, health_check->port: %s", LOG_TAG_POLICY, param->sf_profile_id, item->valuestring);
memcpy(param->sf_health_check.address, param->sf_connectivity.dest_ip, strlen(param->sf_connectivity.dest_ip));
}
if (param->sf_health_check.method == HEALTH_CHECK_METHOD_HTTP)