Skip to contentSkip to conversation

doc: Add net.connman.iwd.IPv{4,6}Configuration API doc

PATCH Applied Andrew Zaborowski 3 participants 5 messages Sep 8, 2021 – Sep 15, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 doc: Add net.connman.iwd.IPv{4,6}Configuration API doc

---
 doc/ip-configuration-api.txt | 47 ++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 doc/ip-configuration-api.txt
doc/ip-configuration-api.txt new file +47 -0
new file mode 100644
index 00000000..58a522de
@@ -0,0 +1,47 @@
+IP Configuration hierarchy
+===============================
+
+Service		net.connman.iwd
+Interface	net.connman.iwd.IPv4Configuration [Experimental]
+Interface	net.connman.iwd.IPv6Configuration [Experimental]
+Object path	/net/connman/iwd/{phy0,phy1,...}/{1,2,...}
+Object path	/net/connman/iwd/{phy0,phy1,...}/p2p_peers/{aa_bb_cc_dd_ee_ff}
+
+The interfaces net.connman.iwd.IPv4Configuration and
+net.connman.iwd.IPv6Configuration currently have the same sets of methods,
+signals and properties.  In station mode, when network configuration is
+enabled there may be one or both interfaces present on a device object in
+connected state depending on if IPv4 and IPv6 addresses have both been
+configured.  In P2P mode only net.connman.iwd.IPv4Configuration is used.
+
+Properties	string Method [readonly]
+
+			Indicates whether the local address was set
+			statically (value "static") or obtained automatically
+			such as through DHCP (value "auto").  Even when the
+			address was obtained from the remote end some
+			configuration bits, such as DNS addresses, may have
+			been overridden locally.
+
+		string Address [readonly]
+
+			Holds the local IP address.
+
+		byte PrefixLength [readonly]
+
+			Holds the prefix-length of the local subnet.  For
+			IPv4 this maps to the netmask.
+
+		string Gateway [readonly, optional]
+
+			Holds the gateway address for the subnet if one
+			exists.
+
+		array(string) DomainNameServers [readonly, optional]
+
+			Holds the list of domain name server addresses
+			configured if any.
+
+		array(string) DomainNames [readonly, optional]
+
+			Holds the network's local domain names if any exist.
Signature · 1 line
2.30.2
#1 lore raw

PATCH 2/2 netconfig: Add IP configuration properties on Station and P2P

Add the IPv{4,6}Configuration D-Bus interfaces on the station and P2P objects that expose current netconfig values. Access Point and P2P-GO are not handled yet, and some of the IP config properties may not automatically generate PropertiesChanged on DHCP lease renewals but their values are unlikely to change.

---
 src/dbus.h      |   2 +
 src/netconfig.c | 640 ++++++++++++++++++++++++++++++++++++++++--------
 src/netconfig.h |   2 +-
 src/p2p.c       |   4 +-
 src/station.c   |   8 +-
 5 files changed, 551 insertions(+), 105 deletions(-)
src/dbus.h +2 -0
index 7703b37f..a345f7ac 100644
@@ -43,6 +43,8 @@
 #define IWD_STATION_DIAGNOSTIC_INTERFACE "net.connman.iwd.StationDiagnostic"
 #define IWD_AP_DIAGNOSTIC_INTERFACE "net.connman.iwd.AccessPointDiagnostic"
 #define IWD_STATION_DEBUG_INTERFACE "net.connman.iwd.StationDebug"
+#define IWD_IPV4_CONFIG_INTERFACE "net.connman.iwd.IPv4Configuration"
+#define IWD_IPV6_CONFIG_INTERFACE "net.connman.iwd.IPv6Configuration"
 
 #define IWD_BASE_PATH "/net/connman/iwd"
 #define IWD_AGENT_MANAGER_PATH IWD_BASE_PATH
src/netconfig.c +540 -100

947 lines not on this page · raw message

src/netconfig.h +1 -1
index fa46c7c8..5d54d9cc 100644
@@ -45,5 +45,5 @@ bool netconfig_get_fils_ip_req(struct netconfig *netconfig,
 void netconfig_handle_fils_ip_resp(struct netconfig *netconfig,
 			const struct ie_fils_ip_addr_response_info *info);
 
-struct netconfig *netconfig_new(uint32_t ifindex);
+struct netconfig *netconfig_new(uint32_t ifindex, const char *dbus_path);
 void netconfig_destroy(struct netconfig *netconfig);
src/p2p.c +3 -1
index 3328271b..b68e4f7c 100644
@@ -1320,7 +1320,9 @@ static void p2p_start_client_netconfig(struct p2p_device *dev)
 	struct l_settings *settings;
 
 	if (!dev->conn_netconfig) {
-		dev->conn_netconfig = netconfig_new(ifindex);
+		const char *peer_path = p2p_peer_get_path(dev->conn_peer);
+
+		dev->conn_netconfig = netconfig_new(ifindex, peer_path);
 		if (!dev->conn_netconfig) {
 			p2p_connect_failed(dev);
 			return;
src/station.c +5 -3
index ac741f5a..a6b5922f 100644
@@ -3577,6 +3577,7 @@ static struct station *station_create(struct netdev *netdev)
 	struct station *station;
 	struct l_dbus *dbus = dbus_get_bus();
 	bool autoconnect = true;
+	const char *path;
 
 	station = l_new(struct station, 1);
 	watchlist_init(&station->state_watches, NULL);
@@ -3594,11 +3595,12 @@ static struct station *station_create(struct netdev *netdev)
 
 	l_queue_push_head(station_list, station);
 
-	l_dbus_object_add_interface(dbus, netdev_get_path(netdev),
-					IWD_STATION_INTERFACE, station);
+	path = netdev_get_path(netdev);
+	l_dbus_object_add_interface(dbus, path, IWD_STATION_INTERFACE, station);
 
 	if (netconfig_enabled)
-		station->netconfig = netconfig_new(netdev_get_ifindex(netdev));
+		station->netconfig = netconfig_new(netdev_get_ifindex(netdev),
+							path);
 
 	station->anqp_pending = l_queue_new();
 
Signature · 1 line
2.30.2
#2 lore raw

Re: [PATCH 2/2] netconfig: Add IP configuration properties on Station and P2P

Hi Andrew,

Quoted 13 lines · Andrew Zaborowski

Add the IPv{4,6}Configuration D-Bus interfaces on the station and P2P objects that expose current netconfig values. Access Point and P2P-GO are not handled yet, and some of the IP config properties may not automatically generate PropertiesChanged on DHCP lease renewals but their values are unlikely to change.

---
  src/dbus.h      |   2 +
  src/netconfig.c | 640 ++++++++++++++++++++++++++++++++++++++++--------
  src/netconfig.h |   2 +-
  src/p2p.c       |   4 +-
  src/station.c   |   8 +-
  5 files changed, 551 insertions(+), 105 deletions(-)

<snip>

Quoted 175 lines
src/netconfig.c +75 -58
@@ -152,20 +164,6 @@ static struct netconfig *netconfig_find(uint32_t ifindex)
  	return NULL;
  }
 
-#define APPEND_STRDUPV(dest, index, src)			\
-	do {							\
-		char **p;					\
-		for (p = src; p && *p; p++)			\
-			dest[index++] = l_strdup(*p);		\
-	} while (0)						\
-
-#define APPENDV(dest, index, src)				\
-	do {							\
-		char **p;					\
-		for (p = src; p && *p; p++)			\
-			dest[index++] = *p;			\
-	} while (0)						\
-
  static inline char *netconfig_ipv4_to_string(uint32_t addr)
  {
  	struct in_addr in_addr = { .s_addr = addr };
@@ -196,77 +194,108 @@ static inline char *netconfig_ipv6_to_string(const uint8_t *addr)
  	return addr_str;
  }
 
-static void netconfig_set_neighbor_entry_cb(int error,
-						uint16_t type, const void *data,
-						uint32_t len, void *user_data)
-{
-	if (error)
-		l_error("l_rtnl_neighbor_set_hwaddr failed: %s (%i)",
-			strerror(-error), error);
-}
-
-static int netconfig_set_dns(struct netconfig *netconfig)
+static char **netconfig_get_dns_list(struct netconfig *netconfig, int af,
+					const uint8_t **out_dns_mac)
  {
-	char **dns6_list = NULL;
-	char **dns4_list = NULL;
-	unsigned int n_entries = 0;
-	char **dns_list;
-	const uint8_t *fils_dns4_mac = NULL;
-	const uint8_t *fils_dns6_mac = NULL;
  	const struct ie_fils_ip_addr_response_info *fils =
  		netconfig->fils_override;
 
-	if (!netconfig->dns4_overrides &&
-			netconfig->rtm_protocol == RTPROT_DHCP) {
+	if (af == AF_INET) {
  		const struct l_dhcp_lease *lease;
 
+		if (netconfig->dns4_overrides)
+			return l_strv_copy(netconfig->dns4_overrides);
+
+		if (netconfig->rtm_protocol != RTPROT_DHCP)
+			return NULL;
+
  		if (fils && fils->ipv4_dns) {
-			dns4_list = l_new(char *, 2);
-			dns4_list[0] = netconfig_ipv4_to_string(fils->ipv4_dns);
+			char **dns_list = l_new(char *, 2);
 
  			if (!l_memeqzero(fils->ipv4_dns_mac, 6) &&
+					out_dns_mac &&
  					util_ip_subnet_match(
  							fils->ipv4_prefix_len,
  							&fils->ipv4_addr,
  							&fils->ipv4_dns))
-				fils_dns4_mac = fils->ipv4_dns_mac;
-		} else if ((lease = l_dhcp_client_get_lease(
-						netconfig->dhcp_client)))
-			dns4_list = l_dhcp_lease_get_dns(lease);
-	}
+				*out_dns_mac = fils->ipv4_dns_mac;
+
+			dns_list[0] = netconfig_ipv4_to_string(fils->ipv4_dns);
+			return dns_list;
+		}
 
-	if (!netconfig->dns6_overrides &&
-			netconfig->rtm_v6_protocol == RTPROT_DHCP) {
+		if (!(lease = l_dhcp_client_get_lease(netconfig->dhcp_client)))
+			return NULL;
+
+		return l_dhcp_lease_get_dns(lease);
+	} else {
  		const struct l_dhcp6_lease *lease;
 
-		if (fils && !l_memeqzero(fils->ipv6_dns,
-						16)) {
-			dns6_list = l_new(char *, 2);
-			dns6_list[0] = netconfig_ipv6_to_string(fils->ipv6_dns);
+		if (netconfig->dns6_overrides)
+			return l_strv_copy(netconfig->dns6_overrides);
+
+		if (netconfig->rtm_v6_protocol != RTPROT_DHCP)
+			return NULL;
+
+		if (fils && !l_memeqzero(fils->ipv6_dns, 16)) {
+			char **dns_list = l_new(char *, 2);
 
  			if (!l_memeqzero(fils->ipv6_dns_mac, 6) &&
+					out_dns_mac &&
  					util_ip_subnet_match(
  							fils->ipv6_prefix_len,
  							fils->ipv6_addr,
  							fils->ipv6_dns))
-				fils_dns6_mac = fils->ipv6_dns_mac;
-		} else if ((lease = l_dhcp6_client_get_lease(
+				*out_dns_mac = fils->ipv6_dns_mac;
+
+			dns_list[0] = netconfig_ipv6_to_string(fils->ipv6_dns);
+			return dns_list;
+		}
+
+		if (!(lease = l_dhcp6_client_get_lease(
  						netconfig->dhcp6_client)))
-			dns6_list = l_dhcp6_lease_get_dns(lease);
+			return NULL;
+
+		return l_dhcp6_lease_get_dns(lease);
  	}
+}
+
+static void netconfig_set_neighbor_entry_cb(int error,
+						uint16_t type, const void *data,
+						uint32_t len, void *user_data)
+{
+	if (error)
+		l_error("l_rtnl_neighbor_set_hwaddr failed: %s (%i)",
+			strerror(-error), error);
+}
+
+static int netconfig_set_dns(struct netconfig *netconfig)
+{
+	const uint8_t *fils_dns4_mac = NULL;
+	const uint8_t *fils_dns6_mac = NULL;
+	char **dns4_list = netconfig_get_dns_list(netconfig, AF_INET,
+							&fils_dns4_mac);
+	char **dns6_list = netconfig_get_dns_list(netconfig, AF_INET6,
+							&fils_dns6_mac);
+	unsigned int n_entries4 = l_strv_length(dns4_list);
+	unsigned int n_entries6 = l_strv_length(dns6_list);
+	char **dns_list;
+	const struct ie_fils_ip_addr_response_info *fils =
+		netconfig->fils_override;
 
-	n_entries += l_strv_length(netconfig->dns4_overrides);
-	n_entries += l_strv_length(netconfig->dns6_overrides);
-	n_entries += l_strv_length(dns4_list);
-	n_entries += l_strv_length(dns6_list);
+	if (!dns4_list && !dns6_list)
+		return 0;
 
-	dns_list = l_new(char *, n_entries + 1);
-	n_entries = 0;
+	dns_list = l_realloc(dns4_list,
+				sizeof(char *) * (n_entries4 + n_entries6 + 1));
+
+	if (dns6_list) {
+		memcpy(dns_list + n_entries4, dns6_list,
+			sizeof(char *) * (n_entries6 + 1));
+		/* Contents now belong to dns_list, so no l_strfreev */
+		l_free(dns6_list);
+	}
 
-	APPEND_STRDUPV(dns_list, n_entries, netconfig->dns4_overrides);
-	APPENDV(dns_list, n_entries, dns4_list);
-	APPEND_STRDUPV(dns_list, n_entries, netconfig->dns6_overrides);
-	APPENDV(dns_list, n_entries, dns6_list);
  	resolve_set_dns(netconfig->resolve, dns_list);
 
  	if (fils_dns4_mac && !l_rtnl_neighbor_set_hwaddr(rtnl,

src/netconfig.c static int netconfig_set_dns(struct netconfig *netconfig) · line 318

Quoted 9 lines
src/netconfig.c +0 -3
@@ -284,9 +313,6 @@ static int netconfig_set_dns(struct netconfig *netconfig)
  		l_debug("l_rtnl_neighbor_set_hwaddr failed");
 
  	l_strv_free(dns_list);
-	/* Contents belonged to dns_list, so not l_strfreev */
-	l_free(dns4_list);
-	l_free(dns6_list);
  	return 0;
  }
 

I applied this part separately in commit 8b573fe3984d ("netconfig: Refactor netconfig_set_dns")

<snip>

Quoted 29 lines
src/netconfig.c +25 -0
@@ -703,6 +732,43 @@ static void netconfig_route_generic_cb(int error, uint16_t type,
  	}
  }
 
+static void netconfig_connected(struct netconfig *netconfig)
+{
+	struct l_dbus *dbus = dbus_get_bus();
+
+	netconfig->connected = true;
+
+	if (netconfig->notify) {
+		netconfig->notify(NETCONFIG_EVENT_CONNECTED,
+					netconfig->user_data);
+		netconfig->notify = NULL;
+	}
+
+	if (netconfig->dbus_path &&
+			unlikely(!l_dbus_object_add_interface(dbus,
+						netconfig->dbus_path,
+						IWD_IPV4_CONFIG_INTERFACE,
+						&netconfig->ipv4_data)))
+		l_info("Unable to add %s at %s",
+			IWD_IPV4_CONFIG_INTERFACE, netconfig->dbus_path);
+
+	if (netconfig->dbus_path &&
+			unlikely(!l_dbus_object_add_interface(dbus,
+						netconfig->dbus_path,
+						IWD_IPV6_CONFIG_INTERFACE,
+						&netconfig->ipv6_data)))

src/netconfig.c static void netconfig_route_generic_cb(int error, uint16_t type, · line 769

Quoted 10 lines
src/netconfig.c +10 -0
+		l_info("Unable to add %s at %s",
+			IWD_IPV6_CONFIG_INTERFACE, netconfig->dbus_path);
+
+	if (netconfig->dbus_path &&
+			!l_dbus_object_add_interface(dbus, netconfig->dbus_path,
+						L_DBUS_INTERFACE_PROPERTIES,
+						netconfig))
+		/* Properties may already exist on the object, not an error */
+		l_debug("Unable to add %s at %s",
+			L_DBUS_INTERFACE_PROPERTIES, netconfig->dbus_path);

So the connected event is fired once we have IPv4 or IPv6 configuration, right?

Why would we populate both IPv6 and IPv4 interfaces here though? Why don't you just make IPv6 interface available when IPv6 is configured, and similarly for IPv4? Would make a lot of the code simpler and require less l_dbus_property_changed() calls.

Quoted 5 lines
src/netconfig.c +2 -0
+}
+
  static void netconfig_route_add_cmd_cb(int error, uint16_t type,
  						const void *data, uint32_t len,
  						void *user_data)

<snip>

Quoted 15 lines
src/netconfig.c +7 -2
@@ -897,10 +989,47 @@ static void netconfig_ipv4_dhcp_event_handler(struct l_dhcp_client *client,
  					netconfig->v4_address,
  					netconfig_ifaddr_del_cmd_cb,
  					netconfig, NULL));
-		l_rtnl_address_free(netconfig->v4_address);
  		/* Fall through. */
  	case L_DHCP_CLIENT_EVENT_LEASE_OBTAINED:
-		netconfig->v4_address = netconfig_get_dhcp4_address(netconfig);
+	{
+		char *gateway_str;
+		struct l_rtnl_address *address;
+
+		gateway_str = netconfig_ipv4_get_gateway(netconfig, NULL);
+		if (l_streq0(netconfig->v4_gateway_str, gateway_str))
+			l_free(gateway_str);

src/netconfig.c static void netconfig_ipv4_dhcp_event_handler(struct l_dhcp_client *client, · line 1010

Quoted 10 lines
src/netconfig.c +10 -0
+		else {
+			l_free(netconfig->v4_gateway_str);
+			netconfig->v4_gateway_str = gateway_str;
+
+			if (netconfig->dbus_path && netconfig->connected)
+				l_dbus_property_changed(dbus,
+						netconfig->dbus_path,
+						IWD_IPV4_CONFIG_INTERFACE,
+						"Gateway");
+		}

So in theory LEASE_OBTAINED should only ever be signaled once. Why not register the IPv4 interface now and avoid all this logic? If we lose the lease for some reason, then we should get a LEASE_LOST or LEASE_EXPIRED event first.

Quoted 45 lines
src/netconfig.c +31 -0
+
+		address = netconfig_get_dhcp4_address(netconfig);
+
+		if (netconfig->dbus_path && netconfig->connected &&
+				!netconfig_address_cmp_prefix_len(
+							netconfig->v4_address,
+							address))
+			l_dbus_property_changed(dbus, netconfig->dbus_path,
+						IWD_IPV4_CONFIG_INTERFACE,
+						"Netmask");
+
+		if (netconfig->dbus_path && netconfig->connected &&
+				netconfig_address_cmp_address(
+							netconfig->v4_address,
+							address))
+			l_dbus_property_changed(dbus, netconfig->dbus_path,
+						IWD_IPV4_CONFIG_INTERFACE,
+						"Address");
+
+		l_rtnl_address_free(netconfig->v4_address);
+		netconfig->v4_address = address;
+
  		if (!netconfig->v4_address) {
  			l_error("netconfig: Failed to obtain IP addresses from "
  							"DHCPv4 lease.");
@@ -913,6 +1042,7 @@ static void netconfig_ipv4_dhcp_event_handler(struct l_dhcp_client *client,
  					netconfig_ipv4_ifaddr_add_cmd_cb,
  					netconfig, NULL)));
  		break;
+	}
  	case L_DHCP_CLIENT_EVENT_LEASE_RENEWED:
  		break;
  	case L_DHCP_CLIENT_EVENT_LEASE_EXPIRED:
@@ -923,6 +1053,25 @@ static void netconfig_ipv4_dhcp_event_handler(struct l_dhcp_client *client,
  		l_rtnl_address_free(netconfig->v4_address);
  		netconfig->v4_address = NULL;
 
+		if (netconfig->dbus_path && netconfig->connected) {
+			l_dbus_property_changed(dbus, netconfig->dbus_path,
+						IWD_IPV4_CONFIG_INTERFACE,
+						"Address");
+			l_dbus_property_changed(dbus, netconfig->dbus_path,
+						IWD_IPV4_CONFIG_INTERFACE,
+						"Netmask");
+		}

src/netconfig.c static void netconfig_ipv4_dhcp_event_handler(struct l_dhcp_client *client, · line 1073

Quoted 10 lines
src/netconfig.c +10 -0
+
+		if (netconfig->v4_gateway_str) {
+			if (netconfig->dbus_path && netconfig->connected)
+				l_dbus_property_changed(dbus,
+						netconfig->dbus_path,
+						IWD_IPV4_CONFIG_INTERFACE,
+						"Gateway");
+
+			l_free(l_steal_ptr(netconfig->v4_gateway_str));
+		}

Why not simply remove the IPv4 interface?

Quoted 49 lines
src/netconfig.c +37 -0
+
  		/* Fall through. */
  	case L_DHCP_CLIENT_EVENT_NO_LEASE:
  		/*
@@ -945,18 +1094,87 @@ static void netconfig_dhcp6_event_handler(struct l_dhcp6_client *client,
  						void *userdata)
  {
  	struct netconfig *netconfig = userdata;
+	struct l_dbus *dbus = dbus_get_bus();
 
  	switch (event) {
  	case L_DHCP6_CLIENT_EVENT_IP_CHANGED:
  	case L_DHCP6_CLIENT_EVENT_LEASE_OBTAINED:
  	case L_DHCP6_CLIENT_EVENT_LEASE_RENEWED:
+	{
+		__auto_type lease =
+			l_dhcp6_client_get_lease(netconfig->dhcp6_client);
+		L_AUTO_FREE_VAR(char *, addr_str) =
+			l_dhcp6_lease_get_address(lease);
+		struct l_rtnl_address *address;
+		__auto_type icmp6 =
+			l_dhcp6_client_get_icmp6(netconfig->dhcp6_client);
+		__auto_type router = l_icmp6_client_get_router(icmp6);
+		char *gateway_str = l_icmp6_router_get_address(router);
+
+		if (l_streq0(netconfig->v6_gateway_str, gateway_str))
+			l_free(gateway_str);
+		else {
+			l_free(netconfig->v6_gateway_str);
+			netconfig->v6_gateway_str = gateway_str;
+
+			if (netconfig->dbus_path && netconfig->connected)
+				l_dbus_property_changed(dbus,
+						netconfig->dbus_path,
+						IWD_IPV6_CONFIG_INTERFACE,
+						"Gateway");
+		}
+
+		address = l_rtnl_address_new(addr_str,
+					l_dhcp6_lease_get_prefix_length(lease));
+
+		if (netconfig->dbus_path && netconfig->connected &&
+				!netconfig_address_cmp_prefix_len(
+							netconfig->v6_address,
+							address))
+			l_dbus_property_changed(dbus, netconfig->dbus_path,
+						IWD_IPV6_CONFIG_INTERFACE,
+						"Netmask");
+

src/netconfig.c static void netconfig_dhcp6_event_handler(struct l_dhcp6_client *client, · line 1147

Quoted 10 lines
src/netconfig.c +10 -0
+		if (netconfig->dbus_path && netconfig->connected &&
+				netconfig_address_cmp_address(
+							netconfig->v6_address,
+							address))
+			l_dbus_property_changed(dbus, netconfig->dbus_path,
+						IWD_IPV6_CONFIG_INTERFACE,
+						"Address");
+
+		l_rtnl_address_free(netconfig->v6_address);
+		netconfig->v4_address = address;

v6 address?

Also similar comments as above? Why not just register the IPv6 interface here instead?

Also, I'm really not sure whether just Netmask/Address/Gateway are the only things that can change. DNS, NTP, domain, etc information might also change. So a more generic old lease / new lease comparison might be needed. Or always send a PropertyChanged for all attributes and have the caller figure it out?

<snip>

Quoted 46 lines
src/netconfig.c +46 -0
+static bool netconfig_property_get_domains(struct l_dbus *dbus,
+					struct l_dbus_message *message,
+					struct l_dbus_message_builder *builder,
+					void *user_data)
+{
+	const struct interface_data *data = user_data;
+
+	if (data->is_ipv4) {
+		L_AUTO_FREE_VAR(char *, domain) =
+			l_settings_get_string(data->netconfig->active_settings,
+						"IPv4", "DomainName");
+
+		if (!domain) {
+			const struct l_dhcp_lease *lease;
+
+			if (data->netconfig->rtm_protocol != RTPROT_DHCP)
+				return false;
+
+			lease = l_dhcp_client_get_lease(
+						data->netconfig->dhcp_client);
+			if (!lease)
+				return false;
+
+			if (!(domain = l_dhcp_lease_get_domain_name(lease)))
+				return false;
+		}
+
+		l_dbus_message_builder_enter_array(builder, "s");
+		l_dbus_message_builder_append_basic(builder, 's', domain);
+		l_dbus_message_builder_leave_array(builder);
+	} else {
+		const struct l_dhcp6_lease *lease;
+		char **domains;
+		char **i;
+
+		if (data->netconfig->rtm_v6_protocol != RTPROT_DHCP)
+			return false;
+
+		lease = l_dhcp6_client_get_lease(data->netconfig->dhcp6_client);
+		if (!lease)
+			return false;
+
+		domains = l_dhcp6_lease_get_domains(lease);
+		if (!domains)
+			return false;
+

src/netconfig.c void netconfig_destroy(struct netconfig *netconfig) · line 1898

Quoted 10 lines
src/netconfig.c +10 -0
+		l_dbus_message_builder_enter_array(builder, "s");
+
+		for (i = domains; *i; i++)
+			l_dbus_message_builder_append_basic(builder, 's', *i);
+
+		l_dbus_message_builder_leave_array(builder);
+		l_strv_free(domains);
+	}
+
+	return true;

Might as well make this two separate functions

Review

Quoted 2 lines
(quoted diff) +2 -0
+}
+

Regards,
-Denis

#3 lore raw

Re: [PATCH 2/2] netconfig: Add IP configuration properties on Station and P2P

Hi Denis,

Quoted 43 lines · Denis Kenzior
Quoted 29 lines · Andrew Zaborowski
src/netconfig.c +25 -0
@@ -703,6 +732,43 @@ static void netconfig_route_generic_cb(int error, uint16_t type,
      }
  }
 
+static void netconfig_connected(struct netconfig *netconfig)
+{
+     struct l_dbus *dbus = dbus_get_bus();
+
+     netconfig->connected = true;
+
+     if (netconfig->notify) {
+             netconfig->notify(NETCONFIG_EVENT_CONNECTED,
+                                     netconfig->user_data);
+             netconfig->notify = NULL;
+     }
+
+     if (netconfig->dbus_path &&
+                     unlikely(!l_dbus_object_add_interface(dbus,
+                                             netconfig->dbus_path,
+                                             IWD_IPV4_CONFIG_INTERFACE,
+                                             &netconfig->ipv4_data)))
+             l_info("Unable to add %s at %s",
+                     IWD_IPV4_CONFIG_INTERFACE, netconfig->dbus_path);
+
+     if (netconfig->dbus_path &&
+                     unlikely(!l_dbus_object_add_interface(dbus,
+                                             netconfig->dbus_path,
+                                             IWD_IPV6_CONFIG_INTERFACE,
+                                             &netconfig->ipv6_data)))

src/netconfig.c static void netconfig_route_generic_cb(int error, uint16_t type, · line 769

Quoted 10 lines
src/netconfig.c +10 -0
+             l_info("Unable to add %s at %s",
+                     IWD_IPV6_CONFIG_INTERFACE, netconfig->dbus_path);
+
+     if (netconfig->dbus_path &&
+                     !l_dbus_object_add_interface(dbus, netconfig->dbus_path,
+                                             L_DBUS_INTERFACE_PROPERTIES,
+                                             netconfig))
+             /* Properties may already exist on the object, not an error */
+             l_debug("Unable to add %s at %s",
+                     L_DBUS_INTERFACE_PROPERTIES, netconfig->dbus_path);

So the connected event is fired once we have IPv4 or IPv6 configuration, right?

Quoted 4 lines

Why would we populate both IPv6 and IPv4 interfaces here though? Why don't you just make IPv6 interface available when IPv6 is configured, and similarly for IPv4? Would make a lot of the code simpler and require less l_dbus_property_changed() calls.

Yep, I was considering that, the semantics of the two interfaces are going to be a little different but that should be fine for NM as the potential user of the API.

I added a netconfig.connected, I'll need to split this into a .connected4 and .connected6 or similar, to track whether we've added the interfaces yet.

Quoted 30 lines
Quoted 6 lines
src/netconfig.c +2 -0
+}
+
  static void netconfig_route_add_cmd_cb(int error, uint16_t type,
                                              const void *data, uint32_t len,
                                              void *user_data)

<snip>

Quoted 21 lines
src/netconfig.c +13 -2
@@ -897,10 +989,47 @@ static void netconfig_ipv4_dhcp_event_handler(struct l_dhcp_client *client,
                                      netconfig->v4_address,
                                      netconfig_ifaddr_del_cmd_cb,
                                      netconfig, NULL));
-             l_rtnl_address_free(netconfig->v4_address);
              /* Fall through. */
      case L_DHCP_CLIENT_EVENT_LEASE_OBTAINED:
-             netconfig->v4_address = netconfig_get_dhcp4_address(netconfig);
+     {
+             char *gateway_str;
+             struct l_rtnl_address *address;
+
+             gateway_str = netconfig_ipv4_get_gateway(netconfig, NULL);
+             if (l_streq0(netconfig->v4_gateway_str, gateway_str))
+                     l_free(gateway_str);
+             else {
+                     l_free(netconfig->v4_gateway_str);
+                     netconfig->v4_gateway_str = gateway_str;
+
+                     if (netconfig->dbus_path && netconfig->connected)
+                             l_dbus_property_changed(dbus,
Quoted 8 lines

src/netconfig.c static void netconfig_ipv4_dhcp_event_handler(struct l_dhcp_client *client, · line 1010

Quoted 4 lines
src/netconfig.c +4 -0
+                                             netconfig->dbus_path,
+                                             IWD_IPV4_CONFIG_INTERFACE,
+                                             "Gateway");
+             }

So in theory LEASE_OBTAINED should only ever be signaled once. Why not register the IPv4 interface now and avoid all this logic? If we lose the lease for some reason, then we should get a LEASE_LOST or LEASE_EXPIRED event first.

Yep, that'd be in line with making the interfaces be present only during the time that we have a lease (if method is DHCP.)

Quoted 50 lines
Quoted 50 lines
src/netconfig.c +35 -0
+
+             address = netconfig_get_dhcp4_address(netconfig);
+
+             if (netconfig->dbus_path && netconfig->connected &&
+                             !netconfig_address_cmp_prefix_len(
+                                                     netconfig->v4_address,
+                                                     address))
+                     l_dbus_property_changed(dbus, netconfig->dbus_path,
+                                             IWD_IPV4_CONFIG_INTERFACE,
+                                             "Netmask");
+
+             if (netconfig->dbus_path && netconfig->connected &&
+                             netconfig_address_cmp_address(
+                                                     netconfig->v4_address,
+                                                     address))
+                     l_dbus_property_changed(dbus, netconfig->dbus_path,
+                                             IWD_IPV4_CONFIG_INTERFACE,
+                                             "Address");
+
+             l_rtnl_address_free(netconfig->v4_address);
+             netconfig->v4_address = address;
+
              if (!netconfig->v4_address) {
                      l_error("netconfig: Failed to obtain IP addresses from "
                                                      "DHCPv4 lease.");
@@ -913,6 +1042,7 @@ static void netconfig_ipv4_dhcp_event_handler(struct l_dhcp_client *client,
                                      netconfig_ipv4_ifaddr_add_cmd_cb,
                                      netconfig, NULL)));
              break;
+     }
      case L_DHCP_CLIENT_EVENT_LEASE_RENEWED:
              break;
      case L_DHCP_CLIENT_EVENT_LEASE_EXPIRED:
@@ -923,6 +1053,25 @@ static void netconfig_ipv4_dhcp_event_handler(struct l_dhcp_client *client,
              l_rtnl_address_free(netconfig->v4_address);
              netconfig->v4_address = NULL;
 
+             if (netconfig->dbus_path && netconfig->connected) {
+                     l_dbus_property_changed(dbus, netconfig->dbus_path,
+                                             IWD_IPV4_CONFIG_INTERFACE,
+                                             "Address");
+                     l_dbus_property_changed(dbus, netconfig->dbus_path,
+                                             IWD_IPV4_CONFIG_INTERFACE,
+                                             "Netmask");
+             }
+
+             if (netconfig->v4_gateway_str) {
+                     if (netconfig->dbus_path && netconfig->connected)
+                             l_dbus_property_changed(dbus,
Quoted 8 lines

src/netconfig.c static void netconfig_ipv4_dhcp_event_handler(struct l_dhcp_client *client, · line 1073

Quoted 6 lines
src/netconfig.c +6 -0
+                                             netconfig->dbus_path,
+                                             IWD_IPV4_CONFIG_INTERFACE,
+                                             "Gateway");
+
+                     l_free(l_steal_ptr(netconfig->v4_gateway_str));
+             }

Why not simply remove the IPv4 interface?

Yep, same here.

Quoted 54 lines
Quoted 54 lines
src/netconfig.c +41 -0
+
              /* Fall through. */
      case L_DHCP_CLIENT_EVENT_NO_LEASE:
              /*
@@ -945,18 +1094,87 @@ static void netconfig_dhcp6_event_handler(struct l_dhcp6_client *client,
                                              void *userdata)
  {
      struct netconfig *netconfig = userdata;
+     struct l_dbus *dbus = dbus_get_bus();
 
      switch (event) {
      case L_DHCP6_CLIENT_EVENT_IP_CHANGED:
      case L_DHCP6_CLIENT_EVENT_LEASE_OBTAINED:
      case L_DHCP6_CLIENT_EVENT_LEASE_RENEWED:
+     {
+             __auto_type lease =
+                     l_dhcp6_client_get_lease(netconfig->dhcp6_client);
+             L_AUTO_FREE_VAR(char *, addr_str) =
+                     l_dhcp6_lease_get_address(lease);
+             struct l_rtnl_address *address;
+             __auto_type icmp6 =
+                     l_dhcp6_client_get_icmp6(netconfig->dhcp6_client);
+             __auto_type router = l_icmp6_client_get_router(icmp6);
+             char *gateway_str = l_icmp6_router_get_address(router);
+
+             if (l_streq0(netconfig->v6_gateway_str, gateway_str))
+                     l_free(gateway_str);
+             else {
+                     l_free(netconfig->v6_gateway_str);
+                     netconfig->v6_gateway_str = gateway_str;
+
+                     if (netconfig->dbus_path && netconfig->connected)
+                             l_dbus_property_changed(dbus,
+                                             netconfig->dbus_path,
+                                             IWD_IPV6_CONFIG_INTERFACE,
+                                             "Gateway");
+             }
+
+             address = l_rtnl_address_new(addr_str,
+                                     l_dhcp6_lease_get_prefix_length(lease));
+
+             if (netconfig->dbus_path && netconfig->connected &&
+                             !netconfig_address_cmp_prefix_len(
+                                                     netconfig->v6_address,
+                                                     address))
+                     l_dbus_property_changed(dbus, netconfig->dbus_path,
+                                             IWD_IPV6_CONFIG_INTERFACE,
+                                             "Netmask");
+
+             if (netconfig->dbus_path && netconfig->connected &&
+                             netconfig_address_cmp_address(
+                                                     netconfig->v6_address,
+                                                     address))
Quoted 8 lines

src/netconfig.c static void netconfig_dhcp6_event_handler(struct l_dhcp6_client *client, · line 1147

Quoted 6 lines
src/netconfig.c +6 -0
+                     l_dbus_property_changed(dbus, netconfig->dbus_path,
+                                             IWD_IPV6_CONFIG_INTERFACE,
+                                             "Address");
+
+             l_rtnl_address_free(netconfig->v6_address);
+             netconfig->v4_address = address;

v6 address?

Oops, yes.

Quoted 8 lines

Also similar comments as above? Why not just register the IPv6 interface here instead?

Also, I'm really not sure whether just Netmask/Address/Gateway are the only things that can change. DNS, NTP, domain, etc information might also change. So a more generic old lease / new lease comparison might be needed. Or always send a PropertyChanged for all attributes and have the caller figure it out?

I mentioned in the commit that the signals don't cover all of the properties since those are unlikely to be useful and are unlikely to change, in fact ell/dhcp.c also only checks the netmask, the address and the router when emitting the event. I'll add the missing signals just in case.

Quoted 53 lines

<snip>

Quoted 50 lines
src/netconfig.c +50 -0
+static bool netconfig_property_get_domains(struct l_dbus *dbus,
+                                     struct l_dbus_message *message,
+                                     struct l_dbus_message_builder *builder,
+                                     void *user_data)
+{
+     const struct interface_data *data = user_data;
+
+     if (data->is_ipv4) {
+             L_AUTO_FREE_VAR(char *, domain) =
+                     l_settings_get_string(data->netconfig->active_settings,
+                                             "IPv4", "DomainName");
+
+             if (!domain) {
+                     const struct l_dhcp_lease *lease;
+
+                     if (data->netconfig->rtm_protocol != RTPROT_DHCP)
+                             return false;
+
+                     lease = l_dhcp_client_get_lease(
+                                             data->netconfig->dhcp_client);
+                     if (!lease)
+                             return false;
+
+                     if (!(domain = l_dhcp_lease_get_domain_name(lease)))
+                             return false;
+             }
+
+             l_dbus_message_builder_enter_array(builder, "s");
+             l_dbus_message_builder_append_basic(builder, 's', domain);
+             l_dbus_message_builder_leave_array(builder);
+     } else {
+             const struct l_dhcp6_lease *lease;
+             char **domains;
+             char **i;
+
+             if (data->netconfig->rtm_v6_protocol != RTPROT_DHCP)
+                     return false;
+
+             lease = l_dhcp6_client_get_lease(data->netconfig->dhcp6_client);
+             if (!lease)
+                     return false;
+
+             domains = l_dhcp6_lease_get_domains(lease);
+             if (!domains)
+                     return false;
+
+             l_dbus_message_builder_enter_array(builder, "s");
+
+             for (i = domains; *i; i++)
+                     l_dbus_message_builder_append_basic(builder, 's', *i);
Quoted 8 lines

src/netconfig.c void netconfig_destroy(struct netconfig *netconfig) · line 1898

Quoted 6 lines
src/netconfig.c +6 -0
+
+             l_dbus_message_builder_leave_array(builder);
+             l_strv_free(domains);
+     }
+
+     return true;

Might as well make this two separate functions

Ok.

Best regards

Applied
#4 lore raw
In reply to Andrew Zaborowski

Hi Andrew,

Quoted 4 lines · Andrew Zaborowski
---
  doc/ip-configuration-api.txt | 47 ++++++++++++++++++++++++++++++++++++
  1 file changed, 47 insertions(+)

create mode 100644 doc/ip-configuration-api.txt

Applied, thanks.

Regards,
-Denis