#7294: Failed to set static IP address for IP Interface

This commit is contained in:
Amin Ben Ramdhane 2022-02-08 11:28:42 +01:00
parent 51466d9ad8
commit b234cc3527

View file

@ -900,7 +900,7 @@ static int addObjIPInterfaceIPv4Address(char *refparam, struct dmctx *ctx, void
get_dmmap_section_of_config_section("dmmap_network", "interface", section_name((struct uci_section *)data), &dmmap_ip_interface);
dmuci_get_value_by_section_string(dmmap_ip_interface, "ip_int_instance", &ip_inst);
if (!strcmp(*instance, "1")) {
if (strcmp(*instance, "1") != 0) {
char device_buf[32] = {0};
snprintf(ipv4_name, sizeof(ipv4_name), "iface%s_ipv4_%s", ip_inst, *instance);
@ -913,15 +913,12 @@ static int addObjIPInterfaceIPv4Address(char *refparam, struct dmctx *ctx, void
// Firewall : add this new interface to zone->network list
add_network_to_firewall_zone_network_list(section_name((struct uci_section *)data), ipv4_name);
} else {
char *proto;
dmuci_get_value_by_section_string((struct uci_section *)data, "proto", &proto);
dmuci_set_value_by_section((struct uci_section *)data, "proto", strcmp(proto, "dhcp") == 0 ? proto : "static");
dmuci_set_value_by_section((struct uci_section *)data, "proto", "static");
}
dmuci_add_section_bbfdm("dmmap_network_ipv4", "intf_ipv4", &dmmap_ip_interface_ipv4);
dmuci_set_value_by_section(dmmap_ip_interface_ipv4, "parent_section", section_name((struct uci_section *)data));
dmuci_set_value_by_section(dmmap_ip_interface_ipv4, "section_name", !strcmp(*instance, "1") ? ipv4_name : section_name((struct uci_section *)data));
dmuci_set_value_by_section(dmmap_ip_interface_ipv4, "section_name", (strcmp(*instance, "1") != 0) ? ipv4_name : section_name((struct uci_section *)data));
dmuci_set_value_by_section(dmmap_ip_interface_ipv4, "added_by_controller", "1");
dmuci_set_value_by_section(dmmap_ip_interface_ipv4, "ipv4_instance", *instance);
return 0;