net: use https_proxy as ecp parameter

Search box on location tab uses https protocol to communicate with map server.
To access to map server, need https_proxy value.

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

diff --git a/tizen/src/emul_state.c b/tizen/src/emul_state.c
index 43fdb50..101bff6 100644 (file)
--- a/tizen/src/emul_state.c
+++ b/tizen/src/emul_state.c
@@ -311,38 +311,38 @@ const char *get_kernel_file(void)
     return qemu_opt_get(qemu_get_machine_opts(), "kernel");
 }
 
-// http proxy
-static const char *http_proxy_addr = NULL;
+// https proxy
+static const char *https_proxy_addr = NULL;
 
-const char *get_http_proxy_addr(void)
+const char *get_https_proxy_addr(void)
 {
-    if (http_proxy_addr) {
-        return http_proxy_addr;
+    if (https_proxy_addr) {
+        return https_proxy_addr;
     }
 
     const char *kernel_cmdline =
         qemu_opt_get(qemu_get_machine_opts(), "append");
 
     // kernel cmdline always contains proxy information
-    char *buf = g_strstr_len(kernel_cmdline, -1, "http_proxy=");
+    char *buf = g_strstr_len(kernel_cmdline, -1, "https_proxy=");
     if (buf) {
         char **token = g_strsplit_set(buf, "= ", 3);
         if (token[0] && token[1] && g_strcmp0(token[1], "")) {
-            http_proxy_addr = g_strdup(token[1]);
+            https_proxy_addr = g_strdup(token[1]);
             g_strfreev(token);
 
-            LOG_INFO("HTTP proxy address: %s\n", http_proxy_addr);
+            LOG_INFO("HTTPS proxy address: %s\n", https_proxy_addr);
 
-            return http_proxy_addr;
+            return https_proxy_addr;
         }
         g_strfreev(token);
     }
 
-    http_proxy_addr = g_strdup("");
+    https_proxy_addr = g_strdup("");
 
-    LOG_INFO("HTTP proxy address is not set.\n");
+    LOG_INFO("HTTPS proxy address is not set.\n");
 
-    return http_proxy_addr;
+    return https_proxy_addr;
 }
 
 // vm_name
@@ -742,8 +742,8 @@ static void emul_state_notify_exit(Notifier *notifier, void *data)
     g_free((void *)swap_image_file);
     swap_image_file = NULL;
 
-    g_free((void *)http_proxy_addr);
-    http_proxy_addr = NULL;
+    g_free((void *)https_proxy_addr);
+    https_proxy_addr = NULL;
 
     g_free((void *)vm_name);
     vm_name = NULL;

diff --git a/tizen/src/emul_state.h b/tizen/src/emul_state.h
index b360e88..91a427a 100644 (file)
--- a/tizen/src/emul_state.h
+++ b/tizen/src/emul_state.h
@@ -128,7 +128,7 @@ const char *get_drive_image_file(void);
 const char *get_drive_image_ver(void);
 const char *get_swap_image_file(void);
 const char *get_kernel_file(void);
-const char *get_http_proxy_addr(void);
+const char *get_https_proxy_addr(void);
 const char *get_vm_name(void);
 const char *get_profile_name(void);
 const char *get_platform_version(void);

diff --git a/tizen/src/ui/menu/contextmenu.cpp b/tizen/src/ui/menu/contextmenu.cpp
index cf60abd..4d0cd4c 100644 (file)
--- a/tizen/src/ui/menu/contextmenu.cpp
+++ b/tizen/src/ui/menu/contextmenu.cpp
@@ -941,21 +941,19 @@ void ContextMenu::slotShell()
 void ContextMenu::launchControlPanel(QString& command,
         QStringList& arguments)
 {
-    QString httpProxyAddr;
-    QString httpProxyPort;
-    const char *http_proxy_addr = get_http_proxy_addr();
-    if (http_proxy_addr) {
-        char **proxy = g_strsplit(http_proxy_addr, ":", 2);
+    const char *https_proxy_addr = get_https_proxy_addr();
+    if (https_proxy_addr) {
+        char **proxy = g_strsplit(https_proxy_addr, ":", 2);
         if (proxy[0] && proxy[1]) {
-            httpProxyAddr = "-Dhttp.proxyHost=" + QString(proxy[0]);
-            httpProxyPort = "-Dhttp.proxyPort=" + QString(proxy[1]);
+            QString httpsProxyAddr = "-Dhttps.proxyHost=" + QString(proxy[0]);
+            QString httpsProxyPort = "-Dhttps.proxyPort=" + QString(proxy[1]);
+            if (httpsProxyAddr != NULL && httpsProxyPort != NULL) {
+                arguments << httpsProxyAddr << httpsProxyPort;
+            }
         }
         g_strfreev(proxy);
     }
 
-    if (httpProxyAddr != NULL && httpProxyPort != NULL) {
-        arguments << httpProxyAddr << httpProxyPort;
-    }
 
     QString loggingCommand = QString("launching ecp: \"" + command + "\"");