Merge tag '386.3' into dsl-master

386.3
gnuton · Jul 25, 2021 · 843ec3d · 843ec3d
2 parents 176049a + a3ce9d1
commit 843ec3d
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 18 deletions.
diff --git a/Changelog-NG.txt b/Changelog-NG.txt
@@ -1,7 +1,7 @@
 Asuswrt-Merlin 386/NG Changelog
 ===============================
 
-386.3 (xx-xxx-xxxx)
+386.3 (23-July-2021)
   - NOTE: First time you boot into this version, you need to
           either shift-reload the main index page, or clear
           your browser cache.
@@ -42,7 +42,8 @@ Asuswrt-Merlin 386/NG Changelog
   - CHANGED: Moved OpenVPN Custom settings content to JFFS, and
              increased max storage length from around 350 chars
              to 4095 chars.
-
+  - CHANGED: Added support for BCM50991 used for the 2.5G
+             interface in newer RT-AX86U revisions.
   - UPDATED: nano to 5.7.
   - UPDATED: curl to 7.76.1.
   - UPDATED: dnsmasq to 2.85-openssl.
@@ -64,6 +65,8 @@ Asuswrt-Merlin 386/NG Changelog
            failure
   - FIXED: profile.add getting used even if JFFS scripting
            was disabled (dave14305)
+  - FIXED: Freedns authentication errors would not
+           properly be reported as errors.
 
 
 386.2_6 (6-June-2021)

diff --git 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=386.3
-EXTENDNO=beta2
+EXTENDNO=0
 RCNO=0
diff --git a/release/src/router/inadyn/plugins/freedns.c b/release/src/router/inadyn/plugins/freedns.c
@@ -88,7 +88,7 @@ static char *fetch_keys(ddns_t *ctx, ddns_info_t *info)
 	trans.max_rsp_len = ctx->work_buflen - 1;	/* Save place for a \0 at the end */
 
 	rc = http_transaction(&client, &trans);
-	logit(LOG_DEBUG, "=> %s", trans.rsp_body);
+	logit((strstr(trans.rsp_body, "ERROR:") ? LOG_ERR : LOG_DEBUG), "=> %s", trans.rsp_body);
 	http_exit(&client);
 	http_destruct(&client, 1);
 
@@ -110,10 +110,15 @@ static int setup(ddns_t *ctx, ddns_info_t *info, ddns_alias_t *alias)
 
 	tmp = buf = fetch_keys(ctx, info);
 	if (!buf) {
-		logit(LOG_INFO, "Cannot find you FreeDNS account API keys");
+		logit(LOG_ERR, "Cannot find your FreeDNS account API keys");
 		return RC_ERROR;
 	}
 
+	if (strstr(buf, "Failed authenticating to fetch API keys")) {
+		free(buf);
+		return RC_DDNS_RSP_AUTH_FAIL;
+	}
+
 	for (line = strsep(&tmp, "\n"); line; line = strsep(&tmp, "\n")) {
 		int num;
 

diff --git a/release/src/router/libovpn/openvpn_control.c b/release/src/router/libovpn/openvpn_control.c
@@ -573,6 +573,8 @@ void ovpn_set_routing_rules(int unit) {
 			if (state == OVPN_STS_RUNNING || state == OVPN_STS_INIT) {
 				snprintf(buffer, sizeof (buffer), "/usr/sbin/ip rule add table ovpnc%d priority %d", unit, 10000 + unit);
 				system(buffer);
+				if (verb >= 3)
+					logmessage("openvpn-routing","Routing all traffic through ovpnc%d", unit);
 			}
 			break;
 
@@ -699,7 +701,7 @@ void ovpn_set_exclusive_dns(int unit) {
 		if (atoi(&enable[0]) == 0)
 			continue;
 
-		if (*src) {
+		if (*src && !*dst) {
 			strlcpy(buffer, src, sizeof(buffer));
 
 			if ((netptr = strchr(buffer, '/'))) {

diff --git a/release/src/router/openvpn/src/openvpn/error.c b/release/src/router/openvpn/src/openvpn/error.c
@@ -275,7 +275,10 @@ x_msg_va(const unsigned int flags, const char *format, va_list arglist)
     if (flags & M_OPTERR)
     {
         openvpn_snprintf(m2, ERR_BUF_SIZE, "Options error: %s", m1);
-        update_nvram_status(EVENT_CONF_ERROR);
+        if (flags & M_FATAL)
+        {
+            update_nvram_status(EVENT_CONF_ERROR);
+        }
         SWAP;
     }
 

diff --git a/release/src/router/rc/format.c b/release/src/router/rc/format.c
@@ -651,12 +651,5 @@ void adjust_jffs_content(void)
 		system("/bin/mv -f /jffs/ssl/* /jffs/.cert/");     /* */
 		rmdir("/jffs/ssl");
 	}
-
-/* Remove legacy 1.xxx Trend Micro signatures if present */
-#ifdef RTCONFIG_BWDPI
-	if (f_exists("/jffs/signature/rule.trf") &&
-	    f_size("/jffs/signature/rule.trf") < 50000)
-		unlink("/jffs/signature/rule.trf");
-#endif
 }
 
diff --git a/release/src/router/www/Guest_network.asp b/release/src/router/www/Guest_network.asp
@@ -411,10 +411,10 @@ function gen_gntable_tr(unit, gn_array, slicesb){
 					if(captive_portal_used_wl_array["wl" + unit_subunit] == undefined) {
 						htmlcode += '<tr><td align="center" class="gninfo_table_bottom"></td></tr>';
 
-						htmlcode += '<tfoot><div id="qrcodepanel' + unit + subunit + '" class="qrcodepanel" style="display:none; margin-left:15px;">';
+						htmlcode += '<tfoot><div id="qrcodepanel' + unit + subunit + '" class="qrcodepanel" style="display:none; width:180px; margin-left:15px;">';
 						htmlcode += '<div style="padding:10px;"><div style="text-align:center;">Scan to connect:</div>';
 						htmlcode += '<div style="margin:10px 0 10px 0px;height:2px;width:100%;padding:0;" class="splitLine"></div>';
-						htmlcode += '<div id="qr' + unit + subunit + '"></div><input style="margin-top:10px; width:100%;" type="button" class="button_gen" value="Close" onclick="hide_qr_code(\'' + unit + subunit + '\');"></div></div>';
+						htmlcode += '<div style="background-color: #596E74; padding:10px;" id="qr' + unit + subunit + '"></div><input style="margin-top:10px; width:100%;" type="button" class="button_gen" value="Close" onclick="hide_qr_code(\'' + unit + subunit + '\');"></div></div>';
 
 						htmlcode += '<tfoot><tr><td align="center" class="gninfo_table_bottom"><div id="showqrdiv' + unit + subunit + '"><span style="color:#FFCC00;cursor:pointer;text-decoration:underline" onclick="show_qr_code(\'' + unit + subunit + '\');">Show QR code</span></div>';
 						htmlcode += '</td></tr>';

diff --git a/release/src/router/www/device-map/router.asp b/release/src/router/www/device-map/router.asp
@@ -362,10 +362,10 @@ function genElement(){
 			code += '</div>';
 		}
 
-		code += '<div id="qrcodepanel' + unit + '" class="qrcodepanel" style="display:none; margin-top:-200px; margin-left:0px;">';
+		code += '<div id="qrcodepanel' + unit + '" class="qrcodepanel" style="display:none; width:180px; margin-top:-200px; margin-left:0px;">';
 		code += '<div style="padding:10px;"><div style="text-align:center;">Scan to connect:</div>';
 		code += '<div style="margin:10px 0 10px 0px;height:2px;width:100%;padding:0;" class="splitLine"></div>';
-		code += '<div id="qr' + unit +'"></div><input style="margin-top:10px; width:100%;" type="button" class="button_gen" value="Close" onclick="hide_qr_code(' + unit + ');"></div></div>';
+		code += '<div style="background-color: #596E74; padding:10px;" id="qr' + unit +'"></div><input style="margin-top:10px; width:100%;" type="button" class="button_gen" value="Close" onclick="hide_qr_code(' + unit + ');"></div></div>';
 		code += '<div style="display:none;" id="showqrdiv' + unit + '"><span style="color:#FFCC00;cursor:pointer;text-decoration:underline" onclick="show_qr_code(' + unit + ');">Show QR code</span></div>';
 		code += '</div>';
 	}