[src/trunk]: src/sys Really make SO_REUSEPORT and SO_REUSEADDR equivalent for...

[seanb <seanb%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/0e510456c8b1
branches:  trunk
changeset: 334000:0e510456c8b1
user:      seanb <seanb%NetBSD.org@localhost>
date:      Tue Nov 25 19:09:13 2014 +0000

description:
Really make SO_REUSEPORT and SO_REUSEADDR equivalent for multicast
sockets.  From FreeBSD.

diffstat:

 sys/netinet/in_pcb.c   |  6 +++---
 sys/netinet6/in6_pcb.c |  6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diffs (54 lines):

diff -r eb3f25872d16 -r 0e510456c8b1 sys/netinet/in_pcb.c
--- a/sys/netinet/in_pcb.c      Tue Nov 25 15:04:37 2014 +0000
+++ b/sys/netinet/in_pcb.c      Tue Nov 25 19:09:13 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: in_pcb.c,v 1.154 2014/11/25 15:04:37 seanb Exp $       */
+/*     $NetBSD: in_pcb.c,v 1.155 2014/11/25 19:09:13 seanb Exp $       */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -93,7 +93,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in_pcb.c,v 1.154 2014/11/25 15:04:37 seanb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in_pcb.c,v 1.155 2014/11/25 19:09:13 seanb Exp $");
 
 #include "opt_inet.h"
 #include "opt_ipsec.h"
@@ -310,7 +310,7 @@
                 * 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))
                        reuseport = SO_REUSEADDR|SO_REUSEPORT;
        } 
 
diff -r eb3f25872d16 -r 0e510456c8b1 sys/netinet6/in6_pcb.c
--- a/sys/netinet6/in6_pcb.c    Tue Nov 25 15:04:37 2014 +0000
+++ b/sys/netinet6/in6_pcb.c    Tue Nov 25 19:09:13 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: in6_pcb.c,v 1.133 2014/11/25 15:04:37 seanb Exp $      */
+/*     $NetBSD: in6_pcb.c,v 1.134 2014/11/25 19:09:13 seanb Exp $      */
 /*     $KAME: in6_pcb.c,v 1.84 2001/02/08 18:02:08 itojun Exp $        */
 
 /*
@@ -62,7 +62,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in6_pcb.c,v 1.133 2014/11/25 15:04:37 seanb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6_pcb.c,v 1.134 2014/11/25 19:09:13 seanb Exp $");
 
 #include "opt_inet.h"
 #include "opt_ipsec.h"
@@ -307,7 +307,7 @@
                 * 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))
                        reuseport = SO_REUSEADDR|SO_REUSEPORT;
        }