diff options
| author | mlaier <mlaier@FreeBSD.org> | 2005-09-08 17:42:42 +0000 |
|---|---|---|
| committer | mlaier <mlaier@FreeBSD.org> | 2005-09-08 17:42:42 +0000 |
| commit | df3bd6cde39d52bff241cca550a807c75c866f84 (patch) | |
| tree | 2578d34d3779230528f5163427b71f2abe122528 /sys/contrib | |
| parent | fc07baa4602d0f93acb217e81c98ab6057e2f88d (diff) | |
| download | FreeBSD-src-df3bd6cde39d52bff241cca550a807c75c866f84.zip FreeBSD-src-df3bd6cde39d52bff241cca550a807c75c866f84.tar.gz | |
Unbreak the build. Committed from the wrong directory.
Diffstat (limited to 'sys/contrib')
| -rw-r--r-- | sys/contrib/pf/net/pf.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sys/contrib/pf/net/pf.c b/sys/contrib/pf/net/pf.c index 311dc74..c552d82 100644 --- a/sys/contrib/pf/net/pf.c +++ b/sys/contrib/pf/net/pf.c @@ -3642,7 +3642,7 @@ pf_test_icmp(struct pf_rule **rm, struct pf_state **sm, int direction, struct pf_ruleset *ruleset = NULL; struct pf_src_node *nsn = NULL; u_short reason; - u_int16_t icmpid, bport, nport = 0; + u_int16_t icmpid = 0, bport, nport = 0; sa_family_t af = pd->af; u_int8_t icmptype = 0; /* make the compiler happy */ u_int8_t icmpcode = 0; /* make the compiler happy */ @@ -3706,7 +3706,8 @@ pf_test_icmp(struct pf_rule **rm, struct pf_state **sm, int direction, pd->hdr.icmp->icmp_cksum = pf_cksum_fixup( pd->hdr.icmp->icmp_cksum, icmpid, nport, 0); pd->hdr.icmp->icmp_id = nport; - m_copyback(m, off, ICMP_MINLEN, pd->hdr.icmp); + m_copyback(m, off, ICMP_MINLEN, + (caddr_t)pd->hdr.icmp); break; #endif /* INET */ #ifdef INET6 @@ -4857,7 +4858,7 @@ pf_test_state_icmp(struct pf_state **state, int direction, struct pfi_kif *kif, pd->hdr.icmp->icmp_id = (*state)->gwy.port; m_copyback(m, off, ICMP_MINLEN, - pd->hdr.icmp); + (caddr_t)pd->hdr.icmp); break; #endif /* INET */ #ifdef INET6 @@ -4885,7 +4886,7 @@ pf_test_state_icmp(struct pf_state **state, int direction, struct pfi_kif *kif, pd->hdr.icmp->icmp_id = (*state)->lan.port; m_copyback(m, off, ICMP_MINLEN, - pd->hdr.icmp); + (caddr_t)pd->hdr.icmp); break; #endif /* INET */ #ifdef INET6 |
