[monitoring-plugins] This patch will add the IP and port, or socket ...

[Jan Wagner]

    Module: monitoring-plugins
    Branch: master
    Commit: e85fcbd5711999af88ed887c0c17a26ab29f2b28
    Author: Davide Madrisan <davide.madri...@gmail.com>
 Committer: Jan Wagner <w...@cyconet.org>
      Date: Wed May  7 22:14:45 2014 +0200
       URL: 
https://www.monitoring-plugins.org/repositories/monitoring-plugins/commit/?id=e85fcbd

This patch will add the IP and port, or socket name, to the error message and
thus simplify the problem debugging: no need to check for this information in
the Nagios configuration.
This function is only used by 'check_tcp.c'.

Without the patch:

$ ./plugins/check_tcp -H 127.0.0.1 -p 21
Connection refused
$ ./plugins/check_tcp -H /var/spool/nagios/cmd/nagios.cmd
Permission denied

With the patch:

$ ./plugins/check_tcp -H 127.0.0.1 -p 21
connect to address 127.0.0.1 and port 21: Connection refused
$ ./plugins/check_tcp -H /var/spool/nagios/cmd/nagios.cmd
connect to socket /var/spool/nagios/cmd/nagios.cmd: Permission denied

Thanks to Davide Madrisan.
---
Closes  #1277

---

 plugins/netutils.c | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/plugins/netutils.c b/plugins/netutils.c
index 0044046..4804218 100644
--- a/plugins/netutils.c
+++ b/plugins/netutils.c
@@ -167,11 +167,13 @@ np_net_connect (const char *host_name, int port, int *sd, 
int proto)
        char port_str[6], host[MAX_HOST_ADDRESS_LENGTH];
        size_t len;
        int socktype, result;
+       bool is_socket;
 
        socktype = (proto == IPPROTO_UDP) ? SOCK_DGRAM : SOCK_STREAM;
+       bool is_socket = (host_name[0] == '/');
 
        /* as long as it doesn't start with a '/', it's assumed a host or ip */
-       if(host_name[0] != '/'){
+       if (!is_socket){
                memset (&hints, 0, sizeof (hints));
                hints.ai_family = address_family;
                hints.ai_protocol = proto;
@@ -253,7 +255,11 @@ np_net_connect (const char *host_name, int port, int *sd, 
int proto)
                        return econn_refuse_state;
                        break;
                case STATE_CRITICAL: /* user did not set econn_refuse_state */
-                       printf ("%s\n", strerror(errno));
+                       if (is_socket)
+                               printf("connect to socket %s: %s\n", host_name, 
strerror(errno));
+                       else
+                               printf("connect to address %s and port %d: 
%s\n",
+                                      host_name, port, strerror(errno));
                        return econn_refuse_state;
                        break;
                default: /* it's a logic error if we do not end up in 
STATE_(OK|WARNING|CRITICAL) */
@@ -262,7 +268,11 @@ np_net_connect (const char *host_name, int port, int *sd, 
int proto)
                }
        }
        else {
-               printf ("%s\n", strerror(errno));
+               if (is_socket)
+                       printf("connect to socket %s: %s\n", host_name, 
strerror(errno));
+               else
+                       printf("connect to address %s and port %d: %s\n",
+                              host_name, port, strerror(errno));
                return STATE_CRITICAL;
        }
 }