9 files changed, 0 insertions, 359 deletions

diff --git a/contrib/package/ffluci-splash/Makefile b/contrib/package/ffluci-splash/Makefile
deleted file mode 100644
index d3e98af18..000000000
--- a/contrib/package/ffluci-splash/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=ffluci-splash
-PKG_VERSION:=0.1
-PKG_RELEASE:=1
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-PKG_BUILD_DEPENDS:=lua-luci
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/ffluci-splash
-  SECTION:=admin
-  CATEGORY:=Administration
-  SUBMENU:=FFLuCI
-  DEPENDS:=+ffluci +iptables-mod-nat +lua-luci
-  TITLE:=FFLuCI DHCP-Splash
-endef
-
-define Build/Compile
-endef
-
-define Package/ffluci-splash/install
-	$(INSTALL_DIR) $(1)/usr/lib/luci-splash/htdocs/cgi-bin
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_DIR) $(1)/etc/cron.minutely
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_DIR) $(1)/usr/sbin
-	
-	$(CP) -a ./src/luci-splash/* $(1)/usr/lib/luci-splash/ -R
-	$(INSTALL_BIN) ./src/luci-splash/htdocs/cgi-bin/index.cgi $(1)/usr/lib/luci-splash/htdocs/cgi-bin
-	$(INSTALL_BIN) ./src/luci_splash.init $(1)/etc/init.d/luci_splash
-	$(INSTALL_BIN) ./src/luci-splash.lua $(1)/usr/sbin/luci-splash
-	
-	$(INSTALL_BIN) -a ./src/luci_splash.cron $(1)/etc/cron.minutely/luci_splash
-	$(CP) -a ./src/luci_splash.uci $(1)/etc/config/luci_splash
-	$(CP) -a ./src/luci_splash_httpd.conf $(1)/etc/
-	
-	$(CP) -a ./ipkg/conffiles $(1)/CONTROL/conffiles
-endef
-
-$(eval $(call BuildPackage,ffluci-splash))
diff --git a/contrib/package/ffluci-splash/ipkg/conffiles b/contrib/package/ffluci-splash/ipkg/conffiles
deleted file mode 100644
index dcbe1ad37..000000000
--- a/contrib/package/ffluci-splash/ipkg/conffiles
+++ /dev/null
@@ -1 +0,0 @@
-/etc/config/luci_splash
\ No newline at end of file
diff --git a/contrib/package/ffluci-splash/src/luci-splash.lua b/contrib/package/ffluci-splash/src/luci-splash.lua
deleted file mode 100644
index 54c32add6..000000000
--- a/contrib/package/ffluci-splash/src/luci-splash.lua
+++ /dev/null
@@ -1,173 +0,0 @@
-#!/usr/bin/lua
-package.path  = "/usr/lib/lua/?.lua;/usr/lib/lua/?/init.lua;" .. package.path
-package.cpath = "/usr/lib/lua/?.so;" .. package.cpath
-
-require("ffluci.http")
-require("ffluci.sys")
-require("ffluci.model.uci")
-
--- Init state session
-uci = ffluci.model.uci.Session("/var/state")
-
-
--- Parse stdin and do something
-function main(argv)
-	local cmd = argv[1]
-	local arg = argv[2]
-	
-	if not cmd then
-		print("Usage: " .. argv[0] .. " <status|add|remove|sync> [MAC]")
-		os.exit(1)
-	elseif cmd == "status" then
-		if not arg then
-			os.exit(1)
-		end
-		
-		if iswhitelisted(arg) then
-			print("whitelisted")
-			os.exit(0)
-		end
-		
-		if haslease(arg) then
-			print("lease")
-			os.exit(0)
-		end		
-		
-		print("unknown")
-		os.exit(0)
-	elseif cmd == "add" then
-		if not arg then
-			os.exit(1)
-		end
-		
-		if not haslease(arg) then
-			add_lease(arg)
-		else
-			print("already leased!")
-			os.exit(2)
-		end
-		os.exit(0)
-	elseif cmd == "remove" then
-		if not cmd[2] then
-			os.exit(1)
-		end
-		
-		remove_lease(arg)
-		os.exit(0)		
-	elseif cmd == "sync" then
-		sync()
-		os.exit(0)
-	end
-end
-
--- Add a lease to state and invoke add_rule
-function add_lease(mac)
-	local key = uci:add("luci_splash", "lease")
-	uci:set("luci_splash", key, "mac", mac)
-	uci:set("luci_splash", key, "start", os.time())
-	add_rule(mac)
-end
-
-
--- Remove a lease from state and invoke remove_rule
-function remove_lease(mac)
-	mac = mac:lower()
-
-	for k, v in pairs(uci:show("luci_splash").luci_splash) do
-		if v.mac:lower() == mac then
-			remove_rule(mac)
-			uci:del("luci_splash", k)
-		end
-	end
-end
-
-
--- Add an iptables rule
-function add_rule(mac)
-	return os.execute("iptables -t nat -I luci_splash_leases -m mac --mac-source '"..mac.."' -j RETURN")
-end
-
-
--- Remove an iptables rule
-function remove_rule(mac)
-	return os.execute("iptables -t nat -D luci_splash_leases -m mac --mac-source '"..mac.."' -j RETURN")
-end
-
-
--- Check whether a MAC-Address is listed in the lease state list
-function haslease(mac)
-	mac = mac:lower()
-	
-	for k, v in pairs(uci:show("luci_splash").luci_splash) do
-		if v[".type"] == "lease" and v.mac and v.mac:lower() == mac then
-			return true
-		end
-	end
-	
-	return false
-end
-
-
--- Check whether a MAC-Address is whitelisted
-function iswhitelisted(mac)
-	mac = mac:lower()
-	
-	for k, v in pairs(uci:show("luci_splash").luci_splash) do
-		if v[".type"] == "whitelist" and v.mac and v.mac:lower() == mac then
-			return true
-		end
-	end
-	
-	return false
-end
-
-
--- Returns a list of MAC-Addresses for which a rule is existing
-function listrules()
-	local cmd = "iptables -t nat -L luci_splash_leases | grep RETURN |"
-	cmd = cmd .. "egrep -io [0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+"
-	return ffluci.util.split(ffluci.sys.exec(cmd))
-end
-
-
--- Synchronise leases, remove abandoned rules
-function sync()
-	local written = {}
-	local time = os.time()
-	
-	-- Current leases in state files
-	local leases = uci:show("luci_splash").luci_splash
-	
-	-- Convert leasetime to seconds
-	local leasetime = tonumber(uci:get("luci_splash", "general", "leasetime")) * 3600
-	
-	-- Clean state file
-	uci:revert("luci_splash")
-	
-	
-	-- For all leases
-	for k, v in pairs(uci:show("luci_splash")) do
-		if v[".type"] == "lease" then
-			if os.difftime(time, tonumber(v.start)) > leasetime then
-				-- Remove expired
-				remove_rule(v.mac)
-			else
-				-- Rewrite state
-				local n = uci:add("luci_splash", "lease")
-				uci:set("luci_splash", n, "mac", v.mac)
-				uci:set("luci_splash", n, "start", v.start)
-				written[v.mac] = 1
-			end
-		end
-	end
-	
-	
-	-- Delete rules without state
-	for i, r in ipairs(listrules()) do
-		if #r > 0 and not written[r] then
-			remove_rule(r)
-		end
-	end
-end
-
-main(arg)
\ No newline at end of file
diff --git a/contrib/package/ffluci-splash/src/luci-splash/htdocs/cgi-bin/index.cgi b/contrib/package/ffluci-splash/src/luci-splash/htdocs/cgi-bin/index.cgi
deleted file mode 100644
index 4cbddc0c5..000000000
--- a/contrib/package/ffluci-splash/src/luci-splash/htdocs/cgi-bin/index.cgi
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/usr/bin/haserl --shell=luac
-package.path  = "/usr/lib/lua/?.lua;/usr/lib/lua/?/init.lua;" .. package.path
-package.cpath = "/usr/lib/lua/?.so;" .. package.cpath
-
-require("ffluci.http")
-require("ffluci.sys")
-require("ffluci.model.uci")
-
-local srv
-local ip = ffluci.http.remote_addr()
-for k, v in pairs(ffluci.model.uci.show("network").network) do
-	if v[".type"] == "interface" and v.ipaddr then
-		local p = ffluci.sys.net.mask4prefix(v.netmask)
-		if ffluci.sys.net.belongs(ip, v.ipaddr, p) then
-			srv = v.ipaddr
-			break
-		end
-	end
-end
-
-if not srv then
-	ffluci.http.textheader()
-	return print("Unable to detect network settings!")
-end
-
-local action = "splash"
-
-local mac = ffluci.sys.net.ip4mac(ip)
-if not mac then
-	action = "unknown"
-end
-
-local status = ffluci.sys.exec("luci-splash status "..mac)
-
-if status == "whitelisted" or status == "lease" then
-	action = "allowed"
-end
-
-ffluci.http.redirect("http://" .. srv .. "/cgi-bin/luci-splash/" .. action)
\ No newline at end of file
diff --git a/contrib/package/ffluci-splash/src/luci-splash/htdocs/index.html b/contrib/package/ffluci-splash/src/luci-splash/htdocs/index.html
deleted file mode 100644
index 58387a5fe..000000000
--- a/contrib/package/ffluci-splash/src/luci-splash/htdocs/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="refresh" content="0; URL=/cgi-bin/index.cgi" />
-</head>
-<body style="background-color: black">
-<a style="color: white; text-decoration: none" href="/cgi-bin/index.cgi">FFLuCI - Freifunk Lua Configuration Interface</a>
-</body>
-</html>
\ No newline at end of file
diff --git a/contrib/package/ffluci-splash/src/luci_splash.cron b/contrib/package/ffluci-splash/src/luci_splash.cron
deleted file mode 100644
index eae429474..000000000
--- a/contrib/package/ffluci-splash/src/luci_splash.cron
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-[ "$(date +%M | cut -c2)" == "5" ] && luci-splash sync
\ No newline at end of file
diff --git a/contrib/package/ffluci-splash/src/luci_splash.init b/contrib/package/ffluci-splash/src/luci_splash.init
deleted file mode 100644
index a7bb4abeb..000000000
--- a/contrib/package/ffluci-splash/src/luci_splash.init
+++ /dev/null
@@ -1,88 +0,0 @@
-#!/bin/sh /etc/rc.common
-START=70
-
-iface_add() {
-	local cfg="$1"
-	
-	config_get net "$cfg" network
-	[ -n "$net" ] || return 0
-	
-	config_get iface "$net" ifname
-	[ -n "$iface" ] || return 0
-	iface="${iface%%:*}"
-	
-	config_get ipaddr "$net" ipaddr
-	[ -n "$ipaddr" ] || return 0
-	
-	config_get netmask "$net" netmask
-	[ -n "$netmask" ] || return 0
-	
-	eval "$(ipcalc.sh $ipaddr $netmask)"
-	
-	iptables -t nat -A luci_splash -i "$iface" -s "$IP/$PREFIX" -j luci_splash_portal
-	iptables -t nat -A luci_splash_portal -i "$iface" -s "$IP/$PREFIX" -d "$ipaddr" -p tcp --dport 80 -j RETURN  
-}
-
-blacklist_add() {
-	local cfg="$1"
-	
-	config_get mac "$cfg" mac
-	[ -n "$mac" ] && iptables -t nat -A luci_splash_portal -m mac --mac-source "$mac" -j DROP
-}
-
-whitelist_add() {
-	local cfg="$1"
-	
-	config_get mac "$cfg" mac
-	[ -n "$mac" ] && iptables -t nat -A luci_splash_portal -m mac --mac-source "$mac" -j RETURN
-}
-
-start() {
-	### Read chains from config
-	include /lib/network
-	scan_interfaces
-	config_load luci_splash
-	
-	### Create subchains
-	iptables -t nat -N luci_splash
-	iptables -t nat -N luci_splash_portal
-	iptables -t nat -N luci_splash_leases
-	
-	### Build the main and portal rule
-	config_foreach blacklist_add blacklist
-	config_foreach whitelist_add whitelist
-	config_foreach iface_add iface
-	
-	### Build the portal rule
-	iptables -t nat -A luci_splash_portal -p udp --dport 53 -j RETURN
-	iptables -t nat -A luci_splash_portal -j luci_splash_leases
-	
-	### Build the leases rule
-	iptables -t nat -A luci_splash_leases -p tcp --dport 80 -j REDIRECT --to-ports 8082
-	iptables -t nat -A luci_splash_leases -j DROP
-	
-	### Start the splash httpd
-	httpd -c /etc/luci_splash_httpd.conf -p 8082 -h /usr/lib/luci-splash/htdocs
-	
-	### Sync leases
-	/usr/lib/luci-splash/sync.lua
-	
-	### Hook in the chain
-	iptables -t nat -A prerouting_rule -j luci_splash
-}
-
-stop() {
-	### Hook out the chain
-	iptables -t nat -D prerouting_rule -j luci_splash
-	
-	### Clear subchains
-	iptables -t nat -F luci_splash_leases
-	iptables -t nat -F luci_splash_portal
-	iptables -t nat -F luci_splash	
-	
-	### Delete subchains
-	iptables -t nat -X luci_splash_leases
-	iptables -t nat -X luci_splash_portal
-	iptables -t nat -X luci_splash
-}
-
diff --git a/contrib/package/ffluci-splash/src/luci_splash.uci b/contrib/package/ffluci-splash/src/luci_splash.uci
deleted file mode 100644
index c4cfef5dd..000000000
--- a/contrib/package/ffluci-splash/src/luci_splash.uci
+++ /dev/null
@@ -1,2 +0,0 @@
-config core general
-	option leasetime 1
\ No newline at end of file
diff --git a/contrib/package/ffluci-splash/src/luci_splash_httpd.conf b/contrib/package/ffluci-splash/src/luci_splash_httpd.conf
deleted file mode 100644
index 6007e80db..000000000
--- a/contrib/package/ffluci-splash/src/luci_splash_httpd.conf
+++ /dev/null
@@ -1 +0,0 @@
-E404:index.html
\ No newline at end of file