kern/179901: commit references a PR

[dfilter service]

The following reply was made to PR kern/179901; it has been noted by GNATS.

From: dfilter at FreeBSD.ORG (dfilter service)
To: bug-followup at FreeBSD.org
Cc:  
Subject: Re: kern/179901: commit references a PR
Date: Fri, 12 Jul 2013 19:08:41 +0000 (UTC)

 Author: trociny
 Date: Fri Jul 12 19:08:33 2013
 New Revision: 253282
 URL: http://svnweb.freebsd.org/changeset/base/253282
 
 Log:
   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
   MFC after:	1 month
 
 Modified:
   head/sys/netinet/in_pcb.c
   head/sys/netinet6/in6_pcb.c
 
 Modified: head/sys/netinet/in_pcb.c
 ==============================================================================
 --- head/sys/netinet/in_pcb.c	Fri Jul 12 18:54:47 2013	(r253281)
 +++ head/sys/netinet/in_pcb.c	Fri Jul 12 19:08:33 2013	(r253282)
 @@ -554,7 +554,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: head/sys/netinet6/in6_pcb.c
 ==============================================================================
 --- head/sys/netinet6/in6_pcb.c	Fri Jul 12 18:54:47 2013	(r253281)
 +++ head/sys/netinet6/in6_pcb.c	Fri Jul 12 19:08:33 2013	(r253282)
 @@ -156,7 +156,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;
 _______________________________________________
 svn-src-all at freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe at freebsd.org"