From owner-svn-soc-all@freebsd.org Mon Aug 22 15:38:40 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 C1115BC2469 for ; Mon, 22 Aug 2016 15:38:40 +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 B438E1A58 for ; Mon, 22 Aug 2016 15:38:40 +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 u7MFceox059027 for ; Mon, 22 Aug 2016 15:38:40 GMT (envelope-from yuanxunzhang@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id u7MFceZb059016 for svn-soc-all@FreeBSD.org; Mon, 22 Aug 2016 15:38:40 GMT (envelope-from yuanxunzhang@FreeBSD.org) Date: Mon, 22 Aug 2016 15:38:40 GMT Message-Id: <201608221538.u7MFceZb059016@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: r308178 - 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 15:38:40 -0000 Author: yuanxunzhang Date: Mon Aug 22 15:38:39 2016 New Revision: 308178 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=308178 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 15:08:09 2016 (r308177) +++ soc2016/yuanxunzhang/head/usr.sbin/eaps/eaps.c Mon Aug 22 15:38:39 2016 (r308178) @@ -328,6 +328,7 @@ printf("Debug print: set_eaps_hellotime %d!\n", hellotime); // get current value of failtime, because hellotime must be greater than failtime + strlcpy(es.ifname, domain_name, sizeof(es.ifname)); if (ioctl(s, SIOCSEAPSDOMAIN, &es) == 0) { if (hellotime >= es.failtime) { err(1, "invalid failtime, hellotime must be greater than failtime"); @@ -337,6 +338,7 @@ err(1, "SIOCSEAPSDOMAIN"); } + bzero(&es, sizeof(es)); es.hellotime = hellotime; strlcpy(es.ifname, domain_name, sizeof(es.ifname)); if (ioctl(s, SIOCSEAPSHELLO, &es) != 0) @@ -364,6 +366,7 @@ printf("Debug print: set_eaps_failtime %d!\n", failtime); // get current value of hellotime, because failtime must be greater than hellotime + strlcpy(es.ifname, domain_name, sizeof(es.ifname)); if (ioctl(s, SIOCSEAPSDOMAIN, &es) == 0) { if (failtime <= es.hellotime) { err(1, "invalid failtime, failtime must be greater than hellotime"); @@ -373,6 +376,7 @@ err(1, "SIOCSEAPSDOMAIN"); } + bzero(&es, sizeof(es)); es.failtime = failtime; strlcpy(es.ifname, domain_name, sizeof(es.ifname)); if (ioctl(s, SIOCSEAPSFAIL, &es) != 0)