diff --git a/libbbfdm/dmtree/tr181/ethernet.c b/libbbfdm/dmtree/tr181/ethernet.c
index c68ef9041df1d9522d77e59403a26088e2e34087..c1b0c39f49b618f15a2dc255864a065ca204efef 100644
--- a/libbbfdm/dmtree/tr181/ethernet.c
+++ b/libbbfdm/dmtree/tr181/ethernet.c
@@ -44,42 +44,42 @@ static inline int init_eth_rmon(struct eth_rmon_args *args, struct dmmap_dup *s,
/*************************************************************
* COMMON FUNCTIONS
**************************************************************/
-bool ethernet___check_vlan_termination_section(const char *name)
+struct uci_section *ethernet___get_ethernet_interface_section(const char *device_name)
{
struct uci_section *s = NULL;
- uci_foreach_option_eq("network", "device", "type", "bridge", s) {
- struct uci_list *uci_list = NULL;
-
- dmuci_get_value_by_section_list(s, "ports", &uci_list);
+ uci_foreach_sections("network", "device", s) {
+ char *name = NULL;
- if (uci_list == NULL)
+ if (!dmuci_is_option_value_empty(s, "type"))
continue;
- if (value_exists_in_uci_list(uci_list, name))
- return false;
+ dmuci_get_value_by_section_string(s, "name", &name);
+
+ if (DM_STRCMP(name, device_name) == 0)
+ return s;
}
- return true;
+ return NULL;
}
-struct uci_section *ethernet___get_ethernet_interface_section(const char *device_name)
+static bool check_vlan_termination_section(const char *name)
{
struct uci_section *s = NULL;
- uci_foreach_sections("network", "device", s) {
- char *name = NULL;
+ uci_foreach_option_eq("network", "device", "type", "bridge", s) {
+ struct uci_list *uci_list = NULL;
- if (!dmuci_is_option_value_empty(s, "type"))
- continue;
+ dmuci_get_value_by_section_list(s, "ports", &uci_list);
- dmuci_get_value_by_section_string(s, "name", &name);
+ if (uci_list == NULL)
+ continue;
- if (DM_STRCMP(name, device_name) == 0)
- return s;
+ if (value_exists_in_uci_list(uci_list, name))
+ return false;
}
- return NULL;
+ return true;
}
static int eth_iface_sysfs(const struct uci_section *data, const char *name, char **value)
@@ -277,7 +277,7 @@ static int browseEthernetVLANTerminationInst(struct dmctx *dmctx, DMNODE *parent
if (DM_STRLEN(type) == 0 ||
DM_LSTRCMP(type, "bridge") == 0 ||
DM_LSTRCMP(type, "macvlan") == 0 ||
- (*name != 0 && !ethernet___check_vlan_termination_section(name)) ||
+ (*name != 0 && !check_vlan_termination_section(name)) ||
(*name == 0 && strncmp(section_name(p->config_section), "br_", 3) == 0))
continue;
@@ -455,7 +455,7 @@ static int delObjEthernetVLANTermination(char *refparam, struct dmctx *ctx, void
if (DM_STRLEN(type) == 0 ||
DM_LSTRCMP(type, "bridge") == 0 ||
DM_LSTRCMP(type, "macvlan") == 0 ||
- (*name != 0 && !ethernet___check_vlan_termination_section(name)) ||
+ (*name != 0 && !check_vlan_termination_section(name)) ||
(*name == 0 && strncmp(section_name(s_dev), "br_", 3) == 0))
continue;
diff --git a/libbbfdm/dmtree/tr181/ethernet.h b/libbbfdm/dmtree/tr181/ethernet.h
index 118b05d8ee575bc4d057353af7e7b68b7a49e3ba..5e86140d0f95844875e7b487b44d9c974815f5af 100644
--- a/libbbfdm/dmtree/tr181/ethernet.h
+++ b/libbbfdm/dmtree/tr181/ethernet.h
@@ -29,6 +29,5 @@ extern DMLEAF tEthernetVLANTerminationStatsParams[];
extern DMLEAF tEthernetRMONStatsParams[];
struct uci_section *ethernet___get_ethernet_interface_section(const char *device_name);
-bool ethernet___check_vlan_termination_section(const char *name);
#endif //__ETHERNET_H
diff --git a/libbbfdm/dmtree/tr181/interfacestack.c b/libbbfdm/dmtree/tr181/interfacestack.c
index 805687f3bb0e4c930de839d494682b7d9b61ffdd..8648b2fb1543f3f8dd30aa1c3f0959b1506f455e 100644
--- a/libbbfdm/dmtree/tr181/interfacestack.c
+++ b/libbbfdm/dmtree/tr181/interfacestack.c
@@ -1,605 +1,237 @@
/*
- * Copyright (C) 2020 iopsys Software Solutions AB
+ * Copyright (C) 2023 iopsys Software Solutions AB
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License version 2.1
* as published by the Free Software Foundation
*
- * Author: Amin Ben Ramdhane <amin.benramdhane@pivasoftware.com>
+ * Author: Amin Ben Romdhane <amin.benromdhane@iopsys.eu>
*/
-#include "ethernet.h"
-#include "ip.h"
#include "interfacestack.h"
-struct interfacestack_data {
- char *lowerlayer;
- char *higherlayer;
- char *loweralias;
- char *higheralias;
+struct interfacestack_data
+{
+ char *HigherLayer;
+ char *LowerLayer;
+ char *HigherAlias;
+ char *LowerAlias;
};
/*************************************************************
-* ENTRY METHOD
+* COMMON FUNCTIONS
**************************************************************/
-static char *get_instance_by_section(int mode, char *dmmap_config, char *section, char *option, char *value, char *instance_option, char *alias_option)
-{
- struct uci_section *dmmap_section = NULL;
- char *instance = "";
-
- get_dmmap_section_of_config_section_eq(dmmap_config, section, option, value, &dmmap_section);
-
- if (mode == INSTANCE_MODE_NUMBER)
- dmuci_get_value_by_section_string(dmmap_section, instance_option, &instance);
- else
- dmuci_get_value_by_section_string(dmmap_section, alias_option, &instance);
-
- return instance;
-}
-
-static char *get_instance_by_section_option_condition(int mode, char *dmmap_config, char *section, char *option, char *value, char *instance_option, char *alias_option)
+static struct uci_section *get_bridge_management_port_section(char *instance)
{
- struct uci_section *dmmap_section = NULL;
- char *instance = "";
-
- get_dmmap_section_of_config_section_cont(dmmap_config, section, option, value, &dmmap_section);
-
- if (mode == INSTANCE_MODE_NUMBER)
- dmuci_get_value_by_section_string(dmmap_section, instance_option, &instance);
- else
- dmuci_get_value_by_section_string(dmmap_section, alias_option, &instance);
+ struct uci_section *s = NULL;
+ char *management = NULL;
- return instance;
-}
+ uci_path_foreach_option_eq(bbfdm, "dmmap_bridge_port", "bridge_port", "br_inst", instance, s) {
-static char *get_alias_by_section(char *dmmap_config, char *section, struct uci_section *s, char *alias_option)
-{
- struct uci_section *dmmap_section = NULL;
- char *alias = "";
+ dmuci_get_value_by_section_string(s, "management", &management);
+ if (DM_STRCMP(management, "1") == 0)
+ return s;
+ }
- get_dmmap_section_of_config_section(dmmap_config, section, section_name(s), &dmmap_section);
- dmuci_get_value_by_section_string(dmmap_section, alias_option, &alias);
- return alias;
+ return NULL;
}
-static char *get_alias_by_section_option_condition(char *dmmap_config, char *section, char *option, char *value, char *alias_option)
-{
- struct uci_section *dmmap_section = NULL;
- char *alias = "";
-
- get_dmmap_section_of_config_section_cont(dmmap_config, section, option, value, &dmmap_section);
- dmuci_get_value_by_section_string(dmmap_section, alias_option, &alias);
-
- return alias;
-}
-static struct uci_section *create_dmmap_interface_stack_section(char *curr_inst)
+static char *get_lower_alias_value(const char *path)
{
struct uci_section *s = NULL;
-
- uci_path_foreach_option_eq(bbfdm, "dmmap_interface_stack", "interface_stack", "interface_stack_instance", curr_inst, s) {
- return s;
- }
-
- if (!s) {
- dmuci_add_section_bbfdm("dmmap_interface_stack", "interface_stack", &s);
- dmuci_set_value_by_section_bbfdm(s, "interface_stack_instance", curr_inst);
+ char *alias_value = "";
+
+ if (DM_STRLEN(path) == 0)
+ return "";
+
+ char *instance = DM_STRRCHR(path, '.');
+ if (!instance)
+ return "";
+
+ if (DM_STRNCMP(path, "Device.IP.Interface.", strlen("Device.IP.Interface.")) == 0) {
+ get_dmmap_section_of_config_section_eq("dmmap_network", "interface", "ip_int_instance", instance + 1, &s);
+ dmuci_get_value_by_section_string(s, "ip_int_alias", &alias_value);
+ } else if (DM_STRNCMP(path, "Device.Ethernet.Link.", strlen("Device.Ethernet.Link.")) == 0) {
+ get_dmmap_section_of_config_section_eq("dmmap_ethernet", "link", "link_instance", instance + 1, &s);
+ dmuci_get_value_by_section_string(s, "link_alias", &alias_value);
+ } else if (DM_STRNCMP(path, "Device.Ethernet.Interface.", strlen("Device.Ethernet.Interface.")) == 0) {
+ get_dmmap_section_of_config_section_eq("dmmap_ethernet", "device", "eth_iface_instance", instance + 1, &s);
+ dmuci_get_value_by_section_string(s, "eth_iface_alias", &alias_value);
+ } else if (DM_STRNCMP(path, "Device.Bridging.Bridge.", strlen("Device.Bridging.Bridge.")) == 0) {
+ regmatch_t pmatch[1] = {0};
+ char *port_inst = NULL;
+ char br_inst[8] = {0};
+
+ bool res = match(path, "([0-9]+)", 1, pmatch);
+ if (res) {
+ DM_STRNCPY(br_inst, &path[pmatch[0].rm_so], pmatch[0].rm_eo - pmatch[0].rm_so + 1);
+ if (DM_STRLEN(br_inst) == 0)
+ return "";
+
+ uci_path_foreach_option_eq(bbfdm, "dmmap_bridge_port", "bridge_port", "br_inst", br_inst, s) {
+ dmuci_get_value_by_section_string(s, "bridge_port_instance", &port_inst);
+ if (DM_STRCMP(port_inst, instance + 1) == 0) {
+ dmuci_get_value_by_section_string(s, "bridge_port_alias", &alias_value);
+ break;
+ }
+ }
+ }
+ } else if (DM_STRNCMP(path, "Device.WiFi.SSID.", strlen("Device.WiFi.SSID.")) == 0) {
+ get_dmmap_section_of_config_section_eq("dmmap_wireless", "ssid", "ssid_instance", instance + 1, &s);
+ dmuci_get_value_by_section_string(s, "ssid_alias", &alias_value);
+ } else if (DM_STRNCMP(path, "Device.WiFi.Radio.", strlen("Device.WiFi.Radio.")) == 0) {
+ get_dmmap_section_of_config_section_eq("dmmap_wireless", "wifi-device", "radioinstance", instance + 1, &s);
+ dmuci_get_value_by_section_string(s, "radioalias", &alias_value);
+ } else if (DM_STRNCMP(path, "Device.Ethernet.VLANTermination.", strlen("Device.Ethernet.VLANTermination.")) == 0) {
+ get_dmmap_section_of_config_section_eq("dmmap_network", "device", "vlan_term_instance", instance + 1, &s);
+ dmuci_get_value_by_section_string(s, "vlan_term_alias", &alias_value);
+ } else if (DM_STRNCMP(path, "Device.PPP.Interface.", strlen("Device.PPP.Interface.")) == 0) {
+ get_dmmap_section_of_config_section_eq("dmmap_ppp", "interface", "ppp_int_instance", instance + 1, &s);
+ dmuci_get_value_by_section_string(s, "ppp_int_alias", &alias_value);
+ } else if (DM_STRNCMP(path, "Device.Ethernet."BBF_VENDOR_PREFIX"MACVLAN.", strlen("Device.Ethernet."BBF_VENDOR_PREFIX"MACVLAN.")) == 0) {
+ get_dmmap_section_of_config_section_eq("dmmap_network", "device", "mac_vlan_instance", instance + 1, &s);
+ dmuci_get_value_by_section_string(s, "mac_vlan_alias", &alias_value);
}
- return s;
+ return alias_value;
}
-static int create_and_link_interface_stack_instance(struct dmctx *dmctx, DMNODE *parent_node, char *higherlayer, char *lowerlayer, char *higheralias, char *loweralias, int *instance)
+static int create_interface_stack_instance(struct dmctx *dmctx, DMNODE *parent_node,
+ struct interfacestack_data *data, struct uci_section *s,
+ char *path, char *inst_number, char *inst_alias, int *curr_inst)
{
- struct interfacestack_data intf_stack_data = {0};
- char buf_instance[16] = {0};
+ char *instance = NULL, *inst = NULL;
- // fill interface stack data
- intf_stack_data.higherlayer = higherlayer ? higherlayer : "";
- intf_stack_data.lowerlayer = lowerlayer ? lowerlayer : "";
- intf_stack_data.higheralias = higheralias ? higheralias : "";
- intf_stack_data.loweralias = loweralias ? loweralias : "";
+ if (!s || !data || !path || !inst_number || !inst_alias)
+ goto end;
- // create dmmap section
- snprintf(buf_instance, sizeof(buf_instance), "%d", ++(*instance));
- struct uci_section *dmmap_s = create_dmmap_interface_stack_section(buf_instance);
+ dmuci_get_value_by_section_string(s, inst_number, &instance);
+ if (DM_STRLEN(instance) == 0)
+ goto end;
- // link instance to interface stack data
- char *inst = handle_instance(dmctx, parent_node, dmmap_s, "interface_stack_instance", "interface_stack_alias");
+ dmasprintf(&data->HigherLayer, "%s%s", path, instance);
+ dmuci_get_value_by_section_string(s, inst_alias, &data->HigherAlias);
+ dmuci_get_value_by_section_string(s, "LowerLayers", &data->LowerLayer);
+ data->LowerAlias = get_lower_alias_value(data->LowerLayer);
- if (DM_LINK_INST_OBJ(dmctx, parent_node, (void *)&intf_stack_data, inst) == DM_STOP)
+ inst = handle_instance_without_section(dmctx, parent_node, ++(*curr_inst));
+ if (DM_LINK_INST_OBJ(dmctx, parent_node, (void *)data, inst) == DM_STOP)
return -1;
+end:
return 0;
}
+/*************************************************************
+* ENTRY METHOD
+**************************************************************/
int browseInterfaceStackInst(struct dmctx *dmctx, DMNODE *parent_node, void *prev_data, char *prev_instance)
{
+ struct interfacestack_data curr_interfacestack_data = {0};
struct uci_section *s = NULL;
- char *layer_inst = "", *loweralias = "", *higheralias = "";
- char buf_lowerlayer[128] = {0};
- char buf_higherlayer[128] = {0};
- char buf_higheralias[64] = {0};
- char buf_loweralias[64] = {0};
- int instance = 0;
-
- /* Higher layers are Device.IP.Interface.{i}. */
- uci_foreach_sections("network", "interface", s) {
- char *proto = NULL;
- char *device_s = NULL;
- char *value = NULL;
- bool found = false;
- char *device = get_device(section_name(s));
-
- dmuci_get_value_by_section_string(s, "proto", &proto);
- dmuci_get_value_by_section_string(s, "device", &device_s);
-
- if (strcmp(section_name(s), "loopback") == 0 ||
- *proto == '\0' ||
- DM_STRCHR(device_s, '@') ||
- ip___is_ipinterface_exists(section_name(s), device_s))
- continue;
+ int idx = 0;
- // The higher layer is Device.IP.Interface.{i}.
- layer_inst = get_instance_by_section(dmctx->instance_mode, "dmmap_network", "interface", "section_name", section_name(s), "ip_int_instance", "ip_int_alias");
- if (*layer_inst == '\0')
- continue;
-
- snprintf(buf_higherlayer, sizeof(buf_higherlayer), "Device.IP.Interface.%s", layer_inst);
-
- higheralias = get_alias_by_section("dmmap_network", "interface", s, "ip_int_alias");
- snprintf(buf_higheralias, sizeof(buf_higheralias), "%s%s", *higheralias ? higheralias : *layer_inst ? "cpe-" : "", (*higheralias == '\0' && *layer_inst) ? layer_inst : "");
-
- /* If the device value is empty, then get its value directly from device option */
- if (DM_STRLEN(device) == 0) device = device_s;
-
- if (DM_STRLEN(device) == 0)
- continue;
-
- struct uci_section *dev_s = get_dup_section_in_config_opt("network", "device", "name", device);
+ /* Higher Layer is Device.IP.Interface.{i}. */
+ uci_path_foreach_sections(bbfdm, "dmmap_network", "interface", s) {
- // The lower layer is Device.PPP.Interface.{i}.
- adm_entry_get_linker_param(dmctx, "Device.PPP.Interface.", device, &value);
- if (DM_STRLEN(value)) {
- found = true;
- loweralias = get_alias_by_section_option_condition("dmmap_ppp", "interface", "iface_name", section_name(s), "ppp_int_alias");
- layer_inst = get_instance_by_section(dmctx->instance_mode, "dmmap_ppp", "interface", "iface_name", section_name(s), "ppp_int_instance", "ppp_int_alias");
- }
-
- // The lower layer is Device.Ethernet.X_IOPSYS_EU_MACVLAN.{i}.
- if (found == false) {
- adm_entry_get_linker_param(dmctx, "Device.Ethernet."BBF_VENDOR_PREFIX"MACVLAN", device, &value);
- if (DM_STRLEN(value)) {
- found = true;
- loweralias = get_alias_by_section("dmmap_network", "device", dev_s, "mac_vlan_alias");
- layer_inst = get_instance_by_section(dmctx->instance_mode, "dmmap_network", "device", "section_name", section_name(dev_s), "mac_vlan_instance", "mac_vlan_alias");
- }
- }
-
- // The lower layer is Device.Ethernet.VLANTermination.{i}.
- if (found == false) {
- adm_entry_get_linker_param(dmctx, "Device.Ethernet.VLANTermination.", device, &value);
- if (DM_STRLEN(value)) {
- found = true;
- loweralias = get_alias_by_section("dmmap_network", "device", dev_s, "vlan_term_alias");
- layer_inst = get_instance_by_section(dmctx->instance_mode, "dmmap_network", "device", "section_name", section_name(dev_s), "vlan_term_instance", "vlan_term_alias");
- }
- }
-
- // The lower layer is Device.Ethernet.Link.{i}.
- if (found == false) {
- adm_entry_get_linker_param(dmctx, "Device.Ethernet.Link.", device, &value);
- loweralias = get_alias_by_section_option_condition("dmmap_ethernet", "link", "device", device, "link_alias");
- layer_inst = get_instance_by_section_option_condition(dmctx->instance_mode, "dmmap_ethernet", "link", "device", device, "link_instance", "link_alias");
- }
-
- snprintf(buf_lowerlayer, sizeof(buf_lowerlayer), "%s", value ? value : "");
- snprintf(buf_loweralias, sizeof(buf_loweralias), "%s%s", *loweralias ? loweralias : *layer_inst ? "cpe-" : "", (*loweralias == '\0' && *layer_inst) ? layer_inst : "");
-
- if (create_and_link_interface_stack_instance(dmctx, parent_node, buf_higherlayer, buf_lowerlayer, buf_higheralias, buf_loweralias, &instance))
+ if (create_interface_stack_instance(dmctx, parent_node, &curr_interfacestack_data, s,
+ "Device.IP.Interface.", "ip_int_instance", "ip_int_alias", &idx))
goto end;
}
- /* Higher layers are Device.PPP.Interface.{i}. */
+ /* Higher Layer is Device.PPP.Interface.{i}. */
uci_path_foreach_sections(bbfdm, "dmmap_ppp", "interface", s) {
- char *ppp_device = NULL;
- char *value = NULL;
- bool found = false;
-
- dmuci_get_value_by_section_string(s, "device", &ppp_device);
- if (DM_STRLEN(ppp_device) == 0)
- continue;
-
- // The higher layer is Device.PPP.Interface.{i}.
- dmuci_get_value_by_section_string(s, "ppp_int_instance", &layer_inst);
- if (*layer_inst == '\0')
- continue;
-
- snprintf(buf_higherlayer, sizeof(buf_higherlayer), "Device.PPP.Interface.%s", layer_inst);
-
- dmuci_get_value_by_section_string(s, "ppp_int_alias", &higheralias);
- snprintf(buf_higheralias, sizeof(buf_higheralias), "%s%s", *higheralias ? higheralias : *layer_inst ? "cpe-" : "", (*higheralias == '\0' && *layer_inst) ? layer_inst : "");
-
- struct uci_section *dev_s = get_dup_section_in_config_opt("network", "device", "name", ppp_device);
-
- // The lower layer is Device.Ethernet.X_IOPSYS_EU_MACVLAN.{i}.
- adm_entry_get_linker_param(dmctx, "Device.Ethernet."BBF_VENDOR_PREFIX"MACVLAN", ppp_device, &value);
- if (DM_STRLEN(value)) {
- found = true;
- loweralias = get_alias_by_section("dmmap_network", "device", dev_s, "mac_vlan_alias");
- layer_inst = get_instance_by_section(dmctx->instance_mode, "dmmap_network", "device", "section_name", section_name(dev_s), "mac_vlan_instance", "mac_vlan_alias");
- }
-
- // The lower layer is Device.Ethernet.VLANTermination.{i}.
- if (found == 0) {
- adm_entry_get_linker_param(dmctx, "Device.Ethernet.VLANTermination.", ppp_device, &value);
- if (DM_STRLEN(value)) {
- found = true;
- loweralias = get_alias_by_section("dmmap_network", "device", dev_s, "vlan_term_alias");
- layer_inst = get_instance_by_section(dmctx->instance_mode, "dmmap_network", "device", "section_name", section_name(dev_s), "vlan_term_instance", "vlan_term_alias");
- }
- }
- if (found == 0) {
- // The lower layer is Device.Ethernet.Link.{i}.
- adm_entry_get_linker_param(dmctx, "Device.Ethernet.Link.", ppp_device, &value);
- loweralias = get_alias_by_section_option_condition("dmmap_ethernet", "link", "device", ppp_device, "link_alias");
- layer_inst = get_instance_by_section_option_condition(dmctx->instance_mode, "dmmap_ethernet", "link", "device", ppp_device, "link_instance", "link_alias");
- }
-
- snprintf(buf_lowerlayer, sizeof(buf_lowerlayer), "%s", value ? value : "");
- snprintf(buf_loweralias, sizeof(buf_loweralias), "%s%s", *loweralias ? loweralias : *layer_inst ? "cpe-" : "", (*loweralias == '\0' && *layer_inst) ? layer_inst : "");
-
- if (create_and_link_interface_stack_instance(dmctx, parent_node, buf_higherlayer, buf_lowerlayer, buf_higheralias, buf_loweralias, &instance))
+ if (create_interface_stack_instance(dmctx, parent_node, &curr_interfacestack_data, s,
+ "Device.PPP.Interface.", "ppp_int_instance", "ppp_int_alias", &idx))
goto end;
}
- /* Higher layers are Device.Ethernet.X_IOPSYS_EU_MACVLAN.{i}. */
- uci_foreach_option_eq("network", "device", "type", "macvlan", s) {
- char *value = NULL;
- char *ifname = NULL;
- bool found = false;
-
- // The higher layer is Device.Ethernet.X_IOPSYS_EU_MACVLAN.{i}.
- layer_inst = get_instance_by_section(dmctx->instance_mode, "dmmap_network", "device", "section_name", section_name(s), "mac_vlan_instance", "mac_vlan_alias");
- if (*layer_inst == '\0')
- continue;
-
- dmuci_get_value_by_section_string(s, "ifname", &ifname);
- if (DM_STRLEN(ifname) == 0)
- continue;
-
- snprintf(buf_higherlayer, sizeof(buf_higherlayer), "Device.Ethernet."BBF_VENDOR_PREFIX"MACVLAN.%s", layer_inst);
+ /* Higher Layer is Device.Ethernet.X_IOPSYS_EU_MACVLAN.{i}. */
+ uci_path_foreach_sections(bbfdm, "dmmap_network", "device", s) {
- higheralias = get_alias_by_section("dmmap_network", "device", s, "mac_vlan_alias");
- snprintf(buf_higheralias, sizeof(buf_higheralias), "%s%s", *higheralias ? higheralias : *layer_inst ? "cpe-" : "", (*higheralias == '\0' && *layer_inst) ? layer_inst : "");
-
- // The lower layer is Device.Ethernet.VLANTermination.{i}.
- adm_entry_get_linker_param(dmctx, "Device.Ethernet.VLANTermination.", ifname, &value);
- if (DM_STRLEN(value)) {
- found = true;
- struct uci_section *dev_s = get_dup_section_in_config_opt("network", "device", "name", ifname);
- loweralias = get_alias_by_section("dmmap_network", "device", dev_s, "vlan_term_alias");
- layer_inst = get_instance_by_section(dmctx->instance_mode, "dmmap_network", "device", "section_name", section_name(dev_s), "vlan_term_instance", "vlan_term_alias");
- }
-
- if (found == 0) {
- // The lower layer is Device.Ethernet.Link.{i}.
- adm_entry_get_linker_param(dmctx, "Device.Ethernet.Link.", ifname, &value);
- loweralias = get_alias_by_section_option_condition("dmmap_ethernet", "link", "device", ifname, "link_alias");
- layer_inst = get_instance_by_section_option_condition(dmctx->instance_mode, "dmmap_ethernet", "link", "device", ifname, "link_instance", "link_alias");
- }
-
- snprintf(buf_lowerlayer, sizeof(buf_lowerlayer), "%s", value ? value : "");
- snprintf(buf_loweralias, sizeof(buf_loweralias), "%s%s", *loweralias ? loweralias : *layer_inst ? "cpe-" : "", (*loweralias == '\0' && *layer_inst) ? layer_inst : "");
-
- if (create_and_link_interface_stack_instance(dmctx, parent_node, buf_higherlayer, buf_lowerlayer, buf_higheralias, buf_loweralias, &instance))
+ if (create_interface_stack_instance(dmctx, parent_node, &curr_interfacestack_data, s,
+ "Device.Ethernet."BBF_VENDOR_PREFIX"MACVLAN.", "mac_vlan_instance", "mac_vlan_alias", &idx))
goto end;
}
- /* Higher layers are Device.Ethernet.VLANTermination.{i}. */
- uci_foreach_sections("network", "device", s) {
- char *type = NULL, *name = NULL, *ifname = NULL, *value = NULL;
-
- dmuci_get_value_by_section_string(s, "type", &type);
- dmuci_get_value_by_section_string(s, "name", &name);
- dmuci_get_value_by_section_string(s, "ifname", &ifname);
- if (DM_STRLEN(type) == 0 ||
- DM_LSTRCMP(type, "bridge") == 0 ||
- DM_LSTRCMP(type, "macvlan") == 0 ||
- (*name != 0 && !ethernet___check_vlan_termination_section(name)) ||
- (*name == 0 && strncmp(section_name(s), "br_", 3) == 0))
- continue;
-
- // The higher layer is Device.Ethernet.VLANTermination.{i}.
- layer_inst = get_instance_by_section(dmctx->instance_mode, "dmmap_network", "device", "section_name", section_name(s), "vlan_term_instance", "vlan_term_alias");
- if (*layer_inst == '\0')
- continue;
-
- snprintf(buf_higherlayer, sizeof(buf_higherlayer), "Device.Ethernet.VLANTermination.%s", layer_inst);
-
- higheralias = get_alias_by_section("dmmap_network", "device", s, "vlan_term_alias");
- snprintf(buf_higheralias, sizeof(buf_higheralias), "%s%s", *higheralias ? higheralias : *layer_inst ? "cpe-" : "", (*higheralias == '\0' && *layer_inst) ? layer_inst : "");
+ /* Higher Layer is Device.Ethernet.VLANTermination.{i}. */
+ uci_path_foreach_sections(bbfdm, "dmmap_network", "device", s) {
- if (DM_LSTRNCMP(type, "8021ad", 6) == 0) {
- // The lower layer is Device.Ethernet.VLANTermination.{i}.
- struct uci_section *dev_s = get_dup_section_in_config_opt("network", "device", "name", ifname);
-
- adm_entry_get_linker_param(dmctx, "Device.Ethernet.VLANTermination.", ifname, &value);
- loweralias = get_alias_by_section("dmmap_network", "device", dev_s, "vlan_term_alias");
- layer_inst = get_instance_by_section(dmctx->instance_mode, "dmmap_network", "device", "section_name", section_name(dev_s), "vlan_term_instance", "vlan_term_alias");
- } else {
- // The lower layer is Device.Ethernet.Link.{i}.
- adm_entry_get_linker_param(dmctx, "Device.Ethernet.Link.", ifname, &value);
- loweralias = get_alias_by_section_option_condition("dmmap_ethernet", "link", "device", ifname, "link_alias");
- layer_inst = get_instance_by_section_option_condition(dmctx->instance_mode, "dmmap_ethernet", "link", "device", ifname, "link_instance", "link_alias");
- }
-
- snprintf(buf_lowerlayer, sizeof(buf_lowerlayer), "%s", value ? value : "");
- snprintf(buf_loweralias, sizeof(buf_loweralias), "%s%s", *loweralias ? loweralias : *layer_inst ? "cpe-" : "", (*loweralias == '\0' && *layer_inst) ? layer_inst : "");
-
- if (create_and_link_interface_stack_instance(dmctx, parent_node, buf_higherlayer, buf_lowerlayer, buf_higheralias, buf_loweralias, &instance))
+ if (create_interface_stack_instance(dmctx, parent_node, &curr_interfacestack_data, s,
+ "Device.Ethernet.VLANTermination.", "vlan_term_instance", "vlan_term_alias", &idx))
goto end;
}
- /* Higher layers are Device.Ethernet.Link.{i}. */
+ /* Higher Layer is Device.Ethernet.Link.{i}. */
uci_path_foreach_sections(bbfdm, "dmmap_ethernet", "link", s) {
- char *linker = NULL;
- char *value = NULL;
- bool found = false;
-
- // The higher layer is Device.Ethernet.Link.{i}.
- dmuci_get_value_by_section_string(s, "link_instance", &layer_inst);
- if (*layer_inst == '\0')
- continue;
-
- snprintf(buf_higherlayer, sizeof(buf_higherlayer), "Device.Ethernet.Link.%s", layer_inst);
-
- dmuci_get_value_by_section_string(s, "link_alias", &higheralias);
- snprintf(buf_higheralias, sizeof(buf_higheralias), "%s%s", *higheralias ? higheralias : *layer_inst ? "cpe-" : "", (*higheralias == '\0' && *layer_inst) ? layer_inst : "");
-
- dmuci_get_value_by_section_string(s, "device", &linker);
- if (DM_STRLEN(linker) == 0)
- continue;
- // The lower layer is Device.Bridging.Bridge.{i}.Port.{i}.
- adm_entry_get_linker_param(dmctx, "Device.Bridging.Bridge.", linker, &value);
- if (DM_STRLEN(value)) {
- found = true;
- struct uci_section *port_s = get_dup_section_in_dmmap_opt("dmmap_bridge_port", "bridge_port", "port", linker);
- dmuci_get_value_by_section_string(port_s, "bridge_port_alias", &loweralias);
- dmuci_get_value_by_section_string(port_s, "bridge_port_instance", &layer_inst);
- }
-
- // The lower layer is Device.Ethernet.Interface.{i}.
- if (found == false) {
- adm_entry_get_linker_param(dmctx, "Device.Ethernet.Interface.", linker, &value);
- struct uci_section *port_s = ethernet___get_ethernet_interface_section(linker);
- loweralias = get_alias_by_section("dmmap_ethernet", "device", port_s, "eth_iface_alias");
- layer_inst = get_instance_by_section(dmctx->instance_mode, "dmmap_ethernet", "device", "section_name", section_name(port_s), "eth_iface_instance", "eth_iface_alias");
- }
-
- snprintf(buf_lowerlayer, sizeof(buf_lowerlayer), "%s", value ? value : "");
- snprintf(buf_loweralias, sizeof(buf_loweralias), "%s%s", *loweralias ? loweralias : *layer_inst ? "cpe-" : "", (*loweralias == '\0' && *layer_inst) ? layer_inst : "");
-
- if (create_and_link_interface_stack_instance(dmctx, parent_node, buf_higherlayer, buf_lowerlayer, buf_higheralias, buf_loweralias, &instance))
+ if (create_interface_stack_instance(dmctx, parent_node, &curr_interfacestack_data, s,
+ "Device.Ethernet.Link.", "link_instance", "link_alias", &idx))
goto end;
}
- /* Higher layers are Device.Bridging.Bridge.{i}.Port.{i}.*/
+ /* Higher Layer is Device.Bridging.Bridge.{i}.Port.{i}.*/
uci_path_foreach_sections(bbfdm, "dmmap_bridge", "device", s) {
- char *br_inst = NULL;
-
- dmuci_get_value_by_section_string(s, "bridge_instance", &br_inst);
-
- if (br_inst && *br_inst == '\0')
+ struct uci_section *port_s = NULL;
+ char *br_instance = NULL;
+ char *mg_port_instnace = NULL;
+ char *mg_port_alias = NULL;
+ char *inst = NULL;
+
+ dmuci_get_value_by_section_string(s, "bridge_instance", &br_instance);
+ if (DM_STRLEN(br_instance) == 0)
continue;
- // The higher layer is Device.Bridging.Bridge.{i}.Port.{i}.
- char *bridge_port_inst, *mg_value = NULL,*value = NULL;
- char buf_mngr[64] = {0};
- struct uci_section *port = NULL;
- uci_path_foreach_option_eq(bbfdm, "dmmap_bridge_port", "bridge_port", "br_inst", br_inst, port) {
- char *mg = NULL;
-
- dmuci_get_value_by_section_string(port, "management", &mg);
- if (DM_LSTRCMP(mg, "1") == 0) {
- char *device = NULL;
+ struct uci_section *mg_port_s = get_bridge_management_port_section(br_instance);
+ if (!mg_port_s)
+ continue;
- dmuci_get_value_by_section_string(port, "port", &device);
+ dmuci_get_value_by_section_string(mg_port_s, "bridge_port_instance", &mg_port_instnace);
+ dmuci_get_value_by_section_string(mg_port_s, "bridge_port_alias", &mg_port_alias);
- adm_entry_get_linker_param(dmctx, "Device.Bridging.Bridge.", device, &mg_value);
- dmuci_get_value_by_section_string(port, "bridge_port_alias", &higheralias);
- dmuci_get_value_by_section_string(port, "bridge_port_instance", &bridge_port_inst);
+ uci_path_foreach_option_eq(bbfdm, "dmmap_bridge_port", "bridge_port", "br_inst", br_instance, port_s) {
+ char *management = NULL;
+ char *instance_value = NULL;
+ char *alias_value = NULL;
+ char *config = NULL;
+ char path[128] = {0};
- snprintf(buf_mngr, sizeof(buf_mngr), "%s%s", *higheralias ? higheralias : *bridge_port_inst ? "cpe-" : "", (*higheralias == '\0' && *bridge_port_inst) ? bridge_port_inst : "");
- break;
- }
- }
-
- struct uci_section *sd = NULL;
- uci_path_foreach_option_eq(bbfdm, "dmmap_bridge_port", "bridge_port", "br_inst", br_inst, sd) {
- char *mg = NULL, *vb = NULL, *device = NULL;
- dmuci_get_value_by_section_string(sd, "management", &mg);
- if (DM_LSTRCMP(mg, "1") == 0)
+ dmuci_get_value_by_section_string(port_s, "management", &management);
+ if (DM_STRCMP(management, "1") == 0)
continue;
- dmuci_get_value_by_section_string(sd, "port", &device);
-
- // The lower layer is Device.Bridging.Bridge.{i}.Port.{i}.
- adm_entry_get_linker_param(dmctx, "Device.Bridging.Bridge.", section_name(sd), &vb);
- dmuci_get_value_by_section_string(sd, "bridge_port_alias", &loweralias);
- dmuci_get_value_by_section_string(sd, "bridge_port_instance", &bridge_port_inst);
+ dmuci_get_value_by_section_string(port_s, "bridge_port_instance", &instance_value);
+ dmuci_get_value_by_section_string(port_s, "bridge_port_alias", &alias_value);
- snprintf(buf_loweralias, sizeof(buf_loweralias), "%s%s", *loweralias ? loweralias : *bridge_port_inst ? "cpe-" : "", (*loweralias == '\0' && *bridge_port_inst) ? bridge_port_inst : "");
+ dmasprintf(&curr_interfacestack_data.HigherLayer, "Device.Bridging.Bridge.%s.Port.%s", br_instance, mg_port_instnace);
+ curr_interfacestack_data.HigherAlias = mg_port_alias;
+ dmasprintf(&curr_interfacestack_data.LowerLayer, "Device.Bridging.Bridge.%s.Port.%s", br_instance, instance_value);
+ curr_interfacestack_data.LowerAlias = alias_value;
- if (create_and_link_interface_stack_instance(dmctx, parent_node, mg_value, vb, buf_mngr, buf_loweralias, &instance))
+ inst = handle_instance_without_section(dmctx, parent_node, ++idx);
+ if (DM_LINK_INST_OBJ(dmctx, parent_node, (void *)&curr_interfacestack_data, inst) == DM_STOP)
goto end;
- snprintf(buf_higheralias, sizeof(buf_higheralias), "%s%s", *loweralias ? loweralias : *bridge_port_inst ? "cpe-" : "", (*loweralias == '\0' && *bridge_port_inst) ? bridge_port_inst : "");
-
- char package[32] = {0};
- int found = 0;
- // The lower layer is Device.Ethernet.Interface.{i}.
- adm_entry_get_linker_param(dmctx, "Device.Ethernet.Interface.", device, &value);
- if (value != NULL) {
- DM_STRNCPY(package, "ports", sizeof(package));
- struct uci_section *port_s = ethernet___get_ethernet_interface_section(device);
- if (port_s) {
- loweralias = get_alias_by_section("dmmap_ethernet", "device", port_s, "eth_iface_alias");
- bridge_port_inst = get_instance_by_section(dmctx->instance_mode, "dmmap_ethernet", "device", "section_name", section_name(port_s), "eth_iface_instance", "eth_iface_alias");
- }
- found = 1;
- }
-
- // The lower layer is Device.WiFi.SSID.{i}.
- if (!found && value == NULL) {
- struct uci_section *iface_s = get_dup_section_in_config_opt("wireless", "wifi-iface", "ifname", device);
- if (iface_s)
- adm_entry_get_linker_param(dmctx, "Device.WiFi.SSID.", section_name(iface_s), &value);
- }
-
- if (!found && value != NULL) {
- DM_STRNCPY(package, "wireless", sizeof(package));
- struct uci_section *wl_s = get_dup_section_in_dmmap_opt("dmmap_wireless", "ssid", "ifname", device);
- dmuci_get_value_by_section_string(wl_s, "ssid_alias", &loweralias);
- bridge_port_inst = get_instance_by_section(dmctx->instance_mode, "dmmap_wireless", "ssid", "ifname", device, "ssid_instance", "ssid_alias");
- found = 1;
- }
-
- // The lower layer is Device.ATM.Link.{i}.
- if (!found && value == NULL) {
- char *tag = DM_STRRCHR(device, '.');
- if (tag) *tag = '\0';
- adm_entry_get_linker_param(dmctx, "Device.ATM.Link.", device, &value);
- }
-
- if (!found && value != NULL) {
- DM_STRNCPY(package, "dsl:atm", sizeof(package));
- struct uci_section *dsl_s = NULL;
- uci_foreach_option_eq("dsl", "atm-device", "device", device, dsl_s) {
- loweralias = get_alias_by_section("dmmap_dsl", "atm-device", dsl_s, "atmlinkalias");
- bridge_port_inst = get_instance_by_section(dmctx->instance_mode, "dmmap_dsl", "atm-device", "section_name", section_name(dsl_s), "atmlinkinstance", "atmlinkalias");
- break;
- }
- found = 1;
- }
-
- // The lower layer is Device.PTM.Link.{i}.
- if (!found && value == NULL) {
- char *tag = DM_STRRCHR(device, '.');
- if (tag) *tag = '\0';
- adm_entry_get_linker_param(dmctx, "Device.PTM.Link.", device, &value);
- }
-
- if (!found && value != NULL) {
- DM_STRNCPY(package, "dsl:ptm", sizeof(package));
- struct uci_section *dsl_s = NULL;
- uci_foreach_option_eq("dsl", "ptm-device", "device", device, dsl_s) {
- loweralias = get_alias_by_section("dmmap_dsl", "ptm-device", dsl_s, "ptmlinkalias");
- bridge_port_inst = get_instance_by_section(dmctx->instance_mode, "dmmap_dsl", "ptm-device", "section_name", section_name(dsl_s), "ptmlinkinstance", "ptmlinkalias");
- break;
- }
- found = 1;
- }
-
- // The lower layer is Device.Ethernet.Interface.{i}.
- if (!found && value == NULL) {
- char *tag = DM_STRRCHR(device, '.');
- if (tag) *tag = '\0';
- adm_entry_get_linker_param(dmctx, "Device.Ethernet.Interface.", device, &value);
- }
-
- if (!found && value != NULL) {
- DM_STRNCPY(package, "ports", sizeof(package));
- struct uci_section *port_s = ethernet___get_ethernet_interface_section(device);
- if (port_s) {
- loweralias = get_alias_by_section("dmmap_ethernet", "device", port_s, "eth_iface_alias");
- bridge_port_inst = get_instance_by_section(dmctx->instance_mode, "dmmap_ethernet", "device", "section_name", section_name(port_s), "eth_iface_instance", "eth_iface_alias");
- }
- }
-
- if (value == NULL)
- value = "";
+ /* Higher Layer is Device.Bridging.Bridge.{i}.Port.{i}.*/
+ snprintf(path, sizeof(path), "Device.Bridging.Bridge.%s.Port.", br_instance);
- snprintf(buf_loweralias, sizeof(buf_loweralias), "%s%s", *loweralias ? loweralias : *bridge_port_inst ? "cpe-" : "", (*loweralias == '\0' && *bridge_port_inst) ? bridge_port_inst : "");
-
- if (create_and_link_interface_stack_instance(dmctx, parent_node, vb, value, buf_higheralias, buf_loweralias, &instance))
+ if (create_interface_stack_instance(dmctx, parent_node, &curr_interfacestack_data, port_s,
+ path, "bridge_port_instance", "bridge_port_alias", &idx))
goto end;
- // The lower layer is Device.WiFi.Radio.{i}.
- if(DM_LSTRCMP(package, "wireless") == 0) {
-
- snprintf(buf_higheralias, sizeof(buf_higheralias), "%s%s", *loweralias ? loweralias : *bridge_port_inst ? "cpe-" : "", (*loweralias == '\0' && *bridge_port_inst) ? bridge_port_inst : "");
-
+ /* Higher Layer is Device.WiFi.SSID.{i}.*/
+ dmuci_get_value_by_section_string(port_s, "config", &config);
+ if (DM_STRCMP(config, "wireless") == 0) {
struct uci_section *wl_s = NULL;
- char *wl_device = NULL;
- uci_foreach_option_eq("wireless", "wifi-iface", "ifname", device, wl_s) {
- dmuci_get_value_by_section_string(wl_s, "device", &wl_device);
- break;
- }
-
- if (wl_device && wl_device[0] != '\0') {
- adm_entry_get_linker_param(dmctx, "Device.WiFi.Radio.", wl_device, &vb);
- struct uci_section *ss = NULL;
- uci_foreach_sections("wireless", "wifi-device", ss) {
- if(strcmp(section_name(ss), wl_device) == 0) {
- loweralias = get_alias_by_section("dmmap_wireless", "wifi-device", ss, "radioalias");
- bridge_port_inst = get_instance_by_section(dmctx->instance_mode, "dmmap_wireless", "wifi-device", "section_name", section_name(ss), "radioinstance", "radioalias");
- break;
- }
- }
- }
+ char *port = NULL;
- if (vb == NULL)
- vb = "";
+ dmuci_get_value_by_section_string(port_s, "port", &port);
+ wl_s = get_dup_section_in_config_opt("wireless", "wifi-iface", "ifname", port);
+ wl_s = get_dup_section_in_dmmap_opt("dmmap_wireless", "ssid", "ap_section_name", section_name(wl_s));
- snprintf(buf_loweralias, sizeof(buf_loweralias), "%s%s", *loweralias ? loweralias : *bridge_port_inst ? "cpe-" : "", (*loweralias == '\0' && *bridge_port_inst) ? bridge_port_inst : "");
-
- if (create_and_link_interface_stack_instance(dmctx, parent_node, value, vb, buf_higheralias, buf_loweralias, &instance))
- goto end;
- }
-
- // The lower layer is Device.DSL.Channel.{i}.
- if(DM_LSTRCMP(package, "dsl:atm") == 0) {
-
- snprintf(buf_higheralias, sizeof(buf_higheralias), "%s%s", *loweralias ? loweralias : *bridge_port_inst ? "cpe-" : "", (*loweralias == '\0' && *bridge_port_inst) ? bridge_port_inst : "");
-
- char *link_channel = "channel_1";
- adm_entry_get_linker_param(dmctx, "Device.DSL.Channel.", link_channel, &vb);
- if (vb == NULL)
- vb = "";
-
- struct uci_section *dsl_s = NULL;
- uci_path_foreach_sections(bbfdm, "dmmap", "dsl_channel", dsl_s) {
- dmuci_get_value_by_section_string(dsl_s, "dsl_channel_alias", &loweralias);
- bridge_port_inst = get_instance_by_section(dmctx->instance_mode, "dmmap", "dsl_channel", "section_name", section_name(dsl_s), "dsl_channel_instance", "dsl_channel_alias");
- }
-
- snprintf(buf_loweralias, sizeof(buf_loweralias), "%s%s", *loweralias ? loweralias : *bridge_port_inst ? "cpe-" : "", (*loweralias == '\0' && *bridge_port_inst) ? bridge_port_inst : "");
-
- if (create_and_link_interface_stack_instance(dmctx, parent_node, value, vb, buf_higheralias, buf_loweralias, &instance))
- goto end;
- }
-
- // The lower layer is Device.DSL.Line.{i}.
- if(DM_LSTRCMP(package, "dsl:ptm") == 0) {
-
- snprintf(buf_higheralias, sizeof(buf_higheralias), "%s%s", *loweralias ? loweralias : *bridge_port_inst ? "cpe-" : "", (*loweralias == '\0' && *bridge_port_inst) ? bridge_port_inst : "");
-
- char *link_line = "line_1";
- adm_entry_get_linker_param(dmctx, "Device.DSL.Line.", link_line, &value);
- if (value == NULL)
- value = "";
-
- struct uci_section *dsl_s = NULL;
- uci_path_foreach_sections(bbfdm, "dmmap", "dsl_line", dsl_s) {
- dmuci_get_value_by_section_string(dsl_s, "dsl_line_alias", &loweralias);
- bridge_port_inst = get_instance_by_section(dmctx->instance_mode, "dmmap", "dsl_line", "id", "1", "dsl_line_instance", "dsl_line_alias");
- }
-
- snprintf(buf_loweralias, sizeof(buf_loweralias), "%s%s", *loweralias ? loweralias : *bridge_port_inst ? "cpe-" : "", (*loweralias == '\0' && *bridge_port_inst) ? bridge_port_inst : "");
-
- if (create_and_link_interface_stack_instance(dmctx, parent_node, vb, value, buf_higheralias, buf_loweralias, &instance))
+ if (create_interface_stack_instance(dmctx, parent_node, &curr_interfacestack_data, wl_s,
+ "Device.WiFi.SSID.", "ssid_instance", "ssid_alias", &idx))
goto end;
}
}
@@ -614,54 +246,36 @@ end:
**************************************************************/
static int get_InterfaceStack_Alias(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
{
- struct uci_section *s = NULL;
- uci_path_foreach_option_eq(bbfdm, "dmmap_interface_stack", "interface_stack", "interface_stack_instance", instance, s) {
- dmuci_get_value_by_section_string(s, "interface_stack_alias", value);
- if ((*value)[0] == '\0')
- dmasprintf(value, "cpe-%s", instance);
- }
+ dmasprintf(value, "cpe-%s", instance);
return 0;
}
static int set_InterfaceStack_Alias(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action)
{
- struct uci_section *s = NULL;
-
- switch (action) {
- case VALUECHECK:
- if (bbfdm_validate_string(ctx, value, -1, 64, NULL, NULL))
- return FAULT_9007;
- break;
- case VALUESET:
- // cppcheck-suppress unknownMacro
- uci_path_foreach_option_eq(bbfdm, "dmmap_interface_stack", "interface_stack", "interface_stack_instance", instance, s)
- dmuci_set_value_by_section(s, "interface_stack_alias", value);
- break;
- }
return 0;
}
static int get_InterfaceStack_HigherLayer(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
{
- *value = dmstrdup(((struct interfacestack_data *)data)->higherlayer);
+ *value = ((struct interfacestack_data *)data)->HigherLayer;
return 0;
}
static int get_InterfaceStack_LowerLayer(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
{
- *value = dmstrdup(((struct interfacestack_data *)data)->lowerlayer);
+ *value = ((struct interfacestack_data *)data)->LowerLayer;
return 0;
}
static int get_InterfaceStack_HigherAlias(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
{
- *value = dmstrdup(((struct interfacestack_data *)data)->higheralias);
+ *value = ((struct interfacestack_data *)data)->HigherAlias;
return 0;
}
static int get_InterfaceStack_LowerAlias(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
{
- *value = dmstrdup(((struct interfacestack_data *)data)->loweralias);
+ *value = ((struct interfacestack_data *)data)->LowerAlias;
return 0;
}
@@ -671,7 +285,7 @@ static int get_InterfaceStack_LowerAlias(char *refparam, struct dmctx *ctx, void
/* *** Device.InterfaceStack.{i}. *** */
DMLEAF tInterfaceStackParams[] = {
/* PARAM, permission, type, getvalue, setvalue, bbfdm_type, version*/
-{"Alias", &DMWRITE, DMT_STRING, get_InterfaceStack_Alias, set_InterfaceStack_Alias, BBFDM_BOTH},
+{"Alias", &DMWRITE, DMT_STRING, get_InterfaceStack_Alias, set_InterfaceStack_Alias, BBFDM_BOTH, DM_FLAG_UNIQUE},
{"HigherLayer", &DMREAD, DMT_STRING, get_InterfaceStack_HigherLayer, NULL, BBFDM_BOTH},
{"LowerLayer", &DMREAD, DMT_STRING, get_InterfaceStack_LowerLayer, NULL, BBFDM_BOTH},
{"HigherAlias", &DMREAD, DMT_STRING, get_InterfaceStack_HigherAlias, NULL, BBFDM_BOTH},
diff --git a/libbbfdm/dmtree/tr181/interfacestack.h b/libbbfdm/dmtree/tr181/interfacestack.h
index 767e13126c94fa8206f3ebe807231ebe3fbfd683..d92f8c97898b1c826c821c55dc8c74cf67d09d85 100644
--- a/libbbfdm/dmtree/tr181/interfacestack.h
+++ b/libbbfdm/dmtree/tr181/interfacestack.h
@@ -1,11 +1,11 @@
/*
- * Copyright (C) 2019 iopsys Software Solutions AB
+ * Copyright (C) 2023 iopsys Software Solutions AB
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License version 2.1
* as published by the Free Software Foundation
*
- * Author: Amin Ben Ramdhane <amin.benramdhane@pivasoftware.com>
+ * Author: Amin Ben Romdhane <amin.benromdhane@iopsys.eu>
*/
#ifndef __INTERFACESTACK_H