From f8902573218a4e2afd0499ac63cf8f7c4120febf Mon Sep 17 00:00:00 2001 From: Wouter Wijngaards Date: Mon, 12 Jan 2015 08:20:43 +0000 Subject: [PATCH] - Cast sun_len sizeof to socklen_t. git-svn-id: file:///svn/unbound/trunk@3312 be551aaa-1e26-0410-a405-d3ace91eadb9 --- doc/Changelog | 3 +++ services/listen_dnsport.c | 2 +- smallapp/unbound-control.c | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/doc/Changelog b/doc/Changelog index fab6058a3..b2465fead 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -1,3 +1,6 @@ +12 January 2015: Wouter + - Cast sun_len sizeof to socklen_t. + 7 January 2015: Wouter - Fix warnings in pythonmod changes. diff --git a/services/listen_dnsport.c b/services/listen_dnsport.c index b9114d296..fc0085a54 100644 --- a/services/listen_dnsport.c +++ b/services/listen_dnsport.c @@ -602,7 +602,7 @@ create_local_accept_sock(const char *path, int* noproto) #ifdef HAVE_STRUCT_SOCKADDR_UN_SUN_LEN /* this member exists on BSDs, not Linux */ - sun.sun_len = (sa_family_t)sizeof(sun); + sun.sun_len = (socklen_t)sizeof(sun); #endif sun.sun_family = AF_LOCAL; /* length is 92-108, 104 on FreeBSD */ diff --git a/smallapp/unbound-control.c b/smallapp/unbound-control.c index ac8d96857..09dc40870 100644 --- a/smallapp/unbound-control.c +++ b/smallapp/unbound-control.c @@ -207,7 +207,7 @@ contact_server(const char* svr, struct config_file* cfg, int statuscmd) struct sockaddr_un* sun = (struct sockaddr_un *) &addr; sun->sun_family = AF_LOCAL; #ifdef HAVE_STRUCT_SOCKADDR_UN_SUN_LEN - sun->sun_len = (sa_family_t)sizeof(sun); + sun->sun_len = (socklen_t)sizeof(sun); #endif (void)strlcpy(sun->sun_path, svr, sizeof(sun->sun_path)); addrlen = (socklen_t)sizeof(struct sockaddr_un); -- 2.47.2