X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/17a8f7b655ab85979781db15290784fcd3c496f2..77ec3b2de9bb1880b258ec6aaf4949f146f6fd8d:/package/swconfig/src/uci.c?ds=inline diff --git a/package/swconfig/src/uci.c b/package/swconfig/src/uci.c index 2df837d27..893e3d1dd 100644 --- a/package/swconfig/src/uci.c +++ b/package/swconfig/src/uci.c @@ -46,13 +46,19 @@ struct swlib_setting { }; struct swlib_setting early_settings[] = { - { .name = "reset" }, - { .name = "enable_vlan" }, + { .name = "reset", .val = "1" }, + { .name = "enable_vlan", .val = "1" }, }; static struct swlib_setting *settings; 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 swlib_map_settings(struct switch_dev *dev, int type, int port_vlan, struct uci_section *s) { @@ -107,6 +113,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,12 +121,29 @@ 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; - if (strcmp(e->name, dev->dev_name) != 0) + 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 (swlib_match_name(dev, o->v.string)) + goto found; + + break; + } + + if (!swlib_match_name(dev, e->name)) continue; goto found; @@ -153,13 +177,13 @@ found: if (!strcmp(os->name, "device")) { devn = o->v.string; - if (strcmp(devn, dev->dev_name) != 0) + if (!swlib_match_name(dev, devn)) devn = NULL; } else if (!strcmp(os->name, "port")) { port = o->v.string; } } - if (!dev || !port || !port[0]) + if (!devn || !port || !port[0]) continue; port_n = strtoul(port, &port_err, 0); @@ -178,13 +202,13 @@ found: if (!strcmp(os->name, "device")) { devn = o->v.string; - if (strcmp(devn, dev->dev_name) != 0) + if (!swlib_match_name(dev, devn)) devn = NULL; } else if (!strcmp(os->name, "vlan")) { vlan = o->v.string; } } - if (!dev || !vlan || !vlan[0]) + if (!devn || !vlan || !vlan[0]) continue; vlan_n = strtoul(vlan, &vlan_err, 0);