changelog: start 0.6.8

[secnet.git] / udp.c

diff --git a/udp.c b/udp.c
index 451e6e9a0b8b23665ad31f054de12bec70204570..d1ada01f6f1d83eb56dce10336a1b33a552bc927 100644 (file)
--- a/udp.c
+++ b/udp.c
@@ -6,7 +6,7 @@
  *
  * secnet is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version d of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  * 
  * secnet is distributed in the hope that it will be useful, but
@@ -173,7 +173,7 @@ static void udp_socks_afterpoll(void *state, struct pollfd *fds, int nfds)
                ca.comm=&cc->ops;
                ca.ia=from;
                ca.ix=i;
-               done=comm_notify(&cc->notify, cc->rbuf, &ca);
+               done=comm_notify(cc, cc->rbuf, &ca);
                if (done) {
                    udp_sock_experienced(0,uc,socks,us,0,
                                         from.sa.sa_family,0,0);
@@ -186,7 +186,9 @@ static void udp_socks_afterpoll(void *state, struct pollfd *fds, int nfds)
                        /* Manufacture and send NAK packet */
                        source=get_uint32(cc->rbuf->start); /* Us */
                        dest=get_uint32(cc->rbuf->start+4); /* Them */
-                       send_nak(&ca,source,dest,msgtype,cc->rbuf,"unwanted");
+                       send_nak(&ca,source,dest,msgtype,cc->rbuf,
+                                priomsg_getmessage(&cc->why_unwanted,
+                                                   "unwanted"));
                    }
                    BUF_FREE(cc->rbuf);
                }
@@ -201,7 +203,8 @@ static void udp_socks_afterpoll(void *state, struct pollfd *fds, int nfds)
 }
 
 static bool_t udp_sendmsg(void *commst, struct buffer_if *buf,
-                         const struct comm_addr *dest)
+                         const struct comm_addr *dest,
+                         struct comm_clientinfo *clientinfo)
 {
     struct udp *st=commst;
     struct udpcommon *uc=&st->uc;
@@ -268,7 +271,8 @@ static bool_t record_socket_gotaddr(struct udpcommon *uc, struct udpsock *us,
     socklen_t salen=sizeof(us->addr);
     int r=getsockname(us->fd,&us->addr.sa,&salen);
     if (r) FAIL("getsockname()");
-    if (salen>sizeof(us->addr)) { errno=0; FAIL("getsockname() length"); }
+    if ((size_t)salen>sizeof(us->addr)) /* cast squashes clang warning */
+      { errno=0; FAIL("getsockname() length"); }
     return True;
 
  failed: