diff options
| author |   SUZUKI, Shinsuke <suz@kame.net> | 2006-01-19 04:58:42 +0000 |
|---|---|---|
| committer | SUZUKI, Shinsuke <suz@kame.net> | 2006-01-19 04:58:42 +0000 |
| commit | e137e82e0a14b4b60f165b2621a25fbc8c040c2c (patch) | |
| tree | eeb8bb0b780f3ea206f00a74e2e27daa5b9ec1a6 | |
| parent | 158974c70111ea132a13a832954e196faba22653 (diff) | |
sync with the latest KAME
* corrected the condition for detecting unwanted incoming messages
* missing initialization in dhcp6c
| -rw-r--r-- | CHANGES | 5 | ||||
| -rw-r--r-- | dhcp6c.c | 7 | ||||
| -rw-r--r-- | dhcp6relay.c | 6 |
3 files changed, 13 insertions, 5 deletions
@@ -1,4 +1,7 @@ - +2006-01-19 SUZUKI, Shinsuke <suz@kame.net> + * corrected the condition for detecting unwanted incoming messages + * missing initialization in dhcp6c + --- 20060114 tar ball released --- --- 20051211 tar ball released --- 2005-12-11 SUZUKI, Shinsuke <suz@kame.net> * locate every files in /usr/local/xxx, instead of /usr/local/v6/xxx @@ -1,4 +1,4 @@ -/* $KAME: dhcp6c.c,v 1.163 2005/09/16 11:30:14 suz Exp $ */ +/* $KAME: dhcp6c.c,v 1.164 2006/01/10 02:46:09 jinmei Exp $ */ /* * Copyright (C) 1998 and 1999 WIDE Project. * All rights reserved. @@ -673,6 +673,8 @@ client6_do_ctlcommand(buf, len) char ifname[IFNAMSIZ]; time_t now; + memset(ifname, 0, sizeof(ifname)); + ctlhead = (struct dhcp6ctl *)buf; command = ntohs(ctlhead->command); @@ -809,6 +811,9 @@ client6_ifctl(ifname, command) return (-1); } + dprintf(LOG_DEBUG, FNAME, "%s interface %s", + command == DHCP6CTL_COMMAND_START ? "start" : "stop", ifname); + switch(command) { case DHCP6CTL_COMMAND_START: free_resources(ifp); diff --git a/dhcp6relay.c b/dhcp6relay.c index f5055a1..98bc5d2 100644 --- a/dhcp6relay.c +++ b/dhcp6relay.c @@ -1,4 +1,4 @@ -/* $KAME: dhcp6relay.c,v 1.60 2005/10/16 16:17:18 suz Exp $ */ +/* $KAME: dhcp6relay.c,v 1.62 2006/01/19 04:25:16 jinmei Exp $ */ /* * Copyright (C) 2000 WIDE Project. * All rights reserved. @@ -180,7 +180,7 @@ main(argc, argv) if (argc != 1) { fprintf(stderr, "you should explicitly specify a " "relaying interface, when you are to " - "listen to multiple interfaces"); + "listen on multiple interfaces"); exit(0); } relaydevice = argv[0]; @@ -577,7 +577,7 @@ relay6_recv(s, fromclient) * interface, when a DHCPv6 server is running on that interface. * This check prevents such reception. */ - if (ifd == NULL || pi->ipi6_ifindex != relayifid) + if (ifd == NULL && pi->ipi6_ifindex != relayifid) return; if (if_indextoname(pi->ipi6_ifindex, ifname) == NULL) { dprintf(LOG_WARNING, FNAME, |