vpn: Make domain parameter optional

[platform/upstream/connman.git] / vpn / main.c

diff --git a/vpn/main.c b/vpn/main.c
index 474c62f..ae9c945 100755 (executable)
--- a/vpn/main.c
+++ b/vpn/main.c
@@ -260,7 +260,7 @@ unsigned int *connman_setting_get_uint_list(const char *key)
  */
 unsigned int connman_timeout_input_request(void)
 {
-       return connman_vpn_settings.timeout_inputreq;
+       return __vpn_settings_get_timeout_inputreq();
 }
 
 unsigned int connman_timeout_browser_launch(void)
@@ -354,9 +354,9 @@ int main(int argc, char *argv[])
        __connman_dbus_init(conn);
 
        if (!option_config)
-               config_init(CONFIGMAINFILE);
+               __vpn_settings_init(CONFIGMAINFILE);
        else
-               config_init(option_config);
+               __vpn_settings_init(option_config);
 
        __connman_inotify_init();
        __connman_agent_init();
@@ -388,6 +388,7 @@ int main(int argc, char *argv[])
        __connman_inotify_cleanup();
        __connman_dbus_cleanup();
        __connman_log_cleanup(false);
+       __vpn_settings_cleanup();
 
        dbus_connection_unref(conn);