From owner-svn-soc-all@freebsd.org  Sun Jun 12 23:47:07 2016
Return-Path: <owner-svn-soc-all@freebsd.org>
Delivered-To: svn-soc-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id F0306AF0E33
 for <svn-soc-all@mailman.ysv.freebsd.org>;
 Sun, 12 Jun 2016 23:47:07 +0000 (UTC)
 (envelope-from yuanxunzhang@FreeBSD.org)
Received: from socsvn.freebsd.org (socsvn.freebsd.org
 [IPv6:2001:1900:2254:206a::50:2])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id E41172471
 for <svn-soc-all@FreeBSD.org>; Sun, 12 Jun 2016 23:47:07 +0000 (UTC)
 (envelope-from yuanxunzhang@FreeBSD.org)
Received: from socsvn.freebsd.org ([127.0.1.124])
 by socsvn.freebsd.org (8.15.2/8.15.2) with ESMTP id u5CNl7ru045390
 for <svn-soc-all@FreeBSD.org>; Sun, 12 Jun 2016 23:47:07 GMT
 (envelope-from yuanxunzhang@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id u5CNl7ZJ045388
 for svn-soc-all@FreeBSD.org; Sun, 12 Jun 2016 23:47:07 GMT
 (envelope-from yuanxunzhang@FreeBSD.org)
Date: Sun, 12 Jun 2016 23:47:07 GMT
Message-Id: <201606122347.u5CNl7ZJ045388@socsvn.freebsd.org>
X-Authentication-Warning: socsvn.freebsd.org: www set sender to
 yuanxunzhang@FreeBSD.org using -f
From: yuanxunzhang@FreeBSD.org
To: svn-soc-all@FreeBSD.org
Subject: socsvn commit: r305119 - soc2016/yuanxunzhang/head/usr.sbin/eaps
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
 <svn-soc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all/>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 12 Jun 2016 23:47:08 -0000

Author: yuanxunzhang
Date: Sun Jun 12 23:47:06 2016
New Revision: 305119
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=305119

Log:
  EAPS: Create EAPS interface

Modified:
  soc2016/yuanxunzhang/head/usr.sbin/eaps/eaps.c

Modified: soc2016/yuanxunzhang/head/usr.sbin/eaps/eaps.c
==============================================================================
--- soc2016/yuanxunzhang/head/usr.sbin/eaps/eaps.c	Sun Jun 12 23:25:37 2016	(r305118)
+++ soc2016/yuanxunzhang/head/usr.sbin/eaps/eaps.c	Sun Jun 12 23:47:06 2016	(r305119)
@@ -75,14 +75,18 @@
 int
 main(int argc, char **argv)
 {
-	int retval = 0;
+	int retval = 0, s;
 	if (argc < 2)
 		usage(NULL);
 
+	s = socket(AF_LOCAL, SOCK_DGRAM, 0);
+	if (s == -1)
+		err(1, "socket(AF_LOCAL,SOCK_DGRAM)");
+
 	if (*(++argv) != NULL)
 		switch (keyword(*argv)) {
 		case K_CREATE:
-			createdomain(argc, argv);
+			createdomain(argc, argv, s);
 
 		case K_DELETE:
 			deletedomain(argc, argv);
@@ -95,22 +99,18 @@
 }
 
 static void
-createdomain(int argc, char **argv)
+createdomain(int argc, char **argv, int s)
 {
-	int error = 0, s;
+	int error = 0;
 	char *domain_name = *(++argv);
 
-	printf("Create eaps domain %s!\n", domain_name);
+	printf("Create eaps %s!\n", domain_name);
 
 	// Create EAPS interface
-	s = socket(AF_LOCAL, SOCK_DGRAM, 0);
-	if (s == -1)
-		err(1, "socket(AF_LOCAL,SOCK_DGRAM)");
-
 	struct ifreq ifr;
 	
 	memset(&ifr, 0, sizeof(ifr));
-	(void) strlcpy(ifr.ifr_name, domain_name, sizeof(ifr.ifr_name));
+	(void) strlcpy(ifr.ifr_name, "bridge", sizeof(ifr.ifr_name));
 
 	if (ioctl(s, SIOCIFCREATE2, &ifr) < 0)
 		err(1, "SIOCIFCREATE2");