qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2025-02-09 19:01:55 +02:00
Code

swconfig: fix backward compatibility

Browse Source 
swconfig fails to load uci configuration after the generic switch
identifier changes.

root@OpenWrt:/# uci show network | grep switch
network.@switch[0]=switch
network.@switch[0].name=eth0
network.@switch[0].reset=1
network.@switch[0].enable_vlan=1
network.@switch_vlan[0]=switch_vlan
network.@switch_vlan[0].device=eth0
network.@switch_vlan[0].vlan=1
network.@switch_vlan[0].ports=0t 2 3 4 5
network.@switch_vlan[1]=switch_vlan
network.@switch_vlan[1].device=eth0
network.@switch_vlan[1].vlan=2
network.@switch_vlan[1].ports=0t 1
root@OpenWrt:/# swconfig dev eth0 load /etc/config/network
Failed to apply configuration for switch 'switch0'
root@OpenWrt:/# swconfig dev switch0 load /etc/config/network
Failed to apply configuration for switch 'switch0'

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27820 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
juhosg 2011-07-28 19:54:11 +00:00
parent daa0f24a0e
commit 746c2a7d3c
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/swconfig/Makefile
View File

@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=swconfig PKG_NAME:=swconfig
PKG_RELEASE:=8 PKG_RELEASE:=9
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/kernel.mk include $(INCLUDE_DIR)/kernel.mk

14
package/swconfig/src/uci.c
View File

@ -53,6 +53,12 @@ struct swlib_setting early_settings[] = {
static struct swlib_setting *settings; static struct swlib_setting *settings;
static struct swlib_setting **head; static struct swlib_setting **head;
static bool swlib_match_name(struct switch_dev *dev, const char *name)
{
return (strcmp(name, dev->dev_name) == 0 ||
strcmp(name, dev->alias) == 0);
}
static int static int
swlib_map_settings(struct switch_dev *dev, int type, int port_vlan, struct uci_section *s) swlib_map_settings(struct switch_dev *dev, int type, int port_vlan, struct uci_section *s)
{ {
@ -131,13 +137,13 @@ int swlib_apply_from_uci(struct switch_dev *dev, struct uci_package *p)
if (o->type != UCI_TYPE_STRING) if (o->type != UCI_TYPE_STRING)
continue; continue;
if (!strcmp(o->v.string, dev->dev_name)) if (swlib_match_name(dev, o->v.string))
goto found; goto found;
break; break;
} }
if (strcmp(e->name, dev->dev_name) != 0) if (!swlib_match_name(dev, e->name))
continue; continue;
goto found; goto found;
@ -171,7 +177,7 @@ found:
if (!strcmp(os->name, "device")) { if (!strcmp(os->name, "device")) {
devn = o->v.string; devn = o->v.string;
if (strcmp(devn, dev->dev_name) != 0) if (!swlib_match_name(dev, devn))
devn = NULL; devn = NULL;
} else if (!strcmp(os->name, "port")) { } else if (!strcmp(os->name, "port")) {
port = o->v.string; port = o->v.string;
@ -196,7 +202,7 @@ found:
if (!strcmp(os->name, "device")) { if (!strcmp(os->name, "device")) {
devn = o->v.string; devn = o->v.string;
if (strcmp(devn, dev->dev_name) != 0) if (!swlib_match_name(dev, devn))
devn = NULL; devn = NULL;
} else if (!strcmp(os->name, "vlan")) { } else if (!strcmp(os->name, "vlan")) {
vlan = o->v.string; vlan = o->v.string;