Merge branch 'develop'

build.sh

@@ -64,7 +64,7 @@ elif [ "$OMR_TARGET" = "rpi2" ]; then
 	OMR_REAL_TARGET="arm_cortex-a7_neon-vfpv4"
 elif [ "$OMR_TARGET" = "4018" ]; then
 	OMR_REAL_TARGET="arm_cortex-a7_neon-vfpv4"
-	elif [ "$OMR_TARGET" = "4019" ]; then
+elif [ "$OMR_TARGET" = "4019" ]; then
 	OMR_REAL_TARGET="arm_cortex-a7_neon-vfpv4"
 elif [ "$OMR_TARGET" = "wrt3200acm" ]; then
 	OMR_REAL_TARGET="arm_cortex-a9_vfpv3-d16"
@@ -419,9 +419,9 @@ if [ "$OMR_KERNEL" = "5.4" ]; then
 	echo "Done"
 	echo "Set to kernel 5.4 for mediatek arch (BPI-R2)"
 	find target/linux/mediatek -type f -name Makefile -exec sed -i 's%KERNEL_PATCHVER:=4.19%KERNEL_PATCHVER:=5.4%g' {} \;
-	echo "Set to kernel 5.4 for IPQ"
-	find target/linux/ipq40xx -type f -name Makefile -exec sed -i 's%KERNEL_PATCHVER:=4.19%KERNEL_PATCHVER:=5.4%g' {} \;
 	echo "Done"
+	echo "Set to kernel 5.4 for IPQ (4019)"
+	find target/linux/ipq40xx -type f -name Makefile -exec sed -i 's%KERNEL_PATCHVER:=4.19%KERNEL_PATCHVER:=5.4%g' {} \;
 	echo "Done"
 fi
 
@@ -443,8 +443,6 @@ cd "$OMR_TARGET/source"
 echo "Update feeds index"
 cp .config .config.keep
 scripts/feeds clean
-./scripts/feeds update -a && ./scripts/feeds install -a
-scripts/feeds install -a
 scripts/feeds update -a
 
 #cd -

config

@@ -265,4 +265,4 @@ CONFIG_PACKAGE_kmod-ledtrig-transient=y
 # end of LED modules
 CONFIG_PACKAGE_kmod-tcp-bbr=y
 CONFIG_PACKAGE_kmod-tcp-hybla=y
-CONFIG_PACKAGE_kmod-tcp-nanqinlang=y
+CONFIG_PACKAGE_kmod-tcp-nanqinlang=y

root/package/base-files/files/bin/config_generate

@@ -140,7 +140,7 @@ generate_network() {
 		static)
 			local ipad
 			case "$1" in
-				lan) ipad=${ipaddr:-"192.168.100.1"} ;;
+				lan) ipad=${ipaddr:-"192.168.1.1"} ;;
 				*) ipad=${ipaddr:-"192.168.$((addr_offset++)).1"} ;;
 			esac
 
@@ -280,7 +280,7 @@ generate_static_system() {
 	uci -q batch <<-EOF
 		delete system.@system[0]
 		add system system
-		set system.@system[-1].hostname='antrouter'
+		set system.@system[-1].hostname='OpenmptcpRouter_China'
 		set system.@system[-1].timezone='UTC'
 		set system.@system[-1].ttylogin='0'
 		set system.@system[-1].log_size='64'

root/package/firmware/ipq-wifi/Makefile

@@ -48,7 +48,6 @@ ALLWIFIBOARDS:= \
 	plasmacloud_pa1200 \
 	plasmacloud_pa2200 \
   pangu_l1000 \
-  p2w_r619ac \
 	qxwlan_e2600ac
 
 ALLWIFIPACKAGES:=$(foreach BOARD,$(ALLWIFIBOARDS),ipq-wifi-$(BOARD))
@@ -134,6 +133,5 @@ $(eval $(call generate-ipq-wifi-package,plasmacloud_pa1200,Plasma Cloud PA1200))
 $(eval $(call generate-ipq-wifi-package,plasmacloud_pa2200,Plasma Cloud PA2200))
 $(eval $(call generate-ipq-wifi-package,qxwlan_e2600ac,Qxwlan E2600AC))
 $(eval $(call generate-ipq-wifi-package,pangu_l1000,PANGU L1000))
-$(eval $(call generate-ipq-wifi-package,p2w_r619ac,P&W R619AC))
 
 $(foreach PACKAGE,$(ALLWIFIPACKAGES),$(eval $(call BuildPackage,$(PACKAGE))))

root/package/network/config/firewall/patches/fullconenat.patch

@@ -1,40 +0,0 @@
---- a/options.h
-+++ b/options.h
-@@ -341,6 +341,8 @@ struct fw3_zone
- 	struct list_head masq_src;
- 	struct list_head masq_dest;
- 
-+	bool fullcone;
-+
- 	bool mtu_fix;
- 
- 	struct list_head cthelpers;
---- a/zones.c
-+++ b/zones.c
-@@ -77,6 +77,8 @@ const struct fw3_option fw3_zone_opts[]
- 	FW3_LIST("masq_src",           network,  zone,     masq_src),
- 	FW3_LIST("masq_dest",          network,  zone,     masq_dest),
- 
-+	FW3_OPT("fullcone",            bool,     zone,     fullcone),
-+
- 	FW3_OPT("extra",               string,   zone,     extra_src),
- 	FW3_OPT("extra_src",           string,   zone,     extra_src),
- 	FW3_OPT("extra_dest",          string,   zone,     extra_dest),
-@@ -709,7 +711,16 @@ print_zone_rule(struct fw3_ipt_handle *h
- 				     (mdest = next_addr(mdest, &zone->masq_dest,
- 					                    handle->family, false)) || first_dest;
- 				     first_dest = false)
--				{
-+				if (zone->fullcone && (access("/usr/lib/iptables/libipt_FULLCONENAT.so", 0) == 0)) {
-+					r = fw3_ipt_rule_new(handle);
-+					fw3_ipt_rule_src_dest(r, msrc, mdest);
-+					fw3_ipt_rule_target(r, "FULLCONENAT");
-+					fw3_ipt_rule_append(r, "zone_%s_postrouting", zone->name);
-+					r = fw3_ipt_rule_new(handle);
-+					fw3_ipt_rule_src_dest(r, msrc, mdest);
-+					fw3_ipt_rule_target(r, "FULLCONENAT");
-+					fw3_ipt_rule_append(r, "zone_%s_prerouting", zone->name);
-+				} else {
- 					r = fw3_ipt_rule_new(handle);
- 					fw3_ipt_rule_src_dest(r, msrc, mdest);
- 					fw3_ipt_rule_target(r, "MASQUERADE");

root/package/network/ipv6/6in4/Makefile

@@ -1,45 +0,0 @@
-#
-# Copyright (C) 2010-2015 OpenWrt.org
-# Copyright (C) 2018-2019 Ycarus (Yannick Chabanois) <ycarus@zugaina.org>
-# - Added gateway setting
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=6in4
-PKG_VERSION:=270
-PKG_RELEASE:=2
-PKG_LICENSE:=GPL-2.0
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/6in4
-  SECTION:=net
-  CATEGORY:=Network
-  DEPENDS:=@IPV6 +kmod-sit +uclient-fetch
-  TITLE:=IPv6-in-IPv4 configuration support
-  MAINTAINER:=Jo-Philipp Wich <jo@mein.io>
-  PKGARCH:=all
-endef
-
-define Package/6in4/description
-Provides support for 6in4 tunnels in /etc/config/network.
-Refer to http://wiki.openwrt.org/doc/uci/network for
-configuration details.
-endef
-
-define Build/Compile
-endef
-
-define Build/Configure
-endef
-
-define Package/6in4/install
-	$(INSTALL_DIR) $(1)/lib/netifd/proto
-	$(INSTALL_BIN) ./files/6in4.sh $(1)/lib/netifd/proto/6in4.sh
-endef
-
-$(eval $(call BuildPackage,6in4))

root/package/network/ipv6/6in4/files/6in4.sh

@@ -1,149 +0,0 @@
-#!/bin/sh
-# 6in4.sh - IPv6-in-IPv4 tunnel backend
-# Copyright (c) 2010-2015 OpenWrt.org
-
-[ -n "$INCLUDE_ONLY" ] || {
-	. /lib/functions.sh
-	. /lib/functions/network.sh
-	. ../netifd-proto.sh
-	init_proto "$@"
-}
-
-proto_6in4_update() {
-	sh -c '
-		timeout=5
-
-		(while [ $((timeout--)) -gt 0 ]; do
-			sleep 1
-			kill -0 $$ || exit 0
-		done; kill -9 $$) 2>/dev/null &
-
-		exec "$@"
-	' "$1" "$@"
-}
-
-proto_6in4_add_prefix() {
-	append "$3" "$1"
-}
-
-proto_6in4_setup() {
-	local cfg="$1"
-	local iface="$2"
-	local link="6in4-$cfg"
-
-	local mtu ttl tos ipaddr peeraddr ip6addr ip6prefix ip6prefixes tunlink tunnelid username password updatekey gateway
-	json_get_vars mtu ttl tos ipaddr peeraddr ip6addr tunlink tunnelid username password updatekey gateway
-	json_for_each_item proto_6in4_add_prefix ip6prefix ip6prefixes
-
-	[ -z "$peeraddr" ] && {
-		proto_notify_error "$cfg" "MISSING_ADDRESS"
-		proto_block_restart "$cfg"
-		return
-	}
-
-	[ -n "$tunlink" ] && ( proto_add_host_dependency "$cfg" "$peeraddr" "$tunlink" )
-
-	[ -z "$ipaddr" ] && {
-		local wanif="$tunlink"
-		if [ -z "$wanif" ] && ! network_find_wan wanif; then
-			proto_notify_error "$cfg" "NO_WAN_LINK"
-			return
-		fi
-
-		if ! network_get_ipaddr ipaddr "$wanif"; then
-			proto_notify_error "$cfg" "NO_WAN_LINK"
-			return
-		fi
-	}
-
-	proto_init_update "$link" 1
-
-	[ -n "$ip6addr" ] && {
-		local local6="${ip6addr%%/*}"
-		local mask6="${ip6addr##*/}"
-		[[ "$local6" = "$mask6" ]] && mask6=
-		proto_add_ipv6_address "$local6" "$mask6"
-		proto_add_ipv6_route "::" 0 "" "" "" "$local6/$mask6"
-	}
-
-	[ -n "$gateway" ] && {
-		proto_add_ipv6_route "::" 0 "$gateway"
-	}
-
-	for ip6prefix in $ip6prefixes; do
-		proto_add_ipv6_prefix "$ip6prefix"
-		proto_add_ipv6_route "::" 0 "" "" "" "$ip6prefix"
-	done
-
-	proto_add_tunnel
-	json_add_string mode sit
-	json_add_int mtu "${mtu:-1280}"
-	json_add_int ttl "${ttl:-64}"
-	[ -n "$tos" ] && json_add_string tos "$tos"
-	json_add_string local "$ipaddr"
-	json_add_string remote "$peeraddr"
-	[ -n "$tunlink" ] && json_add_string link "$tunlink"
-	proto_close_tunnel
-
-	proto_send_update "$cfg"
-
-	[ -n "$tunnelid" -a -n "$username" -a \( -n "$password" -o -n "$updatekey" \) ] && {
-		[ -n "$updatekey" ] && password="$updatekey"
-
-		local http="http"
-		local urlget="uclient-fetch"
-		local urlget_opts="-qO-"
-		local ca_path="${SSL_CERT_DIR:-/etc/ssl/certs}"
-
-		[ -f /lib/libustream-ssl.so ] && http=https
-		[ "$http" = "https" -a -z "$(find $ca_path -name "*.0" 2>/dev/null)" ] && {
-			urlget_opts="$urlget_opts --no-check-certificate"
-		}
-
-		local url="$http://ipv4.tunnelbroker.net/nic/update?hostname=$tunnelid"
-		local try=0
-		local max=3
-
-		(
-			set -o pipefail
-			while [ $((++try)) -le $max ]; do
-				if proto_6in4_update $urlget $urlget_opts --user="$username" --password="$password" "$url" 2>&1 | \
-					sed -e 's,^Killed$,timeout,' -e "s,^,update $try/$max: ," | \
-					logger -t "$link";
-				then
-					logger -t "$link" "updated"
-					return 0
-				fi
-				sleep 5
-			done
-			logger -t "$link" "update failed"
-		)
-	}
-}
-
-proto_6in4_teardown() {
-	local cfg="$1"
-}
-
-proto_6in4_init_config() {
-	no_device=1
-	available=1
-
-	proto_config_add_string "ipaddr"
-	proto_config_add_string "ip6addr"
-	proto_config_add_array "ip6prefix"
-	proto_config_add_string "peeraddr"
-	proto_config_add_string "tunlink"
-	proto_config_add_string "tunnelid"
-	proto_config_add_string "username"
-	proto_config_add_string "password"
-	proto_config_add_string "updatekey"
-	proto_config_add_string "gateway"
-	proto_config_add_int "mtu"
-	proto_config_add_int "ttl"
-	proto_config_add_string "tos"
-}
-
-[ -n "$INCLUDE_ONLY" ] || {
-	add_protocol 6in4
-}

root/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-l1000.dts

@@ -14,7 +14,7 @@
 	model = "GZ841902_55860.com";
 	compatible = "pangu,l1000", "qcom,ipq4019";
 
-
+	
 	memory {
 		device_type = "memory";
 		reg = <0x80000000 0x20000000>; /* 512MB */