diff options
| author | Daniel Hartmeier <dhartmei@cvs.openbsd.org> | 2003-12-18 16:07:39 +0000 |
|---|---|---|
| committer | Daniel Hartmeier <dhartmei@cvs.openbsd.org> | 2003-12-18 16:07:39 +0000 |
| commit | 7d57d5b7eebb952811aaaef97195a1a8c300e8bd (patch) | |
| tree | cd99a0def777482ebbb54abeb37afc26fc8da9cc | |
| parent | 82e462e08a14331d50fdaa5add4e9bbc5efc5e5d (diff) | |
resolve compiler warnings, from Pyun YongHyeon, ok cedric@, mcbride@
| -rw-r--r-- | sys/net/if_pfsync.c | 4 | ||||
| -rw-r--r-- | sys/net/pf.c | 4 | ||||
| -rw-r--r-- | sys/net/pf_osfp.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/sys/net/if_pfsync.c b/sys/net/if_pfsync.c index 399757b68e9..1a183e55f91 100644 --- a/sys/net/if_pfsync.c +++ b/sys/net/if_pfsync.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_pfsync.c,v 1.11 2003/12/16 08:17:56 mcbride Exp $ */ +/* $OpenBSD: if_pfsync.c,v 1.12 2003/12/18 16:07:38 dhartmei Exp $ */ /* * Copyright (c) 2002 Michael Shalayeff @@ -254,7 +254,7 @@ pfsync_input(struct mbuf *m, ...) } ip = mtod(m, struct ip *); } - ph = (void *)ip + iplen; + ph = (struct pfsync_header *)((char *)ip + iplen); /* verify the version */ if (ph->version != PFSYNC_VERSION) { diff --git a/sys/net/pf.c b/sys/net/pf.c index 6aa353c9729..d6475049cd7 100644 --- a/sys/net/pf.c +++ b/sys/net/pf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pf.c,v 1.411 2003/12/15 09:10:25 henning Exp $ */ +/* $OpenBSD: pf.c,v 1.412 2003/12/18 16:07:38 dhartmei Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -604,7 +604,7 @@ pf_insert_state(struct pf_state *state) if (RB_INSERT(pf_state_tree_id, &tree_id, state) != NULL) { if (pf_status.debug >= PF_DEBUG_MISC) { printf("pf: state insert failed: " - "id: %016x creatorid: %08x", + "id: %016llx creatorid: %08x", betoh64(state->id), ntohl(state->creatorid)); if (state->sync_flags & PFSTATE_FROMSYNC) printf(" (from sync)"); diff --git a/sys/net/pf_osfp.c b/sys/net/pf_osfp.c index c01d6de6407..68d937643d1 100644 --- a/sys/net/pf_osfp.c +++ b/sys/net/pf_osfp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pf_osfp.c,v 1.3 2003/08/27 18:23:36 frantzen Exp $ */ +/* $OpenBSD: pf_osfp.c,v 1.4 2003/12/18 16:07:38 dhartmei Exp $ */ /* * Copyright (c) 2003 Mike Frantzen <frantzen@w4g.org> @@ -106,7 +106,7 @@ pf_osfp_fingerprint_hdr(const struct ip *ip, const struct tcphdr *tcp) { struct pf_os_fingerprint fp, *fpresult; int cnt, optlen = 0; - u_int8_t *optp; + const u_int8_t *optp; if ((tcp->th_flags & (TH_SYN|TH_ACK)) != TH_SYN || (ip->ip_off & htons(IP_OFFMASK))) |