mesh: Write close reason from Mesh Peering Close to debug log

[mech_eap.git] / wpa_supplicant / mesh.c

diff --git a/wpa_supplicant/mesh.c b/wpa_supplicant/mesh.c
index aed55da..dd534d4 100644 (file)
--- a/wpa_supplicant/mesh.c
+++ b/wpa_supplicant/mesh.c
@@ -70,6 +70,7 @@ static struct mesh_conf * mesh_config_create(struct wpa_supplicant *wpa_s,
                                             struct wpa_ssid *ssid)
 {
        struct mesh_conf *conf;
+       int cipher;
 
        conf = os_zalloc(sizeof(struct mesh_conf));
        if (!conf)
@@ -91,6 +92,26 @@ static struct mesh_conf * mesh_config_create(struct wpa_supplicant *wpa_s,
                        conf->ieee80211w = NO_MGMT_FRAME_PROTECTION;
        }
 
+       cipher = wpa_pick_pairwise_cipher(ssid->pairwise_cipher, 0);
+       if (cipher < 0 || cipher == WPA_CIPHER_TKIP) {
+               wpa_msg(wpa_s, MSG_INFO, "mesh: Invalid pairwise cipher");
+               os_free(conf);
+               return NULL;
+       }
+       conf->pairwise_cipher = cipher;
+
+       cipher = wpa_pick_group_cipher(ssid->group_cipher);
+       if (cipher < 0 || cipher == WPA_CIPHER_TKIP ||
+           cipher == WPA_CIPHER_GTK_NOT_USED) {
+               wpa_msg(wpa_s, MSG_INFO, "mesh: Invalid group cipher");
+               os_free(conf);
+               return NULL;
+       }
+
+       conf->group_cipher = cipher;
+       if (conf->ieee80211w != NO_MGMT_FRAME_PROTECTION)
+               conf->mgmt_group_cipher = WPA_CIPHER_AES_128_CMAC;
+
        /* defaults */
        conf->mesh_pp_id = MESH_PATH_PROTOCOL_HWMP;
        conf->mesh_pm_id = MESH_PATH_METRIC_AIRTIME;
@@ -343,15 +364,9 @@ int wpa_supplicant_join_mesh(struct wpa_supplicant *wpa_s,
 
        wpa_supplicant_mesh_deinit(wpa_s);
 
-       if (ssid->key_mgmt & WPA_KEY_MGMT_SAE) {
-               wpa_s->pairwise_cipher = WPA_CIPHER_CCMP;
-               wpa_s->group_cipher = WPA_CIPHER_CCMP;
-               wpa_s->mgmt_group_cipher = 0;
-       } else {
-               wpa_s->pairwise_cipher = WPA_CIPHER_NONE;
-               wpa_s->group_cipher = WPA_CIPHER_NONE;
-               wpa_s->mgmt_group_cipher = 0;
-       }
+       wpa_s->pairwise_cipher = WPA_CIPHER_NONE;
+       wpa_s->group_cipher = WPA_CIPHER_NONE;
+       wpa_s->mgmt_group_cipher = 0;
 
        os_memset(&params, 0, sizeof(params));
        params.meshid = ssid->ssid;
@@ -409,6 +424,12 @@ int wpa_supplicant_join_mesh(struct wpa_supplicant *wpa_s,
                goto out;
        }
 
+       if (ssid->key_mgmt & WPA_KEY_MGMT_SAE) {
+               wpa_s->pairwise_cipher = wpa_s->mesh_rsn->pairwise_cipher;
+               wpa_s->group_cipher = wpa_s->mesh_rsn->group_cipher;
+               wpa_s->mgmt_group_cipher = wpa_s->mesh_rsn->mgmt_group_cipher;
+       }
+
        if (wpa_s->ifmsh) {
                params.ies = wpa_s->ifmsh->mconf->rsn_ie;
                params.ie_len = wpa_s->ifmsh->mconf->rsn_ie_len;
@@ -424,6 +445,9 @@ int wpa_supplicant_join_mesh(struct wpa_supplicant *wpa_s,
        /* hostapd sets the interface down until we associate */
        wpa_drv_set_operstate(wpa_s, 1);
 
+       if (!ret)
+               wpa_supplicant_set_state(wpa_s, WPA_COMPLETED);
+
 out:
        return ret;
 }