X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udp.c;h=7ff4d5fd18f84e5ade3487701484124c55767c9e;hb=58650a7008f03bfd9cb69a3b22e0240c81ab7fa4;hp=9615a174224624ce8a58d173f5df68a2de2b3de8;hpb=3b83c93292fbf6c4e859ce513bdf54ad90733f96;p=secnet.git

diff --git a/udp.c b/udp.c
index 9615a17..7ff4d5f 100644
--- a/udp.c
+++ b/udp.c
@@ -47,8 +47,7 @@ struct udp {
 };
 
 static int udp_beforepoll(void *state, struct pollfd *fds, int *nfds_io,
-			  int *timeout_io, const struct timeval *tv,
-			  uint64_t *now)
+			  int *timeout_io)
 {
     struct udp *st=state;
     if (*nfds_io<1) {
@@ -61,12 +60,11 @@ static int udp_beforepoll(void *state, struct pollfd *fds, int *nfds_io,
     return 0;
 }
 
-static void udp_afterpoll(void *state, struct pollfd *fds, int nfds,
-			  const struct timeval *tv, uint64_t *now)
+static void udp_afterpoll(void *state, struct pollfd *fds, int nfds)
 {
     struct udp *st=state;
     struct sockaddr_in from;
-    int fromlen;
+    socklen_t fromlen;
     struct notify_list *n;
     bool_t done;
     int rv;
@@ -274,7 +272,7 @@ static list_t *udp_apply(closure_t *self, struct cloc loc, dict_t *context,
     d=i->data.dict;
 
     j=dict_find_item(d,"address",False,"udp",st->loc);
-    st->addr=j?st->addr=string_item_to_ipaddr(j, "udp"):INADDR_ANY;
+    st->addr=j?string_item_to_ipaddr(j, "udp"):INADDR_ANY;
     st->port=dict_read_number(d,"port",True,"udp",st->loc,0);
     st->rbuf=find_cl_if(d,"buffer",CL_BUFFER,True,"udp",st->loc);
     st->authbind=dict_read_string(d,"authbind",False,"udp",st->loc);
@@ -302,7 +300,6 @@ static list_t *udp_apply(closure_t *self, struct cloc loc, dict_t *context,
     return new_closure(&st->cl);
 }
 
-init_module udp_module;
 void udp_module(dict_t *dict)
 {
     add_closure(dict,"udp",udp_apply);