configure.ac, Makefile.am: More subsetting based on module availability.

[tripe] / server / peer.c

diff --git a/server/peer.c b/server/peer.c
index 75f7acba6fb8bfd2f760d93d4cbc81faee05e800..06dd33db2c29e15bfa42b112d151f8e896f3b1c4 100644 (file)
--- a/server/peer.c
+++ b/server/peer.c
@@ -204,10 +204,9 @@ static int p_decrypt(peer **pp, addr *a, size_t n,
       p = q;
       goto match;
     }
-    T( trace(T_PEER, "peer: failed to decrypt: try other mobile peers...",
-            p_name(q)); )
+    T( trace(T_PEER, "peer: failed to decrypt: try other mobile peers..."); )
   } else if (nmobile)
-    T( trace(T_PEER, "peer: unknown source: trying mobile peers..."); )
+    T( trace(T_PEER, "peer: unknown source: trying mobile peers...") );
   else {
     p = 0;
     goto searched;
@@ -307,7 +306,7 @@ static void p_read(int fd, unsigned mode, void *v)
 {
   peer *p = 0;
   addr a;
-  size_t sz;
+  socklen_t sz;
   ssize_t n;
   int ch;
   buf b, bb;
@@ -799,7 +798,7 @@ void p_init(struct in_addr addr, unsigned port)
 unsigned p_port(void)
 {
   addr a;
-  size_t sz = sizeof(addr);
+  socklen_t sz = sizeof(addr);
 
   if (getsockname(sock.fd, &a.sa, &sz))
     die(EXIT_FAILURE, "couldn't read port number: %s", strerror(errno));