Changeset 512:8fb7528db636 in roaraudio
- Timestamp:
- 08/15/08 03:55:36 (16 years ago)
- Branch:
- default
- Phase:
- public
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
libroar/socket.c
r509 r512 227 227 // int type = ROAR_SOCKET_TYPE_INET; 228 228 int fh; 229 struct sockaddr_in socket_addr; 230 struct sockaddr_un socket_addr_un; 229 union { 230 struct sockaddr_in in; 231 struct sockaddr_un un; 232 } socket_addr; 231 233 struct hostent * he; 232 234 //unsigned int host_div = 0; … … 295 297 } 296 298 297 memset(&socket_addr , 0, sizeof(socket_addr)); 298 memset(&socket_addr_un, 0, sizeof(socket_addr_un)); 299 memset(&socket_addr, 0, sizeof(socket_addr)); 299 300 memset(&he, 0, sizeof(he)); // FIXME: we have a valid pointer in here???? 300 301 … … 308 309 } 309 310 310 memcpy((struct in_addr *)&socket_addr. sin_addr, he->h_addr, sizeof(struct in_addr));311 memcpy((struct in_addr *)&socket_addr.in.sin_addr, he->h_addr, sizeof(struct in_addr)); 311 312 312 313 /* set the connect information */ 313 socket_addr. sin_family = AF_INET;314 socket_addr. sin_port = htons( port );314 socket_addr.in.sin_family = AF_INET; 315 socket_addr.in.sin_port = htons( port ); 315 316 316 317 fh = roar_socket_new_tcp(); 317 318 318 if ( mode_func(fh, (struct sockaddr *)&socket_addr , sizeof(struct sockaddr_in)) == -1 ) {319 if ( mode_func(fh, (struct sockaddr *)&socket_addr.in, sizeof(struct sockaddr_in)) == -1 ) { 319 320 ROAR_DBG("roar_socket_open(*): Can not connect/bind: %s", strerror(errno)); 320 321 close(fh); … … 323 324 // hey! we have a socket... 324 325 } else if ( type == ROAR_SOCKET_TYPE_UNIX ) { 325 socket_addr _un.sun_family = AF_UNIX;326 strncpy(socket_addr _un.sun_path, host, sizeof(socket_addr_un.sun_path) - 1);326 socket_addr.un.sun_family = AF_UNIX; 327 strncpy(socket_addr.un.sun_path, host, sizeof(socket_addr.un.sun_path) - 1); 327 328 328 329 fh = roar_socket_new_unix(); 329 330 330 if ( mode_func(fh, (struct sockaddr *)&socket_addr _un, sizeof(struct sockaddr_un)) == -1 ) {331 if ( mode_func(fh, (struct sockaddr *)&socket_addr.un, sizeof(struct sockaddr_un)) == -1 ) { 331 332 ROAR_DBG("roar_socket_open(*): Can not connect/bind: %s", strerror(errno)); 332 333 close(fh);
Note: See TracChangeset
for help on using the changeset viewer.