From 2bef51ec5840970690f5541a686e28b020c50f03 Mon Sep 17 00:00:00 2001
From: caicaicai21 <caicaicai21@outlook.com>
Date: Fri, 3 Jan 2020 10:25:38 +0800
Subject: [PATCH 1/3] luci-app-ssr-plus: optimize subscription process (#2673)

---
 .../root/usr/share/shadowsocksr/subscribe.sh                 | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/subscribe.sh b/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/subscribe.sh
index 4323a46893..6559f658f4 100755
--- a/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/subscribe.sh
+++ b/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/subscribe.sh
@@ -211,6 +211,11 @@ do
                         			ssr_remarks="$ssr_host:$ssr_port";
                     			fi
 
+							if [ -z "$ssr_host" ];then # 丢弃没有host的无效服务器信息，例如：剩余流量xxx
+								echo_date "丢弃无效节点：【$ssr_remarks】"
+								continue
+							fi
+
                     			uci_name_tmp=$(uci show $name | grep -w "$ssr_hashkey" | awk -F . '{print $2}')
 		    	   		if [ -z "$uci_name_tmp" ]; then # 判断当前服务器信息是否存在
                         			uci_name_tmp=$(uci add $name servers)

From ad9d6b177fc2c355a7889b877c5bc1fa94ff8490 Mon Sep 17 00:00:00 2001
From: outemancut <53339509+outemancut@users.noreply.github.com>
Date: Fri, 3 Jan 2020 10:26:01 +0800
Subject: [PATCH 2/3] Update 02_network (#2672)

---
 target/linux/ipq40xx/base-files/etc/board.d/02_network | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/target/linux/ipq40xx/base-files/etc/board.d/02_network b/target/linux/ipq40xx/base-files/etc/board.d/02_network
index ad1766ea73..f51be5a8ff 100755
--- a/target/linux/ipq40xx/base-files/etc/board.d/02_network
+++ b/target/linux/ipq40xx/base-files/etc/board.d/02_network
@@ -72,8 +72,8 @@ ipq40xx_setup_macs()
 		;;
 	p2w,r619ac|\
 	p2w,r619ac-128m)
-		w_mac=$(cat /sys/class/net/eth0/address)
-		l_mac=$(macaddr_add "$wan_mac" 1)
+		wan_mac=$(cat /sys/class/net/eth0/address)
+		lan_mac=$(macaddr_add "$wan_mac" 1)
 		;;
 	linksys,ea6350v3)
 		wan_mac=$(mtd_get_mac_ascii devinfo hw_mac_addr)

From 251d68183d6113d32578ee49d136269d5f00a926 Mon Sep 17 00:00:00 2001
From: rinho1239104 <1239104@gmail.com>
Date: Fri, 3 Jan 2020 10:26:20 +0800
Subject: [PATCH 3/3] Update adblack.conf (#2671)

---
 .../root/usr/share/adbyby/adblack.conf            | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/package/lean/luci-app-adbyby-plus/root/usr/share/adbyby/adblack.conf b/package/lean/luci-app-adbyby-plus/root/usr/share/adbyby/adblack.conf
index a532f5825b..4e32a6d42f 100644
--- a/package/lean/luci-app-adbyby-plus/root/usr/share/adbyby/adblack.conf
+++ b/package/lean/luci-app-adbyby-plus/root/usr/share/adbyby/adblack.conf
@@ -12,3 +12,18 @@ jellyfish.pandora.xiaomi.com
 gallery.pandora.xiaomi.com
 o2o.api.xiaomi.com
 bss.pandora.xiaomi.com
+auth.api.gitv.tv
+misc.pandora.xiaomi.com
+tvapi.kuyun.com
+tv.aiseet.atianqi.com
+vv.play.aiseet.atianqi.com
+alog.umeng.com
+pandora.mi.com
+tvapi.kuyun.com
+sdkconfig.ad.xiaomi.com
+assistant.pandora.xiaomi.com
+tracking.miui.com
+misc.pandora.xiaomi.com
+omgmta.play.aiseet.atianqi.com
+starfish.pandora.xiaomi.com
+misc.in.duokanbox.com