From: Munkyu Im Date: Fri, 15 Sep 2017 07:27:40 +0000 (+0900) Subject: net: change address for finding base port X-Git-Tag: TizenStudio_2.0_p2.3.1~1^2~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8e9987f32c8016d6935f560c62a57c8b9c87cac3;p=sdk%2Femulator%2Fqemu.git net: change address for finding base port The latest version of emulator uses INADDR_ANY address instead of INADDR_LOOPBACK to find base port. Therefore, if not correct this, different emulators can set the same base port. It causes sdb connection failure. Also, remove unused function. Change-Id: Ib799578e8c34ec13aa3d33f9b78756b729b84002 Signed-off-by: Munkyu Im (cherry picked from commit ddfea1719b3f06559e2e653ba94062586a7118a5) --- diff --git a/tizen/src/util/sdb.c b/tizen/src/util/sdb.c index 35db58b97d..9dbc775973 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 = htonl(INADDR_LOOPBACK); + addr.sin_addr.s_addr = htonl(INADDR_ANY); addr.sin_port = htons(port); s = qemu_socket(AF_INET, SOCK_STREAM, 0); @@ -221,27 +221,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 98ec33d3b5..7be0ee3914 100644 --- 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);