Changeset 3788:fe1762804632 in roaraudio
- Timestamp:
- 05/07/10 15:44:52 (14 years ago)
- Branch:
- default
- Phase:
- public
- Location:
- libroar
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
libroar/slp.c
r3517 r3788 36 36 #include "libroar.h" 37 37 38 #if defined(ROAR_HAVE_LIBSLP) && defined(ROAR_HAVE_TIME) 39 #define _CAN_OPERATE 40 #endif 41 38 42 SLPBoolean roar_slp_url_callback(SLPHandle hslp, 39 43 const char * srvurl, … … 41 45 SLPError errcode, 42 46 void * cookie) { 43 #ifdef ROAR_HAVE_LIBSLP47 #ifdef _CAN_OPERATE 44 48 struct roar_slp_cookie * self = cookie; 45 49 … … 78 82 79 83 int roar_slp_search (struct roar_slp_cookie * cookie, char * type) { 80 #ifdef ROAR_HAVE_LIBSLP84 #ifdef _CAN_OPERATE 81 85 SLPError err; 82 86 SLPHandle hslp; … … 151 155 152 156 int roar_slp_find_roard_r (char * addr, size_t len, int nocache) { 157 #ifdef _CAN_OPERATE 153 158 static struct roar_slp_match cache = {"", 0}; 154 159 struct roar_slp_cookie cookie; … … 207 212 208 213 return 0; 214 #else 215 return -1; 216 #endif 209 217 } 210 218 -
libroar/socket.c
r3785 r3788 59 59 int opt = IPTOS_LOWDELAY; 60 60 #endif 61 #if def TCP_NODELAY61 #if defined(TCP_NODELAY) && !defined(ROAR_TARGET_WIN32) 62 62 int t = 1; 63 63 #endif … … 70 70 setsockopt(fh, IPPROTO_IP, IP_TOS, &opt, sizeof(int)); 71 71 #endif 72 #if def TCP_NODELAY72 #if defined(TCP_NODELAY) && !defined(ROAR_TARGET_WIN32) 73 73 setsockopt(fh, IPPROTO_TCP, TCP_NODELAY, &t, sizeof(int)); 74 74 #endif … … 476 476 #ifdef ROAR_HAVE_IPX 477 477 #define _NEED_OBJ 478 int i;479 478 int ret; 479 #endif 480 #ifdef ROAR_HAVE_IPX 481 unsigned int ipx_port; 480 482 #endif 481 483 #ifdef ROAR_HAVE_UNIX … … 503 505 #endif 504 506 //unsigned int host_div = 0; 507 #ifdef ROAR_TARGET_WIN32 508 int PASCAL (*mode_func)(SOCKET,const struct sockaddr*,int) = connect; // default is to connect 509 #else 505 510 int (*mode_func)(int sockfd, const struct sockaddr *serv_addr, socklen_t addrlen) = connect; // default is to connect 511 #endif 506 512 #ifdef ROAR_HAVE_LIBDNET 507 513 #define _NEED_OBJ … … 649 655 obj[0] = 0; 650 656 651 if ( (ret = sscanf(host, "%8x.%12s(%x)", &socket_addr.ipx.sipx_network, obj, 652 (unsigned int *)&socket_addr.ipx.sipx_port)) < 2 ) {653 return -1;657 if ( (ret = sscanf(host, "%8x.%12s(%x)", &socket_addr.ipx.sipx_network, obj, &ipx_port)) < 2 ) { 658 return -1; 659 socket_addr.ipx.sipx_port = ipx_port; 654 660 } else if ( ret == 2 ) { 655 661 socket_addr.ipx.sipx_port = port; // Network Byte Order? -
libroar/vio_proto.c
r3764 r3788 260 260 struct roar_vio_proto * self; 261 261 struct roar_buffer * bufbuf; 262 void * vpbuf; 262 263 char * buf; 263 264 char * endofheader = NULL; … … 274 275 calls->write = NULL; // Disable write as we do not support this 275 276 276 if ( roar_buffer_new_data(&bufbuf, 1024, &buf) == -1 ) 277 return -1; 277 if ( roar_buffer_new_data(&bufbuf, 1024, &vpbuf) == -1 ) 278 return -1; 279 280 buf = vpbuf; 278 281 279 282 ROAR_DBG("roar_vio_open_proto_http(calls=%p, dst=%p, host='%s', file='%s') = ?", calls, dst, host, file); -
libroar/vio_tantalos.c
r3517 r3788 38 38 #define _LEN 1024 39 39 40 #ifdef ROAR_HAVE_LIBSLP 40 41 static struct roar_slp_cookie * roar_vio_open_get_cookie (int reinit) { 41 42 static struct roar_slp_cookie cookie; … … 50 51 return &cookie; 51 52 } 53 #endif 52 54 53 55 int roar_vio_open_tantalos (struct roar_vio_calls * calls, struct roar_vio_calls * dst,
Note: See TracChangeset
for help on using the changeset viewer.