gsupplicant: Add interface bridge setting
[platform/upstream/connman.git] / plugins / wifi.c
index ee826e9..b7055c3 100644 (file)
@@ -24,6 +24,7 @@
 #endif
 
 #include <unistd.h>
+#include <stdlib.h>
 #include <errno.h>
 #include <string.h>
 #include <sys/ioctl.h>
 #include <connman/inet.h>
 #include <connman/device.h>
 #include <connman/rtnl.h>
+#include <connman/technology.h>
 #include <connman/log.h>
+#include <connman/option.h>
 
 #include <gsupplicant/gsupplicant.h>
 
 #define CLEANUP_TIMEOUT   8    /* in seconds */
 #define INACTIVE_TIMEOUT  12   /* in seconds */
 
+struct connman_technology *wifi_technology = NULL;
+
 struct wifi_data {
        char *identifier;
        struct connman_device *device;
        struct connman_network *network;
+       struct connman_network *pending_network;
        GSupplicantInterface *interface;
+       GSupplicantState state;
        connman_bool_t connected;
+       connman_bool_t disconnecting;
        int index;
        unsigned flags;
        unsigned int watch;
 };
 
+static GList *iface_list = NULL;
+
 static int get_bssid(struct connman_device *device,
                                unsigned char *bssid, unsigned int *bssid_len)
 {
@@ -139,6 +149,8 @@ static int wifi_probe(struct connman_device *device)
                return -ENOMEM;
 
        wifi->connected = FALSE;
+       wifi->disconnecting = FALSE;
+       wifi->state = G_SUPPLICANT_STATE_INACTIVE;
 
        connman_device_set_data(device, wifi);
        wifi->device = connman_device_ref(device);
@@ -149,6 +161,8 @@ static int wifi_probe(struct connman_device *device)
        wifi->watch = connman_rtnl_add_newlink_watch(wifi->index,
                                                        wifi_newlink, device);
 
+       iface_list = g_list_append(iface_list, wifi);
+
        return 0;
 }
 
@@ -158,10 +172,22 @@ static void wifi_remove(struct connman_device *device)
 
        DBG("device %p", device);
 
+       if (wifi == NULL)
+               return;
+
+       iface_list = g_list_remove(iface_list, wifi);
+
+       if (wifi->pending_network != NULL) {
+               connman_network_unref(wifi->pending_network);
+               wifi->pending_network = NULL;
+       }
+
        connman_device_set_data(device, NULL);
        connman_device_unref(wifi->device);
        connman_rtnl_remove_watch(wifi->watch);
 
+       g_supplicant_interface_set_data(wifi->interface, NULL);
+
        g_free(wifi->identifier);
        g_free(wifi);
 }
@@ -201,10 +227,11 @@ static int wifi_enable(struct connman_device *device)
 {
        struct wifi_data *wifi = connman_device_get_data(device);
        const char *interface = connman_device_get_string(device, "Interface");
+       const char *driver = connman_option_get_string("wifi");
 
        DBG("device %p %p", device, wifi);
 
-       return g_supplicant_interface_create(interface, "nl80211,wext",
+       return g_supplicant_interface_create(interface, driver, NULL,
                                                interface_create_callback,
                                                        wifi);
 }
@@ -216,6 +243,12 @@ static int wifi_disable(struct connman_device *device)
        DBG("device %p", device);
 
        wifi->connected = FALSE;
+       wifi->disconnecting = FALSE;
+
+       if (wifi->pending_network != NULL) {
+               connman_network_unref(wifi->pending_network);
+               wifi->pending_network = NULL;
+       }
 
        return g_supplicant_interface_remove(wifi->interface,
                                                interface_remove_callback,
@@ -229,22 +262,25 @@ static void scan_callback(int result, GSupplicantInterface *interface,
 
        DBG("result %d", result);
 
-       if (result < 0) {
+       if (result < 0)
+               connman_device_reset_scanning(device);
+       else
                connman_device_set_scanning(device, FALSE);
-               return;
-       }
-
-       connman_device_set_scanning(device, TRUE);
 }
 
 static int wifi_scan(struct connman_device *device)
 {
        struct wifi_data *wifi = connman_device_get_data(device);
+       int ret;
 
        DBG("device %p %p", device, wifi->interface);
 
-       return g_supplicant_interface_scan(wifi->interface, scan_callback,
+       ret = g_supplicant_interface_scan(wifi->interface, scan_callback,
                                                                device);
+       if (ret == 0)
+               connman_device_set_scanning(device, TRUE);
+
+       return ret;
 }
 
 static struct connman_device_driver wifi_ng_driver = {
@@ -273,18 +309,214 @@ static void system_killed(void)
        connman_device_driver_unregister(&wifi_ng_driver);
 }
 
+static int network_probe(struct connman_network *network)
+{
+       DBG("network %p", network);
+
+       return 0;
+}
+
+static void network_remove(struct connman_network *network)
+{
+       DBG("network %p", network);
+}
+
+static void connect_callback(int result, GSupplicantInterface *interface,
+                                                       void *user_data)
+{
+       connman_error("%s", __func__);
+}
+
+static GSupplicantSecurity network_security(const char *security)
+{
+       if (g_str_equal(security, "none") == TRUE)
+               return G_SUPPLICANT_SECURITY_NONE;
+       else if (g_str_equal(security, "wep") == TRUE)
+               return G_SUPPLICANT_SECURITY_WEP;
+       else if (g_str_equal(security, "psk") == TRUE)
+               return G_SUPPLICANT_SECURITY_PSK;
+       else if (g_str_equal(security, "wpa") == TRUE)
+               return G_SUPPLICANT_SECURITY_PSK;
+       else if (g_str_equal(security, "rsn") == TRUE)
+               return G_SUPPLICANT_SECURITY_PSK;
+       else if (g_str_equal(security, "ieee8021x") == TRUE)
+               return G_SUPPLICANT_SECURITY_IEEE8021X;
+
+       return G_SUPPLICANT_SECURITY_UNKNOWN;
+}
+
+static void ssid_init(GSupplicantSSID *ssid, struct connman_network *network)
+{
+       const char *security, *passphrase;
+
+       memset(ssid, 0, sizeof(*ssid));
+       ssid->mode = G_SUPPLICANT_MODE_INFRA;
+       ssid->ssid = connman_network_get_blob(network, "WiFi.SSID",
+                                               &ssid->ssid_len);
+       ssid->scan_ssid = 1;
+       security = connman_network_get_string(network, "WiFi.Security");
+       ssid->security = network_security(security);
+       passphrase = connman_network_get_string(network,
+                                               "WiFi.Passphrase");
+       if (passphrase == NULL || strlen(passphrase) == 0)
+               ssid->passphrase = NULL;
+        else
+               ssid->passphrase = passphrase;
+
+       ssid->eap = connman_network_get_string(network, "WiFi.EAP");
+
+       /*
+        * If our private key password is unset,
+        * we use the supplied passphrase. That is needed
+        * for PEAP where 2 passphrases (identity and client
+        * cert may have to be provided.
+        */
+       if (connman_network_get_string(network,
+                                       "WiFi.PrivateKeyPassphrase") == NULL)
+               connman_network_set_string(network,
+                                               "WiFi.PrivateKeyPassphrase",
+                                               ssid->passphrase);
+       /* We must have an identity for both PEAP and TLS */
+       ssid->identity = connman_network_get_string(network, "WiFi.Identity");
+       ssid->ca_cert_path = connman_network_get_string(network,
+                                                       "WiFi.CACertFile");
+       ssid->client_cert_path = connman_network_get_string(network,
+                                                       "WiFi.ClientCertFile");
+       ssid->private_key_path = connman_network_get_string(network,
+                                                       "WiFi.PrivateKeyFile");
+       ssid->private_key_passphrase = connman_network_get_string(network,
+                                               "WiFi.PrivateKeyPassphrase");
+       ssid->phase2_auth = connman_network_get_string(network, "WiFi.Phase2");
+
+       ssid->use_wps = connman_network_get_bool(network, "WiFi.UseWPS");
+       ssid->pin_wps = connman_network_get_string(network, "WiFi.PinWPS");
+
+}
+
+static int network_connect(struct connman_network *network)
+{
+       struct connman_device *device = connman_network_get_device(network);
+       struct wifi_data *wifi;
+       GSupplicantInterface *interface;
+       GSupplicantSSID *ssid;
+
+       DBG("network %p", network);
+
+       if (device == NULL)
+               return -ENODEV;
+
+       wifi = connman_device_get_data(device);
+       if (wifi == NULL)
+               return -ENODEV;
+
+       ssid = g_try_malloc0(sizeof(GSupplicantSSID));
+       if (ssid == NULL)
+               return -ENOMEM;
+
+       interface = wifi->interface;
+
+       ssid_init(ssid, network);
+
+       if (wifi->disconnecting == TRUE)
+               wifi->pending_network = connman_network_ref(network);
+       else {
+               wifi->network = connman_network_ref(network);
+
+               return g_supplicant_interface_connect(interface, ssid,
+                                               connect_callback, NULL);
+       }
+
+       return -EINPROGRESS;
+}
+
+static void disconnect_callback(int result, GSupplicantInterface *interface,
+                                                               void *user_data)
+{
+       struct wifi_data *wifi = user_data;
+
+       if (wifi->network != NULL) {
+               /*
+                * if result < 0 supplican return an error because
+                * the network is not current.
+                * we wont receive G_SUPPLICANT_STATE_DISCONNECTED since it
+                * failed, call connman_network_set_connected to report
+                * disconnect is completed.
+                */
+               if (result < 0)
+                       connman_network_set_connected(wifi->network, FALSE);
+
+               connman_network_unref(wifi->network);
+       }
+
+       wifi->network = NULL;
+
+       wifi->disconnecting = FALSE;
+
+       if (wifi->pending_network != NULL) {
+               network_connect(wifi->pending_network);
+               connman_network_unref(wifi->pending_network);
+               wifi->pending_network = NULL;
+       }
+
+}
+
+static int network_disconnect(struct connman_network *network)
+{
+       struct connman_device *device = connman_network_get_device(network);
+       struct wifi_data *wifi;
+       int err;
+
+       DBG("network %p", network);
+
+       wifi = connman_device_get_data(device);
+       if (wifi == NULL || wifi->interface == NULL)
+               return -ENODEV;
+
+       connman_network_set_associating(network, FALSE);
+
+       if (wifi->disconnecting == TRUE)
+               return -EALREADY;
+
+       wifi->disconnecting = TRUE;
+
+       err = g_supplicant_interface_disconnect(wifi->interface,
+                                               disconnect_callback, wifi);
+       if (err < 0)
+               wifi->disconnecting = FALSE;
+
+       return err;
+}
+
+static struct connman_network_driver network_driver = {
+       .name           = "wifi",
+       .type           = CONNMAN_NETWORK_TYPE_WIFI,
+       .priority       = CONNMAN_NETWORK_PRIORITY_LOW,
+       .probe          = network_probe,
+       .remove         = network_remove,
+       .connect        = network_connect,
+       .disconnect     = network_disconnect,
+};
+
 static void interface_added(GSupplicantInterface *interface)
 {
        const char *ifname = g_supplicant_interface_get_ifname(interface);
        const char *driver = g_supplicant_interface_get_driver(interface);
        struct wifi_data *wifi;
 
-       wifi = (struct wifi_data *)g_supplicant_interface_get_data(interface);
+       wifi = g_supplicant_interface_get_data(interface);
+
+       /*
+        * We can get here with a NULL wifi pointer when
+        * the interface added signal is sent before the
+        * interface creation callback is called.
+        */
+       if (wifi == NULL)
+               return;
 
        DBG("ifname %s driver %s wifi %p", ifname, driver, wifi);
 
-       if (wifi == NULL || wifi->device == NULL) {
-               connman_error("Wrong wifi pointer");
+       if (wifi->device == NULL) {
+               connman_error("WiFi device not set");
                return;
        }
 
@@ -292,6 +524,96 @@ static void interface_added(GSupplicantInterface *interface)
        wifi_scan(wifi->device);
 }
 
+static connman_bool_t is_idle(struct wifi_data *wifi)
+{
+       DBG("state %d", wifi->state);
+
+       switch (wifi->state) {
+       case G_SUPPLICANT_STATE_UNKNOWN:
+       case G_SUPPLICANT_STATE_DISCONNECTED:
+       case G_SUPPLICANT_STATE_INACTIVE:
+       case G_SUPPLICANT_STATE_SCANNING:
+               return TRUE;
+
+       case G_SUPPLICANT_STATE_AUTHENTICATING:
+       case G_SUPPLICANT_STATE_ASSOCIATING:
+       case G_SUPPLICANT_STATE_ASSOCIATED:
+       case G_SUPPLICANT_STATE_4WAY_HANDSHAKE:
+       case G_SUPPLICANT_STATE_GROUP_HANDSHAKE:
+       case G_SUPPLICANT_STATE_COMPLETED:
+               return FALSE;
+       }
+
+       return FALSE;
+}
+
+static connman_bool_t is_idle_wps(GSupplicantInterface *interface,
+                                               struct wifi_data *wifi)
+{
+       /* First, let's check if WPS processing did not went wrong */
+       if (g_supplicant_interface_get_wps_state(interface) ==
+               G_SUPPLICANT_WPS_STATE_FAIL)
+               return FALSE;
+
+       /* Unlike normal connection, being associated while processing wps
+        * actually means that we are idling. */
+       switch (wifi->state) {
+       case G_SUPPLICANT_STATE_UNKNOWN:
+       case G_SUPPLICANT_STATE_DISCONNECTED:
+       case G_SUPPLICANT_STATE_INACTIVE:
+       case G_SUPPLICANT_STATE_SCANNING:
+       case G_SUPPLICANT_STATE_ASSOCIATED:
+               return TRUE;
+       case G_SUPPLICANT_STATE_AUTHENTICATING:
+       case G_SUPPLICANT_STATE_ASSOCIATING:
+       case G_SUPPLICANT_STATE_4WAY_HANDSHAKE:
+       case G_SUPPLICANT_STATE_GROUP_HANDSHAKE:
+       case G_SUPPLICANT_STATE_COMPLETED:
+               return FALSE;
+       }
+
+       return FALSE;
+}
+
+static connman_bool_t handle_wps_completion(GSupplicantInterface *interface,
+                                       struct connman_network *network,
+                                       struct connman_device *device,
+                                       struct wifi_data *wifi)
+{
+       connman_bool_t wps;
+
+       wps = connman_network_get_bool(network, "WiFi.UseWPS");
+       if (wps == TRUE) {
+               const unsigned char *ssid, *wps_ssid;
+               unsigned int ssid_len, wps_ssid_len;
+               const char *wps_key;
+
+               /* Checking if we got associated with requested
+                * network */
+               ssid = connman_network_get_blob(network, "WiFi.SSID",
+                                               &ssid_len);
+
+               wps_ssid = g_supplicant_interface_get_wps_ssid(
+                       interface, &wps_ssid_len);
+
+               if (wps_ssid == NULL || wps_ssid_len != ssid_len ||
+                               memcmp(ssid, wps_ssid, ssid_len) != 0) {
+                       connman_network_set_associating(network, FALSE);
+                       g_supplicant_interface_disconnect(wifi->interface,
+                                               disconnect_callback, wifi);
+                       return FALSE;
+               }
+
+               wps_key = g_supplicant_interface_get_wps_key(interface);
+               connman_network_set_string(network, "WiFi.Passphrase",
+                                       wps_key);
+
+               connman_network_set_string(network, "WiFi.PinWPS", NULL);
+       }
+
+       return TRUE;
+}
+
 static void interface_state(GSupplicantInterface *interface)
 {
        struct connman_network *network;
@@ -300,8 +622,9 @@ static void interface_state(GSupplicantInterface *interface)
        GSupplicantState state = g_supplicant_interface_get_state(interface);
        unsigned char bssid[ETH_ALEN];
        unsigned int bssid_len;
+       connman_bool_t wps;
 
-       wifi = (struct wifi_data *) g_supplicant_interface_get_data(interface);
+       wifi = g_supplicant_interface_get_data(interface);
 
        DBG("wifi %p interface state %d", wifi, state);
 
@@ -316,7 +639,6 @@ static void interface_state(GSupplicantInterface *interface)
 
        switch (state) {
        case G_SUPPLICANT_STATE_SCANNING:
-               connman_device_set_scanning(device, TRUE);
                break;
 
        case G_SUPPLICANT_STATE_AUTHENTICATING:
@@ -325,6 +647,10 @@ static void interface_state(GSupplicantInterface *interface)
                break;
 
        case G_SUPPLICANT_STATE_COMPLETED:
+               if (handle_wps_completion(interface, network, device, wifi) ==
+                                                                       FALSE)
+                       break;
+
                /* reset scan trigger and schedule background scan */
                connman_device_schedule_scan(device);
 
@@ -335,10 +661,25 @@ static void interface_state(GSupplicantInterface *interface)
                break;
 
        case G_SUPPLICANT_STATE_DISCONNECTED:
+               /*
+                * If we're in one of the idle modes, we have
+                * not started association yet and thus setting
+                * those ones to FALSE could cancel an association
+                * in progress.
+                */
+               wps = connman_network_get_bool(network, "WiFi.UseWPS");
+               if (wps == TRUE)
+                       if (is_idle_wps(interface, wifi) == TRUE)
+                               break;
+
+               if (is_idle(wifi))
+                       break;
+               connman_network_set_associating(network, FALSE);
                connman_network_set_connected(network, FALSE);
                break;
 
        case G_SUPPLICANT_STATE_INACTIVE:
+               connman_network_set_associating(network, FALSE);
                break;
 
        case G_SUPPLICANT_STATE_UNKNOWN:
@@ -348,6 +689,8 @@ static void interface_state(GSupplicantInterface *interface)
                break;
        }
 
+       wifi->state = state;
+
        DBG("DONE");
 }
 
@@ -358,7 +701,7 @@ static void interface_removed(GSupplicantInterface *interface)
 
        DBG("ifname %s", ifname);
 
-       wifi = (struct wifi_data *)g_supplicant_interface_get_data(interface);
+       wifi = g_supplicant_interface_get_data(interface);
 
        if (wifi == NULL || wifi->device == NULL) {
                connman_error("Wrong wifi pointer");
@@ -374,13 +717,10 @@ static void scan_started(GSupplicantInterface *interface)
 
        DBG("");
 
-       wifi = (struct wifi_data *)g_supplicant_interface_get_data(interface);
+       wifi = g_supplicant_interface_get_data(interface);
 
        if (wifi == NULL)
                return;
-
-       if (wifi->device)
-               connman_device_set_scanning(wifi->device, TRUE);
 }
 
 static void scan_finished(GSupplicantInterface *interface)
@@ -389,7 +729,7 @@ static void scan_finished(GSupplicantInterface *interface)
 
        DBG("");
 
-       wifi = (struct wifi_data *)g_supplicant_interface_get_data(interface);
+       wifi = g_supplicant_interface_get_data(interface);
 
        if (wifi == NULL)
                return;
@@ -411,27 +751,28 @@ static void network_added(GSupplicantNetwork *supplicant_network)
        struct connman_network *network;
        GSupplicantInterface *interface;
        struct wifi_data *wifi;
-       const char *name, *path, *identifier, *mode, *security, *group;
-       unsigned char *ssid;
+       const char *name, *identifier, *mode, *security, *group;
+       const unsigned char *ssid;
        unsigned int ssid_len;
+       connman_bool_t wps;
 
        DBG("");
 
        interface = g_supplicant_network_get_interface(supplicant_network);
-       wifi = (struct wifi_data *) g_supplicant_interface_get_data(interface);
+       wifi = g_supplicant_interface_get_data(interface);
        name = g_supplicant_network_get_name(supplicant_network);
-       path = g_supplicant_network_get_path(supplicant_network);
        identifier = g_supplicant_network_get_identifier(supplicant_network);
        mode = g_supplicant_network_get_mode(supplicant_network);
        security = g_supplicant_network_get_security(supplicant_network);
        group = g_supplicant_network_get_identifier(supplicant_network);
+       wps = g_supplicant_network_get_wps(supplicant_network);
 
        if (wifi == NULL)
                return;
 
-       ssid = (unsigned char *)g_supplicant_network_get_ssid(supplicant_network, &ssid_len);
+       ssid = g_supplicant_network_get_ssid(supplicant_network, &ssid_len);
 
-       network = connman_device_get_network(wifi->device, path);
+       network = connman_device_get_network(wifi->device, identifier);
 
        if (network == NULL) {
                network = connman_network_create(identifier,
@@ -441,9 +782,6 @@ static void network_added(GSupplicantNetwork *supplicant_network)
 
                connman_network_set_index(network, wifi->index);
 
-               connman_network_set_protocol(network,
-                                               CONNMAN_NETWORK_PROTOCOL_IP);
-
                if (connman_device_add_network(wifi->device, network) < 0) {
                        connman_network_unref(network);
                        return;
@@ -459,6 +797,7 @@ static void network_added(GSupplicantNetwork *supplicant_network)
        connman_network_set_string(network, "WiFi.Security", security);
        connman_network_set_strength(network,
                                calculate_strength(supplicant_network));
+       connman_network_set_bool(network, "WiFi.WPS", wps);
 
        connman_network_set_available(network, TRUE);
 
@@ -468,14 +807,25 @@ static void network_added(GSupplicantNetwork *supplicant_network)
 
 static void network_removed(GSupplicantNetwork *network)
 {
-       const char *name = g_supplicant_network_get_name(network);
+       GSupplicantInterface *interface;
+       struct wifi_data *wifi;
+       const char *name, *identifier;
 
-       DBG("* name %s", name);
+       interface = g_supplicant_network_get_interface(network);
+       wifi = g_supplicant_interface_get_data(interface);
+       identifier = g_supplicant_network_get_identifier(network);
+       name = g_supplicant_network_get_name(network);
+
+       DBG("name %s", name);
+
+       if (wifi != NULL)
+               connman_device_remove_network(wifi->device, identifier);
 }
 
 static void debug(const char *str)
 {
-       connman_debug("gsupplicant: %s", str);
+       if (getenv("CONNMAN_SUPPLICANT_DEBUG"))
+               connman_debug("%s", str);
 }
 
 static const GSupplicantCallbacks callbacks = {
@@ -492,145 +842,41 @@ static const GSupplicantCallbacks callbacks = {
 };
 
 
-static int network_probe(struct connman_network *network)
+static int tech_probe(struct connman_technology *technology)
 {
-       DBG("network %p", network);
+       wifi_technology = technology;
 
        return 0;
 }
 
-static void network_remove(struct connman_network *network)
+static void tech_remove(struct connman_technology *technology)
 {
-       DBG("network %p", network);
+       wifi_technology = NULL;
 }
 
-static void connect_callback(int result, GSupplicantInterface *interface,
-                                                       void *user_data)
+static void regdom_callback(void *user_data)
 {
-       connman_error("%s", __func__);
-}
+       char *alpha2 = user_data;
 
-static void disconnect_callback(int result, GSupplicantInterface *interface,
-                                                       void *user_data)
-{
-       struct wifi_data *wifi = user_data;
+       DBG("");
 
-       if (result < 0) {
-               connman_error("%s", __func__);
+       if (wifi_technology == NULL)
                return;
-       }
-
-       connman_network_unref(wifi->network);
-
-       wifi->network = NULL;
-}
-
-
-static GSupplicantSecurity network_security(const char *security)
-{
-       if (g_str_equal(security, "none") == TRUE)
-               return G_SUPPLICANT_SECURITY_NONE;
-       else if (g_str_equal(security, "wep") == TRUE)
-               return G_SUPPLICANT_SECURITY_WEP;
-       else if (g_str_equal(security, "psk") == TRUE)
-               return G_SUPPLICANT_SECURITY_PSK;
-       else if (g_str_equal(security, "wpa") == TRUE)
-               return G_SUPPLICANT_SECURITY_PSK;
-       else if (g_str_equal(security, "rsn") == TRUE)
-               return G_SUPPLICANT_SECURITY_PSK;
-       else if (g_str_equal(security, "ieee8021x") == TRUE)
-               return G_SUPPLICANT_SECURITY_IEEE8021X;
 
-       return G_SUPPLICANT_SECURITY_UNKNOWN;
+       connman_technology_regdom_notify(wifi_technology, alpha2);
 }
 
-static void ssid_init(GSupplicantSSID *ssid, struct connman_network *network)
+static int tech_set_regdom(struct connman_technology *technology, const char *alpha2)
 {
-       const char *security;
-
-       memset(ssid, 0, sizeof(*ssid));
-       ssid->ssid = connman_network_get_blob(network, "WiFi.SSID",
-                                               &ssid->ssid_len);
-       security = connman_network_get_string(network, "WiFi.Security");
-       ssid->security = network_security(security);
-       ssid->passphrase = connman_network_get_string(network,
-                                                       "WiFi.Passphrase");
-       ssid->eap = connman_network_get_string(network, "WiFi.EAP");
-
-       /*
-        * If our private key password is unset,
-        * we use the supplied passphrase. That is needed
-        * for PEAP where 2 passphrases (identity and client
-        * cert may have to be provided.
-        */
-       if (connman_network_get_string(network,
-                                       "WiFi.PrivateKeyPassphrase") == NULL)
-               connman_network_set_string(network,
-                                               "WiFi.PrivateKeyPassphrase",
-                                               ssid->passphrase);
-       /* We must have an identity for both PEAP and TLS */
-       ssid->identity = connman_network_get_string(network, "WiFi.Identity");
-       ssid->ca_cert_path = connman_network_get_string(network,
-                                                       "WiFi.CACertFile");
-       ssid->client_cert_path = connman_network_get_string(network,
-                                                       "WiFi.ClientCertFile");
-       ssid->private_key_path = connman_network_get_string(network,
-                                                       "WiFi.PrivateKeyFile");
-       ssid->private_key_passphrase = connman_network_get_string(network,
-                                               "WiFi.PrivateKeyPassphrase");
-       ssid->phase2_auth = connman_network_get_string(network, "WiFi.Phase2");
-
+       return g_supplicant_set_country(alpha2, regdom_callback, alpha2);
 }
 
-static int network_connect(struct connman_network *network)
-{
-       struct connman_device *device = connman_network_get_device(network);
-       struct wifi_data *wifi;
-       GSupplicantInterface *interface;
-       GSupplicantSSID ssid;
-
-       DBG("network %p", network);
-
-       if (device == NULL)
-               return -ENODEV;
-
-       wifi = connman_device_get_data(device);
-       if (wifi == NULL)
-               return -ENODEV;
-
-       interface = wifi->interface;
-
-       ssid_init(&ssid, network);
-
-       wifi->network = connman_network_ref(network);
-
-       return g_supplicant_interface_connect(interface, &ssid,
-                                               connect_callback, NULL);
-}
-
-static int network_disconnect(struct connman_network *network)
-{
-       struct connman_device *device = connman_network_get_device(network);
-       struct wifi_data *wifi;
-
-       DBG("network %p", network);
-
-       wifi = connman_device_get_data(device);
-       if (wifi == NULL || wifi->interface == NULL)
-               return -ENODEV;
-
-       return g_supplicant_interface_disconnect(wifi->interface,
-                                               disconnect_callback, wifi);
-}
-
-static struct connman_network_driver network_driver = {
+static struct connman_technology_driver tech_driver = {
        .name           = "wifi",
-       .type           = CONNMAN_NETWORK_TYPE_WIFI,
-       .priority       = CONNMAN_NETWORK_PRIORITY_LOW,
-       .probe          = network_probe,
-       .remove         = network_remove,
-       .connect        = network_connect,
-       .disconnect     = network_disconnect,
+       .type           = CONNMAN_SERVICE_TYPE_WIFI,
+       .probe          = tech_probe,
+       .remove         = tech_remove,
+       .set_regdom     = tech_set_regdom,
 };
 
 static int wifi_init(void)
@@ -647,6 +893,13 @@ static int wifi_init(void)
                return err;
        }
 
+       err = connman_technology_driver_register(&tech_driver);
+       if (err < 0) {
+               g_supplicant_unregister(&callbacks);
+               connman_network_driver_unregister(&network_driver);
+               return err;
+       }
+
        return 0;
 }
 
@@ -654,6 +907,8 @@ static void wifi_exit(void)
 {
        DBG();
 
+       connman_technology_driver_unregister(&tech_driver);
+
        g_supplicant_unregister(&callbacks);
 
        connman_network_driver_unregister(&network_driver);