[package] fix path to the orinoco pcmcia driver, thanks hauke

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

diff --git a/package/swconfig/src/swlib.c b/package/swconfig/src/swlib.c
index 3fde816..04b3bef 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];


@@ -343,6 +346,49 @@ swlib_set_attr(struct switch_dev *dev, struct switch_attr *attr, struct switch_v
        return swlib_call(cmd, NULL, send_attr_val, val);
 }
 
        return swlib_call(cmd, NULL, send_attr_val, val);
 }
 

+int swlib_set_attr_string(struct switch_dev *dev, struct switch_attr *a, int port_vlan, const char *str)
+{
+       struct switch_port *ports;
+       struct switch_val val;
+       char *ptr;
+
+       memset(&val, 0, sizeof(val));
+       val.port_vlan = port_vlan;
+       switch(a->type) {
+       case SWITCH_TYPE_INT:
+               val.value.i = atoi(str);
+               break;
+       case SWITCH_TYPE_STRING:
+               val.value.s = str;
+               break;
+       case SWITCH_TYPE_PORTS:
+               ports = alloca(sizeof(struct switch_port) * dev->ports);
+               memset(ports, 0, sizeof(struct switch_port) * dev->ports);
+               val.len = 0;
+               ptr = (char *)str;
+               while(ptr && *ptr)
+               {
+                       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;
+                               ptr++;
+                       }
+                       if (*ptr)
+                               ptr++;
+                       val.len++;
+               }
+               val.value.ports = ports;
+               break;
+       case SWITCH_TYPE_NOVAL:
+               break;
+       default:
+               return -1;
+       }
+       return swlib_set_attr(dev, a, &val);
+}
+

 
 struct attrlist_arg {
        int id;
 
 struct attrlist_arg {
        int id;


@@ -464,7 +510,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;
 }


@@ -472,7 +518,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;


@@ -483,8 +531,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;
        }