keys/tripe-keys.in: Provide `kx-genalg' and `kx-param-genalg' options.

[tripe] / pathmtu / pathmtu.c

diff --git a/pathmtu/pathmtu.c b/pathmtu/pathmtu.c
index d347b0dddf20070b938e9301bfba7026c9bde7bf..9516cd2e21c2b8ce011f3d6db929fce1daa6d1b6 100644 (file)
--- a/pathmtu/pathmtu.c
+++ b/pathmtu/pathmtu.c
@@ -32,6 +32,7 @@
 
 #include "config.h"
 
+#include <assert.h>
 #include <errno.h>
 #include <stddef.h>
 #include <stdio.h>
@@ -238,6 +239,8 @@ static int pathmtu(const struct param *pp)
    * try to hug that initially.
    */
   for (;;) {
+    assert(lo <= mtu && mtu <= hi);
+    if (pp->f & F_VERBOSE) moan("probe: %d <= %d <= %d", lo, mtu, hi);
     rc = probe(&ps, st, mtu);
     switch (rc) {
 
@@ -295,19 +298,36 @@ static int pathmtu(const struct param *pp)
          if (pp->f & F_VERBOSE) moan("probe returned: found correct MTU");
          goto done;
        }
-       if (pp->f & F_VERBOSE) moan("probe returned: guessing higher");
        lo = mtu;
+
+       /* Now we must make a new guess, between lo and hi.  We know that lo
+        * is good; but we're not so sure about hi here.  We know that hi >
+        * lo, so this will find an approximate midpoint, greater than lo and
+        * no more than hi.
+        */
+       if (pp->f & F_VERBOSE) moan("probe returned: guessing higher");
        mtu += (hi - lo + 1)/2;
        break;
 
       case RC_LOWER:
       lower:
-       if (mtu == lo) {
+       /* If this didn't work, and we're already at the bottom of our
+        * possible range, then something has gone horribly wrong.
+        */
+       assert(lo < mtu);
+       hi = mtu - 1;
+       if (lo == hi) {
          if (pp->f & F_VERBOSE) moan("error returned: found correct MTU");
+         mtu = lo;
          goto done;
        }
+
+       /* We must make a new guess, between lo and hi.  We're probably
+        * fairly sure that lo will succeed, since either it's the minimum
+        * MTU or we've tested it already; but we're not quite sure about hi,
+        * so we want to aim high.
+        */
        if (pp->f & F_VERBOSE) moan("error returned: guessing lower");
-       hi = mtu - 1;
        mtu -= (hi - lo + 1)/2;
        break;
 
@@ -383,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;
@@ -597,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);
 
@@ -635,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];