jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

dbus: Add new interface property to get mesh group

Browse source 
Signed-off-by: Saurav Babu <saurav.babu@samsung.com>
This commit is contained in:
Saurav Babu 2017-07-18 12:37:57 +05:30 committed by Jouni Malinen
parent 190f6f1176
commit cdf2501494
4 changed files with 43 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doc/dbus.doxygen
View file

@ -2264,6 +2264,10 @@ Interface for performing mesh operations.
<li> <li>
<h3>MeshPeers - aay - (read)</h3> <h3>MeshPeers - aay - (read)</h3>
</li> </li>
<li>
<h3>MeshGroup - ay - (read)</h3>
</li>
</ul> </ul>
\subsection dbus_mesh_signals Signals \subsection dbus_mesh_signals Signals

5
wpa_supplicant/dbus/dbus_new.c
View file

@ -3489,6 +3489,11 @@ static const struct wpa_dbus_property_desc wpas_dbus_interface_properties[] = {
NULL, NULL,
NULL NULL
}, },
{ "MeshGroup", WPAS_DBUS_NEW_IFACE_MESH, "ay",
wpas_dbus_getter_mesh_group,
NULL,
NULL
},
#endif /* CONFIG_MESH */ #endif /* CONFIG_MESH */
{ NULL, NULL, NULL, NULL, NULL, NULL } { NULL, NULL, NULL, NULL, NULL, NULL }
}; };

33
wpa_supplicant/dbus/dbus_new_handlers.c
View file

@ -4805,6 +4805,7 @@ DBusMessage * wpas_dbus_handler_vendor_elem_remove(DBusMessage *message,
#ifdef CONFIG_MESH #ifdef CONFIG_MESH
/** /**
* wpas_dbus_getter_mesh_peers - Get connected mesh peers * wpas_dbus_getter_mesh_peers - Get connected mesh peers
* @iter: Pointer to incoming dbus message iter * @iter: Pointer to incoming dbus message iter
@ -4865,4 +4866,36 @@ dbus_bool_t wpas_dbus_getter_mesh_peers(
return TRUE; return TRUE;
} }
/**
* wpas_dbus_getter_mesh_group - Get mesh group
* @iter: Pointer to incoming dbus message iter
* @error: Location to store error on failure
* @user_data: Function specific data
* Returns: TRUE on success, FALSE on failure
*
* Getter for "MeshGroup" property.
*/
dbus_bool_t wpas_dbus_getter_mesh_group(
const struct wpa_dbus_property_desc *property_desc,
DBusMessageIter *iter, DBusError *error, void *user_data)
{
struct wpa_supplicant *wpa_s = user_data;
struct wpa_ssid *ssid = wpa_s->current_ssid;
if (!wpa_s->ifmsh || !ssid)
return FALSE;
if (!wpas_dbus_simple_array_property_getter(iter, DBUS_TYPE_BYTE,
(char *) ssid->ssid,
ssid->ssid_len, error)) {
dbus_set_error(error, DBUS_ERROR_FAILED,
"%s: error constructing reply", __func__);
return FALSE;
}
return TRUE;
}
#endif /* CONFIG_MESH */ #endif /* CONFIG_MESH */

1
wpa_supplicant/dbus/dbus_new_handlers.h
View file

@ -209,6 +209,7 @@ DECLARE_ACCESSOR(wpas_dbus_getter_wps_device_device_type);
DECLARE_ACCESSOR(wpas_dbus_setter_wps_device_device_type); DECLARE_ACCESSOR(wpas_dbus_setter_wps_device_device_type);
DECLARE_ACCESSOR(wpas_dbus_getter_mesh_peers); DECLARE_ACCESSOR(wpas_dbus_getter_mesh_peers);
DECLARE_ACCESSOR(wpas_dbus_getter_mesh_group);
DBusMessage * wpas_dbus_handler_tdls_discover(DBusMessage *message, DBusMessage * wpas_dbus_handler_tdls_discover(DBusMessage *message,
struct wpa_supplicant *wpa_s); struct wpa_supplicant *wpa_s);