svn commit: r254778 - in stable/9/sys: netinet netinet6

[Mikolaj Golub]

Author: trociny
Date: Sat Aug 24 12:10:11 2013
New Revision: 254778
URL: http://svnweb.freebsd.org/changeset/base/254778

Log:
  MFC r253282:
  
  A complete duplication of binding should be allowed if on both new and
  duplicated sockets a multicast address is bound and either
  SO_REUSEPORT or SO_REUSEADDR is set.
  
  But actually it works for the following combinations:
  
    * SO_REUSEPORT is set for the fist socket and SO_REUSEPORT for the new;
    * SO_REUSEADDR is set for the fist socket and SO_REUSEADDR for the new;
    * SO_REUSEPORT is set for the fist socket and SO_REUSEADDR for the new;
  
  and fails for this:
  
    * SO_REUSEADDR is set for the fist socket and SO_REUSEPORT for the new.
  
  Fix the last case.
  
  PR:		179901

Modified:
  stable/9/sys/netinet/in_pcb.c
  stable/9/sys/netinet6/in6_pcb.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/netinet/in_pcb.c
==============================================================================
--- stable/9/sys/netinet/in_pcb.c	Sat Aug 24 12:03:24 2013	(r254777)
+++ stable/9/sys/netinet/in_pcb.c	Sat Aug 24 12:10:11 2013	(r254778)
@@ -553,7 +553,7 @@ in_pcbbind_setup(struct inpcb *inp, stru
 			 * and a multicast address is bound on both
 			 * new and duplicated sockets.
 			 */
-			if (so->so_options & SO_REUSEADDR)
+			if ((so->so_options & (SO_REUSEADDR|SO_REUSEPORT)) != 0)
 				reuseport = SO_REUSEADDR|SO_REUSEPORT;
 		} else if (sin->sin_addr.s_addr != INADDR_ANY) {
 			sin->sin_port = 0;		/* yech... */

Modified: stable/9/sys/netinet6/in6_pcb.c
==============================================================================
--- stable/9/sys/netinet6/in6_pcb.c	Sat Aug 24 12:03:24 2013	(r254777)
+++ stable/9/sys/netinet6/in6_pcb.c	Sat Aug 24 12:10:11 2013	(r254778)
@@ -158,7 +158,7 @@ in6_pcbbind(register struct inpcb *inp, 
 			 * and a multicast address is bound on both
 			 * new and duplicated sockets.
 			 */
-			if (so->so_options & SO_REUSEADDR)
+			if ((so->so_options & (SO_REUSEADDR|SO_REUSEPORT)) != 0)
 				reuseport = SO_REUSEADDR|SO_REUSEPORT;
 		} else if (!IN6_IS_ADDR_UNSPECIFIED(&sin6->sin6_addr)) {
 			struct ifaddr *ifa;