PERFORCE change 145335 for review

[Sam Leffler]

http://perforce.freebsd.org/chv.cgi?CH=145335

Change 145335 by sam at sam_ebb on 2008/07/16 16:47:35

	move gre-related stuff to it's own file

Affected files ...

.. //depot/projects/vap/sbin/ifconfig/Makefile#9 edit
.. //depot/projects/vap/sbin/ifconfig/ifconfig.c#9 edit
.. //depot/projects/vap/sbin/ifconfig/ifgre.c#1 add

Differences ...

==== //depot/projects/vap/sbin/ifconfig/Makefile#9 (text+ko) ====

@@ -23,6 +23,7 @@
 SRCS+=	ifmac.c			# MAC support
 SRCS+=	ifmedia.c		# SIOC[GS]IFMEDIA support
 SRCS+=	ifvlan.c		# SIOC[GS]ETVLAN support
+SRCS+=	ifgre.c			# GRE keys etc
 
 SRCS+=	ifieee80211.c regdomain.c # SIOC[GS]IEEE80211 support
 DPADD+=	${LIBBSDXML} ${LIBSBUF}

==== //depot/projects/vap/sbin/ifconfig/ifconfig.c#9 (text+ko) ====

@@ -51,7 +51,6 @@
 
 #include <net/ethernet.h>
 #include <net/if.h>
-#include <net/if_gre.h>
 #include <net/if_var.h>
 #include <net/if_dl.h>
 #include <net/if_types.h>
@@ -750,18 +749,6 @@
 }
 
 static void
-setifgrekey(const char *val, int dummy __unused, int s, 
-    const struct afswtch *afp)
-{
-	uint32_t grekey = atol(val);
-
-	strncpy(ifr.ifr_name, name, sizeof (ifr.ifr_name));
-	ifr.ifr_data = (caddr_t)&grekey;
-	if (ioctl(s, GRESKEY, (caddr_t)&ifr) < 0)
-		warn("ioctl (set grekey)");
-}
-
-static void
 setifname(const char *val, int dummy __unused, int s, 
     const struct afswtch *afp)
 {
@@ -876,12 +863,6 @@
 	if (ioctl(s, SIOCGIFSTATUS, &ifs) == 0) 
 		printf("%s", ifs.ascii);
 
-	int grekey = 0;
-	ifr.ifr_data = (caddr_t)&grekey;
-	if (ioctl(s, GREGKEY, &ifr) == 0)
-		if (grekey != 0)
-			printf("\tgrekey: %d\n", grekey);
-
 	close(s);
 	return;
 }
@@ -1053,7 +1034,6 @@
 	DEF_CMD("noicmp",	IFF_LINK1,	setifflags),
 	DEF_CMD_ARG("mtu",			setifmtu),
 	DEF_CMD_ARG("name",			setifname),
-	DEF_CMD_ARG("grekey",			setifgrekey),
 };
 
 static __constructor void