strategy: add checktimeout config. (#89)

This commit is contained in:
nadoo committed 2019-03-18 23:37:01 +08:00
1 parent 47406ce4ce
commit a22b1d9c86
12 files changed
+91 -74

No files matched your search

+15 -15
View File
@@ -26,10 +26,10 @@ import (
"github.com/nadoo/glider/proxy"
)
// Version is socks5 version number
// Version is socks5 version number.
const Version = 5
// SOCKS5 struct
// SOCKS5 is a base socks5 struct.
type SOCKS5 struct {
dialer proxy.Dialer
addr string
@@ -43,7 +43,7 @@ func init() {
}
// NewSOCKS5 returns a Proxy that makes SOCKS v5 connections to the given address
// with an optional username and password. See RFC 1928
// with an optional username and password. (RFC 1928)
func NewSOCKS5(s string, dialer proxy.Dialer) (*SOCKS5, error) {
u, err := url.Parse(s)
if err != nil {
@@ -65,23 +65,23 @@ func NewSOCKS5(s string, dialer proxy.Dialer) (*SOCKS5, error) {
return h, nil
}
// NewSocks5Dialer returns a socks5 proxy dialer
// NewSocks5Dialer returns a socks5 proxy dialer.
func NewSocks5Dialer(s string, dialer proxy.Dialer) (proxy.Dialer, error) {
return NewSOCKS5(s, dialer)
}
// NewSocks5Server returns a socks5 proxy server
// NewSocks5Server returns a socks5 proxy server.
func NewSocks5Server(s string, dialer proxy.Dialer) (proxy.Server, error) {
return NewSOCKS5(s, dialer)
}
// ListenAndServe serves socks5 requests
// ListenAndServe serves socks5 requests.
func (s *SOCKS5) ListenAndServe() {
go s.ListenAndServeUDP()
s.ListenAndServeTCP()
}
// ListenAndServeTCP .
// ListenAndServeTCP listen and serve on tcp port.
func (s *SOCKS5) ListenAndServeTCP() {
l, err := net.Listen("tcp", s.addr)
if err != nil {
@@ -102,7 +102,7 @@ func (s *SOCKS5) ListenAndServeTCP() {
}
}
// Serve .
// Serve serves a connection.
func (s *SOCKS5) Serve(c net.Conn) {
defer c.Close()
@@ -148,7 +148,7 @@ func (s *SOCKS5) Serve(c net.Conn) {
}
}
// ListenAndServeUDP serves udp requests
// ListenAndServeUDP serves udp requests.
func (s *SOCKS5) ListenAndServeUDP() {
lc, err := net.ListenPacket("udp", s.addr)
if err != nil {
@@ -189,7 +189,7 @@ func (s *SOCKS5) ListenAndServeUDP() {
nm.Store(raddr.String(), pc)
go func() {
conn.TimedCopy(c, raddr, pc, 2*time.Minute)
conn.RelayUDP(c, raddr, pc, 2*time.Minute)
pc.Close()
nm.Delete(raddr.String())
}()
@@ -211,7 +211,7 @@ func (s *SOCKS5) ListenAndServeUDP() {
}
// Addr returns forwarder's address
// Addr returns forwarder's address.
func (s *SOCKS5) Addr() string {
if s.addr == "" {
return s.dialer.Addr()
@@ -219,7 +219,7 @@ func (s *SOCKS5) Addr() string {
return s.addr
}
// NextDialer returns the next dialer
// NextDialer returns the next dialer.
func (s *SOCKS5) NextDialer(dstAddr string) proxy.Dialer { return s.dialer.NextDialer(dstAddr) }
// Dial connects to the address addr on the network net via the SOCKS5 proxy.
@@ -244,7 +244,7 @@ func (s *SOCKS5) Dial(network, addr string) (net.Conn, error) {
return c, nil
}
// DialUDP connects to the given address via the proxy
// DialUDP connects to the given address via the proxy.
func (s *SOCKS5) DialUDP(network, addr string) (pc net.PacketConn, writeTo net.Addr, err error) {
c, err := s.dialer.Dial("tcp", s.addr)
if err != nil {
@@ -293,7 +293,7 @@ func (s *SOCKS5) DialUDP(network, addr string) (pc net.PacketConn, writeTo net.A
// connect takes an existing connection to a socks5 proxy server,
// and commands the server to extend that connection to target,
// which must be a canonical address with a host and port
// which must be a canonical address with a host and port.
func (s *SOCKS5) connect(conn net.Conn, target string) error {
host, portStr, err := net.SplitHostPort(target)
if err != nil {
@@ -424,7 +424,7 @@ func (s *SOCKS5) connect(conn net.Conn, target string) error {
return nil
}
// Handshake fast-tracks SOCKS initialization to get target address to connect
// Handshake fast-tracks SOCKS initialization to get target address to connect.
func (s *SOCKS5) handshake(rw io.ReadWriter) (socks.Addr, error) {
// Read RFC 1928 for request and reply structure and sizes
buf := make([]byte, socks.MaxAddrLen)
+13 -13
View File
@@ -16,7 +16,7 @@ import (
"github.com/nadoo/glider/proxy"
)
// SS .
// SS is a base ss struct.
type SS struct {
dialer proxy.Dialer
addr string
@@ -29,7 +29,7 @@ func init() {
proxy.RegisterServer("ss", NewSSServer)
}
// NewSS returns a shadowsocks proxy
// NewSS returns a ss proxy.
func NewSS(s string, dialer proxy.Dialer) (*SS, error) {
u, err := url.Parse(s)
if err != nil {
@@ -55,23 +55,23 @@ func NewSS(s string, dialer proxy.Dialer) (*SS, error) {
return p, nil
}
// NewSSDialer returns a ss proxy dialer
// NewSSDialer returns a ss proxy dialer.
func NewSSDialer(s string, dialer proxy.Dialer) (proxy.Dialer, error) {
return NewSS(s, dialer)
}
// NewSSServer returns a ss proxy server
// NewSSServer returns a ss proxy server.
func NewSSServer(s string, dialer proxy.Dialer) (proxy.Server, error) {
return NewSS(s, dialer)
}
// ListenAndServe serves ss requests
// ListenAndServe serves ss requests.
func (s *SS) ListenAndServe() {
go s.ListenAndServeUDP()
s.ListenAndServeTCP()
}
// ListenAndServeTCP serves tcp ss requests
// ListenAndServeTCP serves tcp ss requests.
func (s *SS) ListenAndServeTCP() {
l, err := net.Listen("tcp", s.addr)
if err != nil {
@@ -92,7 +92,7 @@ func (s *SS) ListenAndServeTCP() {
}
// Serve serves tcp ss requests
// Serve serves a connection.
func (s *SS) Serve(c net.Conn) {
defer c.Close()
@@ -166,7 +166,7 @@ func (s *SS) Serve(c net.Conn) {
}
// ListenAndServeUDP serves udp ss requests
// ListenAndServeUDP serves udp ss requests.
func (s *SS) ListenAndServeUDP() {
lc, err := net.ListenPacket("udp", s.addr)
if err != nil {
@@ -204,7 +204,7 @@ func (s *SS) ListenAndServeUDP() {
nm.Store(raddr.String(), pc)
go func() {
conn.TimedCopy(c, raddr, pc, 2*time.Minute)
conn.RelayUDP(c, raddr, pc, 2*time.Minute)
pc.Close()
nm.Delete(raddr.String())
}()
@@ -225,12 +225,12 @@ func (s *SS) ListenAndServeUDP() {
}
}
// ListCipher .
// ListCipher returns all the ciphers supported.
func ListCipher() string {
return strings.Join(core.ListCipher(), " ")
}
// Addr returns forwarder's address
// Addr returns forwarder's address.
func (s *SS) Addr() string {
if s.addr == "" {
return s.dialer.Addr()
@@ -238,7 +238,7 @@ func (s *SS) Addr() string {
return s.addr
}
// NextDialer returns the next dialer
// NextDialer returns the next dialer.
func (s *SS) NextDialer(dstAddr string) proxy.Dialer { return s.dialer.NextDialer(dstAddr) }
// Dial connects to the address addr on the network net via the proxy.
@@ -268,7 +268,7 @@ func (s *SS) Dial(network, addr string) (net.Conn, error) {
}
// DialUDP connects to the given address via the proxy
// DialUDP connects to the given address via the proxy.
func (s *SS) DialUDP(network, addr string) (net.PacketConn, net.Addr, error) {
pc, nextHop, err := s.dialer.DialUDP(network, s.addr)
if err != nil {
+5 -5
View File
@@ -16,8 +16,8 @@ import (
type UDPTun struct {
dialer proxy.Dialer
addr string
taddr string // tunnel addr
uaddr *net.UDPAddr // tunnel addr
taddr string // tunnel addr string
tuaddr *net.UDPAddr // tunnel addr
}
func init() {
@@ -41,7 +41,7 @@ func NewUDPTun(s string, dialer proxy.Dialer) (*UDPTun, error) {
taddr: d[1],
}
p.uaddr, err = net.ResolveUDPAddr("udp", p.taddr)
p.tuaddr, err = net.ResolveUDPAddr("udp", p.taddr)
return p, err
}
@@ -85,7 +85,7 @@ func (s *UDPTun) ListenAndServe() {
nm.Store(raddr.String(), pc)
go func() {
conn.TimedCopy(c, raddr, pc, 2*time.Minute)
conn.RelayUDP(c, raddr, pc, 2*time.Minute)
pc.Close()
nm.Delete(raddr.String())
}()
@@ -94,7 +94,7 @@ func (s *UDPTun) ListenAndServe() {
pc = v.(net.PacketConn)
}
_, err = pc.WriteTo(buf[:n], s.uaddr)
_, err = pc.WriteTo(buf[:n], s.tuaddr)
if err != nil {
log.F("[udptun] remote write error: %v", err)
continue
+6 -6
View File
@@ -12,7 +12,7 @@ import (
"github.com/nadoo/glider/proxy"
)
// UoTTun udp over tcp tunnel
// UoTTun is a base udp over tcp tunnel struct.
type UoTTun struct {
dialer proxy.Dialer
addr string
@@ -24,7 +24,7 @@ func init() {
proxy.RegisterServer("uottun", NewUoTTunServer)
}
// NewUoTTun returns a UoTTun proxy
// NewUoTTun returns a UoTTun proxy.
func NewUoTTun(s string, dialer proxy.Dialer) (*UoTTun, error) {
u, err := url.Parse(s)
if err != nil {
@@ -44,12 +44,12 @@ func NewUoTTun(s string, dialer proxy.Dialer) (*UoTTun, error) {
return p, nil
}
// NewUoTTunServer returns a uot tunnel server
// NewUoTTunServer returns a uot tunnel server.
func NewUoTTunServer(s string, dialer proxy.Dialer) (proxy.Server, error) {
return NewUoTTun(s, dialer)
}
// ListenAndServe .
// ListenAndServe listen and serve on tcp.
func (s *UoTTun) ListenAndServe() {
c, err := net.ListenPacket("udp", s.addr)
if err != nil {
@@ -78,7 +78,7 @@ func (s *UoTTun) ListenAndServe() {
go func() {
// no remote forwarder, just a local udp forwarder
if urc, ok := rc.(*net.UDPConn); ok {
conn.TimedCopy(c, clientAddr, urc, 2*time.Minute)
conn.RelayUDP(c, clientAddr, urc, 2*time.Minute)
urc.Close()
return
}
@@ -103,7 +103,7 @@ func (s *UoTTun) ListenAndServe() {
}
}
// Serve .
// Serve is not allowed to be called directly.
func (s *UoTTun) Serve(c net.Conn) {
// TODO
log.F("[uottun] func Serve: can not be called directly")