Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Temporarily ifdef out sys/netipsec/ipsec_input.c:esp6_ctlinput(),

Browse Source 
as there is a duplicate version in (my) ipsec_netbsd.c, with somewhat
newer IP-multicast tests.
This commit is contained in:
jonathan 2004-03-20 02:57:48 +00:00
parent 089c0cfc10
commit def672af05
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/netipsec/ipsec_input.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ipsec_input.c,v 1.7 2004/03/01 23:20:53 thorpej Exp $ */ /* $NetBSD: ipsec_input.c,v 1.8 2004/03/20 02:57:48 jonathan Exp $ */
/* $FreeBSD: /usr/local/www/cvsroot/FreeBSD/src/sys/netipsec/ipsec_input.c,v 1.2.4.2 2003/03/28 20:32:53 sam Exp $ */ /* $FreeBSD: /usr/local/www/cvsroot/FreeBSD/src/sys/netipsec/ipsec_input.c,v 1.2.4.2 2003/03/28 20:32:53 sam Exp $ */
/* $OpenBSD: ipsec_input.c,v 1.63 2003/02/20 18:35:43 deraadt Exp $ */ /* $OpenBSD: ipsec_input.c,v 1.63 2003/02/20 18:35:43 deraadt Exp $ */
@ -39,7 +39,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ipsec_input.c,v 1.7 2004/03/01 23:20:53 thorpej Exp $"); __KERNEL_RCSID(0, "$NetBSD: ipsec_input.c,v 1.8 2004/03/20 02:57:48 jonathan Exp $");
/* /*
* IPsec input processing. * IPsec input processing.
@ -485,6 +485,12 @@ ipsec6_common_input(struct mbuf **mp, int *offp, int proto)
return IPPROTO_DONE; return IPPROTO_DONE;
} }
/*
* NB: ipsec_netbsd.c has a duplicate definition of esp6_ctlinput(),
* with slightly ore recent multicast tests. These should be merged.
* For now, ifdef accordingly.
*/
#ifdef __FreeBSD__
void void
esp6_ctlinput(int cmd, struct sockaddr *sa, void *d) esp6_ctlinput(int cmd, struct sockaddr *sa, void *d)
{ {
@ -560,6 +566,7 @@ esp6_ctlinput(int cmd, struct sockaddr *sa, void *d)
/* we normally notify any pcb here */ /* we normally notify any pcb here */
} }
} }
#endif /* __FreeBSD__ */
extern struct ip6protosw inet6sw[]; extern struct ip6protosw inet6sw[];
extern u_char ip6_protox[]; extern u_char ip6_protox[];