mirror of
https://github.com/nadoo/glider.git
synced 2026-11-19 07:09:42 +08:00
proxy: added PackerServer interface
This commit is contained in:
1 parent
253e5008c4
commit
cf1a4e3817
11 files changed
+52
-22
No files matched your search
@@ -15,6 +15,11 @@ type Server interface {
|
||||
Serve(c net.Conn)
|
||||
}
|
||||
|
||||
// PackketServer interface.
|
||||
type PacketServer interface {
|
||||
ServePacket(pc net.PacketConn)
|
||||
}
|
||||
|
||||
// ServerCreator is a function to create proxy servers.
|
||||
type ServerCreator func(s string, proxy Proxy) (Server, error)
|
||||
|
||||
|
||||
@@ -106,8 +106,13 @@ func (s *Socks5) ListenAndServeUDP() {
|
||||
|
||||
log.F("[socks5] listening UDP on %s", s.addr)
|
||||
|
||||
s.ServePacket(lc)
|
||||
}
|
||||
|
||||
// ServePacket implementes proxy.PacketServer.
|
||||
func (s *Socks5) ServePacket(pc net.PacketConn) {
|
||||
for {
|
||||
c := NewPktConn(lc, nil, nil, true, nil)
|
||||
c := NewPktConn(pc, nil, nil, true, nil)
|
||||
buf := pool.GetBuffer(proxy.UDPBufSize)
|
||||
|
||||
n, srcAddr, err := c.ReadFrom(buf)
|
||||
|
||||
+6
-1
@@ -96,7 +96,12 @@ func (s *SS) ListenAndServeUDP() {
|
||||
|
||||
log.F("[ss] listening UDP on %s", s.addr)
|
||||
|
||||
lc = s.PacketConn(lc)
|
||||
s.ServePacket(lc)
|
||||
}
|
||||
|
||||
// ServePacket implementes proxy.PacketServer.
|
||||
func (s *SS) ServePacket(pc net.PacketConn) {
|
||||
lc := s.PacketConn(pc)
|
||||
for {
|
||||
c := NewPktConn(lc, nil, nil, true)
|
||||
buf := pool.GetBuffer(proxy.UDPBufSize)
|
||||
|
||||
@@ -13,6 +13,11 @@ import (
|
||||
"github.com/nadoo/glider/proxy"
|
||||
)
|
||||
|
||||
func init() {
|
||||
proxy.RegisterDialer("trojan", NewTrojanDialer)
|
||||
proxy.RegisterDialer("trojanc", NewClearTextDialer) // cleartext
|
||||
}
|
||||
|
||||
// NewClearTextDialer returns a trojan cleartext proxy dialer.
|
||||
func NewClearTextDialer(s string, d proxy.Dialer) (proxy.Dialer, error) {
|
||||
t, err := NewTrojan(s, d, nil)
|
||||
|
||||
@@ -27,7 +27,7 @@ func NewPktConn(c net.Conn, tgtAddr socks.Addr) *PktConn {
|
||||
|
||||
// ReadFrom implements the necessary function of net.PacketConn.
|
||||
// NOTE: the underlying connection is not udp, we returned the target address here,
|
||||
// it's not the vless server's address, do not WriteTo it.
|
||||
// it's not the server's address, do not WriteTo it.
|
||||
func (pc *PktConn) ReadFrom(b []byte) (int, net.Addr, error) {
|
||||
// ATYP, DST.ADDR, DST.PORT
|
||||
_, err := socks.ReadAddr(pc.Conn)
|
||||
|
||||
@@ -16,6 +16,11 @@ import (
|
||||
"github.com/nadoo/glider/proxy"
|
||||
)
|
||||
|
||||
func init() {
|
||||
proxy.RegisterServer("trojan", NewTrojanServer)
|
||||
proxy.RegisterServer("trojanc", NewClearTextServer) // cleartext
|
||||
}
|
||||
|
||||
// NewClearTextServer returns a trojan cleartext proxy server.
|
||||
func NewClearTextServer(s string, p proxy.Proxy) (proxy.Server, error) {
|
||||
t, err := NewTrojan(s, nil, p)
|
||||
|
||||
@@ -31,13 +31,6 @@ type Trojan struct {
|
||||
fallback string
|
||||
}
|
||||
|
||||
func init() {
|
||||
proxy.RegisterDialer("trojan", NewTrojanDialer)
|
||||
proxy.RegisterServer("trojan", NewTrojanServer)
|
||||
proxy.RegisterDialer("trojanc", NewClearTextDialer) // cleartext
|
||||
proxy.RegisterServer("trojanc", NewClearTextServer) // cleartext
|
||||
}
|
||||
|
||||
// NewTrojan returns a trojan proxy.
|
||||
func NewTrojan(s string, d proxy.Dialer, p proxy.Proxy) (*Trojan, error) {
|
||||
u, err := url.Parse(s)
|
||||
|
||||
+13
-3
@@ -105,9 +105,19 @@ func (s *Unix) ListenAndServeUDP() {
|
||||
|
||||
log.F("[unix] ListenPacket on %s", s.addru)
|
||||
|
||||
s.ServePacket(c)
|
||||
}
|
||||
|
||||
// ServePacket implementes proxy.PacketServer
|
||||
func (s *Unix) ServePacket(pc net.PacketConn) {
|
||||
if server, ok := s.server.(proxy.PacketServer); ok {
|
||||
server.ServePacket(pc)
|
||||
return
|
||||
}
|
||||
|
||||
for {
|
||||
buf := pool.GetBuffer(proxy.UDPBufSize)
|
||||
n, srcAddr, err := c.ReadFrom(buf)
|
||||
n, srcAddr, err := pc.ReadFrom(buf)
|
||||
if err != nil {
|
||||
log.F("[unix] read error: %v", err)
|
||||
continue
|
||||
@@ -118,7 +128,7 @@ func (s *Unix) ListenAndServeUDP() {
|
||||
|
||||
v, ok := nm.Load(sessionKey)
|
||||
if !ok || v == nil {
|
||||
session = newSession(sessionKey, srcAddr, c)
|
||||
session = newSession(sessionKey, srcAddr, pc)
|
||||
nm.Store(sessionKey, session)
|
||||
go s.serveSession(session)
|
||||
} else {
|
||||
@@ -127,8 +137,8 @@ func (s *Unix) ListenAndServeUDP() {
|
||||
|
||||
session.msgCh <- buf[:n]
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
func (s *Unix) serveSession(session *Session) {
|
||||
dstPC, dialer, writeTo, err := s.proxy.DialUDP("udp", "")
|
||||
if err != nil {
|
||||
|
||||
Reference in new issue
Block a user