faraphel/chrony
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ntp: set invalid socket fd by macro

Browse source
This commit is contained in:
Miroslav Lichvar 2014-03-24 13:48:28 +01:00
parent a02149cf65
commit 6823109cfb
1 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
ntp_io.c
View file

@ -39,6 +39,8 @@
#include "conf.h" #include "conf.h"
#include "util.h" #include "util.h"
#define INVALID_SOCK_FD -1
union sockaddr_in46 { union sockaddr_in46 {
struct sockaddr_in in4; struct sockaddr_in in4;
#ifdef HAVE_IPV6 #ifdef HAVE_IPV6
@ -114,7 +116,7 @@ prepare_socket(int family)
if (sock_fd < 0) { if (sock_fd < 0) {
LOG(LOGS_ERR, LOGF_NtpIO, "Could not open %s NTP socket : %s", LOG(LOGS_ERR, LOGF_NtpIO, "Could not open %s NTP socket : %s",
family == AF_INET ? "IPv4" : "IPv6", strerror(errno)); family == AF_INET ? "IPv4" : "IPv6", strerror(errno));
return -1; return INVALID_SOCK_FD;
} }
/* Close on exec */ /* Close on exec */
@ -213,7 +215,7 @@ prepare_socket(int family)
LOG(LOGS_ERR, LOGF_NtpIO, "Could not bind %s NTP socket : %s", LOG(LOGS_ERR, LOGF_NtpIO, "Could not bind %s NTP socket : %s",
family == AF_INET ? "IPv4" : "IPv6", strerror(errno)); family == AF_INET ? "IPv4" : "IPv6", strerror(errno));
close(sock_fd); close(sock_fd);
return -1; return INVALID_SOCK_FD;
} }
/* Register handler for read events on the socket */ /* Register handler for read events on the socket */
@ -244,17 +246,17 @@ NIO_Initialise(int family)
if (family == IPADDR_UNSPEC || family == IPADDR_INET4) if (family == IPADDR_UNSPEC || family == IPADDR_INET4)
sock_fd4 = prepare_socket(AF_INET); sock_fd4 = prepare_socket(AF_INET);
else else
sock_fd4 = -1; sock_fd4 = INVALID_SOCK_FD;
#ifdef HAVE_IPV6 #ifdef HAVE_IPV6
if (family == IPADDR_UNSPEC || family == IPADDR_INET6) if (family == IPADDR_UNSPEC || family == IPADDR_INET6)
sock_fd6 = prepare_socket(AF_INET6); sock_fd6 = prepare_socket(AF_INET6);
else else
sock_fd6 = -1; sock_fd6 = INVALID_SOCK_FD;
#endif #endif
if (sock_fd4 < 0 if (sock_fd4 == INVALID_SOCK_FD
#ifdef HAVE_IPV6 #ifdef HAVE_IPV6
&& sock_fd6 < 0 && sock_fd6 == INVALID_SOCK_FD
#endif #endif
) { ) {
LOG_FATAL(LOGF_NtpIO, "Could not open any NTP socket"); LOG_FATAL(LOGF_NtpIO, "Could not open any NTP socket");
@ -266,17 +268,17 @@ NIO_Initialise(int family)
void void
NIO_Finalise(void) NIO_Finalise(void)
{ {
if (sock_fd4 >= 0) { if (sock_fd4 != INVALID_SOCK_FD) {
SCH_RemoveInputFileHandler(sock_fd4); SCH_RemoveInputFileHandler(sock_fd4);
close(sock_fd4); close(sock_fd4);
} }
sock_fd4 = -1; sock_fd4 = INVALID_SOCK_FD;
#ifdef HAVE_IPV6 #ifdef HAVE_IPV6
if (sock_fd6 >= 0) { if (sock_fd6 != INVALID_SOCK_FD) {
SCH_RemoveInputFileHandler(sock_fd6); SCH_RemoveInputFileHandler(sock_fd6);
close(sock_fd6); close(sock_fd6);
} }
sock_fd6 = -1; sock_fd6 = INVALID_SOCK_FD;
#endif #endif
initialised = 0; initialised = 0;
} }
@ -435,7 +437,7 @@ send_packet(void *packet, int packetlen, NTP_Remote_Address *remote_addr)
return; return;
} }
if (sock_fd < 0) if (sock_fd == INVALID_SOCK_FD)
return; return;
iov.iov_base = packet; iov.iov_base = packet;