diff options
| author | mlaier <mlaier@FreeBSD.org> | 2005-12-25 22:57:08 +0000 |
|---|---|---|
| committer | mlaier <mlaier@FreeBSD.org> | 2005-12-25 22:57:08 +0000 |
| commit | 74c57f2ec087f221b0548ee90a5d191a21a1ab49 (patch) | |
| tree | 56eb6f17f47f5b56df7cf9937caa21690f695356 | |
| parent | d03771dd86be794cb4a83a8e24605c744cbe3219 (diff) | |
| download | FreeBSD-src-74c57f2ec087f221b0548ee90a5d191a21a1ab49.zip FreeBSD-src-74c57f2ec087f221b0548ee90a5d191a21a1ab49.tar.gz | |
Fix build after timeval.tv_sec changed from long to time_t.
| -rw-r--r-- | contrib/pf/authpf/authpf.c | 8 | ||||
| -rw-r--r-- | sys/contrib/pf/net/pf_norm.c | 7 |
2 files changed, 13 insertions, 2 deletions
diff --git a/contrib/pf/authpf/authpf.c b/contrib/pf/authpf/authpf.c index af75027..22fdfa4 100644 --- a/contrib/pf/authpf/authpf.c +++ b/contrib/pf/authpf/authpf.c @@ -42,6 +42,9 @@ __FBSDID("$FreeBSD$"); #include <err.h> #include <errno.h> +#ifdef __FreeBSD__ +#include <inttypes.h> +#endif #include <login_cap.h> #include <pwd.h> #include <signal.h> @@ -702,8 +705,13 @@ change_filter(int add, const char *luser, const char *ipsrc) syslog(LOG_INFO, "allowing %s, user %s", ipsrc, luser); } else { gettimeofday(&Tend, NULL); +#ifdef __FreeBSD__ + syslog(LOG_INFO, "removed %s, user %s - duration %jd seconds", + ipsrc, luser, (intmax_t)(Tend.tv_sec - Tstart.tv_sec)); +#else syslog(LOG_INFO, "removed %s, user %s - duration %ld seconds", ipsrc, luser, Tend.tv_sec - Tstart.tv_sec); +#endif } return (0); no_mem: diff --git a/sys/contrib/pf/net/pf_norm.c b/sys/contrib/pf/net/pf_norm.c index 34aea84..7312ecd 100644 --- a/sys/contrib/pf/net/pf_norm.c +++ b/sys/contrib/pf/net/pf_norm.c @@ -75,6 +75,8 @@ #include <net/pfvar.h> #ifndef __FreeBSD__ +#include <inttypes.h> + struct pf_frent { LIST_ENTRY(pf_frent) fr_next; struct ip *fr_ip; @@ -1815,8 +1817,9 @@ pf_normalize_tcp_stateful(struct mbuf *m, int off, struct pf_pdesc *pd, SEQ_LT(tsecr, dst->scrub->pfss_tsval0)? '3' : ' ')); #ifdef __FreeBSD__ DPFPRINTF((" tsval: %u tsecr: %u +ticks: %u " - "idle: %lus %lums\n", - tsval, tsecr, tsval_from_last, delta_ts.tv_sec, + "idle: %jus %lums\n", + tsval, tsecr, tsval_from_last, + (uintmax_t)delta_ts.tv_sec, delta_ts.tv_usec / 1000)); DPFPRINTF((" src->tsval: %u tsecr: %u\n", src->scrub->pfss_tsval, src->scrub->pfss_tsecr)); |
