multicast bugfix from arc@sgi.com

SCCS-vsn: sys/netinet/udp_usrreq.c 7.25
SCCS-vsn: sys/kern/uipc_socket.c 7.36

diff --git a/usr/src/sys/kern/uipc_socket.c b/usr/src/sys/kern/uipc_socket.c
index 4cc83bf..f55bbe2 100644 (file)
--- a/usr/src/sys/kern/uipc_socket.c
+++ b/usr/src/sys/kern/uipc_socket.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)uipc_socket.c       7.35 (Berkeley) %G%
+ *     @(#)uipc_socket.c       7.36 (Berkeley) %G%

  */
 
 #include "param.h"
  */
 
 #include "param.h"


@@ -789,6 +789,7 @@ sosetopt(so, level, optname, m0)
                case SO_USELOOPBACK:
                case SO_BROADCAST:
                case SO_REUSEADDR:
                case SO_USELOOPBACK:
                case SO_BROADCAST:
                case SO_REUSEADDR:

+               case SO_REUSEPORT:

                case SO_OOBINLINE:
                        if (m == NULL || m->m_len < sizeof (int)) {
                                error = EINVAL;
                case SO_OOBINLINE:
                        if (m == NULL || m->m_len < sizeof (int)) {
                                error = EINVAL;


@@ -904,6 +905,7 @@ sogetopt(so, level, optname, mp)
                case SO_DEBUG:
                case SO_KEEPALIVE:
                case SO_REUSEADDR:
                case SO_DEBUG:
                case SO_KEEPALIVE:
                case SO_REUSEADDR:

+               case SO_REUSEPORT:

                case SO_BROADCAST:
                case SO_OOBINLINE:
                        *mtod(m, int *) = so->so_options & optname;
                case SO_BROADCAST:
                case SO_OOBINLINE:
                        *mtod(m, int *) = so->so_options & optname;

diff --git a/usr/src/sys/netinet/udp_usrreq.c b/usr/src/sys/netinet/udp_usrreq.c
index d0c648a..bbcdaa6 100644 (file)
--- a/usr/src/sys/netinet/udp_usrreq.c
+++ b/usr/src/sys/netinet/udp_usrreq.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)udp_usrreq.c        7.24 (Berkeley) %G%
+ *     @(#)udp_usrreq.c        7.25 (Berkeley) %G%

  */
 
 #include "param.h"
  */
 
 #include "param.h"


@@ -182,13 +182,13 @@ udp_input(m, iphlen)
                        last = inp->inp_socket;
                        /*
                         * Don't look for additional matches if this one
                        last = inp->inp_socket;
                        /*
                         * Don't look for additional matches if this one

-                        * does not have the SO_REUSEADDR socket option set.
+                        * does not have the SO_REUSEPORT socket option set.

                         * This heuristic avoids searching through all pcbs
                         * in the common case of a non-shared port.  It
                         * assumes that an application will never clear
                         * This heuristic avoids searching through all pcbs
                         * in the common case of a non-shared port.  It
                         * assumes that an application will never clear

-                        * the SO_REUSEADDR option after setting it.
+                        * the SO_REUSEPORT option after setting it.

                         */
                         */

-                       if ((last->so_options & SO_REUSEADDR) == 0)
+                       if ((last->so_options & SO_REUSEPORT) == 0)

                                break;
                }
 
                                break;
                }