From 01558130e33bd5f89e730cb9762c7dd7c78641d0 Mon Sep 17 00:00:00 2001 From: SeokYeon Hwang Date: Tue, 18 Jun 2013 17:16:15 +0900 Subject: [PATCH] Modify the method of look-up loopback interface sophisticatedly. Change-Id: I83ff19a1bfc32de5f70b22ca9ce09cc3b8ec5dde Signed-off-by: SeokYeon Hwang --- qemu-sockets.c | 8 ++++++++ tizen/src/skin/maruskin_operation.c | 10 +++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/qemu-sockets.c b/qemu-sockets.c index 361d890da3..34cbbde01a 100644 --- a/qemu-sockets.c +++ b/qemu-sockets.c @@ -242,6 +242,14 @@ int inet_connect_opts(QemuOpts *opts, bool *in_progress, Error **errp) if (qemu_opt_get_bool(opts, "ipv6", 0)) ai.ai_family = PF_INET6; +#ifdef CONFIG_MARU + // for lookup loopback interface... + if (addr[0] == '\0') { + ai.ai_flags = 0; + addr = NULL; + } +#endif + /* lookup */ if (0 != (rc = getaddrinfo(addr, port, &ai, &res))) { fprintf(stderr,"getaddrinfo(%s,%s): %s\n", addr, port, diff --git a/tizen/src/skin/maruskin_operation.c b/tizen/src/skin/maruskin_operation.c index 476c063372..65c6b3dd29 100644 --- a/tizen/src/skin/maruskin_operation.c +++ b/tizen/src/skin/maruskin_operation.c @@ -40,7 +40,7 @@ #include "emulator.h" #include "debug_ch.h" #include "sdb.h" -#include "nbd.h" +#include "qemu_socket.h" #include "mloop_event.h" #include "emul_state.h" #include "maruskin_keymap.h" @@ -582,10 +582,14 @@ static void* run_timed_shutdown_thread(void* args) static void send_to_emuld(const char* request_type, int request_size, const char* send_buf, int buf_size) { - int s = tcp_socket_outgoing( "127.0.0.1", (uint16_t) ( tizen_base_port + SDB_TCP_EMULD_INDEX ) ); + char addr[128]; + int s = 0; + + snprintf(addr, 128, ":%u", (uint16_t) (tizen_base_port + SDB_TCP_EMULD_INDEX)); + s = inet_connect(addr, true, NULL, NULL); if ( s < 0 ) { - ERR( "can't create socket to talk to the sdb forwarding session \n" ); + ERR( "can't create socket to emulator daemon in guest\n" ); ERR( "[127.0.0.1:%d/tcp] connect fail (%d:%s)\n" , tizen_base_port + SDB_TCP_EMULD_INDEX , errno, strerror(errno) ); return; } -- 2.34.1