Changeset 3129:70bda82a9984 in roaraudio

Timestamp:

01/14/10 09:39:12 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

replaced g_listen_socket

Location:

roard

Files:

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

roard/include/roard.h

@@ -134 +134 @@
 
 #ifdef ROAR_SUPPORT_LISTEN
-int g_listen_socket[ROAR_MAX_LISTEN_SOCKETS];
+//int g_listen_socket[ROAR_MAX_LISTEN_SOCKETS];
 //int g_listen_proto[ROAR_MAX_LISTEN_SOCKETS];
 struct {

roard/lib.c

@@ -53 +53 @@
 #ifdef ROAR_SUPPORT_LISTEN
  for (i = 0; i < ROAR_MAX_LISTEN_SOCKETS; i++)
-  if ( g_listen_socket[i] != -1 )
-   close(g_listen_socket[i]); // listen socket.
+  if ( g_listen[i].socket != -1 )
+   close(g_listen[i].socket); // listen socket.
 #endif
 

roard/loop.c

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

roard/network.c

@@ -46 +46 @@
 
  for (i = 0; i < ROAR_MAX_LISTEN_SOCKETS; i++) {
-  if ( g_listen_socket[i] != -1 ) {
-   if ( g_listen_socket[i] > max_fh )
-    max_fh = g_listen_socket[i];
+  if ( g_listen[i].socket != -1 ) {
+   if ( g_listen[i].socket > max_fh )
+    max_fh = g_listen[i].socket;
 
-   FD_SET(g_listen_socket[i], &sl);
+   FD_SET(g_listen[i].socket, &sl);
   }
  }
@@ -63 +63 @@
   ROAR_DBG("net_check_listen(void): We have a connection!");
   for (i = 0; i < ROAR_MAX_LISTEN_SOCKETS; i++) {
-   if ( g_listen_socket[i] != -1 ) {
-    if ( FD_ISSET(g_listen_socket[i], &sl) ) {
-     if ( net_get_new_client(g_listen_socket[i], g_listen[i].proto) == -1 )
+   if ( g_listen[i].socket != -1 ) {
+    if ( FD_ISSET(g_listen[i].socket, &sl) ) {
+     if ( net_get_new_client(g_listen[i].socket, g_listen[i].proto) == -1 )
       return -1;
     }

roard/roard.c

@@ -272 +272 @@
 
  for (i = 0; i < ROAR_MAX_LISTEN_SOCKETS; i++) {
-  g_listen_socket[i] = -1;
+  g_listen[i].socket = -1;
   g_listen[i].proto  = ROAR_PROTO_ROARAUDIO;
   server[i]          = NULL;
@@ -296 +296 @@
  if ( *addr != 0 ) {
   for (i = 0; i < ROAR_MAX_LISTEN_SOCKETS; i++) {
-   if ( g_listen_socket[i] == -1 ) {
+   if ( g_listen[i].socket == -1 ) {
     sockid = i;
     break;
@@ -309 +309 @@
   ROAR_DBG("add_listen(*): proto=0x%.4x", proto);
 
-  if ( (g_listen_socket[sockid] = roar_socket_listen(sock_type, addr, port)) == -1 ) {
+  if ( (g_listen[sockid].socket = roar_socket_listen(sock_type, addr, port)) == -1 ) {
 #ifdef ROAR_HAVE_UNIX
    if ( *addr == '/' ) {
@@ -322 +322 @@
     } else {
      unlink(addr);
-     if ( (g_listen_socket[sockid] = roar_socket_listen(sock_type, addr, port)) == -1 ) {
+     if ( (g_listen[sockid].socket = roar_socket_listen(sock_type, addr, port)) == -1 ) {
       ROAR_ERR("Can not open listen socket: %s", strerror(errno));
       return 1;
@@ -1665 +1665 @@
 #ifdef ROAR_SUPPORT_LISTEN
  for (i = 0; i < ROAR_MAX_LISTEN_SOCKETS; i++) {
-  if ( g_listen_socket[i] != -1 ) {
+  if ( g_listen[i].socket != -1 ) {
 #ifdef ROAR_HAVE_IO_POSIX
-   close(g_listen_socket[i]);
+   close(g_listen[i].socket);
 #endif // #else is useless because we are in void context.
 
-   g_listen_socket[i] = -1;
+   g_listen[i].socket = -1;
 
 #ifdef ROAR_HAVE_UNIX