Changeset 1359:6a59a3cbc91a in roaraudio
- Timestamp:
- 03/24/09 17:21:51 (15 years ago)
- Branch:
- default
- Phase:
- public
- Location:
- libroar
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
libroar/simple.c
r1187 r1359 146 146 147 147 switch (socket_addr.sin_family) { 148 #ifdef ROAR_HAVE_UNIX 148 149 case AF_UNIX: type = ROAR_SOCKET_TYPE_UNIX; break; 150 #endif 151 #ifdef ROAR_HAVE_IPV4 149 152 case AF_INET: type = ROAR_SOCKET_TYPE_INET; break; 153 #endif 154 #ifdef ROAR_HAVE_LIBDNET 150 155 case AF_DECnet: type = ROAR_SOCKET_TYPE_DECNET; break; 156 #endif 151 157 default: 152 158 return -1; -
libroar/socket.c
r1154 r1359 39 39 40 40 int roar_socket_new_tcp (void) { 41 #ifdef ROAR_HAVE_IPV4 42 int fh; 41 43 int fh; 42 44 #ifndef ROAR_TARGET_WIN32 … … 57 59 58 60 return fh; 61 #else 62 return -1; 63 #endif 59 64 } 60 65 61 66 int roar_socket_new_udp (void) { 67 #ifdef ROAR_HAVE_IPV4 62 68 int fh; 63 69 #ifndef ROAR_TARGET_WIN32 … … 72 78 73 79 return fh; 80 #else 81 return -1; 82 #endif 74 83 } 75 84 … … 441 450 #endif 442 451 union { 452 struct sockaddr sa; 453 #ifdef ROAR_HAVE_IPV4 443 454 struct sockaddr_in in; 455 #endif 444 456 #ifdef ROAR_HAVE_UNIX 445 457 struct sockaddr_un un; … … 452 464 #endif 453 465 } socket_addr; 466 #if defined(ROAR_HAVE_IPV4) || defined(ROAR_HAVE_IPV6) 454 467 struct hostent * he; 468 #endif 455 469 //unsigned int host_div = 0; 456 470 int (*mode_func)(int sockfd, const struct sockaddr *serv_addr, socklen_t addrlen) = connect; // default is to connect … … 523 537 } 524 538 539 #if defined(ROAR_HAVE_IPV4) || defined(ROAR_HAVE_IPV6) 525 540 memset(&socket_addr, 0, sizeof(socket_addr)); 526 541 memset(&he, 0, sizeof(he)); // FIXME: we have a valid pointer in here???? 542 #endif 527 543 528 544 529 545 if ( type == ROAR_SOCKET_TYPE_INET || type == ROAR_SOCKET_TYPE_INET6 ) { 546 #if defined(ROAR_HAVE_IPV4) || defined(ROAR_HAVE_IPV6) 530 547 531 548 if ( (he = gethostbyname(host)) == NULL ) { … … 549 566 } 550 567 // hey! we have a socket... 568 #else 569 return -1; 570 #endif 551 571 } else if ( type == ROAR_SOCKET_TYPE_UNIX ) { 552 572 #ifdef ROAR_HAVE_UNIX -
libroar/vio_dstr.c
r1353 r1359 481 481 break; 482 482 #endif 483 #ifdef ROAR_HAVE_IPV4 483 484 case ROAR_VIO_DSTR_OBJT_TCP: 484 485 c->need_vio = 0; … … 501 502 return -1; 502 503 break; 504 #endif 503 505 #ifdef ROAR_HAVE_IPV6 504 506 case ROAR_VIO_DSTR_OBJT_TCP6:
Note: See TracChangeset
for help on using the changeset viewer.