From cb160b861b8b4f5798eb669f72bd8430eff05009 Mon Sep 17 00:00:00 2001
Message-Id: <cb160b861b8b4f5798eb669f72bd8430eff05009.1715039467.git.mdw@distorted.org.uk>
From: Mark Wooding <mdw@chiark.greenend.org.uk>
Date: Fri, 19 Feb 2016 21:41:04 +0000
Subject: [PATCH] Portability: Use `socklen_t' throughout, if available.
Organization: Straylight/Edgeware

From: Mark Wooding <mdw@distorted.org.uk>

Silly amd64 people, not using `size_t'.
---
 configure.ac      | 1 +
 pathmtu/pathmtu.c | 6 +++---
 server/admin.c    | 2 +-
 server/peer.c     | 4 ++--
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index 9583b73a..004304cd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,6 +36,7 @@ mdw_SILENT_RULES
 AC_PROG_CC
 AM_PROG_CC_C_O
 AX_CFLAGS_WARN_ALL
+AX_TYPE_SOCKLEN_T
 AC_CANONICAL_HOST
 AM_PROG_LIBTOOL
 
diff --git a/pathmtu/pathmtu.c b/pathmtu/pathmtu.c
index e8861f70..9516cd2e 100644
--- a/pathmtu/pathmtu.c
+++ b/pathmtu/pathmtu.c
@@ -403,7 +403,7 @@ struct raw_state {
 static int raw_setup(void *stv, int sk, const struct param *pp)
 {
   struct raw_state *st = stv;
-  size_t sz;
+  socklen_t sz;
   int i, mtu = -1;
   struct ifaddrs *ifa, *ifaa, *ifap;
   struct ifreq ifr;
@@ -617,7 +617,7 @@ static int linux_setup(void *stv, int sk, const struct param *pp)
 {
   struct linux_state *st = stv;
   int i, mtu;
-  size_t sz;
+  socklen_t sz;
 
   /* Snaffle the UDP socket. */
   st->sk = sk;
@@ -655,7 +655,7 @@ static int linux_selproc(void *stv, fd_set *fd_in, struct probestate *ps)
 {
   struct linux_state *st = stv;
   int mtu;
-  size_t sz;
+  socklen_t sz;
   ssize_t n;
   unsigned char b[65536];
 
diff --git a/server/admin.c b/server/admin.c
index 25581f65..ef5fddf3 100644
--- a/server/admin.c
+++ b/server/admin.c
@@ -2237,7 +2237,7 @@ static void a_accept(int fd, unsigned mode, void *v)
 {
   int nfd;
   struct sockaddr_un sun;
-  size_t sz = sizeof(sun);
+  socklen_t sz = sizeof(sun);
 
   if ((nfd = accept(fd, (struct sockaddr *)&sun, &sz)) < 0) {
     if (errno != EINTR && errno != EAGAIN && errno != EWOULDBLOCK &&
diff --git a/server/peer.c b/server/peer.c
index f4d80665..06dd33db 100644
--- a/server/peer.c
+++ b/server/peer.c
@@ -306,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;
@@ -798,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));
-- 
[mdw]