AF indepedent routines introduced.

Modifed process_request() & my_connect() parameters to make 'proto' type
	'int' rather than 'char *' and use IPPROTO_* POSIX values.
Removed is_dotted_quad() & my_inet_aton() functions
Added is_addr(), is_inet_addr(), is_inet6_addr() and resolve_host_or_addr()
	functions to check whether it is a valid IP address
Modified is_host() to call is_addr() and is_hostname()


git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@384 f882894a-f735-0410-b71e-b25c423dba1c

1 files changed, 6 insertions, 11 deletions

diff --git a/plugins/netutils.h.in b/plugins/netutils.h.in
index 1907ab7e..69cf2781 100644
--- a/plugins/netutils.h.in
+++ b/plugins/netutils.h.in
@@ -34,6 +34,7 @@
 #undef HAVE_STRINGS_H
 #undef HAVE_STRING_H
 
+#include "config.h"
 #include "common.h"
 #include <netinet/in.h>
 #include <arpa/inet.h>
@@ -41,22 +42,16 @@
 void socket_timeout_alarm_handler (int);
 
 int process_tcp_request2 (char *address, int port, char *sbuffer,
-                                                                                                        char *rbuffer, int rsize);
+        char *rbuffer, int rsize);
 int process_tcp_request (char *address, int port, char *sbuffer,
-                                                                                                 char *rbuffer, int rsize);
+        char *rbuffer, int rsize);
 int process_udp_request (char *address, int port, char *sbuffer,
-                                                                                                 char *rbuffer, int rsize);
+        char *rbuffer, int rsize);
 int process_request (char *address, int port, char *proto, char *sbuffer,
-                                                                                 char *rbuffer, int rsize);
+        char *rbuffer, int rsize);
 
 int my_tcp_connect (char *address, int port, int *sd);
 int my_udp_connect (char *address, int port, int *sd);
-int my_connect (char *address, int port, int *sd, char *proto);
-
-int my_inet_aton (register const char *cp, struct in_addr *addr);
+int my_connect (char *address, int port, int *sd, int proto);
 
-#ifndef DEFAULT_SOCKET_TIMEOUT
-#include "config.h"
-#include "common.h"
-#endif
 int socket_timeout = DEFAULT_SOCKET_TIMEOUT;