Author: deischen
Date: Sat Jan 8 22:33:46 2011
New Revision: 217169
URL: http://svn.freebsd.org/changeset/base/217169
Log:
Make sure to always do source address selection on
an unbound socket, regardless of any multicast options.
If an address is specified via a multicast option, then
let it override normal the source address selection.
This fixes a bug where source address selection was
not being performed when multicast options were present
but without an interface being specified.
Reviewed by: bz
MFC after: 1 day
Modified:
head/sys/netinet/in_pcb.c
Modified: head/sys/netinet/in_pcb.c
==============================================================================
--- head/sys/netinet/in_pcb.c Sat Jan 8 22:08:23 2011 (r217168)
+++ head/sys/netinet/in_pcb.c Sat Jan 8 22:33:46 2011 (r217169)
@@ -874,9 +874,10 @@ in_pcbconnect_setup(struct inpcb *inp, s
}
}
if (laddr.s_addr == INADDR_ANY) {
+ error = in_pcbladdr(inp, &faddr, &laddr, cred);
/*
* If the destination address is multicast and an outgoing
- * interface has been set as a multicast option, use the
+ * interface has been set as a multicast option, prefer the
* address of that interface as our source address.
*/
if (IN_MULTICAST(ntohl(faddr.s_addr)) &&
@@ -893,16 +894,16 @@ in_pcbconnect_setup(struct inpcb *inp, s
break;
if (ia == NULL) {
IN_IFADDR_RUNLOCK();
- return (EADDRNOTAVAIL);
+ error = EADDRNOTAVAIL;
+ } else {
+ laddr = ia->ia_addr.sin_addr;
+ IN_IFADDR_RUNLOCK();
+ error = 0;
}
- laddr = ia->ia_addr.sin_addr;
- IN_IFADDR_RUNLOCK();
}
- } else {
- error = in_pcbladdr(inp, &faddr, &laddr, cred);
- if (error)
- return (error);
}
+ if (error)
+ return (error);
}
oinp = in_pcblookup_hash(inp->inp_pcbinfo, faddr, fport, laddr, lport,
0, NULL);
_______________________________________________
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"
