Imported Upstream version 1.4.16+git20130911

This commit is contained in:
Jan Wagner 2013-11-27 00:00:34 +01:00
parent 96678a79c9
commit ea90af2ba1
20 changed files with 379 additions and 383 deletions

View file

@ -81,20 +81,14 @@ void host_or_die(const char *str);
# define is_hostname(addr) resolve_host_or_addr(addr, AF_INET)
#endif
#ifdef LOCAL_TIMEOUT_ALARM_HANDLER
extern unsigned int socket_timeout;
extern int socket_timeout_state;
RETSIGTYPE socket_timeout_alarm_handler (int) __attribute__((noreturn));
#else
unsigned int socket_timeout = DEFAULT_SOCKET_TIMEOUT;
unsigned int socket_timeout_state = STATE_CRITICAL;
extern RETSIGTYPE socket_timeout_alarm_handler (int) __attribute__((noreturn));
#endif
extern unsigned int socket_timeout_state;
extern int econn_refuse_state;
extern int was_refused;
extern int address_family;
RETSIGTYPE socket_timeout_alarm_handler (int) __attribute__((noreturn));
/* SSL-Related functionality */
#ifdef HAVE_SSL
/* maybe this could be merged with the above np_net_connect, via some flags */