Changeset 3802:958585351e28 in roaraudio for roard/roard.c
- Timestamp:
- 05/07/10 23:15:25 (14 years ago)
- Branch:
- default
- Phase:
- public
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
roard/roard.c
r3760 r3802 307 307 308 308 for (i = 0; i < ROAR_MAX_LISTEN_SOCKETS; i++) { 309 g_listen[i].socket = -1;310 309 g_listen[i].proto = ROAR_PROTO_ROARAUDIO; 311 310 server[i] = NULL; … … 322 321 323 322 for (i = 0; i < ROAR_MAX_LISTEN_SOCKETS; i++) { 324 if ( g_listen[i].socket == -1) {323 if ( ! g_listen[i].used ) { 325 324 server[i] = NULL; 326 325 *sock = &(g_listen[i]); … … 352 351 if ( *addr != 0 ) { 353 352 for (i = 0; i < ROAR_MAX_LISTEN_SOCKETS; i++) { 354 if ( g_listen[i].socket == -1) {353 if ( ! g_listen[i].used ) { 355 354 sockid = i; 356 355 break; … … 365 364 ROAR_DBG("add_listen(*): proto=0x%.4x", proto); 366 365 367 if ( (g_listen[sockid].socket = roar_socket_listen(sock_type, addr, port)) == -1 ) {366 if ( roar_vio_open_socket_listen(&(g_listen[sockid].sock), sock_type, addr, port) == -1 ) { 368 367 #ifdef ROAR_HAVE_UNIX 369 368 if ( *addr == '/' ) { … … 378 377 } else { 379 378 unlink(addr); 380 if ( (g_listen[sockid].socket = roar_socket_listen(sock_type, addr, port)) == -1 ) {379 if ( roar_vio_open_socket_listen(&(g_listen[sockid].sock), sock_type, addr, port) == -1 ) { 381 380 ROAR_ERR("Can not open listen socket: %s", strerror(errno)); 382 381 return 1; … … 455 454 } 456 455 457 server[sockid] = addr; 456 g_listen[sockid].used = 1; 457 server[sockid] = addr; 458 458 459 return 0; 459 460 } … … 1859 1860 #ifdef ROAR_SUPPORT_LISTEN 1860 1861 for (i = 0; i < ROAR_MAX_LISTEN_SOCKETS; i++) { 1861 if ( g_listen[i].socket != -1 ) { 1862 #ifdef ROAR_HAVE_IO_POSIX 1863 close(g_listen[i].socket); 1864 #endif // #else is useless because we are in void context. 1865 1866 g_listen[i].socket = -1; 1862 if ( g_listen[i].used ) { 1863 roar_vio_close(&(g_listen[i].sock)); 1864 1865 g_listen[i].used = 0; 1867 1866 1868 1867 #ifdef ROAR_HAVE_UNIX
Note: See TracChangeset
for help on using the changeset viewer.