From owner-svn-src-projects@FreeBSD.ORG Thu Feb 23 19:03:23 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4E5921065670; Thu, 23 Feb 2012 19:03:23 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 201738FC13; Thu, 23 Feb 2012 19:03:23 +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 q1NJ3NE3018849; Thu, 23 Feb 2012 19:03:23 GMT (envelope-from glebius@svn.freebsd.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q1NJ3MZC018846; Thu, 23 Feb 2012 19:03:22 GMT (envelope-from glebius@svn.freebsd.org) Message-Id: <201202231903.q1NJ3MZC018846@svn.freebsd.org> From: Gleb Smirnoff Date: Thu, 23 Feb 2012 19:03:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r232062 - in projects/pf/head/sys: contrib/pf/net sys X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Feb 2012 19:03:23 -0000 Author: glebius Date: Thu Feb 23 19:03:22 2012 New Revision: 232062 URL: http://svn.freebsd.org/changeset/base/232062 Log: Use correct API for timeval subtraction. Noticed by: bde Modified: projects/pf/head/sys/contrib/pf/net/pf_norm.c projects/pf/head/sys/sys/time.h Modified: projects/pf/head/sys/contrib/pf/net/pf_norm.c ============================================================================== --- projects/pf/head/sys/contrib/pf/net/pf_norm.c Thu Feb 23 18:59:32 2012 (r232061) +++ projects/pf/head/sys/contrib/pf/net/pf_norm.c Thu Feb 23 19:03:22 2012 (r232062) @@ -1670,7 +1670,6 @@ pf_normalize_tcp_stateful(struct mbuf *m * connection limit until we can come up with a better * lowerbound to the TS echo check. */ - struct timeval delta_ts; int ts_fudge; @@ -1686,9 +1685,9 @@ pf_normalize_tcp_stateful(struct mbuf *m /* Calculate max ticks since the last timestamp */ #define TS_MAXFREQ 1100 /* RFC max TS freq of 1Khz + 10% skew */ #define TS_MICROSECS 1000000 /* microseconds per second */ - timersub(&uptime, &src->scrub->pfss_last, &delta_ts); - tsval_from_last = (delta_ts.tv_sec + ts_fudge) * TS_MAXFREQ; - tsval_from_last += delta_ts.tv_usec / (TS_MICROSECS/TS_MAXFREQ); + timevalsub(&uptime, &src->scrub->pfss_last); + tsval_from_last = (uptime.tv_sec + ts_fudge) * TS_MAXFREQ; + tsval_from_last += uptime.tv_usec / (TS_MICROSECS/TS_MAXFREQ); if ((src->state >= TCPS_ESTABLISHED && dst->state >= TCPS_ESTABLISHED) && @@ -1712,8 +1711,8 @@ pf_normalize_tcp_stateful(struct mbuf *m DPFPRINTF((" tsval: %u tsecr: %u +ticks: %u " "idle: %jus %lums\n", tsval, tsecr, tsval_from_last, - (uintmax_t)delta_ts.tv_sec, - delta_ts.tv_usec / 1000)); + (uintmax_t)uptime.tv_sec, + uptime.tv_usec / 1000)); DPFPRINTF((" src->tsval: %u tsecr: %u\n", src->scrub->pfss_tsval, src->scrub->pfss_tsecr)); DPFPRINTF((" dst->tsval: %u tsecr: %u tsval0: %u" Modified: projects/pf/head/sys/sys/time.h ============================================================================== --- projects/pf/head/sys/sys/time.h Thu Feb 23 18:59:32 2012 (r232061) +++ projects/pf/head/sys/sys/time.h Thu Feb 23 19:03:22 2012 (r232062) @@ -199,7 +199,8 @@ timeval2bintime(const struct timeval *tv #endif /* _KERNEL */ -/* NetBSD/OpenBSD compatible interfaces. */ +#ifndef _KERNEL /* NetBSD/OpenBSD compatible interfaces */ + #define timerclear(tvp) ((tvp)->tv_sec = (tvp)->tv_usec = 0) #define timerisset(tvp) ((tvp)->tv_sec || (tvp)->tv_usec) #define timercmp(tvp, uvp, cmp) \ @@ -224,6 +225,7 @@ timeval2bintime(const struct timeval *tv (vvp)->tv_usec += 1000000; \ } \ } while (0) +#endif /* * Names of the interval timers, and structure