From owner-svn-soc-all@freebsd.org Fri Jun 3 03:23:03 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 24F76B66E83 for ; Fri, 3 Jun 2016 03:23:03 +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 F30111C54 for ; Fri, 3 Jun 2016 03:23:02 +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 u533N2tD027747 for ; Fri, 3 Jun 2016 03:23:02 GMT (envelope-from yuanxunzhang@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id u533N1Pb027286 for svn-soc-all@FreeBSD.org; Fri, 3 Jun 2016 03:23:01 GMT (envelope-from yuanxunzhang@FreeBSD.org) Date: Fri, 3 Jun 2016 03:23:01 GMT Message-Id: <201606030323.u533N1Pb027286@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: r304450 - 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: Fri, 03 Jun 2016 03:23:03 -0000 Author: yuanxunzhang Date: Fri Jun 3 03:23:01 2016 New Revision: 304450 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=304450 Log: freeBSD:EAPS development Modified: soc2016/yuanxunzhang/head/sys/net/eaps.h soc2016/yuanxunzhang/head/usr.sbin/eaps/eaps.c Modified: soc2016/yuanxunzhang/head/sys/net/eaps.h ============================================================================== --- soc2016/yuanxunzhang/head/sys/net/eaps.h Fri Jun 3 00:48:50 2016 (r304449) +++ soc2016/yuanxunzhang/head/sys/net/eaps.h Fri Jun 3 03:23:01 2016 (r304450) @@ -31,6 +31,8 @@ #ifndef _NET_EAPS_H_ #define _NET_EAPS_H_ +#ifdef _KERNEL + /* * Extreme Active Protection System (EAPS) definitions. * Normative reference: draft-shah-extreme-rfc3619bis-02 [Expired I-D] @@ -100,6 +102,7 @@ uint16_t eaps_rsvd1[38]; /* Reserved; set to zero */ } __packed; + #define EAPS_VERSION_1 0x01 /* EAPSv1; may support v2 in future */ #define EAPS_HELLO_INTERVAL 0x04 /* hardcoded value of eaps_hello */ @@ -125,4 +128,6 @@ #define EAPS_S_PREFORWARD 0x05 /* Transit in PREFORWARDING State */ #define EAPS_S_INIT 0x06 /* Master node in INIT state */ +#endif /* _KERNEL */ + #endif /* _NET_EAPS_H_ */ Modified: soc2016/yuanxunzhang/head/usr.sbin/eaps/eaps.c ============================================================================== --- soc2016/yuanxunzhang/head/usr.sbin/eaps/eaps.c Fri Jun 3 00:48:50 2016 (r304449) +++ soc2016/yuanxunzhang/head/usr.sbin/eaps/eaps.c Fri Jun 3 03:23:01 2016 (r304450) @@ -48,9 +48,19 @@ #include /* - * eaps - display, and configure eaps + * eaps - configure, and display eaps */ +/* +* EAPS Configuration Descriptor +*/ +struct eaps_d { + char eaps_name[32]; /* name of the EAPS domain */ + SLIST_ENTRY(eaps_d) eaps_entries; +}; + +static SLIST_HEAD(, eaps_d) eaps_head = SLIST_HEAD_INITIALIZER(eaps_head); + static struct keytab { const char *kt_cp; int kt_i; @@ -67,7 +77,7 @@ int main(int argc, char **argv) { - int rtn = 0; + int retval = 0; if (argc < 3) usage(NULL); @@ -78,10 +88,9 @@ case K_DELETE: deletedomain(argc, argv); - exit(0); } usage(*argv); - return rtn; + return retval; } static void