Merge branch 'dsl-ac68u-384.14_2-mainline' into dsl-ac68u

Changelog-NG.txt

@@ -1,6 +1,18 @@
 Asuswrt-Merlin 384/NG Changelog
 ===============================
 
+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
+           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

release/src-rt/version.conf

@@ -1,5 +1,5 @@
 KERNEL_VER=3.0
 FS_VER=0.4
 SERIALNO=384.14
-EXTENDNO=0
+EXTENDNO=2
 RCNO=0

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
@@ -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

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);

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()) {

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);

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;
 
@@ -9235,7 +9239,8 @@ int start_wanduck(void)
 #endif
 
 	if(ate_factory_mode())
-		return 0;
+		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;

release/src/router/rc/wan.c

@@ -3469,6 +3469,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
@@ -4056,12 +4062,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
 		}
 	}
 

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 {

release/src/router/www/Advanced_FirmwareUpgrade_Content.asp

@@ -226,7 +226,7 @@ function initial(){
 				html += "</th>";
 				html += "<td id='amas_" + mac_id + "'>";
 				if (check_is_merlin_fw(fwver))
-					html += "<div id='current_version'><#ADSL_FW_item1#> : " + fwver.replace("3.0.0.4.", "") + "</div>";
+					html += "<div id='current_version'><#ADSL_FW_item1#> : " + fwver.replace("3.0.0.4.", "").replace("_0","") + "</div>";
 				else
 					html += "<div id='current_version'><#ADSL_FW_item1#> : " + fwver + "</div>";
 				html += "<div id='manual_firmware_update'>";
@@ -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();