diff options
author | Christian Pointner <equinox@spreadspace.org> | 2013-10-07 11:37:35 +0000 |
---|---|---|
committer | Christian Pointner <equinox@spreadspace.org> | 2013-10-07 11:37:35 +0000 |
commit | 0b635145d3a16f4e6bb4182956917a320afc1bd7 (patch) | |
tree | 83a56b7225f564a1a6d3c3a12a7f4dab3505ceff /src/tcp.c | |
parent | configure cleanup (diff) |
fixed build with -Wall
added build support for clang
git-svn-id: https://svn.spreadspace.org/tcpproxy/trunk@67 e61f0598-a718-4e21-a8f0-0aadfa62ad6b
Diffstat (limited to 'src/tcp.c')
-rw-r--r-- | src/tcp.c | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -25,6 +25,7 @@ * along with tcpproxy. If not, see <http://www.gnu.org/licenses/>. */ +#define _GNU_SOURCE #include <string.h> #include <stdio.h> #include <stdlib.h> @@ -40,7 +41,6 @@ char* tcp_endpoint_to_string(tcp_endpoint_t e) { - size_t addrstr_len = 0; char addrstr[INET6_ADDRSTRLEN + 1], portstr[6], *ret; char addrport_sep = ':'; @@ -49,12 +49,13 @@ char* tcp_endpoint_to_string(tcp_endpoint_t e) case AF_INET: addrport_sep = ':'; break; case AF_INET6: addrport_sep = '.'; break; case AF_UNSPEC: return NULL; - default: asprintf(&ret, "unknown address type"); return ret; + default: return strdup("unknown address type"); } int errcode = getnameinfo((struct sockaddr *)&(e.addr_), e.len_, addrstr, sizeof(addrstr), portstr, sizeof(portstr), NI_NUMERICHOST | NI_NUMERICSERV); if (errcode != 0) return NULL; - asprintf(&ret, "%s%c%s", addrstr, addrport_sep ,portstr); + int len = asprintf(&ret, "%s%c%s", addrstr, addrport_sep, portstr); + if(len == -1) return NULL; return ret; } |