Import release 0.1.10

[secnet] / tun.c

diff --git a/tun.c b/tun.c
index 0f88791703c68a2d06e1fe122b3c6e12b6a73e92..90b9161022abc0d5c268702733ee1db7190cfb92 100644 (file)
--- a/tun.c
+++ b/tun.c
@@ -64,14 +64,13 @@ static void tun_afterpoll(void *sst, struct pollfd *fds, int nfds,
        }
        if (l>0) {
            st->buff->size=l;
        }
        if (l>0) {
            st->buff->size=l;

-           st->netlink_to_tunnel(&st->nl,NULL,st->buff);
+           st->netlink_to_tunnel(&st->nl,st->buff);

            BUF_ASSERT_FREE(st->buff);
        }
     }
 }
 
            BUF_ASSERT_FREE(st->buff);
        }
     }
 }
 

-static void tun_deliver_to_kernel(void *sst, void *cid,
-                                 struct buffer_if *buf)
+static void tun_deliver_to_kernel(void *sst, struct buffer_if *buf)

 {
     struct tun *st=sst;
 
 {
     struct tun *st=sst;
 


@@ -261,7 +260,7 @@ static list_t *tun_old_apply(closure_t *self, struct cloc loc, dict_t *context,
 
     st->netlink_to_tunnel=
        netlink_init(&st->nl,st,loc,dict,
 
     st->netlink_to_tunnel=
        netlink_init(&st->nl,st,loc,dict,

-                    "netlink-tun",NULL,tun_deliver_to_kernel);
+                    "netlink-tun",tun_set_route,tun_deliver_to_kernel);

 
     st->tun_old=True;
     st->device_path=dict_read_string(dict,"device",False,"tun-netlink",loc);
 
     st->tun_old=True;
     st->device_path=dict_read_string(dict,"device",False,"tun-netlink",loc);