Changes:
- different approach to calculate execution time and make it hopefully compatible with a reboot
- added missing </b> in status-gui
- some greptimisation
- fixed handling of quoted lines in blacklist custom and whitelist and mapped files
- ignoring leading spaces (if any) from blacklist custom and whitelist and mapped files
- extend the leading spaces pruning to variables populated from NVRAM
- statically map grep and set to the version under /bin to avoid conflict with entware
- introduced "upgrade" function
- introduced "upgrade" silent function (no question asked)
- logw warning message when Custom path = /jffs
- match, log and skip Easylist format as part of the parsefile()
- extend the parsefile analisis to the first 500 unquoted lines
- minor tweak to the alias "domain"
- handle quoted text when this starts from the middle of the line
- shaffles code around for the parsing routing, removing comments first then checking the first 50 lines
- removed leftover <br> from the status-gui
- automatic removal of leftover list/headers from perm storage when not used and 15days+ old
- increase top of the list analysis from 50 to 500 lines on all the elif conditions
- reporting efficiency now uses lines and not bytes, also reports with double decimal e.g.: 0.78% and total line pruned e.g. 1033 lines
- corrected "- gt" typo to "-gt"
- removed the auto-pruning and it came with a "find" issue also it was not compatible with list-of-lists
- increase top of the list analysis from 50 to 500 lines (helps with lists that start with extensive comments)
- renamed "Adblock file" to "Blockfile" in GUI and command line status
- corrected some typos
- exclude blank lines custom/white when fetching content from nvram
- reclassified few messages from debug to info
- CheckRam() "would not fit" messages are now logged as errors
- configuration check for black_custom/whitelist are now excluding any quoted-line/extra-space from the comparison
- Black_custom & Whitelist procedures are run conditionally, e.g. skipped if empty
- automatically prune *.list/*.headers from custom path when they are not enabled and the file date is older than 14 days
Thanks @rs232
For Info:
6.37 RC14.126
wl0: Feb 21 2023 19:39:48 version 6.37.14.126 (r561982)
previous wireless driver:
6.37 RC14.126
wl0: Jan 18 2022 09:11:39 version 6.37.14.126 (r561982)
Note: repair the following commit
bd93ef93e9
- with some services, like the PPTPD, FTPD, their rules will be placed after the logdrop rule. The result is incorrectly dropping packets for valid services
- Introduced new test routine
- Aligned the help output from command line to reflect the above
- Allow for URLs to have leading spaces (reduces unwanted errors)
- Added warning icon on the GUI when last run errors is greater than 0
- Tweaked command line colors
- Removed <li> references from the GUI and cleared up HTML warnings
Because of a wl driver bug, we need to revert for now.
Problem/Issue:
A wlan 5 GHz SSID >= 19 characters will cause a reboot-loop for:
- Media Bridge Mode
- Wireless Ethernet Bridge Mode
- Wireless Client Mode
==> recovery needed!
Further Notes:
AP Mode working correct;
AsusWRT-Merlin 386.9 (06-01-2023) does have the same problem (only Media Bridge possible to test)
big THX to ClixTrix for testing/helping/debugging :)
This reverts commit 12ea51b0c8.
- Split script messages into correct syslog level (debug/info/notification/error)
- Enhanced logging for better troubleshooting
- General optimization/speedup and code enhancement
- Introduced three routines to try to control memory usage and prevent issues: checkList(), checkRam() and safeDnsmasqRestart()
- New status/help command line function
- New reset/clear/snapshot/trace/enable/disable functions
- Handles whitelisted subdomains when its parent domain is blacklisted
- Strict whitelisted domain: no auto child resolution. Domains needs to be defined with a prefix '%' e.g. "%test.example.com"
- Custom-blacklist forced pruning. Domains defined with prepending + will force any defined subdomain to be pruned from the blockfile
- Handles user defined files with Windows/Unix EOL and missing EOL's CR
- New Snapshot and trace function facilitate the debugging
- Enhanced command line operation: 'adblock help' is your friend
- GUI integration
- Maximum filesize user definable from the GUI
- Custom path can be defined to operate the script e.g. on USB leaving RAM headroom for dnsmasq (and much larger domain lists)
- Custom path will also prevent unnecessary downloads if the source list hasn't been updated since the last download
- Quick recover of blocklist after a reboot
- Change in the script logic, when path is defined an attempt to update will result into a check first and the actual update is performed only when needed (e.g. one of the lists was updated or the relevant nvram variables have changed)
- Supports multiple lists format and is able to extract domains from any part of an unquoted line. Easylist format is tolerated but will lead to a number of false positives.
- Allow feeding of custom-blacklist and whitelists from local file (reduce nvram usage). Just define /path/file in the relevant GUI field -
- Adblock is automatically run in debug (a.k.a. trace mode) when loglevel=7 and putput found under /tmp/adblock.debug...
- Imposed hold-time of 30min betwen updates to prevent false calls
- Removed the now-unneccessary other hold-times found in v1
- lists are now populated with --local attribute instead of --address (15% RAM saving)
This version if fully backward compatible with v1 this means the user is not expected to change amy settings to make this working even in case of dirty firmware upgrade.
* A big thank you to @PetervdM for the support and testing
Note: keep alive always now in Media Bridge mode and avoid problems with inactivity (--> no delete / add interface anymore)
improve commits
7c37484945b5f9f02a44
For Info:
Dongle Host Driver, version 1.363.2 (r665954)
Compiled in drivers/net/wireless/bcmdhd on Dec 26 2022 at 16:38:58
previous wireless driver:
Dongle Host Driver, version 1.363.2 (r665954)
Compiled in drivers/net/wireless/bcmdhd on Jan 18 2022 at 09:17:27
For Info:
Dongle Host Driver, version 1.194.33 (r526004)
Compiled in drivers/net/wireless/bcmdhd on Jan 12 2023 at 10:15:07
previous wireless driver:
Dongle Host Driver, version 1.194.33 (r526004)
Compiled in drivers/net/wireless/bcmdhd on May 1 2021 at 04:53:56
Note:
wlc_clm_data.c not changed (WL Countries)
For Info:
6.37 RC14.126
wl0: Nov 19 2022 06:49:04 version 6.37.14.126 (r561982)
previous wireless driver:
6.37 RC14.126
wl0: Jan 18 2022 09:11:39 version 6.37.14.126 (r561982)
Note: SDK6 NG-branch update has been merged back to master-branch, so no need to distinguish or highlight anymore (align to SDK7 / SDK714)
see 9b376f68c1
- Fix building only client or server: 7a53c7f0f4
- Add missing break in switch: 39d955c49f
- Fix so DROPBEAR_DSS is only forced for fuzzing: c043efb47c
M_ars
pedro
rs232
desertkun