![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/plugins/netutils.c b/plugins/netutils.c
index e6ffc548f399b54ca23b5a9f64405da0b6a9c1a9..1d6100abf843efd3f25a8209adbdcfa4042d8fd4 100644 (file)
--- a/plugins/netutils.c
+++ b/plugins/netutils.c
-/****************************************************************************
-*
+/*****************************************************************************
+*
* Nagios plugins network utilities
-*
+*
* License: GPL
* Copyright (c) 1999 Ethan Galstad (nagios@nagios.org)
-*
-* Last Modified: $Date$
-*
+* Copyright (c) 2003-2008 Nagios Plugins Development Team
+*
* Description:
-*
+*
* This file contains commons functions used in many of the plugins.
-*
-* License Information:
-*
-* This program is free software; you can redistribute it and/or modify
+*
+*
+* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
+* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
-*
+*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
-*
+*
* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*
-* $Id$
-*
-****************************************************************************/
+* along with this program. If not, see <http://www.gnu.org/licenses/>.
+*
+*
+*****************************************************************************/
#define LOCAL_TIMEOUT_ALARM_HANDLER
#include "common.h"
#include "netutils.h"
-unsigned int socket_timeout = DEFAULT_SOCKET_TIMEOUT;
int econn_refuse_state = STATE_CRITICAL;
int was_refused = FALSE;
+#if USE_IPV6
int address_family = AF_UNSPEC;
+#else
+int address_family = AF_INET;
+#endif
/* handles socket timeouts */
void
socket_timeout_alarm_handler (int sig)
{
if (sig == SIGALRM)
- printf (_("CRITICAL - Socket timeout after %d seconds\n"), socket_timeout);
+ printf (_("%s - Socket timeout after %d seconds\n"), state_text(socket_timeout_state), socket_timeout);
else
- printf (_("CRITICAL - Abnormal timeout after %d seconds\n"), socket_timeout);
+ printf (_("%s - Abnormal timeout after %d seconds\n"), state_text(socket_timeout_state), socket_timeout);
- exit (STATE_CRITICAL);
+ exit (socket_timeout_state);
}
-/* connects to a host on a specified tcp port, sends a string, and gets a
- response. loops on select-recv until timeout or eof to get all of a
+/* connects to a host on a specified tcp port, sends a string, and gets a
+ response. loops on select-recv until timeout or eof to get all of a
multi-packet answer */
int
process_tcp_request2 (const char *server_address, int server_port,
}
else { /* it has */
recv_result =
- recv (sd, recv_buffer + recv_length,
+ recv (sd, recv_buffer + recv_length,
(size_t)recv_size - recv_length - 1, 0);
if (recv_result == -1) {
/* recv failed, bail out */
}
-/* connects to a host on a specified port, sends a string, and gets a
+/* connects to a host on a specified port, sends a string, and gets a
response */
int
process_request (const char *server_address, int server_port, int proto,
struct addrinfo hints;
struct addrinfo *r, *res;
struct sockaddr_un su;
- char port_str[6];
+ char port_str[6], host[MAX_HOST_ADDRESS_LENGTH];
+ size_t len;
int socktype, result;
socktype = (proto == IPPROTO_UDP) ? SOCK_DGRAM : SOCK_STREAM;
hints.ai_protocol = proto;
hints.ai_socktype = socktype;
+ len = strlen (host_name);
+ /* check for an [IPv6] address (and strip the brackets) */
+ if (len >= 2 && host_name[0] == '[' && host_name[len - 1] == ']') {
+ host_name++;
+ len -= 2;
+ }
+ if (len >= sizeof(host))
+ return STATE_UNKNOWN;
+ memcpy (host, host_name, len);
+ host[len] = '\0';
snprintf (port_str, sizeof (port_str), "%d", port);
- result = getaddrinfo (host_name, port_str, &hints, &res);
+ result = getaddrinfo (host, port_str, &hints, &res);
if (result != 0) {
printf ("%s\n", gai_strerror (result));
r = r->ai_next;
}
freeaddrinfo (res);
- }
+ }
/* else the hostname is interpreted as a path to a unix socket */
else {
if(strlen(host_name) >= UNIX_PATH_MAX){
return STATE_OK;
else if (was_refused) {
switch (econn_refuse_state) { /* a user-defined expected outcome */
- case STATE_OK:
+ case STATE_OK:
case STATE_WARNING: /* user wants WARN or OK on refusal */
return econn_refuse_state;
break;
@@ -271,7 +281,7 @@ send_request (int sd, int proto, const char *send_buffer, char *recv_buffer, int
result = STATE_WARNING;
}
- /* wait up to the number of seconds for socket timeout minus one
+ /* wait up to the number of seconds for socket timeout minus one
for data from the host */
tv.tv_sec = socket_timeout - 1;
tv.tv_usec = 0;
#ifdef USE_IPV6
if (address_family == AF_INET && is_inet_addr (address))
return TRUE;
- else if (address_family == AF_INET6 && is_inet6_addr (address))
+ else if (address_family == AF_INET6 && is_inet6_addr (address))
return TRUE;
#else
if (is_inet_addr (address))