From owner-svn-soc-all@freebsd.org Mon Aug 15 19:20:22 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 9B205BBAD72 for ; Mon, 15 Aug 2016 19:20:22 +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 8E15816A8 for ; Mon, 15 Aug 2016 19:20:22 +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 u7FJKMlj071003 for ; Mon, 15 Aug 2016 19:20:22 GMT (envelope-from yuanxunzhang@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id u7FJKKQ8070966 for svn-soc-all@FreeBSD.org; Mon, 15 Aug 2016 19:20:20 GMT (envelope-from yuanxunzhang@FreeBSD.org) Date: Mon, 15 Aug 2016 19:20:20 GMT Message-Id: <201608151920.u7FJKKQ8070966@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: r307678 - in soc2016/yuanxunzhang/head: sys/net 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: Mon, 15 Aug 2016 19:20:22 -0000 Author: yuanxunzhang Date: Mon Aug 15 19:20:20 2016 New Revision: 307678 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=307678 Log: EAPS: query eaps domian status Modified: soc2016/yuanxunzhang/head/sys/net/eaps.c soc2016/yuanxunzhang/head/sys/net/eaps.h soc2016/yuanxunzhang/head/usr.sbin/eaps/eaps.c soc2016/yuanxunzhang/head/usr.sbin/eaps/keywords Modified: soc2016/yuanxunzhang/head/sys/net/eaps.c ============================================================================== --- soc2016/yuanxunzhang/head/sys/net/eaps.c Mon Aug 15 18:55:33 2016 (r307677) +++ soc2016/yuanxunzhang/head/sys/net/eaps.c Mon Aug 15 19:20:20 2016 (r307678) @@ -198,7 +198,8 @@ int error = 0; switch (cmd) { - + case SIOCSEAPSDOMAIN: + printf("Debug print: Delete eaps domain!\n"); break; default: error = ether_ioctl(ifp, cmd, data); Modified: soc2016/yuanxunzhang/head/sys/net/eaps.h ============================================================================== --- soc2016/yuanxunzhang/head/sys/net/eaps.h Mon Aug 15 18:55:33 2016 (r307677) +++ soc2016/yuanxunzhang/head/sys/net/eaps.h Mon Aug 15 19:20:20 2016 (r307678) @@ -44,10 +44,12 @@ u_char sc_defaddr[6]; /* Default MAC address */ }; -/* eaps ring information */ +/* +* eaps ring information +*/ struct eaps_reqall { char eaps_ifname[IFNAMSIZ]; /* name of the eaps */ - uint8_t eaps_state; /* state of eaps * / + uint8_t eaps_state; /* state of eaps */ uint8_t enable_state; /* enable or disable eaps ring */ }; Modified: soc2016/yuanxunzhang/head/usr.sbin/eaps/eaps.c ============================================================================== --- soc2016/yuanxunzhang/head/usr.sbin/eaps/eaps.c Mon Aug 15 18:55:33 2016 (r307677) +++ soc2016/yuanxunzhang/head/usr.sbin/eaps/eaps.c Mon Aug 15 19:20:20 2016 (r307678) @@ -67,7 +67,7 @@ int keyword(const char *); static void create_domain(int, char **, int); static void delete_domain(int, char **, int); -static void eaps_status(int, char **, int); +static void show_eaps_status(int, char **, int); static void usage(const char *); void load_module(const char *); @@ -86,12 +86,13 @@ switch (keyword(*argv)) { case K_CREATE: create_domain(argc, argv, s); - + break; case K_DELETE: delete_domain(argc, argv, s); - + break; case K_DISPLAY: - eaps_status(argc, argv, s); + show_eaps_status(argc, argv, s); + break; } usage(*argv); return retval; @@ -164,17 +165,21 @@ } static void -eaps_status(int argc, char **argv, int s) +show_eaps_status(int argc, char **argv, int s) { - int error = 0; - + struct eaps_reqall er; + bzero(&ro, sizeof(ro)); + + char *domain_name = *(++argv); + // check eaps domain name if (domain_name == NULL) { err(1, "EAPS domain name is NULL!"); } - - exit(error); + strlcpy(er.eaps_ifname, domain_name, sizeof(er.eaps_ifname)); + if (ioctl(s, SIOCSEAPSDOMAIN, &er) < 0) + err(1, "SIOCSEAPSDOMAIN"); } static void Modified: soc2016/yuanxunzhang/head/usr.sbin/eaps/keywords ============================================================================== --- soc2016/yuanxunzhang/head/usr.sbin/eaps/keywords Mon Aug 15 18:55:33 2016 (r307677) +++ soc2016/yuanxunzhang/head/usr.sbin/eaps/keywords Mon Aug 15 19:20:20 2016 (r307678) @@ -3,4 +3,4 @@ create delete -display +show