X-Git-Url: https://git.distorted.org.uk/~mdw/secnet/blobdiff_plain/ea7ec970f650793fa9cc5d308a1fceb3e3d74336..b567d7576f09da81916f0b2781f2772259fe9d79:/tun.c

diff --git a/tun.c b/tun.c
index eaa7b8a..d899f0c 100644
--- a/tun.c
+++ b/tun.c
@@ -95,8 +95,7 @@ static cstring_t tun_flavour_str(uint32_t flavour)
 }
 
 static int tun_beforepoll(void *sst, struct pollfd *fds, int *nfds_io,
-			  int *timeout_io, const struct timeval *tv_now,
-			  uint64_t *now)
+			  int *timeout_io)
 {
     struct tun *st=sst;
     *nfds_io=1;
@@ -105,8 +104,7 @@ static int tun_beforepoll(void *sst, struct pollfd *fds, int *nfds_io,
     return 0;
 }
 
-static void tun_afterpoll(void *sst, struct pollfd *fds, int nfds,
-			  const struct timeval *tv_now, uint64_t *now)
+static void tun_afterpoll(void *sst, struct pollfd *fds, int nfds)
 {
     struct tun *st=sst;
     int l;
@@ -149,7 +147,7 @@ static bool_t tun_set_route(void *sst, struct netlink_client *routes)
     struct tun *st=sst;
     string_t network, mask, secnetaddr;
     struct subnet_list *nets;
-    uint32_t i;
+    int32_t i;
     int fd=-1;
 
     if (routes->up == routes->kup) return False;
@@ -234,7 +232,7 @@ static void tun_phase_hook(void *sst, uint32_t newphase)
 {
     struct tun *st=sst;
     string_t hostaddr,secnetaddr;
-    uint8_t mtu[6];
+    char mtu[6];
     struct netlink_client *r;
 
     if (st->tun_flavour==TUN_FLAVOUR_BSD) {
@@ -603,7 +601,6 @@ static list_t *tun_bsd_apply(closure_t *self, struct cloc loc, dict_t *context,
     return tun_create(self,loc,context,args,TUN_FLAVOUR_BSD);
 }
 
-init_module tun_module;
 void tun_module(dict_t *dict)
 {
     add_closure(dict,"tun",tun_apply);