mptcp/openmptcprouter-feeds
1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter-feeds.git synced 2025-02-15 03:51:51 +00:00
Code Issues Releases Wiki Activity

Merge pull request #253 from Ysurac/develop

Browse source 
Fix wizard
This commit is contained in:
suyuan 2022-07-07 10:18:32 +08:00 committed by GitHub
commit 5d7cc94a59
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
View file

@ -301,9 +301,10 @@ function wizard_add()
ucic:set("network",intf,"type","macvlan") ucic:set("network",intf,"type","macvlan")
ucic:set("network",intf .. "_dev","device") ucic:set("network",intf .. "_dev","device")
ucic:set("network",intf .. "_dev","type","macvlan") ucic:set("network",intf .. "_dev","type","macvlan")
ucic:set("network",intf .. "_dev","ifname",masterinf) ucic:set("network",intf .. "_dev","ifname",masterintf)
ucic:set("network",intf .. "_dev","mode","vepa") ucic:set("network",intf .. "_dev","mode","vepa")
ucic:set("network",intf .. "_dev","name",intf) ucic:set("network",intf .. "_dev","name",intf)
ucic:set("network",intf,"device",intf)
ucic:set("network",intf,"masterintf",masterintf) ucic:set("network",intf,"masterintf",masterintf)
elseif typeintf == "" and ifname ~= "" and (proto == "static" or proto == "dhcp" or proto == "dhcpv6") then elseif typeintf == "" and ifname ~= "" and (proto == "static" or proto == "dhcp" or proto == "dhcpv6") then
ucic:set("network",intf,"device",ifname) ucic:set("network",intf,"device",ifname)
@ -336,12 +337,15 @@ function wizard_add()
ucic:set("network",intf .. "_dev","name",ifname) ucic:set("network",intf .. "_dev","name",ifname)
end end
end end
if typeintf ~= "macvlan" and ucic:get("network",intf .. "_dev","type") == "macvlan" then if typeintf ~= "macvlan" then
if ucic:get("network",intf .. "_dev","type") == "macvlan" then
ucic:delete("network",intf .. "_dev","type") ucic:delete("network",intf .. "_dev","type")
ucic:delete("network",intf .. "_dev","mode") ucic:delete("network",intf .. "_dev","mode")
ucic:delete("network",intf .. "_dev","ifname") ucic:delete("network",intf .. "_dev","ifname")
ucic:delete("network",intf .. "_dev","macaddr") ucic:delete("network",intf .. "_dev","macaddr")
end end
ucic:delete("network",intf,"masterintf")
end
if proto == "pppoe" then if proto == "pppoe" then
ucic:set("network",intf,"pppd_options","persist maxfail 0") ucic:set("network",intf,"pppd_options","persist maxfail 0")
end end
@ -373,17 +377,17 @@ function wizard_add()
ucic:set("network",intf,"defaultroute",0) ucic:set("network",intf,"defaultroute",0)
ucic:set("network",intf,"peerdns",0) ucic:set("network",intf,"peerdns",0)
if ipaddr ~= "" then if ipaddr ~= "" then
ucic:set("network",intf,"ipaddr",ipaddr) ucic:set("network",intf,"ipaddr",ipaddr:gsub("%s+", ""))
ucic:set("network",intf,"netmask",netmask) ucic:set("network",intf,"netmask",netmask:gsub("%s+", ""))
ucic:set("network",intf,"gateway",gateway) ucic:set("network",intf,"gateway",gateway:gsub("%s+", ""))
else else
ucic:set("network",intf,"ipaddr","") ucic:set("network",intf,"ipaddr","")
ucic:set("network",intf,"netmask","") ucic:set("network",intf,"netmask","")
ucic:set("network",intf,"gateway","") ucic:set("network",intf,"gateway","")
end end
if ip6addr ~= "" then if ip6addr ~= "" then
ucic:set("network",intf,"ip6addr",ip6addr) ucic:set("network",intf,"ip6addr",ip6addr:gsub("%s+", ""))
ucic:set("network",intf,"ip6gw",ip6gw) ucic:set("network",intf,"ip6gw",ip6gw:gsub("%s+", ""))
else else
ucic:set("network",intf,"ip6addr","") ucic:set("network",intf,"ip6addr","")
ucic:set("network",intf,"ip6gw","") ucic:set("network",intf,"ip6gw","")
@ -593,8 +597,8 @@ function wizard_add()
serversnb = serversnb + 1 serversnb = serversnb + 1
end end
ucic:set("openmptcprouter",server,"server") ucic:set("openmptcprouter",server,"server")
ucic:set("openmptcprouter",server,"username",openmptcprouter_vps_username) ucic:set("openmptcprouter",server,"username",openmptcprouter_vps_username:gsub("%s+", ""))
ucic:set("openmptcprouter",server,"password",openmptcprouter_vps_key) ucic:set("openmptcprouter",server,"password",openmptcprouter_vps_key:gsub("%s+", ""))
ucic:set("openmptcprouter",server,"disabled",openmptcprouter_vps_disabled) ucic:set("openmptcprouter",server,"disabled",openmptcprouter_vps_disabled)
ucic:set_list("openmptcprouter",server,"ip",aserverips) ucic:set_list("openmptcprouter",server,"ip",aserverips)
ucic:set("openmptcprouter",server,"port","65500") ucic:set("openmptcprouter",server,"port","65500")