libnl fixes

bind libnl-2.0 and fix libnl-1 to compile with the old version of libnl,
libnl-1 was actually developed against libnl-2.0, which is fixed with this commit.

1 files changed, 6 insertions, 5 deletions

diff --git a/vapi/libnl-1.vapi b/vapi/libnl-1.vapi
index 5e39f628d..45c970aba 100644
--- a/vapi/libnl-1.vapi
+++ b/vapi/libnl-1.vapi
@@ -21,7 +21,8 @@
 [CCode (lower_case_cprefix = "nl_", cheader_filename = "netlink/netlink.h")]
 namespace Netlink {
 
-    public delegate void Callback (Object obj, void* data);
+    [CCode (cname = "callback_func_t", instance_pos = 1)]
+    public delegate void Callback (Object obj);
 
     [Compact]
     [CCode (cprefix = "nl_addr_", cname = "struct nl_addr", free_function = "", cheader_filename = "netlink/addr.h")]
@@ -95,15 +96,15 @@ namespace Netlink {
     }
 
     [Compact]
-    [CCode (cprefix = "nl_socket_", cname = "struct nl_socket", free_function = "nl_socket_free")]
+    [CCode (cname = "struct nl_handle", free_function = "nl_handle_destroy")]
     public class Socket {
-        [CCode (cname = "nl_socket_alloc")]
+        [CCode (cname = "nl_handle_alloc")]
         public Socket();
 
         [CCode (cname = "rtnl_link_alloc_cache")]
-        public int link_alloc_cache (out LinkCache c);
+        public LinkCache link_alloc_cache ();
         [CCode (cname = "rtnl_addr_alloc_cache")]
-        public int addr_alloc_cache (out AddrCache c);
+        public AddrCache addr_alloc_cache ();
 
         [CCode (cname = "nl_connect")]
         public int connect (int family);