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

wifi: Add IWD-specific NMWifiP2PPeer constructors

Browse source 
[thaller@redhat.com: modify original patch to use
  nm_g_variant_unref() and add missing #define]
This commit is contained in:
Andrew Zaborowski 2021-11-09 02:39:11 +01:00 • committed by Thomas Haller
parent e6e3fad4e4
commit 932712d73c
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
3 changed files with 57 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/core/devices/wifi/nm-iwd-manager.h
View file

@ -25,6 +25,7 @@
#define NM_IWD_AP_INTERFACE "net.connman.iwd.AccessPoint"
#define NM_IWD_ADHOC_INTERFACE "net.connman.iwd.AdHoc"
#define NM_IWD_STATION_INTERFACE "net.connman.iwd.Station"
#define NM_IWD_P2P_PEER_INTERFACE "net.connman.iwd.p2p.Peer"
#define NM_TYPE_IWD_MANAGER (nm_iwd_manager_get_type())
#define NM_IWD_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), NM_TYPE_IWD_MANAGER, NMIwdManager))

54
src/core/devices/wifi/nm-wifi-p2p-peer.c
View file

@ -18,6 +18,7 @@
#include "nm-setting-wireless.h"
#include "nm-utils.h"
#include "nm-wifi-utils.h"
#include "nm-iwd-manager.h"
#include "libnm-platform/nm-platform.h"
#include "supplicant/nm-supplicant-types.h"
@ -419,6 +420,48 @@ nm_wifi_p2p_peer_update_from_properties(NMWifiP2PPeer *peer, const NMSupplicantP
return changed;
}
gboolean
nm_wifi_p2p_peer_update_from_iwd_object(NMWifiP2PPeer *peer, GDBusObject *obj)
{
NMWifiP2PPeerPrivate *priv;
gboolean changed = FALSE;
nm_auto_ref_string NMRefString *peer_path = NULL;
gs_unref_object GDBusProxy *peer_proxy = NULL;
GVariant *value;
g_return_val_if_fail(NM_IS_WIFI_P2P_PEER(peer), FALSE);
peer_proxy = G_DBUS_PROXY(g_dbus_object_get_interface(obj, NM_IWD_P2P_PEER_INTERFACE));
g_return_val_if_fail(peer_proxy, FALSE);
peer_path = nm_ref_string_new(g_dbus_object_get_object_path(obj));
priv = NM_WIFI_P2P_PEER_GET_PRIVATE(peer);
nm_assert(!priv->supplicant_path || priv->supplicant_path == peer_path);
g_object_freeze_notify(G_OBJECT(peer));
if (!priv->supplicant_path) {
priv->supplicant_path = g_steal_pointer(&peer_path);
changed = TRUE;
}
value = g_dbus_proxy_get_cached_property(peer_proxy, "Name");
if (value && g_variant_is_of_type(value, G_VARIANT_TYPE_STRING))
changed |= nm_wifi_p2p_peer_set_name(peer, g_variant_get_string(value, NULL));
else
changed |= nm_wifi_p2p_peer_set_name(peer, "");
nm_g_variant_unref(value);
value = g_dbus_proxy_get_cached_property(peer_proxy, "Address");
if (value && g_variant_is_of_type(value, G_VARIANT_TYPE_STRING))
changed |= nm_wifi_p2p_peer_set_address(peer, g_variant_get_string(value, NULL));
nm_g_variant_unref(value);
g_object_thaw_notify(G_OBJECT(peer));
return changed;
}
const char *
nm_wifi_p2p_peer_to_string(const NMWifiP2PPeer *self, char *str_buf, gsize buf_len, gint32 now_s)
{
@ -559,6 +602,17 @@ nm_wifi_p2p_peer_new_from_properties(const NMSupplicantPeerInfo *peer_info)
return peer;
}
NMWifiP2PPeer *
nm_wifi_p2p_peer_new_from_iwd_object(GDBusObject *obj)
{
NMWifiP2PPeer *peer;
/* TODO: Set the flags here */
peer = g_object_new(NM_TYPE_WIFI_P2P_PEER, NULL);
nm_wifi_p2p_peer_update_from_iwd_object(peer, obj);
return peer;
}
static void
finalize(GObject *object)
{

2
src/core/devices/wifi/nm-wifi-p2p-peer.h
View file

@ -45,9 +45,11 @@ struct _NMSupplicantPeerInfo;
GType nm_wifi_p2p_peer_get_type(void);
NMWifiP2PPeer *nm_wifi_p2p_peer_new_from_properties(const struct _NMSupplicantPeerInfo *peer_info);
NMWifiP2PPeer *nm_wifi_p2p_peer_new_from_iwd_object(GDBusObject *obj);
gboolean nm_wifi_p2p_peer_update_from_properties(NMWifiP2PPeer *peer,
const struct _NMSupplicantPeerInfo *peer_info);
gboolean nm_wifi_p2p_peer_update_from_iwd_object(NMWifiP2PPeer *peer, GDBusObject *obj);
gboolean nm_wifi_p2p_peer_check_compatible(NMWifiP2PPeer *self, NMConnection *connection);