From owner-svn-soc-all@freebsd.org  Mon Aug 22 15:08:10 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 98FE3BC2E47
 for <svn-soc-all@mailman.ysv.freebsd.org>;
 Mon, 22 Aug 2016 15:08:10 +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 8C4C91AA8
 for <svn-soc-all@FreeBSD.org>; Mon, 22 Aug 2016 15:08:10 +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 u7MF8Ap7021579
 for <svn-soc-all@FreeBSD.org>; Mon, 22 Aug 2016 15:08:10 GMT
 (envelope-from yuanxunzhang@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id u7MF89CM021480
 for svn-soc-all@FreeBSD.org; Mon, 22 Aug 2016 15:08:10 GMT
 (envelope-from yuanxunzhang@FreeBSD.org)
Date: Mon, 22 Aug 2016 15:08:10 GMT
Message-Id: <201608221508.u7MF89CM021480@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: r308177 - 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: Mon, 22 Aug 2016 15:08:10 -0000

Author: yuanxunzhang
Date: Mon Aug 22 15:08:09 2016
New Revision: 308177
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=308177

Log:
  EAPS: fix set_eaps_hellotime bugs

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	Mon Aug 22 14:53:39 2016	(r308176)
+++ soc2016/yuanxunzhang/head/usr.sbin/eaps/eaps.c	Mon Aug 22 15:08:09 2016	(r308177)
@@ -134,6 +134,10 @@
 			break;
 		case K_HELLOTIME:
 			set_eaps_hellotime(argc, argv, s);
+			break;
+		case K_FAILTIME:
+			set_eaps_failtime(argc, argv, s);
+			break;
 		}
 	usage(*argv);
 	return retval;
@@ -227,8 +231,8 @@
 		printf("state: %s\n", eaps_state_message[es.state]);
 		printf("\tswitch mode: %s\n", eaps_mode_message[es.mode]);
 		printf("\tpriority: %s\n", eaps_priority_message[es.priority]);
-		printf("\thellotime: %d\n", es.hellotime);
-		printf("\tfailtime: %d\n", es.failtime);
+		printf("\thellotime: %d (milliseconds)\n", es.hellotime);
+		printf("\tfailtime: %d (milliseconds)\n", es.failtime);
 	} else {
 		printf("Debug print: ioctl failed!\n");
 		err(1, "SIOCSEAPSDOMAIN");
@@ -323,10 +327,14 @@
 	int32_t hellotime = atoi(*(++argv));
 	printf("Debug print: set_eaps_hellotime %d!\n", hellotime);
 
-	// hellotime must be greater than 0
-	if (hellotime <= 0)
-	{
-		err(1, "invalid hellotime, hellotime must be greater than 0");
+	// get current value of failtime, because hellotime must be greater than failtime
+	if (ioctl(s, SIOCSEAPSDOMAIN, &es) == 0) {
+		if (hellotime >= es.failtime) {
+			err(1, "invalid failtime, hellotime must be greater than failtime");
+		}
+	}else {
+		printf("Debug print: ioctl failed!\n");
+		err(1, "SIOCSEAPSDOMAIN");
 	}
 
 	es.hellotime = hellotime;