diff --git a/doc/dbus.doxygen b/doc/dbus.doxygen index bfdb5a7e3..7f96a935b 100644 --- a/doc/dbus.doxygen +++ b/doc/dbus.doxygen @@ -2288,6 +2288,15 @@ Interface for performing mesh operations.
A dictionary containing information of the connected mesh peer.
+
  • +

    MeshPeerDisconnected ( a{sv} : args )

    +

    +

    Arguments

    +
    +
    a{sv} : args
    +
    A dictionary containing information of the disconnected mesh peer.
    +
    +
  • */ diff --git a/wpa_supplicant/dbus/dbus_new.c b/wpa_supplicant/dbus/dbus_new.c index 6c494c132..e4cf2adbe 100644 --- a/wpa_supplicant/dbus/dbus_new.c +++ b/wpa_supplicant/dbus/dbus_new.c @@ -894,6 +894,40 @@ void wpas_dbus_signal_mesh_peer_connected(struct wpa_supplicant *wpa_s, dbus_message_unref(msg); } + +void wpas_dbus_signal_mesh_peer_disconnected(struct wpa_supplicant *wpa_s, + const u8 *peer_addr, int reason) +{ + struct wpas_dbus_priv *iface; + DBusMessage *msg; + DBusMessageIter iter, dict_iter; + + iface = wpa_s->global->dbus; + + /* Do nothing if the control interface is not turned on */ + if (!iface || !wpa_s->dbus_new_path) + return; + + msg = dbus_message_new_signal(wpa_s->dbus_new_path, + WPAS_DBUS_NEW_IFACE_MESH, + "MeshPeerDisconnected"); + if (!msg) + return; + + dbus_message_iter_init_append(msg, &iter); + if (!wpa_dbus_dict_open_write(&iter, &dict_iter) || + !wpa_dbus_dict_append_byte_array(&dict_iter, "PeerAddress", + (const char *) peer_addr, + ETH_ALEN) || + !wpa_dbus_dict_append_int32(&dict_iter, "DisconnectReason", + reason) || + !wpa_dbus_dict_close_write(&iter, &dict_iter)) + wpa_printf(MSG_ERROR, "dbus: Failed to construct signal"); + else + dbus_connection_send(iface->con, msg, NULL); + dbus_message_unref(msg); +} + #endif /* CONFIG_MESH */ @@ -3745,6 +3779,12 @@ static const struct wpa_dbus_signal_desc wpas_dbus_interface_signals[] = { END_ARGS } }, + { "MeshPeerDisconnected", WPAS_DBUS_NEW_IFACE_MESH, + { + { "args", "a{sv}", ARG_OUT }, + END_ARGS + } + }, #endif /* CONFIG_MESH */ { NULL, NULL, { END_ARGS } } }; diff --git a/wpa_supplicant/dbus/dbus_new.h b/wpa_supplicant/dbus/dbus_new.h index 979630617..e68acb7a1 100644 --- a/wpa_supplicant/dbus/dbus_new.h +++ b/wpa_supplicant/dbus/dbus_new.h @@ -248,6 +248,8 @@ void wpas_dbus_signal_mesh_group_removed(struct wpa_supplicant *wpa_s, int reason); void wpas_dbus_signal_mesh_peer_connected(struct wpa_supplicant *wpa_s, const u8 *peer_addr); +void wpas_dbus_signal_mesh_peer_disconnected(struct wpa_supplicant *wpa_s, + const u8 *peer_addr, int reason); #else /* CONFIG_CTRL_IFACE_DBUS_NEW */ @@ -582,6 +584,12 @@ void wpas_dbus_signal_mesh_peer_connected(struct wpa_supplicant *wpa_s, { } +static inline +void wpas_dbus_signal_mesh_peer_disconnected(struct wpa_supplicant *wpa_s, + const u8 *peer_addr, int reason) +{ +} + #endif /* CONFIG_CTRL_IFACE_DBUS_NEW */ #endif /* CTRL_IFACE_DBUS_H_NEW */ diff --git a/wpa_supplicant/mesh_mpm.c b/wpa_supplicant/mesh_mpm.c index 2047fb8ec..bc3cc5ef9 100644 --- a/wpa_supplicant/mesh_mpm.c +++ b/wpa_supplicant/mesh_mpm.c @@ -1013,6 +1013,10 @@ static void mesh_mpm_fsm(struct wpa_supplicant *wpa_s, struct sta_info *sta, wpa_msg(wpa_s, MSG_INFO, MESH_PEER_DISCONNECTED MACSTR, MAC2STR(sta->addr)); + /* Send D-Bus event */ + wpas_notify_mesh_peer_disconnected(wpa_s, sta->addr, + reason); + hapd->num_plinks--; mesh_mpm_send_plink_action(wpa_s, sta, diff --git a/wpa_supplicant/notify.c b/wpa_supplicant/notify.c index 5ed414e53..3e67a77f2 100644 --- a/wpa_supplicant/notify.c +++ b/wpa_supplicant/notify.c @@ -885,4 +885,14 @@ void wpas_notify_mesh_peer_connected(struct wpa_supplicant *wpa_s, wpas_dbus_signal_mesh_peer_connected(wpa_s, peer_addr); } + +void wpas_notify_mesh_peer_disconnected(struct wpa_supplicant *wpa_s, + const u8 *peer_addr, int reason_code) +{ + if (wpa_s->p2p_mgmt) + return; + + wpas_dbus_signal_mesh_peer_disconnected(wpa_s, peer_addr, reason_code); +} + #endif /* CONFIG_MESH */ diff --git a/wpa_supplicant/notify.h b/wpa_supplicant/notify.h index 6c953b617..0c113cab5 100644 --- a/wpa_supplicant/notify.h +++ b/wpa_supplicant/notify.h @@ -148,5 +148,7 @@ void wpas_notify_mesh_group_removed(struct wpa_supplicant *wpa_s, int reason_code); void wpas_notify_mesh_peer_connected(struct wpa_supplicant *wpa_s, const u8 *peer_addr); +void wpas_notify_mesh_peer_disconnected(struct wpa_supplicant *wpa_s, + const u8 *peer_addr, int reason_code); #endif /* NOTIFY_H */