From owner-svn-soc-all@freebsd.org Mon Aug 22 17:52:17 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 3D77FBC2850 for ; Mon, 22 Aug 2016 17:52:17 +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 0981F1CA2 for ; Mon, 22 Aug 2016 17:52:17 +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 u7MHqGh6029773 for ; Mon, 22 Aug 2016 17:52:16 GMT (envelope-from yuanxunzhang@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id u7MHqFRK029755 for svn-soc-all@FreeBSD.org; Mon, 22 Aug 2016 17:52:15 GMT (envelope-from yuanxunzhang@FreeBSD.org) Date: Mon, 22 Aug 2016 17:52:15 GMT Message-Id: <201608221752.u7MHqFRK029755@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: r308188 - 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: Mon, 22 Aug 2016 17:52:17 -0000 Author: yuanxunzhang Date: Mon Aug 22 17:52:15 2016 New Revision: 308188 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=308188 Log: EAPS: add check domain exists Modified: soc2016/yuanxunzhang/head/usr.sbin/eaps/eaps.c soc2016/yuanxunzhang/head/usr.sbin/eaps/keywords Modified: soc2016/yuanxunzhang/head/usr.sbin/eaps/eaps.c ============================================================================== --- soc2016/yuanxunzhang/head/usr.sbin/eaps/eaps.c Mon Aug 22 16:39:51 2016 (r308187) +++ soc2016/yuanxunzhang/head/usr.sbin/eaps/eaps.c Mon Aug 22 17:52:15 2016 (r308188) @@ -101,6 +101,8 @@ static void set_eaps_priority(int, char **, int); static void set_eaps_hellotime(int, char **, int); static void set_eaps_failtime(int, char **, int); +static void set_eaps_primary_port(int, char **, int); +static void set_eaps_secondary_port(int, char **, int); static void usage(const char *); void load_module(const char *); @@ -138,6 +140,12 @@ case K_FAILTIME: set_eaps_failtime(argc, argv, s); break; + case K_PRIMARY: + set_eaps_primary_port(argc, argv, s); + break; + case K_SECONDARY: + set_eaps_secondary_port(argc, argv, s); + break; } usage(*argv); return retval; @@ -290,6 +298,12 @@ err(1, "EAPS domain name is NULL!"); } + // check if eaps domain exists + if (0 == if_nametoindex(domain_name)) + { + errx(1, "EAPS domain %s does not exist", domain_name); + } + char *priority = *(++argv); printf("Debug print: set priority mode is %s!\n", priority); @@ -386,6 +400,28 @@ } static void +set_eaps_primary_port(int argc, char **argv, int s) +{ + int error = 0; + + struct eaps_state es; + bzero(&es, sizeof(es)); + + char *domain_name = *(++argv); + + // check eaps domain name + if (domain_name == NULL) { + err(1, "EAPS domain name is NULL!"); + } +} + +static void +set_eaps_secondary_port(int argc, char **argv, int s) +{ + +} + +static void usage(const char *cp) { if (cp != NULL) Modified: soc2016/yuanxunzhang/head/usr.sbin/eaps/keywords ============================================================================== --- soc2016/yuanxunzhang/head/usr.sbin/eaps/keywords Mon Aug 22 16:39:51 2016 (r308187) +++ soc2016/yuanxunzhang/head/usr.sbin/eaps/keywords Mon Aug 22 17:52:15 2016 (r308188) @@ -8,3 +8,5 @@ priority hellotime failtime +primary +secondary