From 32f216610056c47e45d3fd02aae730027a4364ff Mon Sep 17 00:00:00 2001
From: Pekka Ervasti <pekka.ervasti@haltian.com>
Date: Mon, 5 Oct 2015 13:13:35 +0300
Subject: [PATCH] ts_engine/connectors: use current_srv_ip4addr when connecting

Signed-off-by: Pekka Ervasti <pekka.ervasti@haltian.com>
---
 apps/ts_engine/kii-connector/conn_comm.c     | 13 +++++--------
 apps/ts_engine/meshblu-connector/conn_comm.c | 13 +++++--------
 apps/ts_engine/ts-connector/conn_comm.c      | 13 +++++--------
 3 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/apps/ts_engine/kii-connector/conn_comm.c b/apps/ts_engine/kii-connector/conn_comm.c
index 3fa33dab..4f2d565e 100644
--- a/apps/ts_engine/kii-connector/conn_comm.c
+++ b/apps/ts_engine/kii-connector/conn_comm.c
@@ -480,16 +480,13 @@ static int execute_http_request(struct sockaddr_in *srv_addr, uint16_t port, cha
     return NETWORK_ERROR;
 
   http_con_dbg("Connect to port %d ...\n", port);
-  srv_addr->sin_port = htons(port);
-  ret = connect(sock, (struct sockaddr *)srv_addr, sizeof(*srv_addr));
+  current_srv_ip4addr->sin_port = htons(port);
+  ret = connect(sock, (struct sockaddr *)current_srv_ip4addr, sizeof(*current_srv_ip4addr));
   if (ret < 0)
     {
-      if (srv_addr == current_srv_ip4addr)
-        {
-          /* Could not connect to server. Try updating server IP address on
-           * next try. */
-          memset(current_srv_ip4addr, 0, sizeof(*current_srv_ip4addr));
-        }
+      /* Could not connect to server. Try updating server IP address on
+       * next try. */
+      memset(current_srv_ip4addr, 0, sizeof(*current_srv_ip4addr));
       goto err_close;
     }
 
diff --git a/apps/ts_engine/meshblu-connector/conn_comm.c b/apps/ts_engine/meshblu-connector/conn_comm.c
index d4a8b972..945dda8c 100644
--- a/apps/ts_engine/meshblu-connector/conn_comm.c
+++ b/apps/ts_engine/meshblu-connector/conn_comm.c
@@ -480,16 +480,13 @@ static int execute_http_request(struct sockaddr_in *srv_addr, uint16_t port, cha
     return NETWORK_ERROR;
 
   http_con_dbg("Connect to port %d ...\n", port);
-  srv_addr->sin_port = htons(port);
-  ret = connect(sock, (struct sockaddr *)srv_addr, sizeof(*srv_addr));
+  current_srv_ip4addr->sin_port = htons(port);
+  ret = connect(sock, (struct sockaddr *)current_srv_ip4addr, sizeof(*current_srv_ip4addr));
   if (ret < 0)
     {
-      if (srv_addr == current_srv_ip4addr)
-        {
-          /* Could not connect to server. Try updating server IP address on
-           * next try. */
-          memset(current_srv_ip4addr, 0, sizeof(*current_srv_ip4addr));
-        }
+      /* Could not connect to server. Try updating server IP address on
+       * next try. */
+      memset(current_srv_ip4addr, 0, sizeof(*current_srv_ip4addr));
       goto err_close;
     }
 
diff --git a/apps/ts_engine/ts-connector/conn_comm.c b/apps/ts_engine/ts-connector/conn_comm.c
index ad5d4106..9b215b79 100644
--- a/apps/ts_engine/ts-connector/conn_comm.c
+++ b/apps/ts_engine/ts-connector/conn_comm.c
@@ -480,16 +480,13 @@ static int execute_http_request(struct sockaddr_in *srv_addr, uint16_t port, cha
     return NETWORK_ERROR;
 
   http_con_dbg("Connect to port %d ...\n", port);
-  srv_addr->sin_port = htons(port);
-  ret = connect(sock, (struct sockaddr *)srv_addr, sizeof(*srv_addr));
+  current_srv_ip4addr->sin_port = htons(port);
+  ret = connect(sock, (struct sockaddr *)current_srv_ip4addr, sizeof(*current_srv_ip4addr));
   if (ret < 0)
     {
-      if (srv_addr == current_srv_ip4addr)
-        {
-          /* Could not connect to server. Try updating server IP address on
-           * next try. */
-          memset(current_srv_ip4addr, 0, sizeof(*current_srv_ip4addr));
-        }
+      /* Could not connect to server. Try updating server IP address on
+       * next try. */
+      memset(current_srv_ip4addr, 0, sizeof(*current_srv_ip4addr));
       goto err_close;
     }
 
-- 
GitLab