[PATCHv2,4/7] dbus: Added dbus signal MeshPeerConnected

Submitted by Saurav Babu on July 18, 2017, 7:07 a.m.

Details

Message ID 1500361677-25313-5-git-send-email-saurav.babu@samsung.com
State New
Headers show

Commit Message

Saurav Babu July 18, 2017, 7:07 a.m.
This is similar to the control interface event MESH-PEER-CONNECTED

Signed-off-by: Saurav Babu <saurav.babu@samsung.com>
---
 doc/dbus.doxygen               |  9 +++++++++
 wpa_supplicant/dbus/dbus_new.c | 37 +++++++++++++++++++++++++++++++++++++
 wpa_supplicant/dbus/dbus_new.h |  8 ++++++++
 wpa_supplicant/mesh_mpm.c      |  4 ++++
 wpa_supplicant/notify.c        | 11 +++++++++++
 wpa_supplicant/notify.h        |  2 ++
 6 files changed, 71 insertions(+)

Patch hide | download patch | download mbox

diff --git a/doc/dbus.doxygen b/doc/dbus.doxygen
index a894770..6f2eeaf 100644
--- a/doc/dbus.doxygen
+++ b/doc/dbus.doxygen
@@ -2278,6 +2278,15 @@  Interface for performing Mesh operations.
       <dd>A dictionary containing information of removed Mesh Group.</dd>
     </dl>
   </li>
+  <li>
+    <h3>MeshPeerConnected ( a{sv} : args )</h3>
+    <p></p>
+    <h4>Arguments</h4>
+    <dl>
+      <dt>a{sv} : args</dt>
+      <dd>A dictionary containing information of connected Mesh Peer.</dd>
+    </dl>
+  </li>
 </ul>
 
 */
diff --git a/wpa_supplicant/dbus/dbus_new.c b/wpa_supplicant/dbus/dbus_new.c
index dc02dc4..7ca9605 100644
--- a/wpa_supplicant/dbus/dbus_new.c
+++ b/wpa_supplicant/dbus/dbus_new.c
@@ -856,6 +856,37 @@  void wpas_dbus_signal_mesh_group_removed(struct wpa_supplicant *wpa_s,
 		dbus_connection_send(iface->con, msg, NULL);
 	dbus_message_unref(msg);
 }
+
+void wpas_dbus_signal_mesh_peer_connected(struct wpa_supplicant *wpa_s,
+					      const u8 *peer_addr)
+{
+	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 == NULL || !wpa_s->dbus_new_path)
+		return;
+
+	msg = dbus_message_new_signal(wpa_s->dbus_new_path,
+				      WPAS_DBUS_NEW_IFACE_MESH,
+				      "MeshPeerConnected");
+	if (msg == NULL)
+		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_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 */
 
 void wpas_dbus_signal_certification(struct wpa_supplicant *wpa_s,
@@ -3700,6 +3731,12 @@  static const struct wpa_dbus_signal_desc wpas_dbus_interface_signals[] = {
 		  END_ARGS
 	  }
 	},
+	{ "MeshPeerConnected", 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 b9f487b..df7da3f 100644
--- a/wpa_supplicant/dbus/dbus_new.h
+++ b/wpa_supplicant/dbus/dbus_new.h
@@ -245,6 +245,8 @@  void wpas_dbus_signal_mesh_group_started(struct wpa_supplicant *wpa_s,
 					      struct wpa_ssid *ssid);
 void wpas_dbus_signal_mesh_group_removed(struct wpa_supplicant *wpa_s,
 					      u8 *meshid, u8 meshid_len, int reason);
+void wpas_dbus_signal_mesh_peer_connected(struct wpa_supplicant *wpa_s,
+					      const u8 *peer_addr);
 
 #else /* CONFIG_CTRL_IFACE_DBUS_NEW */
 
@@ -572,6 +574,12 @@  void wpas_dbus_signal_mesh_group_removed(struct wpa_supplicant *wpa_s,
 {
 }
 
+static inline
+void wpas_dbus_signal_mesh_peer_connected(struct wpa_supplicant *wpa_s,
+					      const u8 *peer_addr);
+{
+}
+
 #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 f152044..6106b07 100644
--- a/wpa_supplicant/mesh_mpm.c
+++ b/wpa_supplicant/mesh_mpm.c
@@ -20,6 +20,7 @@ 
 #include "driver_i.h"
 #include "mesh_mpm.h"
 #include "mesh_rsn.h"
+#include "notify.h"
 
 struct mesh_peer_mgmt_ie {
 	const u8 *proto_id; /* Mesh Peering Protocol Identifier (2 octets) */
@@ -857,6 +858,9 @@  static void mesh_mpm_plink_estab(struct wpa_supplicant *wpa_s,
 	/* Send ctrl event */
 	wpa_msg(wpa_s, MSG_INFO, MESH_PEER_CONNECTED MACSTR,
 		MAC2STR(sta->addr));
+
+	/* Send DBUS event */
+	wpas_notify_mesh_peer_connected(wpa_s, sta->addr);
 }
 
 
diff --git a/wpa_supplicant/notify.c b/wpa_supplicant/notify.c
index afbde11..574b066 100644
--- a/wpa_supplicant/notify.c
+++ b/wpa_supplicant/notify.c
@@ -872,3 +872,14 @@  void wpas_notify_mesh_group_removed(struct wpa_supplicant *wpa_s,
 	wpas_dbus_signal_mesh_group_removed(wpa_s, meshid, meshid_len, reason_code);
 #endif /* CONFIG_MESH */
 }
+
+void wpas_notify_mesh_peer_connected(struct wpa_supplicant *wpa_s,
+								const u8 *peer_addr)
+{
+	if (wpa_s->p2p_mgmt)
+		return;
+
+#ifdef CONFIG_MESH
+	wpas_dbus_signal_mesh_peer_connected(wpa_s, peer_addr);
+#endif /* CONFIG_MESH */
+}
diff --git a/wpa_supplicant/notify.h b/wpa_supplicant/notify.h
index 46270f9..020eaaa 100644
--- a/wpa_supplicant/notify.h
+++ b/wpa_supplicant/notify.h
@@ -145,5 +145,7 @@  void wpas_notify_mesh_group_started(struct wpa_supplicant *wpa_s,
 								struct wpa_ssid *ssid);
 void wpas_notify_mesh_group_removed(struct wpa_supplicant *wpa_s,
 								u8 *meshid, u8 meshid_len, int reason_code);
+void wpas_notify_mesh_peer_connected(struct wpa_supplicant *wpa_s,
+								const u8 *peer_addr);
 
 #endif /* NOTIFY_H */