Merge pull request #1761 from pmelange/ff_olsr_watchdog_del_tnl

ff_olsr_watchdog: delete stale tunnels
This commit is contained in:
Jo-Philipp Wich 2018-07-26 08:41:06 +02:00 committed by GitHub
commit 5c07c6fff3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -23,6 +23,15 @@ if fs.access("/var/run/olsrd.pid") or fs.access("/var/run/olsrd4.pid") then
if not wdgtime or ( systime - wdgtime ) > ( intv * 2 ) then
os.execute("logger -t 'OLSR watchdog' 'Process died - restarting!'")
local tnls = io.popen("ip tunnel show | cut -d : -f 1")
while true do
tnl = tnls:read("*line")
if tnl == nil then break end
if string.find(tnl, "tnl_") == 1 then
os.execute(string.format("logger -t 'OLSR watchdog' 'Deleting stale tunnel %s'", tnl))
os.execute(string.format("ip link del %s", tnl))
end
end
os.execute("/etc/init.d/olsrd restart")
end
end