Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/bsd/dhcpcd/dist Import dhcpcd-7.1.0 with the follow...



details:   https://anonhg.NetBSD.org/src/rev/c968c73054f8
branches:  trunk
changeset: 996180:c968c73054f8
user:      roy <roy%NetBSD.org@localhost>
date:      Tue Jan 22 15:16:24 2019 +0000

description:
Import dhcpcd-7.1.0 with the following changes:

* NetBSD: sets SO_RERROR on to detect receive socket overflow
* BSD: route improvements to avoid listening for own changes
* IP6: implement IP6 address sharing
* BSD: catch UP/DOWN events when interfaces does support media changes
* IPv4LL: remember old address when carrier is lost

diffstat:

 external/bsd/dhcpcd/dist/LICENSE                  |    2 +-
 external/bsd/dhcpcd/dist/configure                |    7 +-
 external/bsd/dhcpcd/dist/src/arp.c                |    2 +-
 external/bsd/dhcpcd/dist/src/arp.h                |    2 +-
 external/bsd/dhcpcd/dist/src/auth.c               |    2 +-
 external/bsd/dhcpcd/dist/src/auth.h               |    2 +-
 external/bsd/dhcpcd/dist/src/bpf.h                |    2 +-
 external/bsd/dhcpcd/dist/src/common.c             |    2 +-
 external/bsd/dhcpcd/dist/src/common.h             |    2 +-
 external/bsd/dhcpcd/dist/src/control.c            |    2 +-
 external/bsd/dhcpcd/dist/src/control.h            |    2 +-
 external/bsd/dhcpcd/dist/src/defs.h               |    4 +-
 external/bsd/dhcpcd/dist/src/dev.c                |    2 +-
 external/bsd/dhcpcd/dist/src/dev.h                |    2 +-
 external/bsd/dhcpcd/dist/src/dev/udev.c           |    2 +-
 external/bsd/dhcpcd/dist/src/dhcp-common.c        |    2 +-
 external/bsd/dhcpcd/dist/src/dhcp-common.h        |    2 +-
 external/bsd/dhcpcd/dist/src/dhcp.h               |    2 +-
 external/bsd/dhcpcd/dist/src/dhcp6.h              |    3 +-
 external/bsd/dhcpcd/dist/src/dhcpcd-embedded.c.in |    2 +-
 external/bsd/dhcpcd/dist/src/dhcpcd-embedded.h.in |    2 +-
 external/bsd/dhcpcd/dist/src/dhcpcd.8.in          |   30 ++--
 external/bsd/dhcpcd/dist/src/dhcpcd.conf.5.in     |  119 +++++++++++--------
 external/bsd/dhcpcd/dist/src/dhcpcd.h             |    9 +-
 external/bsd/dhcpcd/dist/src/duid.c               |    4 +-
 external/bsd/dhcpcd/dist/src/eloop.c              |    2 +-
 external/bsd/dhcpcd/dist/src/eloop.h              |    2 +-
 external/bsd/dhcpcd/dist/src/if-linux-wext.c      |    2 +-
 external/bsd/dhcpcd/dist/src/if-linux.c           |   24 +++-
 external/bsd/dhcpcd/dist/src/if-options.h         |    4 +-
 external/bsd/dhcpcd/dist/src/if-sun.c             |   47 ++-----
 external/bsd/dhcpcd/dist/src/if.c                 |   12 +-
 external/bsd/dhcpcd/dist/src/if.h                 |    3 +-
 external/bsd/dhcpcd/dist/src/ipv4.c               |    5 +-
 external/bsd/dhcpcd/dist/src/ipv4.h               |    2 +-
 external/bsd/dhcpcd/dist/src/ipv4ll.c             |  127 ++++++++++++++-------
 external/bsd/dhcpcd/dist/src/ipv4ll.h             |   10 +-
 external/bsd/dhcpcd/dist/src/ipv6.c               |   68 +++--------
 external/bsd/dhcpcd/dist/src/ipv6.h               |    9 +-
 external/bsd/dhcpcd/dist/src/ipv6nd.h             |    6 +-
 external/bsd/dhcpcd/dist/src/logerr.c             |    2 +-
 external/bsd/dhcpcd/dist/src/logerr.h             |    2 +-
 external/bsd/dhcpcd/dist/src/route.c              |    2 +-
 external/bsd/dhcpcd/dist/src/route.h              |    2 +-
 external/bsd/dhcpcd/dist/src/sa.c                 |    2 +-
 external/bsd/dhcpcd/dist/src/sa.h                 |    2 +-
 external/bsd/dhcpcd/dist/src/script.c             |    2 +-
 external/bsd/dhcpcd/dist/src/script.h             |    2 +-
 48 files changed, 304 insertions(+), 247 deletions(-)

diffs (truncated from 1636 to 300 lines):

diff -r 5394fa9e142a -r c968c73054f8 external/bsd/dhcpcd/dist/LICENSE
--- a/external/bsd/dhcpcd/dist/LICENSE  Tue Jan 22 15:13:22 2019 +0000
+++ b/external/bsd/dhcpcd/dist/LICENSE  Tue Jan 22 15:16:24 2019 +0000
@@ -1,4 +1,4 @@
-Copyright (c) 2006-2018 Roy Marples <roy%marples.name@localhost>
+Copyright (c) 2006-2019 Roy Marples <roy%marples.name@localhost>
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff -r 5394fa9e142a -r c968c73054f8 external/bsd/dhcpcd/dist/configure
--- a/external/bsd/dhcpcd/dist/configure        Tue Jan 22 15:13:22 2019 +0000
+++ b/external/bsd/dhcpcd/dist/configure        Tue Jan 22 15:16:24 2019 +0000
@@ -91,6 +91,7 @@
        --without-sha256) SHA2=no;;
        --without-hmac) HMAC=no;;
        --without-dev) DEV=no;;
+       --with-udev) DEV=yes; UDEV=yes;;
        --without-udev) UDEV=no;;
        --with-poll) POLL="$var";;
        --serviceexists) SERVICEEXISTS=$var;;
@@ -98,7 +99,7 @@
        --servicestatus) SERVICESTATUS=$var;;
        --small) SMALL=yes;;
        --statusarg) STATUSARG=$var;;
-       --infodir|--includedir) ;; # ignore autotools
+       --infodir) ;; # ignore autotools
        --disable-maintainer-mode|--disable-dependency-tracking) ;;
        --disable-silent-rules) ;;
        -V|--version)
@@ -1344,6 +1345,10 @@
        rm -f _udev.c _udev
 elif [ "$DEV" != no -a "$UDEV" != no ]; then
        echo "no"
+       if [ -n "$UDEV" ]; then
+               echo "udev has been explicity requested ... aborting" >&2
+               exit 1
+       fi
 fi
 
 if [ "$DEV" = yes ]; then
diff -r 5394fa9e142a -r c968c73054f8 external/bsd/dhcpcd/dist/src/arp.c
--- a/external/bsd/dhcpcd/dist/src/arp.c        Tue Jan 22 15:13:22 2019 +0000
+++ b/external/bsd/dhcpcd/dist/src/arp.c        Tue Jan 22 15:16:24 2019 +0000
@@ -1,6 +1,6 @@
 /*
  * dhcpcd - ARP handler
- * Copyright (c) 2006-2018 Roy Marples <roy%marples.name@localhost>
+ * Copyright (c) 2006-2019 Roy Marples <roy%marples.name@localhost>
  * All rights reserved
 
  * Redistribution and use in source and binary forms, with or without
diff -r 5394fa9e142a -r c968c73054f8 external/bsd/dhcpcd/dist/src/arp.h
--- a/external/bsd/dhcpcd/dist/src/arp.h        Tue Jan 22 15:13:22 2019 +0000
+++ b/external/bsd/dhcpcd/dist/src/arp.h        Tue Jan 22 15:16:24 2019 +0000
@@ -1,6 +1,6 @@
 /*
  * dhcpcd - DHCP client daemon
- * Copyright (c) 2006-2018 Roy Marples <roy%marples.name@localhost>
+ * Copyright (c) 2006-2019 Roy Marples <roy%marples.name@localhost>
  * All rights reserved
 
  * Redistribution and use in source and binary forms, with or without
diff -r 5394fa9e142a -r c968c73054f8 external/bsd/dhcpcd/dist/src/auth.c
--- a/external/bsd/dhcpcd/dist/src/auth.c       Tue Jan 22 15:13:22 2019 +0000
+++ b/external/bsd/dhcpcd/dist/src/auth.c       Tue Jan 22 15:16:24 2019 +0000
@@ -1,6 +1,6 @@
 /*
  * dhcpcd - DHCP client daemon
- * Copyright (c) 2006-2018 Roy Marples <roy%marples.name@localhost>
+ * Copyright (c) 2006-2019 Roy Marples <roy%marples.name@localhost>
  * All rights reserved
 
  * Redistribution and use in source and binary forms, with or without
diff -r 5394fa9e142a -r c968c73054f8 external/bsd/dhcpcd/dist/src/auth.h
--- a/external/bsd/dhcpcd/dist/src/auth.h       Tue Jan 22 15:13:22 2019 +0000
+++ b/external/bsd/dhcpcd/dist/src/auth.h       Tue Jan 22 15:16:24 2019 +0000
@@ -1,6 +1,6 @@
 /*
  * dhcpcd - DHCP client daemon
- * Copyright (c) 2006-2018 Roy Marples <roy%marples.name@localhost>
+ * Copyright (c) 2006-2019 Roy Marples <roy%marples.name@localhost>
  * All rights reserved
 
  * Redistribution and use in source and binary forms, with or without
diff -r 5394fa9e142a -r c968c73054f8 external/bsd/dhcpcd/dist/src/bpf.h
--- a/external/bsd/dhcpcd/dist/src/bpf.h        Tue Jan 22 15:13:22 2019 +0000
+++ b/external/bsd/dhcpcd/dist/src/bpf.h        Tue Jan 22 15:16:24 2019 +0000
@@ -1,6 +1,6 @@
 /*
  * dhcpcd: BPF arp and bootp filtering
- * Copyright (c) 2006-2018 Roy Marples <roy%marples.name@localhost>
+ * Copyright (c) 2006-2019 Roy Marples <roy%marples.name@localhost>
  * All rights reserved
 
  * Redistribution and use in source and binary forms, with or without
diff -r 5394fa9e142a -r c968c73054f8 external/bsd/dhcpcd/dist/src/common.c
--- a/external/bsd/dhcpcd/dist/src/common.c     Tue Jan 22 15:13:22 2019 +0000
+++ b/external/bsd/dhcpcd/dist/src/common.c     Tue Jan 22 15:16:24 2019 +0000
@@ -1,6 +1,6 @@
 /*
  * dhcpcd - DHCP client daemon
- * Copyright (c) 2006-2018 Roy Marples <roy%marples.name@localhost>
+ * Copyright (c) 2006-2019 Roy Marples <roy%marples.name@localhost>
  * All rights reserved
 
  * Redistribution and use in source and binary forms, with or without
diff -r 5394fa9e142a -r c968c73054f8 external/bsd/dhcpcd/dist/src/common.h
--- a/external/bsd/dhcpcd/dist/src/common.h     Tue Jan 22 15:13:22 2019 +0000
+++ b/external/bsd/dhcpcd/dist/src/common.h     Tue Jan 22 15:16:24 2019 +0000
@@ -1,6 +1,6 @@
 /*
  * dhcpcd - DHCP client daemon
- * Copyright (c) 2006-2018 Roy Marples <roy%marples.name@localhost>
+ * Copyright (c) 2006-2019 Roy Marples <roy%marples.name@localhost>
  * All rights reserved
 
  * Redistribution and use in source and binary forms, with or without
diff -r 5394fa9e142a -r c968c73054f8 external/bsd/dhcpcd/dist/src/control.c
--- a/external/bsd/dhcpcd/dist/src/control.c    Tue Jan 22 15:13:22 2019 +0000
+++ b/external/bsd/dhcpcd/dist/src/control.c    Tue Jan 22 15:16:24 2019 +0000
@@ -1,6 +1,6 @@
 /*
  * dhcpcd - DHCP client daemon
- * Copyright (c) 2006-2018 Roy Marples <roy%marples.name@localhost>
+ * Copyright (c) 2006-2019 Roy Marples <roy%marples.name@localhost>
  * All rights reserved
 
  * Redistribution and use in source and binary forms, with or without
diff -r 5394fa9e142a -r c968c73054f8 external/bsd/dhcpcd/dist/src/control.h
--- a/external/bsd/dhcpcd/dist/src/control.h    Tue Jan 22 15:13:22 2019 +0000
+++ b/external/bsd/dhcpcd/dist/src/control.h    Tue Jan 22 15:16:24 2019 +0000
@@ -1,6 +1,6 @@
 /*
  * dhcpcd - DHCP client daemon
- * Copyright (c) 2006-2018 Roy Marples <roy%marples.name@localhost>
+ * Copyright (c) 2006-2019 Roy Marples <roy%marples.name@localhost>
  * All rights reserved
 
  * Redistribution and use in source and binary forms, with or without
diff -r 5394fa9e142a -r c968c73054f8 external/bsd/dhcpcd/dist/src/defs.h
--- a/external/bsd/dhcpcd/dist/src/defs.h       Tue Jan 22 15:13:22 2019 +0000
+++ b/external/bsd/dhcpcd/dist/src/defs.h       Tue Jan 22 15:16:24 2019 +0000
@@ -1,6 +1,6 @@
 /*
  * dhcpcd - DHCP client daemon
- * Copyright (c) 2006-2018 Roy Marples <roy%marples.name@localhost>
+ * Copyright (c) 2006-2019 Roy Marples <roy%marples.name@localhost>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -28,7 +28,7 @@
 #define CONFIG_H
 
 #define PACKAGE                        "dhcpcd"
-#define VERSION                        "7.0.8"
+#define VERSION                        "7.1.0"
 
 #ifndef CONFIG
 # define CONFIG                        SYSCONFDIR "/" PACKAGE ".conf"
diff -r 5394fa9e142a -r c968c73054f8 external/bsd/dhcpcd/dist/src/dev.c
--- a/external/bsd/dhcpcd/dist/src/dev.c        Tue Jan 22 15:13:22 2019 +0000
+++ b/external/bsd/dhcpcd/dist/src/dev.c        Tue Jan 22 15:16:24 2019 +0000
@@ -1,6 +1,6 @@
 /*
  * dhcpcd - DHCP client daemon
- * Copyright (c) 2006-2018 Roy Marples <roy%marples.name@localhost>
+ * Copyright (c) 2006-2019 Roy Marples <roy%marples.name@localhost>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff -r 5394fa9e142a -r c968c73054f8 external/bsd/dhcpcd/dist/src/dev.h
--- a/external/bsd/dhcpcd/dist/src/dev.h        Tue Jan 22 15:13:22 2019 +0000
+++ b/external/bsd/dhcpcd/dist/src/dev.h        Tue Jan 22 15:16:24 2019 +0000
@@ -1,6 +1,6 @@
 /*
  * dhcpcd - DHCP client daemon
- * Copyright (c) 2006-2018 Roy Marples <roy%marples.name@localhost>
+ * Copyright (c) 2006-2019 Roy Marples <roy%marples.name@localhost>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff -r 5394fa9e142a -r c968c73054f8 external/bsd/dhcpcd/dist/src/dev/udev.c
--- a/external/bsd/dhcpcd/dist/src/dev/udev.c   Tue Jan 22 15:13:22 2019 +0000
+++ b/external/bsd/dhcpcd/dist/src/dev/udev.c   Tue Jan 22 15:16:24 2019 +0000
@@ -1,6 +1,6 @@
 /*
  * dhcpcd - DHCP client daemon
- * Copyright (c) 2006-2018 Roy Marples <roy%marples.name@localhost>
+ * Copyright (c) 2006-2019 Roy Marples <roy%marples.name@localhost>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff -r 5394fa9e142a -r c968c73054f8 external/bsd/dhcpcd/dist/src/dhcp-common.c
--- a/external/bsd/dhcpcd/dist/src/dhcp-common.c        Tue Jan 22 15:13:22 2019 +0000
+++ b/external/bsd/dhcpcd/dist/src/dhcp-common.c        Tue Jan 22 15:16:24 2019 +0000
@@ -1,6 +1,6 @@
 /*
  * dhcpcd - DHCP client daemon
- * Copyright (c) 2006-2018 Roy Marples <roy%marples.name@localhost>
+ * Copyright (c) 2006-2019 Roy Marples <roy%marples.name@localhost>
  * All rights reserved
 
  * Redistribution and use in source and binary forms, with or without
diff -r 5394fa9e142a -r c968c73054f8 external/bsd/dhcpcd/dist/src/dhcp-common.h
--- a/external/bsd/dhcpcd/dist/src/dhcp-common.h        Tue Jan 22 15:13:22 2019 +0000
+++ b/external/bsd/dhcpcd/dist/src/dhcp-common.h        Tue Jan 22 15:16:24 2019 +0000
@@ -1,6 +1,6 @@
 /*
  * dhcpcd - DHCP client daemon
- * Copyright (c) 2006-2018 Roy Marples <roy%marples.name@localhost>
+ * Copyright (c) 2006-2019 Roy Marples <roy%marples.name@localhost>
  * All rights reserved
 
  * Redistribution and use in source and binary forms, with or without
diff -r 5394fa9e142a -r c968c73054f8 external/bsd/dhcpcd/dist/src/dhcp.h
--- a/external/bsd/dhcpcd/dist/src/dhcp.h       Tue Jan 22 15:13:22 2019 +0000
+++ b/external/bsd/dhcpcd/dist/src/dhcp.h       Tue Jan 22 15:16:24 2019 +0000
@@ -1,6 +1,6 @@
 /*
  * dhcpcd - DHCP client daemon
- * Copyright (c) 2006-2018 Roy Marples <roy%marples.name@localhost>
+ * Copyright (c) 2006-2019 Roy Marples <roy%marples.name@localhost>
  * All rights reserved
 
  * Redistribution and use in source and binary forms, with or without
diff -r 5394fa9e142a -r c968c73054f8 external/bsd/dhcpcd/dist/src/dhcp6.h
--- a/external/bsd/dhcpcd/dist/src/dhcp6.h      Tue Jan 22 15:13:22 2019 +0000
+++ b/external/bsd/dhcpcd/dist/src/dhcp6.h      Tue Jan 22 15:16:24 2019 +0000
@@ -1,6 +1,6 @@
 /*
  * dhcpcd - DHCP client daemon
- * Copyright (c) 2006-2018 Roy Marples <roy%marples.name@localhost>
+ * Copyright (c) 2006-2019 Roy Marples <roy%marples.name@localhost>
  * All rights reserved
 
  * Redistribution and use in source and binary forms, with or without
@@ -232,6 +232,7 @@
 void dhcp6_free(struct interface *);
 void dhcp6_handleifa(int, struct ipv6_addr *, pid_t);
 int dhcp6_dadcompleted(const struct interface *);
+void dhcp6_abort(struct interface *);
 void dhcp6_drop(struct interface *, const char *);
 void dhcp6_dropnondelegates(struct interface *ifp);
 int dhcp6_dump(struct interface *);
diff -r 5394fa9e142a -r c968c73054f8 external/bsd/dhcpcd/dist/src/dhcpcd-embedded.c.in
--- a/external/bsd/dhcpcd/dist/src/dhcpcd-embedded.c.in Tue Jan 22 15:13:22 2019 +0000
+++ b/external/bsd/dhcpcd/dist/src/dhcpcd-embedded.c.in Tue Jan 22 15:16:24 2019 +0000
@@ -6,7 +6,7 @@
 
 /*
  * dhcpcd - DHCP client daemon
- * Copyright (c) 2006-2018 Roy Marples <roy%marples.name@localhost>
+ * Copyright (c) 2006-2019 Roy Marples <roy%marples.name@localhost>
  * All rights reserved
 
  * Redistribution and use in source and binary forms, with or without
diff -r 5394fa9e142a -r c968c73054f8 external/bsd/dhcpcd/dist/src/dhcpcd-embedded.h.in
--- a/external/bsd/dhcpcd/dist/src/dhcpcd-embedded.h.in Tue Jan 22 15:13:22 2019 +0000
+++ b/external/bsd/dhcpcd/dist/src/dhcpcd-embedded.h.in Tue Jan 22 15:16:24 2019 +0000
@@ -1,6 +1,6 @@
 /*
  * dhcpcd - DHCP client daemon
- * Copyright (c) 2006-2018 Roy Marples <roy%marples.name@localhost>
+ * Copyright (c) 2006-2019 Roy Marples <roy%marples.name@localhost>
  * All rights reserved
 
  * Redistribution and use in source and binary forms, with or without
diff -r 5394fa9e142a -r c968c73054f8 external/bsd/dhcpcd/dist/src/dhcpcd.8.in
--- a/external/bsd/dhcpcd/dist/src/dhcpcd.8.in  Tue Jan 22 15:13:22 2019 +0000
+++ b/external/bsd/dhcpcd/dist/src/dhcpcd.8.in  Tue Jan 22 15:16:24 2019 +0000
@@ -1,4 +1,4 @@
-.\" Copyright (c) 2006-2018 Roy Marples
+.\" Copyright (c) 2006-2019 Roy Marples
 .\" All rights reserved
 .\"
 .\" Redistribution and use in source and binary forms, with or without
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd June 5, 2018
+.Dd January 2, 2019
 .Dt DHCPCD 8
 .Os
 .Sh NAME
@@ -54,7 +54,7 @@
 .Op Fl v , Fl Fl vendor Ar code , Ar value
 .Op Fl W , Fl Fl whitelist Ar address Ns Op Ar /cidr
 .Op Fl w
-.Op Fl Fl waitip Op 4 | 6
+.Op Fl Fl waitip Ns = Ns Op 4 | 6
 .Op Fl y , Fl Fl reboot Ar seconds
 .Op Fl X , Fl Fl blacklist Ar address Ns Op Ar /cidr
 .Op Fl Z , Fl Fl denyinterfaces Ar pattern
@@ -102,7 +102,7 @@
 .Nm
 then daemonises and waits for the lease renewal time to lapse.
 It will then attempt to renew its lease and reconfigure if the new lease
-changes when the lease beings to expire or the DHCP server sends message
+changes when the lease begins to expire or the DHCP server sends a message



Home | Main Index | Thread Index | Old Index