diff options
| author |  M. Sean Finney <seanius@users.sourceforge.net>
| 2005-05-25 00:30:19 +0000 |
|---|---|---|
| committer | M. Sean Finney <seanius@users.sourceforge.net>
| 2005-05-25 00:30:19 +0000 |
| commit | 8134ec30d1fdf9b9921885154c900d2a88707676 (patch) | |
| tree | 15fbf02522099e889e73292bd387c8944b45a9e0 | |
| parent | dafcd900153a982467d24358724ff51850f28d4c (diff) | |
| download | monitoring-plugins-8134ec30d1fdf9b9921885154c900d2a88707676.tar.gz | |
bah, my_connect is taken by mysql. now calling it np_net_connect.
git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1176 f882894a-f735-0410-b71e-b25c423dba1c
| -rw-r--r-- | plugins/check_tcp.c | 2 | ||||
| -rw-r--r-- | plugins/netutils.c | 6 | ||||
| -rw-r--r-- | plugins/netutils.h | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/plugins/check_tcp.c b/plugins/check_tcp.c index 1bf1f4cb..3087453a 100644 --- a/plugins/check_tcp.c +++ b/plugins/check_tcp.c @@ -284,7 +284,7 @@ main (int argc, char **argv) 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; diff --git a/plugins/netutils.c b/plugins/netutils.c index e7d5ba78..9539a7f0 100644 --- a/plugins/netutils.c +++ b/plugins/netutils.c @@ -68,7 +68,7 @@ process_tcp_request2 (const char *server_address, int server_port, 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 @@ process_request (const char *server_address, int server_port, int proto, 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 @@ process_request (const char *server_address, int server_port, int proto, /* 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; diff --git a/plugins/netutils.h b/plugins/netutils.h index bd532011..1a52eecc 100644 --- a/plugins/netutils.h +++ b/plugins/netutils.h @@ -49,9 +49,9 @@ int process_request (const char *address, int port, int proto, 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) \ |