summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordlg <dlg@openbsd.org>2009-04-04 13:09:29 +0000
committerdlg <dlg@openbsd.org>2009-04-04 13:09:29 +0000
commitda9c45cd0fb82e1dee3a6c924e92c41ca16f6f07 (patch)
tree243960e5cee883cb03d4ad16e534066b0365cef8
parentDo not run make in /var/yp at the end of ypinit -m. (diff)
downloadwireguard-openbsd-da9c45cd0fb82e1dee3a6c924e92c41ca16f6f07.tar.xz
wireguard-openbsd-da9c45cd0fb82e1dee3a6c924e92c41ca16f6f07.zip
use time_uptime instead of time_second internally. time_uptime isnt
affected by adjusting the clock.
-rw-r--r--sys/net/if_pfsync.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/net/if_pfsync.c b/sys/net/if_pfsync.c
index d7d17080896..df54f279551 100644
--- a/sys/net/if_pfsync.c
+++ b/sys/net/if_pfsync.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_pfsync.c,v 1.119 2009/03/31 01:21:29 dlg Exp $ */
+/* $OpenBSD: if_pfsync.c,v 1.120 2009/04/04 13:09:29 dlg Exp $ */
/*
* Copyright (c) 2002 Michael Shalayeff
@@ -563,7 +563,7 @@ pfsync_state_import(struct pfsync_state *sp, u_int8_t flags)
st->anchor.ptr = NULL;
st->rt_kif = NULL;
- st->pfsync_time = time_second;
+ st->pfsync_time = time_uptime;
st->sync_state = PFSYNC_S_NONE;
/* XXX when we have nat_rule/anchors, use STATE_INC_COUNTERS */
@@ -960,7 +960,7 @@ pfsync_in_upd(struct pfsync_pkt *pkt, struct mbuf *m, int offset, int count)
pf_state_peer_ntoh(&sp->dst, &st->dst);
st->expire = ntohl(sp->expire) + time_second;
st->timeout = sp->timeout;
- st->pfsync_time = time_second;
+ st->pfsync_time = time_uptime;
}
splx(s);
@@ -1052,7 +1052,7 @@ pfsync_in_upd_c(struct pfsync_pkt *pkt, struct mbuf *m, int offset, int count)
pf_state_peer_ntoh(&up->dst, &st->dst);
st->expire = ntohl(up->expire) + time_second;
st->timeout = up->timeout;
- st->pfsync_time = time_second;
+ st->pfsync_time = time_uptime;
}
splx(s);
@@ -1918,7 +1918,7 @@ pfsync_update_state(struct pf_state *st)
st->sync_state);
}
- if (sync || (time_second - st->pfsync_time) < 2) {
+ if (sync || (time_uptime - st->pfsync_time) < 2) {
pfsync_upds++;
schednetisr(NETISR_PFSYNC);
}