swconfig: swlib.c: remove const qualifier for val.s since this is supposed to be...

[openwrt/openwrt.git] / package / network / config / swconfig / src / swlib.c

diff --git a/package/network/config/swconfig/src/swlib.c b/package/network/config/swconfig/src/swlib.c
index de08717e33a069fe9d2d5e441da02f75579c361f..f74c093ef4ea4490f69a5d3f8f73ff09a90b7bdb 100644 (file)
--- a/package/network/config/swconfig/src/swlib.c
+++ b/package/network/config/swconfig/src/swlib.c
@@ -41,11 +41,16 @@ static struct genl_family *family;
 static struct nlattr *tb[SWITCH_ATTR_MAX + 1];
 static int refcount = 0;
 
 static struct nlattr *tb[SWITCH_ATTR_MAX + 1];
 static int refcount = 0;
 

-static struct nla_policy port_policy[] = {
+static struct nla_policy port_policy[SWITCH_ATTR_MAX] = {

        [SWITCH_PORT_ID] = { .type = NLA_U32 },
        [SWITCH_PORT_FLAG_TAGGED] = { .type = NLA_FLAG },
 };
 
        [SWITCH_PORT_ID] = { .type = NLA_U32 },
        [SWITCH_PORT_FLAG_TAGGED] = { .type = NLA_FLAG },
 };
 

+static struct nla_policy portmap_policy[SWITCH_PORTMAP_MAX] = {
+       [SWITCH_PORTMAP_SEGMENT] = { .type = NLA_STRING },
+       [SWITCH_PORTMAP_VIRT] = { .type = NLA_U32 },
+};
+

 static inline void *
 swlib_alloc(size_t size)
 {
 static inline void *
 swlib_alloc(size_t size)
 {


@@ -201,7 +206,6 @@ store_val(struct nl_msg *msg, void *arg)
 {
        struct genlmsghdr *gnlh = nlmsg_data(nlmsg_hdr(msg));
        struct switch_val *val = arg;
 {
        struct genlmsghdr *gnlh = nlmsg_data(nlmsg_hdr(msg));
        struct switch_val *val = arg;

-       struct switch_attr *attr = val->attr;

 
        if (!val)
                goto error;
 
        if (!val)
                goto error;


@@ -359,7 +363,7 @@ int swlib_set_attr_string(struct switch_dev *dev, struct switch_attr *a, int por
                val.value.i = atoi(str);
                break;
        case SWITCH_TYPE_STRING:
                val.value.i = atoi(str);
                break;
        case SWITCH_TYPE_STRING:

-               val.value.s = str;
+               val.value.s = (char *)str;

                break;
        case SWITCH_TYPE_PORTS:
                ports = alloca(sizeof(struct switch_port) * dev->ports);
                break;
        case SWITCH_TYPE_PORTS:
                ports = alloca(sizeof(struct switch_port) * dev->ports);


@@ -573,6 +577,41 @@ struct swlib_scan_arg {
        struct switch_dev *ptr;
 };
 
        struct switch_dev *ptr;
 };
 

+static int
+add_port_map(struct switch_dev *dev, struct nlattr *nla)
+{
+       struct nlattr *p;
+       int err = 0, idx = 0;
+       int remaining;
+
+       dev->maps = malloc(sizeof(struct switch_portmap) * dev->ports);
+       if (!dev->maps)
+               return -1;
+       memset(dev->maps, 0, sizeof(struct switch_portmap) * dev->ports);
+
+       nla_for_each_nested(p, nla, remaining) {
+               struct nlattr *tb[SWITCH_PORTMAP_MAX+1];
+
+               if (idx >= dev->ports)
+                       continue;
+
+               err = nla_parse_nested(tb, SWITCH_PORTMAP_MAX, p, portmap_policy);
+               if (err < 0)
+                       continue;
+
+
+               if (tb[SWITCH_PORTMAP_SEGMENT] && tb[SWITCH_PORTMAP_VIRT]) {
+                       dev->maps[idx].segment = strdup(nla_get_string(tb[SWITCH_PORTMAP_SEGMENT]));
+                       dev->maps[idx].virt = nla_get_u32(tb[SWITCH_PORTMAP_VIRT]);
+               }
+               idx++;
+       }
+
+out:
+       return err;
+}
+
+

 static int
 add_switch(struct nl_msg *msg, void *arg)
 {
 static int
 add_switch(struct nl_msg *msg, void *arg)
 {


@@ -610,6 +649,8 @@ add_switch(struct nl_msg *msg, void *arg)
                dev->vlans = nla_get_u32(tb[SWITCH_ATTR_VLANS]);
        if (tb[SWITCH_ATTR_CPU_PORT])
                dev->cpu_port = nla_get_u32(tb[SWITCH_ATTR_CPU_PORT]);
                dev->vlans = nla_get_u32(tb[SWITCH_ATTR_VLANS]);
        if (tb[SWITCH_ATTR_CPU_PORT])
                dev->cpu_port = nla_get_u32(tb[SWITCH_ATTR_CPU_PORT]);

+       if (tb[SWITCH_ATTR_PORTMAP])
+               add_port_map(dev, tb[SWITCH_ATTR_PORTMAP]);

 
        if (!sa->head) {
                sa->head = dev;
 
        if (!sa->head) {
                sa->head = dev;


@@ -624,12 +665,65 @@ done:
        return NL_SKIP;
 }
 
        return NL_SKIP;
 }
 

+static int
+list_switch(struct nl_msg *msg, void *arg)
+{
+       struct genlmsghdr *gnlh = nlmsg_data(nlmsg_hdr(msg));
+
+       if (nla_parse(tb, SWITCH_ATTR_MAX, genlmsg_attrdata(gnlh, 0), genlmsg_attrlen(gnlh, 0), NULL) < 0)
+               goto done;
+
+       if (!tb[SWITCH_ATTR_DEV_NAME] || !tb[SWITCH_ATTR_NAME])
+               goto done;
+
+       printf("Found: %s - %s\n", nla_get_string(tb[SWITCH_ATTR_DEV_NAME]),
+               nla_get_string(tb[SWITCH_ATTR_ALIAS]));
+
+done:
+       return NL_SKIP;
+}
+
+void
+swlib_list(void)
+{
+       if (swlib_priv_init() < 0)
+               return;
+       swlib_call(SWITCH_CMD_GET_SWITCH, list_switch, NULL, NULL);
+       swlib_priv_free();
+}
+
+void
+swlib_print_portmap(struct switch_dev *dev, char *segment)
+{
+       int i;
+
+       if (segment) {
+               if (!strcmp(segment, "cpu")) {
+                       printf("%d ", dev->cpu_port);
+               } else if (!strcmp(segment, "disabled")) {
+                       for (i = 0; i < dev->ports; i++)
+                               if (!dev->maps[i].segment)
+                                       printf("%d ", i);
+               } else for (i = 0; i < dev->ports; i++) {
+                       if (dev->maps[i].segment && !strcmp(dev->maps[i].segment, segment))
+                               printf("%d ", i);
+               }
+       } else {
+               printf("%s - %s\n", dev->dev_name, dev->name);
+               for (i = 0; i < dev->ports; i++)
+                       if (i == dev->cpu_port)
+                               printf("port%d:\tcpu\n", i);
+                       else if (dev->maps[i].segment)
+                               printf("port%d:\t%s.%d\n", i, dev->maps[i].segment, dev->maps[i].virt);
+                       else
+                               printf("port%d:\tdisabled\n", i);
+       }
+}

 
 struct switch_dev *
 swlib_connect(const char *name)
 {
        struct swlib_scan_arg arg;
 
 struct switch_dev *
 swlib_connect(const char *name)
 {
        struct swlib_scan_arg arg;

-       int err;

 
        if (!refcount) {
                if (swlib_priv_init() < 0)
 
        if (!refcount) {
                if (swlib_priv_init() < 0)


@@ -667,6 +761,8 @@ swlib_free(struct switch_dev *dev)
        swlib_free_attributes(&dev->ops);
        swlib_free_attributes(&dev->port_ops);
        swlib_free_attributes(&dev->vlan_ops);
        swlib_free_attributes(&dev->ops);
        swlib_free_attributes(&dev->port_ops);
        swlib_free_attributes(&dev->vlan_ops);

+       free(dev->name);
+       free(dev->alias);

        free(dev);
 
        if (--refcount == 0)
        free(dev);
 
        if (--refcount == 0)