diff options
| author | cmetz <cmetz@cvs.openbsd.org> | 1999-02-24 04:36:47 +0000 |
|---|---|---|
| committer | cmetz <cmetz@cvs.openbsd.org> | 1999-02-24 04:36:47 +0000 |
| commit | 8c0241f4651fcbf97a1e6149a3d981e6bfa862c6 (patch) | |
| tree | 855da0938d789b0bebb7ac432046ceb5500eba87 /sys/netinet6/raw_ipv6.c | |
| parent | 78500307c2a50ab81e78d480be46ad85ae7dd809 (diff) | |
Synchronized changes needed to integrate into OpenBSD with the NRL source
tree so we can have a unified netinet6 directory.
Diffstat (limited to 'sys/netinet6/raw_ipv6.c')
| -rw-r--r-- | sys/netinet6/raw_ipv6.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/sys/netinet6/raw_ipv6.c b/sys/netinet6/raw_ipv6.c index fb95a4858b2..ddaab0ec8d9 100644 --- a/sys/netinet6/raw_ipv6.c +++ b/sys/netinet6/raw_ipv6.c @@ -42,7 +42,7 @@ didn't get a copy, you may request one from <license@ipv6.nrl.navy.mil>. * SUCH DAMAGE. * * @(#)raw_ip.c 8.7 (Berkeley) 5/15/95 - * $Id: raw_ipv6.c,v 1.1 1999/01/06 23:26:58 deraadt Exp $ + * $Id: raw_ipv6.c,v 1.2 1999/02/24 04:36:46 cmetz Exp $ */ #include <sys/param.h> @@ -88,7 +88,12 @@ didn't get a copy, you may request one from <license@ipv6.nrl.navy.mil>. #include <net/netproc_var.h> #endif /* IPSEC */ +#ifdef DEBUG_NRL_SYS #include <sys/debug.h> +#endif /* DEBUG_NRL_SYS */ +#ifdef DEBUG_NRL_NETINET6 +#include <netinet6/debug.h> +#endif /* DEBUG_NRL_NETINET6 */ /* * Globals @@ -120,9 +125,6 @@ static struct inpcbinfo ri6pcbinfo; extern struct ipv6stat ipv6stat; -struct mbuf *ipv6_headertocontrol(struct mbuf *m, size_t extra, int inp_flags); -int ipv6_controltoheader(struct mbuf **m, struct mbuf *control, struct ifnet **forceifp, int *); - #define RETURN_ERROR(x) { \ DPRINTF(EVENT, ("%s: returning %s\n", DEBUG_STATUS, #x)); \ return x; \ @@ -199,7 +201,7 @@ static int ipv6_findnexthdr(struct mbuf *m, size_t extra) return -1; hl = sizeof(struct ipv6_opthdr) + - ((struct ipv6_opthdr *)p)->oh_extlen << 3; + (((struct ipv6_opthdr *)p)->oh_extlen << 3); if ((extra -= hl) < 0) return -1; @@ -211,7 +213,7 @@ static int ipv6_findnexthdr(struct mbuf *m, size_t extra) return -1; hl = sizeof(struct ipv6_srcroute0) + - ((struct ipv6_srcroute0 *)p)->i6sr_len << 3; + (((struct ipv6_srcroute0 *)p)->i6sr_len << 3); if ((extra -= hl) < 0) return -1; @@ -275,7 +277,6 @@ ripv6_input(m,extra) DPRINTF(FINISHED, ("ripv6_input(m=%08x, extra=%d)\n", OSDEP_PCAST(m), extra)); DP(FINISHED, m->m_pkthdr.len, d); - DDO(FINISHED,printf("In ripv6_input(), header is:\n");dump_mchain(m)); DPRINTF(EVENT, ("In ripv6_input()\n")); DPRINTF(EVENT, ("Header is: ")); |