Author: bz
Date: Sat Apr 9 02:22:49 2011
New Revision: 220463
URL: http://svn.freebsd.org/changeset/base/220463
Log:
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
MFC after: 3 days
Modified:
head/sys/netinet6/udp6_usrreq.c
Modified: head/sys/netinet6/udp6_usrreq.c
==============================================================================
--- head/sys/netinet6/udp6_usrreq.c Sat Apr 9 01:29:46 2011
(r220462)
+++ head/sys/netinet6/udp6_usrreq.c Sat Apr 9 02:22:49 2011
(r220463)
@@ -1045,18 +1045,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,
@@ -1081,7 +1069,6 @@ udp6_send(struct socket *so, int flags,
#endif
error = udp6_output(inp, m, addr, control, td);
#ifdef INET
-out:
#endif
INP_WUNLOCK(inp);
INP_INFO_WUNLOCK(&V_udbinfo);
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
