summaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorJeremy T. Bouse <undrgrid@users.sourceforge.net>2003-03-12 17:11:20 +0000
committerJeremy T. Bouse <undrgrid@users.sourceforge.net>2003-03-12 17:11:20 +0000
commit48442b777389cfecb95f07b800d69dbac24130f0 (patch)
tree89503205708962a022c89c26fc0f5159ec3b9f62 /plugins
parent46b0e78076a4c712f9c58b4f7804ba50b5895f46 (diff)
downloadmonitoring-plugins-48442b777389cfecb95f07b800d69dbac24130f0.tar.gz
Added autogen.sh script that rebuilds using autotools and runs configure
Modified configure.in to include some debug build option info at the end of the scripts execution. Can be removed by release time. Modified configure.in to include a --with-ipv6 option Default build is without IPv6 support now to enable you need to use the --with-ipv6 command line option to configure. Modified plugins/utils.* to use USE_IPV6 git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@410 f882894a-f735-0410-b71e-b25c423dba1c
Diffstat (limited to 'plugins')
-rw-r--r--plugins/utils.c12
-rw-r--r--plugins/utils.h.in2
2 files changed, 14 insertions, 0 deletions
diff --git a/plugins/utils.c b/plugins/utils.c
index 0d250677..9ac5596e 100644
--- a/plugins/utils.c
+++ b/plugins/utils.c
@@ -32,7 +32,9 @@ int is_host (char *);
32int is_addr (char *); 32int is_addr (char *);
33int resolve_host_or_addr (char *, int); 33int resolve_host_or_addr (char *, int);
34int is_inet_addr (char *); 34int is_inet_addr (char *);
35#ifdef USE_IPV6
35int is_inet6_addr (char *); 36int is_inet6_addr (char *);
37#endif
36int is_hostname (char *); 38int is_hostname (char *);
37 39
38int is_integer (char *); 40int is_integer (char *);
@@ -181,7 +183,11 @@ is_host (char *address)
181int 183int
182is_addr (char *address) 184is_addr (char *address)
183{ 185{
186#ifdef USE_IPV6
184 if (is_inet_addr (address) || is_inet6_addr (address)) 187 if (is_inet_addr (address) || is_inet6_addr (address))
188#else
189 if (is_inet_addr (address))
190#endif
185 return (TRUE); 191 return (TRUE);
186 192
187 return (FALSE); 193 return (FALSE);
@@ -212,11 +218,13 @@ is_inet_addr (char *address)
212 return resolve_host_or_addr (address, AF_INET); 218 return resolve_host_or_addr (address, AF_INET);
213} 219}
214 220
221#ifdef USE_IPV6
215int 222int
216is_inet6_addr (char *address) 223is_inet6_addr (char *address)
217{ 224{
218 return resolve_host_or_addr (address, AF_INET6); 225 return resolve_host_or_addr (address, AF_INET6);
219} 226}
227#endif
220 228
221/* from RFC-1035 229/* from RFC-1035
222 * 230 *
@@ -228,7 +236,11 @@ is_inet6_addr (char *address)
228int 236int
229is_hostname (char *s1) 237is_hostname (char *s1)
230{ 238{
239#ifdef USE_IPV6
231 return resolve_host_or_addr (s1, AF_UNSPEC); 240 return resolve_host_or_addr (s1, AF_UNSPEC);
241#else
242 return resolve_host_or_addr (s1, AF_INET);
243#endif
232} 244}
233 245
234int 246int
diff --git a/plugins/utils.h.in b/plugins/utils.h.in
index 0d947f42..89ada6f0 100644
--- a/plugins/utils.h.in
+++ b/plugins/utils.h.in
@@ -30,7 +30,9 @@ int timeout_interval = DEFAULT_SOCKET_TIMEOUT;
30int is_host (char *); 30int is_host (char *);
31int is_addr (char *); 31int is_addr (char *);
32int is_inet_addr (char *); 32int is_inet_addr (char *);
33#ifdef USE_IPV6
33int is_inet6_addr (char *); 34int is_inet6_addr (char *);
35#endif
34int is_hostname (char *); 36int is_hostname (char *);
35 37
36int is_integer (char *); 38int is_integer (char *);