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

   1 From 0669ee7a69a004ce34fed41e50aa575f8e04427b Mon Sep 17 00:00:00 2001
   2 From: Simon Kelley <simon@thekelleys.org.uk>
   3 Date: Fri, 4 May 2018 16:46:24 +0100
   4 Subject: [PATCH 02/17] Fix DHCP broken-ness when --no-ping AND
   5  --dhcp-sequential-ip are set.
   6
   7 Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
   8 ---
   9  CHANGELOG  | 3 ++-
  10  src/dhcp.c | 2 +-
  11  2 files changed, 3 insertions(+), 2 deletions(-)
  12
  13 --- a/CHANGELOG
  14 +++ b/CHANGELOG
  15 @@ -14,7 +14,8 @@ version 2.80
  16          when the upstream namesevers do not support DNSSEC, and in this
  17          case no DNSSEC validation at all is occuring.
  18
  19 -
  20 +        Fix DHCP broken-ness when --no-ping AND --dhcp-sequential-ip
  21 +       are set. Thanks to Daniel Miess for help with this.
  22
  23
  24  version 2.79
  25 --- a/src/dhcp.c
  26 +++ b/src/dhcp.c
  27 @@ -678,7 +678,7 @@ struct ping_result *do_icmp_ping(time_t
  28    if ((count >= max) || option_bool(OPT_NO_PING) || loopback)
  29      {
  30        /* overloaded, or configured not to check, loopback interface, return "not in use" */
  31 -      dummy.hash = 0;
  32 +      dummy.hash = hash;
  33        return &dummy;
  34      }
  35    else if (icmp_ping(addr))