summaryrefslogtreecommitdiff
path: root/vpn
diff options
context:
space:
mode:
authorhyunuktak <hyunuk.tak@samsung.com>2016-01-04 05:15:48 (GMT)
committerhyunuktak <hyunuk.tak@samsung.com>2016-01-04 05:15:54 (GMT)
commit2de1944cb9184bd2ff37103d71d24db06314728f (patch)
tree2fd1d7ab1a259a2ef982b9655bb6ac951b0723fa /vpn
parent8769e464f3fb7608e7429ef59d24856eadc0240a (diff)
downloadconnman-2de1944cb9184bd2ff37103d71d24db06314728f.zip
connman-2de1944cb9184bd2ff37103d71d24db06314728f.tar.gz
connman-2de1944cb9184bd2ff37103d71d24db06314728f.tar.bz2
Added Connman VPN packagerefs/changes/64/56064/1
Change-Id: I0f33c30fc20c9e6b48f159e0a0a5a13193cf8ab9 Signed-off-by: hyunuktak <hyunuk.tak@samsung.com>
Diffstat (limited to 'vpn')
-rwxr-xr-xvpn/main.c23
1 files changed, 23 insertions, 0 deletions
diff --git a/vpn/main.c b/vpn/main.c
index ee88aac..debb0ca 100755
--- a/vpn/main.c
+++ b/vpn/main.c
@@ -45,6 +45,7 @@
#define CONFIGMAINFILE CONFIGDIR "/connman-vpn.conf"
#define DEFAULT_INPUT_REQUEST_TIMEOUT 300 * 1000
+#define DEFAULT_BROWSER_LAUNCH_TIMEOUT 300 * 1000
static GMainLoop *main_loop = NULL;
@@ -52,8 +53,10 @@ static unsigned int __terminated = 0;
static struct {
unsigned int timeout_inputreq;
+ unsigned int timeout_browserlaunch;
} connman_vpn_settings = {
.timeout_inputreq = DEFAULT_INPUT_REQUEST_TIMEOUT,
+ .timeout_browserlaunch = DEFAULT_BROWSER_LAUNCH_TIMEOUT,
};
static GKeyFile *load_config(const char *file)
@@ -224,6 +227,21 @@ static GOptionEntry options[] = {
{ NULL },
};
+bool connman_setting_get_bool(const char *key)
+{
+ return false;
+}
+
+char **connman_setting_get_string_list(const char *key)
+{
+ return NULL;
+}
+
+unsigned int *connman_setting_get_uint_list(const char *key)
+{
+ return NULL;
+}
+
/*
* This function will be called from generic src/agent.c code so we have
* to use connman_ prefix instead of vpn_ one.
@@ -233,6 +251,11 @@ unsigned int connman_timeout_input_request(void)
return connman_vpn_settings.timeout_inputreq;
}
+unsigned int connman_timeout_browser_launch(void)
+{
+ return connman_vpn_settings.timeout_browserlaunch;
+}
+
int main(int argc, char *argv[])
{
GOptionContext *context;