From 6d57b3cb56340f40ac585e947c42449e3c601e03 Mon Sep 17 00:00:00 2001 From: Max Lv Date: Sun, 30 Oct 2016 08:34:43 +0800 Subject: [PATCH] Fix #912 --- src/netutils.c | 43 ------------------------------------------- src/netutils.h | 4 ---- 2 files changed, 47 deletions(-) diff --git a/src/netutils.c b/src/netutils.c index 822fa58d..ccdfaeba 100644 --- a/src/netutils.c +++ b/src/netutils.c @@ -300,46 +300,3 @@ validate_hostname(const char *hostname, const int hostname_len) return 1; } -void -print_addrinfo(struct addrinfo *ai) -{ - char ipstr[INET6_ADDRSTRLEN]; - unsigned short int port = 0; - memset(ipstr, 0, INET6_ADDRSTRLEN); - - printf("addrinfo=>{"); - printf("ai_flags="); - switch (ai->ai_flags) { - case AI_PASSIVE: printf("AI_PASSIVE"); break; - case AI_CANONNAME: printf("AI_CANONNAME"); break; - default: printf("ERROR(%d)", ai->ai_flags); - } - printf(", ai_family="); - switch (ai->ai_family) { - case AF_INET: - dns_ntop(AF_INET, &(((struct sockaddr_in *)ai->ai_addr)->sin_addr), ipstr, INET_ADDRSTRLEN); - port = htons(((struct sockaddr_in *)ai->ai_addr)->sin_port); - printf("AF_INET"); - break; - case AF_INET6: - dns_ntop(AF_INET6, &(((struct sockaddr_in6 *)ai->ai_addr)->sin6_addr), ipstr, INET6_ADDRSTRLEN); - port = htons(((struct sockaddr_in6 *)ai->ai_addr)->sin6_port); - printf("AF_INET6"); - break; - case AF_UNSPEC: printf("AF_UNSPEC"); break; - default: printf("ERROR(%d)", ai->ai_family); - } - printf(", ai_socktype="); - switch (ai->ai_socktype) { - case SOCK_STREAM: printf("SOCK_STREAM"); break; - case SOCK_DGRAM: printf("SOCK_SGRAM"); break; - default: printf("ERROR(%d)", ai->ai_socktype); - } - printf(", ai_protocol=%d", ai->ai_protocol); - printf(", ai_addrlen=%d", ai->ai_addrlen); - printf(", ai_addr=%s:%d", ipstr, port); - printf(", ai_canonname=%s", ai->ai_canonname); - printf(", ai_next=%p", ai->ai_next); - printf("}\n"); -} - diff --git a/src/netutils.h b/src/netutils.h index 6d11f519..756d0c1e 100644 --- a/src/netutils.h +++ b/src/netutils.h @@ -27,8 +27,6 @@ #include #elif !defined(__MINGW32__) #include -#else -#include "win32.h" #endif // only enable TCP_FASTOPEN on linux @@ -95,6 +93,4 @@ int sockaddr_cmp_addr(struct sockaddr_storage *addr1, int validate_hostname(const char *hostname, const int hostname_len); -void print_addrinfo(struct addrinfo *ai); - #endif