14877 Commits

Author SHA1 Message Date
Jo-Philipp Wich
165e411cd4 luci-mod-network: parse ports without tag/pvid annotation as well
Fixes: 01eac366f6 ("luci-mod-network: fix tagging/pvid state parsing in bridge-vlan ports")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit e57f8663afd53cc7421debcd63444e1d136f5dec)
2021-07-01 21:15:04 +02:00
Jo-Philipp Wich
4c05263573 luci-mod-network: fix tagging/pvid state parsing in bridge-vlan ports
The previous code naively looked for a `t` in the entire port spec,
wrongly matching untagged ports having a `t` in their name, such
as `eth0`.

Rework the logic to be more strict when parsing the port member
specification to avoid this issue.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 01eac366f69ba58c090ddc2cb70aeb069adbdd5a)
2021-07-01 21:15:04 +02:00
Jo-Philipp Wich
ccf7c1e036 luci-mod-network: refactor device configuration
Since all netifd device types inherit generic device settings, we can
simplify various aspects of the device configuration ui and drop unused
code while we're at it.

 - Remove setIfActive() helper, superseded by commit
   f3f74bd0fe ("luci-base: form.js: consider aliased options in AbstractValue.remove()")

 - Remove most dependency constraints to make all generic device settings
   available for all device types

 - Add MTU value validation to disallow exceeding parent device MTU for
   VLAN interfaces

 - Dynamically update placeholder values when changing base or parent
   device options

 - Undo VLAN network config hack since all options are available now.
   Reverts commit
   3c6b59504a ("luci-mod-interfaces: simplify configuring MAC address of 802.1q devices")

 - Do not suggest inactive wireless networks as existing device or base
   device choices

 - Disallow specifying names of already existing network devices when
   creating new device settings

 - Fix a number of multicast dependency specifications

 - Drop now unused functions

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit f689d0d208acbf9934da5a2d49c8717c054be585)
2021-07-01 21:15:04 +02:00
Jo-Philipp Wich
0eb87ea65e luci-mod-network: change port status layout in vlan filter config
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 36350e9867ca9fd2f9b137ed76f0fabe0e57c880)
2021-07-01 21:15:04 +02:00
Jo-Philipp Wich
8504470ad8 build: add script to find commits suitable for cherry picking
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 0ead87320bade6f924991f4310271582a760edb4)
2021-07-01 21:13:56 +02:00
Dirk Brenken
7d5318b9ae
luci-app-adblock: sync with latest version
* expose new reporting option to LuCI
* sync translations

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit 83778c145281eb128a4acf23defda07003dfdc98)
2021-07-01 06:41:37 +02:00
Florian Eckert
06d63dc283
Merge pull request #5145 from msylgj/patch-2
luci-app-frpc/frps:add service status display
2021-06-29 08:58:19 +02:00
SiYao Mo
ad08c8e912 luci-app-frpc/frps:add service status display
reference from luci-app-smartdns
Special thanks to Nick Peng <pymumu@gmail.com>

Signed-off-by: SiYao Mo <msylgj@vip.qq.com>
2021-06-24 18:01:54 +08:00
Florian Eckert
d67e0daa8b
Merge pull request #5142 from msylgj/patch-2
luci-app-frpc: allow hostname in server address
2021-06-24 08:22:36 +02:00
Siyao Mo
1878aab778 luci-app-frpc: allow hostname in server address
Sometimes, our frp server cannot use a static ip address.
So perhaps we should allow people to use hostname in server address.

Signed-off-by: SiYao Mo <msylgj@vip.qq.com>
2021-06-24 00:18:59 +08:00
Florian Eckert
891eff7f1c luci-app-nlbwmon: i18n sync translations
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2021-06-21 13:53:18 +02:00
Florian Eckert
74c16549a1 luci-base: i18n sync translations
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2021-06-21 13:53:03 +02:00
Florian Eckert
71def4a101 luci-app-watchcat: i18n sync translations
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2021-06-21 13:52:50 +02:00
Florian Eckert
abc50bd1ae luci-app-banip: i18n sync translations
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2021-06-21 13:52:28 +02:00
Florian Eckert
d35a1a7866 luci-app-adblock: i18n sync translations
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2021-06-21 13:52:12 +02:00
Anton Kikin
2e6b6ec0dc luci-mod-network: Support for disabling routes
Support for disabling routes in netifd was added in commit [1]. This commit
adds support for disabling routes through the LuCI interface.

Additionally hidden the route options descriptions in the header of the
routes table (they are still available in the modal view).

[1]: https://git.openwrt.org/?p=project/netifd.git;a=commit;h=327da9895327bc56b23413ee91a6e6b6e0e4329d

Signed-off-by: Anton Kikin <a.kikin@tano-systems.com>
(cherry picked from commit bfe8a01040c8a74f38818195620f069f5bc10c5c)
2021-06-21 12:53:21 +02:00
Florian Eckert
95b3633055 luci-mod-status: switch to html table for wlan channel analysis
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit 8f8ce8613fb6e41954aa5bcbb60330e3b034bd3a)
2021-06-21 12:21:44 +02:00
Jo-Philipp Wich
ecc58e7fcb luci-theme-openwrt-2020: fix spinning disk animation
Fixes: #4824
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit e8a6f0bb7c7c24f31ddbc36f81fa97b3a2a53b2e)
2021-06-21 12:06:44 +02:00
Florian Eckert
b1567baf0c luci-app-nlbwmon: show force reload button even if data are available
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit a7be13ff05cc35352a02ad7c36acd704a037e37f)
2021-06-21 12:03:31 +02:00
Florian Eckert
dbb2cb9523 luci-app-nlbwmon: adjused the display export page
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit 04c4499be74152c476ca1edfd6b8048252a55251)
2021-06-21 12:03:06 +02:00
Florian Eckert
5cdce5d96a luci-app-nlbwmon: change force reload html element to button
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit d6443a629362f7ed79d1212cd964e5d6a127a9c0)
2021-06-21 12:03:06 +02:00
Florian Eckert
4ab591a24d luci-app-nlbwmon: add missing cbi-button class for database backup
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit 6f6ec9f56cc24be9f432b0a88a29f46277dad7d5)
2021-06-21 12:03:06 +02:00
Florian Eckert
ec2712335a luci-app-nlbwmon: fix url
When moving this application to the service section, the links were
forgotten to be changed.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit 7a365183296f385bb8cb14b8eb6fcfc29941c7e4)
2021-06-21 12:03:06 +02:00
Florian Eckert
eee3d4bef4 luci-app-nlbwmon: move into menu entry into service section
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit 9e91737566cc6101b4bf37107c6d945842f06bb8)
2021-06-21 12:03:06 +02:00
Jo-Philipp Wich
d365470f66 luco-app-ksmbd, luci-app-omcproxy: use relative luci.mk include path
Fixes: #5134
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 2f0ffd9d82b1e41d64e4d63088086f4956010840)
2021-06-18 14:29:20 +02:00
Jo-Philipp Wich
8b663587f9 luci-mod-network: only consider bridge vlans belonging to the current device
In case multiple bridges with bridge vlans are declared, LuCI did not
correctly filter the VLANs to show only the ones belonging to the
bridge being configured currently.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit f6f1eacb012b0364940c1dc9b9392fc0e60405b9)
2021-06-17 09:39:38 +02:00
Yu Hua
83f6606a6d luci-lib-docker: add container export support
commit from https://github.com/lisaac/luci-lib-docker

Signed-off-by: Yu Hua <hue715@gmail.com>
(cherry picked from commit fe795d5278e541c91d16374371c7f2a0c3eae998)
2021-06-16 14:52:05 +02:00
Jo-Philipp Wich
199533a08e treewide: resync and merge master translations
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2021-06-15 10:06:26 +02:00
Jo-Philipp Wich
5ca9e86cbf rpcd-mod-luci: bump version
Fixes: a78b74784d ("rpcd-mod-luci: refactor host hint gathering")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit a26b53314db468e2a3c0c5ea4d8db4939d8eb09c)
2021-06-15 10:03:22 +02:00
Jo-Philipp Wich
e0a32b2749 rpcd-mod-luci: refactor host hint gathering
- Do not incorrectly put the IP addresses from the rrdns reply into the
   first hint, instead distribute hostnames to the appropriate hints.

 - Avoid returning stale lease information from previously parsed records
   by clearing the static struct before each parse attempt.

 - Improve existing checks for empty MAC addresses and unspecified IPv6
   addresses.

Fixes: #5126
Fixes: 87bcf9e923 ("rpcd-mod-luci: Return array of addresses in getHostHints")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit a78b74784dc1d4a4007e3e21a79228d5192f0dad)
2021-06-14 21:53:32 +02:00
Jo-Philipp Wich
2778366916 luci-mod-network: wireless.js: recognize HE* htmodes
Ref: https://bugs.openwrt.org/index.php?do=details&task_id=3856#comment9797
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 4286c84825c15f4d36f294b2ea28071667a4be7e)
2021-06-14 09:06:39 +02:00
Dirk Brenken
467b8535ae
luci-app-banip: sync with banip 0.7.9
* support the new 'ban_fetchinsecure' option
* improve the chain help text to make clear that you can assign
  multiple FW chains

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit 770548eadf21ea4c18c57b5e4ee68bf7dfa184fd)
2021-06-14 06:42:32 +02:00
Dirk Brenken
4c8ab04dcc
luci-app-adblock: sync with adblock 4.1.3
* support the new 'adb_fetchinsecure' option

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit be578c64e97d138e7104dfa7025eb9ab998b3b07)
2021-06-14 06:40:40 +02:00
Jo-Philipp Wich
bd36169e8c luci-theme-bootstrap: mobile style fixes for vlan filter matrix
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit e6a2cdbdab83f8eaefeec36ad668468ea374d471)
2021-06-13 21:50:18 +02:00
Jo-Philipp Wich
1397a1b72e luci-mod-network: small styling fixes for vlan filter matrix
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit cbf2cc396a29d6794a4d883d80f8390e227e072b)
2021-06-13 21:48:27 +02:00
Rafał Miłecki
4dff25448a luci-mod-network: migrate more device options
Include mtu and igmp_snooping while migrating.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
(cherry picked from commit fa51d04459b16245d33a1562159c65d4b03a32f0)
2021-06-13 20:12:19 +02:00
Jo-Philipp Wich
655d522a42 csstidy: update to latest Git HEAD
707feae parse_css: do not omit white space in url() property values

Ref: 6960819997 (commitcomment-52088358)
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit e266c749034310b26410cf820e95691654e18174)
2021-06-13 19:56:32 +02:00
Jo-Philipp Wich
973e80e97e luci-mod-network: reset bridge VLANs on cancelling modal dialog
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit bb3269945c7f189e1d1de1e7979d79d30a860b03)
2021-06-12 22:55:38 +02:00
Jo-Philipp Wich
7f15982c25 luci-mod-network: fix vlan filter matrix overflow after redraw
Ensure that the overflow styles are reapplied after a redraw. This also
simplifies the code as a side-effect.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 7a781d9cd8ab783dd7a5c72f154b972a9ea9aa98)
2021-06-12 22:10:15 +02:00
Jo-Philipp Wich
c7ee2c1141 treewide: resync and merge master translations
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2021-06-12 20:01:58 +02:00
Jo-Philipp Wich
12b5dd9ff3 protocols: unify TOS and TTL description strings
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(backported from commit b4c394f2d275ab093a16d994333da4f104e1723f)
2021-06-12 20:01:58 +02:00
Jo-Philipp Wich
6c6559ad05 treewide: consolidate {IPv4,IPv6,MAC} {address,gateway} spellings
- Turn IPv4-Address into IPv4 address
 - Turn IPv4-Gateway into IPv4 gateway
 - Turn IPv6-Address into IPv6 address
 - Turn IPv6-Gateway into IPv6 gateway
 - Turn MAC-Address into MAC address

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(backported from commit 88b9d843882cf52a6acf4d08a878fd005120edd4)
2021-06-12 20:01:58 +02:00
Jo-Philipp Wich
003f367e8d treewide: fix "promiscious" typo
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(backported from commit b5832d134e0e38609ea8a2d83b8aa62e0e662f24)
2021-06-12 20:01:58 +02:00
Dirk Brenken
ca66b630c0 luci-mod-system: remove bogus btn class in flash.js
* fixes #4970

Signed-off-by: Dirk Brenken <dev@brenken.org>
[omit translation sync]
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(backported from commit 8c6a29a45cba64724bd726e52719eabbfa8528a6)
2021-06-12 20:01:58 +02:00
Wojciech Jowsa
7abec3b04f luci-mod-status: check if center_chan1 is defined
Signed-off-by: Wojciech Jowsa <wojciech.jowsa@gmail.com>
(cherry picked from commit ead64c0195cd792341a6dddce7ea5e724247c60d)
2021-06-12 20:01:58 +02:00
Jo-Philipp Wich
2afd4b78c8 luci-theme-openwrt-2020: rework table styles
Target table, tr, th and td tags directly and stop using the corresponding
CSS class names.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 70571084004ede442e7f2e944d17156c83182a24)
2021-06-12 20:01:58 +02:00
Jo-Philipp Wich
d3971680ee luci-mod-network: add port status to bridge vlan filter matrix
Also ensure that port devices are ordered numerically.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 8c71b1d01ee234c5681684e9aae5f63dbe9ebb07)
2021-06-12 20:01:58 +02:00
Jo-Philipp Wich
ba57ec5fd5 luci-base: network.js: add link status information accessors
Fixes: #5121
Fixes: 8c71b1d01e ("luci-mod-network: add port status to bridge vlan filter matrix")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 1bcb12570c3b6f26009801ee6006b2ab305d088f)
2021-06-12 20:01:58 +02:00
Jo-Philipp Wich
55b3ed0833 lucihttp: update to latest Git HEAD
Fixes compilation under 32bit systems by using the proper printf format
specifier for size_t values.

Also fixes compilation with Ninja by appending instead of
overwriting CMAKE_OPTIONS.

Fixes: #5116
Suggested-by: Rosen Penev <rosenp@gmail.com>
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit d1fc11d852262bacb650a49782dbce0c8cbd572a)
2021-06-12 20:01:57 +02:00
Jo-Philipp Wich
aea75e6593 rpcd-mod-luci: add link details to ubus netdev information
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 113c0b0d26b2f60c38a605732ce4c0fb3bdfc7dc)
2021-06-12 20:01:57 +02:00