1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
|
--- dhcp6c.c.orig 2008-06-15 07:48:41 UTC
+++ dhcp6c.c
@@ -67,6 +67,7 @@
#include <string.h>
#include <err.h>
#include <ifaddrs.h>
+#include <fcntl.h>
#include <dhcp6.h>
#include <config.h>
@@ -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 +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,
@@ -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 +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) {
|
