]> git.ipfire.org Git - thirdparty/hostap.git/commitdiff
mesh: Add mesh peering manager
authorBob Copeland <me@bobcopeland.com>
Tue, 11 Mar 2014 04:07:01 +0000 (21:07 -0700)
committerJouni Malinen <j@w1.fi>
Sat, 25 Oct 2014 14:45:31 +0000 (17:45 +0300)
The mesh peering manager establishes and maintains links among
mesh peers, tracking each peer link via a finite state machine.

This implementation supports open mesh peerings.

[assorted fixes from Yu Niiro <yu.niiro@gmail.com>]
[more fixes from Masashi Honma <masashi.honma@gmail.com>]
Signed-off-by: Javier Lopez <jlopex@gmail.com>
Signed-off-by: Javier Cardona <javier@cozybit.com>
Signed-off-by: Ashok Nagarajan <ashok.dragon@gmail.com>
Signed-off-by: Jason Mobarak <x@jason.mobarak.name>
Signed-hostap: Bob Copeland <me@bobcopeland.com>

src/ap/hostapd.h
src/ap/sta_info.h
src/common/ieee802_11_defs.h
src/common/wpa_ctrl.h
wpa_supplicant/Android.mk
wpa_supplicant/Makefile
wpa_supplicant/events.c
wpa_supplicant/mesh.c
wpa_supplicant/mesh_mpm.c [new file with mode: 0644]
wpa_supplicant/mesh_mpm.h [new file with mode: 0644]

index df3ade06f55cc5c3d32ee94b7a2cb75c04e08fdb..3f79413d6c2604b1550c1d615ad3de92bc430f7c 100644 (file)
@@ -241,6 +241,10 @@ struct hostapd_data {
 #ifdef CONFIG_INTERWORKING
        size_t gas_frag_limit;
 #endif /* CONFIG_INTERWORKING */
+#ifdef CONFIG_MESH
+       int num_plinks;
+       int max_plinks;
+#endif /* CONFIG_MESH */
 
 #ifdef CONFIG_SQLITE
        struct hostapd_eap_user tmp_eap_user;
index faf32d859efb2300ef19ba0bcd0c7618a8586029..c4c88250aa10e6e30c15bacf9c50e0c29d58ec33 100644 (file)
@@ -9,6 +9,11 @@
 #ifndef STA_INFO_H
 #define STA_INFO_H
 
+#ifdef CONFIG_MESH
+/* needed for mesh_plink_state enum */
+#include "common/defs.h"
+#endif /* CONFIG_MESH */
+
 /* STA flags */
 #define WLAN_STA_AUTH BIT(0)
 #define WLAN_STA_ASSOC BIT(1)
@@ -49,6 +54,14 @@ struct sta_info {
        int supported_rates_len;
        u8 qosinfo; /* Valid when WLAN_STA_WMM is set */
 
+#ifdef CONFIG_MESH
+       enum mesh_plink_state plink_state;
+       u16 peer_lid;
+       u16 my_lid;
+       u16 mpm_close_reason;
+       int mpm_retries;
+#endif /* CONFIG_MESH */
+
        unsigned int nonerp_set:1;
        unsigned int no_short_slot_time_set:1;
        unsigned int no_short_preamble_set:1;
index 3238bd4a6ce826c998b1048f32355a87ff7fc537..f5adbc026caeeed9e67b40a83b212bc01ebe0e4e 100644 (file)
@@ -1124,6 +1124,12 @@ enum wifi_display_subelem {
 #define MESH_PATH_METRIC_AIRTIME       1
 #define MESH_PATH_METRIC_VENDOR                255
 
+enum plink_action_field {
+       PLINK_OPEN = 1,
+       PLINK_CONFIRM,
+       PLINK_CLOSE
+};
+
 #define OUI_BROADCOM 0x00904c /* Broadcom (Epigram) */
 
 #define VENDOR_HT_CAPAB_OUI_TYPE 0x33 /* 00-90-4c:0x33 */
index e4619a7d5a1ab6720b04553163ce3bd69423dbb1..9c6188cb3335bdf352600958593b815b60afc0d6 100644 (file)
@@ -118,6 +118,10 @@ extern "C" {
 #define WPS_EVENT_ER_AP_SETTINGS "WPS-ER-AP-SETTINGS "
 #define WPS_EVENT_ER_SET_SEL_REG "WPS-ER-AP-SET-SEL-REG "
 
+/* MESH events */
+#define MESH_PEER_CONNECTED "MESH-PEER-CONNECTED "
+#define MESH_PEER_DISCONNECTED "MESH-PEER-DISCONNECTED "
+
 /** P2P device found */
 #define P2P_EVENT_DEVICE_FOUND "P2P-DEVICE-FOUND "
 
index 48ff99fa6a57ff197bb325a1eecedcbab812acc1..bfe5215fb7459866224e152f6b61038d379f0e4d 100644 (file)
@@ -199,6 +199,7 @@ ifdef CONFIG_MESH
 NEED_80211_COMMON=y
 L_CFLAGS += -DCONFIG_MESH
 OBJS += mesh.c
+OBJS += mesh_mpm.c
 endif
 
 ifdef CONFIG_SAE
index b6389b07fc9d06cb005ddba8ae475eb750e732ff..7e19cf8417752b0107af0fd553762438e137a38d 100644 (file)
@@ -202,6 +202,7 @@ ifdef CONFIG_MESH
 NEED_80211_COMMON=y
 CFLAGS += -DCONFIG_MESH
 OBJS += mesh.o
+OBJS += mesh_mpm.o
 endif
 
 ifdef CONFIG_SAE
index 34d8226a498b32f3a7fe48a921be4bbf738811c5..189dacd0c2376105208731b35f4d64db2d5bc971 100644 (file)
@@ -43,6 +43,7 @@
 #include "offchannel.h"
 #include "interworking.h"
 #include "mesh.h"
+#include "mesh_mpm.h"
 
 
 #ifndef CONFIG_NO_SCAN_PROCESSING
@@ -2840,6 +2841,8 @@ static void wpas_event_rx_mgmt_action(struct wpa_supplicant *wpa_s,
 
        wpas_p2p_rx_action(wpa_s, mgmt->da, mgmt->sa, mgmt->bssid,
                           category, payload, plen, freq);
+       if (wpa_s->ifmsh)
+               mesh_mpm_action_rx(wpa_s, mgmt, len);
 }
 
 
@@ -3209,7 +3212,9 @@ void wpa_supplicant_event(void *ctx, enum wpa_event_type event,
                        }
 #endif /* CONFIG_P2P */
 #ifdef CONFIG_IBSS_RSN
-                       if (stype == WLAN_FC_STYPE_AUTH &&
+                       if (wpa_s->current_ssid &&
+                           wpa_s->current_ssid->mode == WPAS_MODE_IBSS &&
+                           stype == WLAN_FC_STYPE_AUTH &&
                            data->rx_mgmt.frame_len >= 30) {
                                wpa_supplicant_event_ibss_auth(wpa_s, data);
                                break;
@@ -3224,6 +3229,11 @@ void wpa_supplicant_event(void *ctx, enum wpa_event_type event,
                                break;
                        }
 
+                       if (wpa_s->ifmsh) {
+                               mesh_mpm_mgmt_rx(wpa_s, &data->rx_mgmt);
+                               break;
+                       }
+
                        wpa_dbg(wpa_s, MSG_DEBUG, "AP: ignore received "
                                "management frame in non-AP mode");
                        break;
index 320440c6a5eefe50105b601b902d35fb195014e1..efacf7081383526ce0d0871668ca756d78985878 100644 (file)
@@ -21,6 +21,7 @@
 #include "wpa_supplicant_i.h"
 #include "driver_i.h"
 #include "notify.h"
+#include "mesh_mpm.h"
 #include "mesh.h"
 
 
@@ -41,6 +42,7 @@ void wpa_supplicant_mesh_iface_deinit(struct wpa_supplicant *wpa_s,
                return;
 
        if (ifmsh->mconf) {
+               mesh_mpm_deinit(wpa_s, ifmsh);
                if (ifmsh->mconf->ies) {
                        ifmsh->mconf->ies = NULL;
                        /* We cannot free this struct
@@ -117,6 +119,13 @@ static int wpa_supplicant_mesh_init(struct wpa_supplicant *wpa_s,
        static int default_groups[] = { 19, 20, 21, 25, 26, -1 };
        size_t len;
 
+       if (!wpa_s->conf->user_mpm) {
+               /* not much for us to do here */
+               wpa_msg(wpa_s, MSG_WARNING,
+                       "user_mpm is not enabled in configuration");
+               return 0;
+       }
+
        wpa_s->ifmsh = ifmsh = os_zalloc(sizeof(*wpa_s->ifmsh));
        if (!ifmsh)
                return -ENOMEM;
@@ -149,6 +158,7 @@ static int wpa_supplicant_mesh_init(struct wpa_supplicant *wpa_s,
        bss->iconf = conf;
        ifmsh->conf = conf;
 
+       ifmsh->bss[0]->max_plinks = 99;
        os_strlcpy(bss->conf->iface, wpa_s->ifname, sizeof(bss->conf->iface));
 
        mconf = mesh_config_create(ssid);
@@ -241,7 +251,9 @@ void wpa_mesh_notify_peer(struct wpa_supplicant *wpa_s, const u8 *addr,
        if (ieee802_11_parse_elems(ies, ie_len, &elems, 0) == ParseFailed) {
                wpa_msg(wpa_s, MSG_INFO, "Could not parse beacon from " MACSTR,
                        MAC2STR(addr));
+               return;
        }
+       wpa_mesh_new_mesh_peer(wpa_s, addr, &elems);
 }
 
 
@@ -266,10 +278,16 @@ int wpa_supplicant_join_mesh(struct wpa_supplicant *wpa_s,
        if (ssid->key_mgmt & WPA_KEY_MGMT_SAE) {
                params.flags |= WPA_DRIVER_MESH_FLAG_SAE_AUTH;
                params.flags |= WPA_DRIVER_MESH_FLAG_AMPE;
+               wpa_s->conf->user_mpm = 1;
        }
 
-       params.flags |= WPA_DRIVER_MESH_FLAG_DRIVER_MPM;
-       params.conf.flags |= WPA_DRIVER_MESH_CONF_FLAG_AUTO_PLINKS;
+       if (wpa_s->conf->user_mpm) {
+               params.flags |= WPA_DRIVER_MESH_FLAG_USER_MPM;
+               params.conf.flags &= ~WPA_DRIVER_MESH_CONF_FLAG_AUTO_PLINKS;
+       } else {
+               params.flags |= WPA_DRIVER_MESH_FLAG_DRIVER_MPM;
+               params.conf.flags |= WPA_DRIVER_MESH_CONF_FLAG_AUTO_PLINKS;
+       }
 
        if (wpa_supplicant_mesh_init(wpa_s, ssid)) {
                wpa_msg(wpa_s, MSG_ERROR, "Failed to init mesh");
diff --git a/wpa_supplicant/mesh_mpm.c b/wpa_supplicant/mesh_mpm.c
new file mode 100644 (file)
index 0000000..aa28324
--- /dev/null
@@ -0,0 +1,853 @@
+/*
+ * WPA Supplicant - Basic mesh peer management
+ * Copyright (c) 2013-2014, cozybit, Inc.  All rights reserved.
+ *
+ * This software may be distributed under the terms of the BSD license.
+ * See README for more details.
+ */
+
+#include "utils/includes.h"
+
+#include "utils/common.h"
+#include "utils/eloop.h"
+#include "common/ieee802_11_defs.h"
+#include "ap/hostapd.h"
+#include "ap/sta_info.h"
+#include "ap/ieee802_11.h"
+#include "wpa_supplicant_i.h"
+#include "driver_i.h"
+#include "mesh_mpm.h"
+
+/* TODO make configurable */
+#define dot11MeshMaxRetries 10
+#define dot11MeshRetryTimeout 1
+#define dot11MeshConfirmTimeout 1
+#define dot11MeshHoldingTimeout 1
+
+struct mesh_peer_mgmt_ie {
+       const u8 *proto_id;
+       const u8 *llid;
+       const u8 *plid;
+       const u8 *reason;
+       const u8 *pmk;
+};
+
+static void plink_timer(void *eloop_ctx, void *user_data);
+
+
+enum plink_event {
+       PLINK_UNDEFINED,
+       OPN_ACPT,
+       OPN_RJCT,
+       OPN_IGNR,
+       CNF_ACPT,
+       CNF_RJCT,
+       CNF_IGNR,
+       CLS_ACPT,
+       CLS_IGNR
+};
+
+static const char * const mplstate[] = {
+       [PLINK_LISTEN] = "LISTEN",
+       [PLINK_OPEN_SENT] = "OPEN_SENT",
+       [PLINK_OPEN_RCVD] = "OPEN_RCVD",
+       [PLINK_CNF_RCVD] = "CNF_RCVD",
+       [PLINK_ESTAB] = "ESTAB",
+       [PLINK_HOLDING] = "HOLDING",
+       [PLINK_BLOCKED] = "BLOCKED"
+};
+
+static const char * const mplevent[] = {
+       [PLINK_UNDEFINED] = "UNDEFINED",
+       [OPN_ACPT] = "OPN_ACPT",
+       [OPN_RJCT] = "OPN_RJCT",
+       [OPN_IGNR] = "OPN_IGNR",
+       [CNF_ACPT] = "CNF_ACPT",
+       [CNF_RJCT] = "CNF_RJCT",
+       [CNF_IGNR] = "CNF_IGNR",
+       [CLS_ACPT] = "CLS_ACPT",
+       [CLS_IGNR] = "CLS_IGNR"
+};
+
+
+static int mesh_mpm_parse_peer_mgmt(struct wpa_supplicant *wpa_s,
+                                   u8 action_field,
+                                   const u8 *ie, size_t len,
+                                   struct mesh_peer_mgmt_ie *mpm_ie)
+{
+       os_memset(mpm_ie, 0, sizeof(*mpm_ie));
+
+       /* remove optional PMK at end */
+       if (len >= 16) {
+               len -= 16;
+               mpm_ie->pmk = ie + len - 16;
+       }
+
+       if ((action_field == PLINK_OPEN && len != 4) ||
+           (action_field == PLINK_CONFIRM && len != 6) ||
+           (action_field == PLINK_CLOSE && len != 6 && len != 8)) {
+               wpa_msg(wpa_s, MSG_DEBUG, "MPM: Invalid peer mgmt ie");
+               return -1;
+       }
+
+       /* required fields */
+       if (len < 4)
+               return -1;
+       mpm_ie->proto_id = ie;
+       mpm_ie->llid = ie + 2;
+       ie += 4;
+       len -= 4;
+
+       /* close reason is always present at end for close */
+       if (action_field == PLINK_CLOSE) {
+               if (len < 2)
+                       return -1;
+               mpm_ie->reason = ie + len - 2;
+               len -= 2;
+       }
+
+       /* plid, present for confirm, and possibly close */
+       if (len)
+               mpm_ie->plid = ie;
+
+       return 0;
+}
+
+
+static int plink_free_count(struct hostapd_data *hapd)
+{
+       if (hapd->max_plinks > hapd->num_plinks)
+               return hapd->max_plinks - hapd->num_plinks;
+       return 0;
+}
+
+
+static u16 copy_supp_rates(struct wpa_supplicant *wpa_s,
+                          struct sta_info *sta,
+                          struct ieee802_11_elems *elems)
+{
+       if (!elems->supp_rates) {
+               wpa_msg(wpa_s, MSG_ERROR, "no supported rates from " MACSTR,
+                       MAC2STR(sta->addr));
+               return WLAN_STATUS_UNSPECIFIED_FAILURE;
+       }
+
+       if (elems->supp_rates_len + elems->ext_supp_rates_len >
+           sizeof(sta->supported_rates)) {
+               wpa_msg(wpa_s, MSG_ERROR,
+                       "Invalid supported rates element length " MACSTR
+                       " %d+%d", MAC2STR(sta->addr), elems->supp_rates_len,
+                       elems->ext_supp_rates_len);
+               return WLAN_STATUS_UNSPECIFIED_FAILURE;
+       }
+
+       sta->supported_rates_len = merge_byte_arrays(
+               sta->supported_rates, sizeof(sta->supported_rates),
+               elems->supp_rates, elems->supp_rates_len,
+               elems->ext_supp_rates, elems->ext_supp_rates_len);
+
+       return WLAN_STATUS_SUCCESS;
+}
+
+
+/* return true if elems from a neighbor match this MBSS */
+static Boolean matches_local(struct wpa_supplicant *wpa_s,
+                            struct ieee802_11_elems *elems)
+{
+       struct mesh_conf *mconf = wpa_s->ifmsh->mconf;
+
+       if (elems->mesh_config_len < 5)
+               return FALSE;
+
+       return (mconf->meshid_len == elems->mesh_id_len &&
+               os_memcmp(mconf->meshid, elems->mesh_id,
+                         elems->mesh_id_len) == 0 &&
+               mconf->mesh_pp_id == elems->mesh_config[0] &&
+               mconf->mesh_pm_id == elems->mesh_config[1] &&
+               mconf->mesh_cc_id == elems->mesh_config[2] &&
+               mconf->mesh_sp_id == elems->mesh_config[3] &&
+               mconf->mesh_auth_id == elems->mesh_config[4]);
+}
+
+
+/* check if local link id is already used with another peer */
+static Boolean llid_in_use(struct wpa_supplicant *wpa_s, u16 llid)
+{
+       struct sta_info *sta;
+       struct hostapd_data *hapd = wpa_s->ifmsh->bss[0];
+
+       for (sta = hapd->sta_list; sta; sta = sta->next) {
+               if (sta->my_lid == llid)
+                       return TRUE;
+       }
+
+       return FALSE;
+}
+
+
+/* generate an llid for a link and set to initial state */
+static void mesh_mpm_init_link(struct wpa_supplicant *wpa_s,
+                              struct sta_info *sta)
+{
+       u16 llid;
+
+       do {
+               if (os_get_random((u8 *) &llid, sizeof(llid)) < 0)
+                       continue;
+       } while (!llid || llid_in_use(wpa_s, llid));
+
+       sta->my_lid = llid;
+       sta->peer_lid = 0;
+       sta->plink_state = PLINK_LISTEN;
+}
+
+
+static void mesh_mpm_send_plink_action(struct wpa_supplicant *wpa_s,
+                                      struct sta_info *sta,
+                                      enum plink_action_field type,
+                                      u16 close_reason)
+{
+       struct wpabuf *buf;
+       struct hostapd_iface *ifmsh = wpa_s->ifmsh;
+       struct hostapd_data *bss = ifmsh->bss[0];
+       struct mesh_conf *conf = ifmsh->mconf;
+       u8 supp_rates[2 + 2 + 32];
+       u8 *pos;
+       u8 ie_len, add_plid = 0;
+       int ret;
+       int ampe = conf->security & MESH_CONF_SEC_AMPE;
+
+       if (!sta)
+               return;
+
+       buf = wpabuf_alloc(2 +      /* capability info */
+                          2 +      /* AID */
+                          2 + 8 +  /* supported rates */
+                          2 + (32 - 8) +
+                          2 + 32 + /* mesh ID */
+                          2 + 7 +  /* mesh config */
+                          2 + 26 + /* HT capabilities */
+                          2 + 22 + /* HT operation */
+                          2 + 23 + /* peering management */
+                          2 + 96 + /* AMPE */
+                          2 + 16); /* MIC */
+       if (!buf)
+               return;
+
+       wpabuf_put_u8(buf, WLAN_ACTION_SELF_PROTECTED);
+       wpabuf_put_u8(buf, type);
+
+       if (type != PLINK_CLOSE) {
+               /* capability info */
+               wpabuf_put_le16(buf, ampe ? IEEE80211_CAP_PRIVACY : 0);
+
+               if (type == PLINK_CONFIRM)
+                       wpabuf_put_le16(buf, sta->peer_lid);
+
+               /* IE: supp + ext. supp rates */
+               pos = hostapd_eid_supp_rates(bss, supp_rates);
+               pos = hostapd_eid_ext_supp_rates(bss, pos);
+               wpabuf_put_data(buf, supp_rates, pos - supp_rates);
+
+               /* IE: Mesh ID */
+               wpabuf_put_u8(buf, WLAN_EID_MESH_ID);
+               wpabuf_put_u8(buf, conf->meshid_len);
+               wpabuf_put_data(buf, conf->meshid, conf->meshid_len);
+
+               /* IE: mesh conf */
+               wpabuf_put_u8(buf, WLAN_EID_MESH_CONFIG);
+               wpabuf_put_u8(buf, 7);
+               wpabuf_put_u8(buf, conf->mesh_pp_id);
+               wpabuf_put_u8(buf, conf->mesh_pm_id);
+               wpabuf_put_u8(buf, conf->mesh_cc_id);
+               wpabuf_put_u8(buf, conf->mesh_sp_id);
+               wpabuf_put_u8(buf, conf->mesh_auth_id);
+               /* TODO: formation info */
+               wpabuf_put_u8(buf, 0);
+               /* always forwarding & accepting plinks for now */
+               wpabuf_put_u8(buf, 0x1 | 0x8);
+       } else {        /* Peer closing frame */
+               /* IE: Mesh ID */
+               wpabuf_put_u8(buf, WLAN_EID_MESH_ID);
+               wpabuf_put_u8(buf, conf->meshid_len);
+               wpabuf_put_data(buf, conf->meshid, conf->meshid_len);
+       }
+
+       /* IE: Mesh Peering Management element */
+       ie_len = 4;
+       if (ampe)
+               ie_len += PMKID_LEN;
+       switch (type) {
+       case PLINK_OPEN:
+               break;
+       case PLINK_CONFIRM:
+               ie_len += 2;
+               add_plid = 1;
+               break;
+       case PLINK_CLOSE:
+               ie_len += 2;
+               add_plid = 1;
+               ie_len += 2; /* reason code */
+               break;
+       }
+
+       wpabuf_put_u8(buf, WLAN_EID_PEER_MGMT);
+       wpabuf_put_u8(buf, ie_len);
+       /* peering protocol */
+       if (ampe)
+               wpabuf_put_le16(buf, 1);
+       else
+               wpabuf_put_le16(buf, 0);
+       wpabuf_put_le16(buf, sta->my_lid);
+       if (add_plid)
+               wpabuf_put_le16(buf, sta->peer_lid);
+       if (type == PLINK_CLOSE)
+               wpabuf_put_le16(buf, close_reason);
+
+       /* TODO HT IEs */
+
+       ret = wpa_drv_send_action(wpa_s, wpa_s->assoc_freq, 0,
+                                 sta->addr, wpa_s->own_addr, wpa_s->own_addr,
+                                 wpabuf_head(buf), wpabuf_len(buf), 0);
+       if (ret < 0)
+               wpa_msg(wpa_s, MSG_INFO,
+                       "Mesh MPM: failed to send peering frame");
+
+       wpabuf_free(buf);
+}
+
+
+/* configure peering state in ours and driver's station entry */
+static void
+wpa_mesh_set_plink_state(struct wpa_supplicant *wpa_s, struct sta_info *sta,
+                        enum mesh_plink_state state)
+{
+       struct hostapd_sta_add_params params;
+       int ret;
+
+       sta->plink_state = state;
+
+       os_memset(&params, 0, sizeof(params));
+       params.addr = sta->addr;
+       params.plink_state = state;
+       params.set = 1;
+
+       wpa_msg(wpa_s, MSG_DEBUG, "MPM set " MACSTR " into %s",
+               MAC2STR(sta->addr), mplstate[state]);
+       ret = wpa_drv_sta_add(wpa_s, &params);
+       if (ret) {
+               wpa_msg(wpa_s, MSG_ERROR, "Driver failed to set " MACSTR
+                       ": %d", MAC2STR(sta->addr), ret);
+       }
+}
+
+
+static void mesh_mpm_fsm_restart(struct wpa_supplicant *wpa_s,
+                                struct sta_info *sta)
+{
+       struct hostapd_data *hapd = wpa_s->ifmsh->bss[0];
+
+       eloop_cancel_timeout(plink_timer, wpa_s, sta);
+
+       if (sta->mpm_close_reason == WLAN_REASON_MESH_CLOSE_RCVD) {
+               ap_free_sta(hapd, sta);
+               return;
+       }
+
+       wpa_mesh_set_plink_state(wpa_s, sta, PLINK_LISTEN);
+       sta->my_lid = sta->peer_lid = sta->mpm_close_reason = 0;
+       sta->mpm_retries = 0;
+}
+
+
+static void plink_timer(void *eloop_ctx, void *user_data)
+{
+       struct wpa_supplicant *wpa_s = eloop_ctx;
+       struct sta_info *sta = user_data;
+       u16 reason = 0;
+
+       switch (sta->plink_state) {
+       case PLINK_OPEN_RCVD:
+       case PLINK_OPEN_SENT:
+               /* retry timer */
+               if (sta->mpm_retries < dot11MeshMaxRetries) {
+                       eloop_register_timeout(dot11MeshRetryTimeout, 0,
+                                              plink_timer, wpa_s, sta);
+                       mesh_mpm_send_plink_action(wpa_s, sta, PLINK_OPEN, 0);
+                       sta->mpm_retries++;
+                       break;
+               }
+               reason = WLAN_REASON_MESH_MAX_RETRIES;
+               /* fall through on else */
+
+       case PLINK_CNF_RCVD:
+               /* confirm timer */
+               if (!reason)
+                       reason = WLAN_REASON_MESH_CONFIRM_TIMEOUT;
+               sta->plink_state = PLINK_HOLDING;
+               eloop_register_timeout(dot11MeshHoldingTimeout, 0,
+                                      plink_timer, wpa_s, sta);
+               mesh_mpm_send_plink_action(wpa_s, sta, PLINK_CLOSE, reason);
+               break;
+       case PLINK_HOLDING:
+               /* holding timer */
+               mesh_mpm_fsm_restart(wpa_s, sta);
+               break;
+       default:
+               break;
+       }
+}
+
+
+/* initiate peering with station */
+static void
+mesh_mpm_plink_open(struct wpa_supplicant *wpa_s, struct sta_info *sta,
+                   enum mesh_plink_state next_state)
+{
+       eloop_cancel_timeout(plink_timer, wpa_s, sta);
+       eloop_register_timeout(dot11MeshRetryTimeout, 0, plink_timer,
+                              wpa_s, sta);
+       mesh_mpm_send_plink_action(wpa_s, sta, PLINK_OPEN, 0);
+       wpa_mesh_set_plink_state(wpa_s, sta, next_state);
+}
+
+
+int mesh_mpm_plink_close(struct hostapd_data *hapd,
+                        struct sta_info *sta, void *ctx)
+{
+       struct wpa_supplicant *wpa_s = ctx;
+       int reason = WLAN_REASON_MESH_PEERING_CANCELLED;
+
+       if (sta) {
+               wpa_mesh_set_plink_state(wpa_s, sta, PLINK_HOLDING);
+               mesh_mpm_send_plink_action(wpa_s, sta, PLINK_CLOSE, reason);
+               wpa_printf(MSG_DEBUG, "MPM closing plink sta=" MACSTR,
+                          MAC2STR(sta->addr));
+               eloop_cancel_timeout(plink_timer, wpa_s, sta);
+               return 0;
+       }
+
+       return 1;
+}
+
+
+void mesh_mpm_deinit(struct wpa_supplicant *wpa_s, struct hostapd_iface *ifmsh)
+{
+       struct hostapd_data *hapd = ifmsh->bss[0];
+
+       /* notify peers we're leaving */
+       ap_for_each_sta(hapd, mesh_mpm_plink_close, wpa_s);
+
+       hapd->num_plinks = 0;
+       hostapd_free_stas(hapd);
+}
+
+
+/* for mesh_rsn to indicate this peer has completed authentication, and we're
+ * ready to start AMPE */
+void mesh_mpm_auth_peer(struct wpa_supplicant *wpa_s, const u8 *addr)
+{
+       struct hostapd_data *data = wpa_s->ifmsh->bss[0];
+       struct hostapd_sta_add_params params;
+       struct sta_info *sta;
+       int ret;
+
+       sta = ap_get_sta(data, addr);
+       if (!sta) {
+               wpa_msg(wpa_s, MSG_DEBUG, "no such mesh peer");
+               return;
+       }
+
+       /* TODO: Should do nothing if this STA is already authenticated, but
+        * the AP code already sets this flag. */
+       sta->flags |= WLAN_STA_AUTH;
+
+       os_memset(&params, 0, sizeof(params));
+       params.addr = sta->addr;
+       params.flags = WPA_STA_AUTHENTICATED | WPA_STA_AUTHORIZED;
+       params.set = 1;
+
+       wpa_msg(wpa_s, MSG_DEBUG, "MPM authenticating " MACSTR,
+               MAC2STR(sta->addr));
+       ret = wpa_drv_sta_add(wpa_s, &params);
+       if (ret) {
+               wpa_msg(wpa_s, MSG_ERROR,
+                       "Driver failed to set " MACSTR ": %d",
+                       MAC2STR(sta->addr), ret);
+       }
+
+       if (!sta->my_lid)
+               mesh_mpm_init_link(wpa_s, sta);
+
+       mesh_mpm_plink_open(wpa_s, sta, PLINK_OPEN_SENT);
+}
+
+
+void wpa_mesh_new_mesh_peer(struct wpa_supplicant *wpa_s, const u8 *addr,
+                           struct ieee802_11_elems *elems)
+{
+       struct hostapd_sta_add_params params;
+       struct mesh_conf *conf = wpa_s->ifmsh->mconf;
+       struct hostapd_data *data = wpa_s->ifmsh->bss[0];
+       struct sta_info *sta;
+       int ret = 0;
+
+       sta = ap_get_sta(data, addr);
+       if (!sta) {
+               sta = ap_sta_add(data, addr);
+               if (!sta)
+                       return;
+       }
+
+       /* initialize sta */
+       if (copy_supp_rates(wpa_s, sta, elems))
+               return;
+
+       mesh_mpm_init_link(wpa_s, sta);
+
+       /* insert into driver */
+       os_memset(&params, 0, sizeof(params));
+       params.supp_rates = sta->supported_rates;
+       params.supp_rates_len = sta->supported_rates_len;
+       params.addr = addr;
+       params.plink_state = sta->plink_state;
+       params.aid = sta->peer_lid;
+       params.listen_interval = 100;
+       /* TODO: HT capabilities */
+       params.flags |= WPA_STA_WMM;
+       params.flags_mask |= WPA_STA_AUTHENTICATED;
+       if (conf->security == MESH_CONF_SEC_NONE) {
+               params.flags |= WPA_STA_AUTHORIZED;
+               params.flags |= WPA_STA_AUTHENTICATED;
+       } else {
+               sta->flags |= WLAN_STA_MFP;
+               params.flags |= WPA_STA_MFP;
+       }
+
+       ret = wpa_drv_sta_add(wpa_s, &params);
+       if (ret) {
+               wpa_msg(wpa_s, MSG_ERROR,
+                       "Driver failed to insert " MACSTR ": %d",
+                       MAC2STR(addr), ret);
+               return;
+       }
+
+       mesh_mpm_plink_open(wpa_s, sta, PLINK_OPEN_SENT);
+}
+
+
+void mesh_mpm_mgmt_rx(struct wpa_supplicant *wpa_s, struct rx_mgmt *rx_mgmt)
+{
+       struct hostapd_frame_info fi;
+
+       os_memset(&fi, 0, sizeof(fi));
+       fi.datarate = rx_mgmt->datarate;
+       fi.ssi_signal = rx_mgmt->ssi_signal;
+       ieee802_11_mgmt(wpa_s->ifmsh->bss[0], rx_mgmt->frame,
+                       rx_mgmt->frame_len, &fi);
+}
+
+
+static void mesh_mpm_plink_estab(struct wpa_supplicant *wpa_s,
+                                struct sta_info *sta)
+{
+       struct hostapd_data *hapd = wpa_s->ifmsh->bss[0];
+
+       wpa_msg(wpa_s, MSG_INFO, "mesh plink with " MACSTR " established",
+               MAC2STR(sta->addr));
+
+       wpa_mesh_set_plink_state(wpa_s, sta, PLINK_ESTAB);
+       hapd->num_plinks++;
+
+       sta->flags |= WLAN_STA_ASSOC;
+
+       eloop_cancel_timeout(plink_timer, wpa_s, sta);
+
+       /* Send ctrl event */
+       wpa_msg_ctrl(wpa_s, MSG_INFO, MESH_PEER_CONNECTED MACSTR,
+                    MAC2STR(sta->addr));
+}
+
+
+static void mesh_mpm_fsm(struct wpa_supplicant *wpa_s, struct sta_info *sta,
+                        enum plink_event event)
+{
+       struct hostapd_data *hapd = wpa_s->ifmsh->bss[0];
+       u16 reason = 0;
+
+       wpa_msg(wpa_s, MSG_DEBUG, "MPM " MACSTR " state %s event %s",
+               MAC2STR(sta->addr), mplstate[sta->plink_state],
+               mplevent[event]);
+
+       switch (sta->plink_state) {
+       case PLINK_LISTEN:
+               switch (event) {
+               case CLS_ACPT:
+                       mesh_mpm_fsm_restart(wpa_s, sta);
+                       break;
+               case OPN_ACPT:
+                       mesh_mpm_plink_open(wpa_s, sta, PLINK_OPEN_RCVD);
+                       mesh_mpm_send_plink_action(wpa_s, sta, PLINK_CONFIRM,
+                                                  0);
+                       break;
+               default:
+                       break;
+               }
+               break;
+       case PLINK_OPEN_SENT:
+               switch (event) {
+               case OPN_RJCT:
+               case CNF_RJCT:
+                       reason = WLAN_REASON_MESH_CONFIG_POLICY_VIOLATION;
+                       /* fall-through */
+               case CLS_ACPT:
+                       wpa_mesh_set_plink_state(wpa_s, sta, PLINK_HOLDING);
+                       if (!reason)
+                               reason = WLAN_REASON_MESH_CLOSE_RCVD;
+                       eloop_register_timeout(dot11MeshHoldingTimeout, 0,
+                                              plink_timer, wpa_s, sta);
+                       mesh_mpm_send_plink_action(wpa_s, sta,
+                                                  PLINK_CLOSE, reason);
+                       break;
+               case OPN_ACPT:
+                       /* retry timer is left untouched */
+                       wpa_mesh_set_plink_state(wpa_s, sta, PLINK_OPEN_RCVD);
+                       mesh_mpm_send_plink_action(wpa_s, sta,
+                                                  PLINK_CONFIRM, 0);
+                       break;
+               case CNF_ACPT:
+                       wpa_mesh_set_plink_state(wpa_s, sta, PLINK_CNF_RCVD);
+                       eloop_register_timeout(dot11MeshConfirmTimeout, 0,
+                                              plink_timer, wpa_s, sta);
+                       break;
+               default:
+                       break;
+               }
+               break;
+       case PLINK_OPEN_RCVD:
+               switch (event) {
+               case OPN_RJCT:
+               case CNF_RJCT:
+                       reason = WLAN_REASON_MESH_CONFIG_POLICY_VIOLATION;
+                       /* fall-through */
+               case CLS_ACPT:
+                       wpa_mesh_set_plink_state(wpa_s, sta, PLINK_HOLDING);
+                       if (!reason)
+                               reason = WLAN_REASON_MESH_CLOSE_RCVD;
+                       eloop_register_timeout(dot11MeshHoldingTimeout, 0,
+                                              plink_timer, wpa_s, sta);
+                       sta->mpm_close_reason = reason;
+                       mesh_mpm_send_plink_action(wpa_s, sta,
+                                                  PLINK_CLOSE, reason);
+                       break;
+               case OPN_ACPT:
+                       mesh_mpm_send_plink_action(wpa_s, sta,
+                                                  PLINK_CONFIRM, 0);
+                       break;
+               case CNF_ACPT:
+                       mesh_mpm_plink_estab(wpa_s, sta);
+                       break;
+               default:
+                       break;
+               }
+               break;
+       case PLINK_CNF_RCVD:
+               switch (event) {
+               case OPN_RJCT:
+               case CNF_RJCT:
+                       reason = WLAN_REASON_MESH_CONFIG_POLICY_VIOLATION;
+                       /* fall-through */
+               case CLS_ACPT:
+                       wpa_mesh_set_plink_state(wpa_s, sta, PLINK_HOLDING);
+                       if (!reason)
+                               reason = WLAN_REASON_MESH_CLOSE_RCVD;
+                       eloop_register_timeout(dot11MeshHoldingTimeout, 0,
+                                              plink_timer, wpa_s, sta);
+                       sta->mpm_close_reason = reason;
+                       mesh_mpm_send_plink_action(wpa_s, sta,
+                                                  PLINK_CLOSE, reason);
+                       break;
+               case OPN_ACPT:
+                       mesh_mpm_plink_estab(wpa_s, sta);
+                       mesh_mpm_send_plink_action(wpa_s, sta,
+                                                  PLINK_CONFIRM, 0);
+                       break;
+               default:
+                       break;
+               }
+               break;
+       case PLINK_ESTAB:
+               switch (event) {
+               case CLS_ACPT:
+                       wpa_mesh_set_plink_state(wpa_s, sta, PLINK_HOLDING);
+                       reason = WLAN_REASON_MESH_CLOSE_RCVD;
+
+                       eloop_register_timeout(dot11MeshHoldingTimeout, 0,
+                                              plink_timer, wpa_s, sta);
+                       sta->mpm_close_reason = reason;
+
+                       wpa_msg(wpa_s, MSG_INFO, "mesh plink with " MACSTR
+                               " closed with reason %d",
+                               MAC2STR(sta->addr), reason);
+
+                       wpa_msg_ctrl(wpa_s, MSG_INFO,
+                                    MESH_PEER_DISCONNECTED MACSTR,
+                                    MAC2STR(sta->addr));
+
+                       hapd->num_plinks--;
+
+                       mesh_mpm_send_plink_action(wpa_s, sta,
+                                                  PLINK_CLOSE, reason);
+                       break;
+               case OPN_ACPT:
+                       mesh_mpm_send_plink_action(wpa_s, sta,
+                                                  PLINK_CONFIRM, 0);
+                       break;
+               default:
+                       break;
+               }
+               break;
+       case PLINK_HOLDING:
+               switch (event) {
+               case CLS_ACPT:
+                       mesh_mpm_fsm_restart(wpa_s, sta);
+                       break;
+               case OPN_ACPT:
+               case CNF_ACPT:
+               case OPN_RJCT:
+               case CNF_RJCT:
+                       reason = sta->mpm_close_reason;
+                       mesh_mpm_send_plink_action(wpa_s, sta,
+                                                  PLINK_CLOSE, reason);
+                       break;
+               default:
+                       break;
+               }
+               break;
+       default:
+               wpa_msg(wpa_s, MSG_DEBUG,
+                       "Unsupported MPM event %s for state %s",
+                       mplevent[event], mplstate[sta->plink_state]);
+               break;
+       }
+}
+
+
+void mesh_mpm_action_rx(struct wpa_supplicant *wpa_s,
+                       const struct ieee80211_mgmt *mgmt, size_t len)
+{
+       u8 action_field;
+       struct hostapd_data *hapd = wpa_s->ifmsh->bss[0];
+       struct sta_info *sta;
+       u16 plid = 0, llid = 0;
+       enum plink_event event;
+       struct ieee802_11_elems elems;
+       struct mesh_peer_mgmt_ie peer_mgmt_ie;
+       const u8 *ies;
+       size_t ie_len;
+       int ret;
+
+       if (mgmt->u.action.category != WLAN_ACTION_SELF_PROTECTED)
+               return;
+
+       action_field = mgmt->u.action.u.slf_prot_action.action;
+
+       ies = mgmt->u.action.u.slf_prot_action.variable;
+       ie_len = (const u8 *) mgmt + len -
+               mgmt->u.action.u.slf_prot_action.variable;
+
+       /* at least expect mesh id and peering mgmt */
+       if (ie_len < 2 + 2)
+               return;
+
+       if (action_field == PLINK_OPEN || action_field == PLINK_CONFIRM) {
+               ies += 2;       /* capability */
+               ie_len -= 2;
+       }
+       if (action_field == PLINK_CONFIRM) {
+               ies += 2;       /* aid */
+               ie_len -= 2;
+       }
+
+       /* check for mesh peering, mesh id and mesh config IEs */
+       if (ieee802_11_parse_elems(ies, ie_len, &elems, 0) == ParseFailed)
+               return;
+       if (!elems.peer_mgmt)
+               return;
+       if ((action_field != PLINK_CLOSE) &&
+           (!elems.mesh_id || !elems.mesh_config))
+               return;
+
+       if (action_field != PLINK_CLOSE && !matches_local(wpa_s, &elems))
+               return;
+
+       ret = mesh_mpm_parse_peer_mgmt(wpa_s, action_field,
+                                      elems.peer_mgmt,
+                                      elems.peer_mgmt_len,
+                                      &peer_mgmt_ie);
+       if (ret)
+               return;
+
+       /* the sender's llid is our plid and vice-versa */
+       plid = WPA_GET_LE16(peer_mgmt_ie.llid);
+       if (peer_mgmt_ie.plid)
+               llid = WPA_GET_LE16(peer_mgmt_ie.plid);
+
+       sta = ap_get_sta(hapd, mgmt->sa);
+       if (!sta)
+               return;
+
+       if (!sta->my_lid)
+               mesh_mpm_init_link(wpa_s, sta);
+
+       if (sta->plink_state == PLINK_BLOCKED)
+               return;
+
+       /* Now we will figure out the appropriate event... */
+       switch (action_field) {
+       case PLINK_OPEN:
+               if (!plink_free_count(hapd) ||
+                   (sta->peer_lid && sta->peer_lid != plid)) {
+                       event = OPN_IGNR;
+               } else {
+                       sta->peer_lid = plid;
+                       event = OPN_ACPT;
+               }
+               break;
+       case PLINK_CONFIRM:
+               if (!plink_free_count(hapd) ||
+                   sta->my_lid != llid ||
+                   (sta->peer_lid && sta->peer_lid != plid)) {
+                       event = CNF_IGNR;
+               } else {
+                       if (!sta->peer_lid)
+                               sta->peer_lid = plid;
+                       event = CNF_ACPT;
+               }
+               break;
+       case PLINK_CLOSE:
+               if (sta->plink_state == PLINK_ESTAB)
+                       /* Do not check for llid or plid. This does not
+                        * follow the standard but since multiple plinks
+                        * per cand are not supported, it is necessary in
+                        * order to avoid a livelock when MP A sees an
+                        * establish peer link to MP B but MP B does not
+                        * see it. This can be caused by a timeout in
+                        * B's peer link establishment or B being
+                        * restarted.
+                        */
+                       event = CLS_ACPT;
+               else if (sta->peer_lid != plid)
+                       event = CLS_IGNR;
+               else if (peer_mgmt_ie.plid && sta->my_lid != llid)
+                       event = CLS_IGNR;
+               else
+                       event = CLS_ACPT;
+               break;
+       default:
+               wpa_msg(wpa_s, MSG_ERROR,
+                       "Mesh plink: unknown frame subtype");
+               return;
+       }
+       mesh_mpm_fsm(wpa_s, sta, event);
+}
diff --git a/wpa_supplicant/mesh_mpm.h b/wpa_supplicant/mesh_mpm.h
new file mode 100644 (file)
index 0000000..056cedd
--- /dev/null
@@ -0,0 +1,39 @@
+/*
+ * WPA Supplicant - Basic mesh peer management
+ * Copyright (c) 2013-2014, cozybit, Inc.  All rights reserved.
+ *
+ * This software may be distributed under the terms of the BSD license.
+ * See README for more details.
+ */
+
+#ifndef MESH_MPM_H
+#define MESH_MPM_H
+
+/* notify MPM of new mesh peer to be inserted in MPM and driver */
+void wpa_mesh_new_mesh_peer(struct wpa_supplicant *wpa_s, const u8 *addr,
+                           struct ieee802_11_elems *elems);
+void mesh_mpm_deinit(struct wpa_supplicant *wpa_s, struct hostapd_iface *ifmsh);
+void mesh_mpm_auth_peer(struct wpa_supplicant *wpa_s, const u8 *addr);
+
+#ifdef CONFIG_MESH
+
+void mesh_mpm_action_rx(struct wpa_supplicant *wpa_s,
+                       const struct ieee80211_mgmt *mgmt, size_t len);
+void mesh_mpm_mgmt_rx(struct wpa_supplicant *wpa_s, struct rx_mgmt *rx_mgmt);
+
+#else /* CONFIG_MESH */
+
+static inline void mesh_mpm_action_rx(struct wpa_supplicant *wpa_s,
+                                     const struct ieee80211_mgmt *mgmt,
+                                     size_t len)
+{
+}
+
+static inline void mesh_mpm_mgmt_rx(struct wpa_supplicant *wpa_s,
+                                   struct rx_mgmt *rx_mgmt)
+{
+}
+
+#endif /* CONFIG_MESH */
+
+#endif /* MESH_MPM_H */