RADIUS: Use more likely unique accounting Acct-{,Multi-}Session-Id

[mech_eap.git] / src / ap / hostapd.h

diff --git a/src/ap/hostapd.h b/src/ap/hostapd.h
index 89a1e8b..72f8252 100644 (file)
--- a/src/ap/hostapd.h
+++ b/src/ap/hostapd.h
@@ -138,7 +138,6 @@ struct hostapd_data {
        void *msg_ctx_parent; /* parent interface ctx for wpa_msg() calls */
 
        struct radius_client_data *radius;
-       u32 acct_session_id_hi, acct_session_id_lo;
        struct radius_das_data *radius_das;
 
        struct iapp_data *iapp;
@@ -228,6 +227,8 @@ struct hostapd_data {
        unsigned int cs_c_off_beacon;
        unsigned int cs_c_off_proberesp;
        int csa_in_progress;
+       unsigned int cs_c_off_ecsa_beacon;
+       unsigned int cs_c_off_ecsa_proberesp;
 
        /* BSS Load */
        unsigned int bss_load_update_timeout;
@@ -281,6 +282,12 @@ struct hostapd_data {
 };
 
 
+struct hostapd_sta_info {
+       struct dl_list list;
+       u8 addr[ETH_ALEN];
+       struct os_reltime last_seen;
+};
+
 /**
  * struct hostapd_iface - hostapd per-interface data structure
  */
@@ -321,6 +328,15 @@ struct hostapd_iface {
         */
        unsigned int driver_ap_teardown:1;
 
+       /*
+        * When set, indicates that this interface is part of list of
+        * interfaces that need to be started together (synchronously).
+        */
+       unsigned int need_to_start_in_sync:1;
+
+       /* Ready to start but waiting for other interfaces to become ready. */
+       unsigned int ready_to_start_in_sync:1;
+
        int num_ap; /* number of entries in ap_list */
        struct ap_info *ap_list; /* AP info list head */
        struct ap_info *ap_hash[STA_HASH_SIZE];
@@ -396,6 +412,9 @@ struct hostapd_iface {
        u64 last_channel_time_busy;
        u8 channel_utilization;
 
+       /* eCSA IE will be added only if operating class is specified */
+       u8 cs_oper_class;
+
        unsigned int dfs_cac_ms;
        struct os_reltime dfs_cac_start;
 
@@ -409,6 +428,9 @@ struct hostapd_iface {
 
        void (*scan_cb)(struct hostapd_iface *iface);
        int num_ht40_scan_tries;
+
+       struct dl_list sta_seen; /* struct hostapd_sta_info */
+       unsigned int num_sta_seen;
 };
 
 /* hostapd.c */
@@ -440,6 +462,7 @@ int hostapd_remove_iface(struct hapd_interfaces *ifaces, char *buf);
 void hostapd_channel_list_updated(struct hostapd_iface *iface, int initiator);
 void hostapd_set_state(struct hostapd_iface *iface, enum hostapd_iface_state s);
 const char * hostapd_state_text(enum hostapd_iface_state s);
+int hostapd_csa_in_progress(struct hostapd_iface *iface);
 int hostapd_switch_channel(struct hostapd_data *hapd,
                           struct csa_settings *settings);
 void
@@ -469,6 +492,11 @@ int hostapd_probe_req_rx(struct hostapd_data *hapd, const u8 *sa, const u8 *da,
                         int ssi_signal);
 void hostapd_event_ch_switch(struct hostapd_data *hapd, int freq, int ht,
                             int offset, int width, int cf1, int cf2);
+struct survey_results;
+void hostapd_event_get_survey(struct hostapd_iface *iface,
+                             struct survey_results *survey_results);
+void hostapd_acs_channel_selected(struct hostapd_data *hapd,
+                                 struct acs_selected_channels *acs_res);
 
 const struct hostapd_eap_user *
 hostapd_get_eap_user(struct hostapd_data *hapd, const u8 *identity,