Changeset 3802:958585351e28 in roaraudio for roard/roard.c

Timestamp:

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

Author:

phi

Branch:

default

Phase:

public

Message:

converted listen socket handling mostly to VIOs

File:

• roard/roard.c (modified) (7 diffs)

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