sync/NeoNetwork
1
0
Fork 0
mirror of https://github.com/NeoCloud/NeoNetwork synced 2024-11-22 19:20:40 +08:00
Code Issues Releases Wiki Activity

Completely removed all TUN30 route

Browse source
This commit is contained in:
Neo_Chen 2020-05-11 17:33:01 +08:00
parent 144cbddf84
commit 41d43ad1e2
35 changed files with 7 additions and 144 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
route/10.127.0.0,30
View file

@ -1,4 +0,0 @@
TYPE="TUN30"
PROTO="TINC"
UPSTREAM="caasih"
DOWNSTREAM="ucbvax"

4
route/10.127.0.100,30
View file

@ -1,4 +0,0 @@
TYPE="TUN30"
PROTO="Gre"
UPSTREAM="septs"
DOWNSTREAM="JerryXiao"

4
route/10.127.0.104,30
View file

@ -1,4 +0,0 @@
TYPE="TUN30"
PROTO="Gre"
UPSTREAM="septs"
DOWNSTREAM="megumiLHS"

4
route/10.127.0.108,30
View file

@ -1,4 +0,0 @@
TYPE="TUN30"
PROTO="Gre"
UPSTREAM="septs"
DOWNSTREAM="LanTian"

4
route/10.127.0.112,30
View file

@ -1,4 +0,0 @@
TYPE="TUN30"
PROTO="L2TP"
UPSTREAM="septs"
DOWNSTREAM="ucbvax"

4
route/10.127.0.116,30
View file

@ -1,4 +0,0 @@
TYPE="TUN30"
PROTO="WireGuard"
UPSTREAM="ucbvax"
DOWNSTREAM="santost12"

4
route/10.127.0.12,30
View file

@ -1,4 +0,0 @@
TYPE="TUN30"
PROTO="Tinc"
UPSTREAM="ucbvax"
DOWNSTREAM="NeoPDP-11"

4
route/10.127.0.120,30
View file

@ -1,4 +0,0 @@
TYPE="TUN30"
PROTO="WireGuard"
UPSTREAM="MagicNeko-JP03"
DOWNSTREAM="chenx97"

4
route/10.127.0.124,30
View file

@ -1,4 +0,0 @@
TYPE="TUN30"
PROTO="Gre"
UPSTREAM="septs"
DOWNSTREAM="MagicNeko-RU01"

4
route/10.127.0.128,30
View file

@ -1,4 +0,0 @@
TYPE="TUN30"
PROTO="Gre"
UPSTREAM="MagicNeko-JP03"
DOWNSTREAM="megumiLHS"

4
route/10.127.0.132,30
View file

@ -1,4 +0,0 @@
TYPE="TUN30"
PROTO="WireGuard"
UPSTREAM="MagicNeko-JP03"
DOWNSTREAM="frank-hsinchu"

4
route/10.127.0.136,30
View file

@ -1,4 +0,0 @@
TYPE="TUN30"
PROTO="IPsec/GRE"
UPSTREAM="septs"
DOWNSTREAM="James58899"

4
route/10.127.0.140,30
View file

@ -1,4 +0,0 @@
TYPE="TUN30"
PROTO="WireGuard"
UPSTREAM="pan"
DOWNSTREAM="MagicNeko-JP03"

4
route/10.127.0.16,30
View file

@ -1,4 +0,0 @@
TYPE="TUN30"
PROTO="Tinc"
UPSTREAM="caasih"
DOWNSTREAM="NeoPDP-11"

4
route/10.127.0.20,30
View file

@ -1,4 +0,0 @@
TYPE="TUN30"
PROTO="Direct"
UPSTREAM="NeoSystem"
DOWNSTREAM="NeoVAX"

4
route/10.127.0.24,30
View file

@ -1,4 +0,0 @@
TYPE="TUN30"
PROTO="Gre"
UPSTREAM="staph"
DOWNSTREAM="MagicNeko-RU01"

4
route/10.127.0.28,30
View file

@ -1,4 +0,0 @@
TYPE="TUN30"
PROTO="Tinc"
UPSTREAM="ucbvax"
DOWNSTREAM="megumiLHS"

4
route/10.127.0.40,30
View file

@ -1,4 +0,0 @@
TYPE="TUN30"
PROTO="Tinc"
UPSTREAM="pan"
DOWNSTREAM="NeoPDP-11"

4
route/10.127.0.44,30
View file

@ -1,4 +0,0 @@
TYPE="TUN30"
PROTO="Tinc"
UPSTREAM="pan"
DOWNSTREAM="NeoSystem"

4
route/10.127.0.48,30
View file

@ -1,4 +0,0 @@
TYPE="TUN30"
PROTO="WireGuard"
UPSTREAM="cklvax"
DOWNSTREAM="NeoSystem"

4
route/10.127.0.52,30
View file

@ -1,4 +0,0 @@
TYPE="TUN30"
PROTO="WireGuard"
UPSTREAM="pan"
DOWNSTREAM="NeoSystem"

4
route/10.127.0.56,30
View file

@ -1,4 +0,0 @@
TYPE="TUN30"
PROTO="Tinc"
UPSTREAM="ucbvax"
DOWNSTREAM="MagicNeko-HK01"

4
route/10.127.0.60,30
View file

@ -1,4 +0,0 @@
TYPE="TUN30"
PROTO="WireGuard"
UPSTREAM="ucbvax"
DOWNSTREAM="pan"

4
route/10.127.0.64,30
View file

@ -1,4 +0,0 @@
TYPE="TUN30"
PROTO="Gre"
UPSTREAM="MagicNeko-HK01"
DOWNSTREAM="Icecat-GroupAccessNetwork"

4
route/10.127.0.68,30
View file

@ -1,4 +0,0 @@
TYPE="TUN30"
PROTO="Tinc"
UPSTREAM="caasih"
DOWNSTREAM="staph"

4
route/10.127.0.72,30
View file

@ -1,4 +0,0 @@
TYPE="TUN30"
PROTO="WireGuard"
UPSTREAM="ucbvax"
DOWNSTREAM="chenx97"

4
route/10.127.0.8,30
View file

@ -1,4 +0,0 @@
TYPE="TUN30"
PROTO="WireGuard"
UPSTREAM="ucbvax"
DOWNSTREAM="NeoSystem"

4
route/10.127.0.80,30
View file

@ -1,4 +0,0 @@
TYPE="TUN30"
PROTO="WireGuard"
UPSTREAM="JerryXiao"
DOWNSTREAM="ucbvax"

4
route/10.127.0.84,30
View file

@ -1,4 +0,0 @@
TYPE="TUN30"
PROTO="WireGuard"
UPSTREAM="MagicNeko-JP03"
DOWNSTREAM="JerryXiao"

4
route/10.127.0.88,30
View file

@ -1,4 +0,0 @@
TYPE="TUN30"
PROTO="Gre"
UPSTREAM="septs"
DOWNSTREAM="MagicNeko-JP03"

4
route/10.127.0.92,30
View file

@ -1,4 +0,0 @@
TYPE="TUN30"
PROTO="Gre"
UPSTREAM="septs"
DOWNSTREAM="frank-hsinchu"

4
route/10.127.0.96,30
View file

@ -1,4 +0,0 @@
TYPE="TUN30"
PROTO="Gre"
UPSTREAM="staph"
DOWNSTREAM="septs"

14
scripts/dns-reverse-generator.sh
View file

@ -3,7 +3,6 @@ set -e
FILE="dns/db.10.127" FILE="dns/db.10.127"
TUN30_TEMP="$(mktemp)" TUN30_TEMP="$(mktemp)"
PP_TEMP="$(mktemp)"
LO_TEMP="$(mktemp)" LO_TEMP="$(mktemp)"
if [[ "$(uname)" = *BSD ]]; then if [[ "$(uname)" = *BSD ]]; then
@ -45,15 +44,6 @@ for i in *; do
print_record "$upstream_ip" "$DOWNSTREAM.$UPSTREAM.tun30.neo." print_record "$upstream_ip" "$DOWNSTREAM.$UPSTREAM.tun30.neo."
print_record "$downstream_ip" "$UPSTREAM.$DOWNSTREAM.tun30.neo." print_record "$downstream_ip" "$UPSTREAM.$DOWNSTREAM.tun30.neo."
) >> "$TUN30_TEMP" ) >> "$TUN30_TEMP"
elif [ "$TYPE" = "PTP" ]; then
i="${i/PTP,/}"
upstream_ip="${i%~*}"
downstream_ip="${i#*~}"
(
print_record "$(ipcalc "$upstream_ip" 0)" "$UPSTREAM.ptp.neo."
print_record "$(ipcalc "$downstream_ip" 0)" "$DOWNSTREAM.ptp.neo."
) >> "$PP_TEMP"
elif [ "$TYPE" = "LO" ]; then elif [ "$TYPE" = "LO" ]; then
ip="${i/,32/}" ip="${i/,32/}"
@ -65,10 +55,8 @@ done
{ {
echo -e "\n; Tunnel /30 Addresses" echo -e "\n; Tunnel /30 Addresses"
sort -n < "$TUN30_TEMP" sort -n < "$TUN30_TEMP"
echo -e "\n; Point to Point Addresses"
sort -n < "$PP_TEMP"
echo -e "\n; Loopback Addresses" echo -e "\n; Loopback Addresses"
sort -n < "$LO_TEMP" sort -n < "$LO_TEMP"
} >> "$FILE" } >> "$FILE"
rm -f "$TUN30_TEMP" "$PP_TEMP" "$LO_TEMP" rm -f "$TUN30_TEMP" "$LO_TEMP"

6
scripts/pretty-output.sh
View file

@ -106,13 +106,16 @@ arg="$2" # Optional argument
case "$1" in case "$1" in
asn) asn)
for i in asn/*; do (
cd asn
for i in *; do
msg "${i#asn/}\n" msg "${i#asn/}\n"
source "$i" source "$i"
printf "${BRIGHT}${FMAGENTA}%-16s${RESET}| ${BRIGHT}${FYELLOW}%s\n\t>> %s\n" \ printf "${BRIGHT}${FMAGENTA}%-16s${RESET}| ${BRIGHT}${FYELLOW}%s\n\t>> %s\n" \
"$OWNER" "$NAME" "$DESC" "$OWNER" "$NAME" "$DESC"
done done
)
;; ;;
route) route)
for i in route*/*; do for i in route*/*; do
@ -122,7 +125,6 @@ route)
case "$TYPE" in case "$TYPE" in
TUN30) print_tun30 "$subnet" "$PROTO" "$UPSTREAM" "$DOWNSTREAM";; TUN30) print_tun30 "$subnet" "$PROTO" "$UPSTREAM" "$DOWNSTREAM";;
SUBNET) print_subnet "$subnet" "$NAME" "$DESC";; SUBNET) print_subnet "$subnet" "$NAME" "$DESC";;
PTP) print_ptp "$subnet" "$PROTO" "$UPSTREAM" "$DOWNSTREAM";;
LO) print_lo "$subnet" "$NAME" "$DESC";; LO) print_lo "$subnet" "$NAME" "$DESC";;
*) errmsg "Invalid \$TYPE in $i\n";; *) errmsg "Invalid \$TYPE in $i\n";;
esac esac

3
vpn/wireguard.conf
View file

@ -1,5 +1,6 @@
[Interface] [Interface]
Address = 10.127.0.xx/30 Address = 10.127.x.x/32, fd80::/32
PostUp = /path/to/wg-postup.sh 10.127.x.x/32 <Peer IPv6> <IPv6 src> fd80::/32 <Peer IPv6>
# Custom DNS # Custom DNS
#DNS = 127.0.0.1 #DNS = 127.0.0.1
# Set MTU to 1412 if using PPP # Set MTU to 1412 if using PPP