Wed Mar 18 05:14:04 2009 UTC ()

Pull up following revision(s) (requested by plunky in ticket #570):
	usr.sbin/btpand/tap.c: revision 1.2
use the generic SIOCALIFADDR to add an active link layer address
instead of the (soon to be) deprecated SIOCSIFPHYADDR


(snj)

diff -r1.1 -r1.1.6.1 src/usr.sbin/btpand/tap.c

--- src/usr.sbin/btpand/tap.c 2008/08/17 13:20:57	1.1
+++ src/usr.sbin/btpand/tap.c 2009/03/18 05:14:04	1.1.6.1

 @@ -1,14 +1,14 @@
-/*	$NetBSD: tap.c,v 1.1 2008/08/17 13:20:57 plunky Exp $	*/
+/*	$NetBSD: tap.c,v 1.1.6.1 2009/03/18 05:14:04 snj Exp $	*/
 /*-
  * Copyright (c) 2008 Iain Hibbert
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -16,81 +16,82 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: tap.c,v 1.1 2008/08/17 13:20:57 plunky Exp $");
+__RCSID("$NetBSD: tap.c,v 1.1.6.1 2009/03/18 05:14:04 snj Exp $");
 #include <sys/ioctl.h>
 #include <sys/uio.h>
 #include <net/if_dl.h>
 #include <net/if_tap.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <util.h>
 #include "btpand.h"
 static bool tap_send(channel_t *, packet_t *);
 static bool tap_recv(packet_t *);
 void
 tap_init(void)
+{
 	channel_t *chan;
 	struct sockaddr_dl *sdl;
-	struct ifaliasreq ifra;
+	struct if_laddrreq iflr;
 	struct ifreq ifr;
 	int fd, s;
 	fd = open(interface_name, O_RDWR);
 	if (fd == -1) {
 		log_err("Could not open \"%s\": %m", interface_name);
 		exit(EXIT_FAILURE);
+	}
 	memset(&ifr, 0, sizeof(ifr));
 	if (ioctl(fd, TAPGIFNAME, &ifr) == -1) {
 		log_err("Could not get interface name: %m");
 		exit(EXIT_FAILURE);
+	}
 	s = socket(PF_LINK, SOCK_DGRAM, 0);
 	if (s == -1) {
 		log_err("Could not open PF_LINK socket: %m");
 		exit(EXIT_FAILURE);
+	}
-	memset(&ifra, 0, sizeof(ifra));
+	memset(&iflr, 0, sizeof(iflr));
-	memcpy(ifra.ifra_name, ifr.ifr_name, IFNAMSIZ);
+	memcpy(iflr.iflr_name, ifr.ifr_name, IFNAMSIZ);
 	iflr.flags = IFLR_ACTIVE;
-	sdl = satosdl(&ifra.ifra_addr);
+	sdl = satosdl(sstosa(&iflr.addr));
 	sdl->sdl_family = AF_LINK;
 	sdl->sdl_len = sizeof(struct sockaddr_dl);
 	sdl->sdl_alen = ETHER_ADDR_LEN;
 	b2eaddr(LLADDR(sdl), &local_bdaddr);
-	if (ioctl(s, SIOCSIFPHYADDR, &ifra) == -1) {
+	if (ioctl(s, SIOCALIFADDR, &iflr) == -1) {
-		log_err("Could not set %s physical address: %m", ifra.ifra_name);
+		log_err("Could not add %s link address: %m", iflr.iflr_name);
 		exit(EXIT_FAILURE);
+	}
 	if (ioctl(s, SIOCGIFFLAGS, &ifr) == -1) {
 		log_err("Could not get interface flags: %m");
 		exit(EXIT_FAILURE);
+	}
 	if ((ifr.ifr_flags & IFF_UP) == 0) {
 		ifr.ifr_flags |= IFF_UP;
 		if (ioctl(s, SIOCSIFFLAGS, &ifr) == -1) {
 			log_err("Could not set IFF_UP: %m");