Add security definitions for PSK and IEEE 802.1x

diff --git a/include/service.h b/include/service.h
index ad2e963..48463c7 100644 (file)
--- a/include/service.h
+++ b/include/service.h
@@ -58,8 +58,10 @@ enum connman_service_security {
        CONNMAN_SERVICE_SECURITY_UNKNOWN = 0,
        CONNMAN_SERVICE_SECURITY_NONE    = 1,
        CONNMAN_SERVICE_SECURITY_WEP     = 2,
-       CONNMAN_SERVICE_SECURITY_WPA     = 3,
-       CONNMAN_SERVICE_SECURITY_RSN     = 4,
+       CONNMAN_SERVICE_SECURITY_PSK     = 3,
+       CONNMAN_SERVICE_SECURITY_8021X   = 4,
+       CONNMAN_SERVICE_SECURITY_WPA     = 8,
+       CONNMAN_SERVICE_SECURITY_RSN     = 9,
 };
 
 enum connman_service_state {

diff --git a/src/service.c b/src/service.c
index c411828..161f65f 100644 (file)
--- a/src/service.c
+++ b/src/service.c
@@ -168,6 +168,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:
@@ -432,8 +436,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)
@@ -619,8 +625,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)
@@ -1647,8 +1655,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)
@@ -2150,6 +2160,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)