Changeset 3128:949cdc22e981 in roaraudio

Timestamp:

01/14/10 09:32:35 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

started to move all the global values for listen sockets into a global struct

Location:

roard

Files:

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

roard/include/roard.h

@@ -135 +135 @@
 #ifdef ROAR_SUPPORT_LISTEN
 int g_listen_socket[ROAR_MAX_LISTEN_SOCKETS];
-int g_listen_proto[ROAR_MAX_LISTEN_SOCKETS];
+//int g_listen_proto[ROAR_MAX_LISTEN_SOCKETS];
+struct {
+ int socket;
+ int proto;
+ union {
+  void * vp;
+  int    si;
+  struct {
+   int                    dir;
+   struct roar_audio_info info;
+  } stpl;
+ } inst;
+} g_listen[ROAR_MAX_LISTEN_SOCKETS];
 #endif
 

roard/network.c

@@ -65 +65 @@
    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_proto[i]) == -1 )
+     if ( net_get_new_client(g_listen_socket[i], g_listen[i].proto) == -1 )
       return -1;
     }

roard/roard.c

@@ -269 +269 @@
  int i;
 
+ memset(g_listen, 0, sizeof(g_listen));
+
  for (i = 0; i < ROAR_MAX_LISTEN_SOCKETS; i++) {
   g_listen_socket[i] = -1;
-  g_listen_proto[i]  = ROAR_PROTO_ROARAUDIO;
+  g_listen[i].proto  = ROAR_PROTO_ROARAUDIO;
   server[i]          = NULL;
  }
@@ -303 +305 @@
    return -1;
 
-  g_listen_proto[sockid] = proto;
+  g_listen[sockid].proto = proto;
 
   ROAR_DBG("add_listen(*): proto=0x%.4x", proto);