Merge pull request #6352 from nevumx/add-wireguard-peer-addresses-config

luci-proto-wireguard: adding an Addresses option to the wireguard peer config generator
(cherry picked from commit 9d746c75f4023bf3c4bcfe77eaa394fbf0188d95)

luci-proto-sstp: add support for custom port (#6634)

Add support for connecting to a custom SSTP port.
See also: https://github.com/openwrt/packages/pull/22405

Signed-off-by: Vladislav Grigoryev <vg.aetera@gmail.com>
(cherry picked from commit 85ad07c59ee3ab82ac5b55732201d17e6cc3ab9c)

luci-app-example: Update with more documentation, more examples (#6503)

* luci-app-example: Update with more documentation, examples
* Update translations file
* Move more YAML support to .md file, improve README
* luci-app-example: Update with more documentation, examples
* luci-app-example: Fix missed call to load_sample_yaml
* Format with tabs by using jsbeautify

(cherry picked from commit 28f805b2e5f95e04515bd7d045a103cc3a366c2c)

luci-proto-wireguard: Remove confirmation dialogue to generate keys (#6697)

Quality of life improvements. Reduce click amounts.
LuCI batches all changes for user-review anyway.

Tested on 23.05.0

Signed-off-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit a5786b5f2f68596b2ea8441fc8ad8ad7cf2ce2a9)

luci-lib-nixio: Fix add_luci_conffiles adding duplicate files (#6568)

* luci-lib-nixio: Fix add_luci_conffiles adding duplicate files

add_luci_conffiles does not check whether the file already exists
when adding the file, which may result in redundant backups in the
sysupgrade backup.

Signed-off-by: Xiang W <wxjstz@126.com>
(cherry picked from commit c2f679962ddf7f6545adacfcf3068370825c43a9)

luci-app-tor: Manage tor-hs onion services (#6476)

* luci-app-tor: Manage Onion services (tor-hs)

The tor-hs packages provides Tor Onion (Hidden) Services.
This is a good option to bypass NAT and have stable access to a router.

Later once the main Tor package gains a support of a Proxy/Bridge configuration.
We can add this to the same luci app as a different view.

Signed-off-by: Sergey Ponomarev <stokito@gmail.com>
(cherry picked from commit 3283cb2ebdb3dbd8ae744125ecd577a0025d14ad)

New app: luci-app-sshtunnel for SSH tunnels (#6424)

* luci-app-sshtunnel: SSH tunnels

The app helps to configure SSH tunnels.
You can also generate an SSH key and see known hosts.

Signed-off-by: Sergey Ponomarev <stokito@gmail.com>
(cherry picked from commit 7d14746ae88a83163a7e34daae70b264285bbe56)

luci-app-statistics: regenerate graphs on window resize

Currently graphs are redrawn only based on the refresh interval
(never or every 5/30/60 seconds).
Since the image size is calculated based on the window size,
redraw graphs (once) also after resizing the window.
This also captures window resize due to orientation change
(e.g., for mobile).
Since multiple resize events are fired when dragging the window
border, there is a 250ms delay for debouncing.

Signed-off-by: Rani Hod <rani.hod@gmail.com>
Tested-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit 8fcd52f5130acd1a0738ff47f9bba2c9cc42e662)

Merge pull request #6642 from vgaetera/dnsmasq-network-select

luci-mod-network: use network selector for dnsmasq instances
(cherry picked from commit aa1e049f3600f68cf2f52d8a1eb092155bfe8d8a)

Merge pull request #6651 from jjm2473/upstream/dockerman-hide-submit-on-overview

luci-app-dockerman: hide config buttons in overview page
(cherry picked from commit 568b44edb3bf545e424e7c1a3f162e753b190113)

Merge pull request #6525 from hingbong/issue-6524

luci-app-unbound: dns assist in zone-detail add 'unprotected-loop' option #6524
(cherry picked from commit e3466bd83be36bc1d62257fac3e1635fe18133ba)

Merge pull request #6734 from felagund/patch-1

 luci-mod-network: Update wireless.js to clarify Distance Optimization

(cherry picked from commit 647019cc160c394800db32ce82895245adc302ee)

Merge pull request #6712 from systemcrash/discard_text

luci-mod-network: Extend helptext for RFC1918 rebind_protection
(cherry picked from commit d75626efcdf322a2c16559c11d5a53bab6dbd8a3)

Merge pull request #6400 from vintas/patch-2

docs: fix Client side JS API docs link
(cherry picked from commit 6ddbb30ac360393a69bfc4c0566b32bd23d9bcd0)

Merge pull request #6386 from egc112/egc112-openvpn-advanced-lua

openvpn-advanced.lua request to add OpenVPN data-ciphers

(cherry picked from commit 1c5ebc2a0c635130bd4f86f65dce29a686eb24c4)

Merge pull request #6296 from jjm2473/patch-2

luci-theme-bootstrap: set scroll-margin-top for all elements
(cherry picked from commit 16470a0ab89c7bcde66e9ce7334d8e4d0a4265d0)

Merge pull request #6295 from jjm2473/patch-1

luci-mod-status: fix iptables jump on argon theme
(cherry picked from commit 706668243b8617d5c5529ac76e54f84dc57203e3)

Merge pull request #6216 from ne20002/luci-app-crowdsec-firewall-bouncer

luci-app-crowdsec-firewall-bouncer: new app
(cherry picked from commit dd3f5c65470c62ae977de047e975138195bf45e6)

luci-app-crowdsec-firewall-bouncer: add newline correction

Signed-off-by: Paul Donald <newtwen@gmail.com>
(cherry picked from commit e4dc88d875bbb63c90b71888d106b767e907140c)

Merge pull request #5631 from coudu/luci-app-nut-fixes

luci-app-nut: nut-monitor fixes
(cherry picked from commit 51a7e0b8e8db3709feccfa83176ae77372b2b1e7)

Merge pull request #5520 from acooler15/luci-lib-docker

luci-lib-docker: fix chunked decode
(cherry picked from commit 4ade6bd04c6fb29203ade9cb44ecd37ab465a2d6)

luci-proto-modemmanager: Added logging level option and debugmode

Merge github.com:valexi7/luci PR #4328

Signed-off-by: Paul Donald <newtwen@gmail.com>
Signed-off-by: valexi7 <44439515+valexi7@users.noreply.github.com>
(cherry picked from commit 1731fe12b512e10b9c061114d348cd4872422c7a)

Luci-app-usteer: First version of luci-app-usteer

Signed-off-by: Ramon Van Gorkom <github@flightfoil.com>
[most trailing whitespace errors removed]
(cherry picked from commit a6753d44e7bcff305f789e182031fb5f089a8836)

Merge pull request #6707 from ElbertMai/fix_vxlan6_ui

(cherry picked from commit 41cee29f3bc832bbadc24786f082fddfb78c009d)

Merge pull request #6698 from vgaetera/route-defaults-fix

luci-mod-network: fix route defaults
(cherry picked from commit a9849edf23a2993737c9d5f2f6a95d79b03a2eda)

treewide: Backport translations, sync

Backport from master and sync translations.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

luci-app-vnstat2: use more efficient way to get database interfaces

The currently used command "vnstat --json f 1" can be very slow when the
database contains many entries. This can result in an XHR timeout error
on the configuration page.

Use the "--dbiflist" option instead, which was added in vnStat 2.7.

Fixes: #6702
Signed-off-by: Jan Hoffmann <jan@3e8.eu>
(cherry picked from commit 3ac4f567dfdfd6ee989ceffb025241e605790b6d)

luci-lib-ip: fix creating address instances from integers

Ensure that the proper byte order is used when creating IPv4/IPv6/MAC
instances from integer values on big endian systems.

Fixes: #6678
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit ac7b37ef0133ab8349c8516d5a63a57a44dddafd)

Merge pull request #6654 from stangri/openwrt-22.03-luci-app-https-dns-proxy

[22.03] luci-app-https-dns-proxy: add status->overview include file

luci-app-https-dns-proxy: add status->overview include file

* add status->overview include file
* sync version to principal package
* minor code formatting/styling fixes for js files
* improve HTTP/2 and HTTP/3 detection in RPCD script

Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit dea2f135d7c915d46940e95a49891b945037be29)

luci-lib-jsonc: improve handling of integral numeric values

Properly deal with integral numeric values exceeding the int32_t range
by replacing the cast logic with more fine grained checks:

 - Lua numbers which are integers in the first place are directly converted
   to JSON integers

 - Finite double Lua numbers which are integral are converted to JSON
   integer values

 - All other numeric values are converted to JSON doubles

This should bring the handling of large integral value in line with the
documented behavior of turning non-fractional Lua numbers into JSON
integers.

Fixes: #6647
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit efcd4879781ee6c428b467052957534a7919d36d)

luci-mod-status: persist sorting of DHCP lease status tables

Add an ID attribute to the dynamically generated lease status tables to
persist row ordering choice across reloads.

Fixes: #6640
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 603992560c5ca4b5929047e8e8c70f901f75d7f7)

luci-base: ui.js: sorting fixes for tables initialized from markup

 - Populate id option from table id attribute
 - Update column head sort indicator in UITable.update()
 - Don't store sort state for tables without id

Ref: https://github.com/openwrt/luci/issues/6640
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit ee6a4da00b70949eccb5a0a7b69d2c5b98ef1f89)

treewide: Backport translations from master

Backport from master and sync translations.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

treewide: Backport from master and sync translations

Backport, sync.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

Merge pull request #6559 from stangri/openwrt-22.03-luci-app-https-dns-proxy

[22.03] luci-app-https-dns-proxy: rewrite in javascript

luci-app-https-dns-proxy: rewrite in javascript

Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit 6df7b92a50485d7a7c61c38c5abeaf96ad69a28c)

treewide: Backport translations from master

Backport translations from master, sync.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

Merge pull request #6488 from stangri/openwrt-22.03-luci-app-simple-adblock

[22.03] luci-app-simple-adblock: bugfix: unsupported DNS options display

luci-app-simple-adblock: bugfix: unsupported DNS options display

* bugfix: move the break tag in front of the unsupported DNS options to pretty up
  the output
* use pkg.Name in RPCD calls
* slightly change the version display in WebUI to make it consistent with other
  packages

Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit 8001cc5f2fce4b54fccca46157d42cbfca9f5894)

luci-app-banip: fix URL regex in custom feed editor

- accept special chars for BASIC AUTH in URL

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit ceb490df59d23664e409af991e578122e259a65d)

luci-app-banip: sync with banIP 0.9.0-1

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit 56bbacbeca5dcd7e71d4e2bd22c15f338f878506)
Signed-off-by: Dirk Brenken <dev@brenken.org>

luci-app-travelmate: remove unneeded dependency

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit 537a1e4f49d1e6bf167be76b606d8bdf2199e9ee)

luci-app-banip: remove unneeded dependency

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit 3dac65643cf48067bb61bb131d7206937ae6c3ad)

luci-app-adblock: remove unneeded dependency

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit e6ff6826884ecd6912bb488c21eebd500030dd47)

treewide: Backport/sync translations

Backport translations from master.
Sync.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

luci-app-banip: sync with banIP 0.8.8-1

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit 6a4831f5844ef64ebc9ba66af5cfcc9787364599)
Signed-off-by: Dirk Brenken <dev@brenken.org>

luci-app-banip: sync with banIP 0.8.7-1

* make new option 'ban_autoblocksubnet' available
* sync translations

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit e245c9c280ad53f0b796614a0b259c9551a620b3)
Signed-off-by: Dirk Brenken <dev@brenken.org>

luci-mod-network: fix incorrectly reverting vlan device name

Fixes: #6435
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit b2546c26b5b33bf3f740149dc1a52a7ad3d6ee30)

luci-mod-status: handle HE channel width for channel_analysis

Handle HE channel width for channel analysis status page and correctly
draw local interface band width.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
(cherry picked from commit 307e385ba19fff36e335d048c45fc8f667129bd8)

treewide: Backport translations from master

Backport from master, sync.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

luci-app-statistics: enhance tcpconns plugin

Modernize tcpconns plugin to match the features in collectd:

* Support summary of all ports
* 'All listening ports' can be concurrent to specified ports,
  not just alternative

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit c9c395920e424cd188a663a6c3f4acfdf8d65012)

luci-mod-network: fix dropdown clipping on diagnostics page

The default overflow hidden style for table cell elements breaks action
dropdowns on the diagnostics page.

Fixes: #6379
Fixes: 5f2d305476 ("luci-mod-network: convert diagnostic page to LuCI look and feel")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 9b12a48c3f14beafae09eca99cca5e323ae72893)

Merge pull request #6394 from stangri/openwrt-22.03-luci-app-https-dns-proxy

[22.03] luci-app-https-dns-proxy: fix curl-related error in logs

luci-app-https-dns-proxy: fix curl-related error in logs

* if curl is not installed, there used to be an error in logs from uhttpd that
  curl is not found, this commit addresses it

Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit 5553a66903a1889b52aeb2d36e3d9de455e45c2e)

luci-app-banip: sync with banIP 0.8.6-1

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit e6c3364a73001a7fda42d5504aabeb20fca12dbc)
Signed-off-by: Dirk Brenken <dev@brenken.org>

Merge pull request #6384 from stangri/openwrt-22.03-luci-app-pbr

[22.03] luci-app-pbr: opkg_get_version bugfix

luci-app-pbr: opkg_get_version bugfix

Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit f45a91013c85e8e0b21f9ba0f2f507b034152aab)

Merge pull request #6375 from stangri/openwrt-22.03-luci-app-pbr

[22.03] luci-app-pbr: update to 1.1.1-5

luci-app-banip: sync with banIP 0.8.5-1

* make new options available
* restructure some existing config options
* sync translations

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit 7b75148fe5c786ff7b368c80f8808cb070712db5)
Signed-off-by: Dirk Brenken <dev@brenken.org>

luci-app-pbr: update to 1.1.1-5

* Artificial version bump as WebUI compares version number to the principal package

Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit 831d05163448a7dabb016caa4c07fa3c122ffe60)

Merge pull request #6368 from stangri/openwrt-22.03-luci-app-pbr

[22.03] luci-app-pbr: update to 1.1.1-1

luci-app-banip: sync with banIP 0.8.4-4

* small changes
* sync translations

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit 0632f167d8008e5d013418644596e79249826362)
Signed-off-by: Dirk Brenken <dev@brenken.org>

 luci-app-banip: sync with banIP 0.8.4-3

* add new option 'ban_autoallowuplink'

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit 483229c8cf090f66605ded9c87a41a90b993d452)

Merge pull request #6328 from stangri/openwrt-22.03-luci-app-simple-adblock

[22.03] luci-app-simple-adblock: update to 1.9.5

luci-app-pbr: update to 1.1.1-1

Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit dfa792148a71f88f26ac66abd1a2d2d57c924b5e)

luci-lua-runtime: fix legacy luci-mod-rpc authentication

The split of the former `sysauth` cookie into `sysauth_http` and
`sysauth_https` ones was also imposed upon the RPC module, without
leaving the option to use just `sysauth` in place, so allow this cookie
name again for the legacy RPC logins.

Fixes: #6333
Fixes: e1932592c3 ("luci-base: use different cookie names for HTTP and HTTPS")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(backported from commit 2a9c3a3173e0cec686fb8d9fafb8c063f80958e4)

treewide: sync and merge master translations

Signed-off-by: Jo-Philipp Wich <jo@mein.io>

luci-app-nlbwmon: fix row sorting

Add raw cell values to support proper numerical row sorting.

Fixes: #6366
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 4f4ad9bff5482211695bf564543e4d34de4808d8)

luci-app-babeld: use table markup for overview tables

Fixes: #6337
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 70fb460c00d6c641a39f0cf97eb7eb846bee51e2)

luci-app-ddns: order list of DDNS service providers

Fixes: #6200
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit d9dcf98778f46f51d56d3df2a19a4245a0903b7c)

luci-base: ui.js: make upload cancellation message translatable

Resync base translation templates as well.

Fixes: #6364
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(backported from commit 6fb185f956bdda0e6fa72b2beb77a9138279f9d0)

luci-mod-system: uhttpd.js: remove flag option overrides

Use standard 0/1 values for the `redirect_https` option.

Supersedes: #6332
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 58f7b27adf0087721dcb509f16745203513e15e8)

luci-app-dockerman: gracefully handle empty registry mirror setting

Fixes: #6300
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 39d387f34c083afab9589952c6bcc9a0028cc9da)

luci-mod-network: expose peerdns option for dhcpv6

Ref: https://github.com/openwrt/luci/commit/2be01cbfcb34746d9713173a60c3f8a69c554a68#commitcomment-111035308
Fixes: 2be01cbfcb ("luci-mod-network: restrict peerdns option to protocols that implemenent it")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit b2476ba71de964828def0967793556bdb141d7e2)

luci-base: rpcd: handle swap entries in getBlockDevices

Add entries from `/proc/swaps` to the result array as well in order to
let the ui properly deal with swap files.

Fixes: #6350
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(backported from commit ad3509bf3bb5dfa79af634c841d584408068fb0a)

luci-app-banip: more feed editor improvements

* add more 'upload' and 'save' safeguards
* save only keys with values in exported JSON structure/file
* sync translations

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit d25d5c28b7daddd9cfdf650b15642f1e89b2c2e5)
Signed-off-by: Dirk Brenken <dev@brenken.org>

luci-app-banip: more feed editor improvements

* add upload safeguards
* beautify JSON output
* small translation fix

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit 7ce43d20cb51ff0e002e5fda4267c876bd4a44ce)
Signed-off-by: Dirk Brenken <dev@brenken.org>

luci-app-banip: feed editor improvements

* add the ability to up-/download a local/remote JSON feed file

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit ee3f56bd02aec46fd73f81e7470f213579534a9c)
Signed-off-by: Dirk Brenken <dev@brenken.org>

luci-app-banip: sync with banIP-0.8.4-1

* add a custom feed editor (req. >= banIP-0.8.4-1)
* various small fixes and enhancements

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit 876c9b292d0a5d3915dd6e085a0a3c0dbe3f16ac)
Signed-off-by: Dirk Brenken <dev@brenken.org>

luci-app-banip: sync with banIP 0.8.3-1

* requires the latest banIP backend (>= 0.8.3-1)
* sync translations

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit 31def1846db019f66c432b043ca9cac5111bf578)
Signed-off-by: Dirk Brenken <dev@brenken.org>

luci-app-simple-adblock: update to 1.9.5

* update to support corresponding principal package

Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit b7be432ba79e1320661a7a92d2203358bcbde88c)

timezone data: update to 2023c

Update timezone data to 2023a, 2023b, 2023c.
(2023c reverts 2023b.)

https://mm.icann.org/pipermail/tz-announce/2023-March/000077.html
https://mm.icann.org/pipermail/tz-announce/2023-March/000078.html
https://mm.icann.org/pipermail/tz-announce/2023-March/000079.html

Summary:
* Egypt now uses DST again, from April through October.
* Much of Greenland still uses DST from 2024 on.
* America/Yellowknife now links to America/Edmonton. (removed here)
* Europe/Kirov and Europe/Volgograd now use the abbreviations MSK/MSD

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

treewide: sync and merge master translations

Signed-off-by: Jo-Philipp Wich <jo@mein.io>

luci-app-omcproxy: relax menu dependencies

The uci configuration may be completely empty, so adjust the menu dependency
to check the existence of the configuration file itself instead.

Fixes: #6301
Supersedes: #6304
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit e1fa41ec15c66d1d26913b4394af48f5809d6d86)

luci-proto-openconnect: relax key checking

Valid keys may begin/end with `-----BEGIN PRIVATE KEY-----` and
`-----END PRIVATE KEY-----` so make the `RSA` keyword optional.

Fixes: #6319
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit b8ee30589bd3e9037e7c7a8a5a1e8c1048afaf2f)

luci-theme-bootstrap: File input background color

Remove the white background color for the file input elements, this way it'll use the default color defined for input elements, matching the light/dark theme.

Signed-off-by: Santiago Kozak <santikzk1406@gmail.com>
(cherry picked from commit d94a7285e57eba268764490ab8317d12e24ecd5f)

luci-proto-modemmanager: fix acl regex to support more then 9 modem objects

If a modem is restarted often, the modem manager object number is
increased by one. Currently, the regex is set so that the modem can no
longer be selected if the object number is greater than 9. This change
fixes that.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
[replace wildcard with rule duplication to disallow option injection]
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 71b7ecb7770e11168f02e53b00195c94cee9b28e)

luci-mod-network: add stricter wireless interface name validation

Linux wireless interface names have the following restrictions:

 * It must not be an empty string
 * It must not be '.' or '..'
 * It must not contain any /, : or space character ( , \t, \n, ...)
 * It must be less than 16 chars
 * It likely must not contain any % either

Fixes: 8673aef8db ("luci-mod-network: remove uciname validation from wireless interface")
Signed-off-by: Glenn Washburn <development@efficientek.com>
[reword validation error messages, remove extended description text as it would be
 shown as part of the validation errors]
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 6ad6a241c32ebd4d62f6021a2e3cbe4e1bc192c2)

application/luci-app-firewall: fix null access

Fixes: 48086e1c7b ("luci-app-firewall: Add ipset field to snats")
Fixes: d0d891c23e ("luci-app-firewall: Add ipset field to forwards (redirects)")
Fixes: f407a013ba ("luci-app-firewall: Add ipset field to rules")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 7a4afdcb05ad69fd9c0e39de9b44a59ad31130a7)

luci-app-firewall: add masq6 option for zones

Allow configure Masquerading6 via LuCI interface.

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit ef288b791d4455478f6244f2d41c3aac55271226)

luci-app-firewall: Add ipset field to snats

Signed-off-by: Paul Dee <itsascambutmailmeanyway@gmail.com>
(cherry picked from commit 48086e1c7b3e7094b6fbe61335209189b1006bfb)

luci-app-firewall: Add ipset field to forwards (redirects)

Signed-off-by: Paul Dee <itsascambutmailmeanyway@gmail.com>
(cherry picked from commit d0d891c23eb65da42ae6c1b8f0156e971abea5b3)

luci-app-firewall: Add ipset field to rules

Signed-off-by: Paul Dee <itsascambutmailmeanyway@gmail.com>
(cherry picked from commit f407a013ba1e889ba4cd09eaf456724cb41e1537)

luci-app-firewall: implement IPsets GUI

Enable it and place it between snats and custom tabs

Tested on 22.03.2, 22.03.3

Signed-off-by: Paul Dee <itsascambutmailmeanyway@gmail.com>
(cherry picked from commit 0484343903e9c284766044c2542fed1bc89b34e3)

luci-app-firewall: allow ipv6 setup

Allow setup ipv6 for Port Forwards and NAT Rules if firewall4 is
used.

Add 'Restrict to address family' option for NAT Rules, if family is
any/empty , assume it is ipv4. this allow setup NAT6 rules in web ui

Signed-off-by: Chen Minqiang <ptpt52@gmail.com>
(cherry picked from commit 9c55500fe8efa309d55f34c21d5ae2bf69fabf06)

luci-app-firewall: suppress lengthy masq description in zone table

Ensure that the description of the masquerade option does not end up in
the grid section overview as it messes up the table layout.

Fixes: c54efde717 ("luci-app-firewall: Add clarification to masquerading option")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit c0d4c0172529e060926e8fa00714bd9e8b567cb4)

luci-app-firewall: extend icmpv6 types available

luci complement to https://github.com/openwrt/firewall4/commit/e6e82a55206cf7017f26b92f7097f779161b5cac

Tested on 22.03.3

Signed-off-by: Paul Dee <itsascambutmailmeanyway@gmail.com>
(cherry picked from commit 88a016cbff7eacf3a8248bc4949904abacef6685)

luci-app-firewall: remove the '', 'any' mapping in icmpv6 entries

This prevents its inconsistent checked/unchecked behaviour when exiting
and re-entering the dialogue.

Tested on 22.03.3

Signed-off-by: Paul Dee <itsascambutmailmeanyway@gmail.com>
(cherry picked from commit 7bf1c2daa02c070e6c8b76eadadd1648ed592851)

luci-app-dawn: fix crash issue when viewing hearing map

When viewing the hearing map, sometimes a crash will happen when one of the
routers suddenly cannot view a client. This PR simply checks that the radio
frequency in data2 is not 0, and skips the entry if it is a 0.

Submitted-by: Brian Coverstone <brian@mainsequence.net>
[fix commit subject, add commit description]
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 2221110c17c2799948209463590618190cce8808)

luci-app-bcp38: migration to JavaScript

- One to one migration of lua based package to JavaSript.

Signed-off-by: S. Brusch <ne20002@gmx.ch>
(cherry picked from commit a159d98f97b56f80d3211c56f19d8b3db0adaec4)