diff options
| author | rrs <rrs@FreeBSD.org> | 2006-11-05 13:25:18 +0000 |
|---|---|---|
| committer | rrs <rrs@FreeBSD.org> | 2006-11-05 13:25:18 +0000 |
| commit | 20dc61d3a46238522e738dd8dde26965d5ce46dd (patch) | |
| tree | 0917b677ec5366916adb9fc52ff977feb016deb1 /sys/netinet6/sctp6_usrreq.c | |
| parent | 21ab4f8a250dc1903e52406d7a88f2bc912fb733 (diff) | |
| download | FreeBSD-src-20dc61d3a46238522e738dd8dde26965d5ce46dd.zip FreeBSD-src-20dc61d3a46238522e738dd8dde26965d5ce46dd.tar.gz | |
Tons of fixes to get all the 64bit issues removed.
This also moves two 16 bit int's to become 32 bit
values so we do not have to use atomic_add_16.
Most of the changes are %p, casts and other various
nasty's that were in the orignal code base. With this
commit my machine will now do a build universe.. however
I as yet have not tested on a 64bit machine .. it may not work :-(
Diffstat (limited to 'sys/netinet6/sctp6_usrreq.c')
| -rw-r--r-- | sys/netinet6/sctp6_usrreq.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sys/netinet6/sctp6_usrreq.c b/sys/netinet6/sctp6_usrreq.c index d722336..39d531b 100644 --- a/sys/netinet6/sctp6_usrreq.c +++ b/sys/netinet6/sctp6_usrreq.c @@ -80,6 +80,7 @@ __FBSDID("$FreeBSD$"); #ifdef IPSEC #include <netinet6/ipsec.h> +#include <netinet6/ipsec6.h> #endif /* IPSEC */ #if defined(NFAITH) && NFAITH > 0 @@ -193,8 +194,8 @@ sctp6_input(mp, offp, proto) if (calc_check != check) { #ifdef SCTP_DEBUG if (sctp_debug_on & SCTP_DEBUG_INPUT1) { - printf("Bad CSUM on SCTP packet calc_check:%x check:%x m:%x mlen:%d iphlen:%d\n", - calc_check, check, (u_int)m, + printf("Bad CSUM on SCTP packet calc_check:%x check:%x m:%p mlen:%d iphlen:%d\n", + calc_check, check, m, mlen, iphlen); } #endif @@ -249,11 +250,11 @@ sctp_skip_csum: /* * Check AH/ESP integrity. */ - if (in6p->sctp_socket && (ipsec6_in_reject_so(m, in6p->sctp_socket)) { + if (in6p_ip && (ipsec6_in_reject(m, in6p_ip))) { /* XXX */ ipsec6stat.in_polvio++; goto bad; - } + } #endif /* IPSEC */ |
