From owner-svn-src-head@FreeBSD.ORG  Mon Jun  4 18:02:10 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 17E0F106566B;
	Mon,  4 Jun 2012 18:02:10 +0000 (UTC)
	(envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 0286C8FC1D;
	Mon,  4 Jun 2012 18:02:10 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q54I29Ls056892;
	Mon, 4 Jun 2012 18:02:09 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q54I29nZ056889;
	Mon, 4 Jun 2012 18:02:09 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201206041802.q54I29nZ056889@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Mon, 4 Jun 2012 18:02:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r236572 - head/usr.sbin/inetd
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 04 Jun 2012 18:02:10 -0000

Author: delphij
Date: Mon Jun  4 18:02:09 2012
New Revision: 236572
URL: http://svn.freebsd.org/changeset/base/236572

Log:
  Replace the use of wall clock time with monotonically increasing
  clock.  In general, gettimeofday() is not appropriate interface
  when accounting for elasped time because it can go backward, in
  which case the policy code could errornously consider the limit
  as exceeded.
  
  MFC after:	1 week
  Reported by:	Mahesh Arumugam
  Submitted by:	Dorr H. Clark via gnn
  Sponsored by:	Citrix / NetScaler

Modified:
  head/usr.sbin/inetd/inetd.c
  head/usr.sbin/inetd/inetd.h

Modified: head/usr.sbin/inetd/inetd.c
==============================================================================
--- head/usr.sbin/inetd/inetd.c	Mon Jun  4 17:22:43 2012	(r236571)
+++ head/usr.sbin/inetd/inetd.c	Mon Jun  4 18:02:09 2012	(r236572)
@@ -688,11 +688,11 @@ main(int argc, char **argv)
 		     */
 		    if (dofork) {
 			    if (sep->se_count++ == 0)
-				(void)gettimeofday(&sep->se_time, (struct timezone *)NULL);
+				(void)clock_gettime(CLOCK_MONOTONIC_FAST, &sep->se_time);
 			    else if (toomany > 0 && sep->se_count >= toomany) {
-				struct timeval now;
+				struct timespec now;
 
-				(void)gettimeofday(&now, (struct timezone *)NULL);
+				(void)clock_gettime(CLOCK_MONOTONIC_FAST, &now);
 				if (now.tv_sec - sep->se_time.tv_sec >
 				    CNT_INTVL) {
 					sep->se_time = now;

Modified: head/usr.sbin/inetd/inetd.h
==============================================================================
--- head/usr.sbin/inetd/inetd.h	Mon Jun  4 17:22:43 2012	(r236571)
+++ head/usr.sbin/inetd/inetd.h	Mon Jun  4 18:02:09 2012	(r236572)
@@ -109,7 +109,7 @@ struct	servtab {
 	u_int	se_rpc_lowvers;		/* RPC low version */
 	u_int	se_rpc_highvers;	/* RPC high version */
 	int	se_count;		/* number started since se_time */
-	struct	timeval se_time;	/* start of se_count */
+	struct	timespec se_time;	/* start of se_count */
 	struct	servtab *se_next;
 	struct se_flags {
 		u_int se_nomapped : 1;