aboutsummaryrefslogtreecommitdiffstats
path: root/package/swconfig/src
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2010-01-18 00:38:04 +0000
committerFelix Fietkau <nbd@openwrt.org>2010-01-18 00:38:04 +0000
commit54bbc306875d7eb7dc3b86016242580004a9644b (patch)
tree0c911058c8255e9746eb54bdbc8c0de04cd524a0 /package/swconfig/src
parent2670e906b6f9c500b87ece595825e88aa5157ff4 (diff)
downloadupstream-54bbc306875d7eb7dc3b86016242580004a9644b.tar.gz
upstream-54bbc306875d7eb7dc3b86016242580004a9644b.tar.bz2
upstream-54bbc306875d7eb7dc3b86016242580004a9644b.zip
swconfig: support providing the switch device name in an option instead of the section name - necessary to support switches that contain characters such as "-"
SVN-Revision: 19208
Diffstat (limited to 'package/swconfig/src')
-rw-r--r--package/swconfig/src/uci.c18
1 files changed, 18 insertions, 0 deletions
diff --git a/package/swconfig/src/uci.c b/package/swconfig/src/uci.c
index 2df837d278..e597acebfb 100644
--- a/package/swconfig/src/uci.c
+++ b/package/swconfig/src/uci.c
@@ -107,6 +107,7 @@ int swlib_apply_from_uci(struct switch_dev *dev, struct uci_package *p)
struct uci_element *e;
struct uci_section *s;
struct uci_option *o;
+ struct uci_ptr ptr;
struct switch_val val;
int i;
@@ -114,11 +115,28 @@ int swlib_apply_from_uci(struct switch_dev *dev, struct uci_package *p)
head = &settings;
uci_foreach_element(&p->sections, e) {
+ struct uci_element *n;
+
s = uci_to_section(e);
if (strcmp(s->type, "switch") != 0)
continue;
+ uci_foreach_element(&s->options, n) {
+ struct uci_option *o = uci_to_option(n);
+
+ if (strcmp(n->name, "name") != 0)
+ continue;
+
+ if (o->type != UCI_TYPE_STRING)
+ continue;
+
+ if (!strcmp(o->v.string, dev->dev_name))
+ goto found;
+
+ break;
+ }
+
if (strcmp(e->name, dev->dev_name) != 0)
continue;