From d620bdae7081eafce2a4b3e6da0aa2116d71fbc8 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Wed, 1 Oct 2014 15:05:00 +0200 Subject: [PATCH] wireless: display anonymous interface section names using index based extended syntax Signed-off-by: Felix Fietkau --- config.c | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/config.c b/config.c index 7720acf..9fb9c01 100644 --- a/config.c +++ b/config.c @@ -32,6 +32,25 @@ static struct uci_package *uci_network; static struct uci_package *uci_wireless; static struct blob_buf b; +static int +config_section_idx(struct uci_section *s) +{ + struct uci_element *e; + int idx = 0; + + uci_foreach_element(&uci_wireless->sections, e) { + struct uci_section *cur = uci_to_section(e); + + if (s == cur) + return idx; + + if (!strcmp(cur->type, s->type)) + idx++; + } + + return -1; +} + static int config_parse_bridge_interface(struct uci_section *s) { @@ -313,9 +332,16 @@ config_parse_wireless_device(struct uci_section *s) static void config_parse_wireless_interface(struct wireless_device *wdev, struct uci_section *s) { + char *name = NULL; + + if (s->anonymous) { + name = alloca(strlen(s->type) + 16); + asprintf(&name, "@%s[%d]", s->type, config_section_idx(s)); + } + blob_buf_init(&b, 0); uci_to_blob(&b, s, wdev->drv->interface.config); - wireless_interface_create(wdev, b.head, s->e.name); + wireless_interface_create(wdev, b.head, name ? name : s->e.name); } static void -- 2.25.1