Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

lldpad: remove device from config file when ports are removed #110

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions config.c
Original file line number Diff line number Diff line change
Expand Up @@ -472,6 +472,32 @@ int get_config_setting(const char *ifname, int agenttype, char *path,
return (rval == CONFIG_FALSE) ? cmd_failed : cmd_success;
}

int remove_config_device(const char *ifname, int agenttype)
{
const char *section = agent_type2section(agenttype);
config_setting_t *setting = NULL;
int rval = cmd_failed;

setting = config_lookup(&lldpad_cfg, section);

if (setting != NULL) {
rval = config_setting_remove(setting, ifname);
if (rval == CONFIG_TRUE) {
LLDPAD_DBG("In %s, remove %s from section %s\n", __func__, ifname, section);
if (config_write_file(&lldpad_cfg, cfg_file_name)) {
rval = cmd_success;
} else {
LLDPAD_DBG("In %s, update config failed\n", __func__);
rval = cmd_failed;
}
}
} else {
LLDPAD_DBG("In %s, can't find section %s\n", __func__, section);
}

return rval;
}

int remove_config_setting(const char *ifname, int agenttype, char *parent,
char *name)
{
Expand Down
1 change: 1 addition & 0 deletions include/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ int get_cfg(const char *ifname, int agenttype, char *path, union cfg_get value,
int set_cfg(const char *ifname, int agenttype, char *path, union cfg_set value, int type);
int get_config_setting(const char *ifname, int agenttype, char *path, union cfg_get value, int type);
int set_config_setting(const char *ifname, int agenttype, char *path, union cfg_set value, int type);
int remove_config_device(const char *ifname, int agenttype);
int remove_config_setting(const char *ifname, int agenttype, char *parent, char *name);
int get_config_tlvfield(const char *ifname, int agenttype, u32 tlvid, const char *field, union cfg_get value, int type);
int get_config_tlvfield_int(const char *ifname, int agenttype, u32 tlvid, const char *field, int *value);
Expand Down
3 changes: 3 additions & 0 deletions lldp/ports.c
Original file line number Diff line number Diff line change
Expand Up @@ -355,6 +355,9 @@ int remove_port(const char *ifname)
free(agent->tx.frameout);

LIST_REMOVE(agent, entry);

remove_config_device(ifname, agent->type);

free(agent);
}

Expand Down
Loading