From: Munkyu Im <munkyu.im@samsung.com>
Date: Fri, 19 Jun 2015 07:11:53 +0000 (+0900)
Subject: sdb: change sdb path and source address
X-Git-Tag: Tizen_Studio_1.3_Release_p2.3~41^2~3^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f060d425f0deba1f290066d7ce5ab0adff299198;p=sdk%2Femulator%2Fqemu.git

sdb: change sdb path and source address

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

diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/util/SkinUtil.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/util/SkinUtil.java
index 8cce8a619e..8da9242c41 100644
--- a/tizen/src/skin/client/src/org/tizen/emulator/skin/util/SkinUtil.java
+++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/util/SkinUtil.java
@@ -167,15 +167,17 @@ public class SkinUtil {
 	}
 
 	public static String getSdbPath() {
-		String sdbPath = null;
-
+		StringBuilder sdbPath = new StringBuilder(".." + File.separator + ".."
+				+ File.separator + ".." + File.separator + ".."
+				+ File.separator + ".." + File.separator + "tools"
+				+ File.separator);
 		if (SwtUtil.isWindowsPlatform()) {
-			sdbPath = "..\\..\\ansicon.exe";
+			sdbPath.append("ansicon.exe");
 		} else {
-			sdbPath = "../../sdb";
+			sdbPath.append("sdb");
 		}
 
-		return (binaryPath + sdbPath);
+		return (binaryPath + sdbPath.toString());
 	}
 
 	public static String getEcpPath() {
diff --git a/tizen/src/util/sdb.c b/tizen/src/util/sdb.c
index 89908dfd30..ad177ec9c9 100644
--- 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);
@@ -161,7 +161,8 @@ int check_port_bind_listen(uint32_t port)
     return ret;
 }
 
-#define ECS_INDEX   3
+#define ECS_INDEX 3
+#define SDB_GUEST_PORT 26101
 void set_base_port(void)
 {
     int   tries     = 10;
@@ -171,10 +172,10 @@ void set_base_port(void)
 
     base_port = get_emul_vm_base_port();
 
-    if(base_port == 0){
+    if (base_port == 0) {
 
         for ( ; tries > 0; tries--, port += 10 ) {
-            if(check_port_bind_listen(port + ECS_INDEX) < 0 )
+            if (check_port_bind_listen(port + ECS_INDEX) < 0)
                 continue;
 
             success = 1;
@@ -187,7 +188,7 @@ void set_base_port(void)
         }
 
         base_port = port;
-        INFO( "sdb port is %d\n", base_port);
+        INFO( "emulator base port is %d\n", base_port);
     }
 
     set_emul_vm_base_port(base_port);
@@ -203,8 +204,8 @@ void sdb_setup(void)
     number = get_device_serial_number();
 
     for ( ; tries > 0; tries--, number += 10 ) {
-        sprintf(buf, "tcp:%d::26101", number);
-        if(net_slirp_redir((char*)buf) < 0)
+        sprintf(buf, "tcp:%d::%d", number, SDB_GUEST_PORT);
+        if (net_slirp_redir((char*)buf) < 0)
             continue;
 
         INFO( "SDBD established on port %d\n", number);
@@ -221,27 +222,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
  */
@@ -555,7 +535,7 @@ static int create_UDP_server(SDB_Noti_Server *server, int port)
 
     memset(&server_addr, '\0', sizeof(server_addr));
     server_addr.sin_family = PF_INET;
-    server_addr.sin_addr.s_addr = inet_addr("127.0.0.1");
+    server_addr.sin_addr.s_addr = INADDR_ANY;
     server_addr.sin_port = htons(port);
 
     qemu_set_nonblock(server->server_fd);