Skip to contentSkip to conversation

build: add ell/acd.{c,h} to makefile

PATCH In review James Prestwood 2 participants 11 messages Dec 10, 2020 Kbuild

lore
Share & tools
lore
#0 lore raw

PATCH 1/9 build: add ell/acd.{c,h} to makefile

---
 Makefile.am | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
Makefile.am +4 -2
index 1f0b0d30..3cd7eaa6 100644
@@ -61,7 +61,8 @@ ell_headers = ell/util.h \
 			ell/time.h \
 			ell/path.h \
 			ell/icmp6.h \
-			ell/dhcp6.h
+			ell/dhcp6.h \
+			ell/acd.h
 
 ell_sources = ell/private.h \
 			ell/missing.h \
@@ -138,7 +139,8 @@ ell_sources = ell/private.h \
 			ell/icmp6.c \
 			ell/icmp6-private.h \
 			ell/dhcp6-lease.c \
-			ell/dhcp6-transport.c
+			ell/dhcp6-transport.c \
+			ell/acd.c
 
 ell_libell_internal_la_SOURCES = $(ell_headers) $(ell_sources)
 endif
Signature · 1 line
2.26.2
#1 lore raw

PATCH 2/9 netconfig: add ACD client for static configuration

When the IP is configured to be static we can now use ACD in order to check that the IP is available and not already in use. If a conflict is found netconfig will be reset and no IP will be set on the interface. The ACD client is left with the default 'defend once' policy, and probes are not turned off. This will increase connection time, but for static IP's it is the best approach.

---
 src/netconfig.c | 45 ++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 44 insertions(+), 1 deletion(-)
src/netconfig.c +44 -1
index f48a789a..24ad3fff 100644
@@ -64,6 +64,8 @@ struct netconfig {
 	void *user_data;
 
 	struct resolve *resolve;
+
+	struct l_acd *acd;
 };
 
 static struct l_netlink *rtnl;
@@ -804,15 +806,56 @@ static void netconfig_dhcp6_event_handler(struct l_dhcp6_client *client,
 	}
 }
 
+static void netconfig_ipv4_acd_event(enum l_acd_event event, void *user_data)
+{
+	struct netconfig *netconfig = user_data;
+
+	switch (event) {
+	case L_ACD_EVENT_AVAILABLE:
+		L_WARN_ON(!l_rtnl_ifaddr_add(rtnl, netconfig->ifindex,
+					netconfig->v4_address,
+					netconfig_ipv4_ifaddr_add_cmd_cb,
+					netconfig, NULL));
+		return;
+	case L_ACD_EVENT_CONFLICT:
+		l_error("netconfig: statically configured address conflict!");
+		break;
+	case L_ACD_EVENT_LOST:
+		l_error("netconfig: statically configured address was lost");
+		break;
+	}
+
+	netconfig_reset(netconfig);
+}
+
 static void netconfig_ipv4_select_and_install(struct netconfig *netconfig)
 {
 	netconfig->v4_address = netconfig_get_static4_address(netconfig);
 	if (netconfig->v4_address) {
+		char ip[INET6_ADDRSTRLEN];
+
 		netconfig->rtm_protocol = RTPROT_STATIC;
-		L_WARN_ON(!l_rtnl_ifaddr_add(rtnl, netconfig->ifindex,
+		netconfig->acd = l_acd_new(netconfig->ifindex);
+		l_acd_set_event_handler(netconfig->acd,
+					netconfig_ipv4_acd_event, netconfig,
+					NULL);
+		if (getenv("IWD_ACD_DEBUG"))
+			l_acd_set_debug(netconfig->acd, do_debug,
+					"[ACD] ", NULL);
+
+		l_rtnl_address_get_address(netconfig->v4_address, ip);
+
+		if (!l_acd_start(netconfig->acd, ip)) {
+			l_error("failed to start ACD, continuing anyways");
+			l_acd_destroy(netconfig->acd);
+			netconfig->acd = NULL;
+
+			L_WARN_ON(!l_rtnl_ifaddr_add(rtnl, netconfig->ifindex,
 					netconfig->v4_address,
 					netconfig_ipv4_ifaddr_add_cmd_cb,
 					netconfig, NULL));
+		}
+
 		return;
 	}
 
Signature · 1 line
2.26.2
#2 lore raw

Re: [PATCH 2/9] netconfig: add ACD client for static configuration

Hi James,

Quoted 38 lines · James Prestwood

When the IP is configured to be static we can now use ACD in order to check that the IP is available and not already in use. If a conflict is found netconfig will be reset and no IP will be set on the interface. The ACD client is left with the default 'defend once' policy, and probes are not turned off. This will increase connection time, but for static IP's it is the best approach.

---
  src/netconfig.c | 45 ++++++++++++++++++++++++++++++++++++++++++++-
  1 file changed, 44 insertions(+), 1 deletion(-)
src/netconfig.c +12 -0
index f48a789a..24ad3fff 100644
@@ -64,6 +64,8 @@ struct netconfig {
  	void *user_data;
 
  	struct resolve *resolve;
+
+	struct l_acd *acd;
  };
 
  static struct l_netlink *rtnl;
@@ -804,15 +806,56 @@ static void netconfig_dhcp6_event_handler(struct l_dhcp6_client *client,
  	}
  }
 
+static void netconfig_ipv4_acd_event(enum l_acd_event event, void *user_data)
+{
+	struct netconfig *netconfig = user_data;
+
+	switch (event) {
+	case L_ACD_EVENT_AVAILABLE:
+		L_WARN_ON(!l_rtnl_ifaddr_add(rtnl, netconfig->ifindex,
+					netconfig->v4_address,
+					netconfig_ipv4_ifaddr_add_cmd_cb,
+					netconfig, NULL));

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

Quoted 10 lines
src/netconfig.c +10 -0
+		return;
+	case L_ACD_EVENT_CONFLICT:
+		l_error("netconfig: statically configured address conflict!");
+		break;
+	case L_ACD_EVENT_LOST:
+		l_error("netconfig: statically configured address was lost");
+		break;
+	}
+
+	netconfig_reset(netconfig);

That might be a bit harsh. We may still have ipv6 connectivity.

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

Quoted 6 lines
src/netconfig.c +2 -0
+}
+
  static void netconfig_ipv4_select_and_install(struct netconfig *netconfig)
  {
  	netconfig->v4_address = netconfig_get_static4_address(netconfig);
  	if (netconfig->v4_address) {

Hmm, right now the assumption is that if v4_address is set, then we attempted to set it in the kernel and it is most likely set. So on ACD failure we'd try to reset an address that doesn't exist. Harmless, but might be nicer not to do unnecessary stuff.

Quoted 19 lines
src/netconfig.c +16 -1
+		char ip[INET6_ADDRSTRLEN];
+
  		netconfig->rtm_protocol = RTPROT_STATIC;
-		L_WARN_ON(!l_rtnl_ifaddr_add(rtnl, netconfig->ifindex,
+		netconfig->acd = l_acd_new(netconfig->ifindex);
+		l_acd_set_event_handler(netconfig->acd,
+					netconfig_ipv4_acd_event, netconfig,
+					NULL);
+		if (getenv("IWD_ACD_DEBUG"))
+			l_acd_set_debug(netconfig->acd, do_debug,
+					"[ACD] ", NULL);
+
+		l_rtnl_address_get_address(netconfig->v4_address, ip);
+
+		if (!l_acd_start(netconfig->acd, ip)) {
+			l_error("failed to start ACD, continuing anyways");
+			l_acd_destroy(netconfig->acd);
+			netconfig->acd = NULL;

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

Quoted 10 lines
src/netconfig.c +4 -0
+
+			L_WARN_ON(!l_rtnl_ifaddr_add(rtnl, netconfig->ifindex,
  					netconfig->v4_address,
  					netconfig_ipv4_ifaddr_add_cmd_cb,
  					netconfig, NULL));
+		}
+
  		return;
  	}
 

Regards,
-Denis

#3 lore raw

PATCH 3/9 test-runner: have start_iwd take a storage dir

In reply to James Prestwood

Allow the storage directory (default /tmp/iwd) to be configured just like the state directory. This is in order to support multiple IWD instances which require separate storage directories for network provisioning files.

---
 tools/test-runner | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
tools/test-runner +2 -2
index 3a9cfce2..c2ff7eff 100755
@@ -559,7 +559,7 @@ class Namespace:
 
 		self._bus = dbus.bus.BusConnection(address_or_type=self.dbus_address)
 
-	def start_iwd(self, config_dir = '/tmp'):
+	def start_iwd(self, config_dir = '/tmp', storage_dir = '/tmp/iwd'):
 		args = []
 		iwd_radios = ','.join([r.name for r in self.radios if r.use == 'iwd'])
 
@@ -575,7 +575,7 @@ class Namespace:
 		env = os.environ.copy()
 
 		env['CONFIGURATION_DIRECTORY'] = config_dir
-		env['STATE_DIRECTORY'] = '/tmp/iwd'
+		env['STATE_DIRECTORY'] = storage_dir
 
 		if self.is_verbose('iwd-dhcp'):
 			env['IWD_DHCP_DEBUG'] = '1'
Signature · 1 line
2.26.2
#4 lore raw

PATCH 4/9 auto-t: add storage dir to IWD() constructor

In reply to James Prestwood

Add support for setting a custom storage directory.

---
 autotests/util/iwd.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
autotests/util/iwd.py +4 -2
index bb4ecefa..844bb0db 100755
@@ -943,7 +943,8 @@ class IWD(AsyncOpAbstract):
     _default_instance = None
     psk_agent = None
 
-    def __init__(self, start_iwd_daemon = False, iwd_config_dir = '/tmp', namespace=ctx):
+    def __init__(self, start_iwd_daemon = False, iwd_config_dir = '/tmp',
+                            iwd_storage_dir = '/tmp/iwd', namespace=ctx):
         self.namespace = namespace
         self._bus = namespace.get_bus()
 
@@ -951,7 +952,8 @@ class IWD(AsyncOpAbstract):
             if self.namespace.is_process_running('iwd'):
                 raise Exception("IWD requested to start but is already running")
 
-            self._iwd_proc = self.namespace.start_iwd(iwd_config_dir)
+            self._iwd_proc = self.namespace.start_iwd(iwd_config_dir,
+                                                        iwd_storage_dir)
 
         tries = 0
         while not self._bus.name_has_owner(IWD_SERVICE):
Signature · 1 line
2.26.2
#5 lore raw

PATCH 5/9 auto-t: pass namespace on to other IWD classes

In reply to James Prestwood

Certain classes were still using the default namespace. This didn't matter yet since testAP was the only test using namespaces, and the AP interface was the only one being used.

For an IWD station on a separate namespace all objects need to be accessable, so the namespace is passed along to those as needed.

---
 autotests/util/iwd.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
autotests/util/iwd.py +5 -4
index 844bb0db..9e653575 100755
@@ -124,6 +124,7 @@ class IWDDBusAbstract(AsyncOpAbstract):
 
     def __init__(self, object_path = None, properties = None, service=IWD_SERVICE, namespace=ctx):
         self._bus = namespace.get_bus()
+        self._namespace = namespace
 
         self._object_path = object_path
         proxy = self._bus.get_object(service, self._object_path)
@@ -391,7 +392,7 @@ class Device(IWDDBusAbstract):
         '''
         ordered_networks = []
         for bus_obj in self._station.GetOrderedNetworks():
-            ordered_network = OrderedNetwork(bus_obj, self._bus)
+            ordered_network = OrderedNetwork(bus_obj, self._bus, self._namespace)
             ordered_networks.append(ordered_network)
 
         if len(ordered_networks) > 0:
@@ -407,7 +408,7 @@ class Device(IWDDBusAbstract):
         IWD._wait_for_object_condition(self, condition)
 
         for bus_obj in self._station.GetOrderedNetworks():
-            ordered_network = OrderedNetwork(bus_obj, self._bus)
+            ordered_network = OrderedNetwork(bus_obj, self._bus, self._namespace)
             ordered_networks.append(ordered_network)
 
         if len(ordered_networks) > 0:
@@ -643,9 +644,9 @@ class KnownNetwork(IWDDBusAbstract):
 class OrderedNetwork(object):
     '''Represents a network found in the scan'''
 
-    def __init__(self, o_n_tuple, bus):
+    def __init__(self, o_n_tuple, bus, namespace=ctx):
         self._bus = bus
-        self._network_object = Network(o_n_tuple[0])
+        self._network_object = Network(o_n_tuple[0], namespace=namespace)
         self._network_proxy = dbus.Interface(self._bus.get_object(IWD_SERVICE,
                                         o_n_tuple[0]),
                                         DBUS_PROPERTIES)
Signature · 1 line
2.26.2
#6 lore raw

PATCH 6/9 auto-t: support IP match with no IP set

In reply to James Prestwood

This allows an interface with no IP set to be checked for by passing None in as the address. This will generate an exception by ioctl which we catch.

---
 autotests/util/testutil.py | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)
autotests/util/testutil.py +9 -3
index 94f8ef32..f50223b1 100644
@@ -146,9 +146,15 @@ def test_iface_operstate(intf=None):
         sock.close()
 
 def test_ip_address_match(intf, ip):
-    s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
-    addr = fcntl.ioctl(s.fileno(), SIOCGIFADDR, struct.pack('256s', intf.encode('utf-8')))
-    addr = socket.inet_ntoa(addr[20:24])
+    try:
+        s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+        addr = fcntl.ioctl(s.fileno(), SIOCGIFADDR, struct.pack('256s', intf.encode('utf-8')))
+        addr = socket.inet_ntoa(addr[20:24])
+    except OSError as e:
+        if e.errno != 99 or ip != None:
+            raise Exception('SIOCGIFADDR failed with %d' % e.errno)
+
+        return
 
     if ip != addr:
         raise Exception('IP for %s did not match %s (was %s)' % (intf, ip, addr))
Signature · 1 line
2.26.2
#7 lore raw

PATCH 7/9 auto-t: add static netconfig test

In reply to James Prestwood

Tests netconfig with a static configuration, as well as tests ACD functionality.

The test has two IWD radios which will eventually use the same IP. One is configured statically, one will receive the IP via DHCP. The static client sets its IP first and begins using it. Then the DHCP client is started. Since ACD in a DHCP client is configured to use its address indefinitely, the static client *should* give up its address.

---
 autotests/testNetconfig/connection_test.py   |  10 +-
 autotests/testNetconfig/hw.conf              |   7 +-
 autotests/testNetconfig/static_test.py       | 105 +++++++++++++++++++
 autotests/testNetconfig/storage/ssidTKIP.psk |   3 +
 4 files changed, 121 insertions(+), 4 deletions(-)
 create mode 100644 autotests/testNetconfig/static_test.py
 create mode 100644 autotests/testNetconfig/storage/ssidTKIP.psk
autotests/testNetconfig/connection_test.py +7 -3
index 5fc7a88e..caab090c 100644
@@ -11,11 +11,12 @@ from iwd import NetworkType
 from hostapd import HostapdCLI
 import testutil
 from config import ctx
+import os
 
 class Test(unittest.TestCase):
 
     def test_connection_success(self):
-        wd = IWD()
+        wd = IWD(True)
 
         psk_agent = PSKAgent("secret123")
         wd.register_psk_agent(psk_agent)
@@ -62,12 +63,15 @@ class Test(unittest.TestCase):
         ctx.start_process(['ifconfig', hapd.ifname, '192.168.1.1', 'netmask', '255.255.255.0'],
                                 wait=True)
         ctx.start_process(['touch', '/tmp/dhcpd.leases'], wait=True)
-        ctx.start_process(['dhcpd', '-cf', '/tmp/dhcpd.conf', '-lf', '/tmp/dhcpd.leases',
-                            hapd.ifname])
+        cls.dhcpd_pid = ctx.start_process(['dhcpd', '-f', '-cf', '/tmp/dhcpd.conf',
+                                            '-lf', '/tmp/dhcpd.leases',
+                                            hapd.ifname])
 
     @classmethod
     def tearDownClass(cls):
         IWD.clear_storage()
+        cls.dhcpd_pid.kill()
+        os.system('rm -rf /tmp/dhcpd.leases')
 
 if __name__ == '__main__':
     unittest.main(exit=True)
autotests/testNetconfig/hw.conf +6 -1
index 75c5ac6e..323f1fb2 100644
@@ -1,6 +1,11 @@
 [SETUP]
-num_radios=2
+num_radios=3
 max_test_exec_interval_sec=40
+start_iwd=0
+hwsim_medium=no
 
 [HOSTAPD]
 rad0=ssidTKIP.conf
+
+[NameSpaces]
+ns0=rad2
autotests/testNetconfig/static_test.py new file +105 -0

105 lines not on this page · raw message

autotests/testNetconfig/storage/ssidTKIP.psk new file +3 -0
new file mode 100644
index 00000000..f15724a3
@@ -0,0 +1,3 @@
+[IPv4]
+Address=192.168.1.10
+Gateway=192.168.1.1
Signature · 1 line
2.26.2
#8 lore raw

PATCH 8/9 test-runner: add iwd-acd to verbose options

In reply to James Prestwood

This will turn on IWD_ACD_DEBUG

---
 tools/test-runner | 3 +++
 1 file changed, 3 insertions(+)
tools/test-runner +3 -0
index c2ff7eff..3628e45e 100755
@@ -586,6 +586,9 @@ class Namespace:
 		if self.is_verbose('iwd-genl'):
 			env['IWD_GENL_DEBUG'] = '1'
 
+		if self.is_verbose('iwd-acd'):
+			env['IWD_ACD_DEBUG'] = '1'
+
 		pid = self.start_process(args, env=env)
 		return pid
 
Signature · 1 line
2.26.2
#9 lore raw

PATCH 9/9 test-runner: set processor count for VM

In reply to James Prestwood

For better reliability the processor count is now set to qemu. In cases of low CPU count (< 2) hosts the processor count is limited to 1. Otherwise half of the host cores will be used for the VM.

---
 tools/test-runner | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)
tools/test-runner +14 -1
index 3628e45e..bc580a41 100755
@@ -1405,6 +1405,19 @@ class Main:
 			'kernel'
 		]
 
+		nproc = multiprocessing.cpu_count()
+
+		#
+		# Specially handle CPU systems with minimal cores, otherwise
+		# use half the host cores.
+		#
+		if nproc < 2:
+			smp = 1
+		else:
+			smp = int(nproc / 2)
+
+		print("Using %d cores for VM" % smp)
+
 		#
 		# This passes through most of the command line options to
 		# the kernel command line. Some are not relevant (e.g. qemu)
@@ -1443,7 +1456,7 @@ class Main:
 				rootflags=trans=virtio,version=9p2000.u \
 				acpi=off pci=noacpi %s ro \
 				mac80211_hwsim.radios=0 %s' % (kern_log, options),
-			'-cpu', 'host'
+			'-cpu', 'host', '-smp', str(smp)
 		]
 
 		# Add two ethernet devices for testing EAD
Signature · 1 line
2.26.2
#10 lore raw
In reply to James Prestwood

Hi James,

Quoted 4 lines · James Prestwood
---
  Makefile.am | 6 ++++--
  1 file changed, 4 insertions(+), 2 deletions(-)

Patches 1, 3, 4, 5, 6, 8 and 9 applied, thanks.

Regards,
-Denis