X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fmodbus.c;fp=src%2Fmodbus.c;h=cf126b5ae3b6e967dd560c07b8a0e805ed9c37ef;hb=4c92b223198c6b3d6ba0b052f1baea1d33abf31e;hp=c04b308d81728e74f4621737b64fb394eb47430d;hpb=55ef2778ade050e2924eeb027c98feea103f1585;p=collectd.git diff --git a/src/modbus.c b/src/modbus.c index c04b308d..cf126b5a 100644 --- a/src/modbus.c +++ b/src/modbus.c @@ -21,13 +21,14 @@ **/ #include "collectd.h" + #include "common.h" -#include "plugin.h" #include "configfile.h" - -#include +#include "plugin.h" #include +#include +#include #ifndef LIBMODBUS_VERSION_CHECK /* Assume version 2.0.3 */ @@ -473,12 +474,9 @@ static int mb_read_data (mb_host_t *host, mb_slave_t *slave, /* {{{ */ } else if (host->conntype == MBCONN_TCP) { - struct sockaddr sockaddr; - socklen_t saddrlen = sizeof (sockaddr); - - status = getpeername (modbus_get_socket (host->connection), - &sockaddr, &saddrlen); - if (status != 0) + if (getpeername (modbus_get_socket (host->connection), + (void *) &(struct sockaddr_storage) {0}, + &(socklen_t) {sizeof(struct sockaddr_storage)}) != 0) status = errno; }