kernel: update linux 3.1 to 3.1.9

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

diff --git a/package/swconfig/src/swlib.c b/package/swconfig/src/swlib.c
index fbc0365..531a23a 100644 (file)
--- a/package/swconfig/src/swlib.c
+++ b/package/swconfig/src/swlib.c
@@ -24,6 +24,9 @@
 #include <sys/socket.h>
 #include <linux/switch.h>
 #include "swlib.h"
 #include <sys/socket.h>
 #include <linux/switch.h>
 #include "swlib.h"

+#include <netlink/netlink.h>
+#include <netlink/genl/genl.h>
+#include <netlink/genl/family.h>

 
 //#define DEBUG 1
 #ifdef DEBUG
 
 //#define DEBUG 1
 #ifdef DEBUG


@@ -32,7 +35,7 @@
 #define DPRINTF(fmt, ...) do {} while (0)
 #endif
 
 #define DPRINTF(fmt, ...) do {} while (0)
 #endif
 

-static struct nl_handle *handle;
+static struct nl_sock *handle;

 static struct nl_cache *cache;
 static struct genl_family *family;
 static struct nlattr *tb[SWITCH_ATTR_MAX];
 static struct nl_cache *cache;
 static struct genl_family *family;
 static struct nlattr *tb[SWITCH_ATTR_MAX];


@@ -365,11 +368,26 @@ int swlib_set_attr_string(struct switch_dev *dev, struct switch_attr *a, int por
                ptr = (char *)str;
                while(ptr && *ptr)
                {
                ptr = (char *)str;
                while(ptr && *ptr)
                {

+                       while(*ptr && isspace(*ptr))
+                               ptr++;
+
+                       if (!*ptr)
+                               break;
+
+                       if (!isdigit(*ptr))
+                               return -1;
+
+                       if (val.len >= dev->ports)
+                               return -1;
+

                        ports[val.len].flags = 0;
                        ports[val.len].id = strtoul(ptr, &ptr, 10);
                        while(*ptr && !isspace(*ptr)) {
                                if (*ptr == 't')
                                        ports[val.len].flags |= SWLIB_PORT_FLAG_TAGGED;
                        ports[val.len].flags = 0;
                        ports[val.len].id = strtoul(ptr, &ptr, 10);
                        while(*ptr && !isspace(*ptr)) {
                                if (*ptr == 't')
                                        ports[val.len].flags |= SWLIB_PORT_FLAG_TAGGED;

+                               else
+                                       return -1;
+

                                ptr++;
                        }
                        if (*ptr)
                                ptr++;
                        }
                        if (*ptr)


@@ -379,6 +397,9 @@ int swlib_set_attr_string(struct switch_dev *dev, struct switch_attr *a, int por
                val.value.ports = ports;
                break;
        case SWITCH_TYPE_NOVAL:
                val.value.ports = ports;
                break;
        case SWITCH_TYPE_NOVAL:

+               if (str && !strcmp(str, "0"))
+                       return 0;
+

                break;
        default:
                return -1;
                break;
        default:
                return -1;


@@ -507,7 +528,7 @@ swlib_priv_free(void)
        if (cache)
                nl_cache_free(cache);
        if (handle)
        if (cache)
                nl_cache_free(cache);
        if (handle)

-               nl_handle_destroy(handle);
+               nl_socket_free(handle);

        handle = NULL;
        cache = NULL;
 }
        handle = NULL;
        cache = NULL;
 }


@@ -515,7 +536,9 @@ swlib_priv_free(void)
 static int
 swlib_priv_init(void)
 {
 static int
 swlib_priv_init(void)
 {

-       handle = nl_handle_alloc();
+       int ret;
+
+       handle = nl_socket_alloc();

        if (!handle) {
                DPRINTF("Failed to create handle\n");
                goto err;
        if (!handle) {
                DPRINTF("Failed to create handle\n");
                goto err;


@@ -526,8 +549,8 @@ swlib_priv_init(void)
                goto err;
        }
 
                goto err;
        }
 

-       cache = genl_ctrl_alloc_cache(handle);
-       if (!cache) {
+       ret = genl_ctrl_alloc_cache(handle, &cache);
+       if (ret < 0) {

                DPRINTF("Failed to allocate netlink cache\n");
                goto err;
        }
                DPRINTF("Failed to allocate netlink cache\n");
                goto err;
        }


@@ -557,6 +580,7 @@ add_switch(struct nl_msg *msg, void *arg)
        struct genlmsghdr *gnlh = nlmsg_data(nlmsg_hdr(msg));
        struct switch_dev *dev;
        const char *name;
        struct genlmsghdr *gnlh = nlmsg_data(nlmsg_hdr(msg));
        struct switch_dev *dev;
        const char *name;

+       const char *alias;

 
        if (nla_parse(tb, SWITCH_ATTR_MAX, genlmsg_attrdata(gnlh, 0), genlmsg_attrlen(gnlh, 0), NULL) < 0)
                goto done;
 
        if (nla_parse(tb, SWITCH_ATTR_MAX, genlmsg_attrdata(gnlh, 0), genlmsg_attrlen(gnlh, 0), NULL) < 0)
                goto done;


@@ -565,22 +589,27 @@ add_switch(struct nl_msg *msg, void *arg)
                goto done;
 
        name = nla_get_string(tb[SWITCH_ATTR_DEV_NAME]);
                goto done;
 
        name = nla_get_string(tb[SWITCH_ATTR_DEV_NAME]);

-       if (sa->name && (strcmp(name, sa->name) != 0))
+       alias = nla_get_string(tb[SWITCH_ATTR_ALIAS]);
+
+       if (sa->name && (strcmp(name, sa->name) != 0) && (strcmp(alias, sa->name) != 0))

                goto done;
 
        dev = swlib_alloc(sizeof(struct switch_dev));
        if (!dev)
                goto done;
 
                goto done;
 
        dev = swlib_alloc(sizeof(struct switch_dev));
        if (!dev)
                goto done;
 

-       dev->dev_name = strdup(name);
+       strncpy(dev->dev_name, name, IFNAMSIZ - 1);
+       dev->alias = strdup(alias);

        if (tb[SWITCH_ATTR_ID])
                dev->id = nla_get_u32(tb[SWITCH_ATTR_ID]);
        if (tb[SWITCH_ATTR_NAME])
        if (tb[SWITCH_ATTR_ID])
                dev->id = nla_get_u32(tb[SWITCH_ATTR_ID]);
        if (tb[SWITCH_ATTR_NAME])

-               dev->name = strdup(nla_get_string(tb[SWITCH_ATTR_DEV_NAME]));
+               dev->name = strdup(nla_get_string(tb[SWITCH_ATTR_NAME]));

        if (tb[SWITCH_ATTR_PORTS])
                dev->ports = nla_get_u32(tb[SWITCH_ATTR_PORTS]);
        if (tb[SWITCH_ATTR_VLANS])
                dev->vlans = nla_get_u32(tb[SWITCH_ATTR_VLANS]);
        if (tb[SWITCH_ATTR_PORTS])
                dev->ports = nla_get_u32(tb[SWITCH_ATTR_PORTS]);
        if (tb[SWITCH_ATTR_VLANS])
                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 (!sa->head) {
                sa->head = dev;
 
        if (!sa->head) {
                sa->head = dev;