package/mcd: new package, replaces querierd

Update all package references and confd:ietf-interfaces

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>

package/Config.in

@@ -15,9 +15,9 @@ source "$BR2_EXTERNAL_INFIX_PATH/package/klish/Config.in"
 source "$BR2_EXTERNAL_INFIX_PATH/package/klish-plugin-sysrepo/Config.in"
 source "$BR2_EXTERNAL_INFIX_PATH/package/libsrx/Config.in"
 source "$BR2_EXTERNAL_INFIX_PATH/package/lowdown/Config.in"
+source "$BR2_EXTERNAL_INFIX_PATH/package/mcd/Config.in"
 source "$BR2_EXTERNAL_INFIX_PATH/package/mdnsd/Config.in"
 source "$BR2_EXTERNAL_INFIX_PATH/package/podman/Config.in"
 source "$BR2_EXTERNAL_INFIX_PATH/package/skeleton-init-finit/Config.in"
 source "$BR2_EXTERNAL_INFIX_PATH/package/tetris/Config.in"
-source "$BR2_EXTERNAL_INFIX_PATH/package/querierd/Config.in"
 source "$BR2_EXTERNAL_INFIX_PATH/package/greenpak-programmer/Config.in"

package/mcd/Config.in

@@ -0,0 +1,6 @@
+config BR2_PACKAGE_MCD
+	bool "mcd"
+	help
+	  A bridge helper daemon for sending multicast queries.
+
+	  https://github.com/kernelkit/mcd

package/mcd/example.conf

@@ -1,4 +1,4 @@
-# /etc/querierd.conf: default Infix configuration
+# /etc/mcd.conf: example configuration
 
 # Query interval can be [1,1024], default 125.  Recommended not go below 10
 #query-interval 125
@@ -26,6 +26,7 @@
 
 # Enable and one of the IGMP versions to use at startup, with fallback
 # to older versions if older clients appear.
-iface vlan1 enable igmpv3
+#iface vlan1 enable igmpv3
 #iface vlan2 enable igmpv3
 #iface vlan3 enable igmpv3
+iface br0 enable igmpv3

package/mcd/mcd.hash

@@ -0,0 +1,2 @@
+sha256 63e70c0bd457b1d198acdb8d2bbe4925140ed368c7b3971a02f6c969058c039c  mcd-1.0.tar.gz
+sha256 834f45ed282fd010f354ecc0a50538af519a1cfcc4d2866de3be06982fa9ed29  LICENSE

package/mcd/mcd.mk

@@ -0,0 +1,27 @@
+################################################################################
+#
+# mcd
+#
+################################################################################
+
+MCD_VERSION = 1.0
+MCD_SITE    = https://github.com/kernelkit/mcd/releases/download/v$(MCD_VERSION)
+MCD_LICENSE = BSD-3-Clause
+MCD_LICENSE_FILES = LICENSE
+
+define MCD_INSTALL_CONFIG
+	$(INSTALL) -D -m 0644 $(MCD_PKGDIR)/example.conf \
+		$(TARGET_DIR)/etc/mcd/example.conf
+endef
+MCD_POST_INSTALL_TARGET_HOOKS += MCD_INSTALL_CONFIG
+
+define MCD_INSTALL_FINIT_SVC
+	$(INSTALL) -D -m 0644 $(MCD_PKGDIR)/mcd.svc \
+		$(FINIT_D)/available/mcd.conf
+	$(INSTALL) -D -m 0644 $(MCD_PKGDIR)/template.svc \
+		$(FINIT_D)/available/mcd@.conf
+endef
+
+MCD_POST_INSTALL_TARGET_HOOKS += MCD_INSTALL_FINIT_SVC
+
+$(eval $(autotools-package))

package/mcd/mcd.svc

@@ -0,0 +1 @@
+service [2345789] env:-/etc/default/mcd /usr/sbin/mcd -sn $MCD_ARGS -- Multicast querier daemon

package/mcd/template.svc

@@ -0,0 +1,3 @@
+service <net/%i/exist> \
+	[2345] mcd -sn -f /etc/mcd/%i.conf -i %i \
+	-- Multicast querier daemon @%i

package/querierd/Config.in

@@ -1,6 +0,0 @@
-config BR2_PACKAGE_QUERIERD
-	bool "querierd"
-	help
-	  A bridge helper daemon for sending multicast queries.
-
-	  https://github.com/westermo/querierd

package/querierd/querierd.hash

@@ -1,2 +0,0 @@
-sha256 b425e5d9db3e87a5e4d6dd3887f4378202e07aaf2304412f5c1fb0589ab625dc  querierd-0.10.tar.gz
-sha256 834f45ed282fd010f354ecc0a50538af519a1cfcc4d2866de3be06982fa9ed29  LICENSE

package/querierd/querierd.mk

@@ -1,29 +0,0 @@
-################################################################################
-#
-# querierd
-#
-################################################################################
-
-QUERIERD_VERSION = 0.10
-QUERIERD_SITE    = \
-	https://github.com/westermo/querierd/releases/download/v$(QUERIERD_VERSION)
-QUERIERD_LICENSE = BSD-3-Clause
-QUERIERD_LICENSE_FILES = LICENSE
-QUERIERD_INSTALL_STAGING = YES
-
-define QUERIERD_INSTALL_CONFIG
-	$(INSTALL) -D -m 0644 $(QUERIERD_PKGDIR)/querierd.conf \
-		$(TARGET_DIR)/etc/querierd/example.conf
-endef
-QUERIERD_POST_INSTALL_TARGET_HOOKS += QUERIERD_INSTALL_CONFIG
-
-define QUERIERD_INSTALL_FINIT_SVC
-	$(INSTALL) -D -m 0644 $(QUERIERD_PKGDIR)/querierd.svc \
-		$(FINIT_D)/available/querierd.conf
-	$(INSTALL) -D -m 0644 $(QUERIERD_PKGDIR)/template.svc \
-		$(FINIT_D)/available/querierd@.conf
-endef
-
-QUERIERD_POST_INSTALL_TARGET_HOOKS += QUERIERD_INSTALL_FINIT_SVC
-
-$(eval $(autotools-package))

package/querierd/querierd.svc

@@ -1,2 +0,0 @@
-# Launch IGMP querier daemon
-service [2345789] env:-/etc/default/querierd /usr/sbin/querierd -sn $QUERIERD_ARGS -- IGMP querier daemon

package/querierd/template.svc

@@ -1,3 +0,0 @@
-service <net/%i/exist> \
-	[2345] querierd -sn -f /etc/querierd/%i.conf -i %i \
-	-- IGMP querier daemon @%i

package/skeleton-init-finit/skeleton/etc/finit.d/available/querierd.conf

@@ -1 +0,0 @@
-service [2345] env:-/etc/default/querierd querierd -sn $QUERIERD_ARGS -- Multicast query daemon

src/confd/src/ietf-interfaces.c

@@ -978,12 +978,12 @@ static void mcast_querier(const char *ifname, int mode, int interval)
 
 	DEBUG("mcast querier %s mode %d interval %d", ifname, mode, interval);
 	if (!mode) {
-		erasef("/etc/querierd/%s.conf", ifname);
-		systemf("initctl -bnq disable querierd@%s", ifname);
+		erasef("/etc/mcd/%s.conf", ifname);
+		systemf("initctl -bnq disable mcd@%s", ifname);
 		return;
 	}
 
-	fp = fopenf("w", "/etc/querierd/%s.conf", ifname);
+	fp = fopenf("w", "/etc/mcd/%s.conf", ifname);
 	if (!fp) {
 		ERRNO("Failed creating querier configuration for %s", ifname);
 		return;
@@ -993,7 +993,7 @@ static void mcast_querier(const char *ifname, int mode, int interval)
 	fprintf(fp, "iface %s enable %sigmpv3\n", ifname, mode == 1 ? "proxy-queries " : "");
 	fclose(fp);
 
-	systemf("initctl -bnq enable querierd@%s", ifname);
+	systemf("initctl -bnq enable mcd@%s", ifname);
 }
 
 static char *find_vlan_interface(sr_session_ctx_t *session, const char *brname, int vid)