added an option to relay packets to the specified unicast-address, in…

…stead of ff05::1:3
kame · Jul 16, 2003 · e3c137b · e3c137b
1 parent 49d9485
commit e3c137b
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 18 deletions.
diff --git a/kame/kame/dhcp6/dhcp6relay.8 b/kame/kame/dhcp6/dhcp6relay.8
@@ -1,4 +1,4 @@
-.\"	$KAME: dhcp6relay.8,v 1.13 2003/07/14 09:59:16 jinmei Exp $
+.\"	$KAME: dhcp6relay.8,v 1.14 2003/07/16 13:11:03 suz Exp $
 .\"
 .\" Copyright (C) 2000 WIDE Project.
 .\" All rights reserved.
@@ -79,6 +79,9 @@ Specifies the interface on which messages to servers are sent.
 When omitted, the same interface as
 .Ar interface
 will be used.
+.It Fl s Ar serveraddr
+Specifies the DHCPv6 server address to relay packets to.
+If not specified,  packets are relayed to ff05::1:3 (All DHCPv6 servers).
 .El
 .\"
 .Sh SEE ALSO

diff --git a/kame/kame/dhcp6/dhcp6relay.c b/kame/kame/dhcp6/dhcp6relay.c
@@ -1,4 +1,4 @@
-/*	$KAME: dhcp6relay.c,v 1.37 2003/07/14 09:51:43 jinmei Exp $	*/
+/*	$KAME: dhcp6relay.c,v 1.38 2003/07/16 13:11:03 suz Exp $	*/
 /*
  * Copyright (C) 2000 WIDE Project.
  * All rights reserved.
@@ -67,6 +67,7 @@ static int debug = 0;
 static char *device;
 static char *relaydevice;
 static char *boundaddr;
+static char *serveraddr = DH6ADDR_ALLSERVER;
 
 static char *rmsgctlbuf, *smsgctlbuf;
 static int rmsgctllen, smsgctllen;
@@ -104,7 +105,7 @@ usage()
 {
 	fprintf(stderr,
 	    "usage: dhcp6relay [-dDf] [-b boundaddr] [-H hoplim] "
-	    "[-r relay-IF] IF\n");
+	    "[-r relay-IF] [-s serveraddr] IF\n");
 	exit(0);
 }
 
@@ -122,7 +123,7 @@ main(argc, argv)
 	else
 		progname++;
 
-	while((ch = getopt(argc, argv, "b:dDfH:r:")) != -1) {
+	while((ch = getopt(argc, argv, "b:dDfH:r:s:")) != -1) {
 		switch(ch) {
 		case 'b':
 			boundaddr = optarg;
@@ -151,6 +152,9 @@ main(argc, argv)
 		case 'r':
 			relaydevice = optarg;
 			break;
+		case 's':
+			serveraddr = optarg;
+			break;
 		default:
 			usage();
 			exit(0);
@@ -265,7 +269,7 @@ relay6_init()
 	hints.ai_socktype = SOCK_DGRAM;
 	hints.ai_protocol = IPPROTO_UDP;
 	hints.ai_flags = AI_PASSIVE;
-	error = getaddrinfo(DH6ADDR_ALLSERVER, DH6PORT_UPSTREAM, &hints, &res);
+	error = getaddrinfo(serveraddr, DH6PORT_UPSTREAM, &hints, &res);
 	if (error) {
 		dprintf(LOG_ERR, FNAME, "getaddrinfo: %s",
 		    gai_strerror(error));
@@ -279,6 +283,7 @@ relay6_init()
 		    strerror(errno));
 		goto failexit;
 	}
+	/* XXX: assume only one DHCPv6 server address */
 	memcpy(&sa6_all_servers, res->ai_addr, sizeof (sa6_all_servers));
 	freeaddrinfo(res);
 
@@ -434,19 +439,21 @@ relay6_init()
 	}
 	freeaddrinfo(res);
 
-	if (setsockopt(ssock, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, &mhops,
-	    sizeof (mhops)) < 0) {
-		dprintf(LOG_ERR, FNAME,
-		    "setsockopt(ssock, IPV6_MULTICAST_HOPS(%d)): %s", mhops,
-		    strerror(errno));
-		goto failexit;
-	}
-	if (setsockopt(ssock, IPPROTO_IPV6, IPV6_MULTICAST_IF,
-	    &ifidx, sizeof (ifidx)) < 0) {
-		dprintf(LOG_ERR, FNAME,
-		    "setsockopt(IPV6_MULTICAST_IF, %d): %s",
-		    ifidx, strerror(errno));
-		goto failexit;
+	if (IN6_IS_ADDR_MULTICAST(&sa6_all_servers.sin6_addr)) {
+		if (setsockopt(ssock, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, &mhops,
+		    sizeof (mhops)) < 0) {
+			dprintf(LOG_ERR, FNAME,
+			    "setsockopt(ssock, IPV6_MULTICAST_HOPS(%d)): %s",
+			    mhops, strerror(errno));
+			goto failexit;
+		}
+		if (setsockopt(ssock, IPPROTO_IPV6, IPV6_MULTICAST_IF,
+		    &ifidx, sizeof (ifidx)) < 0) {
+			dprintf(LOG_ERR, FNAME,
+			    "setsockopt(IPV6_MULTICAST_IF, %d): %s",
+			    ifidx, strerror(errno));
+			goto failexit;
+		}
 	}
 	on = 1;
 #ifdef IPV6_RECVPKTINFO