kern/83187: MFC suggestion for if_pfsync.c

[Martin Matuska]

>Number:         83187
>Category:       kern
>Synopsis:       MFC suggestion for if_pfsync.c
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jul 09 15:00:35 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Martin Matuska
>Release:        FreeBSD 5-STABLE i386
>Organization:
>Environment:
>Description:
I suggest MFCing the patch in OpenBSD: src/sys/net/if_pfsync.c rev. 1.41
to RELENG_5 (already included in HEAD)

Comments from OpenBSD cvslog for src/sys/net/if_pfsync.c 1.41:
Set creation timestamps correctly on states learnt by pfsync that are
more than a second old.

>How-To-Repeat:
>Fix:
fixed in OpenBSD: src/sys/net/if_pfsync.c rev. 1.41
already included in HEAD
please MFC to RELENG_5 the following patches from HEAD:
--- src/sys/contrib/pf/net/if_pfsync.c.orig	Sat Jul  9 15:31:31 2005
+++ src/sys/contrib/pf/net/if_pfsync.c	Sat Jul  9 15:56:51 2005
@@ -346,7 +349,7 @@
 
 	bcopy(&sp->rt_addr, &st->rt_addr, sizeof(st->rt_addr));
 #ifdef __FreeBSD__
-	st->creation = ntohl(sp->creation) + time_second;
+	st->creation = time_second - ntohl(sp->creation);
 	st->expire = ntohl(sp->expire) + time_second;
 #else
 	st->creation = ntohl(sp->creation) + time.tv_sec;
>Release-Note:
>Audit-Trail:
>Unformatted: