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

supplicant: Store assigned addr for P2P group joins

Browse source 
A P2P Group Owner may assign an IP address and netmask to us. Store this
address so that it can be retrieved later during the IP configuration
stage.
This commit is contained in:
Benjamin Berg 2021-06-18 13:03:30 +02:00 • committed by Thomas Haller
parent a967f7cb58
commit b9bcd61f15
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
2 changed files with 63 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
src/core/supplicant/nm-supplicant-interface.c
View file

@ -115,6 +115,9 @@ typedef struct _NMSupplicantInterfacePrivate {
CList peer_lst_head;
CList peer_initializing_lst_head;
in_addr_t p2p_assigned_addr;
guint8 p2p_assigned_plen;
gint64 last_scan_msec;
NMSupplicantAuthState auth_state;
@ -2904,6 +2907,15 @@ _get_all_p2p_device_cb(GVariant *result, GError *error, gpointer user_data)
_properties_changed(user_data, NM_WPAS_DBUS_IFACE_INTERFACE_P2P_DEVICE, properties, TRUE);
}
static void
_set_p2p_assigned_addr(NMSupplicantInterface *self, gconstpointer addr, guint8 plen)
{
NMSupplicantInterfacePrivate *priv = NM_SUPPLICANT_INTERFACE_GET_PRIVATE(self);
nm_ip_addr_set(AF_INET, &priv->p2p_assigned_addr, addr);
priv->p2p_assigned_plen = plen;
}
static void
_signal_handle(NMSupplicantInterface *self,
const char * signal_interface_name,
@ -2998,6 +3010,7 @@ _signal_handle(NMSupplicantInterface *self,
gs_unref_object NMSupplicantInterface *iface = NULL;
const char * group_path;
const char * iface_path;
GVariant * v_v = NULL;
g_variant_get(parameters, "(@a{sv})", &args);
if (!g_variant_lookup(args, "group_object", "&o", &group_path))
@ -3019,6 +3032,34 @@ _signal_handle(NMSupplicantInterface *self,
}
}
v_v = g_variant_lookup_value(args, "IpAddr", G_VARIANT_TYPE_BYTESTRING);
if (v_v) {
const guint8 *addr_data;
gsize addr_len = 0;
const guint8 *mask_data = NULL;
gsize mask_len = 0;
/* The address is passed in network-byte-order */
addr_data = g_variant_get_fixed_array(v_v, &addr_len, 1);
/* TODO: Should we expose IpAddrGo? If yes, maybe as gateway? */
v_v = g_variant_lookup_value(args, "IpAddrMask", G_VARIANT_TYPE_BYTESTRING);
if (v_v)
mask_data = g_variant_get_fixed_array(v_v, &mask_len, 1);
if (addr_len == NM_AF_INET_SIZE && mask_len == NM_AF_INET_SIZE) {
guint32 netmask;
memcpy(&netmask, mask_data, NM_AF_INET_SIZE);
_set_p2p_assigned_addr(iface,
addr_data,
nm_utils_ip4_netmask_to_prefix(netmask));
} else {
_LOGW("P2P: GroupStarted signaled invalid IP Address information");
}
}
/* Signal existence of the (new) interface. */
g_signal_emit(self, signals[GROUP_STARTED], 0, iface);
}
@ -3099,6 +3140,24 @@ nm_supplicant_interface_get_p2p_group_owner(NMSupplicantInterface *self)
return NM_SUPPLICANT_INTERFACE_GET_PRIVATE(self)->p2p_group_owner_cached;
}
gboolean
nm_supplicant_interface_get_p2p_assigned_addr(NMSupplicantInterface *self,
in_addr_t * addr,
guint8 * plen)
{
NMSupplicantInterfacePrivate *priv = NM_SUPPLICANT_INTERFACE_GET_PRIVATE(self);
if (nm_ip_addr_is_null(AF_INET, &priv->p2p_assigned_addr))
return FALSE;
if (addr)
nm_ip_addr_set(AF_INET, addr, &priv->p2p_assigned_addr);
if (plen)
*plen = priv->p2p_assigned_plen;
return TRUE;
}
/*****************************************************************************/
static void

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

@ -164,6 +164,10 @@ const char *nm_supplicant_interface_get_p2p_group_path(NMSupplicantInterface *se
gboolean nm_supplicant_interface_get_p2p_group_owner(NMSupplicantInterface *self);
gboolean nm_supplicant_interface_get_p2p_assigned_addr(NMSupplicantInterface *self,
in_addr_t * assigned_addr,
guint8 * plen);
void nm_supplicant_interface_p2p_start_find(NMSupplicantInterface *self, guint timeout);
void nm_supplicant_interface_p2p_stop_find(NMSupplicantInterface *self);