From 2b0654c7d9362cf9aef3c16c893651dc35fb9e16 Mon Sep 17 00:00:00 2001 From: Eric Sauvageau Date: Sat, 28 Dec 2019 14:19:22 -0500 Subject: [PATCH 01/12] Bumped revision to 384.14_1 --- release/src-rt/version.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/src-rt/version.conf b/release/src-rt/version.conf index 9d0ba147a38..5935b8d98b2 100644 --- a/release/src-rt/version.conf +++ b/release/src-rt/version.conf @@ -1,5 +1,5 @@ KERNEL_VER=3.0 FS_VER=0.4 SERIALNO=384.14 -EXTENDNO=0 +EXTENDNO=1 RCNO=0 From 8d832c2cbb64bfedd91309388889f73d25fa0559 Mon Sep 17 00:00:00 2001 From: Eric Sauvageau Date: Sat, 28 Dec 2019 14:36:11 -0500 Subject: [PATCH 02/12] getdns: provide explicit path to OpenSSL 1.1.1 (fixes regression fom GPL 81044 merge) --- release/src/router/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/release/src/router/Makefile b/release/src/router/Makefile index 097a084f2bc..781e3d6d3be 100644 --- a/release/src/router/Makefile +++ b/release/src/router/Makefile @@ -2923,9 +2923,9 @@ getdns-configure: getdns/configure --enable-static --disable-shared --disable-gost \ --enable-stub-only --without-libidn --without-libidn2 \ --without-getdns_query --without-getdns_server_mon --with-stubby \ - --with-ssl=$(STAGEDIR)/usr --with-libyaml=$(STAGEDIR)/usr \ - CFLAGS="-Os -I$(STAGEDIR)/usr/include -ffunction-sections -fdata-sections $(EXTRACFLAGS)" \ - LDFLAGS="-L$(STAGEDIR)/usr/lib -Wl,--gc-sections $(EXTRALDFLAGS)" \ + --with-ssl=$(TOP)/$(OPENSSL) --with-libyaml=$(STAGEDIR)/usr \ + CFLAGS="-Os -I$(TOP)/$(OPENSSL)/include -I$(STAGEDIR)/usr/include -ffunction-sections -fdata-sections $(EXTRACFLAGS)" \ + LDFLAGS="-L$(TOP)/$(OPENSSL) -L$(STAGEDIR)/usr/lib -Wl,--gc-sections $(EXTRALDFLAGS)" \ LIBS="-lcrypto -lssl -lyaml" getdns: $(OPENSSL) libyaml getdns/Makefile From 73c8e86ace81ad01cbe67c649e36cae6359067b8 Mon Sep 17 00:00:00 2001 From: Eric Sauvageau Date: Sun, 29 Dec 2019 01:27:39 -0500 Subject: [PATCH 03/12] rc: fail wanduck (and possibly other services) failing to start due to ate_mode check --- release/src/router/rc/check_watchdog.c | 2 ++ release/src/router/rc/init.c | 5 ++++- release/src/router/rc/services.c | 6 ++++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/release/src/router/rc/check_watchdog.c b/release/src/router/rc/check_watchdog.c index 95ff70a4996..b172c917ca1 100644 --- a/release/src/router/rc/check_watchdog.c +++ b/release/src/router/rc/check_watchdog.c @@ -45,8 +45,10 @@ void check_watchdog() if (g_reboot || g_upgrade) return; +#if 0 if (ate_factory_mode()) return; +#endif ret = stat("/tmp/watchdog_heartbeat", &sb); time(&now); diff --git a/release/src/router/rc/init.c b/release/src/router/rc/init.c index e086662d810..5e76a45b912 100644 --- a/release/src/router/rc/init.c +++ b/release/src/router/rc/init.c @@ -2025,9 +2025,12 @@ static pid_t run_shell(int timeout, int nowait) if (waitfor(STDIN_FILENO, timeout) <= 0) return 0; +#if 0 if (ate_factory_mode()) argv = argv_shell; - else if (!check_if_file_exist("/etc/shadow")) + else +#endif + if (!check_if_file_exist("/etc/shadow")) setup_passwd(); switch (pid = fork()) { diff --git a/release/src/router/rc/services.c b/release/src/router/rc/services.c index 1ab8544688a..47256f00772 100644 --- a/release/src/router/rc/services.c +++ b/release/src/router/rc/services.c @@ -2747,7 +2747,9 @@ int start_wlceventd(void) if (factory_debug()) #endif #else +#if 0 if (IS_ATE_FACTORY_MODE()) +#endif #endif return ret; @@ -2816,7 +2818,9 @@ int start_wlc_nt(void) if (factory_debug()) #endif #else +#if 0 if (IS_ATE_FACTORY_MODE()) +#endif #endif return ret; @@ -9234,8 +9238,10 @@ int start_wanduck(void) return 0; #endif +#if 0 if(ate_factory_mode()) return 0; +#endif if(!strcmp(nvram_safe_get("wanduck_down"), "1")) return 0; From 6c4196a268c3a3002673f1647a3eeba752e53263 Mon Sep 17 00:00:00 2001 From: Eric Sauvageau Date: Sun, 29 Dec 2019 02:11:37 -0500 Subject: [PATCH 04/12] rstats: revert some of the 384_81044 changes in an attempt to resolve the traffic spikes --- release/src/router/rstats/rstats.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/release/src/router/rstats/rstats.c b/release/src/router/rstats/rstats.c index 62b8a8c6ca9..63b95676570 100755 --- a/release/src/router/rstats/rstats.c +++ b/release/src/router/rstats/rstats.c @@ -626,7 +626,7 @@ static void save_speedjs(long next) FILE *f; uint64_t total; uint64_t tmax; - unsigned long long n; + unsigned long n; char c; if ((f = fopen("/var/tmp/rstats-speed.js", "w")) == NULL) return; @@ -645,7 +645,7 @@ static void save_speedjs(long next) for (k = 0; k < MAX_NSPEED; ++k) { p = (p + 1) % MAX_NSPEED; n = sp->speed[p][j]; - fprintf(f, "%s%llu", k ? "," : "", n); + fprintf(f, "%s%lu", k ? "," : "", n); total += n; if (n > tmax) tmax = n; } @@ -848,8 +848,8 @@ static void calc(void) time_t now; time_t mon; struct tm *tms; - unsigned long long c; - unsigned long long sc; + uint32_t c; + uint32_t sc; unsigned long long diff; long tick; int n; @@ -983,7 +983,7 @@ static void calc(void) /* retrieve vlan-if counters again for bcm5301x case */ #if defined(RTCONFIG_BCM5301X_TRAFFIC_MONITOR) if(strncmp(ifname, "vlan", 4)==0){ - traffic_wanlan(ifname, (uint32_t*) &counter[0], (uint32_t*) &counter[1]); + traffic_wanlan(ifname, &counter[0], &counter[1]); } #endif @@ -1110,7 +1110,7 @@ static void calc(void) c = tmp->counter[i]; sc = sp->last[i]; if (c < sc) { - diff = ((~0ULL) - sc + 1) + c; + diff = (0xFFFFFFFF - sc + 1) + c; if (diff > MAX_ROLLOVER) diff = 0; } else { From 9132036d7d9dd80f85ffd880b64179e355bfbf41 Mon Sep 17 00:00:00 2001 From: Eric Sauvageau Date: Mon, 30 Dec 2019 20:23:52 -0500 Subject: [PATCH 05/12] rc: log if router is in manufacturing mode at wanduck launch --- release/src/router/rc/services.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/release/src/router/rc/services.c b/release/src/router/rc/services.c index 47256f00772..3a7cc6ede6b 100644 --- a/release/src/router/rc/services.c +++ b/release/src/router/rc/services.c @@ -9238,10 +9238,9 @@ int start_wanduck(void) return 0; #endif -#if 0 if(ate_factory_mode()) - return 0; -#endif + logmessage("wanduck", "WARNING - router is in manufacturing mode, and can behave unexpectedly (did you mess with your bootloader?)"); + //return 0; if(!strcmp(nvram_safe_get("wanduck_down"), "1")) return 0; From 35d1fd1184220581e0bc46e2cb212f7ccffd1b1f Mon Sep 17 00:00:00 2001 From: Eric Sauvageau Date: Mon, 30 Dec 2019 20:30:07 -0500 Subject: [PATCH 06/12] Updated documentation --- Changelog-NG.txt | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Changelog-NG.txt b/Changelog-NG.txt index 20c82382204..66b87261886 100644 --- a/Changelog-NG.txt +++ b/Changelog-NG.txt @@ -1,6 +1,17 @@ Asuswrt-Merlin 384/NG Changelog =============================== +384.14_2 (xx-xxx-xxxx) + - FIXED: stubby was linked with OpenSSL 1.0 instead of 1.1 + - FIXED: some routers were reporting the Internet connection being + disconnected. If you were affected and you had flashed + a customized bootloader, then please reflash your original + bootloader, as your modded bootloader is invalid, and other + potential issues may appear over time. + - FIXED: Random traffic spikes logged in Traffic Monitor (regression + from 384_81351) + + 384.14 (14-Dec-2019) - NEW: Implement option to prevent Firefox's automatic usage of DoH. By default, this will only apply if you have DNSPrivacy From 5fa7992874daf7cb9b38e8e592f047af38fe69ab Mon Sep 17 00:00:00 2001 From: Eric Sauvageau Date: Tue, 24 Dec 2019 21:40:18 -0500 Subject: [PATCH 07/12] rc: fix bad GPL merge --- release/src/router/rc/wan.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/release/src/router/rc/wan.c b/release/src/router/rc/wan.c index b6395387f7b..1d82ab7f163 100644 --- a/release/src/router/rc/wan.c +++ b/release/src/router/rc/wan.c @@ -3470,6 +3470,12 @@ start_wan(void) _dprintf("%s: start_wan_if(%d)!\n", __FUNCTION__, unit); start_wan_if(unit); } +#ifdef RTCONFIG_HND_ROUTER + else if(!strcmp(wans_mode, "fo") || !strcmp(wans_mode, "fb")){ + _dprintf("%s: stop_wan_if(%d) for IFUP only!\n", __func__, unit); + stop_wan_if(unit); + } +#endif } } #else // RTCONFIG_DUALWAN @@ -4057,12 +4063,6 @@ void detwan_apply_wan(const char *wan_ifname, unsigned int wan_mask, unsigned in eval("ifconfig", ifname, "up"); } } -#ifdef RTCONFIG_HND_ROUTER - else if(!strcmp(wans_mode, "fo") || !strcmp(wans_mode, "fb")){ - _dprintf("%s: stop_wan_if(%d) for IFUP only!\n", __func__, unit); - stop_wan_if(unit); - } -#endif } } From bfe637c825eb9e1d2aae97baf92d79c908768ef8 Mon Sep 17 00:00:00 2001 From: Eric Sauvageau Date: Tue, 24 Dec 2019 21:44:55 -0500 Subject: [PATCH 08/12] rc: remove no longer required kludge for STP on HND models --- release/src/router/rc/lan.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/release/src/router/rc/lan.c b/release/src/router/rc/lan.c index 68ae564b32e..f089930f74a 100644 --- a/release/src/router/rc/lan.c +++ b/release/src/router/rc/lan.c @@ -1330,10 +1330,8 @@ void start_lan(void) eval("brctl", "stp", lan_ifname, "0"); #endif -#if 0 // Kludge, requires 81116 blobs #ifdef HND_ROUTER hnd_set_hwstp(); -#endif #endif set_iface_ps(lan_ifname, 3); From 9edb5b64e8adf0f427905a14dc0ea36395c7a1c4 Mon Sep 17 00:00:00 2001 From: Eric Sauvageau Date: Tue, 24 Dec 2019 22:02:10 -0500 Subject: [PATCH 09/12] build: re-add cifs.ko module (lost with GPL 81044 merge) --- release/src/router/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/src/router/Makefile b/release/src/router/Makefile index 781e3d6d3be..2089e5abc2b 100644 --- a/release/src/router/Makefile +++ b/release/src/router/Makefile @@ -1983,7 +1983,7 @@ ifneq ($(RTCONFIG_USB_EXTRAS),y) @rm -rf $(TARGETDIR)/lib/modules/*/kernel/drivers/connector || true @rm -rf $(TARGETDIR)/lib/modules/*/kernel/drivers/block || true endif - $(if $(or $(RTCONFIG_CIFS),$(RTCONFIG_APP_FILEFLEX)),@cp -f,@mv) $(TARGETDIR)/lib/modules/*/kernel/fs/cifs.*o $(PLATFORMDIR)/extras/ || true +# $(if $(or $(RTCONFIG_CIFS),$(RTCONFIG_APP_FILEFLEX)),@cp -f,@mv) $(TARGETDIR)/lib/modules/*/kernel/fs/cifs.*o $(PLATFORMDIR)/extras/ || true @cp -f $(TARGETDIR)/lib/modules/*/kernel/fs/cifs.*o $(PLATFORMDIR)/extras/ || true $(if $(or $(RTCONFIG_BRCM_NAND_JFFS2),$(RTCONFIG_JFFS2)),$(if $(RTCONFIG_JFFSV1),@mv,@cp -f),@mv) $(TARGETDIR)/lib/modules/*/kernel/fs/jffs2.*o $(PLATFORMDIR)/extras/ || true $(if $(or $(RTCONFIG_BRCM_NAND_JFFS2),$(RTCONFIG_JFFS2)),$(if $(RTCONFIG_JFFSV1),@mv,@cp -f),@mv) $(TARGETDIR)/lib/modules/*/kernel/lib/zlib_*.*o $(PLATFORMDIR)/extras/ || true From 1d31ab3018f8076ff138cf4baebdadfdbb06d9af Mon Sep 17 00:00:00 2001 From: Eric Sauvageau Date: Mon, 30 Dec 2019 01:41:38 -0500 Subject: [PATCH 10/12] webui: hide _0 extendno from firmware versions returned by cfg_sync --- release/src/router/www/Advanced_FirmwareUpgrade_Content.asp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/release/src/router/www/Advanced_FirmwareUpgrade_Content.asp b/release/src/router/www/Advanced_FirmwareUpgrade_Content.asp index dc9eb44cb24..180b5d749fb 100644 --- a/release/src/router/www/Advanced_FirmwareUpgrade_Content.asp +++ b/release/src/router/www/Advanced_FirmwareUpgrade_Content.asp @@ -226,7 +226,7 @@ function initial(){ html += ""; html += ""; if (check_is_merlin_fw(fwver)) - html += "
<#ADSL_FW_item1#> : " + fwver.replace("3.0.0.4.", "") + "
"; + html += "
<#ADSL_FW_item1#> : " + fwver.replace("3.0.0.4.", "").replace("_0","") + "
"; else html += "
<#ADSL_FW_item1#> : " + fwver + "
"; html += "
"; @@ -1074,7 +1074,7 @@ function update_AiMesh_fw() { var online = get_cfg_clientlist[idx].online; var mac_id = mac.replace(/:/g, ""); if (check_is_merlin_fw(fwver)) - $("#amas_" + mac_id + "").children("#current_version").html("<#ADSL_FW_item1#> : " + fwver.replace("3.0.0.4.","") + ""); + $("#amas_" + mac_id + "").children("#current_version").html("<#ADSL_FW_item1#> : " + fwver.replace("3.0.0.4.","").replace("_0","") + ""); else $("#amas_" + mac_id + "").children("#current_version").html("<#ADSL_FW_item1#> : " + fwver + ""); $("#amas_" + mac_id + "").children("#manual_firmware_update").empty(); From 91f5f746480696e623ef53f659d9b96a7cf2535d Mon Sep 17 00:00:00 2001 From: Eric Sauvageau Date: Tue, 31 Dec 2019 22:20:10 -0500 Subject: [PATCH 11/12] Updated documentation --- Changelog-NG.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Changelog-NG.txt b/Changelog-NG.txt index 66b87261886..768d3328471 100644 --- a/Changelog-NG.txt +++ b/Changelog-NG.txt @@ -1,7 +1,8 @@ Asuswrt-Merlin 384/NG Changelog =============================== -384.14_2 (xx-xxx-xxxx) +384.14_2 (1-1-2020) + - FIXED: Missing cifs kernel module - FIXED: stubby was linked with OpenSSL 1.0 instead of 1.1 - FIXED: some routers were reporting the Internet connection being disconnected. If you were affected and you had flashed From 45ae9b6918309eba58c447558fcc80ff22e953f2 Mon Sep 17 00:00:00 2001 From: Eric Sauvageau Date: Tue, 31 Dec 2019 22:20:33 -0500 Subject: [PATCH 12/12] Bumped revision to 384.14_2 --- release/src-rt/version.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/src-rt/version.conf b/release/src-rt/version.conf index 5935b8d98b2..993ee17901d 100644 --- a/release/src-rt/version.conf +++ b/release/src-rt/version.conf @@ -1,5 +1,5 @@ KERNEL_VER=3.0 FS_VER=0.4 SERIALNO=384.14 -EXTENDNO=1 +EXTENDNO=2 RCNO=0