root/gost_software
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tun: add routes setup support for windows

Browse Source
This commit is contained in:
ginuerzh 2019-12-27 22:17:09 +08:00
parent c3ca971f6c
commit fd13582ded
2 changed files with 33 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tun_unix.go
View File

@ -6,7 +6,7 @@ import (
"fmt" "fmt"
"net" "net"
"os/exec" "os/exec"
"strconv" "strings"
"github.com/go-log/log" "github.com/go-log/log"
"github.com/songgao/water" "github.com/songgao/water"
@ -32,11 +32,8 @@ func createTun(cfg TunConfig) (conn net.Conn, ipNet *net.IPNet, err error) {
cmd := fmt.Sprintf("ifconfig %s inet %s mtu %d up", ifce.Name(), cfg.Addr, mtu) cmd := fmt.Sprintf("ifconfig %s inet %s mtu %d up", ifce.Name(), cfg.Addr, mtu)
log.Log("[tun]", cmd) log.Log("[tun]", cmd)
if er := exec.Command( args := strings.Split(cmd, " ")
"ifconfig", ifce.Name(), if er := exec.Command(args[0], args[1:]...).Run(); er != nil {
"inet", cfg.Addr,
"mtu", strconv.Itoa(mtu),
"up").Run(); er != nil {
err = fmt.Errorf("%s: %v", cmd, er) err = fmt.Errorf("%s: %v", cmd, er)
return return
} }
@ -59,10 +56,8 @@ func addRoutes(ifName string, routes ...string) error {
} }
cmd := fmt.Sprintf("route add -net %s -interface %s", route, ifName) cmd := fmt.Sprintf("route add -net %s -interface %s", route, ifName)
log.Log("[tun]", cmd) log.Log("[tun]", cmd)
if er := exec.Command( args := strings.Split(cmd, " ")
"route", "add", if er := exec.Command(args[0], args[1:]...).Run(); er != nil {
"-net", route,
"-interface", ifName).Run(); er != nil {
return fmt.Errorf("%s: %v", cmd, er) return fmt.Errorf("%s: %v", cmd, er)
} }
} }

32
tun_windows.go
View File

@ -4,6 +4,7 @@ import (
"fmt" "fmt"
"net" "net"
"os/exec" "os/exec"
"strings"
"github.com/go-log/log" "github.com/go-log/log"
"github.com/songgao/water" "github.com/songgao/water"
@ -31,14 +32,16 @@ func createTun(cfg TunConfig) (conn net.Conn, ipNet *net.IPNet, err error) {
"source=static addr=%s mask=%s gateway=none", "source=static addr=%s mask=%s gateway=none",
ifce.Name(), ip.String(), ipMask(ipNet.Mask)) ifce.Name(), ip.String(), ipMask(ipNet.Mask))
log.Log("[tun]", cmd) log.Log("[tun]", cmd)
if er := exec.Command("netsh", args := strings.Split(cmd, " ")
"interface", "ip", "set", "address", if er := exec.Command(args[0], args[1:]...).Run(); er != nil {
"name="+ifce.Name(), "source=static",
"addr="+ip.String(), "mask="+ipMask(ipNet.Mask), "gateway=none").Run(); er != nil {
err = fmt.Errorf("%s: %v", cmd, er) err = fmt.Errorf("%s: %v", cmd, er)
return return
} }
if err = addRoutes(ip.String(), cfg.Routes...); err != nil {
return
}
conn = &tunConn{ conn = &tunConn{
ifce: ifce, ifce: ifce,
addr: &net.IPAddr{IP: ip}, addr: &net.IPAddr{IP: ip},
@ -46,6 +49,27 @@ func createTun(cfg TunConfig) (conn net.Conn, ipNet *net.IPNet, err error) {
return return
} }
func addRoutes(ifIP string, routes ...string) error {
for _, route := range routes {
if route == "" {
continue
}
_, inet, err := net.ParseCIDR(route)
if err != nil {
return err
}
cmd := fmt.Sprintf("route ADD %s MASK %s %s",
inet.IP, ipMask(inet.Mask), ifIP)
log.Log("[tun]", cmd)
args := strings.Split(cmd, " ")
if er := exec.Command(args[0], args[1:]...).Run(); er != nil {
return fmt.Errorf("%s: %v", cmd, er)
}
}
return nil
}
func ipMask(mask net.IPMask) string { func ipMask(mask net.IPMask) string {
return fmt.Sprintf("%d.%d.%d.%d", mask[0], mask[1], mask[2], mask[3]) return fmt.Sprintf("%d.%d.%d.%d", mask[0], mask[1], mask[2], mask[3])
} }