chore: move some packages to pkg folder

This commit is contained in:
nadoo committed 2022-01-08 15:05:55 +08:00
1 parent a529261893
commit 1fd59a1677
82 files changed
+133 -123

No files matched your search

+10 -4
View File
@@ -1,11 +1,13 @@
package proxy
import (
"context"
"errors"
"net"
"time"
"github.com/nadoo/glider/log"
"github.com/nadoo/glider/pkg/log"
"github.com/nadoo/glider/pkg/sockopt"
)
// Direct proxy.
@@ -86,7 +88,7 @@ func (d *Direct) dial(network, addr string, localIP net.IP) (net.Conn, error) {
dialer := &net.Dialer{LocalAddr: la, Timeout: d.dialTimeout}
if d.iface != nil {
bind(dialer, d.iface)
dialer.Control = sockopt.BindControl(d.iface)
}
c, err := dialer.Dial(network, addr)
@@ -107,13 +109,17 @@ func (d *Direct) dial(network, addr string, localIP net.IP) (net.Conn, error) {
// DialUDP connects to the given address.
func (d *Direct) DialUDP(network, addr string) (net.PacketConn, net.Addr, error) {
// TODO: support specifying local interface
var la string
if d.ip != nil {
la = net.JoinHostPort(d.ip.String(), "0")
}
pc, err := net.ListenPacket(network, la)
lc := &net.ListenConfig{}
if d.iface != nil {
lc.Control = sockopt.BindControl(d.iface)
}
pc, err := lc.ListenPacket(context.Background(), network, la)
if err != nil {
log.F("ListenPacket error: %s", err)
return nil, nil, err