mirrors/dae
1
0
Fork 0
mirror of https://github.com/daeuniverse/dae.git synced 2025-07-16 19:00:05 +07:00
Code Issues Packages Projects Releases Wiki Activity

feat: support to dial domain for udp and support udp for ssr (#17)

Browse Source
This commit is contained in:
mzz
2023-02-18 00:49:35 +08:00
committed by GitHub
parent 663fbb2a59
commit e495ee1b7c
29 changed files with 182 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
common/netutils/context_dialer.go
View File

@ -7,12 +7,11 @@ package netutils
import (
"context"
"golang.org/x/net/proxy"
"net"
)
type ContextDialer struct {
Dialer proxy.Dialer
Dialer net.Dialer
}
func (d *ContextDialer) DialContext(ctx context.Context, network, addr string) (c net.Conn, err error) {

13
common/netutils/dns.go
View File

@ -9,10 +9,10 @@ import (
"context"
"encoding/binary"
"fmt"
"github.com/mzz2017/softwind/netproxy"
"github.com/mzz2017/softwind/pkg/fastrand"
"github.com/mzz2017/softwind/pool"
"golang.org/x/net/dns/dnsmessage"
"golang.org/x/net/proxy"
"io"
"math"
"net/netip"
@ -70,7 +70,7 @@ func SystemDns() (dns netip.AddrPort, err error) {
return systemDns, nil
}
func ResolveNetip(ctx context.Context, d proxy.Dialer, dns netip.AddrPort, host string, typ dnsmessage.Type, tcp bool) (addrs []netip.Addr, err error) {
func ResolveNetip(ctx context.Context, d netproxy.Dialer, dns netip.AddrPort, host string, typ dnsmessage.Type, tcp bool) (addrs []netip.Addr, err error) {
ctx, cancel := context.WithCancel(ctx)
defer cancel()
if addr, err := netip.ParseAddr(host); err == nil {
@ -122,14 +122,13 @@ func ResolveNetip(ctx context.Context, d proxy.Dialer, dns netip.AddrPort, host
}
// Dial and write.
var network string
cd := &netproxy.ContextDialer{Dialer: d}
var c netproxy.Conn
if tcp {
network = "tcp"
c, err = cd.DialTcpContext(ctx, dns.String())
} else {
network = "udp"
c, err = cd.DialUdpContext(ctx, dns.String())
}
cd := ContextDialer{d}
c, err := cd.DialContext(ctx, network, dns.String())
if err != nil {
return nil, err
}

4
common/netutils/ip46.go
View File

@ -7,8 +7,8 @@ package netutils
import (
"context"
"github.com/mzz2017/softwind/netproxy"
"golang.org/x/net/dns/dnsmessage"
"golang.org/x/net/proxy"
"net/netip"
)
@ -17,7 +17,7 @@ type Ip46 struct {
Ip6 netip.Addr
}
func ParseIp46(ctx context.Context, dialer proxy.Dialer, dns netip.AddrPort, host string, tcp bool) (ipv46 *Ip46, err error) {
func ParseIp46(ctx context.Context, dialer netproxy.Dialer, dns netip.AddrPort, host string, tcp bool) (ipv46 *Ip46, err error) {
addrs4, err := ResolveNetip(ctx, dialer, dns, host, dnsmessage.TypeA, tcp)
if err != nil {
return nil, err