Merge pull request ovh#32 from simlelievre/bugfix/lua

overthebox: check if there is no headers

Author: simon

Diff for: mwan3otb/Makefile

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mwan3otb
 PKG_VERSION:=1.7
-PKG_RELEASE:=21
+PKG_RELEASE:=22
 PKG_MAINTAINER:=Jeroen Louwes <[email protected]>
 PKG_LICENSE:=GPLv2
 

Diff for: mwan3otb/files/usr/sbin/track.lua

@@ -595,6 +595,7 @@ bw_stats.command= "/usr/bin/luci-bwc"
 function bw_stats:collect()
 	-- run bandwidth monitor
 	local handle = io.popen(string.format("%s -i %s", bw_stats.command, opts["i"]))
+	if not handle then return 0 end
 	local result = handle:read("*a")
 	handle:close()
 	-- store rsult in table

Diff for: overthebox/Makefile

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=overthebox
 PKG_VERSION:=0.3
-PKG_RELEASE:=7
+PKG_RELEASE:=8
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/overthebox-$(PKG_VERSION)
 

Diff for: overthebox/files/usr/lib/lua/overthebox.lua

@@ -845,15 +845,11 @@ function API(uri, method, data)
 		print()
 	end
 
-	for k, v in pairs(headers) do
-		if k == "x-otb-client-ip" then
-			if v:match("(%d+)%.(%d+)%.(%d+)%.(%d+)") then
-		                fd = io.open("/tmp/wanip", "w")
-		                if fd then
-		                        fd:write(v)
-		                        fd:close()
-		                end
-			end
+	if ( headers and type(headers) == "table" and headers["x-otb-client-ip"] and headers["x-otb-client-ip"]:match("(%d+)%.(%d+)%.(%d+)%.(%d+)") ) then
+		fd = io.open("/tmp/wanip", "w")
+		if fd then
+			fd:write(headers["x-otb-client-ip"])
+			fd:close()
 		end
 	end