Index: head/net/dhcp6/Makefile =================================================================== --- head/net/dhcp6/Makefile (revision 405215) +++ head/net/dhcp6/Makefile (revision 405216) @@ -1,34 +1,34 @@ # Created by: Munechika SUMIKAWA # $FreeBSD$ PORTNAME= dhcp6 PORTVERSION= 20080615 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net ipv6 MASTER_SITES= SF/wide-dhcpv6/wide-dhcpv6/wide-dhcpv6-${PORTVERSION} DISTNAME= wide-dhcpv6-${PORTVERSION} MAINTAINER= hrs@FreeBSD.org COMMENT= KAME DHCP6 client, server, and relay LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYRIGHT GNU_CONFIGURE= yes CONFIGURE_ARGS= --sysconfdir=${LOCALBASE}/etc \ --with-localdbdir=/var/db USE_RC_SUBR= dhcp6c dhcp6relay dhcp6s PORTDOCS= README OPTIONS_DEFINE= DOCS post-install: cd ${WRKSRC} && ${INSTALL_DATA} \ dhcp6c.conf.sample dhcp6s.conf.sample \ ${STAGEDIR}${PREFIX}/etc post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} .include Index: head/net/dhcp6/files/patch-addrconf.c =================================================================== --- head/net/dhcp6/files/patch-addrconf.c (nonexistent) +++ head/net/dhcp6/files/patch-addrconf.c (revision 405216) @@ -0,0 +1,11 @@ +--- addrconf.c.orig 2008-06-15 07:48:40 UTC ++++ addrconf.c +@@ -173,7 +173,7 @@ update_address(ia, addr, dhcpifp, ctlp, + sacreate ? "create" : "update", + in6addr2str(&addr->addr, 0), addr->pltime, addr->vltime); + +- if (sa->addr.vltime != 0) ++ if (sa->addr.vltime != 0 || sacreate) + if (na_ifaddrconf(IFADDRCONF_ADD, sa) < 0) + return (-1); + Property changes on: head/net/dhcp6/files/patch-addrconf.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/dhcp6/files/patch-auth.c =================================================================== --- head/net/dhcp6/files/patch-auth.c (nonexistent) +++ head/net/dhcp6/files/patch-auth.c (revision 405216) @@ -0,0 +1,11 @@ +--- auth.c.orig 2007-03-21 09:52:57 UTC ++++ auth.c +@@ -222,7 +222,7 @@ hmacmd5_invalidate(hmacmd5_t *ctx) + { + md5_invalidate(&ctx->md5ctx); + memset(ctx->key, 0, sizeof(ctx->key)); +- memset(ctx, 0, sizeof(ctx)); ++ memset(ctx, 0, sizeof(*ctx)); + } + + /* Property changes on: head/net/dhcp6/files/patch-auth.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/dhcp6/files/patch-dhcp6c.c =================================================================== --- head/net/dhcp6/files/patch-dhcp6c.c (revision 405215) +++ head/net/dhcp6/files/patch-dhcp6c.c (revision 405216) @@ -1,72 +1,128 @@ --- dhcp6c.c.orig 2008-06-15 07:48:41 UTC +++ dhcp6c.c @@ -67,6 +67,7 @@ #include #include #include +#include #include #include -@@ -257,7 +258,7 @@ client6_init() +@@ -88,7 +89,6 @@ static sig_atomic_t sig_flags = 0; + const dhcp6_mode_t dhcp6_mode = DHCP6_MODE_CLIENT; + + int sock; /* inbound/outbound udp port */ +-int rtsock; /* routing socket */ + int ctlsock = -1; /* control TCP port */ + char *ctladdr = DEFAULT_CLIENT_CONTROL_ADDR; + char *ctlport = DEFAULT_CLIENT_CONTROL_PORT; +@@ -257,7 +257,7 @@ client6_init() { struct addrinfo hints, *res; static struct sockaddr_in6 sa6_allagent_storage; - int error, on = 1; + int error, on = 0; /* get our DUID */ if (get_duid(DUID_FILE, &client_duid)) { -@@ -287,6 +288,20 @@ client6_init() +@@ -287,6 +287,20 @@ client6_init() dprintf(LOG_ERR, FNAME, "socket"); exit(1); } + + if ((on = fcntl(sock, F_GETFL, 0)) == -1) { + dprintf(LOG_ERR, FNAME, "fctnl getflags"); + exit(1); + } + + on |= FD_CLOEXEC; + + if ((on = fcntl(sock, F_SETFL, on)) == -1) { + dprintf(LOG_ERR, FNAME, "fctnl setflags"); + exit(1); + } + + on = 1; if (setsockopt(sock, SOL_SOCKET, SO_REUSEPORT, &on, sizeof(on)) < 0) { dprintf(LOG_ERR, FNAME, -@@ -1828,15 +1843,6 @@ client6_recvreply(ifp, dh6, len, optinfo +@@ -337,13 +351,6 @@ client6_init() } + freeaddrinfo(res); +- /* open a routing socket to watch the routing table */ +- if ((rtsock = socket(PF_ROUTE, SOCK_RAW, 0)) < 0) { +- dprintf(LOG_ERR, FNAME, "open a routing socket: %s", +- strerror(errno)); +- exit(1); +- } +- + memset(&hints, 0, sizeof(hints)); + hints.ai_family = PF_INET6; + hints.ai_socktype = SOCK_DGRAM; +@@ -596,7 +603,7 @@ get_ifname(bpp, lenp, ifbuf, ifbuflen) + if (*lenp < ifnamelen || ifnamelen > ifbuflen) + return (-1); + +- memset(ifbuf, 0, sizeof(ifbuf)); ++ memset(ifbuf, 0, ifbuflen); + memcpy(ifbuf, *bpp, ifnamelen); + if (ifbuf[ifbuflen - 1] != '\0') + return (-1); /* not null terminated */ +@@ -763,6 +770,15 @@ client6_ifctl(ifname, command) + + switch(command) { + case DHCP6CTL_COMMAND_START: ++ /* ++ * The ifid might have changed, so reset it before releasing the ++ * lease. ++ */ ++ if (ifreset(ifp)) { ++ dprintf(LOG_NOTICE, FNAME, "failed to reset %s", ++ ifname); ++ return (-1); ++ } + free_resources(ifp); + if (client6_start(ifp)) { + dprintf(LOG_NOTICE, FNAME, "failed to restart %s", +@@ -929,7 +945,7 @@ construct_confdata(ifp, ev) + "failed to create a new event data"); + goto fail; + } +- memset(evd, 0, sizeof(evd)); ++ memset(evd, 0, sizeof(*evd)); + + memset(&iaparam, 0, sizeof(iaparam)); + iaparam.iaid = iac->iaid; +@@ -1828,15 +1844,6 @@ client6_recvreply(ifp, dh6, len, optinfo + } + /* - * Call the configuration script, if specified, to handle various - * configuration parameters. - */ - if (ifp->scriptpath != NULL && strlen(ifp->scriptpath) != 0) { - dprintf(LOG_DEBUG, FNAME, "executes %s", ifp->scriptpath); - client6_script(ifp->scriptpath, state, optinfo); - } - - /* * Set refresh timer for configuration information specified in * information-request. If the timer value is specified by the server * in an information refresh time option, use it; use the protocol -@@ -1888,6 +1894,15 @@ client6_recvreply(ifp, dh6, len, optinfo +@@ -1888,6 +1895,15 @@ client6_recvreply(ifp, dh6, len, optinfo &optinfo->serverID, ev->authparam); } + /* + * Call the configuration script, if specified, to handle various + * configuration parameters. + */ + if (ifp->scriptpath != NULL && strlen(ifp->scriptpath) != 0) { + dprintf(LOG_DEBUG, FNAME, "executes %s", ifp->scriptpath); + client6_script(ifp->scriptpath, state, optinfo); + } + dhcp6_remove_event(ev); if (state == DHCP6S_RELEASE) {