From owner-p4-projects@FreeBSD.ORG  Wed Jul 16 16:48:35 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 03BB8106569B; Wed, 16 Jul 2008 16:48:35 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BC602106568D
	for <perforce@freebsd.org>; Wed, 16 Jul 2008 16:48:34 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id A77F98FC1E
	for <perforce@freebsd.org>; Wed, 16 Jul 2008 16:48:34 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m6GGmYJi086865
	for <perforce@freebsd.org>; Wed, 16 Jul 2008 16:48:34 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m6GGmYq7086863
	for perforce@freebsd.org; Wed, 16 Jul 2008 16:48:34 GMT
	(envelope-from sam@freebsd.org)
Date: Wed, 16 Jul 2008 16:48:34 GMT
Message-Id: <200807161648.m6GGmYq7086863@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 145335 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 16 Jul 2008 16:48:35 -0000

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

Change 145335 by sam@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