X-Git-Url: http://tinc-vpn.org/git/browse?a=blobdiff_plain;ds=inline;f=src%2Fnetutl.c;h=69714eaec41dae4a3020c576f5793ee844926a1a;hb=3a316823b971396a428f020f401b9fe41252d98d;hp=a9ad17ce016c8c27277251a3bf4b74989aa418f6;hpb=5822f817aa802c2c5a83e9d99a8ae78cb822799b;p=tinc

diff --git a/src/netutl.c b/src/netutl.c
index a9ad17ce..69714eae 100644
--- a/src/netutl.c
+++ b/src/netutl.c
@@ -97,7 +97,7 @@ void sockaddr2str(const sockaddr_t *sa, char **addrstr, char **portstr) {
 		return;
 	}
 
-	err = getnameinfo(&sa->sa, SALEN(sa->sa), address, sizeof address, port, sizeof port, NI_NUMERICHOST | NI_NUMERICSERV);
+	err = getnameinfo(&sa->sa, SALEN(sa->sa), address, sizeof(address), port, sizeof port, NI_NUMERICHOST | NI_NUMERICSERV);
 
 	if(err) {
 		logger(DEBUG_ALWAYS, LOG_ERR, "Error while translating addresses: %s", err == EAI_SYSTEM ? strerror(errno) : gai_strerror(err));
@@ -129,7 +129,7 @@ char *sockaddr2hostname(const sockaddr_t *sa) {
 		return str;
 	}
 
-	err = getnameinfo(&sa->sa, SALEN(sa->sa), address, sizeof address, port, sizeof port,
+	err = getnameinfo(&sa->sa, SALEN(sa->sa), address, sizeof(address), port, sizeof port,
 					hostnames ? 0 : (NI_NUMERICHOST | NI_NUMERICSERV));
 	if(err) {
 		logger(DEBUG_ALWAYS, LOG_ERR, "Error while looking up hostname: %s", err == EAI_SYSTEM ? strerror(errno) : gai_strerror(err));
@@ -189,20 +189,20 @@ int sockaddrcmp(const sockaddr_t *a, const sockaddr_t *b) {
 			return strcmp(a->unknown.port, b->unknown.port);
 
 		case AF_INET:
-			result = memcmp(&a->in.sin_addr, &b->in.sin_addr, sizeof a->in.sin_addr);
+			result = memcmp(&a->in.sin_addr, &b->in.sin_addr, sizeof(a->in.sin_addr));
 
 			if(result)
 				return result;
 
-			return memcmp(&a->in.sin_port, &b->in.sin_port, sizeof a->in.sin_port);
+			return memcmp(&a->in.sin_port, &b->in.sin_port, sizeof(a->in.sin_port));
 
 		case AF_INET6:
-			result = memcmp(&a->in6.sin6_addr, &b->in6.sin6_addr, sizeof a->in6.sin6_addr);
+			result = memcmp(&a->in6.sin6_addr, &b->in6.sin6_addr, sizeof(a->in6.sin6_addr));
 
 			if(result)
 				return result;
 
-			return memcmp(&a->in6.sin6_port, &b->in6.sin6_port, sizeof a->in6.sin6_port);
+			return memcmp(&a->in6.sin6_port, &b->in6.sin6_port, sizeof(a->in6.sin6_port));
 
 		default:
 			logger(DEBUG_ALWAYS, LOG_ERR, "sockaddrcmp() was called with unknown address family %d, exitting!",