Module Name: src
Committed By: rjs
Date: Fri Feb 20 22:13:48 UTC 2015
Modified Files:
src/sys/netinet6: in6.c in6.h
Log Message:
Declare input argument to in6_sin_2_v4mapsin6 to be const, allows an
address from the route cache to be used as the input.
ok christos@.
To generate a diff of this commit:
cvs rdiff -u -r1.180 -r1.181 src/sys/netinet6/in6.c
cvs rdiff -u -r1.82 -r1.83 src/sys/netinet6/in6.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/in6.c
diff -u src/sys/netinet6/in6.c:1.180 src/sys/netinet6/in6.c:1.181
--- src/sys/netinet6/in6.c:1.180 Tue Dec 2 19:36:58 2014
+++ src/sys/netinet6/in6.c Fri Feb 20 22:13:48 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: in6.c,v 1.180 2014/12/02 19:36:58 christos Exp $ */
+/* $NetBSD: in6.c,v 1.181 2015/02/20 22:13:48 rjs Exp $ */
/* $KAME: in6.c,v 1.198 2001/07/18 09:12:38 itojun Exp $ */
/*
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in6.c,v 1.180 2014/12/02 19:36:58 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6.c,v 1.181 2015/02/20 22:13:48 rjs Exp $");
#include "opt_inet.h"
#include "opt_compat_netbsd.h"
@@ -2341,7 +2341,7 @@ in6_sin6_2_sin(struct sockaddr_in *sin,
/* Convert sockaddr_in to sockaddr_in6 in v4 mapped addr format. */
void
-in6_sin_2_v4mapsin6(struct sockaddr_in *sin, struct sockaddr_in6 *sin6)
+in6_sin_2_v4mapsin6(const struct sockaddr_in *sin, struct sockaddr_in6 *sin6)
{
memset(sin6, 0, sizeof(*sin6));
sin6->sin6_len = sizeof(struct sockaddr_in6);
Index: src/sys/netinet6/in6.h
diff -u src/sys/netinet6/in6.h:1.82 src/sys/netinet6/in6.h:1.83
--- src/sys/netinet6/in6.h:1.82 Tue Jan 20 21:27:36 2015
+++ src/sys/netinet6/in6.h Fri Feb 20 22:13:48 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: in6.h,v 1.82 2015/01/20 21:27:36 roy Exp $ */
+/* $NetBSD: in6.h,v 1.83 2015/02/20 22:13:48 rjs Exp $ */
/* $KAME: in6.h,v 1.83 2001/03/29 02:55:07 jinmei Exp $ */
/*
@@ -770,7 +770,7 @@ __BEGIN_DECLS
struct cmsghdr;
void in6_sin6_2_sin(struct sockaddr_in *, struct sockaddr_in6 *);
-void in6_sin_2_v4mapsin6(struct sockaddr_in *, struct sockaddr_in6 *);
+void in6_sin_2_v4mapsin6(const struct sockaddr_in *, struct sockaddr_in6 *);
void in6_sin6_2_sin_in_sock(struct sockaddr *);
void in6_sin_2_v4mapsin6_in_sock(struct sockaddr **);
