From owner-svn-soc-all@freebsd.org Sun Aug 14 04:08:05 2016 Return-Path: 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 7CB0FBB926F for ; Sun, 14 Aug 2016 04:08:05 +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 6F39C1B61 for ; Sun, 14 Aug 2016 04:08:05 +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 u7E485C1028092 for ; Sun, 14 Aug 2016 04:08:05 GMT (envelope-from yuanxunzhang@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id u7E484LL027754 for svn-soc-all@FreeBSD.org; Sun, 14 Aug 2016 04:08:04 GMT (envelope-from yuanxunzhang@FreeBSD.org) Date: Sun, 14 Aug 2016 04:08:04 GMT Message-Id: <201608140408.u7E484LL027754@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: r307556 - 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Aug 2016 04:08:05 -0000 Author: yuanxunzhang Date: Sun Aug 14 04:08:04 2016 New Revision: 307556 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=307556 Log: EAPS: check eaps domian name 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 Aug 14 03:49:37 2016 (r307555) +++ soc2016/yuanxunzhang/head/usr.sbin/eaps/eaps.c Sun Aug 14 04:08:04 2016 (r307556) @@ -66,7 +66,7 @@ int keyword(const char *); static void create_domain(int, char **, int); -static void delete_domain(int, char **); +static void delete_domain(int, char **, int); static void display(int, char **); static void usage(const char *); void load_module(const char *); @@ -103,7 +103,7 @@ struct module_stat mstat; int fileid, modid; const char *cp; - + mstat.version = sizeof(struct module_stat); for (fileid = kldnext(0); fileid > 0; fileid = kldnext(fileid)) { /* scan modules in file */ @@ -135,13 +135,17 @@ printf("Create eaps %s!\n", domain_name); + if (domain_name == null) { + err(1, "EAPS domain name is NULL!"); + } + // Create EAPS interface /* check and maybe load support for this interface */ load_module(eaps_ifname); - struct ifreq ifr; - + struct ifreq ifr; memset(&ifr, 0, sizeof(ifr)); + (void) strlcpy(ifr.ifr_name, eaps_ifname, sizeof(ifr.ifr_name)); if (ioctl(s, SIOCIFCREATE2, &ifr) < 0) @@ -151,7 +155,7 @@ } static void -delete_domain(int argc, char **argv) +delete_domain(int argc, char **argv, int s) { int error = 0; printf("Delete eaps domain %s!\n", *(++argv));