fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-04-20 13:00:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

supplicant: Add methods to start/stop a P2P Find operation

Browse source 
The timeout is limited to be in the range of 1-600s. This is arbitrary,
but the point is that a timeout of 0 is not permitted to prevent a
client from making us run a find continuously simply by forgetting to
call the stop method.
This commit is contained in:
Benjamin Berg 2018-10-15 15:11:34 +02:00 • committed by Thomas Haller
parent c05aa3b309
commit 1371414e3d
2 changed files with 51 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
src/supplicant/nm-supplicant-interface.c
View file

@ -2436,6 +2436,53 @@ nm_supplicant_interface_get_max_scan_ssids (NMSupplicantInterface *self)
/*****************************************************************************/
void
nm_supplicant_interface_p2p_start_find (NMSupplicantInterface *self,
guint timeout)
{
NMSupplicantInterfacePrivate *priv;
GVariantBuilder builder;
g_return_if_fail (NM_IS_SUPPLICANT_INTERFACE (self));
g_return_if_fail (timeout > 0 && timeout <= 600);
priv = NM_SUPPLICANT_INTERFACE_GET_PRIVATE (self);
/* Find parameters */
g_variant_builder_init (&builder, G_VARIANT_TYPE_VARDICT);
g_variant_builder_add (&builder, "{sv}", "Timeout", g_variant_new_int32 (timeout));
g_dbus_proxy_call (priv->p2p_proxy,
"Find",
g_variant_new ("(a{sv})", &builder),
G_DBUS_CALL_FLAGS_NONE,
-1,
priv->other_cancellable,
(GAsyncReadyCallback) log_result_cb,
self);
}
void
nm_supplicant_interface_p2p_stop_find (NMSupplicantInterface *self)
{
NMSupplicantInterfacePrivate *priv;
g_return_if_fail (NM_IS_SUPPLICANT_INTERFACE (self));
priv = NM_SUPPLICANT_INTERFACE_GET_PRIVATE (self);
g_dbus_proxy_call (priv->p2p_proxy,
"StopFind",
NULL,
G_DBUS_CALL_FLAGS_NONE,
-1,
priv->other_cancellable,
(GAsyncReadyCallback) scan_request_cb,
self);
}
/*****************************************************************************/
void
nm_supplicant_interface_p2p_connect (NMSupplicantInterface * self,
const char * peer,

4
src/supplicant/nm-supplicant-interface.h
View file

@ -146,6 +146,10 @@ gboolean nm_supplicant_interface_credentials_reply (NMSupplicantInterface *self,
const char *value,
GError **error);
void nm_supplicant_interface_p2p_start_find (NMSupplicantInterface *self,
guint timeout);
void nm_supplicant_interface_p2p_stop_find (NMSupplicantInterface *self);
void nm_supplicant_interface_p2p_connect (NMSupplicantInterface * self,
const char * peer,
const char * wps_method,