Changeset 36284

Timestamp:

2013-04-09T16:19:13+02:00 (5 years ago)

Author:

blogic

Message:

[swconfig] add portmap support to userland

Signed-off-by: John Crispin <blogic@…>

Location:

trunk/package/network/config/swconfig

Files:

• Makefile (modified) (1 diff)
• src/cli.c (modified) (4 diffs)
• src/swlib.c (modified) (4 diffs)
• src/swlib.h (modified) (3 diffs)

trunk/package/network/config/swconfig/Makefile

@@ -27 +27 @@
         -I$(STAGING_DIR)/usr/include/libnl-tiny \
         -I$(PKG_BUILD_DIR) \
-        $(TARGET_CPPFLAGS)
+        $(TARGET_CPPFLAGS) \
+        -I$(LINUX_DIR)/user_headers/include
 
 define Build/Prepare

trunk/package/network/config/swconfig/src/cli.c

@@ -42 +42 @@
         CMD_HELP,
         CMD_SHOW,
+        CMD_PORTMAP,
 };
 
@@ -215 +216 @@
         char *ckey = NULL;
         char *cvalue = NULL;
+        char *csegment = NULL;
 
         if((argc == 2) && !strcmp(argv[1], "list")) {
@@ -253 +255 @@
                         cmd = CMD_LOAD;
                         ckey = argv[++i];
+                } else if (!strcmp(arg, "portmap")) {
+                        if (i + 1 < argc)
+                                csegment = argv[++i];
+                        cmd = CMD_PORTMAP;
                 } else if (!strcmp(arg, "show")) {
                         cmd = CMD_SHOW;
@@ -324 +330 @@
         case CMD_HELP:
                 list_attributes(dev);
+                break;
+        case CMD_PORTMAP:
+                swlib_print_portmap(dev, csegment);
                 break;
         case CMD_SHOW:

trunk/package/network/config/swconfig/src/swlib.c

@@ -42 +42 @@
 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 },
+};
+
+static struct nla_policy portmap_policy[SWITCH_PORTMAP_MAX] = {
+        [SWITCH_PORTMAP_SEGMENT] = { .type = NLA_STRING },
+        [SWITCH_PORTMAP_VIRT] = { .type = NLA_U32 },
 };
 
@@ -573 +578 @@
         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
@@ -611 +651 @@
         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) {
@@ -656 +698 @@
 }
 
+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)

trunk/package/network/config/swconfig/src/swlib.h

@@ -110 +110 @@
 struct switch_attr;
 struct switch_port;
+struct switch_port_map;
 struct switch_val;
 struct uci_package;
@@ -124 +125 @@
         struct switch_attr *port_ops;
         struct switch_attr *vlan_ops;
+        struct switch_portmap *maps;
         struct switch_dev *next;
         void *priv;
@@ -155 +157 @@
 };
 
+struct switch_portmap {
+        unsigned int virt;
+        const char *segment;
+};
+
 /**
  * swlib_list: list all switches
  */
 void swlib_list(void);
+
+/**
+ * swlib_print_portmap: get portmap
+ * @dev: switch device struct
+ */
+void swlib_print_portmap(struct switch_dev *dev, char *segment);
 
 /**