diff options
| author |  Ton Voon <tonvoon@users.sourceforge.net>
| 2006-11-09 11:44:16 +0000 |
|---|---|---|
| committer | Ton Voon <tonvoon@users.sourceforge.net>
| 2006-11-09 11:44:16 +0000 |
| commit | deadc98264563366726f3698bc57dc1eda13ae75 (patch) | |
| tree | 8023f193002b6bb5d716df3aeb6053af657d57b7 /plugins | |
| parent | a5a4996a639101859bc183c85b33a6e04f5133f9 (diff) | |
| download | monitoring-plugins-deadc98264563366726f3698bc57dc1eda13ae75.tar.gz | |
Reduced DNS lookups in check_ping and netutils.c in IPv6 configurations
(Pawel Malachowski)
git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1535 f882894a-f735-0410-b71e-b25c423dba1c
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/check_ping.c | 2 | ||||
| -rw-r--r-- | plugins/netutils.c | 10 |
2 files changed, 5 insertions, 7 deletions
diff --git a/plugins/check_ping.c b/plugins/check_ping.c index 750b0554..9652ab7f 100644 --- a/plugins/check_ping.c +++ b/plugins/check_ping.c @@ -109,7 +109,7 @@ main (int argc, char **argv) for (i = 0 ; i < n_addresses ; i++) { #ifdef PING6_COMMAND - if (is_inet6_addr(addresses[i]) && address_family != AF_INET) + if (address_family != AF_INET && is_inet6_addr(addresses[i])) rawcmd = strdup(PING6_COMMAND); else rawcmd = strdup(PING_COMMAND); diff --git a/plugins/netutils.c b/plugins/netutils.c index a3a241d2..9294f3a2 100644 --- a/plugins/netutils.c +++ b/plugins/netutils.c @@ -324,14 +324,12 @@ int is_addr (const char *address) { #ifdef USE_IPV6 - if (is_inet_addr (address) && address_family != AF_INET6) + if (address_family == AF_INET && is_inet_addr (address)) + return TRUE; + else if (address_family == AF_INET6 && is_inet6_addr (address)) + return TRUE; #else if (is_inet_addr (address)) -#endif - return (TRUE); - -#ifdef USE_IPV6 - if (is_inet6_addr (address) && address_family != AF_INET) return (TRUE); #endif |