diff options
| author | Pierre Ossman <ossman@cendio.se> | 2006-01-05 18:55:10 +0000 |
|---|---|---|
| committer | Pierre Ossman <ossman@cendio.se> | 2006-01-05 18:55:10 +0000 |
| commit | ff49e63b49dcd107e2680587b796c9c5998b1854 (patch) | |
| tree | 9aad5deb9cdaca5053196e925d4990dc050379ad | |
| parent | 456e25634ce860d1576b6f09f11cdab8f9d8e685 (diff) | |
inet_ntop can't be found on all platforms. Do a stupid emulation when
not found.
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/ossman@380 fefdeb5f-60dc-0310-8127-8f9354f1896f
| -rw-r--r-- | polyp/socket-server.c | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/polyp/socket-server.c b/polyp/socket-server.c index d46db6c8..096d8a40 100644 --- a/polyp/socket-server.c +++ b/polyp/socket-server.c @@ -350,10 +350,22 @@ char *pa_socket_server_get_address(struct pa_socket_server *s, char *c, size_t l } else { char ip[INET6_ADDRSTRLEN]; +#ifdef HAVE_INET_NTOP if (!inet_ntop(AF_INET6, &sa.sin6_addr, ip, sizeof(ip))) { pa_log(__FILE__": inet_ntop() failed: %s\n", strerror(errno)); return NULL; } +#else + snprintf(ip, INET6_ADDRSTRLEN, "%x:%x:%x:%x:%x:%x:%x:%x", + sa.sin6_addr.s6_addr[ 0] << 8 | sa.sin6_addr.s6_addr[ 1], + sa.sin6_addr.s6_addr[ 2] << 8 | sa.sin6_addr.s6_addr[ 3], + sa.sin6_addr.s6_addr[ 4] << 8 | sa.sin6_addr.s6_addr[ 5], + sa.sin6_addr.s6_addr[ 6] << 8 | sa.sin6_addr.s6_addr[ 7], + sa.sin6_addr.s6_addr[ 8] << 8 | sa.sin6_addr.s6_addr[ 9], + sa.sin6_addr.s6_addr[10] << 8 | sa.sin6_addr.s6_addr[11], + sa.sin6_addr.s6_addr[12] << 8 | sa.sin6_addr.s6_addr[13], + sa.sin6_addr.s6_addr[14] << 8 | sa.sin6_addr.s6_addr[15]); +#endif snprintf(c, l, "tcp6:[%s]:%u", ip, (unsigned) ntohs(sa.sin6_port)); } @@ -385,10 +397,25 @@ char *pa_socket_server_get_address(struct pa_socket_server *s, char *c, size_t l } else { char ip[INET_ADDRSTRLEN]; +#ifdef HAVE_INET_NTOP if (!inet_ntop(AF_INET, &sa.sin_addr, ip, sizeof(ip))) { pa_log(__FILE__": inet_ntop() failed: %s\n", strerror(errno)); return NULL; } +#else /* HAVE_INET_NTOP */ + snprintf(ip, INET_ADDRSTRLEN, "%d.%d.%d.%d", +#ifdef WORDS_BIGENDIAN + (int)(sa.sin_addr.s_addr >> 24) & 0xff, + (int)(sa.sin_addr.s_addr >> 16) & 0xff, + (int)(sa.sin_addr.s_addr >> 8) & 0xff, + (int)(sa.sin_addr.s_addr >> 0) & 0xff); +#else + (int)(sa.sin_addr.s_addr >> 0) & 0xff, + (int)(sa.sin_addr.s_addr >> 8) & 0xff, + (int)(sa.sin_addr.s_addr >> 16) & 0xff, + (int)(sa.sin_addr.s_addr >> 24) & 0xff); +#endif +#endif /* HAVE_INET_NTOP */ snprintf(c, l, "tcp:[%s]:%u", ip, (unsigned) ntohs(sa.sin_port)); |