From 8d8349b860ded6dce72f67db26f75af3a649cd34 Mon Sep 17 00:00:00 2001 From: Stéphane Raimbault Date: Sat, 7 Apr 2012 22:46:45 +0200 Subject: [PATCH] Display node and service in PI and port in IPv4 at connection --- src/modbus-tcp.c | 6 +++++- tests/unit-test-client.c | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/modbus-tcp.c b/src/modbus-tcp.c index 914bbb7..696923f 100644 --- a/src/modbus-tcp.c +++ b/src/modbus-tcp.c @@ -305,7 +305,7 @@ static int _modbus_tcp_connect(modbus_t *ctx) } if (ctx->debug) { - printf("Connecting to %s\n", ctx_tcp->ip); + printf("Connecting to %s:%d\n", ctx_tcp->ip, ctx_tcp->port); } addr.sin_family = AF_INET; @@ -368,6 +368,10 @@ static int _modbus_tcp_pi_connect(modbus_t *ctx) if (ai_ptr->ai_family == AF_INET) _modbus_tcp_set_ipv4_options(s); + if (ctx->debug) { + printf("Connecting to [%s]:%s\n", ctx_tcp_pi->node, ctx_tcp_pi->service); + } + rc = _connect(s, ai_ptr->ai_addr, ai_ptr->ai_addrlen, &ctx->response_timeout); if (rc == -1) { close(s); diff --git a/tests/unit-test-client.c b/tests/unit-test-client.c index b0c60d2..19b2afa 100644 --- a/tests/unit-test-client.c +++ b/tests/unit-test-client.c @@ -48,7 +48,7 @@ int main(int argc, char *argv[]) if (argc > 1) { if (strcmp(argv[1], "tcp") == 0) { use_backend = TCP; - } else if (strcmp(argv[1], "tcppi") == 0) { + } else if (strcmp(argv[1], "tcppi") == 0) { use_backend = TCP_PI; } else if (strcmp(argv[1], "rtu") == 0) { use_backend = RTU; -- libgit2 0.21.4