From b4f4799f9e745aae8b70df7ad27315eb997cf570 Mon Sep 17 00:00:00 2001 From: Vladislav Grigoryev Date: Tue, 10 Aug 2021 01:55:19 +0300 Subject: luci-mod-network: network/routing support for pbr Provide comprehensive routing configuration: * Rename the "Network > Routes" page to "Network > Routing". * Unify sorting for the "Status" and "Network" menus. * Add the tabs "IPv4 Rules" and "IPv6 Rules" to the "Routing" page. * Provide configuration for IPv4 and IPv6 routing rules. * Consolidate routing configuration and terminology for IPv4 and IPv6. Policy-based routing is an increasingly popular problem. Netifd natively supports policy-based routing: * Interface-specific options "ip4table" and "ip6table". * Routing rules using the "rule" and "rule6" sections. LuCI is missing configuration for routing rules. Signed-off-by: Vladislav Grigoryev --- modules/luci-base/po/ms/base.po | 92 ++++++++++++++--------------------------- 1 file changed, 32 insertions(+), 60 deletions(-) (limited to 'modules/luci-base/po/ms/base.po') diff --git a/modules/luci-base/po/ms/base.po b/modules/luci-base/po/ms/base.po index 79840189c9..9d1d4e1e2a 100644 --- a/modules/luci-base/po/ms/base.po +++ b/modules/luci-base/po/ms/base.po @@ -177,25 +177,10 @@ msgid "ESSID" msgstr "" "ESSID" -#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:47 -msgid "IPv4-Gateway" -msgstr "IPv4-Pintu gerbang" - #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:691 -#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:41 msgid "IPv4-Netmask" msgstr "IPv4-Netmask" -#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:36 -msgid "" -"IPv6-Address or Network " -"(CIDR)" -msgstr "IPv6 Host-Alamat atau Rangkaian (CIDR)" - -#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:47 -msgid "IPv6-Gateway" -msgstr "IPv6-Pintu gerbang" - #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/leds.js:58 msgid "LED Configuration" msgstr "Konfigurasi lampu LED" @@ -521,7 +506,8 @@ msgstr "Pentadbiran" #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:478 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:633 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:1523 -#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:26 +#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:39 +#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:126 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:924 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:988 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:241 @@ -1498,7 +1484,7 @@ msgid "DHCP Server" msgstr "" #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:244 -#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:50 +#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:62 msgid "DHCP and DNS" msgstr "" @@ -1684,6 +1670,7 @@ msgstr "Disain" msgid "Designated master" msgstr "" +#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:158 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/connections.js:386 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:71 msgid "Destination" @@ -1756,7 +1743,7 @@ msgstr "" msgid "Devices" msgstr "" -#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:78 +#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:76 msgid "Diagnostics" msgstr "" @@ -1769,7 +1756,8 @@ msgstr "" msgid "Directory" msgstr "" -#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:32 +#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:112 +#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:197 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:897 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:937 msgid "Disable" @@ -1798,10 +1786,6 @@ msgstr "" msgid "Disable this network" msgstr "" -#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:32 -msgid "Disable this route" -msgstr "" - #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:954 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1680 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js:13 @@ -2700,6 +2684,7 @@ msgstr "" msgid "GRETAP tunnel over IPv6" msgstr "" +#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:74 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/30_network.js:44 msgid "Gateway" msgstr "" @@ -2715,7 +2700,8 @@ msgstr "" #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:251 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:477 -#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:25 +#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:38 +#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:125 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/mounts.js:240 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/system.js:108 msgid "General Settings" @@ -2933,10 +2919,6 @@ msgstr "" msgid "Host expiry timeout" msgstr "" -#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:36 -msgid "Host-IP or Network" -msgstr "IP host atau rangkaian" - #: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:88 msgid "Host-Uniq tag content" msgstr "" @@ -3416,7 +3398,7 @@ msgstr "" msgid "Insufficient permissions to read UCI configuration." msgstr "" -#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:28 +#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:41 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js:180 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js:206 #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/dropbear.js:17 @@ -4055,7 +4037,7 @@ msgstr "" #: modules/luci-mod-network/htdocs/luci-static/resources/tools/network.js:580 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:1418 -#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:59 +#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:85 #: protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js:53 #: protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js:92 msgid "MTU" @@ -4195,7 +4177,7 @@ msgstr "" msgid "Method to determine link status" msgstr "" -#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:51 +#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:78 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js:189 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js:215 msgid "Metric" @@ -4746,8 +4728,8 @@ msgstr "" msgid "On" msgstr "" -#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:101 -msgid "On-Link route" +#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:108 +msgid "On-link" msgstr "" #: modules/luci-mod-system/htdocs/luci-static/resources/view/system/led-trigger/timer.js:11 @@ -5390,6 +5372,7 @@ msgid "Primary becomes active slave whenever it comes back up (always, 0)" msgstr "" #: modules/luci-mod-network/htdocs/luci-static/resources/tools/network.js:508 +#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:128 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js:197 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js:223 msgid "Priority" @@ -5859,11 +5842,7 @@ msgstr "" msgid "Route Allowed IPs" msgstr "" -#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:78 -msgid "Route table" -msgstr "" - -#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:65 +#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:45 msgid "Route type" msgstr "" @@ -5878,18 +5857,16 @@ msgstr "" msgid "Router Password" msgstr "" -#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:15 -msgid "Routes" -msgstr "Laluan" - -#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:15 +#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:28 msgid "" -"Routes specify over which interface and gateway a certain host or network " +"Routing defines over which interface and gateway a certain host or network " "can be reached." msgstr "" "Laluan menentukan di mana interface dan gateway host atau rangkaian tertentu " "yang boleh dicapai." +#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:28 +#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:50 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js:244 #: modules/luci-mod-status/root/usr/share/luci/menu.d/luci-mod-status.json:15 msgid "Routing" @@ -6252,16 +6229,14 @@ msgid "" "instructions." msgstr "" +#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:98 +#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:147 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/connections.js:385 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:70 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js:214 msgid "Source" msgstr "Sumber" -#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:89 -msgid "Source Address" -msgstr "" - #: protocols/luci-proto-gre/htdocs/luci-static/resources/protocol/grev6.js:57 #: protocols/luci-proto-gre/htdocs/luci-static/resources/protocol/grev6tap.js:57 msgid "Source interface" @@ -6538,11 +6513,11 @@ msgstr "" msgid "Startup" msgstr "" -#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:19 +#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:32 msgid "Static IPv4 Routes" msgstr "Laluan IPv4 Statik" -#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:19 +#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:32 msgid "Static IPv6 Routes" msgstr "Laluan IPv6 Statik" @@ -6555,10 +6530,6 @@ msgstr "" msgid "Static Leases" msgstr "Statische Einträge" -#: modules/luci-mod-network/root/usr/share/luci/menu.d/luci-mod-network.json:66 -msgid "Static Routes" -msgstr "Laluan Statik" - #: modules/luci-base/htdocs/luci-static/resources/network.js:2099 #: modules/luci-base/htdocs/luci-static/resources/protocol/static.js:172 #: modules/luci-compat/luasrc/model/network.lua:967 @@ -6722,13 +6693,15 @@ msgstr "" msgid "TX queue length" msgstr "" +#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:90 +#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:165 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:18 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js:190 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js:216 msgid "Table" msgstr "Meja" -#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:36 +#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:56 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/iptables.js:66 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js:187 #: modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js:213 @@ -8031,12 +8004,16 @@ msgid "ZRam Size" msgstr "" #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js:440 +#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:151 +#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:162 msgid "any" msgstr "" #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:1463 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:1471 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:1476 +#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:101 +#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:132 #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js:1230 #: protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js:79 #: protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js:48 @@ -8046,7 +8023,6 @@ msgid "auto" msgstr "auto" #: modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js:776 -#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:90 msgid "automatic" msgstr "automatik" @@ -8175,10 +8151,6 @@ msgstr "" msgid "hybrid mode" msgstr "" -#: modules/luci-mod-network/htdocs/luci-static/resources/view/network/routes.js:41 -msgid "if target is a network" -msgstr "jika target itu ialah rangkaian" - #: protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js:63 msgid "ignore" msgstr "" -- cgit v1.2.3