server/dh.c: Set the correct scalar size when loading XDH keys.

[tripe] / pathmtu / pathmtu.c

diff --git a/pathmtu/pathmtu.c b/pathmtu/pathmtu.c
index 8dac7b1153293f80822539adab2877ff1128e7eb..9516cd2e21c2b8ce011f3d6db929fce1daa6d1b6 100644 (file)
--- 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,13 +617,13 @@ 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;
 
   /* Turn on kernel path-MTU discovery and force DF on. */
-  i = IP_PMTUDISC_DO;
+  i = IP_PMTUDISC_PROBE;
   if (setsockopt(st->sk, IPPROTO_IP, IP_MTU_DISCOVER, &i, sizeof(i)))
     return (-1);
 
@@ -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];