Fix update of Ethernet address and MTU values
[framework/connectivity/connman.git] / src / service.c
index 9caa505..21aaba4 100644 (file)
@@ -80,10 +80,8 @@ static void append_path(gpointer value, gpointer user_data)
                                                        &service->path);
 }
 
-void __connman_service_list(DBusMessageIter *iter)
+void __connman_service_list(DBusMessageIter *iter, void *user_data)
 {
-       DBG("");
-
        g_sequence_foreach(service_list, append_path, iter);
 }
 
@@ -120,6 +118,8 @@ const char *__connman_service_type2string(enum connman_service_type type)
        switch (type) {
        case CONNMAN_SERVICE_TYPE_UNKNOWN:
                break;
+       case CONNMAN_SERVICE_TYPE_SYSTEM:
+               return "system";
        case CONNMAN_SERVICE_TYPE_ETHERNET:
                return "ethernet";
        case CONNMAN_SERVICE_TYPE_WIFI:
@@ -130,6 +130,8 @@ const char *__connman_service_type2string(enum connman_service_type type)
                return "bluetooth";
        case CONNMAN_SERVICE_TYPE_CELLULAR:
                return "cellular";
+       case CONNMAN_SERVICE_TYPE_VPN:
+               return "vpn";
        }
 
        return NULL;
@@ -164,6 +166,10 @@ static const char *security2string(enum connman_service_security security)
                return "none";
        case CONNMAN_SERVICE_SECURITY_WEP:
                return "wep";
+       case CONNMAN_SERVICE_SECURITY_PSK:
+               return "psk";
+       case CONNMAN_SERVICE_SECURITY_8021X:
+               return "ieee8021x";
        case CONNMAN_SERVICE_SECURITY_WPA:
                return "wpa";
        case CONNMAN_SERVICE_SECURITY_RSN:
@@ -180,8 +186,6 @@ static const char *state2string(enum connman_service_state state)
                break;
        case CONNMAN_SERVICE_STATE_IDLE:
                return "idle";
-       case CONNMAN_SERVICE_STATE_CARRIER:
-               return "carrier";
        case CONNMAN_SERVICE_STATE_ASSOCIATION:
                return "association";
        case CONNMAN_SERVICE_STATE_CONFIGURATION:
@@ -263,164 +267,73 @@ const char *__connman_service_default(void)
 
 static void mode_changed(struct connman_service *service)
 {
-       DBusMessage *signal;
-       DBusMessageIter entry, value;
-       const char *str, *key = "Mode";
-
-       if (service->path == NULL)
-               return;
+       const char *str;
 
        str = mode2string(service->mode);
        if (str == NULL)
                return;
 
-       signal = dbus_message_new_signal(service->path,
-                               CONNMAN_SERVICE_INTERFACE, "PropertyChanged");
-       if (signal == NULL)
-               return;
-
-       dbus_message_iter_init_append(signal, &entry);
-
-       dbus_message_iter_append_basic(&entry, DBUS_TYPE_STRING, &key);
-
-       dbus_message_iter_open_container(&entry, DBUS_TYPE_VARIANT,
-                                       DBUS_TYPE_STRING_AS_STRING, &value);
-       dbus_message_iter_append_basic(&value, DBUS_TYPE_STRING, &str);
-       dbus_message_iter_close_container(&entry, &value);
-
-       g_dbus_send_message(connection, signal);
+       connman_dbus_property_changed_basic(service->path,
+                               CONNMAN_SERVICE_INTERFACE, "Mode",
+                                               DBUS_TYPE_STRING, &str);
 }
 
 static void state_changed(struct connman_service *service)
 {
-       DBusMessage *signal;
-       DBusMessageIter entry, value;
-       const char *str, *key = "State";
-
-       if (service->path == NULL)
-               return;
+       const char *str;
 
        str = state2string(service->state);
        if (str == NULL)
                return;
 
-       signal = dbus_message_new_signal(service->path,
-                               CONNMAN_SERVICE_INTERFACE, "PropertyChanged");
-       if (signal == NULL)
-               return;
-
-       dbus_message_iter_init_append(signal, &entry);
-
-       dbus_message_iter_append_basic(&entry, DBUS_TYPE_STRING, &key);
-
-       dbus_message_iter_open_container(&entry, DBUS_TYPE_VARIANT,
-                                       DBUS_TYPE_STRING_AS_STRING, &value);
-       dbus_message_iter_append_basic(&value, DBUS_TYPE_STRING, &str);
-       dbus_message_iter_close_container(&entry, &value);
-
-       g_dbus_send_message(connection, signal);
+       connman_dbus_property_changed_basic(service->path,
+                               CONNMAN_SERVICE_INTERFACE, "State",
+                                               DBUS_TYPE_STRING, &str);
 }
 
 static void strength_changed(struct connman_service *service)
 {
-       DBusMessage *signal;
-       DBusMessageIter entry, value;
-       const char *key = "Strength";
-
-       if (service->path == NULL)
-               return;
-
        if (service->strength == 0)
                return;
 
-       signal = dbus_message_new_signal(service->path,
-                               CONNMAN_SERVICE_INTERFACE, "PropertyChanged");
-       if (signal == NULL)
-               return;
-
-       dbus_message_iter_init_append(signal, &entry);
-
-       dbus_message_iter_append_basic(&entry, DBUS_TYPE_STRING, &key);
-
-       dbus_message_iter_open_container(&entry, DBUS_TYPE_VARIANT,
-                                       DBUS_TYPE_BYTE_AS_STRING, &value);
-       dbus_message_iter_append_basic(&value, DBUS_TYPE_BYTE,
-                                                       &service->strength);
-       dbus_message_iter_close_container(&entry, &value);
+       connman_dbus_property_changed_basic(service->path,
+                               CONNMAN_SERVICE_INTERFACE, "Strength",
+                                       DBUS_TYPE_BYTE, &service->strength);
+}
 
-       g_dbus_send_message(connection, signal);
+static void favorite_changed(struct connman_service *service)
+{
+       connman_dbus_property_changed_basic(service->path,
+                               CONNMAN_SERVICE_INTERFACE, "Favorite",
+                                       DBUS_TYPE_BOOLEAN, &service->favorite);
 }
 
 static void roaming_changed(struct connman_service *service)
 {
-       DBusMessage *signal;
-       DBusMessageIter entry, value;
-       const char *key = "Roaming";
-
-       if (service->path == NULL)
-               return;
-
-       signal = dbus_message_new_signal(service->path,
-                               CONNMAN_SERVICE_INTERFACE, "PropertyChanged");
-       if (signal == NULL)
-               return;
-
-       dbus_message_iter_init_append(signal, &entry);
-
-       dbus_message_iter_append_basic(&entry, DBUS_TYPE_STRING, &key);
-
-       dbus_message_iter_open_container(&entry, DBUS_TYPE_VARIANT,
-                                       DBUS_TYPE_BOOLEAN_AS_STRING, &value);
-       dbus_message_iter_append_basic(&value, DBUS_TYPE_BOOLEAN,
-                                                       &service->roaming);
-       dbus_message_iter_close_container(&entry, &value);
-
-       g_dbus_send_message(connection, signal);
+       connman_dbus_property_changed_basic(service->path,
+                               CONNMAN_SERVICE_INTERFACE, "Roaming",
+                                       DBUS_TYPE_BOOLEAN, &service->roaming);
 }
 
 static void autoconnect_changed(struct connman_service *service)
 {
-       DBusMessage *signal;
-       DBusMessageIter entry, value;
-       const char *key = "AutoConnect";
-
-       if (service->path == NULL)
-               return;
-
-       signal = dbus_message_new_signal(service->path,
-                               CONNMAN_SERVICE_INTERFACE, "PropertyChanged");
-       if (signal == NULL)
-               return;
-
-       dbus_message_iter_init_append(signal, &entry);
-
-       dbus_message_iter_append_basic(&entry, DBUS_TYPE_STRING, &key);
-
-       dbus_message_iter_open_container(&entry, DBUS_TYPE_VARIANT,
-                                       DBUS_TYPE_BOOLEAN_AS_STRING, &value);
-       dbus_message_iter_append_basic(&value, DBUS_TYPE_BOOLEAN,
-                                                       &service->autoconnect);
-       dbus_message_iter_close_container(&entry, &value);
-
-       g_dbus_send_message(connection, signal);
+       connman_dbus_property_changed_basic(service->path,
+                               CONNMAN_SERVICE_INTERFACE, "AutoConnect",
+                               DBUS_TYPE_BOOLEAN, &service->autoconnect);
 }
 
 static void passphrase_changed(struct connman_service *service)
 {
-       DBusMessage *signal;
-       DBusMessageIter entry, value;
        dbus_bool_t required;
-       const char *key = "PassphraseRequired";
-
-       if (service->path == NULL)
-               return;
 
        switch (service->type) {
        case CONNMAN_SERVICE_TYPE_UNKNOWN:
+       case CONNMAN_SERVICE_TYPE_SYSTEM:
        case CONNMAN_SERVICE_TYPE_ETHERNET:
        case CONNMAN_SERVICE_TYPE_WIMAX:
        case CONNMAN_SERVICE_TYPE_BLUETOOTH:
        case CONNMAN_SERVICE_TYPE_CELLULAR:
+       case CONNMAN_SERVICE_TYPE_VPN:
                return;
        case CONNMAN_SERVICE_TYPE_WIFI:
                required = FALSE;
@@ -428,8 +341,10 @@ static void passphrase_changed(struct connman_service *service)
                switch (service->security) {
                case CONNMAN_SERVICE_SECURITY_UNKNOWN:
                case CONNMAN_SERVICE_SECURITY_NONE:
+               case CONNMAN_SERVICE_SECURITY_8021X:
                        break;
                case CONNMAN_SERVICE_SECURITY_WEP:
+               case CONNMAN_SERVICE_SECURITY_PSK:
                case CONNMAN_SERVICE_SECURITY_WPA:
                case CONNMAN_SERVICE_SECURITY_RSN:
                        if (service->passphrase == NULL)
@@ -439,39 +354,23 @@ static void passphrase_changed(struct connman_service *service)
                break;
        }
 
-       signal = dbus_message_new_signal(service->path,
-                               CONNMAN_SERVICE_INTERFACE, "PropertyChanged");
-       if (signal == NULL)
-               return;
-
-       dbus_message_iter_init_append(signal, &entry);
-
-       dbus_message_iter_append_basic(&entry, DBUS_TYPE_STRING, &key);
-
-       dbus_message_iter_open_container(&entry, DBUS_TYPE_VARIANT,
-                                       DBUS_TYPE_BOOLEAN_AS_STRING, &value);
-       dbus_message_iter_append_basic(&value, DBUS_TYPE_BOOLEAN, &required);
-       dbus_message_iter_close_container(&entry, &value);
-
-       g_dbus_send_message(connection, signal);
+       connman_dbus_property_changed_basic(service->path,
+                               CONNMAN_SERVICE_INTERFACE, "PassphraseRequired",
+                                               DBUS_TYPE_BOOLEAN, &required);
 }
 
 static void apn_changed(struct connman_service *service)
 {
-       DBusMessage *signal;
-       DBusMessageIter entry, value;
        dbus_bool_t required;
-       const char *key = "SetupRequired";
-
-       if (service->path == NULL)
-               return;
 
        switch (service->type) {
        case CONNMAN_SERVICE_TYPE_UNKNOWN:
+       case CONNMAN_SERVICE_TYPE_SYSTEM:
        case CONNMAN_SERVICE_TYPE_ETHERNET:
        case CONNMAN_SERVICE_TYPE_WIMAX:
        case CONNMAN_SERVICE_TYPE_BLUETOOTH:
        case CONNMAN_SERVICE_TYPE_WIFI:
+       case CONNMAN_SERVICE_TYPE_VPN:
                return;
        case CONNMAN_SERVICE_TYPE_CELLULAR:
                break;
@@ -479,21 +378,56 @@ static void apn_changed(struct connman_service *service)
 
        required = (service->apn == NULL) ? TRUE : FALSE;
 
-       signal = dbus_message_new_signal(service->path,
-                               CONNMAN_SERVICE_INTERFACE, "PropertyChanged");
-       if (signal == NULL)
+       connman_dbus_property_changed_basic(service->path,
+                               CONNMAN_SERVICE_INTERFACE, "SetupRequired",
+                                               DBUS_TYPE_BOOLEAN, &required);
+}
+
+static void append_ethernet(DBusMessageIter *iter, void *user_data)
+{
+       struct connman_service *service = user_data;
+
+       switch (service->state) {
+       case CONNMAN_SERVICE_STATE_UNKNOWN:
+       case CONNMAN_SERVICE_STATE_IDLE:
+       case CONNMAN_SERVICE_STATE_FAILURE:
+       case CONNMAN_SERVICE_STATE_DISCONNECT:
                return;
+       case CONNMAN_SERVICE_STATE_ASSOCIATION:
+       case CONNMAN_SERVICE_STATE_CONFIGURATION:
+       case CONNMAN_SERVICE_STATE_READY:
+               break;
+       }
 
-       dbus_message_iter_init_append(signal, &entry);
+       if (service->ipconfig != NULL)
+               __connman_ipconfig_append_ethernet(service->ipconfig, iter);
+}
+
+static void append_ipv4(DBusMessageIter *iter, void *user_data)
+{
+       struct connman_service *service = user_data;
 
-       dbus_message_iter_append_basic(&entry, DBUS_TYPE_STRING, &key);
+       switch (service->state) {
+       case CONNMAN_SERVICE_STATE_UNKNOWN:
+       case CONNMAN_SERVICE_STATE_IDLE:
+       case CONNMAN_SERVICE_STATE_FAILURE:
+       case CONNMAN_SERVICE_STATE_DISCONNECT:
+       case CONNMAN_SERVICE_STATE_ASSOCIATION:
+       case CONNMAN_SERVICE_STATE_CONFIGURATION:
+               return;
+       case CONNMAN_SERVICE_STATE_READY:
+               break;
+       }
 
-       dbus_message_iter_open_container(&entry, DBUS_TYPE_VARIANT,
-                                       DBUS_TYPE_BOOLEAN_AS_STRING, &value);
-       dbus_message_iter_append_basic(&value, DBUS_TYPE_BOOLEAN, &required);
-       dbus_message_iter_close_container(&entry, &value);
+       if (service->ipconfig != NULL)
+               __connman_ipconfig_append_ipv4(service->ipconfig, iter);
+}
 
-       g_dbus_send_message(connection, signal);
+static void settings_changed(struct connman_service *service)
+{
+       connman_dbus_property_changed_dict(service->path,
+                                       CONNMAN_SERVICE_INTERFACE, "IPv4",
+                                                       append_ipv4, service);
 }
 
 static DBusMessage *get_properties(DBusConnection *conn,
@@ -513,82 +447,80 @@ static DBusMessage *get_properties(DBusConnection *conn,
 
        dbus_message_iter_init_append(reply, &array);
 
-       dbus_message_iter_open_container(&array, DBUS_TYPE_ARRAY,
-                       DBUS_DICT_ENTRY_BEGIN_CHAR_AS_STRING
-                       DBUS_TYPE_STRING_AS_STRING DBUS_TYPE_VARIANT_AS_STRING
-                       DBUS_DICT_ENTRY_END_CHAR_AS_STRING, &dict);
+       connman_dbus_dict_open(&array, &dict);
 
        str = __connman_service_type2string(service->type);
        if (str != NULL)
-               connman_dbus_dict_append_variant(&dict, "Type",
+               connman_dbus_dict_append_basic(&dict, "Type",
                                                DBUS_TYPE_STRING, &str);
 
        str = mode2string(service->mode);
        if (str != NULL)
-               connman_dbus_dict_append_variant(&dict, "Mode",
+               connman_dbus_dict_append_basic(&dict, "Mode",
                                                DBUS_TYPE_STRING, &str);
 
        str = security2string(service->security);
        if (str != NULL)
-               connman_dbus_dict_append_variant(&dict, "Security",
+               connman_dbus_dict_append_basic(&dict, "Security",
                                                DBUS_TYPE_STRING, &str);
 
        str = state2string(service->state);
        if (str != NULL)
-               connman_dbus_dict_append_variant(&dict, "State",
+               connman_dbus_dict_append_basic(&dict, "State",
                                                DBUS_TYPE_STRING, &str);
 
        str = error2string(service->error);
        if (str != NULL)
-               connman_dbus_dict_append_variant(&dict, "Error",
+               connman_dbus_dict_append_basic(&dict, "Error",
                                                DBUS_TYPE_STRING, &str);
 
        if (service->strength > 0)
-               connman_dbus_dict_append_variant(&dict, "Strength",
+               connman_dbus_dict_append_basic(&dict, "Strength",
                                        DBUS_TYPE_BYTE, &service->strength);
 
-       connman_dbus_dict_append_variant(&dict, "Favorite",
+       connman_dbus_dict_append_basic(&dict, "Favorite",
                                        DBUS_TYPE_BOOLEAN, &service->favorite);
 
        if (service->favorite == TRUE)
-               connman_dbus_dict_append_variant(&dict, "AutoConnect",
+               connman_dbus_dict_append_basic(&dict, "AutoConnect",
                                DBUS_TYPE_BOOLEAN, &service->autoconnect);
        else
-               connman_dbus_dict_append_variant(&dict, "AutoConnect",
+               connman_dbus_dict_append_basic(&dict, "AutoConnect",
                                        DBUS_TYPE_BOOLEAN, &service->favorite);
 
        if (service->name != NULL)
-               connman_dbus_dict_append_variant(&dict, "Name",
+               connman_dbus_dict_append_basic(&dict, "Name",
                                        DBUS_TYPE_STRING, &service->name);
 
        switch (service->type) {
        case CONNMAN_SERVICE_TYPE_UNKNOWN:
-       case CONNMAN_SERVICE_TYPE_ETHERNET:
+       case CONNMAN_SERVICE_TYPE_SYSTEM:
        case CONNMAN_SERVICE_TYPE_WIMAX:
        case CONNMAN_SERVICE_TYPE_BLUETOOTH:
+       case CONNMAN_SERVICE_TYPE_VPN:
                break;
        case CONNMAN_SERVICE_TYPE_CELLULAR:
-               connman_dbus_dict_append_variant(&dict, "Roaming",
+               connman_dbus_dict_append_basic(&dict, "Roaming",
                                        DBUS_TYPE_BOOLEAN, &service->roaming);
 
                if (service->mcc != NULL && service->mnc != NULL) {
-                       connman_dbus_dict_append_variant(&dict, "MCC",
+                       connman_dbus_dict_append_basic(&dict, "MCC",
                                        DBUS_TYPE_STRING, &service->mcc);
-                       connman_dbus_dict_append_variant(&dict, "MNC",
+                       connman_dbus_dict_append_basic(&dict, "MNC",
                                        DBUS_TYPE_STRING, &service->mnc);
                }
 
                if (service->apn != NULL) {
-                       connman_dbus_dict_append_variant(&dict, "APN",
+                       connman_dbus_dict_append_basic(&dict, "APN",
                                        DBUS_TYPE_STRING, &service->apn);
 
                        if (service->username != NULL)
-                               connman_dbus_dict_append_variant(&dict,
+                               connman_dbus_dict_append_basic(&dict,
                                        "Username", DBUS_TYPE_STRING,
                                                        &service->username);
 
                        if (service->password != NULL)
-                               connman_dbus_dict_append_variant(&dict,
+                               connman_dbus_dict_append_basic(&dict,
                                        "Password", DBUS_TYPE_STRING,
                                                        &service->password);
 
@@ -596,14 +528,14 @@ static DBusMessage *get_properties(DBusConnection *conn,
                } else
                        required = TRUE;
 
-               connman_dbus_dict_append_variant(&dict, "SetupRequired",
+               connman_dbus_dict_append_basic(&dict, "SetupRequired",
                                                DBUS_TYPE_BOOLEAN, &required);
                break;
        case CONNMAN_SERVICE_TYPE_WIFI:
                if (service->passphrase != NULL &&
                                __connman_security_check_privilege(msg,
                                        CONNMAN_SECURITY_PRIVILEGE_SECRET) == 0)
-                       connman_dbus_dict_append_variant(&dict, "Passphrase",
+                       connman_dbus_dict_append_basic(&dict, "Passphrase",
                                DBUS_TYPE_STRING, &service->passphrase);
 
                required = FALSE;
@@ -611,8 +543,10 @@ static DBusMessage *get_properties(DBusConnection *conn,
                switch (service->security) {
                case CONNMAN_SERVICE_SECURITY_UNKNOWN:
                case CONNMAN_SERVICE_SECURITY_NONE:
+               case CONNMAN_SERVICE_SECURITY_8021X:
                        break;
                case CONNMAN_SERVICE_SECURITY_WEP:
+               case CONNMAN_SERVICE_SECURITY_PSK:
                case CONNMAN_SERVICE_SECURITY_WPA:
                case CONNMAN_SERVICE_SECURITY_RSN:
                        if (service->passphrase == NULL)
@@ -620,16 +554,18 @@ static DBusMessage *get_properties(DBusConnection *conn,
                        break;
                }
 
-               connman_dbus_dict_append_variant(&dict, "PassphraseRequired",
+               connman_dbus_dict_append_basic(&dict, "PassphraseRequired",
                                                DBUS_TYPE_BOOLEAN, &required);
+               /* fall through */
+       case CONNMAN_SERVICE_TYPE_ETHERNET:
+               connman_dbus_dict_append_dict(&dict, "Ethernet",
+                                               append_ethernet, service);
                break;
        }
 
-       if (service->ipconfig != NULL)
-               __connman_ipconfig_append_ipv4(service->ipconfig,
-                                                       &dict, "IPv4.");
+       connman_dbus_dict_append_dict(&dict, "IPv4", append_ipv4, service);
 
-       dbus_message_iter_close_container(&array, &dict);
+       connman_dbus_dict_close(&array, &dict);
 
        return reply;
 }
@@ -757,16 +693,6 @@ static DBusMessage *set_property(DBusConnection *conn,
                                        "Cellular.Password", service->password);
 
                __connman_storage_save_service(service);
-       } else if (g_str_has_prefix(name, "IPv4.") == TRUE) {
-               int err;
-
-               if (service->ipconfig == NULL)
-                       return __connman_error_invalid_property(msg);
-
-               err = __connman_ipconfig_set_ipv4(service->ipconfig,
-                                                       name + 5, &value);
-               if (err < 0)
-                       return __connman_error_failed(msg, -err);
        } else
                return __connman_error_invalid_property(msg);
 
@@ -818,7 +744,6 @@ static connman_bool_t is_connecting(struct connman_service *service)
        switch (service->state) {
        case CONNMAN_SERVICE_STATE_UNKNOWN:
        case CONNMAN_SERVICE_STATE_IDLE:
-       case CONNMAN_SERVICE_STATE_CARRIER:
        case CONNMAN_SERVICE_STATE_FAILURE:
        case CONNMAN_SERVICE_STATE_DISCONNECT:
        case CONNMAN_SERVICE_STATE_READY:
@@ -1352,7 +1277,9 @@ static gint service_compare(gconstpointer a, gconstpointer b,
        if (service_a->type != service_b->type) {
                switch (service_a->type) {
                case CONNMAN_SERVICE_TYPE_UNKNOWN:
+               case CONNMAN_SERVICE_TYPE_SYSTEM:
                case CONNMAN_SERVICE_TYPE_ETHERNET:
+               case CONNMAN_SERVICE_TYPE_VPN:
                        break;
                case CONNMAN_SERVICE_TYPE_WIFI:
                        return 1;
@@ -1366,33 +1293,6 @@ static gint service_compare(gconstpointer a, gconstpointer b,
        return (gint) service_b->strength - (gint) service_a->strength;
 }
 
-static void favorite_changed(struct connman_service *service)
-{
-       DBusMessage *signal;
-       DBusMessageIter entry, value;
-       const char *key = "Favorite";
-
-       if (service->path == NULL)
-               return;
-
-       signal = dbus_message_new_signal(service->path,
-                               CONNMAN_SERVICE_INTERFACE, "PropertyChanged");
-       if (signal == NULL)
-               return;
-
-       dbus_message_iter_init_append(signal, &entry);
-
-       dbus_message_iter_append_basic(&entry, DBUS_TYPE_STRING, &key);
-
-       dbus_message_iter_open_container(&entry, DBUS_TYPE_VARIANT,
-                                       DBUS_TYPE_BOOLEAN_AS_STRING, &value);
-       dbus_message_iter_append_basic(&value, DBUS_TYPE_BOOLEAN,
-                                                       &service->favorite);
-       dbus_message_iter_close_container(&entry, &value);
-
-       g_dbus_send_message(connection, signal);
-}
-
 /**
  * connman_service_get_type:
  * @service: service structure
@@ -1458,7 +1358,6 @@ int connman_service_set_favorite(struct connman_service *service,
        return 0;
 }
 
-
 int __connman_service_indicate_state(struct connman_service *service,
                                        enum connman_service_state state)
 {
@@ -1513,6 +1412,8 @@ int __connman_service_indicate_state(struct connman_service *service,
                g_get_current_time(&service->modified);
                __connman_storage_save_service(service);
 
+               settings_changed(service);
+
                __connman_notifier_connect(service->type);
 
                default_changed();
@@ -1623,6 +1524,8 @@ int __connman_service_connect(struct connman_service *service)
 
        switch (service->type) {
        case CONNMAN_SERVICE_TYPE_UNKNOWN:
+       case CONNMAN_SERVICE_TYPE_SYSTEM:
+       case CONNMAN_SERVICE_TYPE_VPN:
                return -EINVAL;
        case CONNMAN_SERVICE_TYPE_ETHERNET:
        case CONNMAN_SERVICE_TYPE_WIMAX:
@@ -1636,8 +1539,10 @@ int __connman_service_connect(struct connman_service *service)
                switch (service->security) {
                case CONNMAN_SERVICE_SECURITY_UNKNOWN:
                case CONNMAN_SERVICE_SECURITY_NONE:
+               case CONNMAN_SERVICE_SECURITY_8021X:
                        break;
                case CONNMAN_SERVICE_SECURITY_WEP:
+               case CONNMAN_SERVICE_SECURITY_PSK:
                case CONNMAN_SERVICE_SECURITY_WPA:
                case CONNMAN_SERVICE_SECURITY_RSN:
                        if (service->passphrase == NULL)
@@ -1828,12 +1733,13 @@ int __connman_service_create_and_connect(DBusMessage *msg)
                return -EINVAL;
 
        if (g_strcmp0(security, "none") != 0 &&
-                       g_strcmp0(security, "wep") != 0 &&
+                               g_strcmp0(security, "wep") != 0 &&
+                               g_strcmp0(security, "psk") != 0 &&
                                g_strcmp0(security, "wpa") != 0 &&
-                                       g_strcmp0(security, "rsn") != 0)
+                               g_strcmp0(security, "rsn") != 0)
                return -EINVAL;
 
-       device = __connman_element_find_device(CONNMAN_SERVICE_TYPE_WIFI);
+       device = __connman_element_find_device(CONNMAN_DEVICE_TYPE_WIFI);
        if (device == NULL)
                return -EOPNOTSUPP;
 
@@ -2131,7 +2037,7 @@ static enum connman_service_mode convert_wifi_mode(const char *mode)
                return CONNMAN_SERVICE_MODE_UNKNOWN;
 }
 
-static enum connman_service_mode convert_wifi_security(const char *security)
+static enum connman_service_security convert_wifi_security(const char *security)
 {
        if (security == NULL)
                return CONNMAN_SERVICE_SECURITY_UNKNOWN;
@@ -2139,6 +2045,10 @@ static enum connman_service_mode convert_wifi_security(const char *security)
                return CONNMAN_SERVICE_SECURITY_NONE;
        else if (g_str_equal(security, "wep") == TRUE)
                return CONNMAN_SERVICE_SECURITY_WEP;
+       else if (g_str_equal(security, "wep") == TRUE)
+               return CONNMAN_SERVICE_SECURITY_PSK;
+       else if (g_str_equal(security, "ieee8021x") == TRUE)
+               return CONNMAN_SERVICE_SECURITY_8021X;
        else if (g_str_equal(security, "wpa") == TRUE)
                return CONNMAN_SERVICE_SECURITY_WPA;
        else if (g_str_equal(security, "rsn") == TRUE)
@@ -2281,9 +2191,11 @@ struct connman_service *__connman_service_create_from_network(struct connman_net
 
        switch (service->type) {
        case CONNMAN_SERVICE_TYPE_UNKNOWN:
+       case CONNMAN_SERVICE_TYPE_SYSTEM:
        case CONNMAN_SERVICE_TYPE_ETHERNET:
        case CONNMAN_SERVICE_TYPE_WIMAX:
        case CONNMAN_SERVICE_TYPE_BLUETOOTH:
+       case CONNMAN_SERVICE_TYPE_VPN:
                service->autoconnect = FALSE;
                break;
        case CONNMAN_SERVICE_TYPE_WIFI:
@@ -2414,7 +2326,9 @@ static int service_load(struct connman_service *service)
 
        switch (service->type) {
        case CONNMAN_SERVICE_TYPE_UNKNOWN:
+       case CONNMAN_SERVICE_TYPE_SYSTEM:
        case CONNMAN_SERVICE_TYPE_ETHERNET:
+       case CONNMAN_SERVICE_TYPE_VPN:
                break;
        case CONNMAN_SERVICE_TYPE_WIFI:
                if (service->name == NULL) {
@@ -2558,7 +2472,9 @@ update:
 
        switch (service->type) {
        case CONNMAN_SERVICE_TYPE_UNKNOWN:
+       case CONNMAN_SERVICE_TYPE_SYSTEM:
        case CONNMAN_SERVICE_TYPE_ETHERNET:
+       case CONNMAN_SERVICE_TYPE_VPN:
                break;
        case CONNMAN_SERVICE_TYPE_WIFI:
                if (service->network) {