go-gost/x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tun: support multiple IPs

Browse Source
This commit is contained in:
ginuerzh
2022-12-22 17:44:30 +08:00
parent 67bbdbf5a3
commit fb29d5c80e
9 changed files with 128 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
listener/tun/metadata.go
View File

@ -29,17 +29,30 @@ func (l *tunListener) parseMetadata(md mdata.Metadata) (err error) {
)
config := &tun_util.Config{
Name: mdutil.GetString(md, name),
Net: mdutil.GetString(md, netKey),
Peer: mdutil.GetString(md, peer),
MTU: mdutil.GetInt(md, mtu),
Gateway: mdutil.GetString(md, gateway),
Name: mdutil.GetString(md, name),
Peer: mdutil.GetString(md, peer),
MTU: mdutil.GetInt(md, mtu),
}
if config.MTU <= 0 {
config.MTU = DefaultMTU
}
if gw := mdutil.GetString(md, gateway); gw != "" {
config.Gateway = net.ParseIP(gw)
}
gw := net.ParseIP(config.Gateway)
for _, s := range strings.Split(mdutil.GetString(md, netKey), ",") {
if s = strings.TrimSpace(s); s == "" {
continue
}
ip, ipNet, err := net.ParseCIDR(s)
if err != nil {
continue
}
config.Net = append(config.Net, net.IPNet{
IP: ip,
Mask: ipNet.Mask,
})
}
for _, s := range strings.Split(mdutil.GetString(md, route), ",") {
var route tun_util.Route
@ -48,7 +61,7 @@ func (l *tunListener) parseMetadata(md mdata.Metadata) (err error) {
continue
}
route.Net = *ipNet
route.Gateway = gw
route.Gateway = config.Gateway
config.Routes = append(config.Routes, route)
}
@ -64,7 +77,7 @@ func (l *tunListener) parseMetadata(md mdata.Metadata) (err error) {
route.Net = *ipNet
route.Gateway = net.ParseIP(ss[1])
if route.Gateway == nil {
route.Gateway = gw
route.Gateway = config.Gateway
}
config.Routes = append(config.Routes, route)

21
listener/tun/tun_darwin.go
View File

@ -15,11 +15,6 @@ const (
)
func (l *tunListener) createTun() (ifce io.ReadWriteCloser, name string, ip net.IP, err error) {
ip, _, err = net.ParseCIDR(l.md.config.Net)
if err != nil {
return
}
if l.md.config.Name == "" {
l.md.config.Name = defaultTunName
}
@ -32,13 +27,15 @@ func (l *tunListener) createTun() (ifce io.ReadWriteCloser, name string, ip net.
if peer == "" {
peer = ip.String()
}
cmd := fmt.Sprintf("ifconfig %s inet %s %s mtu %d up",
name, l.md.config.Net, l.md.config.Peer, l.md.config.MTU)
l.logger.Debug(cmd)
args := strings.Split(cmd, " ")
if err = exec.Command(args[0], args[1:]...).Run(); err != nil {
return
if len(l.md.config.Net) > 0 {
cmd := fmt.Sprintf("ifconfig %s inet %s %s mtu %d up",
name, l.md.config.Net[0].String(), l.md.config.Peer, l.md.config.MTU)
l.logger.Debug(cmd)
args := strings.Split(cmd, " ")
if err = exec.Command(args[0], args[1:]...).Run(); err != nil {
return
}
ip = l.md.config.Net[0].IP
}
if err = l.addRoutes(name, l.md.config.Routes...); err != nil {

23
listener/tun/tun_linux.go
View File

@ -11,11 +11,6 @@ import (
)
func (l *tunListener) createTun() (dev io.ReadWriteCloser, name string, ip net.IP, err error) {
ip, ipNet, err := net.ParseCIDR(l.md.config.Net)
if err != nil {
return
}
dev, name, err = l.createTunDevice()
if err != nil {
return
@ -31,14 +26,18 @@ func (l *tunListener) createTun() (dev io.ReadWriteCloser, name string, ip net.I
return
}
if err = netlink.AddrAdd(link, &netlink.Addr{
IPNet: &net.IPNet{
IP: ip,
Mask: ipNet.Mask,
},
}); err != nil {
return
for _, net := range l.md.config.Net {
if err = netlink.AddrAdd(link, &netlink.Addr{
IPNet: &net,
}); err != nil {
l.logger.Error(err)
continue
}
}
if len(l.md.config.Net) > 0 {
ip = l.md.config.Net[0].IP
}
if err = netlink.LinkSetUp(link); err != nil {
return
}

22
listener/tun/tun_unix.go
View File

@ -17,11 +17,6 @@ const (
)
func (l *tunListener) createTun() (ifce io.ReadWriteCloser, name string, ip net.IP, err error) {
ip, _, err = net.ParseCIDR(l.md.config.Net)
if err != nil {
return
}
if l.md.config.Name == "" {
l.md.config.Name = defaultTunName
}
@ -30,14 +25,17 @@ func (l *tunListener) createTun() (ifce io.ReadWriteCloser, name string, ip net.
return
}
cmd := fmt.Sprintf("ifconfig %s inet %s mtu %d up",
name, l.md.config.Net, l.md.config.MTU)
l.logger.Debug(cmd)
if len(l.md.config.Net) > 0 {
cmd := fmt.Sprintf("ifconfig %s inet %s mtu %d up",
name, l.md.config.Net[0].String(), l.md.config.MTU)
l.logger.Debug(cmd)
args := strings.Split(cmd, " ")
if er := exec.Command(args[0], args[1:]...).Run(); er != nil {
err = fmt.Errorf("%s: %v", cmd, er)
return
args := strings.Split(cmd, " ")
if er := exec.Command(args[0], args[1:]...).Run(); er != nil {
err = fmt.Errorf("%s: %v", cmd, er)
return
}
ip = l.md.config.Net[0].IP
}
if err = l.addRoutes(name, l.md.config.Routes...); err != nil {

31
listener/tun/tun_windows.go
View File

@ -15,11 +15,6 @@ const (
)
func (l *tunListener) createTun() (ifce io.ReadWriteCloser, name string, ip net.IP, err error) {
ip, ipNet, err := net.ParseCIDR(l.md.config.Net)
if err != nil {
return
}
if l.md.config.Name == "" {
l.md.config.Name = defaultTunName
}
@ -28,15 +23,19 @@ func (l *tunListener) createTun() (ifce io.ReadWriteCloser, name string, ip net.
return
}
cmd := fmt.Sprintf("netsh interface ip set address name=%s "+
"source=static addr=%s mask=%s gateway=none",
name, ip.String(), ipMask(ipNet.Mask))
l.logger.Debug(cmd)
if len(l.md.config.Net) > 0 {
ipNet := l.md.config.Net[0]
cmd := fmt.Sprintf("netsh interface ip set address name=%s "+
"source=static addr=%s mask=%s gateway=none",
name, ipNet.IP.String(), ipMask(ipNet.Mask))
l.logger.Debug(cmd)
args := strings.Split(cmd, " ")
if er := exec.Command(args[0], args[1:]...).Run(); er != nil {
err = fmt.Errorf("%s: %v", cmd, er)
return
args := strings.Split(cmd, " ")
if er := exec.Command(args[0], args[1:]...).Run(); er != nil {
err = fmt.Errorf("%s: %v", cmd, er)
return
}
ip = ipNet.IP
}
if err = l.addRoutes(name, l.md.config.Gateway, l.md.config.Routes...); err != nil {
@ -46,14 +45,14 @@ func (l *tunListener) createTun() (ifce io.ReadWriteCloser, name string, ip net.
return
}
func (l *tunListener) addRoutes(ifName string, gw string, routes ...tun_util.Route) error {
func (l *tunListener) addRoutes(ifName string, gw net.IP, routes ...tun_util.Route) error {
for _, route := range routes {
l.deleteRoute(ifName, route.Net.String())
cmd := fmt.Sprintf("netsh interface ip add route prefix=%s interface=%s store=active",
route.Net.String(), ifName)
if gw != "" {
cmd += " nexthop=" + gw
if gw != nil {
cmd += " nexthop=" + gw.String()
}
l.logger.Debug(cmd)
args := strings.Split(cmd, " ")