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 #3772 && #3773

Browse source 
- #3772: IP.Interfaces connected to Ehternet object is transparent
 - #3773: TR-181: Not possible to set IP.Interface.LowerLayers to an existing Ethernet.Link object
This commit is contained in:
Amin Ben Ramdhane 2020-11-13 11:56:57 +01:00
parent 40f7c52554
commit 192a2f48b0
2 changed files with 116 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
dmtree/tr181/ethernet.c
View file

@ -85,7 +85,7 @@ static int check_section_in_curr_section(char *curr_section, char *section)
static void add_section_in_curr_section(struct uci_section *dmmap_section, char *curr_section, char *section)
{
char section_list[128] = {0}, *p = section_list;
char section_list[256] = {0}, *p = section_list;
dmstrappendstr(p, curr_section);
dmstrappendchr(p, ',');
dmstrappendstr(p, section);
@ -127,9 +127,10 @@ static void create_link(char *sec_name, char *mac_addr)
/* For all the Ethernet link objects pointing to same Ethernet Interface, only one ethernet link */
char intf[32] = {0};
strncpy(intf, device, sizeof(intf) - 1);
char *p = strchr(intf, '.');
if (p != NULL) {
*p = '\0';
char *vid = strchr(intf, '.');
char *macvlan = strchr(intf, '_');
if (vid != NULL || !macvlan) {
if (vid) *vid = '\0';
struct uci_section *dmmap_section = is_device_section_exist(intf);
if (dmmap_section) {
char *section_name;

141
dmtree/tr181/ip.c
View file

@ -261,17 +261,54 @@ static char *get_ip_interface_last_instance(char *package, char *section, char*
return instance;
}
static int remove_interface_name_from_interface_list(struct uci_section *dmmap_sec, char *int_sec)
{
char *sec_name, intf_list[256], *p, *pch = NULL, *spch = NULL;
intf_list[0] = '\0';
dmuci_get_value_by_section_string(dmmap_sec, "section_name", &sec_name);
p = intf_list;
for (pch = strtok_r(sec_name, ",", &spch); pch; pch = strtok_r(NULL, ",", &spch)) {
if (strcmp(pch, int_sec) != 0) {
if (intf_list[0] != '\0')
dmstrappendchr(p, ',');
dmstrappendstr(p, pch);
}
}
dmstrappendend(p);
if (*intf_list != '\0') {
/* set section_name list */
dmuci_set_value_by_section(dmmap_sec, "section_name", intf_list);
} else {
/* remove dmmap section */
dmuci_delete_by_section(dmmap_sec, NULL, NULL);
}
return 0;
}
static int delete_ip_intertace_instance(struct uci_section *s)
{
struct uci_section *int_ss = NULL, *int_stmp = NULL;
char buf[32], *ifname;
char buf[32], *ifname, *int_sec_name = dmstrdup(section_name(s));
snprintf(buf, sizeof(buf), "@%s", section_name(s));
snprintf(buf, sizeof(buf), "@%s", int_sec_name);
/* remove section name from the list of dmmap ethernet link */
uci_path_foreach_sections_safe(bbfdm, DMMAP, "link", int_stmp, int_ss) {
char *sec_list;
dmuci_get_value_by_section_string(int_ss, "section_name", &sec_list);
if (strstr(sec_list, int_sec_name)) {
remove_interface_name_from_interface_list(int_ss, int_sec_name);
break;
}
}
uci_foreach_sections_safe("network", "interface", int_stmp, int_ss) {
dmuci_get_value_by_section_string(int_ss, "ifname", &ifname);
if (strcmp(section_name(int_ss), section_name(s)) != 0 && strcmp(ifname, buf) != 0)
if (strcmp(section_name(int_ss), int_sec_name) != 0 && strcmp(ifname, buf) != 0)
continue;
// Get dmmap section related to this interface section
@ -285,10 +322,14 @@ static int delete_ip_intertace_instance(struct uci_section *s)
// Check the type value ==> if bridge : there is a Bridging.Bridge. object mapped to this interface, remove only proto option from the section
// Check the type value ==> else : there is no Bridging.Bridge. object mapped to this interface, remove the section
if (strcmp(type, "bridge") == 0) {
/* type is bridge ==> remove only proto option from the interface section and ip instance option from dmmap section */
/* type is bridge */
/* remove only proto option from the interface section and ip instance option from dmmap section */
dmuci_set_value_by_section(int_ss, "proto", "");
dmuci_set_value_by_section(dmmap_section, "ip_int_instance", "");
} else {
/* type is not bridge */
/* Remove the device section corresponding to this interface if exists and no interface used it */
char *device = get_device( section_name(int_ss));
struct uci_section *ss = NULL, *stmp = NULL;
@ -314,7 +355,6 @@ static int delete_ip_intertace_instance(struct uci_section *s)
}
}
/* type is not bridge */
/* remove dmmap section related to this interface */
dmuci_delete_by_section(dmmap_section, NULL, NULL);
@ -363,6 +403,36 @@ static bool interface_section_with_dhcpv6_exists(const char *sec_name)
return false;
}
static void set_ip_interface_ifname_option(struct uci_section *section, char *linker, char *instance)
{
struct uci_section *s = NULL;
bool device_exists = false;
char ifname[64];
snprintf(ifname, sizeof(ifname), "%s.1", linker);
// Check if device exists
uci_foreach_option_eq("network", "device", "name", ifname, s) {
device_exists = true;
break;
}
// if device dosn't exist ==> create a new device section
if (!device_exists) {
char device_name[32], *val;
snprintf(device_name, sizeof(device_name), "dev_ip_int_%s", instance);
dmuci_add_section("network", "device", &s, &val);
dmuci_rename_section_by_section(s, device_name);
dmuci_set_value_by_section(s, "type", "untagged");
dmuci_set_value_by_section(s, "ifname", linker);
dmuci_set_value_by_section(s, "name", ifname);
}
dmuci_set_value_by_section(section, "ifname", ifname);
}
/*************************************************************
* ENTRY METHOD
**************************************************************/
@ -1266,43 +1336,54 @@ static int set_IPInterface_LowerLayers(char *refparam, struct dmctx *ctx, void *
// Get interface name from Ethernet.Link. object
struct uci_section *s = NULL;
char *interface, *ifname = NULL;
char *interface_list;
get_dmmap_section_of_config_section_eq("dmmap", "link", "device", linker, &s);
dmuci_get_value_by_section_string(s, "section_name", &interface);
dmuci_get_value_by_section_string(s, "section_name", &interface_list);
char *interface = strchr(interface_list, ',');
dmuci_get_value_by_section_string((struct uci_section *)data, "ifname", &ifname);
if (ifname && *ifname) {
// Update the new interface section with proto=dhcp
if (!interface) {
bool ip_interface_s = false;
// Update the new interface section with proto=dhcp if its proto is empty
uci_foreach_sections("network", "interface", s) {
if (strcmp(section_name(s), interface) == 0) {
dmuci_set_value_by_section(s, "proto", "dhcp");
if (strcmp(section_name(s), interface_list) == 0) {
char *proto, *type;
dmuci_get_value_by_section_string(s, "proto", &proto);
dmuci_get_value_by_section_string(s, "type", &type);
if (*proto == '\0') {
dmuci_set_value_by_section(s, "proto", "dhcp");
if (strcmp(type, "bridge") != 0)
set_ip_interface_ifname_option(s, linker, instance);
} else {
ip_interface_s = true;
}
break;
}
}
// Get dmmap section related to this interface section and remove it
struct uci_section *dmmap_section = NULL;
get_dmmap_section_of_config_section("dmmap_network", "interface", section_name((struct uci_section *)data), &dmmap_section);
if (!ip_interface_s) {
// Get dmmap section related to this interface section and remove it
struct uci_section *dmmap_section = NULL;
get_dmmap_section_of_config_section("dmmap_network", "interface", section_name((struct uci_section *)data), &dmmap_section);
// Get the current ip instance
char *ip_int_instance;
dmuci_get_value_by_section_string(dmmap_section, "ip_int_instance", &ip_int_instance);
// Get the current ip instance
char *ip_int_instance;
dmuci_get_value_by_section_string(dmmap_section, "ip_int_instance", &ip_int_instance);
// Get the new dmmap section related to the new interface section and update ip instance option
struct uci_section *new_dmmap_section = NULL;
get_dmmap_section_of_config_section("dmmap_network", "interface", interface, &new_dmmap_section);
dmuci_set_value_by_section(new_dmmap_section, "ip_int_instance", ip_int_instance);
// Get the new dmmap section related to the new interface section and update ip instance option
struct uci_section *new_dmmap_section = NULL;
get_dmmap_section_of_config_section("dmmap_network", "interface", interface_list, &new_dmmap_section);
dmuci_set_value_by_section(new_dmmap_section, "ip_int_instance", ip_int_instance);
// remove dmmap section
dmuci_delete_by_section(dmmap_section, NULL, NULL);
// remove the current interface section
dmuci_delete_by_section((struct uci_section *)data, NULL, NULL);
// remove dmmap section
dmuci_delete_by_section(dmmap_section, NULL, NULL);
// remove the current interface section
dmuci_delete_by_section((struct uci_section *)data, NULL, NULL);
} else {
set_ip_interface_ifname_option((struct uci_section *)data, linker, instance);
}
} else {
char *device = get_device(interface);
dmuci_set_value_by_section((struct uci_section *)data, "ifname", device);
set_ip_interface_ifname_option((struct uci_section *)data, linker, instance);
}
}
break;