diff options
| author | Dirk Brenken <dev@brenken.org> | 2020-04-18 09:31:39 +0200 |
|---|---|---|
| committer | Dirk Brenken <dev@brenken.org> | 2020-04-18 09:31:39 +0200 |
| commit | f32978674b5fcf6f7cdaf508ae28b4bac2fff7e5 (patch) | |
| tree | c4bd7e0f0809a7fd8bab183875aae7fd6513a1bd /applications/luci-app-openvpn | |
| parent | d4fef2cc647b2381c195f2e417a883b1c0adfb15 (diff) | |
luci-app-openvpn: parse extended 'remote' syntax as well
* parse special 'remote' syntax (remote <host> <port> <proto> as well
(removed in last commit by accident)
Signed-off-by: Dirk Brenken <dev@brenken.org>
Diffstat (limited to 'applications/luci-app-openvpn')
| -rw-r--r-- | applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua b/applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua index 74d27f6350..bf8e26afe6 100644 --- a/applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua +++ b/applications/luci-app-openvpn/luasrc/model/cbi/openvpn.lua @@ -144,7 +144,10 @@ function port.cfgvalue(self, section) if not val then local file_cfg = self.map:get(section, "config") if file_cfg and fs.access(file_cfg) then - val = sys.exec("awk '{if(match(tolower($1),/^port$|^remote$/)&&match($2,/[0-9]+/)){cnt++;printf $2;exit}}END{if(cnt==0)printf \"-\"}' " ..file_cfg) + val = sys.exec("awk '{if(match(tolower($1),/^port$/)&&match($2,/[0-9]+/)){cnt++;printf $2;exit}}END{if(cnt==0)printf \"-\"}' " ..file_cfg) + if val == "-" then + val = sys.exec("awk '{if(match(tolower($1),/^remote$/)&&match($3,/[0-9]+/)){cnt++;printf $3;exit}}END{if(cnt==0)printf \"-\"}' " ..file_cfg) + end end end return val or "-" @@ -156,7 +159,10 @@ function proto.cfgvalue(self, section) if not val then local file_cfg = self.map:get(section, "config") if file_cfg and fs.access(file_cfg) then - val = sys.exec("awk '{if(match(tolower($1),/^proto$|^remote$/)&&match(tolower($2),/^udp[46]*$|^tcp[a-z46-]*$/)){cnt++;print tolower(substr($2,1,3));exit}}END{if(cnt==0)printf \"-\"}' " ..file_cfg) + val = sys.exec("awk '{if(match(tolower($1),/^proto$/)&&match(tolower($2),/^udp[46]*$|^tcp[a-z46-]*$/)){cnt++;print tolower(substr($2,1,3));exit}}END{if(cnt==0)printf \"-\"}' " ..file_cfg) + if val == "-" then + val = sys.exec("awk '{if(match(tolower($1),/^remote$/)&&match(tolower($4),/^udp[46]*$|^tcp[a-z46-]*$/)){cnt++;print tolower(substr($4,1,3));exit}}END{if(cnt==0)printf \"-\"}' " ..file_cfg) + end end end return val or "-" |