v0.5. New modules, refactoring

internet-detector/Makefile

@@ -5,8 +5,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=internet-detector
-PKG_VERSION:=0.4
-PKG_RELEASE:=3
+PKG_VERSION:=0.5
+PKG_RELEASE:=0
 PKG_MAINTAINER:=gSpot <https://github.com/gSpotx2f/luci-app-internet-detector>
 
 include $(INCLUDE_DIR)/package.mk
@@ -41,14 +41,18 @@ define Package/$(PKG_NAME)/install
 	$(INSTALL_CONF) ./files/etc/config/internet-detector $(1)/etc/config/internet-detector
 	$(INSTALL_DIR) $(1)/etc/internet-detector
 	$(INSTALL_BIN) ./files/etc/internet-detector/down-script $(1)/etc/internet-detector/down-script
-	$(INSTALL_BIN) ./files/etc/internet-detector/run-script $(1)/etc/internet-detector/run-script
 	$(INSTALL_BIN) ./files/etc/internet-detector/up-script $(1)/etc/internet-detector/up-script
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_BIN) ./files/etc/init.d/internet-detector $(1)/etc/init.d/internet-detector
 	$(INSTALL_DIR) $(1)/usr/bin
 	$(INSTALL_BIN) ./files/usr/bin/internet-detector $(1)/usr/bin/internet-detector
 	$(INSTALL_DIR) $(1)/usr/lib/internet-detector
+	$(INSTALL_DATA) ./files/usr/lib/internet-detector/mod_email.lua $(1)/usr/lib/internet-detector/mod_email.lua
 	$(INSTALL_DATA) ./files/usr/lib/internet-detector/mod_led_control.lua $(1)/usr/lib/internet-detector/mod_led_control.lua
+	$(INSTALL_DATA) ./files/usr/lib/internet-detector/mod_modem_restart.lua $(1)/usr/lib/internet-detector/mod_modem_restart.lua
+	$(INSTALL_DATA) ./files/usr/lib/internet-detector/mod_network_restart.lua $(1)/usr/lib/internet-detector/mod_network_restart.lua
+	$(INSTALL_DATA) ./files/usr/lib/internet-detector/mod_reboot.lua $(1)/usr/lib/internet-detector/mod_reboot.lua
+	$(INSTALL_DATA) ./files/usr/lib/internet-detector/mod_user_scripts.lua $(1)/usr/lib/internet-detector/mod_user_scripts.lua
 endef
 
 $(eval $(call BuildPackage,$(PKG_NAME)))

internet-detector/files/etc/config/internet-detector

@@ -4,22 +4,43 @@ config main 'config'
 	list hosts '1.1.1.1'
 	option check_type '0'
 	option tcp_port '53'
-
-config main 'ui_config'
-	option interval_up '6'
-	option interval_down '1'
-	option connection_attempts '1'
-	option connection_timeout '1'
-
-config main 'service_config'
-	option interval_up '30'
-	option interval_down '5'
-	option connection_attempts '2'
-	option connection_timeout '2'
-	option enable_logger '1'
-	option enable_up_script '0'
-	option enable_down_script '0'
-	option enable_run_script '0'
+	option ui_interval_up '6'
+	option ui_interval_down '1'
+	option ui_connection_attempts '1'
+	option ui_connection_timeout '1'
+	option service_interval_up '30'
+	option service_interval_down '5'
+	option service_connection_attempts '2'
+	option service_connection_timeout '2'
+	option service_enable_logger '1'
 
 config module 'mod_led_control'
 	option enabled '0'
+
+config module 'mod_reboot'
+	option enabled '0'
+	option dead_period '3600'
+	option force_reboot_delay '300'
+
+config module 'mod_network_restart'
+	option enabled '0'
+	option dead_period '900'
+	option attempts '1'
+	option restart_timeout '0'
+
+config module 'mod_modem_restart'
+	option enabled '0'
+	option dead_period '600'
+	option any_band '1'
+
+config module 'mod_email'
+	option enabled '0'
+	option alive_period '0'
+	option mail_smtp 'smtp.gmail.com'
+	option mail_smtp_port '587'
+	option mail_security 'tls'
+
+config module 'mod_user_scripts'
+	option enabled '0'
+	option alive_period '0'
+	option dead_period '0'

internet-detector/files/etc/init.d/internet-detector

@@ -1,6 +1,6 @@
 #!/bin/sh /etc/rc.common
 
-START=99
+START=97
 STOP=01
 
 ID="/usr/bin/internet-detector"

internet-detector/files/etc/internet-detector/run-script

@@ -1,4 +0,0 @@
-#	Shell commands that are executed every time the Internet is checked for availability
-#
-#	$1 - (0|1) - internet status: 0 is up, 1 is down
-#

internet-detector/files/usr/bin/internet-detector

@@ -14,38 +14,36 @@
 -- Default settings
 
 local Config = {
-	["mode"]                 = 2,
-	["enableLogger"]         = true,
-	["enableUpScript"]       = false,
-	["enableDownScript"]     = false,
-	["enableRunScript"]      = false,
-	["intervalUp"]           = 30,
-	["intervalDown"]         = 5,
-	["connectionAttempts"]   = 1,
-	["UIConnectionAttempts"] = 1,
-	["hosts"]                = {
+	mode                 = 2,
+	enableLogger         = true,
+	intervalUp           = 30,
+	intervalDown         = 5,
+	connectionAttempts   = 2,
+	connectionTimeout    = 2,
+	UIConnectionAttempts = 1,
+	UIConnectionTimeout  = 1,
+	hosts                = {
 		[1] = "8.8.8.8",
 		[2] = "1.1.1.1",
 	},
-	["parsedHosts"]          = {},
-	["appName"]              = "internet-detector",
-	["commonDir"]            = "/tmp/run",
-	["pingCmd"]              = "ping",
-	["pingParams"]           = "-c 1",
-	["connectionTimeout"]    = 3,
-	["UIConnectionTimeout"]  = 1,
-	["tcpPort"]              = 53,
-	["checkType"]            = 0,	-- 0: TCP, 1: ping
-	["loggerLevel"]          = "info",
-	["modules"]              = {},
+	tcpPort              = 53,
+	pingPacketSize       = 56,
+	iface                = nil,
+	checkType            = 0,	-- 0: TCP, 1: ping
+	hostname             = "OpenWrt",
+	appName              = "internet-detector",
+	commonDir            = "/tmp/run",
+	debugLog             = "/tmp/internet-detector.debug",
+	pingCmd              = "/bin/ping",
+	pingParams           = "-c 1",
+	debug                = false,
+	modules              = {},
+	parsedHosts          = {},
 }
-Config.configDir  = "/etc/" .. Config.appName
-Config.modulesDir = "/usr/lib/" .. Config.appName
-Config.upScript   = Config.configDir .. "/" .. "up-script"
-Config.downScript = Config.configDir .. "/" .. "down-script"
-Config.runScript  = Config.configDir .. "/" .. "run-script"
-Config.pidFile    = Config.commonDir .. "/" .. Config.appName .. ".pid"
-Config.statusFile = Config.commonDir .. "/" .. Config.appName .. ".status"
+Config.configDir  = string.format("/etc/%s", Config.appName)
+Config.modulesDir = string.format("/usr/lib/%s", Config.appName)
+Config.pidFile    = string.format("%s/%s.pid", Config.commonDir, Config.appName)
+Config.statusFile = string.format("%s/%s.status", Config.commonDir, Config.appName)
 
 -- Importing packages
 
@@ -69,31 +67,48 @@ end
 local uciCursor             = uci.cursor()
 Config.mode                 = tonumber(uciCursor:get(
                                Config.appName, "config", "mode"))
+Config.enableLogger         = (tonumber(uciCursor:get(
+                               Config.appName, "config", "service_enable_logger")) ~= 0)
+Config.intervalUp           = tonumber(uciCursor:get(
+                               Config.appName, "config", "service_interval_up"))
+Config.intervalDown         = tonumber(uciCursor:get(
+                               Config.appName, "config", "service_interval_down"))
+Config.connectionAttempts   = tonumber(uciCursor:get(
+                               Config.appName, "config", "service_connection_attempts"))
+Config.connectionTimeout    = tonumber(uciCursor:get(
+                               Config.appName, "config", "service_connection_timeout"))
+Config.UIConnectionAttempts = tonumber(uciCursor:get(
+                               Config.appName, "config", "ui_connection_attempts"))
+Config.UIConnectionTimeout  = tonumber(uciCursor:get(
+                               Config.appName, "config", "ui_connection_timeout"))
 Config.hosts                = uciCursor:get(Config.appName, "config", "hosts")
+
+local tcpPort               = uciCursor:get(
+                               Config.appName, "config", "tcp_port")
+if tcpPort ~= nil then
+	Config.tcpPort = tonumber(tcpPort)
+end
+
+local pingPacketSize        = uciCursor:get(
+                               Config.appName, "config", "ping_packet_size")
+if pingPacketSize ~= nil then
+	Config.pingPacketSize = tonumber(pingPacketSize)
+end
+
+local iface                 = uciCursor:get(
+                               Config.appName, "config", "iface")
+if iface ~= nil then
+	Config.iface = iface
+end
+
 Config.checkType            = tonumber(uciCursor:get(
                                Config.appName, "config", "check_type"))
-Config.tcpPort              = tonumber(uciCursor:get(
-                               Config.appName, "config", "tcp_port"))
-Config.UIConnectionAttempts = tonumber(uciCursor:get(
-                               Config.appName, "ui_config", "connection_attempts"))
-Config.UIConnectionTimeout  = tonumber(uciCursor:get(
-                               Config.appName, "ui_config", "connection_timeout"))
-Config.enableLogger         = (tonumber(uciCursor:get(
-                               Config.appName, "service_config", "enable_logger")) ~= 0)
-Config.enableUpScript       = (tonumber(uciCursor:get(
-                               Config.appName, "service_config", "enable_up_script")) ~= 0)
-Config.enableDownScript     = (tonumber(uciCursor:get(
-                               Config.appName, "service_config", "enable_down_script")) ~= 0)
-Config.enableRunScript      = (tonumber(uciCursor:get(
-                               Config.appName, "service_config", "enable_run_script")) ~= 0)
-Config.intervalUp           = tonumber(uciCursor:get(
-                               Config.appName, "service_config", "interval_up"))
-Config.intervalDown         = tonumber(uciCursor:get(
-                               Config.appName, "service_config", "interval_down"))
-Config.connectionAttempts   = tonumber(uciCursor:get(
-                               Config.appName, "service_config", "connection_attempts"))
-Config.connectionTimeout    = tonumber(uciCursor:get(
-                               Config.appName, "service_config", "connection_timeout"))
+
+local hostname              = uciCursor:get("system", "@[0]", "hostname")
+if hostname ~= nil then
+	Config.hostname = hostname
+end
+
 
 local function writeValueToFile(filePath, str)
 	local retValue = false
@@ -124,7 +139,7 @@ local function writeLogMessage(level, msg)
 end
 
 local function loadModules()
-	package.path = string.format("%s;%s/?.lua", package.path, Config.modulesDir)
+	package.path   = string.format("%s;%s/?.lua", package.path, Config.modulesDir)
 	Config.modules = {}
 	uciCursor:foreach(
 		Config.appName,
@@ -134,6 +149,7 @@ local function loadModules()
 			if mod_name and s.enabled == "1" then
 				local m = prequire(mod_name)
 				if m then
+					m.config     = Config
 					m.syslog     = writeLogMessage
 					m.writeValue = writeValueToFile
 					m.readValue  = readValueFromFile
@@ -145,40 +161,43 @@ local function loadModules()
 	)
 end
 
-local function runExternalScript(scriptPath, inetStat)
-	if inetStat == nil then
-		inetStat = ""
-	end
-	if nixio.fs.access(scriptPath, "x") then
-		local fh = io.popen(
-			string.format('/bin/sh -c "%s %s" &', scriptPath, inetStat), "r")
-		fh:close()
-	end
-end
-
 local function parseHost(host)
-	local port
-	local addr = host:match("^[^:]+")
-	if host:find(":") then
-		port = host:match("[^:]+$")
-	end
-	return addr, port
+	local addr, port = host:match("^([^:]+):?(%d*)")
+	return addr, tonumber(port) or false
 end
 
 local function parseHosts()
 	Config.parsedHosts = {}
 	for k, v in ipairs(Config.hosts) do
 		local addr, port = parseHost(v)
-		Config.parsedHosts[k] = {[1] = addr, [2] = (tonumber(port) or false)}
+		Config.parsedHosts[k] = { addr = addr, port = port }
 	end
 end
 
 local function pingHost(host)
-	return os.execute(string.format("%s %s -W %d %s > /dev/null 2>&1",
-		Config.pingCmd, Config.pingParams, Config.connectionTimeout, host))
+	local ping = string.format(
+		"%s %s -W %d -s %d%s %s > /dev/null 2>&1",
+		Config.pingCmd,
+		Config.pingParams,
+		Config.connectionTimeout,
+		Config.pingPacketSize,
+		Config.iface and (" -I " .. Config.iface) or "",
+		host
+	)
+	local retCode = os.execute(ping)
+
+	-- Debug
+	if Config.debug then
+		io.stdout:write(string.format(
+			"--- Ping ---\ntime = %s\n%s\nretCode = %s\n", os.time(), ping, retCode)
+		)
+		io.stdout:flush()
+	end
+
+	return retCode
 end
 
-local function tcpConnectToHost(host, port)
+local function TCPConnectionToHost(host, port)
 	local retCode  = 1
 	local addrInfo = nixio.getaddrinfo(host, "any")
 	if addrInfo then
@@ -187,7 +206,31 @@ local function tcpConnectToHost(host, port)
 			local socket  = nixio.socket(family, "stream")
 			socket:setopt("socket", "sndtimeo", Config.connectionTimeout)
 			socket:setopt("socket", "rcvtimeo", Config.connectionTimeout)
+			if Config.iface then
+				socket:setopt("socket", "bindtodevice", Config.iface)
+			end
 			local success = socket:connect(host, port or Config.tcpPort)
+
+			-- Debug
+			if Config.debug then
+				local sockAddr, sockPort = socket:getsockname()
+				local peerAddr, peerPort = socket:getpeername()
+				io.stdout:write(string.format(
+					"--- TCP ---\ntime = %s\nconnectionTimeout = %s\niface = %s\nhost:port = %s:%s\nsockname = %s:%s\npeername = %s:%s\nsuccess = %s\n",
+					os.time(),
+					Config.connectionTimeout,
+					tostring(Config.iface),
+					host,
+					port or Config.tcpPort,
+					tostring(sockAddr),
+					tostring(sockPort),
+					tostring(peerAddr),
+					tostring(peerPort),
+					tostring(success))
+				)
+				io.stdout:flush()
+			end
+
 			socket:close()
 			retCode = success and 0 or 1
 		end
@@ -196,11 +239,11 @@ local function tcpConnectToHost(host, port)
 end
 
 local function checkHosts()
-	local checkFunc = (Config.checkType == 1) and pingHost or tcpConnectToHost
+	local checkFunc = (Config.checkType == 1) and pingHost or TCPConnectionToHost
 	local retCode   = 1
 	for k, v in ipairs(Config.parsedHosts) do
 		for i = 1, Config.connectionAttempts do
-			if checkFunc(v[1], v[2]) == 0 then
+			if checkFunc(v.addr, v.port) == 0 then
 				retCode = 0
 				break
 			end
@@ -213,46 +256,48 @@ local function checkHosts()
 end
 
 local function main()
-	local lastStatus
-	local currentStatus
+	local lastStatus, currentStatus, timeNow, timeDiff, lastTime
 	local interval = Config.intervalUp
+	local counter  = 0
 
 	while true do
-		currentStatus = checkHosts()
-		if not nixio.fs.access(Config.statusFile, "r") then
-			writeValueToFile(Config.statusFile, currentStatus)
-		end
-
-		if currentStatus == 0 then
-			interval = Config.intervalUp
-			if lastStatus ~= nil and currentStatus ~= lastStatus then
+		if counter == 0 or counter >= interval then
+			currentStatus = checkHosts()
+			if not nixio.fs.access(Config.statusFile, "r") then
 				writeValueToFile(Config.statusFile, currentStatus)
-				writeLogMessage("notice", "internet connected")
-				if Config.enableUpScript then
-					runExternalScript(Config.upScript)
-				end
-			end
-		else
-			interval = Config.intervalDown
-			if lastStatus ~= nil and currentStatus ~= lastStatus then
-				writeValueToFile(Config.statusFile, currentStatus)
-				writeLogMessage("notice", "internet disconnected")
-				if Config.enableDownScript then
-					runExternalScript(Config.downScript)
+			end
+
+			if currentStatus == 0 then
+				interval = Config.intervalUp
+				if lastStatus ~= nil and currentStatus ~= lastStatus then
+					writeValueToFile(Config.statusFile, currentStatus)
+					writeLogMessage("notice", "Internet connected")
+				end
+			else
+				interval = Config.intervalDown
+				if lastStatus ~= nil and currentStatus ~= lastStatus then
+					writeValueToFile(Config.statusFile, currentStatus)
+					writeLogMessage("notice", "Internet disconnected")
 				end
 			end
+
+			counter = 0
 		end
 
+		timeDiff = 0
 		for _, e in ipairs(Config.modules) do
-			e:run(currentStatus, lastStatus)
+			timeNow = nixio.sysinfo().uptime
+			if lastTime then
+				timeDiff = timeDiff + timeNow - lastTime
+			else
+				timeDiff = 1
+			end
+			lastTime = timeNow
+			e:run(currentStatus, lastStatus, timeDiff)
 		end
-
-		if Config.enableRunScript then
-			runExternalScript(Config.runScript, currentStatus)
-		end
-
 		lastStatus = currentStatus
-		nixio.nanosleep(interval)
+		nixio.nanosleep(1)
+		counter    = counter + 1
 	end
 end
 
@@ -369,6 +414,30 @@ local function run()
 		)
 	end
 
+	-- Debug
+	if Config.debug then
+
+		local function inspectTable()
+			local tables = {}, f
+			f = function(t, prefix)
+				tables[t] = true
+				for k, v in pairs(t) do
+					io.stdout:write(string.format(
+						"%s%s = %s\n", prefix, k, tostring(v))
+					)
+					if type(v) == "table" and not tables[v] then
+						f(v, string.format("%s%s.", prefix, k))
+					end
+				end
+			end
+			return f
+		end
+
+		io.stdout:write("--- Config ---\n")
+		inspectTable()(Config, "Config.")
+		io.stdout:flush()
+	end
+
 	main()
 	if Config.enableLogger then
 		nixio.closelog()
@@ -382,7 +451,7 @@ local function noDaemon()
 	run()
 end
 
-local function daemon()
+local function daemon(debug)
 	if not preRun() then
 		return
 	end
@@ -392,12 +461,16 @@ local function daemon()
 		if nixio.fork() == 0 then
 			nixio.chdir("/")
 			nixio.umask(0)
-			local devnull = "/dev/null"
+			local output = "/dev/null"
+			if debug then
+				output       = Config.debugLog
+				Config.debug = true
+			end
 			io.stdout:flush()
 			io.stderr:flush()
-			nixio.dup(io.open(devnull, "r"), io.stdin)
-			nixio.dup(io.open(devnull, "a+"), io.stdout)
-			nixio.dup(io.open(devnull, "a+"), io.stderr)
+			nixio.dup(io.open("/dev/null", "r"), io.stdin)
+			nixio.dup(io.open(output, "a+"), io.stdout)
+			nixio.dup(io.open(output, "a+"), io.stderr)
 			run()
 		end
 		os.exit(0)
@@ -416,16 +489,18 @@ parseHosts()
 
 local function help()
 	return string.format(
-		"Usage: %s [start|no-daemon|stop|restart|status|inet-status|poll [<attempts num>] [<timeout sec>]|--help]",
+		"Usage: %s [start|stop|restart|no-daemon|debug|status|inet-status|poll [<attempts num>] [<timeout sec>]|--help]",
 		arg[0]
 	)
 end
 
-local helpArgs = {["-h"] = true, ["--help"] = true, ["help"] = true}
+local helpArgs = { ["-h"] = true, ["--help"] = true, ["help"] = true }
 if arg[1] == "start" or #arg == 0 then
 	daemon()
 elseif arg[1] == "no-daemon" then
 	noDaemon()
+elseif arg[1] == "debug" then
+	daemon(true)
 elseif arg[1] == "stop" then
 	stop()
 elseif arg[1] == "restart" then

internet-detector/files/usr/lib/internet-detector/mod_email.lua

@@ -0,0 +1,138 @@
+--[[
+	Dependences:
+		mailsend
+--]]
+local nixio  = require("nixio")
+
+local Module = {
+	name               = "mod_email",
+	config             = {},
+	syslog             = function(level, msg) return true end,
+	writeValue         = function(filePath, str) return false end,
+	readValue          = function(filePath) return nil end,
+	alivePeriod        = 0,
+	hostAlias          = "OpenWrt",
+	mta                = "/usr/bin/mailsend",
+	mailRecipient      = "email@gmail.com",
+	mailSender         = "email@gmail.com",
+	mailUser           = "email@gmail.com",
+	mailPassword       = "password",
+	mailSmtp           = "smtp.gmail.com",
+	mailSmtpPort       = '587',
+	mailSecurity       = "tls",
+	_enabled           = false,
+	_aliveCounter      = 0,
+	_msgSent           = true,
+	_disconnected      = true,
+	_lastDisconnection = nil,
+	_lastConnection    = nil,
+}
+
+function Module:init(t)
+	self.alivePeriod = tonumber(t.alive_period)
+	if t.host_alias then
+		self.hostAlias = t.host_alias
+	else
+		self.hostAlias = self.config.hostname
+	end
+
+	self.mailRecipient = t.mail_recipient
+	self.mailSender    = t.mail_sender
+	self.mailUser      = t.mail_user
+	self.mailPassword  = t.mail_password
+	self.mailSmtp      = t.mail_smtp
+	self.mailSmtpPort  = t.mail_smtp_port
+	self.mailSecurity  = t.mail_security
+
+	if nixio.fs.access(self.mta, "x") then
+		self._enabled = true
+	else
+		self._enabled = false
+		self.syslog("warning", string.format("%s: %s is not available", self.name, self.mta))
+	end
+
+	if (not self.mailRecipient or
+	    not self.mailSender or
+	    not self.mailUser or
+	    not self.mailPassword or
+	    not self.mailSmtp or
+	    not self.mailSmtpPort) then
+		self._enabled = false
+		self.syslog("warning", string.format(
+			"%s: Insufficient data to connect to the SMTP server", self.name))
+	end
+end
+
+function Module:sendMessage(msg)
+	local verboseArg = ""
+	-- Debug
+	if self.config.debug then
+		verboseArg = " -v"
+		io.stdout:write("--- mod_email ---\n")
+		io.stdout:flush()
+	end
+	local securityArgs = "-starttls -auth-login"
+	if self.mailSecurity == "ssl" then
+		securityArgs = "-ssl -auth"
+	end
+	local mtaCmd = string.format(
+		'%s%s %s -smtp "%s" -port %s -cs utf-8 -user "%s" -pass "%s" -f "%s" -t "%s" -sub "%s" -M "%s"',
+		self.mta, verboseArg, securityArgs, self.mailSmtp, self.mailSmtpPort,
+		self.mailUser, self.mailPassword, self.mailSender, self.mailRecipient,
+		string.format("%s notification", self.hostAlias),
+		string.format("%s:\n%s", self.hostAlias, msg))
+
+	if os.execute(mtaCmd) ~= 0 then
+		self.syslog("err", string.format(
+			"%s: An error occured while sending message", self.name))
+	else
+		self.syslog("info", string.format(
+			"%s: Message sent to %s", self.name, self.mailRecipient))
+	end
+end
+
+function Module:run(currentStatus, lastStatus, timeDiff)
+	if not self._enabled then
+		return
+	end
+
+	if currentStatus == 1 then
+		self._aliveCounter   = 0
+		self._msgSent        = false
+		self._lastConnection = nil
+		if not self._disconnected then
+			self._disconnected      = true
+			if not self._lastDisconnection then
+				self._lastDisconnection = os.date("%Y.%m.%d %H:%M:%S", os.time())
+			end
+		end
+	else
+		if not self._msgSent then
+
+			if not self._lastConnection then
+				self._lastConnection = os.date("%Y.%m.%d %H:%M:%S", os.time())
+			end
+
+			if self._aliveCounter >= self.alivePeriod then
+				local message = {}
+				if self._lastDisconnection then
+					message[#message + 1] = string.format(
+						"Internet disconnected: %s", self._lastDisconnection)
+					self._lastDisconnection = nil
+				end
+				if self._lastConnection then
+					message[#message + 1] = string.format(
+						"Internet connected: %s", self._lastConnection)
+					self:sendMessage(table.concat(message, ", "))
+					self._msgSent = true
+				end
+			else
+				self._aliveCounter = self._aliveCounter + timeDiff
+			end
+		end
+
+		self._disconnected = false
+	end
+end
+
+return Module

internet-detector/files/usr/lib/internet-detector/mod_led_control.lua

@@ -3,16 +3,19 @@ local nixio  = require("nixio")
 
 local Module = {
 	name                  = "mod_led_control",
-	sysLedsDir            = "/sys/class/leds",
+	config                = {},
 	syslog                = function(level, msg) return true end,
 	writeValue            = function(filePath, str) return false end,
 	readValue             = function(filePath) return nil end,
+	runInterval           = 5,
+	sysLedsDir            = "/sys/class/leds",
 	ledName               = nil,
 	_enabled              = false,
 	_ledDir               = nil,
 	_ledMaxBrightnessFile = nil,
 	_ledBrightnessFile    = nil,
 	_ledMaxBrightness     = nil,
+	_counter              = 0,
 }
 
 function Module:resetLeds()
@@ -33,14 +36,14 @@ function Module:init(t)
 	if not self.ledName then
 		return
 	end
-	self._ledDir = string.format("%s/%s", self.sysLedsDir, self.ledName)
-	self._ledMaxBrightnessFile = self._ledDir .. "/max_brightness"
-	self._ledBrightnessFile    = self._ledDir .. "/brightness"
+	self._ledDir               = string.format("%s/%s", self.sysLedsDir, self.ledName)
+	self._ledMaxBrightnessFile = string.format("%s/max_brightness", self._ledDir)
+	self._ledBrightnessFile    = string.format("%s/brightness", self._ledDir)
 	self._ledMaxBrightness     = self.readValue(self._ledMaxBrightnessFile) or 1
 	if (not nixio.fs.access(self._ledDir, "r") or
 	    not nixio.fs.access(self._ledBrightnessFile, "r", "w")) then
 		self._enabled = false
-		self.syslog("warning", string.format('%s: "%s" is not available', self.name, self.ledName))
+		self.syslog("warning", string.format("%s: LED '%s' is not available", self.name, self.ledName))
 	else
 		self._enabled = true
 		-- Reset all LEDs
@@ -63,19 +66,25 @@ function Module:off()
 	self.writeValue(self._ledBrightnessFile, 0)
 end
 
-function Module:run(currentStatus, lastStatus)
+function Module:run(currentStatus, lastStatus, timeDiff)
 	if not self._enabled then
 		return
 	end
-	if currentStatus == 0 then
-		if not self:getCurrentState() then
-			self:on()
-		end
-	else
-		if self:getCurrentState() then
-			self:off()
+	if self._counter == 0 or self._counter >= self.runInterval or currentStatus ~= lastStatus then
+
+		if currentStatus == 0 then
+			if not self:getCurrentState() then
+				self:on()
+			end
+		else
+			if self:getCurrentState() then
+				self:off()
+			end
 		end
+
+		self._counter = 0
 	end
+	self._counter = self._counter + timeDiff
 end
 
 return Module

internet-detector/files/usr/lib/internet-detector/mod_modem_restart.lua

@@ -0,0 +1,84 @@
+--[[
+	Dependences:
+		modemmanager
+--]]
+local nixio  = require("nixio")
+
+local Module = {
+	name         = "mod_modem_restart",
+	config       = {},
+	syslog       = function(level, msg) return true end,
+	writeValue   = function(filePath, str) return false end,
+	readValue    = function(filePath) return nil end,
+	mmcli        = "/usr/bin/mmcli",
+	mmInit       = "/etc/init.d/modemmanager",
+	deadPeriod   = 0,
+	iface        = nil,
+	anyBand      = false,
+	_enabled     = false,
+	_deadCounter = 0,
+	_restarted   = false,
+}
+
+function Module:toggleIface(flag)
+	return os.execute(
+		string.format("%s %s", (flag and "/sbin/ifup" or "/sbin/ifdown"), self.iface)
+	)
+end
+
+function Module:restartMM()
+	if self.anyBand then
+		self.syslog("info", string.format(
+			"%s: resetting current-bands to 'any'", self.name))
+		os.execute(string.format("%s -m any --set-current-bands=any", self.mmcli))
+	end
+
+	self.syslog("info", string.format("%s: reconnecting modem", self.name))
+	os.execute(string.format("%s restart", self.mmInit))
+
+	if self.iface then
+		self.syslog("info", string.format(
+			"%s: restarting network interface '%s'", self.name, self.iface))
+		self:toggleIface(false)
+		self:toggleIface(true)
+	end
+end
+
+function Module:init(t)
+	self.deadPeriod = tonumber(t.dead_period)
+	self.iface      = t.iface
+	self.anyBand    = (tonumber(t.any_band) ~= 0)
+
+	if not nixio.fs.access(self.mmcli, "x") then
+		self.anyBand = false
+	end
+
+	if nixio.fs.access(self.mmInit, "x") then
+		self._enabled = true
+	else
+		self._enabled = false
+		self.syslog("warning", string.format(
+			"%s: modemmanager service is not available", self.name))
+	end
+end
+
+function Module:run(currentStatus, lastStatus, timeDiff)
+	if not self._enabled then
+		return
+	end
+	if currentStatus == 1 then
+		if not self._restarted then
+			if self._deadCounter >= self.deadPeriod then
+				self:restartMM()
+				self._restarted = true
+			else
+				self._deadCounter = self._deadCounter + timeDiff
+			end
+		end
+	else
+		self._deadCounter = 0
+		self._restarted   = false
+	end
+end
+
+return Module

internet-detector/files/usr/lib/internet-detector/mod_network_restart.lua

@@ -0,0 +1,91 @@
+
+local nixio  = require("nixio")
+
+local Module = {
+	name             = "mod_network_restart",
+	config           = {},
+	syslog           = function(level, msg) return true end,
+	writeValue       = function(filePath, str) return false end,
+	readValue        = function(filePath) return nil end,
+	iface            = false,
+	attempts         = 0,
+	deadPeriod       = 0,
+	restartTimeout   = 0,
+	_attemptsCounter = 0,
+	_deadCounter     = 0,
+}
+
+function Module:toggleFunc(flag)
+	return
+end
+
+function Module:toggleDevice(flag)
+	local ip = "/sbin/ip"
+	if nixio.fs.access(ip, "x") then
+		return os.execute(
+			string.format("%s link set dev %s %s", ip, self.iface, (flag and "up" or "down"))
+		)
+	end
+end
+
+function Module:toggleIface(flag)
+	return os.execute(
+		string.format("%s %s", (flag and "/sbin/ifup" or "/sbin/ifdown"), self.iface)
+	)
+end
+
+function Module:ifaceUp()
+	self:toggleFunc(true)
+end
+
+function Module:ifaceDown()
+	self:toggleFunc(false)
+end
+
+function Module:networkRestart()
+	return os.execute("/etc/init.d/network restart")
+end
+
+function Module:init(t)
+	local iface = t.iface
+	if iface then
+		self.iface = iface
+		if self.iface:match("^@") then
+			self.iface      = self.iface:gsub("^@", "")
+			self.toggleFunc = self.toggleIface
+		else
+			self.toggleFunc = self.toggleDevice
+		end
+	end
+	self.attempts       = tonumber(t.attempts)
+	self.deadPeriod     = tonumber(t.dead_period)
+	self.restartTimeout = tonumber(t.restart_timeout)
+end
+
+function Module:run(currentStatus, lastStatus, timeDiff)
+	if currentStatus == 1 then
+		if self.attempts == 0 or self._attemptsCounter < self.attempts then
+			if self._deadCounter >= self.deadPeriod then
+				if self.iface then
+					self.syslog("info", string.format(
+						"%s: restarting network interface '%s'", self.name, self.iface))
+					self:ifaceDown()
+					nixio.nanosleep(self.restartTimeout)
+					self:ifaceUp()
+				else
+					self.syslog("info", string.format("%s: restarting network", self.name))
+					self:networkRestart()
+				end
+				self._deadCounter     = 0
+				self._attemptsCounter = self._attemptsCounter + 1
+			else
+				self._deadCounter = self._deadCounter + timeDiff
+			end
+		end
+	else
+		self._attemptsCounter = 0
+		self._deadCounter     = 0
+	end
+end
+
+return Module

internet-detector/files/usr/lib/internet-detector/mod_reboot.lua

@@ -0,0 +1,46 @@
+
+local nixio  = require("nixio")
+
+local Module = {
+	name             = "mod_reboot",
+	config           = {},
+	syslog           = function(level, msg) return true end,
+	writeValue       = function(filePath, str) return false end,
+	readValue        = function(filePath) return nil end,
+	deadPeriod       = 0,
+	forceRebootDelay = 0,
+	_deadCounter     = 0,
+}
+
+function Module:rebootDevice()
+	self.syslog("warning", string.format("%s: reboot", self.name))
+	os.execute("/sbin/reboot &")
+
+	if self.forceRebootDelay > 0 then
+		nixio.nanosleep(self.forceRebootDelay)
+		self.syslog("warning", string.format("%s: force reboot", self.name))
+		self.writeValue("/proc/sys/kernel/sysrq", "1")
+		self.writeValue("/proc/sysrq-trigger", "b")
+	end
+end
+
+function Module:init(t)
+	self.deadPeriod       = tonumber(t.dead_period)
+	self.forceRebootDelay = tonumber(t.force_reboot_delay)
+end
+
+function Module:run(currentStatus, lastStatus, timeDiff)
+	if currentStatus == 1 then
+		if self._deadCounter >= self.deadPeriod then
+			self:rebootDevice()
+			self._deadCounter = 0
+		else
+			self._deadCounter = self._deadCounter + timeDiff
+		end
+
+	else
+		self._deadCounter = 0
+	end
+end
+
+return Module

internet-detector/files/usr/lib/internet-detector/mod_user_scripts.lua

@@ -0,0 +1,63 @@
+
+local nixio  = require("nixio")
+
+local Module = {
+	name                = "mod_user_scripts",
+	config              = {},
+	syslog              = function(level, msg) return true end,
+	writeValue          = function(filePath, str) return false end,
+	readValue           = function(filePath) return nil end,
+	deadPeriod          = 0,
+	alivePeriod         = 0,
+	upScript            = "",
+	downScript          = "",
+	_deadCounter        = 0,
+	_aliveCounter       = 0,
+	_upScriptExecuted   = true,
+	_downScriptExecuted = true,
+}
+
+function Module:runExternalScript(scriptPath)
+	if nixio.fs.access(scriptPath, "x") then
+		os.execute(string.format('/bin/sh -c "%s" &', scriptPath))
+	end
+end
+
+function Module:init(t)
+	self.deadPeriod  = tonumber(t.dead_period)
+	self.alivePeriod = tonumber(t.alive_period)
+	if self.config.configDir then
+		self.upScript   = string.format("%s/up-script", self.config.configDir)
+		self.downScript = string.format("%s/down-script", self.config.configDir)
+	end
+end
+
+function Module:run(currentStatus, lastStatus, timeDiff)
+	if currentStatus == 1 then
+		self._aliveCounter       = 0
+		self._downScriptExecuted = false
+
+		if not self._upScriptExecuted then
+			if self._deadCounter >= self.deadPeriod then
+				self:runExternalScript(self.downScript)
+				self._upScriptExecuted = true
+			else
+				self._deadCounter = self._deadCounter + timeDiff
+			end
+		end
+	else
+		self._deadCounter      = 0
+		self._upScriptExecuted = false
+
+		if not self._downScriptExecuted then
+			if self._aliveCounter >= self.alivePeriod then
+				self:runExternalScript(self.upScript)
+				self._downScriptExecuted = true
+			else
+				self._aliveCounter = self._aliveCounter + timeDiff
+			end
+		end
+	end
+end
+
+return Module