Merge tag 'upstream/1.40' into tizen.

[platform/upstream/connman.git] / vpn / vpn-provider.c

diff --git a/vpn/vpn-provider.c b/vpn/vpn-provider.c
old mode 100644 (file)
new mode 100755 (executable)
index 59c805c..8092b5d
--- a/vpn/vpn-provider.c
+++ b/vpn/vpn-provider.c
@@ -2194,6 +2194,7 @@ static void provider_create_all_from_type(const char *provider_type)
        g_strfreev(providers);
 }
 
+#if !defined TIZEN_EXT
 char *__vpn_provider_create_identifier(const char *host, const char *domain)
 {
        char *ident;
@@ -2207,6 +2208,23 @@ char *__vpn_provider_create_identifier(const char *host, const char *domain)
 
        return ident;
 }
+#else
+char *__vpn_provider_create_identifier(const char *host, const char *domain, const char *name)
+{
+       char *ident;
+
+       if (domain)
+               ident = g_strdup_printf("%s_%s_%s", host, domain, name);
+       else
+               ident = g_strdup_printf("%s_%s", host, name);
+       if (!ident)
+               return NULL;
+
+       provider_dbus_ident(ident);
+
+       return ident;
+}
+#endif
 
 int __vpn_provider_create(DBusMessage *msg)
 {
@@ -2266,7 +2284,11 @@ int __vpn_provider_create(DBusMessage *msg)
        if (!type || !name)
                return -EOPNOTSUPP;
 
+#if !defined TIZEN_EXT
        ident = __vpn_provider_create_identifier(host, domain);
+#else
+       ident = __vpn_provider_create_identifier(host, domain, name);
+#endif
        DBG("ident %s", ident);
 
        provider = __vpn_provider_lookup(ident);
@@ -2456,7 +2478,11 @@ int __vpn_provider_create_from_config(GHashTable *settings,
                goto fail;
        }
 
+#if !defined TIZEN_EXT
        ident = __vpn_provider_create_identifier(host, domain);
+#else
+       ident = __vpn_provider_create_identifier(host, domain, name);
+#endif
        DBG("ident %s", ident);
 
        provider = __vpn_provider_lookup(ident);
@@ -2528,7 +2554,11 @@ static void append_connection_structs(DBusMessageIter *iter, void *user_data)
        while (g_hash_table_iter_next(&hash, &key, &value)) {
                struct vpn_provider *provider = value;
 
+#if defined TIZEN_EXT
+               DBG("provider %p", provider);
+#else
                DBG("path %s", provider->path);
+#endif
 
                if (!provider->identifier)
                        continue;
@@ -2786,6 +2816,10 @@ void vpn_provider_set_data(struct vpn_provider *provider, void *data)
 
 void *vpn_provider_get_plugin_data(struct vpn_provider *provider)
 {
+#if defined TIZEN_EXT
+       if (!provider)
+               return NULL;
+#endif
        return provider->plugin_data;
 }