D-Bus: Emit signal when a station is authorized or deauthorized
Add "StaAuthorized" and "StaDeauthorized" D-Bus interface in AP mode. After enabling the AP mode of wpa_supplicant, the other process need to get the MAC address and authorization status of every station, so wpa_supplicant emits signal when the station is authorized or deauthorized. Signed-hostap: Chengyi Zhao <chengyix.zhao@gmail.com>
This commit is contained in:
parent
9578329874
commit
8a901d750b
4 changed files with 124 additions and 0 deletions
|
@ -532,6 +532,26 @@ fi.w1.wpa_supplicant1.CreateInterface.
|
||||||
</dl>
|
</dl>
|
||||||
</li>
|
</li>
|
||||||
|
|
||||||
|
<li>
|
||||||
|
<h3>StaAuthorized ( s : mac )</h3>
|
||||||
|
<p>A new station has been authorized to the interface.</p>
|
||||||
|
<h4>Arguments</h4>
|
||||||
|
<dl>
|
||||||
|
<dt>s : mac</dt>
|
||||||
|
<dd>A mac address which has been authorized.</dd>
|
||||||
|
</dl>
|
||||||
|
</li>
|
||||||
|
|
||||||
|
<li>
|
||||||
|
<h3>StaDeauthorized ( s : mac )</h3>
|
||||||
|
<p>A station has been deauthorized to the interface.</p>
|
||||||
|
<h4>Arguments</h4>
|
||||||
|
<dl>
|
||||||
|
<dt>s : mac</dt>
|
||||||
|
<dd>A mac address which has been deauthorized.</dd>
|
||||||
|
</dl>
|
||||||
|
</li>
|
||||||
|
|
||||||
<li>
|
<li>
|
||||||
<h3>PropertiesChanged ( a{sv} : properties )</h3>
|
<h3>PropertiesChanged ( a{sv} : properties )</h3>
|
||||||
<p>Some properties have changed.</p>
|
<p>Some properties have changed.</p>
|
||||||
|
|
|
@ -869,6 +869,76 @@ nomem:
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* wpas_dbus_signal_sta - Send a station related event signal
|
||||||
|
* @wpa_s: %wpa_supplicant network interface data
|
||||||
|
* @sta: station mac address
|
||||||
|
* @sig_name: signal name - StaAuthorized or StaDeauthorized
|
||||||
|
*
|
||||||
|
* Notify listeners about event related with station
|
||||||
|
*/
|
||||||
|
static void wpas_dbus_signal_sta(struct wpa_supplicant *wpa_s,
|
||||||
|
const u8 *sta, const char *sig_name)
|
||||||
|
{
|
||||||
|
struct wpas_dbus_priv *iface;
|
||||||
|
DBusMessage *msg;
|
||||||
|
char sta_mac[WPAS_DBUS_OBJECT_PATH_MAX];
|
||||||
|
char *dev_mac;
|
||||||
|
|
||||||
|
os_snprintf(sta_mac, WPAS_DBUS_OBJECT_PATH_MAX, MACSTR, MAC2STR(sta));
|
||||||
|
dev_mac = sta_mac;
|
||||||
|
|
||||||
|
iface = wpa_s->global->dbus;
|
||||||
|
|
||||||
|
/* Do nothing if the control interface is not turned on */
|
||||||
|
if (iface == NULL)
|
||||||
|
return;
|
||||||
|
|
||||||
|
msg = dbus_message_new_signal(wpa_s->dbus_new_path,
|
||||||
|
WPAS_DBUS_NEW_IFACE_INTERFACE, sig_name);
|
||||||
|
if (msg == NULL)
|
||||||
|
return;
|
||||||
|
|
||||||
|
if (dbus_message_append_args(msg, DBUS_TYPE_STRING, &dev_mac,
|
||||||
|
DBUS_TYPE_INVALID))
|
||||||
|
dbus_connection_send(iface->con, msg, NULL);
|
||||||
|
else
|
||||||
|
wpa_printf(MSG_ERROR, "dbus: Failed to construct signal");
|
||||||
|
dbus_message_unref(msg);
|
||||||
|
|
||||||
|
wpa_printf(MSG_DEBUG, "dbus: Station MAC address '%s' '%s'",
|
||||||
|
sta_mac, sig_name);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* wpas_dbus_signal_sta_authorized - Send a STA authorized signal
|
||||||
|
* @wpa_s: %wpa_supplicant network interface data
|
||||||
|
* @sta: station mac address
|
||||||
|
*
|
||||||
|
* Notify listeners a new station has been authorized
|
||||||
|
*/
|
||||||
|
void wpas_dbus_signal_sta_authorized(struct wpa_supplicant *wpa_s,
|
||||||
|
const u8 *sta)
|
||||||
|
{
|
||||||
|
wpas_dbus_signal_sta(wpa_s, sta, "StaAuthorized");
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* wpas_dbus_signal_sta_deauthorized - Send a STA deauthorized signal
|
||||||
|
* @wpa_s: %wpa_supplicant network interface data
|
||||||
|
* @sta: station mac address
|
||||||
|
*
|
||||||
|
* Notify listeners a station has been deauthorized
|
||||||
|
*/
|
||||||
|
void wpas_dbus_signal_sta_deauthorized(struct wpa_supplicant *wpa_s,
|
||||||
|
const u8 *sta)
|
||||||
|
{
|
||||||
|
wpas_dbus_signal_sta(wpa_s, sta, "StaDeauthorized");
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
#ifdef CONFIG_P2P
|
#ifdef CONFIG_P2P
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -3017,6 +3087,18 @@ static const struct wpa_dbus_signal_desc wpas_dbus_interface_signals[] = {
|
||||||
END_ARGS
|
END_ARGS
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
{ "StaAuthorized", WPAS_DBUS_NEW_IFACE_INTERFACE,
|
||||||
|
{
|
||||||
|
{ "name", "s", ARG_OUT },
|
||||||
|
END_ARGS
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{ "StaDeauthorized", WPAS_DBUS_NEW_IFACE_INTERFACE,
|
||||||
|
{
|
||||||
|
{ "name", "s", ARG_OUT },
|
||||||
|
END_ARGS
|
||||||
|
}
|
||||||
|
},
|
||||||
{ NULL, NULL, { END_ARGS } }
|
{ NULL, NULL, { END_ARGS } }
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -222,6 +222,10 @@ void wpas_dbus_signal_preq(struct wpa_supplicant *wpa_s,
|
||||||
const u8 *ie, size_t ie_len, u32 ssi_signal);
|
const u8 *ie, size_t ie_len, u32 ssi_signal);
|
||||||
void wpas_dbus_signal_eap_status(struct wpa_supplicant *wpa_s,
|
void wpas_dbus_signal_eap_status(struct wpa_supplicant *wpa_s,
|
||||||
const char *status, const char *parameter);
|
const char *status, const char *parameter);
|
||||||
|
void wpas_dbus_signal_sta_authorized(struct wpa_supplicant *wpa_s,
|
||||||
|
const u8 *sta);
|
||||||
|
void wpas_dbus_signal_sta_deauthorized(struct wpa_supplicant *wpa_s,
|
||||||
|
const u8 *sta);
|
||||||
|
|
||||||
#else /* CONFIG_CTRL_IFACE_DBUS_NEW */
|
#else /* CONFIG_CTRL_IFACE_DBUS_NEW */
|
||||||
|
|
||||||
|
@ -493,6 +497,18 @@ static inline void wpas_dbus_signal_eap_status(struct wpa_supplicant *wpa_s,
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static inline
|
||||||
|
void wpas_dbus_signal_sta_authorized(struct wpa_supplicant *wpa_s,
|
||||||
|
const u8 *sta)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
static inline
|
||||||
|
void wpas_dbus_signal_sta_deauthorized(struct wpa_supplicant *wpa_s,
|
||||||
|
const u8 *sta)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
#endif /* CONFIG_CTRL_IFACE_DBUS_NEW */
|
#endif /* CONFIG_CTRL_IFACE_DBUS_NEW */
|
||||||
|
|
||||||
#endif /* CTRL_IFACE_DBUS_H_NEW */
|
#endif /* CTRL_IFACE_DBUS_H_NEW */
|
||||||
|
|
|
@ -547,6 +547,9 @@ static void wpas_notify_ap_sta_authorized(struct wpa_supplicant *wpa_s,
|
||||||
*/
|
*/
|
||||||
wpas_dbus_signal_p2p_peer_joined(wpa_s, sta);
|
wpas_dbus_signal_p2p_peer_joined(wpa_s, sta);
|
||||||
#endif /* CONFIG_P2P */
|
#endif /* CONFIG_P2P */
|
||||||
|
|
||||||
|
/* Notify listeners a new station has been authorized */
|
||||||
|
wpas_dbus_signal_sta_authorized(wpa_s, sta);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -566,6 +569,9 @@ static void wpas_notify_ap_sta_deauthorized(struct wpa_supplicant *wpa_s,
|
||||||
*/
|
*/
|
||||||
wpas_dbus_signal_p2p_peer_disconnected(wpa_s, sta);
|
wpas_dbus_signal_p2p_peer_disconnected(wpa_s, sta);
|
||||||
#endif /* CONFIG_P2P */
|
#endif /* CONFIG_P2P */
|
||||||
|
|
||||||
|
/* Notify listeners a station has been deauthorized */
|
||||||
|
wpas_dbus_signal_sta_deauthorized(wpa_s, sta);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue