Module Name: src
Committed By: maxv
Date: Wed Feb 14 05:29:39 UTC 2018
Modified Files:
src/sys/netinet6: ip6_input.c ip6_var.h
Log Message:
Re-make ip6_nexthdr global, it will be used in soon-to-be-added code...
To generate a diff of this commit:
cvs rdiff -u -r1.191 -r1.192 src/sys/netinet6/ip6_input.c
cvs rdiff -u -r1.79 -r1.80 src/sys/netinet6/ip6_var.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet6/ip6_input.c
diff -u src/sys/netinet6/ip6_input.c:1.191 src/sys/netinet6/ip6_input.c:1.192
--- src/sys/netinet6/ip6_input.c:1.191 Mon Feb 12 12:52:12 2018
+++ src/sys/netinet6/ip6_input.c Wed Feb 14 05:29:39 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ip6_input.c,v 1.191 2018/02/12 12:52:12 maxv Exp $ */
+/* $NetBSD: ip6_input.c,v 1.192 2018/02/14 05:29:39 maxv Exp $ */
/* $KAME: ip6_input.c,v 1.188 2001/03/29 05:34:31 itojun Exp $ */
/*
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip6_input.c,v 1.191 2018/02/12 12:52:12 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip6_input.c,v 1.192 2018/02/14 05:29:39 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_gateway.h"
@@ -1402,7 +1402,7 @@ ip6_get_prevhdr(struct mbuf *m, int off)
/*
* get next header offset. m will be retained.
*/
-static int
+int
ip6_nexthdr(struct mbuf *m, int off, int proto, int *nxtp)
{
struct ip6_hdr ip6;
Index: src/sys/netinet6/ip6_var.h
diff -u src/sys/netinet6/ip6_var.h:1.79 src/sys/netinet6/ip6_var.h:1.80
--- src/sys/netinet6/ip6_var.h:1.79 Tue Jan 30 15:54:02 2018
+++ src/sys/netinet6/ip6_var.h Wed Feb 14 05:29:39 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ip6_var.h,v 1.79 2018/01/30 15:54:02 maxv Exp $ */
+/* $NetBSD: ip6_var.h,v 1.80 2018/02/14 05:29:39 maxv Exp $ */
/* $KAME: ip6_var.h,v 1.33 2000/06/11 14:59:20 jinmei Exp $ */
/*
@@ -287,6 +287,7 @@ void ip6_freepcbopts(struct ip6_pktopts
void ip6_freemoptions(struct ip6_moptions *);
int ip6_unknown_opt(u_int8_t *, struct mbuf *, int);
int ip6_get_prevhdr(struct mbuf *, int);
+int ip6_nexthdr(struct mbuf *, int, int, int *);
int ip6_lasthdr(struct mbuf *, int, int, int *);
struct m_tag *ip6_addaux(struct mbuf *);
