diff options
| author | Munkyu Im <munkyu.im@samsung.com> | 2015-02-11 14:56:23 +0900 |
|---|---|---|
| committer | Munkyu Im <munkyu.im@samsung.com> | 2015-03-13 16:02:24 +0900 |
| commit | 8fcaa40bb854c6cf0d32dad1877563a0bf787545 (patch) | |
| tree | fed87d56607ea39022f0d4a13c02fb94736446dd /tizen/src | |
| parent | bf19e33f158234332c20ae6eda1ac64dcfda4ca3 (diff) | |
| download | qemu-8fcaa40bb854c6cf0d32dad1877563a0bf787545.tar.gz qemu-8fcaa40bb854c6cf0d32dad1877563a0bf787545.tar.bz2 qemu-8fcaa40bb854c6cf0d32dad1877563a0bf787545.zip | |
net: Add checking network
If Emulator use bridged network,
it is not necessary to use adding port-forwarding of ECP Network tab.
So send message to ECP to recognize it.
Change-Id: I131f854a4ca59f6d6887ddeeeffd591bedcadcec
Signed-off-by: Munkyu Im <munkyu.im@samsung.com>
Diffstat (limited to 'tizen/src')
| -rw-r--r-- | tizen/src/ecs/ecs.h | 3 | ||||
| -rw-r--r-- | tizen/src/ecs/ecs_msg_device.c | 5 | ||||
| -rw-r--r-- | tizen/src/ui/menu/contextmenu.cpp | 8 |
3 files changed, 13 insertions, 3 deletions
diff --git a/tizen/src/ecs/ecs.h b/tizen/src/ecs/ecs.h index ae3e92377d..17d1393110 100644 --- a/tizen/src/ecs/ecs.h +++ b/tizen/src/ecs/ecs.h @@ -90,7 +90,8 @@ enum message_action { MSG_ACT_PRESSURE = 116, MSG_ACT_UV = 117, MSG_ACT_HRM = 118, - MSG_ACT_LOCATION = 120 + MSG_ACT_LOCATION = 120, + MSG_ACT_NETBRIDGE = 123 }; #define TIMER_ALIVE_S 60 diff --git a/tizen/src/ecs/ecs_msg_device.c b/tizen/src/ecs/ecs_msg_device.c index 338560a2dd..0f4d956864 100644 --- a/tizen/src/ecs/ecs_msg_device.c +++ b/tizen/src/ecs/ecs_msg_device.c @@ -400,6 +400,11 @@ bool msgproc_device_req(ECS_Client* ccli, ECS__DeviceReq* msg) if (!strcmp(cmd, MSG_TYPE_SENSOR)) { msgproc_device_req_sensor(ccli, msg, cmd); } else if (!strcmp(cmd, "Network")) { + if (msg->action == MSG_ACT_NETBRIDGE) { + make_send_device_ntf(cmd, is_emul_tap_enable(), msg->action, NULL); + } else { + LOG_SEVERE("unsupported action value: %d\n", msg->action); + } msgproc_device_req_network(ccli, msg); } else if (!strcmp(cmd, "TGesture")) { msgproc_device_req_tgesture(ccli, msg); diff --git a/tizen/src/ui/menu/contextmenu.cpp b/tizen/src/ui/menu/contextmenu.cpp index b1d0bc2aba..6735cb22dd 100644 --- a/tizen/src/ui/menu/contextmenu.cpp +++ b/tizen/src/ui/menu/contextmenu.cpp @@ -500,7 +500,12 @@ void ContextMenu::slotShell() } QString sdbPort = QString::number(get_device_serial_number()); - QString sdbSerialName = "emulator-" + sdbPort; + QString sdbSerialName; + if (is_emul_tap_enable()) { + sdbSerialName = QString(get_emul_guest_ip()); + } else { + sdbSerialName = "emulator-" + sdbPort; + } QString sdbPath = QCoreApplication::applicationDirPath(); #ifdef CONFIG_WIN32 @@ -668,7 +673,6 @@ void ContextMenu::slotControlPanel() arguments << "-XstartOnFirstThread"; #endif arguments << "-jar" << ecpPath << vmNameOpt << basePortOpt; - qDebug() << command << arguments; try { |