svn commit: r238224 - stable/9/sys/netinet6

[Bjoern A. Zeeb]

Author: bz
Date: Sun Jul  8 09:49:01 2012
New Revision: 238224
URL: http://svn.freebsd.org/changeset/base/238224

Log:
  MFC r235916:
  
     Introduce in6_getscope() to allow more effective checksum
     computations without the need to copy the address to clear the
     scope.
  
  Approved by:	re

Modified:
  stable/9/sys/netinet6/scope6.c
  stable/9/sys/netinet6/scope6_var.h
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/netinet6/scope6.c
==============================================================================
--- stable/9/sys/netinet6/scope6.c	Sun Jul  8 09:06:25 2012	(r238223)
+++ stable/9/sys/netinet6/scope6.c	Sun Jul  8 09:49:01 2012	(r238224)
@@ -494,3 +494,16 @@ in6_clearscope(struct in6_addr *in6)
 
 	return (modified);
 }
+
+/*
+ * Return the scope identifier or zero.
+ */
+uint16_t
+in6_getscope(struct in6_addr *in6)
+{
+
+	if (IN6_IS_SCOPE_LINKLOCAL(in6) || IN6_IS_ADDR_MC_INTFACELOCAL(in6))
+		return (in6->s6_addr16[1]);
+
+	return (0);
+}

Modified: stable/9/sys/netinet6/scope6_var.h
==============================================================================
--- stable/9/sys/netinet6/scope6_var.h	Sun Jul  8 09:06:25 2012	(r238223)
+++ stable/9/sys/netinet6/scope6_var.h	Sun Jul  8 09:49:01 2012	(r238224)
@@ -54,6 +54,7 @@ int	sa6_embedscope __P((struct sockaddr_
 int	sa6_recoverscope __P((struct sockaddr_in6 *));
 int	in6_setscope __P((struct in6_addr *, struct ifnet *, u_int32_t *));
 int	in6_clearscope __P((struct in6_addr *));
+uint16_t in6_getscope(struct in6_addr *);
 #endif /* _KERNEL */
 
 #endif /* _NETINET6_SCOPE6_VAR_H_ */