[Nagiosplug-checkins] nagiosplug/plugins check_tcp.c,1.64,1.65 netutils.c,1.23,1.24 netutils.h,1.11,1.12

[M. Sean Finney]

Update of /cvsroot/nagiosplug/nagiosplug/plugins
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28292

Modified Files:
	check_tcp.c netutils.c netutils.h 
Log Message:
bah, my_connect is taken by mysql.  now calling it np_net_connect.


Index: check_tcp.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_tcp.c,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- check_tcp.c	24 May 2005 20:25:19 -0000	1.64
+++ check_tcp.c	25 May 2005 00:30:18 -0000	1.65
@@ -284,7 +284,7 @@
 		result = connect_SSL ();
 	else
 #endif
-		result = my_connect (server_address, server_port, &sd, PROTOCOL);
+		result = np_net_connect (server_address, server_port, &sd, PROTOCOL);
 
 	if (result == STATE_CRITICAL)
 		return STATE_CRITICAL;

Index: netutils.h
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/netutils.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- netutils.h	24 May 2005 20:25:19 -0000	1.11
+++ netutils.h	25 May 2005 00:30:19 -0000	1.12
@@ -49,9 +49,9 @@
   const char *sbuffer, char *rbuffer, int rsize);
 
 /* my_connect and wrapper macros */
-#define my_tcp_connect(addr, port, s) my_connect(addr, port, s, IPPROTO_TCP)
-#define my_udp_connect(addr, port, s) my_connect(addr, port, s, IPPROTO_UDP)
-int my_connect(const char *address, int port, int *sd, int proto);
+#define my_tcp_connect(addr, port, s) np_net_connect(addr, port, s, IPPROTO_TCP)
+#define my_udp_connect(addr, port, s) np_net_connect(addr, port, s, IPPROTO_UDP)
+int np_net_connect(const char *address, int port, int *sd, int proto);
 
 /* send_request and wrapper macros */
 #define send_tcp_request(s, sbuf, rbuf, rsize) \

Index: netutils.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/netutils.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- netutils.c	24 May 2005 20:25:19 -0000	1.23
+++ netutils.c	25 May 2005 00:30:19 -0000	1.24
@@ -68,7 +68,7 @@
 	fd_set readfds;
 	int recv_length = 0;
 
-	result = my_connect (server_address, server_port, &sd, IPPROTO_TCP);
+	result = np_net_connect (server_address, server_port, &sd, IPPROTO_TCP);
 	if (result != STATE_OK)
 		return STATE_CRITICAL;
 
@@ -143,7 +143,7 @@
 
 	result = STATE_OK;
 
-	result = my_connect (server_address, server_port, &sd, proto);
+	result = np_net_connect (server_address, server_port, &sd, proto);
 	if (result != STATE_OK)
 		return STATE_CRITICAL;
 
@@ -157,7 +157,7 @@
 
 /* opens a tcp or udp connection to a remote host */
 int
-my_connect (const char *host_name, int port, int *sd, int proto)
+np_net_connect (const char *host_name, int port, int *sd, int proto)
 {
 	struct addrinfo hints;
 	struct addrinfo *res, *res0;