X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnetutl.c;h=7a214702b4e072336bf3c04a3295726d1208cc1f;hp=1ec6e5a82199548254b3f3c3813082ef7b47e544;hb=3112e6a863b4421eb1a0b32632b86c55e47f989e;hpb=721e4caee0f7c6e003c297c95fb6d93bd4102219 diff --git a/src/netutl.c b/src/netutl.c index 1ec6e5a8..7a214702 100644 --- a/src/netutl.c +++ b/src/netutl.c @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id: netutl.c,v 1.12.4.50 2003/07/29 22:59:00 guus Exp $ + $Id: netutl.c,v 1.12.4.52 2003/08/03 12:38:43 guus Exp $ */ #include "system.h" @@ -36,19 +36,18 @@ bool hostnames = false; */ struct addrinfo *str2addrinfo(const char *address, const char *service, int socktype) { - struct addrinfo *ai; - struct addrinfo hint = { - .ai_family = addressfamily, - .ai_socktype = socktype, - }; + struct addrinfo *ai, hint = {0}; int err; cp(); + hint.ai_family = addressfamily; + hint.ai_socktype = socktype; + err = getaddrinfo(address, service, &hint, &ai); if(err) { - logger(LOG_WARNING, _("Error looking up %s port %s: %s\n"), address, + logger(LOG_WARNING, _("Error looking up %s port %s: %s"), address, service, gai_strerror(err)); return NULL; } @@ -58,21 +57,20 @@ struct addrinfo *str2addrinfo(const char *address, const char *service, int sock sockaddr_t str2sockaddr(const char *address, const char *port) { - struct addrinfo *ai; - struct addrinfo hint = { - .ai_family = AF_UNSPEC, - .ai_flags = AI_NUMERICHOST, - .ai_socktype = SOCK_STREAM, - }; + struct addrinfo *ai, hint = {0}; sockaddr_t result; int err; cp(); + hint.ai_family = AF_UNSPEC; + hint.ai_flags = AI_NUMERICHOST; + hint.ai_socktype = SOCK_STREAM; + err = getaddrinfo(address, port, &hint, &ai); if(err || !ai) { - logger(LOG_ERR, _("Error looking up %s port %s: %s\n"), address, port, + logger(LOG_ERR, _("Error looking up %s port %s: %s"), address, port, gai_strerror(err)); cp_trace(); raise(SIGFPE);