修改 atomic 引用

This commit is contained in:
bjdgyc
2024-03-14 16:47:25 +08:00
parent 57a67ee030
commit 000b041578
10 changed files with 59 additions and 37 deletions

View File

@@ -4,12 +4,16 @@ import (
"fmt"
"github.com/bjdgyc/anylink/base"
"github.com/bjdgyc/anylink/pkg/utils"
"github.com/bjdgyc/anylink/sessdata"
"github.com/coreos/go-iptables/iptables"
"github.com/songgao/water"
)
func checkTun() {
// 测试ip命令
base.CheckModOrLoad("tun")
// 测试tun
cfg := water.Config{
DeviceType: water.TUN,
@@ -21,16 +25,14 @@ func checkTun() {
}
defer ifce.Close()
// 测试ip命令
base.CheckModOrLoad("tun")
cmdstr1 := fmt.Sprintf("ip link set dev %s up mtu %s multicast off", ifce.Name(), "1399")
err = execCmd([]string{cmdstr1})
if err != nil {
base.Fatal("testTun err: ", err)
}
// 开启服务器转发
if err := execCmd([]string{"sysctl -w net.ipv4.ip_forward=1"}); err != nil {
err = execCmd([]string{"sysctl -w net.ipv4.ip_forward=1"})
if err != nil {
base.Fatal(err)
}
if base.Cfg.IptablesNat {
@@ -47,14 +49,14 @@ func checkTun() {
// 添加注释
natRule := []string{"-s", base.Cfg.Ipv4CIDR, "-o", base.Cfg.Ipv4Master, "-m", "comment",
"--comment", "anylink tun nat", "-j", "MASQUERADE"}
"--comment", "AnyLink", "-j", "MASQUERADE"}
err = ipt.InsertUnique("nat", "POSTROUTING", 1, natRule...)
if err != nil {
base.Error(err)
}
// 添加注释
forwardRule := []string{"-m", "comment", "--comment", "anylink forward filter", "-j", "ACCEPT"}
forwardRule := []string{"-m", "comment", "--comment", "AnyLink", "-j", "ACCEPT"}
err = ipt.InsertUnique("filter", "FORWARD", 1, forwardRule...)
if err != nil {
base.Error(err)
@@ -80,8 +82,8 @@ func LinkTun(cSess *sessdata.ConnSession) error {
cSess.SetIfName(ifce.Name())
// 通过 ip link show 查看 alias 信息
cmdstr1 := fmt.Sprintf("ip link set dev %s up mtu %d multicast off alias %s.%s", ifce.Name(), cSess.Mtu, cSess.Group.Name, cSess.Username)
alias := utils.ParseName(cSess.Group.Name + "." + cSess.Username)
cmdstr1 := fmt.Sprintf("ip link set dev %s up mtu %d multicast off alias %s", ifce.Name(), cSess.Mtu, alias)
cmdstr2 := fmt.Sprintf("ip addr add dev %s local %s peer %s/32",
ifce.Name(), base.Cfg.Ipv4Gateway, cSess.IpAddr)
err = execCmd([]string{cmdstr1, cmdstr2})