~mdw
/
secnet
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
build system: Builds OK under dpkg-buildpackage.
[secnet]
/
tun.c
diff --git
a/tun.c
b/tun.c
index
04ac08b
..
d899f0c
100644
(file)
--- 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,
}
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;
{
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;
}
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;
{
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;
struct tun *st=sst;
string_t network, mask, secnetaddr;
struct subnet_list *nets;
-
u
int32_t i;
+ int32_t i;
int fd=-1;
if (routes->up == routes->kup) return False;
int fd=-1;
if (routes->up == routes->kup) return False;