diff --git a/plugins/netutils.h b/plugins/netutils.h
index 4c0a563c390dc576a607bddcb83aa5b3298f51fe..572a3ae2253c9417bd2d764b372387213cc2f17a 100644 (file)
--- a/plugins/netutils.h
+++ b/plugins/netutils.h
* Copyright (c) 1999 Ethan Galstad (nagios@nagios.org)
* Copyright (c) 2003-2007 Nagios Plugins Development Team
*
-* Last Modified: $Date$
-*
* Description:
*
* This file contains common include files and function definitions
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
-* $Id$
*
*****************************************************************************/
#include "utils.h"
#include <netinet/in.h>
#include <arpa/inet.h>
-#include "getaddrinfo.h"
+#include <netdb.h>
#ifdef HAVE_SYS_UN_H
# include <sys/un.h>
# endif /* UNIX_PATH_MAX */
#endif /* HAVE_SYS_UN_H */
-RETSIGTYPE socket_timeout_alarm_handler (int) __attribute__((noreturn));
-
/* process_request and wrapper macros */
#define process_tcp_request(addr, port, sbuf, rbuf, rsize) \
process_request(addr, port, IPPROTO_TCP, sbuf, rbuf, rsize)
# 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 int econn_refuse_state;
extern int was_refused;
extern int address_family;
#ifdef HAVE_SSL
/* maybe this could be merged with the above np_net_connect, via some flags */
int np_net_ssl_init(int sd);
+int np_net_ssl_init_with_hostname(int sd, char *host_name);
void np_net_ssl_cleanup();
int np_net_ssl_write(const void *buf, int num);
int np_net_ssl_read(void *buf, int num);