[RFC 2/4] hostapd: Add offchannel support
Michal Kazior
michal.kazior
Thu Jul 25 04:11:45 PDT 2013
Although unused at the moment, this will be used later by
ACS code.
Signed-hostap: Michal Kazior <michal.kazior at tieto.com>
---
src/ap/ap_drv_ops.h | 11 ++++++++
src/ap/drv_callbacks.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++++
src/ap/hostapd.h | 4 +++
3 files changed, 85 insertions(+)
diff --git a/src/ap/ap_drv_ops.h b/src/ap/ap_drv_ops.h
index cfc30ce..6d2b343 100644
--- a/src/ap/ap_drv_ops.h
+++ b/src/ap/ap_drv_ops.h
@@ -225,4 +225,15 @@ static inline void hostapd_drv_poll_client(struct hostapd_data *hapd,
hapd->driver->poll_client(hapd->drv_priv, own_addr, addr, qos);
}
+static inline int hostapd_drv_remain_on_channel(struct hostapd_data *hapd,
+ unsigned int freq,
+ unsigned int duration)
+{
+ if (hapd->driver == NULL)
+ return -1;
+ if (!hapd->driver->remain_on_channel)
+ return -1;
+ return hapd->driver->remain_on_channel(hapd->drv_priv, freq, duration);
+}
+
#endif /* AP_DRV_OPS */
diff --git a/src/ap/drv_callbacks.c b/src/ap/drv_callbacks.c
index fa4b5e4..2851f4d 100644
--- a/src/ap/drv_callbacks.c
+++ b/src/ap/drv_callbacks.c
@@ -715,6 +715,68 @@ static void hostapd_event_eapol_rx(struct hostapd_data *hapd, const u8 *src,
}
+static int hostapd_roc_channel_check(struct hostapd_iface *iface)
+{
+ struct hostapd_channel_data *chan = NULL, *offchan;
+ int i;
+ int found = 0;
+
+ offchan = &iface->current_mode->channels[iface->off_channel_freq_idx];
+
+ for (i = 0; i < iface->current_mode->num_channels; i++) {
+ chan = &iface->current_mode->channels[i];
+ if (offchan != chan)
+ continue;
+ found = 1;
+ break;
+ }
+
+ if (!found || !chan) {
+ wpa_printf(MSG_ERROR, "Channel requested to go offchannel "
+ "on freq %d MHz disappeared",
+ chan->freq);
+ goto fail;
+ }
+
+ if (chan->flag & HOSTAPD_CHAN_DISABLED) {
+ wpa_printf(MSG_ERROR, "Channel requested to go offchannel "
+ "on freq %d MHz became disabled",
+ chan->freq);
+ goto fail;
+ }
+
+
+ return 0;
+fail:
+ return -1;
+}
+
+
+static void hostapd_event_roc(struct hostapd_data *hapd, unsigned int freq,
+ unsigned int duration)
+{
+ struct hostapd_iface *iface = hapd->iface;
+ int err;
+
+ err = hostapd_roc_channel_check(iface);
+ (void)err;
+ /* XXX: pass err to listeners, no one yet */
+}
+
+
+static void hostapd_event_roc_cancel(struct hostapd_data *hapd,
+ unsigned int freq,
+ unsigned int duration)
+{
+ struct hostapd_iface *iface = hapd->iface;
+ int err;
+
+ err = hostapd_roc_channel_check(iface);
+ (void)err;
+ /* XXX: pass err to listeners, no one yet */
+}
+
+
void wpa_supplicant_event(void *ctx, enum wpa_event_type event,
union wpa_event_data *data)
{
@@ -811,6 +873,14 @@ void wpa_supplicant_event(void *ctx, enum wpa_event_type event,
data->eapol_rx.data,
data->eapol_rx.data_len);
break;
+ case EVENT_REMAIN_ON_CHANNEL:
+ hostapd_event_roc(hapd, data->remain_on_channel.freq,
+ data->remain_on_channel.duration);
+ break;
+ case EVENT_CANCEL_REMAIN_ON_CHANNEL:
+ hostapd_event_roc_cancel(hapd, data->remain_on_channel.freq,
+ data->remain_on_channel.duration);
+ break;
case EVENT_ASSOC:
hostapd_notif_assoc(hapd, data->assoc_info.addr,
data->assoc_info.req_ies,
diff --git a/src/ap/hostapd.h b/src/ap/hostapd.h
index c0b1306..2fc2a04 100644
--- a/src/ap/hostapd.h
+++ b/src/ap/hostapd.h
@@ -280,6 +280,10 @@ struct hostapd_iface {
int olbc_ht;
u16 ht_op_mode;
+
+ /* Offchannel operation helper */
+ unsigned int off_channel_freq_idx;
+
void (*scan_cb)(struct hostapd_iface *iface);
};
--
1.7.9.5
More information about the Hostap
mailing list