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

Ticket refs #6952: unmanaged bridges can not be applied

Browse source
This commit is contained in:
Amin Ben Ramdhane 2022-01-17 16:41:09 +01:00
parent ab7b12d96e
commit 3d8f3fb264
3 changed files with 125 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
dmtree/tr181/bridging.c
View file

@ -1531,13 +1531,24 @@ void remove_bridge_from_provider_bridge(char *bridge_inst)
static int addObjBridgingBridge(char *refparam, struct dmctx *ctx, void *data, char **instance)
{
struct uci_section *s = NULL, *dmmap_bridge = NULL;
char device_name[32];
char iface_s_name[16];
char dev_s_name[16];
char device_name[16];
snprintf(device_name, sizeof(device_name), "br_%s", *instance);
snprintf(iface_s_name, sizeof(iface_s_name), "iface_br%s", *instance);
snprintf(dev_s_name, sizeof(dev_s_name), "dev_br%s", *instance);
snprintf(device_name, sizeof(device_name), "br-dev%s", *instance);
// Add network bridge section
dmuci_add_section("network", "interface", &s);
dmuci_rename_section_by_section(s, iface_s_name);
dmuci_set_value_by_section(s, "device", device_name);
dmuci_set_value_by_section(s, "bridge_empty", "1");
// Add device bridge section
dmuci_add_section("network", "device", &s);
dmuci_rename_section_by_section(s, device_name);
dmuci_rename_section_by_section(s, dev_s_name);
dmuci_set_value_by_section(s, "name", device_name);
dmuci_set_value_by_section(s, "type", "bridge");
// Add dmmap bridge section
@ -1551,6 +1562,7 @@ static int addObjBridgingBridge(char *refparam, struct dmctx *ctx, void *data, c
static int delObjBridgingBridge(char *refparam, struct dmctx *ctx, void *data, char *instance, unsigned char del_action)
{
struct uci_section *s = NULL, *stmp = NULL;
char *curr_device = NULL;
switch (del_action) {
case DEL_INST:
@ -1572,11 +1584,28 @@ static int delObjBridgingBridge(char *refparam, struct dmctx *ctx, void *data, c
// Remove cvlan/svaln from dmmap_provider_bridge section if this bridge instance is a part of it
remove_bridge_from_provider_bridge(((struct bridge_args *)data)->br_inst);
// Remove interface bridge that maps to this device
dmuci_get_value_by_section_string(((struct bridge_args *)data)->bridge_sec, "name", &curr_device);
if (curr_device && *curr_device) {
uci_foreach_sections("network", "interface", s) {
char *device = NULL;
char *proto = NULL;
dmuci_get_value_by_section_string(s, "proto", &proto);
dmuci_get_value_by_section_string(s, "device", &device);
if (device && strcmp(device, curr_device) == 0) {
dmuci_delete_by_section(s, (proto && *proto == 0) ? NULL : "device", NULL);
break;
}
}
}
// Remove device bridge section
dmuci_delete_by_section(((struct bridge_args *)data)->bridge_sec, NULL, NULL);
break;
case DEL_ALL:
uci_foreach_option_eq_safe("network", "device", "type", "bridge", stmp, s) {
struct uci_section *ss = NULL;
struct uci_list *br_ports_list = NULL;
struct uci_section *dmmap_section = NULL;
char *bridge_inst = NULL;
@ -1603,6 +1632,22 @@ static int delObjBridgingBridge(char *refparam, struct dmctx *ctx, void *data, c
// Remove dmmap device bridge section
dmuci_delete_by_section(dmmap_section, NULL, NULL);
// Remove interface bridge that maps to this device
dmuci_get_value_by_section_string(s, "name", &curr_device);
if (curr_device && *curr_device) {
uci_foreach_sections("network", "interface", ss) {
char *device = NULL;
char *proto = NULL;
dmuci_get_value_by_section_string(ss, "proto", &proto);
dmuci_get_value_by_section_string(ss, "device", &device);
if (device && strcmp(device, curr_device) == 0) {
dmuci_delete_by_section(ss, (proto && *proto == 0) ? NULL : "device", NULL);
break;
}
}
}
// Remove device bridge section
dmuci_delete_by_section(s, NULL, NULL);
}

94
dmtree/tr181/ethernet.c
View file

@ -223,17 +223,22 @@ static void create_link(char *sec_name, char *mac_addr)
static int dmmap_synchronizeEthernetLink(struct dmctx *dmctx, DMNODE *parent_node, void *prev_data, char *prev_instance)
{
struct uci_section *s = NULL;
char *device, *macaddr;
char *proto, *device, *macaddr;
uci_foreach_sections("network", "interface", s) {
// Skip this interface section if its name=loopback
// Skip this interface section if its proto option is empty
dmuci_get_value_by_section_string(s, "proto", &proto);
if (*proto == 0)
continue;
// Skip this interface section if its name is equal to loopback
if (strcmp(section_name(s), "loopback") == 0)
continue;
// Skip this interface section if its ifname option contains '@'
// Skip this interface section if its device option contains '@' or is empty
dmuci_get_value_by_section_string(s, "device", &device);
if (strchr(device, '@'))
if (*device == 0 || strchr(device, '@'))
continue;
dmuci_get_value_by_section_string(s, "macaddr", &macaddr);
@ -956,10 +961,11 @@ static int get_EthernetLink_LastChange(char *refparam, struct dmctx *ctx, void *
static int get_EthernetLink_LowerLayers(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
{
char *linker = NULL;
dmuci_get_value_by_section_string((struct uci_section *)data, "LowerLayers", value);
if ((*value)[0] == '\0') {
char *linker = NULL;
char *device_s_type = NULL;
dmuci_get_value_by_section_string((struct uci_section *)data, "device", &linker);
@ -980,6 +986,10 @@ static int get_EthernetLink_LowerLayers(char *refparam, struct dmctx *ctx, void
if (macvlan) *macvlan = '\0';
adm_entry_get_linker_param(ctx, "Device.Ethernet.Interface.", linker, value);
}
} else {
adm_entry_get_linker_value(ctx, *value, &linker);
if (!linker || *linker == 0)
*value = "";
}
return 0;
}
@ -1036,46 +1046,66 @@ static int set_EthernetLink_LowerLayers(char *refparam, struct dmctx *ctx, void
char *bridge = strchr(br_linker, ':');
if (bridge) {
struct uci_section *s = NULL;
char br_inst[8] = {0};
char device[32] = {0};
char *device_name = NULL;
char *int_name = NULL;
char *linker = NULL;
char *dev_s_name = NULL;
char br_inst[8] = {0};
*bridge = '\0';
DM_STRNCPY(br_inst, br_linker+3, sizeof(br_inst));
dmuci_get_value_by_section_string((struct uci_section *)data, "section_name", &int_name);
dmuci_get_value_by_section_string((struct uci_section *)data, "linker", &linker);
//Generate the device name for bridge as br-<NETWORK>
snprintf(device, sizeof(device), "br-%s", (int_name && *int_name) ? int_name : linker);
if (*int_name) {
/* There is an IP.Interface Object maps to this Ethernet.Link. Object */
char old_device[16] = {0};
char new_device[16] = {0};
uci_foreach_sections("network", "interface", s) {
if (int_name && strcmp(section_name(s), int_name) == 0) {
dmuci_set_value_by_section(s, "device", device);
break;
}
}
snprintf(old_device, sizeof(old_device), "br-dev%s", br_inst);
snprintf(new_device, sizeof(new_device), "br-%s", int_name);
uci_path_foreach_option_eq(bbfdm, "dmmap_bridge_port", "bridge_port", "br_inst", br_inst, s) {
// Remove unused Interface section created by Bridge Object if it exists
uci_foreach_sections("network", "interface", s) {
char *device = NULL;
if (dev_s_name == NULL || *dev_s_name == '\0')
dmuci_get_value_by_section_string(s, "device_section_name", &dev_s_name);
dmuci_set_value_by_section(s, "device", device);
}
if (dev_s_name && *dev_s_name) {
uci_foreach_sections("network", "device", s) {
if (dev_s_name && strcmp(section_name(s), dev_s_name) == 0) {
dmuci_set_value_by_section(s, "name", device);
dmuci_get_value_by_section_string(s, "device", &device);
if (device && strcmp(device, old_device) == 0) {
dmuci_delete_by_section(s, NULL, NULL);
break;
}
}
}
}
dmuci_set_value_by_section((struct uci_section *)data, "device", device);
// Add device option to Interface section that maps to this Ethernet.Link. Object
s = get_origin_section_from_config("network", "interface", int_name);
dmuci_set_value_by_section(s, "device", new_device);
// Update all bridge_port section with the new device value
uci_path_foreach_option_eq(bbfdm, "dmmap_bridge_port", "bridge_port", "br_inst", br_inst, s) {
if (device_name == NULL || *device_name == '\0')
dmuci_get_value_by_section_string(s, "device_section_name", &device_name);
dmuci_set_value_by_section(s, "device", new_device);
}
// Update device section with the new name value
if (device_name && *device_name) {
s = get_origin_section_from_config("network", "device", device_name);
dmuci_set_value_by_section(s, "name", new_device);
}
dmuci_set_value_by_section((struct uci_section *)data, "device", new_device);
} else {
/* This is a new Ethernet.Link. Object so section_name is empty */
// Get the device value
uci_path_foreach_option_eq(bbfdm, "dmmap_bridge_port", "bridge_port", "br_inst", br_inst, s) {
dmuci_get_value_by_section_string(s, "device", &device_name);
if (device_name && *device_name)
break;
}
dmuci_set_value_by_section((struct uci_section *)data, "device", device_name ? device_name : "");
}
}
}
break;

15
dmtree/tr181/ip.c
View file

@ -1391,15 +1391,30 @@ static int set_IPInterface_LowerLayers(char *refparam, struct dmctx *ctx, void *
if (strcmp(device, linker_buf) != 0) {
struct uci_section *s = NULL;
// Remove unused Interface section created by Bridge Object if it exists
uci_foreach_sections("network", "interface", s) {
char *br_device = NULL;
dmuci_get_value_by_section_string(s, "device", &br_device);
if (br_device && strcmp(br_device, linker_buf) == 0) {
dmuci_delete_by_section(s, NULL, NULL);
break;
}
}
// Update all bridge_port section with the new device value
uci_path_foreach_option_eq(bbfdm, "dmmap_bridge_port", "bridge_port", "device", linker_buf, s) {
dmuci_set_value_by_section(s, "device", device);
}
// Update device section with the new name value
uci_foreach_option_eq("network", "device", "name", linker_buf, s) {
dmuci_set_value_by_section(s, "name", device);
}
// Update device option in dmmap section related to this Interface section
dmuci_set_value_by_section(eth_link_s, "device", device);
DM_STRNCPY(linker_buf, device, sizeof(linker_buf));
}
}