#include <unistd.h>
#include <assert.h>
-#ifdef HAVE_SYS_SOCKET_H
-# include <sys/socket.h>
-#endif /* def HAVE_SYS_SOCKET_H */
-
-#ifdef HAVE_SYS_SELECT_H
-# include <sys/select.h>
-#endif /* def HAVE_SYS_SELECT_H */
+#include <sys/socket.h>
+#include <sys/select.h>
#ifndef WINDOWS
# ifdef __VMS
#include <errno.h>
#include <string.h>
-#ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-#endif
+#include <sys/time.h>
#include "utils.h"
#include "host.h"
#include "connect.h"
const char *txt_addr = print_address (ip);
if (0 != strcmp (print, txt_addr))
{
- char *str = NULL, *name;
+ char *str = NULL, *name;
if (opt.enable_iri && (name = idn_decode ((char *) print)) != NULL)
{
logprintf (LOG_VERBOSE, _("Connecting to %s|%s|:%d... "),
str ? str : escnonprint_uri (print), txt_addr, port);
- if (str)
- xfree (str);
+ if (str)
+ xfree (str);
}
else
- {
+ {
if (ip->family == AF_INET)
logprintf (LOG_VERBOSE, _("Connecting to %s:%d... "), txt_addr, port);
+#ifdef ENABLE_IPV6
else if (ip->family == AF_INET6)
logprintf (LOG_VERBOSE, _("Connecting to [%s]:%d... "), txt_addr, port);
- }
+#endif
+ }
}
/* Store the sockaddr info to SA. */
if (ret < 0)
return false;
+ memset(ip, 0, sizeof(ip_address));
ip->family = sockaddr->sa_family;
switch (sockaddr->sa_family)
{