Merge tag 'upstream/1.40' into tizen.

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

diff --git a/vpn/main.c b/vpn/main.c
old mode 100644 (file)
new mode 100755 (executable)
index 133acd2..e4f4a10
--- a/vpn/main.c
+++ b/vpn/main.c
@@ -129,7 +129,6 @@ static gchar *option_plugin = NULL;
 static gchar *option_noplugin = NULL;
 static bool option_detach = true;
 static bool option_version = false;
-static bool option_routes = false;
 
 static bool parse_debug(const char *key, const char *value,
                                        gpointer user_data, GError **error)
@@ -156,13 +155,48 @@ static GOptionEntry options[] = {
        { "nodaemon", 'n', G_OPTION_FLAG_REVERSE,
                                G_OPTION_ARG_NONE, &option_detach,
                                "Don't fork daemon to background" },
-       { "routes", 'r', 0, G_OPTION_ARG_NONE, &option_routes,
-                               "Create/delete VPN routes" },
        { "version", 'v', 0, G_OPTION_ARG_NONE, &option_version,
                                "Show version information and exit" },
        { NULL },
 };
 
+#if defined TIZEN_EXT
+bool connman_setting_get_bool(const char *key)
+{
+       return false;
+}
+
+unsigned int connman_setting_get_uint(const char *key)
+{
+       return 0;
+}
+
+int connman_setting_get_int(const char *key)
+{
+       return 0;
+}
+
+char *connman_setting_get_string(const char *key)
+{
+        return NULL;
+}
+
+char **connman_setting_get_string_list(const char *key)
+{
+       return NULL;
+}
+
+unsigned int *connman_setting_get_uint_list(const char *key)
+{
+       return NULL;
+}
+
+unsigned int connman_timeout_browser_launch(void)
+{
+       return 0;
+}
+#endif
+
 /*
  * This function will be called from generic src/agent.c code so we have
  * to use connman_ prefix instead of vpn_ one.
@@ -259,7 +293,7 @@ int main(int argc, char *argv[])
 
        __connman_inotify_init();
        __connman_agent_init();
-       __vpn_provider_init(option_routes);
+       __vpn_provider_init();
        __vpn_manager_init();
        __vpn_ipconfig_init();
        __vpn_rtnl_init();