mirrors/wireproxy
1
0
Fork 0
mirror of https://github.com/whyvl/wireproxy.git synced 2025-04-29 19:01:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

make VirtualTun fields public

Browse source
This commit is contained in:
Fabian Off 2022-12-23 09:22:11 +01:00 • committed by Fabian Off
parent 2d53f675af
commit b18b709f84
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
routine.go
View file

@ -28,8 +28,8 @@ type CredentialValidator struct {
// VirtualTun stores a reference to netstack network and DNS configuration // VirtualTun stores a reference to netstack network and DNS configuration
type VirtualTun struct { type VirtualTun struct {
tnet *netstack.Net Tnet *netstack.Net
systemDNS bool SystemDNS bool
} }
// RoutineSpawner spawns a routine (e.g. socks5, tcp static routes) after the configuration is parsed // RoutineSpawner spawns a routine (e.g. socks5, tcp static routes) after the configuration is parsed
@ -45,10 +45,10 @@ type addressPort struct {
// LookupAddr lookups a hostname. // LookupAddr lookups a hostname.
// DNS traffic may or may not be routed depending on VirtualTun's setting // DNS traffic may or may not be routed depending on VirtualTun's setting
func (d VirtualTun) LookupAddr(ctx context.Context, name string) ([]string, error) { func (d VirtualTun) LookupAddr(ctx context.Context, name string) ([]string, error) {
if d.systemDNS { if d.SystemDNS {
return net.DefaultResolver.LookupHost(ctx, name) return net.DefaultResolver.LookupHost(ctx, name)
} else { } else {
return d.tnet.LookupContextHost(ctx, name) return d.Tnet.LookupContextHost(ctx, name)
} }
} }
@ -121,7 +121,7 @@ func (d VirtualTun) resolveToAddrPort(endpoint *addressPort) (*netip.AddrPort, e
// SpawnRoutine spawns a socks5 server. // SpawnRoutine spawns a socks5 server.
func (config *Socks5Config) SpawnRoutine(vt *VirtualTun) { func (config *Socks5Config) SpawnRoutine(vt *VirtualTun) {
conf := &socks5.Config{Dial: vt.tnet.DialContext, Resolver: vt} conf := &socks5.Config{Dial: vt.Tnet.DialContext, Resolver: vt}
if username := config.Username; username != "" { if username := config.Username; username != "" {
validator := CredentialValidator{username: username} validator := CredentialValidator{username: username}
validator.password = config.Password validator.password = config.Password
@ -166,7 +166,7 @@ func tcpClientForward(vt *VirtualTun, raddr *addressPort, conn net.Conn) {
tcpAddr := TCPAddrFromAddrPort(*target) tcpAddr := TCPAddrFromAddrPort(*target)
sconn, err := vt.tnet.DialTCP(tcpAddr) sconn, err := vt.Tnet.DialTCP(tcpAddr)
if err != nil { if err != nil {
errorLogger.Printf("TCP Client Tunnel to %s: %s\n", target, err.Error()) errorLogger.Printf("TCP Client Tunnel to %s: %s\n", target, err.Error())
return return
@ -225,7 +225,7 @@ func (conf *TCPServerTunnelConfig) SpawnRoutine(vt *VirtualTun) {
} }
addr := &net.TCPAddr{Port: conf.ListenPort} addr := &net.TCPAddr{Port: conf.ListenPort}
server, err := vt.tnet.ListenTCP(addr) server, err := vt.Tnet.ListenTCP(addr)
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }

4
wireguard.go
View file

@ -75,7 +75,7 @@ func StartWireguard(conf *DeviceConfig) (*VirtualTun, error) {
} }
return &VirtualTun{ return &VirtualTun{
tnet: tnet, Tnet: tnet,
systemDNS: len(setting.dns) == 0, SystemDNS: len(setting.dns) == 0,
}, nil }, nil
} }