Changeset 3129:70bda82a9984 in roaraudio
- Timestamp:
- 01/14/10 09:39:12 (14 years ago)
- Branch:
- default
- Phase:
- public
- Location:
- roard
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
roard/include/roard.h
r3128 r3129 134 134 135 135 #ifdef ROAR_SUPPORT_LISTEN 136 int g_listen_socket[ROAR_MAX_LISTEN_SOCKETS];136 //int g_listen_socket[ROAR_MAX_LISTEN_SOCKETS]; 137 137 //int g_listen_proto[ROAR_MAX_LISTEN_SOCKETS]; 138 138 struct { -
roard/lib.c
r2530 r3129 53 53 #ifdef ROAR_SUPPORT_LISTEN 54 54 for (i = 0; i < ROAR_MAX_LISTEN_SOCKETS; i++) 55 if ( g_listen _socket[i]!= -1 )56 close(g_listen _socket[i]); // listen socket.55 if ( g_listen[i].socket != -1 ) 56 close(g_listen[i].socket); // listen socket. 57 57 #endif 58 58 -
roard/loop.c
r2947 r3129 65 65 have_listen = 0; 66 66 for (i = 0; i < ROAR_MAX_LISTEN_SOCKETS; i++) { 67 if ( g_listen _socket[i]!= -1 ) {67 if ( g_listen[i].socket != -1 ) { 68 68 have_listen = 1; 69 69 break; -
roard/network.c
r3128 r3129 46 46 47 47 for (i = 0; i < ROAR_MAX_LISTEN_SOCKETS; i++) { 48 if ( g_listen _socket[i]!= -1 ) {49 if ( g_listen _socket[i]> max_fh )50 max_fh = g_listen _socket[i];48 if ( g_listen[i].socket != -1 ) { 49 if ( g_listen[i].socket > max_fh ) 50 max_fh = g_listen[i].socket; 51 51 52 FD_SET(g_listen _socket[i], &sl);52 FD_SET(g_listen[i].socket, &sl); 53 53 } 54 54 } … … 63 63 ROAR_DBG("net_check_listen(void): We have a connection!"); 64 64 for (i = 0; i < ROAR_MAX_LISTEN_SOCKETS; i++) { 65 if ( g_listen _socket[i]!= -1 ) {66 if ( FD_ISSET(g_listen _socket[i], &sl) ) {67 if ( net_get_new_client(g_listen _socket[i], g_listen[i].proto) == -1 )65 if ( g_listen[i].socket != -1 ) { 66 if ( FD_ISSET(g_listen[i].socket, &sl) ) { 67 if ( net_get_new_client(g_listen[i].socket, g_listen[i].proto) == -1 ) 68 68 return -1; 69 69 } -
roard/roard.c
r3128 r3129 272 272 273 273 for (i = 0; i < ROAR_MAX_LISTEN_SOCKETS; i++) { 274 g_listen _socket[i]= -1;274 g_listen[i].socket = -1; 275 275 g_listen[i].proto = ROAR_PROTO_ROARAUDIO; 276 276 server[i] = NULL; … … 296 296 if ( *addr != 0 ) { 297 297 for (i = 0; i < ROAR_MAX_LISTEN_SOCKETS; i++) { 298 if ( g_listen _socket[i]== -1 ) {298 if ( g_listen[i].socket == -1 ) { 299 299 sockid = i; 300 300 break; … … 309 309 ROAR_DBG("add_listen(*): proto=0x%.4x", proto); 310 310 311 if ( (g_listen _socket[sockid]= roar_socket_listen(sock_type, addr, port)) == -1 ) {311 if ( (g_listen[sockid].socket = roar_socket_listen(sock_type, addr, port)) == -1 ) { 312 312 #ifdef ROAR_HAVE_UNIX 313 313 if ( *addr == '/' ) { … … 322 322 } else { 323 323 unlink(addr); 324 if ( (g_listen _socket[sockid]= roar_socket_listen(sock_type, addr, port)) == -1 ) {324 if ( (g_listen[sockid].socket = roar_socket_listen(sock_type, addr, port)) == -1 ) { 325 325 ROAR_ERR("Can not open listen socket: %s", strerror(errno)); 326 326 return 1; … … 1665 1665 #ifdef ROAR_SUPPORT_LISTEN 1666 1666 for (i = 0; i < ROAR_MAX_LISTEN_SOCKETS; i++) { 1667 if ( g_listen _socket[i]!= -1 ) {1667 if ( g_listen[i].socket != -1 ) { 1668 1668 #ifdef ROAR_HAVE_IO_POSIX 1669 close(g_listen _socket[i]);1669 close(g_listen[i].socket); 1670 1670 #endif // #else is useless because we are in void context. 1671 1671 1672 g_listen _socket[i]= -1;1672 g_listen[i].socket = -1; 1673 1673 1674 1674 #ifdef ROAR_HAVE_UNIX
Note: See TracChangeset
for help on using the changeset viewer.