git.openwrt.org Git - openwrt/staging/adrian.git/blob

   1 From 9c0d445ef4abffa2b9342ad65e85ef425c1f83bb Mon Sep 17 00:00:00 2001
   2 From: Simon Kelley <simon@thekelleys.org.uk>
   3 Date: Wed, 9 Jan 2019 17:57:56 +0000
   4 Subject: [PATCH 27/32] Fix e7bfd556c079c8b5e7425aed44abc35925b24043 to
   5  actually work.
   6
   7 Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
   8 ---
   9  src/dhcp.c  | 54 +++++++++++++++++++++++++----------------------------
  10  src/dhcp6.c |  2 +-
  11  2 files changed, 26 insertions(+), 30 deletions(-)
  12
  13 --- a/src/dhcp.c
  14 +++ b/src/dhcp.c
  15 @@ -754,19 +754,6 @@ int address_allocate(struct dhcp_context
  16               if (addr.s_addr == d->router.s_addr)
  17                 break;
  18
  19 -           /* in consec-ip mode, skip addresses equal to
  20 -              the number of addresses rejected by clients. This
  21 -              should avoid the same client being offered the same
  22 -              address after it has rjected it. */
  23 -           if (option_bool(OPT_CONSEC_ADDR))
  24 -             {
  25 -               if (c->addr_epoch)
  26 -                 {
  27 -                   c->addr_epoch--;
  28 -                   d = context; /* d non-NULL skips the address. */
  29 -                 }
  30 -             }
  31 -
  32             /* Addresses which end in .255 and .0 are broken in Windows even when using
  33                supernetting. ie dhcp-range=192.168.0.1,192.168.1.254,255,255,254.0
  34                then 192.168.0.255 is a valid IP address, but not for Windows as it's
  35 @@ -778,24 +765,33 @@ int address_allocate(struct dhcp_context
  36                 (!IN_CLASSC(ntohl(addr.s_addr)) ||
  37                  ((ntohl(addr.s_addr) & 0xff) != 0xff && ((ntohl(addr.s_addr) & 0xff) != 0x0))))
  38               {
  39 -               struct ping_result *r;
  40 -
  41 -               if ((r = do_icmp_ping(now, addr, j, loopback)))
  42 -                 {
  43 -                   /* consec-ip mode: we offered this address for another client
  44 -                      (different hash) recently, don't offer it to this one. */
  45 -                   if (!option_bool(OPT_CONSEC_ADDR) || r->hash == j)
  46 -                     {
  47 -                       *addrp = addr;
  48 -                       return 1;
  49 -                     }
  50 -                 }
  51 +               /* in consec-ip mode, skip addresses equal to
  52 +                  the number of addresses rejected by clients. This
  53 +                  should avoid the same client being offered the same
  54 +                  address after it has rjected it. */
  55 +               if (option_bool(OPT_CONSEC_ADDR) && c->addr_epoch)
  56 +                 c->addr_epoch--;
  57                 else
  58                   {
  59 -                   /* address in use: perturb address selection so that we are
  60 -                      less likely to try this address again. */
  61 -                   if (!option_bool(OPT_CONSEC_ADDR))
  62 -                     c->addr_epoch++;
  63 +                   struct ping_result *r;
  64 +
  65 +                   if ((r = do_icmp_ping(now, addr, j, loopback)))
  66 +                     {
  67 +                       /* consec-ip mode: we offered this address for another client
  68 +                          (different hash) recently, don't offer it to this one. */
  69 +                       if (!option_bool(OPT_CONSEC_ADDR) || r->hash == j)
  70 +                         {
  71 +                           *addrp = addr;
  72 +                           return 1;
  73 +                         }
  74 +                     }
  75 +                   else
  76 +                     {
  77 +                       /* address in use: perturb address selection so that we are
  78 +                          less likely to try this address again. */
  79 +                       if (!option_bool(OPT_CONSEC_ADDR))
  80 +                         c->addr_epoch++;
  81 +                     }
  82                   }
  83               }
  84
  85 --- a/src/dhcp6.c
  86 +++ b/src/dhcp6.c
  87 @@ -436,7 +436,7 @@ struct dhcp_context *address6_allocate(s
  88                  skip addresses equal to the number of addresses rejected
  89                  by clients. This should avoid the same client being offered the same
  90                  address after it has rjected it. */
  91 -             start = lease_find_max_addr6(c) + serial + c->addr_epoch;
  92 +             start = lease_find_max_addr6(c) + 1 + serial + c->addr_epoch;
  93               if (c->addr_epoch)
  94                 c->addr_epoch--;
  95             }