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 Sync



details:   https://anonhg.NetBSD.org/src/rev/cabce647f6d3
branches:  trunk
changeset: 806063:cabce647f6d3
user:      roy <roy%NetBSD.org@localhost>
date:      Fri Jan 30 09:47:05 2015 +0000

description:
Sync

diffstat:

 external/bsd/dhcpcd/dist/arp.c                   |    4 +-
 external/bsd/dhcpcd/dist/arp.h                   |    6 +-
 external/bsd/dhcpcd/dist/auth.c                  |    4 +-
 external/bsd/dhcpcd/dist/auth.h                  |    4 +-
 external/bsd/dhcpcd/dist/common.c                |    4 +-
 external/bsd/dhcpcd/dist/common.h                |    4 +-
 external/bsd/dhcpcd/dist/control.c               |    4 +-
 external/bsd/dhcpcd/dist/control.h               |    4 +-
 external/bsd/dhcpcd/dist/crypt/crypt.h           |    4 +-
 external/bsd/dhcpcd/dist/crypt/hmac_md5.c        |    4 +-
 external/bsd/dhcpcd/dist/defs.h                  |    6 +-
 external/bsd/dhcpcd/dist/dev.h                   |    4 +-
 external/bsd/dhcpcd/dist/dhcp-common.c           |    4 +-
 external/bsd/dhcpcd/dist/dhcp-common.h           |    4 +-
 external/bsd/dhcpcd/dist/dhcp.c                  |   54 +-
 external/bsd/dhcpcd/dist/dhcp.h                  |   16 +-
 external/bsd/dhcpcd/dist/dhcp6.c                 |   19 +-
 external/bsd/dhcpcd/dist/dhcp6.h                 |   14 +-
 external/bsd/dhcpcd/dist/dhcpcd-definitions.conf |    4 +-
 external/bsd/dhcpcd/dist/dhcpcd-embedded.c       |    4 +-
 external/bsd/dhcpcd/dist/dhcpcd-embedded.h       |    4 +-
 external/bsd/dhcpcd/dist/dhcpcd-run-hooks.8.in   |    4 +-
 external/bsd/dhcpcd/dist/dhcpcd.8.in             |   18 +-
 external/bsd/dhcpcd/dist/dhcpcd.c                |   38 +-
 external/bsd/dhcpcd/dist/dhcpcd.conf.5.in        |   20 +-
 external/bsd/dhcpcd/dist/dhcpcd.h                |    7 +-
 external/bsd/dhcpcd/dist/duid.c                  |    4 +-
 external/bsd/dhcpcd/dist/duid.h                  |    4 +-
 external/bsd/dhcpcd/dist/eloop.c                 |    4 +-
 external/bsd/dhcpcd/dist/eloop.h                 |    4 +-
 external/bsd/dhcpcd/dist/if-bsd.c                |  158 +++++-
 external/bsd/dhcpcd/dist/if-options.c            |   55 +-
 external/bsd/dhcpcd/dist/if-options.h            |    7 +-
 external/bsd/dhcpcd/dist/if.c                    |   46 +-
 external/bsd/dhcpcd/dist/if.h                    |    9 +-
 external/bsd/dhcpcd/dist/ipv4.c                  |    4 +-
 external/bsd/dhcpcd/dist/ipv4.h                  |    4 +-
 external/bsd/dhcpcd/dist/ipv4ll.c                |    4 +-
 external/bsd/dhcpcd/dist/ipv6.c                  |  626 +++++++++++++++++++---
 external/bsd/dhcpcd/dist/ipv6.h                  |   73 ++-
 external/bsd/dhcpcd/dist/ipv6nd.c                |   71 ++-
 external/bsd/dhcpcd/dist/ipv6nd.h                |    8 +-
 external/bsd/dhcpcd/dist/script.c                |   10 +-
 43 files changed, 1077 insertions(+), 276 deletions(-)

diffs (truncated from 2690 to 300 lines):

diff -r bdef1dafb437 -r cabce647f6d3 external/bsd/dhcpcd/dist/arp.c
--- a/external/bsd/dhcpcd/dist/arp.c    Fri Jan 30 09:40:24 2015 +0000
+++ b/external/bsd/dhcpcd/dist/arp.c    Fri Jan 30 09:47:05 2015 +0000
@@ -1,9 +1,9 @@
 #include <sys/cdefs.h>
- __RCSID("$NetBSD: arp.c,v 1.8 2014/11/26 13:43:06 roy Exp $");
+ __RCSID("$NetBSD: arp.c,v 1.9 2015/01/30 09:47:05 roy Exp $");
 
 /*
  * dhcpcd - DHCP client daemon
- * Copyright (c) 2006-2014 Roy Marples <roy%marples.name@localhost>
+ * Copyright (c) 2006-2015 Roy Marples <roy%marples.name@localhost>
  * All rights reserved
 
  * Redistribution and use in source and binary forms, with or without
diff -r bdef1dafb437 -r cabce647f6d3 external/bsd/dhcpcd/dist/arp.h
--- a/external/bsd/dhcpcd/dist/arp.h    Fri Jan 30 09:40:24 2015 +0000
+++ b/external/bsd/dhcpcd/dist/arp.h    Fri Jan 30 09:47:05 2015 +0000
@@ -1,8 +1,8 @@
-/* $NetBSD: arp.h,v 1.7 2014/12/19 10:54:08 roy Exp $ */
+/* $NetBSD: arp.h,v 1.8 2015/01/30 09:47:05 roy Exp $ */
 
 /*
  * dhcpcd - DHCP client daemon
- * Copyright (c) 2006-2014 Roy Marples <roy%marples.name@localhost>
+ * Copyright (c) 2006-2015 Roy Marples <roy%marples.name@localhost>
  * All rights reserved
 
  * Redistribution and use in source and binary forms, with or without
@@ -77,6 +77,6 @@
 void arp_free_but(struct arp_state *);
 void arp_close(struct interface *);
 #else
-#define arp_close(a)
+#define arp_close(a) {}
 #endif
 #endif
diff -r bdef1dafb437 -r cabce647f6d3 external/bsd/dhcpcd/dist/auth.c
--- a/external/bsd/dhcpcd/dist/auth.c   Fri Jan 30 09:40:24 2015 +0000
+++ b/external/bsd/dhcpcd/dist/auth.c   Fri Jan 30 09:47:05 2015 +0000
@@ -1,9 +1,9 @@
 #include <sys/cdefs.h>
- __RCSID("$NetBSD: auth.c,v 1.7 2014/11/14 12:00:54 roy Exp $");
+ __RCSID("$NetBSD: auth.c,v 1.8 2015/01/30 09:47:05 roy Exp $");
 
 /*
  * dhcpcd - DHCP client daemon
- * Copyright (c) 2006-2014 Roy Marples <roy%marples.name@localhost>
+ * Copyright (c) 2006-2015 Roy Marples <roy%marples.name@localhost>
  * All rights reserved
 
  * Redistribution and use in source and binary forms, with or without
diff -r bdef1dafb437 -r cabce647f6d3 external/bsd/dhcpcd/dist/auth.h
--- a/external/bsd/dhcpcd/dist/auth.h   Fri Jan 30 09:40:24 2015 +0000
+++ b/external/bsd/dhcpcd/dist/auth.h   Fri Jan 30 09:47:05 2015 +0000
@@ -1,8 +1,8 @@
-/* $NetBSD: auth.h,v 1.7 2014/11/14 12:00:54 roy Exp $ */
+/* $NetBSD: auth.h,v 1.8 2015/01/30 09:47:05 roy Exp $ */
 
 /*
  * dhcpcd - DHCP client daemon
- * Copyright (c) 2006-2014 Roy Marples <roy%marples.name@localhost>
+ * Copyright (c) 2006-2015 Roy Marples <roy%marples.name@localhost>
  * All rights reserved
 
  * Redistribution and use in source and binary forms, with or without
diff -r bdef1dafb437 -r cabce647f6d3 external/bsd/dhcpcd/dist/common.c
--- a/external/bsd/dhcpcd/dist/common.c Fri Jan 30 09:40:24 2015 +0000
+++ b/external/bsd/dhcpcd/dist/common.c Fri Jan 30 09:47:05 2015 +0000
@@ -1,9 +1,9 @@
 #include <sys/cdefs.h>
- __RCSID("$NetBSD: common.c,v 1.7 2014/11/14 12:00:54 roy Exp $");
+ __RCSID("$NetBSD: common.c,v 1.8 2015/01/30 09:47:05 roy Exp $");
 
 /*
  * dhcpcd - DHCP client daemon
- * Copyright (c) 2006-2014 Roy Marples <roy%marples.name@localhost>
+ * Copyright (c) 2006-2015 Roy Marples <roy%marples.name@localhost>
  * All rights reserved
 
  * Redistribution and use in source and binary forms, with or without
diff -r bdef1dafb437 -r cabce647f6d3 external/bsd/dhcpcd/dist/common.h
--- a/external/bsd/dhcpcd/dist/common.h Fri Jan 30 09:40:24 2015 +0000
+++ b/external/bsd/dhcpcd/dist/common.h Fri Jan 30 09:47:05 2015 +0000
@@ -1,8 +1,8 @@
-/* $NetBSD: common.h,v 1.6 2014/11/07 20:51:02 roy Exp $ */
+/* $NetBSD: common.h,v 1.7 2015/01/30 09:47:05 roy Exp $ */
 
 /*
  * dhcpcd - DHCP client daemon
- * Copyright (c) 2006-2014 Roy Marples <roy%marples.name@localhost>
+ * Copyright (c) 2006-2015 Roy Marples <roy%marples.name@localhost>
  * All rights reserved
 
  * Redistribution and use in source and binary forms, with or without
diff -r bdef1dafb437 -r cabce647f6d3 external/bsd/dhcpcd/dist/control.c
--- a/external/bsd/dhcpcd/dist/control.c        Fri Jan 30 09:40:24 2015 +0000
+++ b/external/bsd/dhcpcd/dist/control.c        Fri Jan 30 09:47:05 2015 +0000
@@ -1,9 +1,9 @@
 #include <sys/cdefs.h>
- __RCSID("$NetBSD: control.c,v 1.6 2014/11/07 20:51:02 roy Exp $");
+ __RCSID("$NetBSD: control.c,v 1.7 2015/01/30 09:47:05 roy Exp $");
 
 /*
  * dhcpcd - DHCP client daemon
- * Copyright (c) 2006-2014 Roy Marples <roy%marples.name@localhost>
+ * Copyright (c) 2006-2015 Roy Marples <roy%marples.name@localhost>
  * All rights reserved
 
  * Redistribution and use in source and binary forms, with or without
diff -r bdef1dafb437 -r cabce647f6d3 external/bsd/dhcpcd/dist/control.h
--- a/external/bsd/dhcpcd/dist/control.h        Fri Jan 30 09:40:24 2015 +0000
+++ b/external/bsd/dhcpcd/dist/control.h        Fri Jan 30 09:47:05 2015 +0000
@@ -1,8 +1,8 @@
-/* $NetBSD: control.h,v 1.6 2014/11/07 20:51:02 roy Exp $ */
+/* $NetBSD: control.h,v 1.7 2015/01/30 09:47:05 roy Exp $ */
 
 /*
  * dhcpcd - DHCP client daemon
- * Copyright (c) 2006-2014 Roy Marples <roy%marples.name@localhost>
+ * Copyright (c) 2006-2015 Roy Marples <roy%marples.name@localhost>
  * All rights reserved
 
  * Redistribution and use in source and binary forms, with or without
diff -r bdef1dafb437 -r cabce647f6d3 external/bsd/dhcpcd/dist/crypt/crypt.h
--- a/external/bsd/dhcpcd/dist/crypt/crypt.h    Fri Jan 30 09:40:24 2015 +0000
+++ b/external/bsd/dhcpcd/dist/crypt/crypt.h    Fri Jan 30 09:47:05 2015 +0000
@@ -1,8 +1,8 @@
-/* $NetBSD: crypt.h,v 1.5 2014/11/07 20:51:03 roy Exp $ */
+/* $NetBSD: crypt.h,v 1.6 2015/01/30 09:47:05 roy Exp $ */
 
 /*
  * dhcpcd - DHCP client daemon
- * Copyright (c) 2006-2014 Roy Marples <roy%marples.name@localhost>
+ * Copyright (c) 2006-2015 Roy Marples <roy%marples.name@localhost>
  * All rights reserved
 
  * Redistribution and use in source and binary forms, with or without
diff -r bdef1dafb437 -r cabce647f6d3 external/bsd/dhcpcd/dist/crypt/hmac_md5.c
--- a/external/bsd/dhcpcd/dist/crypt/hmac_md5.c Fri Jan 30 09:40:24 2015 +0000
+++ b/external/bsd/dhcpcd/dist/crypt/hmac_md5.c Fri Jan 30 09:47:05 2015 +0000
@@ -1,9 +1,9 @@
 #include <sys/cdefs.h>
- __RCSID("$NetBSD: hmac_md5.c,v 1.5 2014/11/07 20:51:03 roy Exp $");
+ __RCSID("$NetBSD: hmac_md5.c,v 1.6 2015/01/30 09:47:05 roy Exp $");
 
 /*
  * dhcpcd - DHCP client daemon
- * Copyright (c) 2006-2014 Roy Marples <roy%marples.name@localhost>
+ * Copyright (c) 2006-2015 Roy Marples <roy%marples.name@localhost>
  * All rights reserved
 
  * Redistribution and use in source and binary forms, with or without
diff -r bdef1dafb437 -r cabce647f6d3 external/bsd/dhcpcd/dist/defs.h
--- a/external/bsd/dhcpcd/dist/defs.h   Fri Jan 30 09:40:24 2015 +0000
+++ b/external/bsd/dhcpcd/dist/defs.h   Fri Jan 30 09:47:05 2015 +0000
@@ -1,8 +1,8 @@
-/* $NetBSD: defs.h,v 1.12 2014/12/19 10:54:08 roy Exp $ */
+/* $NetBSD: defs.h,v 1.13 2015/01/30 09:47:05 roy Exp $ */
 
 /*
  * dhcpcd - DHCP client daemon
- * Copyright (c) 2006-2014 Roy Marples <roy%marples.name@localhost>
+ * Copyright (c) 2006-2015 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
@@ -30,7 +30,7 @@
 #define CONFIG_H
 
 #define PACKAGE                        "dhcpcd"
-#define VERSION                        "6.6.7"
+#define VERSION                        "6.7.0"
 
 #ifndef CONFIG
 # define CONFIG                        SYSCONFDIR "/" PACKAGE ".conf"
diff -r bdef1dafb437 -r cabce647f6d3 external/bsd/dhcpcd/dist/dev.h
--- a/external/bsd/dhcpcd/dist/dev.h    Fri Jan 30 09:40:24 2015 +0000
+++ b/external/bsd/dhcpcd/dist/dev.h    Fri Jan 30 09:47:05 2015 +0000
@@ -1,8 +1,8 @@
-/* $NetBSD: dev.h,v 1.6 2014/11/07 20:51:02 roy Exp $ */
+/* $NetBSD: dev.h,v 1.7 2015/01/30 09:47:05 roy Exp $ */
 
 /*
  * dhcpcd - DHCP client daemon
- * Copyright (c) 2006-2014 Roy Marples <roy%marples.name@localhost>
+ * Copyright (c) 2006-2015 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 bdef1dafb437 -r cabce647f6d3 external/bsd/dhcpcd/dist/dhcp-common.c
--- a/external/bsd/dhcpcd/dist/dhcp-common.c    Fri Jan 30 09:40:24 2015 +0000
+++ b/external/bsd/dhcpcd/dist/dhcp-common.c    Fri Jan 30 09:47:05 2015 +0000
@@ -1,9 +1,9 @@
 #include <sys/cdefs.h>
- __RCSID("$NetBSD: dhcp-common.c,v 1.6 2014/11/07 20:51:02 roy Exp $");
+ __RCSID("$NetBSD: dhcp-common.c,v 1.7 2015/01/30 09:47:05 roy Exp $");
 
 /*
  * dhcpcd - DHCP client daemon
- * Copyright (c) 2006-2014 Roy Marples <roy%marples.name@localhost>
+ * Copyright (c) 2006-2015 Roy Marples <roy%marples.name@localhost>
  * All rights reserved
 
  * Redistribution and use in source and binary forms, with or without
diff -r bdef1dafb437 -r cabce647f6d3 external/bsd/dhcpcd/dist/dhcp-common.h
--- a/external/bsd/dhcpcd/dist/dhcp-common.h    Fri Jan 30 09:40:24 2015 +0000
+++ b/external/bsd/dhcpcd/dist/dhcp-common.h    Fri Jan 30 09:47:05 2015 +0000
@@ -1,8 +1,8 @@
-/* $NetBSD: dhcp-common.h,v 1.6 2014/11/07 20:51:02 roy Exp $ */
+/* $NetBSD: dhcp-common.h,v 1.7 2015/01/30 09:47:05 roy Exp $ */
 
 /*
  * dhcpcd - DHCP client daemon
- * Copyright (c) 2006-2014 Roy Marples <roy%marples.name@localhost>
+ * Copyright (c) 2006-2015 Roy Marples <roy%marples.name@localhost>
  * All rights reserved
 
  * Redistribution and use in source and binary forms, with or without
diff -r bdef1dafb437 -r cabce647f6d3 external/bsd/dhcpcd/dist/dhcp.c
--- a/external/bsd/dhcpcd/dist/dhcp.c   Fri Jan 30 09:40:24 2015 +0000
+++ b/external/bsd/dhcpcd/dist/dhcp.c   Fri Jan 30 09:47:05 2015 +0000
@@ -1,9 +1,9 @@
 #include <sys/cdefs.h>
- __RCSID("$NetBSD: dhcp.c,v 1.26 2014/12/17 20:50:08 roy Exp $");
+ __RCSID("$NetBSD: dhcp.c,v 1.27 2015/01/30 09:47:05 roy Exp $");
 
 /*
  * dhcpcd - DHCP client daemon
- * Copyright (c) 2006-2014 Roy Marples <roy%marples.name@localhost>
+ * Copyright (c) 2006-2015 Roy Marples <roy%marples.name@localhost>
  * All rights reserved
 
  * Redistribution and use in source and binary forms, with or without
@@ -2489,6 +2489,16 @@
        /* reset the message counter */
        state->interval = 0;
 
+       /* Ensure that no reject options are present */
+       for (i = 1; i < 255; i++) {
+               if (has_option_mask(ifo->rejectmask, i) &&
+                   get_option_uint8(iface->ctx, &tmp, dhcp, (uint8_t)i) == 0)
+               {
+                       log_dhcp(LOG_WARNING, "reject DHCP", iface, dhcp, from);
+                       return;
+               }
+       }
+
        if (type == DHCP_NAK) {
                /* For NAK, only check if we require the ServerID */
                if (has_option_mask(ifo->requiremask, DHO_SERVERID) &&
@@ -2525,6 +2535,23 @@
                return;
        }
 
+       /* Ensure that all required options are present */
+       for (i = 1; i < 255; i++) {
+               if (has_option_mask(ifo->requiremask, i) &&
+                   get_option_uint8(iface->ctx, &tmp, dhcp, (uint8_t)i) != 0)
+               {
+                       /* If we are bootp, then ignore the need for serverid.
+                        * To ignore bootp, require dhcp_message_type.
+                        * However, nothing really stops bootp from providing
+                        * DHCP style options as well so the above isn't
+                        * always true. */
+                       if (type == 0 && i == DHO_SERVERID)
+                               continue;
+                       log_dhcp(LOG_WARNING, "reject DHCP", iface, dhcp, from);
+                       return;
+               }
+       }
+
        /* DHCP Auto-Configure, RFC 2563 */
        if (type == DHCP_OFFER && dhcp->yiaddr == 0) {
                log_dhcp(LOG_WARNING, "no address given", iface, dhcp, from);
@@ -2571,20 +2598,6 @@
                return;
        }
 
-       /* Ensure that all required options are present */
-       for (i = 1; i < 255; i++) {
-               if (has_option_mask(ifo->requiremask, i) &&
-                   get_option_uint8(iface->ctx, &tmp, dhcp, (uint8_t)i) != 0)
-               {
-                       /* If we are bootp, then ignore the need for serverid.
-                        * To ignore bootp, require dhcp_message_type. */
-                       if (type == 0 && i == DHO_SERVERID)
-                               continue;
-                       log_dhcp(LOG_WARNING, "reject DHCP", iface, dhcp, from);
-                       return;
-               }
-       }
-
        /* Ensure that the address offered is valid */
        if ((type == 0 || type == DHCP_OFFER || type == DHCP_ACK) &&
            (dhcp->ciaddr == INADDR_ANY || dhcp->ciaddr == INADDR_BROADCAST) &&
@@ -2879,7 +2892,14 @@
        if (state->raw_fd == -1) {
                state->raw_fd = if_openrawsocket(ifp, ETHERTYPE_IP);
                if (state->raw_fd == -1) {



Home | Main Index | Thread Index | Old Index