option for receiving OOB data in-line

SCCS-vsn: sys/kern/uipc_socket.c 6.26
SCCS-vsn: sys/sys/socket.h 6.10

diff --git a/usr/src/sys/kern/uipc_socket.c b/usr/src/sys/kern/uipc_socket.c
index 937dfa1..0b49ec6 100644 (file)
--- a/usr/src/sys/kern/uipc_socket.c
+++ b/usr/src/sys/kern/uipc_socket.c
@@ -3,7 +3,7 @@
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *

- *     @(#)uipc_socket.c       6.25 (Berkeley) %G%
+ *     @(#)uipc_socket.c       6.26 (Berkeley) %G%

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


@@ -649,6 +649,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_OOBINLINE:

                        if (m == NULL || m->m_len < sizeof (int)) {
                                error = EINVAL;
                                goto bad;
                        if (m == NULL || m->m_len < sizeof (int)) {
                                error = EINVAL;
                                goto bad;


@@ -738,6 +739,7 @@ sogetopt(so, level, optname, mp)
                case SO_KEEPALIVE:
                case SO_REUSEADDR:
                case SO_BROADCAST:
                case SO_KEEPALIVE:
                case SO_REUSEADDR:
                case SO_BROADCAST:

+               case SO_OOBINLINE:

                        *mtod(m, int *) = so->so_options & optname;
                        break;
 
                        *mtod(m, int *) = so->so_options & optname;
                        break;
 

diff --git a/usr/src/sys/sys/socket.h b/usr/src/sys/sys/socket.h
index 758e23f..2e4843b 100644 (file)
--- a/usr/src/sys/sys/socket.h
+++ b/usr/src/sys/sys/socket.h
@@ -3,7 +3,7 @@
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *

- *     @(#)socket.h    6.9 (Berkeley) %G%
+ *     @(#)socket.h    6.10 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -22,14 +22,15 @@
 /*
  * Option flags per-socket.
  */
 /*
  * Option flags per-socket.
  */

-#define        SO_DEBUG        0x01            /* turn on debugging info recording */
-#define        SO_ACCEPTCONN   0x02            /* socket has had listen() */
-#define        SO_REUSEADDR    0x04            /* allow local address reuse */
-#define        SO_KEEPALIVE    0x08            /* keep connections alive */
-#define        SO_DONTROUTE    0x10            /* just use interface addresses */
-#define        SO_BROADCAST    0x20            /* permit sending of broadcast msgs */
-#define        SO_USELOOPBACK  0x40            /* bypass hardware when possible */
-#define        SO_LINGER       0x80            /* linger on close if data present */
+#define        SO_DEBUG        0x0001          /* turn on debugging info recording */
+#define        SO_ACCEPTCONN   0x0002          /* socket has had listen() */
+#define        SO_REUSEADDR    0x0004          /* allow local address reuse */
+#define        SO_KEEPALIVE    0x0008          /* keep connections alive */
+#define        SO_DONTROUTE    0x0010          /* just use interface addresses */
+#define        SO_BROADCAST    0x0020          /* permit sending of broadcast msgs */
+#define        SO_USELOOPBACK  0x0040          /* bypass hardware when possible */
+#define        SO_LINGER       0x0080          /* linger on close if data present */
+#define        SO_OOBINLINE    0x0100          /* leave received OOB data in line */

 
 /*
  * Additional options, not kept in so_options.
 
 /*
  * Additional options, not kept in so_options.