Changeset 3796:a3ee3b5bed2b in roaraudio

Timestamp:

05/07/10 17:49:13 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added support for shutdown()

Files:

• include/libroar/vio.h (modified) (1 diff)
• include/libroar/vio_ctl.h (modified) (2 diffs)
• libroar/vio.c (modified) (4 diffs)

include/libroar/vio.h

@@ -76 +76 @@
 // specal commands:
 int     roar_vio_accept  (struct roar_vio_calls * calls, struct roar_vio_calls * dst);
+int     roar_vio_shutdown(struct roar_vio_calls * vio,   int how);
 
 // converters:

include/libroar/vio_ctl.h

@@ -77 +77 @@
 #define ROAR_VIO_CTL_GET_NAME            (ROAR_VIO_CTL_GENERIC|ROAR_VIO_CTL_GET|0x0160) /* get name of VIO */
 #define ROAR_VIO_CTL_ACCEPT              (ROAR_VIO_CTL_GENERIC|0x0170) /* accept(), vio* */
+#define ROAR_VIO_CTL_SHUTDOWN            (ROAR_VIO_CTL_GENERIC|ROAR_VIO_CTL_SET|0x0174) /* shutdown(), int */
 
 // get or set data format used for read and write calls, see below
@@ -108 +109 @@
 #define ROAR_VIO_CTL_SET_VOLUME    (ROAR_VIO_CTL_DRIVER|ROAR_VIO_CTL_SET|0x10)
 
+// consts for ROAR_VIO_CTL_SHUTDOWN:
+#define ROAR_VIO_SHUTDOWN_READ        0x1
+#define ROAR_VIO_SHUTDOWN_WRITE       0x2
+#define ROAR_VIO_SHUTDOWN_LISTEN      0x4 /* like close() on listen sock but allow padding requests */
+                                          /* to be accept()ed                                       */
+#define ROAR_VIO_SHUTDOWN_RW       (ROAR_VIO_SHUTDOWN_READ|ROAR_VIO_SHUTDOWN_WRITE)
 
 // Data format used for read/write():

libroar/vio.c

@@ -182 +182 @@
 }
 
+int     roar_vio_shutdown(struct roar_vio_calls * vio,   int how) {
+ return roar_vio_ctl(vio, ROAR_VIO_CTL_SHUTDOWN, &how);
+}
+
 // converters:
 int     roar_vio_open_file     (struct roar_vio_calls * calls, char * filename, int flags, mode_t mode) {
@@ -339 +343 @@
 
 int     roar_vio_basic_ctl     (struct roar_vio_calls * vio, int cmd, void * data) {
- int fh;
+ int tmp;
+ int s_r = 0, s_w = 0;
 
  if ( vio == NULL || cmd == -1 )
@@ -369 +374 @@
    break;
   case ROAR_VIO_CTL_ACCEPT:
-    fh = accept(roar_vio_get_fh(vio), NULL, 0);
-    if ( fh == -1 )
+    tmp = accept(roar_vio_get_fh(vio), NULL, 0);
+    if ( tmp == -1 )
      return -1;
 
     // most proably a socket.
-    if ( roar_vio_open_fh_socket(data, fh) == -1 ) {
+    if ( roar_vio_open_fh_socket(data, tmp) == -1 ) {
 #ifdef ROAR_TARGET_WIN32
-     closesocket(fh);
-#else
-     close(fh);
+     closesocket(tmp);
+#else
+     close(tmp);
 #endif
      return -1;
@@ -384 +389 @@
 
     return 0;
+   break;
+  case ROAR_VIO_CTL_SHUTDOWN:
+    tmp = *(int*)data;
+
+    if ( tmp & ROAR_VIO_SHUTDOWN_READ ) {
+     s_r = 1;
+     tmp -= ROAR_VIO_SHUTDOWN_READ;
+    }
+
+    if ( tmp & ROAR_VIO_SHUTDOWN_WRITE ) {
+     s_w = 1;
+     tmp -= ROAR_VIO_SHUTDOWN_WRITE;
+    }
+
+    if ( tmp != 0 ) /* we currently only support R and W shutdowns */
+     return -1;
+
+    if ( s_r && s_w ) {
+     tmp = SHUT_RDWR;
+    } else if ( s_r ) {
+     tmp = SHUT_RD;
+    } else if ( s_w ) {
+     tmp = SHUT_WR;
+    } else {
+     return 0; // nothing to do.
+    }
+
+    return shutdown(roar_vio_get_fh(vio), tmp);
    break;
  }