fix(bridge): reorder initialization for bridge dependents

Consider the scenario where you run DHCPv4 on the primary bridge
interface.

You have no real interface to "wait upon", so it's OK. Nonetheless,
anything depending on successful completion of DHCPv4, e.g. adding a
default route, will block `s6-rc -v2 up change default`.

The way new interfaces are attached to the bridge is via `s6-rc -b -u
change $attach-oneshot-service`, this introduce in turn a deadlock.

At some point, DHCPv4 will timeout, unblocking the deadlock and
attaching the members to the primary bridge interface, making it ready
to send L2 broadcast packets for DHCP, unblocking DHCP in turn again.

This is not satisfying because we really want to have a no-hiccups
bring-up.

To fix this, we proceed to multiple changes:

- we remove `svc.ifwait.build` out of band `s6-rc -b -u $oneshot-attach`
  call, which is, by design, wrong here.
- users can now depend on the members service to know when a bridge is
  fully operational (we could make it more granular and let them depend
  on the LAN member joining rather than WLAN, etc.)
- users can also depend on the primary service being brought up rather
  than just being present, this is useful if you need to bring it up
  when it has AT LEAST one member to get link local address or MAC
  addresses (fixing DHCPv6 bring up as well because `ff02::1` is used
  there).

One thing is not addressed yet, if you are running a WLAN service using
RADIUS attached to the bridge, at bring up time, it will try to reach
out the external RADIUS server and *fail*.

To solve this, granular dependency on the DHCPv4 once LAN is joined.
Then the hostapd can wait on defaultroute4 completion so that
connectivity is available to reach RADIUS server.

It can join the bridge later on without any hiccup as well.

This is left as a TODO as hostapd can survive RADIUS authentication
failure and retry later.

Signed-off-by: Raito Bezarius <masterancpp@gmail.com>

modules/bridge/default.nix

@@ -20,6 +20,7 @@ in
     system.service.bridge = {
       primary = mkOption { type = liminix.lib.types.serviceDefn; };
       members = mkOption { type = liminix.lib.types.serviceDefn; };
+      ready = mkOption { type = liminix.lib.types.serviceDefn; };
     };
   };
   config.system.service.bridge = {
@@ -46,6 +47,19 @@ in
         description = "interfaces to add to the bridge";
       };
     };
+
+    # TODO: generalize it outside
+    ready = config.system.callService ./ready.nix {
+      primary = mkOption {
+        type = liminix.lib.types.service;
+        description = "primary bridge interface";
+      };
+
+      members = mkOption {
+        type = liminix.lib.types.service;
+        description = "members service";
+      };
+    };
   };
   config.kernel.config = {
     BRIDGE = "y";

modules/bridge/members.nix

@@ -10,26 +10,19 @@ let
   inherit (liminix.networking) interface;
   inherit (liminix.services) bundle oneshot;
   inherit (lib) mkOption types;
-  addif = member :
+  addif = member : oneshot {
-    # how do we get sight of services from here? maybe we need to
+    name = "${primary.name}.member.${member.name}";
-    # implement ifwait as a regualr derivation instead of a
+    up = ''
-    # servicedefinition
+      echo "attaching $(output ${member} ifname) to $(output ${primary} ifname) bridge"
-    svc.ifwait.build {
+      ip link set dev $(output ${member} ifname) master $(output ${primary} ifname)
-      state = "running";
+    '';
-      interface = member;
+    down = ''
-      dependencies = [ primary member ];
+      echo "detaching $(output ${member} ifname) from any bridge"
-      service = oneshot {
+      ip link set dev $(output ${member} ifname) nomaster
-        name = "${primary.name}.member.${member.name}";
+    '';
-        up = ''
+
-          echo "attaching $(output ${member} ifname) to $(output ${primary} ifname) bridge"
+    dependencies = [ primary member ];
-          ip link set dev $(output ${member} ifname) master $(output ${primary} ifname)
+  };
-        '';
-        down = ''
-          echo "detaching $(output ${member} ifname) from any bridge"
-          ip link set dev $(output ${member} ifname) nomaster
-        '';
-      };
-    };
 in bundle {
   name = "${primary.name}.members";
   contents = map addif members;

modules/bridge/primary.nix

@@ -14,9 +14,13 @@ in oneshot rec {
       "ip link add name ${ifname} type bridge"
       else
       "ip link add name ${ifname} address $(output ${macAddressFromInterface} ether) type bridge"}
-    ${liminix.networking.ifup name ifname}
+
+      (in_outputs ${name}
+        echo ${ifname} > ifname
+        cat /sys/class/net/${ifname}/address > ether
+      )
   '';
-  down = "ip link set down dev ${ifname}";
+  down = "ip link delete ${ifname}";
 
   dependencies = optional (macAddressFromInterface != null) macAddressFromInterface;
 }

modules/bridge/ready.nix

@@ -0,0 +1,18 @@
+{
+  liminix
+, ifwait
+, lib
+}:
+{ primary, members } :
+let
+  inherit (liminix.services) oneshot;
+in oneshot {
+  name = "${primary.name}.oper";
+  up = ''
+    ip link set up dev $(output ${primary} ifname)
+    ${ifwait}/bin/ifwait -v $(output ${primary} ifname) running
+  '';
+  down = "ip link set down dev $(output ${primary} ifname)";
+
+  dependencies = [ members ];
+}