summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArron Wang <arron.wang@intel.com>2012-10-09 16:20:45 +0800
committerZhang zhengguang <zhengguang.zhang@intel.com>2014-10-31 16:06:20 +0800
commit2bbc2b500806c808f54b459615ea4daddef1cf4e (patch)
tree7b56f82d6449d479747e4060d027fef1c3a0f270
parentd9c8d2e9c9b3d0b7c8c884e74b124895a627d148 (diff)
downloadconnman-2bbc2b500806c808f54b459615ea4daddef1cf4e.tar.gz
connman-2bbc2b500806c808f54b459615ea4daddef1cf4e.tar.bz2
connman-2bbc2b500806c808f54b459615ea4daddef1cf4e.zip
Tizen: Export network proxy API for telephony plugin
Telephony plug-in requires manual PROXY setting function Telephony stack provides proxy address (3G profile). Change-Id: Iaa02f59465a687961c303667ee09051b419507d2
-rw-r--r--include/network.h3
-rw-r--r--src/connman.h4
-rw-r--r--src/network.c18
-rw-r--r--src/service.c16
4 files changed, 41 insertions, 0 deletions
diff --git a/include/network.h b/include/network.h
index 180f2a23..e433c226 100644
--- a/include/network.h
+++ b/include/network.h
@@ -131,6 +131,9 @@ unsigned int connman_network_get_maxrate(struct connman_network *network);
int connman_network_set_enc_mode(struct connman_network *network,
const char *encryption_mode);
const char *connman_network_get_enc_mode(struct connman_network *network);
+
+int connman_network_set_proxy(struct connman_network *network,
+ const char *proxies);
#endif
int connman_network_set_name(struct connman_network *network,
diff --git a/src/connman.h b/src/connman.h
index da012152..4d78eab0 100644
--- a/src/connman.h
+++ b/src/connman.h
@@ -756,6 +756,10 @@ void __connman_service_timeserver_changed(struct connman_service *service,
GSList *ts_list);
void __connman_service_set_pac(struct connman_service *service,
const char *pac);
+#if defined TIZEN_EXT
+void __connman_service_set_proxy(struct connman_service *service,
+ const char *proxies);
+#endif
bool __connman_service_is_hidden(struct connman_service *service);
bool __connman_service_is_split_routing(struct connman_service *service);
bool __connman_service_index_is_split_routing(int index);
diff --git a/src/network.c b/src/network.c
index c40a0795..8c9fdcbb 100644
--- a/src/network.c
+++ b/src/network.c
@@ -1808,6 +1808,24 @@ const char *connman_network_get_enc_mode(struct connman_network *network)
return (const char *)network->wifi.encryption_mode;
}
+int connman_network_set_proxy(struct connman_network *network,
+ const char *proxies)
+{
+ struct connman_service *service;
+
+ DBG("network %p proxies %s", network, proxies);
+
+ service = connman_service_lookup_from_network(network);
+ if (service == NULL)
+ return -EINVAL;
+
+ __connman_service_set_proxy(service, proxies);
+
+ connman_service_set_proxy_method(service,
+ CONNMAN_SERVICE_PROXY_METHOD_MANUAL);
+
+ return 0;
+}
#endif
int connman_network_set_nameservers(struct connman_network *network,
diff --git a/src/service.c b/src/service.c
index d3b219fe..8d3c6196 100644
--- a/src/service.c
+++ b/src/service.c
@@ -2806,6 +2806,22 @@ void __connman_service_set_pac(struct connman_service *service,
proxy_changed(service);
}
+#if defined TIZEN_EXT
+void __connman_service_set_proxy(struct connman_service *service,
+ const char *proxies)
+{
+ char **proxies_array = NULL;
+
+ g_strfreev(service->proxies);
+ service->proxies = NULL;
+
+ if (proxies != NULL)
+ proxies_array = g_strsplit(proxies, " ", 0);
+
+ service->proxies = proxies_array;
+}
+#endif
+
void __connman_service_set_identity(struct connman_service *service,
const char *identity)
{