update ip from 254.254.254.xxx --> 223.254.254.xxx and change iptables portforward port range from 2000-60000 --> 80-60000

This commit is contained in:
p_caiwfeng
2021-08-11 10:29:42 +08:00
parent 3dae9e8541
commit 1ba315806b
3 changed files with 23 additions and 15 deletions

View File

@@ -73,8 +73,8 @@ func prepare() {
}
trafficManager := net.IPNet{
IP: net.IPv4(254, 254, 254, 100),
Mask: net.IPv4Mask(255, 255, 255, 0),
IP: net.IPv4(223, 254, 254, 100),
Mask: net.CIDRMask(24, 32),
}
err = remote.InitDHCP(clientset, namespace, &trafficManager)
@@ -96,22 +96,30 @@ func prepare() {
}
virtualShadowIp, _ := remote.GetRandomIpFromDHCP(clientset, namespace)
tempIps = append(tempIps, virtualShadowIp)
err = remote.CreateServerInbound(clientset, namespace, service, tunIp.IP.String(), pod.Status.PodIP, virtualShadowIp.String(), strings.Join(list, ","))
err = remote.CreateServerInbound(
clientset,
namespace,
service,
tunIp.IP.String(),
pod.Status.PodIP,
virtualShadowIp.String(),
strings.Join(list, ","),
)
if err != nil {
log.Error(err)
}
}
remote.AddCleanUpResourceHandler(clientset, namespace, services, tempIps...)
if runtime.GOOS == "windows" {
tunIp.Mask = net.IPv4Mask(0, 0, 0, 0)
tunIp.Mask = net.CIDRMask(0, 32)
} else {
tunIp.Mask = net.IPv4Mask(255, 255, 255, 0)
tunIp.Mask = net.CIDRMask(24, 32)
}
//list = append(list, tunIp.String())
//if runtime.GOOS == "windows" {
ipNet := net.IPNet{
IP: net.IPv4(254, 254, 254, 100),
Mask: net.IPv4Mask(255, 255, 255, 0),
IP: net.IPv4(223, 254, 254, 100),
Mask: net.CIDRMask(24, 32),
}
list = append(list, ipNet.String())
//list = append(list, "192.192.254.162/32")
@@ -152,7 +160,7 @@ func main() {
log.Fatal(err)
}
log.Info("dns service ok")
_ = exec.Command("ping", "-c", "4", "254.254.254.100").Run()
_ = exec.Command("ping", "-c", "4", "223.254.254.100").Run()
select {}
}

View File

@@ -161,7 +161,7 @@ func GetIpFromDHCP(client *kubernetes.Clientset, namespace string) (*net.IPNet,
}
return &net.IPNet{
IP: net.IPv4(254, 254, 254, byte(ip)),
IP: net.IPv4(223, 254, 254, byte(ip)),
Mask: net.IPv4Mask(255, 255, 255, 0),
}, nil
}
@@ -186,7 +186,7 @@ func GetRandomIpFromDHCP(client *kubernetes.Clientset, namespace string) (*net.I
atoi, _ := strconv.Atoi(ip)
return &net.IPNet{
IP: net.IPv4(254, 254, 254, byte(atoi)),
IP: net.IPv4(223, 254, 254, byte(atoi)),
Mask: net.IPv4Mask(255, 255, 255, 0),
}, nil
}

View File

@@ -36,7 +36,7 @@ func CreateServerOutbound(clientset *kubernetes.Clientset, namespace string, ser
"iptables -F",
"iptables -P INPUT ACCEPT",
"iptables -P FORWARD ACCEPT",
"iptables -t nat -A POSTROUTING -s 254.254.254.0/24 -o eth0 -j MASQUERADE",
"iptables -t nat -A POSTROUTING -s 223.254.254.0/24 -o eth0 -j MASQUERADE",
}
for _, ipNet := range nodeCIDR {
args = append(args, "iptables -t nat -A POSTROUTING -s "+ipNet.String()+" -o eth0 -j MASQUERADE")
@@ -131,10 +131,10 @@ func CreateServerInbound(clientset *kubernetes.Clientset, namespace, service str
"iptables -F;" +
"iptables -P INPUT ACCEPT;" +
"iptables -P FORWARD ACCEPT;" +
"iptables -t nat -A PREROUTING -i eth0 -p tcp --dport 2000:60000 -j DNAT --to " + virtualLocalIp + ":2000-60000;" +
"iptables -t nat -A POSTROUTING -p tcp -m tcp --dport 2000:60000 -j MASQUERADE;" +
"iptables -t nat -A PREROUTING -i eth0 -p udp --dport 2000:60000 -j DNAT --to " + virtualLocalIp + ":2000-60000;" +
"iptables -t nat -A POSTROUTING -p udp -m udp --dport 2000:60000 -j MASQUERADE;" +
"iptables -t nat -A PREROUTING -i eth0 -p tcp --dport 80:60000 -j DNAT --to " + virtualLocalIp + ":80-60000;" +
"iptables -t nat -A POSTROUTING -p tcp -m tcp --dport 80:60000 -j MASQUERADE;" +
"iptables -t nat -A PREROUTING -i eth0 -p udp --dport 80:60000 -j DNAT --to " + virtualLocalIp + ":80-60000;" +
"iptables -t nat -A POSTROUTING -p udp -m udp --dport 80:60000 -j MASQUERADE;" +
"gost -L 'tun://0.0.0.0:8421/127.0.0.1:8421?net=" + virtualShadowIp + "&route=" + routes + "' -F 'socks5://" + realRouterIP + ":10800?notls=true'",
},
SecurityContext: &v1.SecurityContext{