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

bbf: Update functions name

Browse source
This commit is contained in:
Amin Ben Ramdhane 2021-12-31 12:57:55 +01:00
parent 54937be474
commit 5fb2c1036c
4 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
dmtree/tr181/ethernet.c
View file

@ -45,7 +45,7 @@ static inline int init_eth_rmon(struct eth_rmon_args *args, struct dmmap_dup *s,
/*************************************************************
* COMMON FUNCTIONS
**************************************************************/
struct uci_section *get_device_section(char *dev_name)
struct uci_section *ethernet___get_device_section(char *dev_name)
{
struct uci_section *s = NULL;
@ -108,7 +108,7 @@ static struct uci_section *is_device_section_exist(char *device)
return s;
}
bool ethernet_check_section_in_curr_section(char *curr_section, char *section)
bool ethernet___check_section_in_curr_section(const char *curr_section, const char *section)
{
char *pch = NULL, *pchr = NULL, section_list[256] = {0};
@ -131,7 +131,7 @@ static void add_section_in_curr_section(struct uci_section *dmmap_section, char
dmuci_set_value_by_section(dmmap_section, "section_name", section_list);
}
bool ethernet_name_exists_in_devices(char *name)
bool ethernet___name_exists_in_devices(char *name)
{
struct uci_section *s = NULL;
@ -184,7 +184,7 @@ static void create_link(char *sec_name, char *mac_addr)
dmuci_get_value_by_section_string(dmmap_section, "section_name", &section_name);
/* Check section name exist => if yes, return*/
if (ethernet_check_section_in_curr_section(section_name, sec_name))
if (ethernet___check_section_in_curr_section(section_name, sec_name))
return;
/* Update only section name */
@ -935,7 +935,7 @@ static int get_EthernetLink_LowerLayers(char *refparam, struct dmctx *ctx, void
return 0;
// get device section mapped to this device name
struct uci_section *br_device_s = get_device_section(linker);
struct uci_section *br_device_s = ethernet___get_device_section(linker);
if (br_device_s) dmuci_get_value_by_section_string(br_device_s, "type", &device_s_type);
@ -1276,7 +1276,7 @@ static int set_EthernetVLANTermination_LowerLayers(char *refparam, struct dmctx
snprintf(link_inst, sizeof(link_inst), "%c", value[21]);
snprintf(new_name, sizeof(new_name), "%s_%s", vlan_linker, link_inst);
if (ethernet_name_exists_in_devices(new_name))
if (ethernet___name_exists_in_devices(new_name))
return -1;
uci_foreach_option_eq("network", "interface", "device", vlan_linker, s) {
@ -1301,7 +1301,7 @@ static int set_EthernetVLANTermination_LowerLayers(char *refparam, struct dmctx
else
snprintf(new_name, sizeof(new_name), "%s", vlan_linker);
if (ethernet_name_exists_in_devices(new_name))
if (ethernet___name_exists_in_devices(new_name))
return -1;
// if device is lowerlayer to an ip interface, then
@ -1328,7 +1328,7 @@ static int set_EthernetVLANTermination_LowerLayers(char *refparam, struct dmctx
break;
}
snprintf(new_name, sizeof(new_name), "%s.%s.%s", dev_name, inner_vid, vid);
if (ethernet_name_exists_in_devices(new_name))
if (ethernet___name_exists_in_devices(new_name))
return -1;
dmuci_set_value_by_section(((struct dmmap_dup *)data)->config_section, "ifname", dev_name);
@ -1384,7 +1384,7 @@ static int set_EthernetVLANTermination_VLANID(char *refparam, struct dmctx *ctx,
snprintf(new_name, sizeof(new_name), "%s.%s", ifname, value);
}
if (ethernet_name_exists_in_devices(new_name))
if (ethernet___name_exists_in_devices(new_name))
return -1;
// Update the corresponding device '8021ad' section that maps to this section

6
dmtree/tr181/ethernet.h
View file

@ -28,8 +28,8 @@ extern DMLEAF tEthernetVLANTerminationParams[];
extern DMLEAF tEthernetVLANTerminationStatsParams[];
extern DMLEAF tEthernetRMONStatsParams[];
struct uci_section *get_device_section(char *dev_name);
bool ethernet_check_section_in_curr_section(char *curr_section, char *section);
bool ethernet_name_exists_in_devices(char *name);
struct uci_section *ethernet___get_device_section(char *dev_name);
bool ethernet___check_section_in_curr_section(const char *curr_section, const char *section);
bool ethernet___name_exists_in_devices(char *name);
#endif //__ETHERNET_H

2
dmtree/tr181/interfacestack.c
View file

@ -314,7 +314,7 @@ int browseInterfaceStackInst(struct dmctx *dmctx, DMNODE *parent_node, void *pre
char *linker, *value = NULL, *device_s_type = NULL;
dmuci_get_value_by_section_string(s, "device", &linker);
struct uci_section *br_device_s = get_device_section(linker);
struct uci_section *br_device_s = ethernet___get_device_section(linker);
if (br_device_s) dmuci_get_value_by_section_string(br_device_s, "type", &device_s_type);
if (br_device_s && strcmp(device_s_type, "bridge") == 0) {

10
dmtree/vendor/iopsys/tr181/ethernet.c vendored
View file

@ -45,7 +45,7 @@ static int set_EthernetVLANTermination_MACVLAN(char *refparam, struct dmctx *ctx
dmuci_get_value_by_section_string(dmmap_s, "link_instance", &link_instance);
snprintf(new_name, sizeof(new_name), "%s_%s", ifname, link_instance);
if (ethernet_name_exists_in_devices(new_name))
if (ethernet___name_exists_in_devices(new_name))
return -1;
dmuci_set_value_by_section(dmmap_s, "device", new_name);
@ -69,13 +69,13 @@ static int set_EthernetVLANTermination_MACVLAN(char *refparam, struct dmctx *ctx
char *sec_name;
dmuci_get_value_by_section_string(dmmap_s, "section_name", &sec_name);
/* Check section name exist => if yes, continue*/
if (!ethernet_check_section_in_curr_section(sec_name, section_name(ss)))
if (!ethernet___check_section_in_curr_section(sec_name, section_name(ss)))
continue;
dmuci_get_value_by_section_string(dmmap_s, "link_instance", &link_instance);
snprintf(new_name, sizeof(new_name), "%s_%s", ifname, link_instance);
if (ethernet_name_exists_in_devices(new_name))
if (ethernet___name_exists_in_devices(new_name))
return -1;
dmuci_set_value_by_section(dmmap_s, "device", new_name);
@ -94,7 +94,7 @@ static int set_EthernetVLANTermination_MACVLAN(char *refparam, struct dmctx *ctx
dmuci_get_value_by_section_string(dmmap_s, "link_instance", &link_instance);
snprintf(new_name, sizeof(new_name), "%s_%s", ifname, link_instance);
if (ethernet_name_exists_in_devices(new_name))
if (ethernet___name_exists_in_devices(new_name))
return -1;
dmuci_set_value_by_section(dmmap_s, "device", new_name);
@ -119,7 +119,7 @@ static int set_EthernetVLANTermination_MACVLAN(char *refparam, struct dmctx *ctx
else
snprintf(new_name, sizeof(new_name), "%s", ifname);
if (ethernet_name_exists_in_devices(new_name))
if (ethernet___name_exists_in_devices(new_name))
return -1;
dmuci_set_value_by_section(dmmap_s, "device", new_name);