From: Patrik Flykt <[email protected]>

Create helper function for setting a service passphrase by factoring out
the code from set_property.
---
 src/service.c |   27 +++++++++++++++++----------
 1 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/service.c b/src/service.c
index b22edb1..42c8339 100644
--- a/src/service.c
+++ b/src/service.c
@@ -1377,6 +1377,22 @@ const char *connman_service_get_proxy_autoconfig(struct 
connman_service *service
        return __connman_ipconfig_get_proxy_autoconfig(service->ipconfig);
 }
 
+static void connman_service_set_passphrase(struct connman_service *service,
+                                       const char* passphrase)
+{
+       g_free(service->passphrase);
+       service->passphrase = g_strdup(passphrase);
+
+       passphrase_changed(service);
+
+       if (service->network != NULL)
+               connman_network_set_string(service->network,
+                                       "WiFi.Passphrase",
+                                       service->passphrase);
+
+       __connman_storage_save_service(service);
+}
+
 static DBusMessage *get_properties(DBusConnection *conn,
                                        DBusMessage *msg, void *user_data)
 {
@@ -1448,16 +1464,7 @@ static DBusMessage *set_property(DBusConnection *conn,
 
                dbus_message_iter_get_basic(&value, &passphrase);
 
-               g_free(service->passphrase);
-               service->passphrase = g_strdup(passphrase);
-
-               passphrase_changed(service);
-
-               if (service->network != NULL)
-                       connman_network_set_string(service->network,
-                               "WiFi.Passphrase", service->passphrase);
-
-               __connman_storage_save_service(service);
+               connman_service_set_passphrase(service, passphrase);
        } else if (g_str_equal(name, "APN") == TRUE) {
                const char *apn;
 
-- 
1.7.1

_______________________________________________
connman mailing list
[email protected]
http://lists.connman.net/listinfo/connman

Reply via email to