userv-ipif: Always request routes from userv, regardless of link quality

[secnet] / slip.c

diff --git a/slip.c b/slip.c
index dd2e727..7c138d1 100644 (file)
--- a/slip.c
+++ b/slip.c
@@ -132,8 +132,7 @@ struct userv {
 };
 
 static int userv_beforepoll(void *sst, struct pollfd *fds, int *nfds_io,
-                           int *timeout_io, const struct timeval *tv_now,
-                           uint64_t *now)
+                           int *timeout_io)
 {
     struct userv *st=sst;
 
@@ -149,8 +148,7 @@ static int userv_beforepoll(void *sst, struct pollfd *fds, int *nfds_io,
     return 0;
 }
 
-static void userv_afterpoll(void *sst, struct pollfd *fds, int nfds,
-                           const struct timeval *tv_now, uint64_t *now)
+static void userv_afterpoll(void *sst, struct pollfd *fds, int nfds)
 {
     struct userv *st=sst;
     uint8_t rxbuf[DEFAULT_BUFSIZE];
@@ -259,13 +257,11 @@ static void userv_invoke_userv(struct userv *st)
 
     allnets=ipset_new();
     for (r=st->slip.nl.clients; r; r=r->next) {
-       if (r->up) {
-           struct ipset *nan;
-           r->kup=True;
-           nan=ipset_union(allnets,r->networks);
-           ipset_free(allnets);
-           allnets=nan;
-       }
+       struct ipset *nan;
+       r->kup=True;
+       nan=ipset_union(allnets,r->networks);
+       ipset_free(allnets);
+       allnets=nan;
     }
     snets=ipset_to_subnet_list(allnets);
     ipset_free(allnets);