mirror/bbfdm
1
0
Fork 0
mirror of https://dev.iopsys.eu/bbf/bbfdm.git synced 2025-12-10 07:44:39 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix duplicate DNS server address

Browse source
This commit is contained in:
suvendhu 2023-08-29 20:14:12 +05:30
parent 9799ef78d6
commit a9f11ebaaa
1 changed files with 21 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
libbbfdm/dmtree/tr181/dns.c
View file

@ -14,15 +14,14 @@
/*************************************************************
* COMMON FUNCTIONS
**************************************************************/
static unsigned char is_dns_server_in_dmmap(char *chk_ip, char *chk_interface)
static unsigned char is_dns_server_in_dmmap(char *chk_ip)
{
struct uci_section *s = NULL;
char *ip, *interface;
char *ip;
uci_path_foreach_sections(bbfdm, "dmmap_dns", "dns_server", s) {
dmuci_get_value_by_section_string(s, "ip", &ip);
dmuci_get_value_by_section_string(s, "interface", &interface);
if (DM_STRCMP(interface, chk_interface) == 0 && DM_STRCMP(ip, chk_ip) == 0) {
if (DM_STRCMP(ip, chk_ip) == 0) {
return 1;
}
}
@ -94,7 +93,7 @@ static int dmmap_synchronizeDNSClientRelayServer(struct dmctx *dmctx, DMNODE *pa
if (dns_list != NULL) {
uci_foreach_element(dns_list, e) {
if (is_dns_server_in_dmmap(e->name, section_name(s)))
if (is_dns_server_in_dmmap(e->name))
continue;
dmuci_add_section_bbfdm("dmmap_dns", "dns_server", &dns_s);
@ -113,7 +112,7 @@ static int dmmap_synchronizeDNSClientRelayServer(struct dmctx *dmctx, DMNODE *pa
if (!jobj) continue;
dmjson_foreach_value_in_array(jobj, arrobj, ipdns, j, 1, "dns-server") {
if (ipdns[0] == '\0' || is_dns_server_in_dmmap(ipdns, section_name(s)))
if (ipdns[0] == '\0' || is_dns_server_in_dmmap(ipdns))
continue;
dmuci_add_section_bbfdm("dmmap_dns", "dns_server", &dns_s);
@ -481,8 +480,7 @@ static int set_server_alias(char *refparam, struct dmctx *ctx, void *data, char
static int set_dns_server(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action)
{
struct uci_list *dns_list = NULL;
char *interface = NULL;
char *interface = NULL, *enable = NULL;
char *peerdns = NULL;
char *oip = NULL;
@ -502,13 +500,15 @@ static int set_dns_server(char *refparam, struct dmctx *ctx, void *data, char *i
if (DM_STRCMP(oip, value) == 0)
return 0;
// Check if duplicate entry is alreadyexist
if (is_dns_server_in_dmmap(value))
return FAULT_9007;
dmuci_get_value_by_section_string((struct uci_section *)data, "interface", &interface);
if (DM_STRLEN(interface)) {
dmuci_get_option_value_list("network", interface, "dns", &dns_list);
if (value_exists_in_uci_list(dns_list, oip)) {
dmuci_del_list_value("network", interface, "dns", oip);
dmuci_add_list_value("network", interface, "dns", value);
}
dmuci_get_value_by_section_string((struct uci_section *)data, "enable", &enable);
if (DM_STRLEN(interface) && DM_LSTRCMP(enable, "1") == 0) {
dmuci_del_list_value("network", interface, "dns", oip);
dmuci_add_list_value("network", interface, "dns", value);
}
dmuci_set_value_by_section((struct uci_section *)data, "ip", value);
@ -520,8 +520,7 @@ static int set_dns_server(char *refparam, struct dmctx *ctx, void *data, char *i
static int set_dns_interface(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action)
{
char *allowed_objects[] = {"Device.IP.Interface.", NULL};
struct uci_list *dns_list = NULL;
char *interface = NULL;
char *interface = NULL, *enable = NULL;
char *peerdns = NULL;
char *linker = NULL;
char *oip = NULL;
@ -545,6 +544,7 @@ static int set_dns_interface(char *refparam, struct dmctx *ctx, void *data, char
dmuci_get_value_by_section_string((struct uci_section *)data, "interface", &interface);
dmuci_get_value_by_section_string((struct uci_section *)data, "ip", &oip);
dmuci_get_value_by_section_string((struct uci_section *)data, "enable", &enable);
if (!linker || linker[0] == 0) {
dmuci_del_list_value("network", interface, "dns", oip);
@ -555,13 +555,11 @@ static int set_dns_interface(char *refparam, struct dmctx *ctx, void *data, char
if (DM_STRCMP(interface, linker) == 0)
return 0;
if (DM_STRLEN(interface)) {
dmuci_get_option_value_list("network", interface, "dns", &dns_list);
if (value_exists_in_uci_list(dns_list, oip)) {
dmuci_del_list_value("network", interface, "dns", oip);
dmuci_add_list_value("network", linker, "dns", oip);
}
}
if (DM_STRLEN(interface))
dmuci_del_list_value("network", interface, "dns", oip);
if (DM_LSTRCMP(enable, "1") == 0)
dmuci_add_list_value("network", linker, "dns", oip);
dmuci_set_value_by_section((struct uci_section *)data, "interface", linker);
break;