Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-07 08:23:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_Scripting: fixed webserver warnings

Browse Source
This commit is contained in:
Andrew Tridgell 2023-12-10 08:06:22 +11:00
parent 583c24d833
commit ded1cdaa2a
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
libraries/AP_Scripting/applets/net_webserver.lua
View File

@ -23,7 +23,7 @@ assert(param:add_table(PARAM_TABLE_KEY, PARAM_TABLE_PREFIX, 6), 'net_test: could
// @Values: 0:Disabled,1:Enabled // @Values: 0:Disabled,1:Enabled
// @User: Standard // @User: Standard
--]] --]]
local WEB_ENABLE = bind_add_param('ENABLE', 1, 0) local WEB_ENABLE = bind_add_param('ENABLE', 1, 1)
--[[ --[[
// @Param: WEB_BIND_PORT // @Param: WEB_BIND_PORT
@ -62,11 +62,15 @@ local WEB_BLOCK_SIZE = bind_add_param('BLOCK_SIZE', 4, 10240)
--]] --]]
local WEB_TIMEOUT = bind_add_param('TIMEOUT', 5, 2.0) local WEB_TIMEOUT = bind_add_param('TIMEOUT', 5, 2.0)
if WEB_ENABLE:get() ~= 1 then
gcs:send_text(MAV_SEVERITY.INFO, "WebServer: disabled")
return
end
local BRD_RTC_TZ_MIN = Parameter("BRD_RTC_TZ_MIN") local BRD_RTC_TZ_MIN = Parameter("BRD_RTC_TZ_MIN")
gcs:send_text(MAV_SEVERITY.INFO, string.format("WebServer: starting on port %u", WEB_BIND_PORT:get())) gcs:send_text(MAV_SEVERITY.INFO, string.format("WebServer: starting on port %u", WEB_BIND_PORT:get()))
local counter = 0
local sock_listen = SocketAPM(0) local sock_listen = SocketAPM(0)
local clients = {} local clients = {}
@ -77,8 +81,6 @@ local CONTENT_OCTET_STREAM = "application/octet-stream"
local HIDDEN_FOLDERS = { "@SYS", "@ROMFS", "@MISSION", "@PARAM" } local HIDDEN_FOLDERS = { "@SYS", "@ROMFS", "@MISSION", "@PARAM" }
local CGI_BIN_PATH = "cgi-bin"
local MNT_PREFIX = "/mnt" local MNT_PREFIX = "/mnt"
local MNT_PREFIX2 = MNT_PREFIX .. "/" local MNT_PREFIX2 = MNT_PREFIX .. "/"
@ -282,9 +284,7 @@ end
return true if a string starts with the 2nd string return true if a string starts with the 2nd string
--]] --]]
local function startswith(str, s) local function startswith(str, s)
local len1 = #str return string.sub(str,1,#s) == s
local len2 = #s
return string.sub(str,1,len2) == s
end end
local debug_count=0 local debug_count=0
@ -338,7 +338,7 @@ function file_timestring(path)
end end
local mtime = s:mtime() local mtime = s:mtime()
mtime = mtime + BRD_RTC_TZ_MIN:get()*60 mtime = mtime + BRD_RTC_TZ_MIN:get()*60
local year, month, day, hour, min, sec, wday = rtc:clock_s_to_date_fields(mtime) local year, month, day, hour, min, sec, _ = rtc:clock_s_to_date_fields(mtime)
if not year then if not year then
return "" return ""
end end
@ -520,7 +520,7 @@ local function Client(_sock, _idx)
if endswith(path,"/") then if endswith(path,"/") then
path = string.sub(path, 1, #path-1) path = string.sub(path, 1, #path-1)
end end
local dir, file = string.match(path, '(.*/)(.*)') local dir, _ = string.match(path, '(.*/)(.*)')
if not dir then if not dir then
return path return path
end end
@ -646,12 +646,12 @@ local function Client(_sock, _idx)
local eval_code = "function eval_func()\n" .. code .. "\nend\n" local eval_code = "function eval_func()\n" .. code .. "\nend\n"
local f, errloc, err = load(eval_code, "eval_func", "t", _ENV) local f, errloc, err = load(eval_code, "eval_func", "t", _ENV)
if not f then if not f then
DEBUG(string.format("load failed: err=%s", err)) DEBUG(string.format("load failed: err=%s errloc=%s", err, errloc))
return nil return nil
end end
local success, err = pcall(f) local success, err2 = pcall(f)
if not success then if not success then
DEBUG(string.format("pcall failed: err=%s", err)) DEBUG(string.format("pcall failed: err=%s", err2))
return nil return nil
end end
local ok, s2 = pcall(eval_func) local ok, s2 = pcall(eval_func)
@ -719,7 +719,7 @@ local function Client(_sock, _idx)
if path == "/" then if path == "/" then
return MIME_TYPES["html"] return MIME_TYPES["html"]
end end
local file, ext = string.match(path, '(.*[.])(.*)') local _, ext = string.match(path, '(.*[.])(.*)')
ext = string.lower(ext) ext = string.lower(ext)
local ret = MIME_TYPES[ext] local ret = MIME_TYPES[ext]
if not ret then if not ret then