migrate from genofire to wifictld

README.md

@@ -1,6 +1,6 @@
 # Wifi control deamon packages feed
 
-[![Build Status](https://dev.sum7.eu/genofire/wifictld/badges/master/build.svg)](https://dev.sum7.eu/genofire/wifictld/pipelines)
+[![Build Status](https://dev.sum7.eu/wifictld/wifictld/badges/master/build.svg)](https://dev.sum7.eu/genofire/wifictld/pipelines)
 
 ## Description
 
@@ -30,6 +30,6 @@ The wifictld packages should now appear in menuconfig under wireless.
 
 ## Snapshots / Download
 
-- [wifictld_1.0-1_mips_24kc.ipk](https://dev.sum7.eu/genofire/wifictld/-/jobs/artifacts/master/raw/build_dir/bin/packages/mips_24kc/wifictld/wifictld_1.0-1_mips_24kc.ipk?inline=false&job=compile)
-- [wifictld-mini_1.0-1_mips_24kc.ipk](https://dev.sum7.eu/genofire/wifictld/-/jobs/artifacts/master/raw/build_dir/bin/packages/mips_24kc/wifictld/wifictld-mini_1.0-1_mips_24kc.ipk?inline=false&job=compile)
-- [respondd-module-wifictld_1-1_mips_24kc.ipk](https://dev.sum7.eu/genofire/wifictld/-/jobs/artifacts/master/raw/build_dir/bin/packages/mips_24kc/wifictld/respondd-module-wifictld_1-1_mips_24kc.ipk?inline=false&job=compile)
+- [wifictld_1.0-1_mips_24kc.ipk](https://dev.sum7.eu/wifictld/wifictld/-/jobs/artifacts/master/raw/build_dir/bin/packages/mips_24kc/wifictld/wifictld_1.0-1_mips_24kc.ipk?inline=false&job=compile)
+- [wifictld-mini_1.0-1_mips_24kc.ipk](https://dev.sum7.eu/wifictld/wifictld/-/jobs/artifacts/master/raw/build_dir/bin/packages/mips_24kc/wifictld/wifictld-mini_1.0-1_mips_24kc.ipk?inline=false&job=compile)
+- [respondd-module-wifictld_1-1_mips_24kc.ipk](https://dev.sum7.eu/wifictld/wifictld/-/jobs/artifacts/master/raw/build_dir/bin/packages/mips_24kc/wifictld/respondd-module-wifictld_1-1_mips_24kc.ipk?inline=false&job=compile)

wireless/wifictld/Makefile

@@ -13,7 +13,7 @@ define Package/wifictld/Default
 	SECTION:=net
 	CATEGORY:=Network
 	TITLE:=wireless control daemon
-	URL:=https://dev.sum7.eu/genofire/wifictld
+	URL:=https://dev.sum7.eu/wifictld/wifictld
 	DEPENDS:=+libubus +libubox
 endef
 
@@ -55,7 +55,6 @@ define Package/wifictld/install
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/wifictld $(1)/usr/sbin/
 	$(INSTALL_DIR) $(1)/etc/init.d/
 	$(INSTALL_BIN) ./files/etc/init.d/wifictld $(1)/etc/init.d/
-	$(CP) ./luasrc/. $(1)/
 endef
 
 Package/wifictld-mini/install = $(Package/wifictld/install)

wireless/wifictld/files/etc/init.d/wifictld

@@ -13,7 +13,7 @@ start_service () {
 	procd_set_param stdout 1
 	procd_set_param stderr 1
 	procd_set_param respawn ${respawn_threshold:-3660} ${respawn_timeout:-5} ${respawn_retry:-0}
-	procd_set_param command "$PROG" --if mmfd0 --addr $(uci get network.loopback.ip6addr | sed 's/\/128//') --maddr ff05::31f1 --port 1000 --clean-authed=1
+	procd_set_param command "$PROG" --if br-wan --mif br-wan
 	procd_set_param watch network.wireless
 	procd_close_instance
 }

wireless/wifictld/luasrc/lib/gluon/ebtables/350-mcast-wifictld

@@ -1 +0,0 @@
-rule 'MULTICAST_OUT -p IPv6 --ip6-protocol udp --ip6-destination ff05::31f1 --ip6-destination-port 1000 -j RETURN'

wireless/wifictld/luasrc/lib/gluon/upgrade/400-wifictld-firewall

@@ -1,25 +0,0 @@
-#!/usr/bin/lua
-
-local uci = require('simple-uci').cursor()
-local site = require('gluon.site')
-
-
-uci:section('firewall', 'rule',  'mesh_wifictld_ll', {
-	name = 'mesh_wifictld_ll',
-	src = 'mesh',
-	src_ip = 'fe80::/64',
-	dest_port = '1000',
-	proto = 'udp',
-	target = 'ACCEPT',
-})
-
-uci:section('firewall', 'rule',  'mesh_wifictld_siteprefix', {
-	name = 'mesh_wifictld_siteprefix',
-	src = 'mesh',
-	src_ip = site.node_prefix6(),
-	dest_port = '1000',
-	proto = 'udp',
-	target = 'ACCEPT',
-})
-
-uci:save('firewall')