mirror
/
gost-mirror
mirror of https://github.com/ginuerzh/gost
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

tap: fix createTap

pull/507/head
ginuerzh 7 years ago
parent
124bc03ea4
commit
8e914c87e0
3 changed files with 14 additions and 4 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      tuntap_darwin.go
  2. 9
      tuntap_unix.go
  3. 7
      tuntap_windows.go

2
tuntap_darwin.go
View File

@ -48,7 +48,7 @@ func createTun(cfg TunConfig) (conn net.Conn, ipNet *net.IPNet, err error) {
return return
} }
func createTap(cfg TapConfig) (conn net.Conn, ipNet *net.IPNet, err error) { func createTap(cfg TapConfig) (conn net.Conn, itf *net.Interface, err error) {
err = errors.New("tap is not supported on darwin") err = errors.New("tap is not supported on darwin")
return return
} }

9
tuntap_unix.go
View File

@ -49,8 +49,8 @@ func createTun(cfg TunConfig) (conn net.Conn, ipNet *net.IPNet, err error) {
return return
} }
func createTap(cfg TapConfig) (conn net.Conn, ipNet *net.IPNet, err error) { func createTap(cfg TapConfig) (conn net.Conn, itf *net.Interface, err error) {
ip, ipNet, err := net.ParseCIDR(cfg.Addr) ip, _, err := net.ParseCIDR(cfg.Addr)
if err != nil { if err != nil {
return return
} }
@ -79,6 +79,11 @@ func createTap(cfg TapConfig) (conn net.Conn, ipNet *net.IPNet, err error) {
return return
} }
itf, err = net.InterfaceByName(ifce.Name())
if err != nil {
return
}
conn = &tunTapConn{ conn = &tunTapConn{
ifce: ifce, ifce: ifce,
addr: &net.IPAddr{IP: ip}, addr: &net.IPAddr{IP: ip},

7
tuntap_windows.go
View File

@ -49,7 +49,7 @@ func createTun(cfg TunConfig) (conn net.Conn, ipNet *net.IPNet, err error) {
return return
} }
func createTap(cfg TapConfig) (conn net.Conn, ipNet *net.IPNet, err error) { func createTap(cfg TapConfig) (conn net.Conn, itf *net.Interface, err error) {
ip, ipNet, err := net.ParseCIDR(cfg.Addr) ip, ipNet, err := net.ParseCIDR(cfg.Addr)
if err != nil { if err != nil {
return return
@ -81,6 +81,11 @@ func createTap(cfg TapConfig) (conn net.Conn, ipNet *net.IPNet, err error) {
return return
} }
itf, err = net.InterfaceByName(ifce.Name())
if err != nil {
return
}
conn = &tunTapConn{ conn = &tunTapConn{
ifce: ifce, ifce: ifce,
addr: &net.IPAddr{IP: ip}, addr: &net.IPAddr{IP: ip},

Write Preview
Loading…
Cancel
Save