From 0b6423f9c99d9edf8c96fefd0f6c453859395aa1 Mon Sep 17 00:00:00 2001 From: Holger Weiss Date: Mon, 30 Sep 2013 00:03:24 +0200 Subject: Import Nagios Plugins site Import the Nagios Plugins web site, Cronjobs, infrastructure scripts, and configuration files. --- .../135799-nagiosplug-wrapper-macros.diff | 197 +++++++++++++++++++++ 1 file changed, 197 insertions(+) create mode 100644 web/attachments/135799-nagiosplug-wrapper-macros.diff (limited to 'web/attachments/135799-nagiosplug-wrapper-macros.diff') diff --git a/web/attachments/135799-nagiosplug-wrapper-macros.diff b/web/attachments/135799-nagiosplug-wrapper-macros.diff new file mode 100644 index 0000000..ce0a0c5 --- /dev/null +++ b/web/attachments/135799-nagiosplug-wrapper-macros.diff @@ -0,0 +1,197 @@ +diff -urN ../nagiosplug.orig/plugins/netutils.c ./plugins/netutils.c +--- ../nagiosplug.orig/plugins/netutils.c 2005-01-05 21:53:22.000000000 +0100 ++++ ./plugins/netutils.c 2005-05-24 09:25:09.000000000 +0200 +@@ -39,7 +39,6 @@ + int was_refused = FALSE; + int address_family = AF_UNSPEC; + +-static int my_connect(const char *address, int port, int *sd, int proto); + /* handles socket timeouts */ + void + socket_timeout_alarm_handler (int sig) +@@ -53,37 +52,6 @@ + } + + +-/* connects to a host on a specified TCP port, sends a string, +- and gets a response */ +-int +-process_tcp_request (const char *server_address, int server_port, +- const char *send_buffer, char *recv_buffer, int recv_size) +-{ +- int result; +- +- result = process_request (server_address, server_port, +- IPPROTO_TCP, send_buffer, recv_buffer, recv_size); +- +- return result; +-} +- +- +-/* connects to a host on a specified UDP port, sends a string, and gets a +- response */ +-int +-process_udp_request (const char *server_address, int server_port, +- const char *send_buffer, char *recv_buffer, int recv_size) +-{ +- int result; +- +- result = process_request (server_address, server_port, +- IPPROTO_UDP, send_buffer, recv_buffer, recv_size); +- +- return result; +-} +- +- +- + /* connects to a host on a specified tcp port, sends a string, and gets a + response. loops on select-recv until timeout or eof to get all of a + multi-packet answer */ +@@ -163,6 +131,7 @@ + return result; + } + ++ + /* connects to a host on a specified port, sends a string, and gets a + response */ + int +@@ -186,32 +155,8 @@ + } + + +-/* opens a connection to a remote host/tcp port */ +-int +-my_tcp_connect (const char *host_name, int port, int *sd) +-{ +- int result; +- +- result = my_connect (host_name, port, sd, IPPROTO_TCP); +- +- return result; +-} +- +- +-/* opens a connection to a remote host/udp port */ +-int +-my_udp_connect (const char *host_name, int port, int *sd) +-{ +- int result; +- +- result = my_connect (host_name, port, sd, IPPROTO_UDP); +- +- return result; +-} +- +- + /* opens a tcp or udp connection to a remote host */ +-static int ++int + my_connect (const char *host_name, int port, int *sd, int proto) + { + struct addrinfo hints; +@@ -291,20 +236,6 @@ + + + int +-send_tcp_request (int sd, const char *send_buffer, char *recv_buffer, int recv_size) +-{ +- return send_request (sd, IPPROTO_TCP, send_buffer, recv_buffer, recv_size); +-} +- +- +-int +-send_udp_request (int sd, const char *send_buffer, char *recv_buffer, int recv_size) +-{ +- return send_request (sd, IPPROTO_UDP, send_buffer, recv_buffer, recv_size); +-} +- +- +-int + send_request (int sd, int proto, const char *send_buffer, char *recv_buffer, int recv_size) + { + int result = STATE_OK; +@@ -397,28 +328,3 @@ + return TRUE; + } + } +- +-int +-is_inet_addr (const char *address) +-{ +- return resolve_host_or_addr (address, AF_INET); +-} +- +-#ifdef USE_IPV6 +-int +-is_inet6_addr (const char *address) +-{ +- return resolve_host_or_addr (address, AF_INET6); +-} +-#endif +- +-int +-is_hostname (const char *s1) +-{ +-#ifdef USE_IPV6 +- return resolve_host_or_addr (s1, address_family); +-#else +- return resolve_host_or_addr (s1, AF_INET); +-#endif +-} +- +diff -urN ../nagiosplug.orig/plugins/netutils.h ./plugins/netutils.h +--- ../nagiosplug.orig/plugins/netutils.h 2004-12-02 00:54:51.000000000 +0100 ++++ ./plugins/netutils.h 2005-05-24 09:25:35.000000000 +0200 +@@ -38,30 +38,40 @@ + + RETSIGTYPE socket_timeout_alarm_handler (int) __attribute__((noreturn)); + ++/* process_request and wrapper macros */ ++#define process_tcp_request(addr, port, sbuf, rbuf, rsize) \ ++ process_request(addr, port, IPPROTO_TCP, sbuf, rbuf, rsize) ++#define process_udp_request(addr, port, sbuf, rbuf, rsize) \ ++ process_request(addr, port, IPPROTO_UDP, sbuf, rbuf, rsize) + int process_tcp_request2 (const char *address, int port, + const char *sbuffer, char *rbuffer, int rsize); +-int process_tcp_request (const char *address, int port, +- const char *sbuffer, char *rbuffer, int rsize); +-int process_udp_request (const char *address, int port, +- const char *sbuffer, char *rbuffer, int rsize); + int process_request (const char *address, int port, int proto, + const char *sbuffer, char *rbuffer, int rsize); + +-int my_tcp_connect (const char *address, int port, int *sd); +-int my_udp_connect (const char *address, int port, int *sd); +- +-int send_tcp_request (int sd, const char *send_buffer, char *recv_buffer, int recv_size); +-int send_udp_request (int sd, const char *send_buffer, char *recv_buffer, int recv_size); ++/* 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); ++ ++/* send_request and wrapper macros */ ++#define send_tcp_request(s, sbuf, rbuf, rsize) \ ++ send_request(s, IPPROTO_TCP, sbuf, rbuf, rsize) ++#define send_udp_request(s, sbuf, rbuf, rsize) \ ++ send_request(s, IPPROTO_UDP, sbuf, rbuf, rsize) + int send_request (int sd, int proto, const char *send_buffer, char *recv_buffer, int recv_size); + ++ ++/* "is_*" wrapper macros and functions */ + int is_host (const char *); + int is_addr (const char *); + int resolve_host_or_addr (const char *, int); +-int is_inet_addr (const char *); ++#define is_inet_addr(addr) resolve_host_or_addr(addr, AF_INET) + #ifdef USE_IPV6 +-int is_inet6_addr (const char *); ++# define is_inet6_addr(addr) resolve_host_or_addr(addr, AF_INET6) ++# define is_hostname(addr) resolve_host_or_addr(addr, address_family) ++#else ++# define is_hostname(addr) resolve_host_or_addr(addr, AF_INET) + #endif +-int is_hostname (const char *); + + extern unsigned int socket_timeout; + extern int econn_refuse_state; -- cgit v1.2.3-74-g34f1