svn commit: r220826 - stable/7/sys/netinet6

[Bjoern A. Zeeb]

Author: bz
Date: Tue Apr 19 08:35:07 2011
New Revision: 220826
URL: http://svn.freebsd.org/changeset/base/220826

Log:
  MFC r220463:
  
   Remove a check in udp6_send() that prevented v4-mapped v6 addresses from
   working.  We store v4 and v6 addresses as a union but for v4-mapped
   addresses only store the 32bits w/o the ::ffff: word.  That failed the
   check as for example 127.0.0.1 would be ::7f00:1 rather than ::ffff:7f00:1
   and the IN6_IS_ADDR_V4MAPPED() never worked here.  Given we can hardly get
   here with an unbound local address or invalid inp_vflags remove the check.
  
   Reported by:	tuexen
   Reviewed by:	tuexen

Modified:
  stable/7/sys/netinet6/udp6_usrreq.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/netinet6/udp6_usrreq.c
==============================================================================
--- stable/7/sys/netinet6/udp6_usrreq.c	Tue Apr 19 08:29:28 2011	(r220825)
+++ stable/7/sys/netinet6/udp6_usrreq.c	Tue Apr 19 08:35:07 2011	(r220826)
@@ -986,18 +986,6 @@ udp6_send(struct socket *so, int flags, 
 		if (hasv4addr) {
 			struct pr_usrreqs *pru;
 
-			if (!IN6_IS_ADDR_UNSPECIFIED(&inp->in6p_laddr) &&
-			    !IN6_IS_ADDR_V4MAPPED(&inp->in6p_laddr)) {
-				/*
-				 * When remote addr is IPv4-mapped address,
-				 * local addr should not be an IPv6 address;
-				 * since you cannot determine how to map IPv6
-				 * source address to IPv4.
-				 */
-				error = EINVAL;
-				goto out;
-			}
-
 			/*
 			 * XXXRW: We release UDP-layer locks before calling
 			 * udp_send() in order to avoid recursion.  However,
@@ -1021,7 +1009,6 @@ udp6_send(struct socket *so, int flags, 
 	mac_create_mbuf_from_inpcb(inp, m);
 #endif
 	error = udp6_output(inp, m, addr, control, td);
-out:
 	INP_WUNLOCK(inp);
 	INP_INFO_WUNLOCK(&udbinfo);
 	return (error);