net: Change source address for checking port

ECS creates socket with LOOPBACK address.
So it needs to be changed for checking emulator instance.
Otherwise, the second emulator instance fails due to reuse issue.

Arrange redundant codes.

Change-Id: I63541d345b68020dbd0d4812f8e4d3988d11490e
Signed-off-by: Munkyu Im <munkyu.im@samsung.com>

diff --git a/net/tap.c b/net/tap.c
index 53057ec0470c2bed0d1288aceb653a4b8d8e3e7b..3ad61df7c2f6ccca9e440095d06ded1183e893ad 100644 (file)
--- a/net/tap.c
+++ b/net/tap.c
@@ -47,7 +47,6 @@
 #include "tizen/src/emul_state.h"
 #endif
 
-#include "tizen/src/emul_state.h"
 typedef struct TAPState {
     NetClientState nc;
     int fd;

diff --git a/tizen/src/util/sdb.c b/tizen/src/util/sdb.c
index 38ea12d6d68be0f331e3fddb61f84c246339b034..1b05b3d7c798127ed1bbcb9604c9320a09eb64b8 100644 (file)
--- a/tizen/src/util/sdb.c
+++ b/tizen/src/util/sdb.c
@@ -121,7 +121,7 @@ int check_port_bind_listen(uint32_t port)
     memset(&addr, 0, addrlen);
 
     addr.sin_family = AF_INET;
-    addr.sin_addr.s_addr = INADDR_ANY;
+    addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
     addr.sin_port = htons(port);
 
     s = qemu_socket(AF_INET, SOCK_STREAM, 0);
@@ -230,27 +230,6 @@ void sdb_setup(void)
     INFO( "Port(%d/tcp) listen for SDB\n", number);
 }
 
-int sdb_loopback_client(int port, int type)
-{
-    struct sockaddr_in addr;
-    int s;
-
-    memset(&addr, 0, sizeof(addr));
-    addr.sin_family = AF_INET;
-    addr.sin_port = htons(port);
-    addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
-
-    s = socket(AF_INET, type, 0);
-    if(s < 0) return -1;
-
-    if(connect(s, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
-        close(s);
-        return -1;
-    }
-
-    return s;
-}
-
 /*
  * SDB Notification server
  */

diff --git a/tizen/src/util/sdb.h b/tizen/src/util/sdb.h
index 62cad12e732fd05f035af430c39962311a06e81d..8e109180550634953c05c95601a1f71a31db211e 100644 (file)
--- a/tizen/src/util/sdb.h
+++ b/tizen/src/util/sdb.h
@@ -58,7 +58,6 @@ int inet_strtoip(const char*  str, uint32_t  *ip);
 int socket_send(int fd, const void*  buf, int  buflen);
 void socket_close(int fd);
 int check_port_bind_listen(uint32_t port);
-int sdb_loopback_client(int port, int type);
 void start_sdb_noti_server(int server_port);
 
 #define STATE_RUNNING 0