Changeset 3802:958585351e28 in roaraudio

Timestamp:

05/07/10 23:15:25 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

converted listen socket handling mostly to VIOs

Location:

roard

Files:

• include/roard.h (modified) (1 diff)
• lib.c (modified) (2 diffs)
• loop.c (modified) (1 diff)
• network.c (modified) (3 diffs)
• req.c (modified) (1 diff)
• roard.c (modified) (7 diffs)

roard/include/roard.h

@@ -146 +146 @@
 #ifdef ROAR_SUPPORT_LISTEN
 struct roard_listen {
- int socket;
+ int used;
+ struct roar_vio_calls sock;
  int proto;
  union {

roard/lib.c

@@ -28 +28 @@
 int lib_run_bg(char * cmd, int infh, int outfh, int errfh, int * closefh, int lenclose) {
 #ifdef ROAR_HAVE_FORK
- pid_t child = fork();
+ pid_t child;
  int fh[3] = {-1, -1, -1};
  int i;
+
+ ROAR_WARN("lib_run_bg(cmd='%s', ...): This function should never be called. Contact devels.");
+
+ child = fork();
 
  if ( child == -1 ) {
@@ -54 +58 @@
 #ifdef ROAR_SUPPORT_LISTEN
  for (i = 0; i < ROAR_MAX_LISTEN_SOCKETS; i++)
-  if ( g_listen[i].socket != -1 )
-   close(g_listen[i].socket); // listen socket.
+  if ( g_listen[i].used )
+   roar_vio_close(&(g_listen[i].sock)); // listen socket.
 #endif
 

roard/loop.c

@@ -66 +66 @@
   have_listen = 0;
   for (i = 0; i < ROAR_MAX_LISTEN_SOCKETS; i++) {
-   if ( g_listen[i].socket != -1 ) {
+   if ( g_listen[i].used ) {
     have_listen = 1;
     break;

roard/network.c

@@ -37 +37 @@
 
 int net_check_listen  (void) {
-#ifdef _CAN_OPERATE
- int r;
- fd_set sl;
- struct timeval tv;
+ struct roar_vio_selecttv rtv;
+ struct roar_vio_select   sv[ROAR_MAX_LISTEN_SOCKETS];
+ size_t num = 0;
+ ssize_t ret;
  int i;
- int max_fh = -1;
-
- FD_ZERO(&sl);
 
  for (i = 0; i < ROAR_MAX_LISTEN_SOCKETS; i++) {
-  if ( g_listen[i].socket != -1 ) {
-   if ( g_listen[i].socket > max_fh )
-    max_fh = g_listen[i].socket;
-
-   FD_SET(g_listen[i].socket, &sl);
+  if ( g_listen[i].used ) {
+   ROAR_VIO_SELECT_SETVIO(&(sv[num]), &(g_listen[i].sock), ROAR_VIO_SELECT_READ);
+   sv[num].ud.si = i;
+   num++;
   }
  }
 
- if ( max_fh == -1 )
+ if ( num == 0 )
   return 0;
 
- tv.tv_sec  = 0;
- tv.tv_usec = 1;
+ rtv.sec  = 0;
+ rtv.nsec = 1000;
 
- if ((r = select(max_fh + 1, &sl, NULL, NULL, &tv)) > 0) {
-  ROAR_DBG("net_check_listen(void): We have a connection!");
-  for (i = 0; i < ROAR_MAX_LISTEN_SOCKETS; i++) {
-   if ( g_listen[i].socket != -1 ) {
-    if ( FD_ISSET(g_listen[i].socket, &sl) ) {
-     if ( net_get_new_client(&(g_listen[i])) == -1 )
-      return -1;
-    }
+ if ( (ret = roar_vio_select(sv, num, &rtv, NULL)) > 0 ) {
+  for (i = 0; i < num; i++) {
+   if ( sv[i].eventsa & ROAR_VIO_SELECT_READ ) {
+    if ( net_get_new_client(&(g_listen[sv[i].ud.si])) == -1 )
+     return -1;
    }
   }
  }
 
- return r;
-#else
- return -1;
-#endif
+ return ret;
 }
 
-#ifdef _CAN_OPERATE
 int net_get_new_client (struct roard_listen * lsock) {
  int fh;
  int client;
+ int socket;
  struct roar_client * c;
  struct roar_vio_calls    vio;
@@ -88 +78 @@
  socklen_t                addrlen = sizeof(addr);
 
- fh = accept(lsock->socket, (struct sockaddr*)&addr, &addrlen);
+ roar_vio_ctl(&(lsock->sock), ROAR_VIO_CTL_GET_FH, &socket);
+
+ fh = accept(socket, (struct sockaddr*)&addr, &addrlen);
 
  ROAR_DBG("net_get_new_client(void): fh = %i", fh);
@@ -180 +172 @@
  return 0;
 }
-#endif
 
 #endif

roard/req.c

@@ -351 +351 @@
   }
 
-  lsock->socket = fh;
+  roar_vio_open_fh_socket(&(lsock->sock), fh);
+  lsock->used   = 1;
   lsock->proto  = d[2];
  } else {

roard/roard.c

@@ -307 +307 @@
 
  for (i = 0; i < ROAR_MAX_LISTEN_SOCKETS; i++) {
-  g_listen[i].socket = -1;
   g_listen[i].proto  = ROAR_PROTO_ROARAUDIO;
   server[i]          = NULL;
@@ -322 +321 @@
 
  for (i = 0; i < ROAR_MAX_LISTEN_SOCKETS; i++) {
-  if ( g_listen[i].socket == -1 ) {
+  if ( ! g_listen[i].used ) {
    server[i] = NULL;
    *sock = &(g_listen[i]);
@@ -352 +351 @@
  if ( *addr != 0 ) {
   for (i = 0; i < ROAR_MAX_LISTEN_SOCKETS; i++) {
-   if ( g_listen[i].socket == -1 ) {
+   if ( ! g_listen[i].used ) {
     sockid = i;
     break;
@@ -365 +364 @@
   ROAR_DBG("add_listen(*): proto=0x%.4x", proto);
 
-  if ( (g_listen[sockid].socket = roar_socket_listen(sock_type, addr, port)) == -1 ) {
+  if ( roar_vio_open_socket_listen(&(g_listen[sockid].sock), sock_type, addr, port) == -1 ) {
 #ifdef ROAR_HAVE_UNIX
    if ( *addr == '/' ) {
@@ -378 +377 @@
     } else {
      unlink(addr);
-     if ( (g_listen[sockid].socket = roar_socket_listen(sock_type, addr, port)) == -1 ) {
+     if ( roar_vio_open_socket_listen(&(g_listen[sockid].sock), sock_type, addr, port) == -1 ) {
       ROAR_ERR("Can not open listen socket: %s", strerror(errno));
       return 1;
@@ -455 +454 @@
  }
 
- server[sockid] = addr;
+ g_listen[sockid].used = 1;
+ server[sockid]        = addr;
+
  return 0;
 }
@@ -1859 +1860 @@
 #ifdef ROAR_SUPPORT_LISTEN
  for (i = 0; i < ROAR_MAX_LISTEN_SOCKETS; i++) {
-  if ( g_listen[i].socket != -1 ) {
-#ifdef ROAR_HAVE_IO_POSIX
-   close(g_listen[i].socket);
-#endif // #else is useless because we are in void context.
-
-   g_listen[i].socket = -1;
+  if ( g_listen[i].used  ) {
+   roar_vio_close(&(g_listen[i].sock));
+
+   g_listen[i].used = 0;
 
 #ifdef ROAR_HAVE_UNIX