[src/trunk]: src/external/bsd/dhcpcd/dist Import dhcpcd-5.2.11

[roy <roy%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/2d0b833a9f22
branches:  trunk
changeset: 761660:2d0b833a9f22
user:      roy <roy%NetBSD.org@localhost>
date:      Fri Feb 04 15:00:22 2011 +0000

description:
Import dhcpcd-5.2.11
Change from dhcpcd-5.2.10 is a fix for the new routing sockets.

diffstat:

 external/bsd/dhcpcd/dist/defs.h   |   4 ++--
 external/bsd/dhcpcd/dist/dhcpcd.c |   4 ++--
 external/bsd/dhcpcd/dist/if-bsd.c |  12 +++++++-----
 3 files changed, 11 insertions(+), 9 deletions(-)

diffs (83 lines):

diff -r 61354058e08c -r 2d0b833a9f22 external/bsd/dhcpcd/dist/defs.h
--- a/external/bsd/dhcpcd/dist/defs.h   Fri Feb 04 14:51:02 2011 +0000
+++ b/external/bsd/dhcpcd/dist/defs.h   Fri Feb 04 15:00:22 2011 +0000
@@ -1,6 +1,6 @@
 /*
  * dhcpcd - DHCP client daemon
- * Copyright (c) 2006-2010 Roy Marples <roy%marples.name@localhost>
+ * Copyright (c) 2006-2011 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                        "5.2.10"
+#define VERSION                        "5.2.11"
 
 #ifndef CONFIG
 # define CONFIG                        SYSCONFDIR "/" PACKAGE ".conf"
diff -r 61354058e08c -r 2d0b833a9f22 external/bsd/dhcpcd/dist/dhcpcd.c
--- a/external/bsd/dhcpcd/dist/dhcpcd.c Fri Feb 04 14:51:02 2011 +0000
+++ b/external/bsd/dhcpcd/dist/dhcpcd.c Fri Feb 04 15:00:22 2011 +0000
@@ -1,6 +1,6 @@
 /* 
  * dhcpcd - DHCP client daemon
- * Copyright (c) 2006-2010 Roy Marples <roy%marples.name@localhost>
+ * Copyright (c) 2006-2011 Roy Marples <roy%marples.name@localhost>
  * All rights reserved
 
  * Redistribution and use in source and binary forms, with or without
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  */
 
-const char copyright[] = "Copyright (c) 2006-2010 Roy Marples";
+const char copyright[] = "Copyright (c) 2006-2011 Roy Marples";
 
 #include <sys/file.h>
 #include <sys/socket.h>
diff -r 61354058e08c -r 2d0b833a9f22 external/bsd/dhcpcd/dist/if-bsd.c
--- a/external/bsd/dhcpcd/dist/if-bsd.c Fri Feb 04 14:51:02 2011 +0000
+++ b/external/bsd/dhcpcd/dist/if-bsd.c Fri Feb 04 15:00:22 2011 +0000
@@ -1,6 +1,6 @@
 /* 
  * dhcpcd - DHCP client daemon
- * Copyright (c) 2006-2010 Roy Marples <roy%marples.name@localhost>
+ * Copyright (c) 2006-2011 Roy Marples <roy%marples.name@localhost>
  * All rights reserved
 
  * Redistribution and use in source and binary forms, with or without
@@ -61,9 +61,11 @@
 #include "if-options.h"
 #include "net.h"
 
-#define ROUNDUP(a)                                                           \
+#ifndef RT_ROUNDUP
+#define RT_ROUNDUP(a)                                                        \
        ((a) > 0 ? (1 + (((a) - 1) | (sizeof(long) - 1))) : sizeof(long))
-#define ADVANCE(x, n) (x += ROUNDUP((n)->sa_len))
+#define RT_ADVANCE(x, n) (x += RT_ROUNDUP((n)->sa_len))
+#endif
 
 /* FIXME: Why do we need to check for sa_family 255 */
 #define COPYOUT(sin, sa)                                                     \
@@ -198,7 +200,7 @@
        int retval = 0;
 
 #define ADDSU(_su) {                                                         \
-               l = ROUNDUP(_su.sa.sa_len);                                   \
+               l = RT_ROUNDUP(_su.sa.sa_len);                                \
                memcpy(bp, &(_su), l);                                        \
                bp += l;                                                      \
        }
@@ -298,7 +300,7 @@
                            inet_ntoa(((struct sockaddr_in *)sa[i])->
                                sin_addr));
 #endif
-                       ADVANCE(cp, sa[i]);
+                       RT_ADVANCE(cp, sa[i]);
                } else
                        sa[i] = NULL;
        }