gfwleak/tango-tsg-service-chaining-engine
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bfdd控制命令,删除local-address字段

Browse Source
This commit is contained in:
wangmenglan
2023-02-23 21:11:07 +08:00
parent cdc3b1c589
commit bb13fff5db
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common/include/bfd.h
View File

@@ -18,8 +18,8 @@ struct bfd_vtysh_client {
int bfd_vtysh_connect(struct bfd_vtysh_client *client); int bfd_vtysh_connect(struct bfd_vtysh_client *client);
void bfd_vtysh_close(struct bfd_vtysh_client *client); void bfd_vtysh_close(struct bfd_vtysh_client *client);
int bfd_vtysh_add_dev(struct bfd_vtysh_client *client, const char *local_addr, const char *peer_addr, int retires, int interval_ms); int bfd_vtysh_add_dev(struct bfd_vtysh_client *client, const char *peer_addr, int retires, int interval_ms);
int bfd_vtysh_del_dev(struct bfd_vtysh_client *client, const char *local_addr, char *peer_addr); int bfd_vtysh_del_dev(struct bfd_vtysh_client *client, const char *peer_addr);
int bfd_vtysh_get_dev_active(struct bfd_vtysh_client *client, char *addr); int bfd_vtysh_get_dev_active(struct bfd_vtysh_client *client, char *addr);
int bfd_vtysh_pre_config(struct bfd_vtysh_client *client); int bfd_vtysh_pre_config(struct bfd_vtysh_client *client);

8
common/src/bfd.cpp
View File

@@ -220,13 +220,13 @@ int bfd_vtysh_pre_config(struct bfd_vtysh_client *client)
// return 0 : success // return 0 : success
// return -1 : fail // return -1 : fail
int bfd_vtysh_add_dev(struct bfd_vtysh_client *client, const char *local_addr, const char *peer_addr, int retires, int interval_ms) int bfd_vtysh_add_dev(struct bfd_vtysh_client *client, const char *peer_addr, int retires, int interval_ms)
{ {
int ret = 0; int ret = 0;
char cmd[256] = {0}; char cmd[256] = {0};
char stackbuf[4096]; char stackbuf[4096];
snprintf(cmd, sizeof(cmd), "peer %s local-address %s", peer_addr, local_addr); snprintf(cmd, sizeof(cmd), "peer %s", peer_addr);
ret = bfd_vtysh_cmd_exec(client, cmd, stackbuf, sizeof(stackbuf)-1); ret = bfd_vtysh_cmd_exec(client, cmd, stackbuf, sizeof(stackbuf)-1);
if (ret < 0) { if (ret < 0) {
LOG_DEBUG("bfd vtysh cmd [%s] error", cmd); LOG_DEBUG("bfd vtysh cmd [%s] error", cmd);
@@ -259,13 +259,13 @@ int bfd_vtysh_add_dev(struct bfd_vtysh_client *client, const char *local_addr, c
// return 0 : success // return 0 : success
// return -1 : fail // return -1 : fail
int bfd_vtysh_del_dev(struct bfd_vtysh_client *client, const char *local_addr, char *peer_addr) int bfd_vtysh_del_dev(struct bfd_vtysh_client *client, const char *peer_addr)
{ {
int ret = 0; int ret = 0;
char cmd[256] = {0}; char cmd[256] = {0};
char stackbuf[4096]; char stackbuf[4096];
snprintf(cmd, sizeof(cmd), "no peer %s local-address %s", peer_addr, local_addr); snprintf(cmd, sizeof(cmd), "no peer %s", peer_addr);
ret = bfd_vtysh_cmd_exec(client, cmd, stackbuf, sizeof(stackbuf)-1); ret = bfd_vtysh_cmd_exec(client, cmd, stackbuf, sizeof(stackbuf)-1);
if (ret < 0) { if (ret < 0) {
LOG_DEBUG("bfd vtysh cmd [%s] error", cmd); LOG_DEBUG("bfd vtysh cmd [%s] error", cmd);

6
platform/src/health_check.cpp
View File

@@ -104,9 +104,9 @@ int health_check_session_add(int session_id, const struct health_check *policy)
health_check_session_init_bfd_client(&client); health_check_session_init_bfd_client(&client);
bfd_vtysh_connect(&client); bfd_vtysh_connect(&client);
ret = bfd_vtysh_add_dev(&client, local_address, policy->address, policy->retires, policy->interval_ms); ret = bfd_vtysh_add_dev(&client, policy->address, policy->retires, policy->interval_ms);
if (ret != 0) { if (ret != 0) {
LOG_DEBUG("bfd vtysh add dev address [%s] failed!", tmp->policy.address); LOG_DEBUG("bfd vtysh add dev address [%s] failed!", policy->address);
bfd_vtysh_close(&client); bfd_vtysh_close(&client);
return -1; return -1;
} }
@@ -140,7 +140,7 @@ int health_check_session_del(int session_id)
health_check_session_init_bfd_client(&client); health_check_session_init_bfd_client(&client);
bfd_vtysh_connect(&client); bfd_vtysh_connect(&client);
ret = bfd_vtysh_del_dev(&client, local_address, tmp->policy.address); ret = bfd_vtysh_del_dev(&client, tmp->policy.address);
if (ret != 0) { if (ret != 0) {
LOG_DEBUG("bfd vtysh delete dev address [%s] failed!", tmp->policy.address); LOG_DEBUG("bfd vtysh delete dev address [%s] failed!", tmp->policy.address);
bfd_vtysh_close(&client); bfd_vtysh_close(&client);