mirror of
https://github.com/nadoo/glider.git
synced 2026-11-19 07:09:42 +08:00
trojan: add new scheme trojanc (trojan cleartext)
This commit is contained in:
1 parent
175ef16a5c
commit
40ddd1be3a
8 files changed
+71
-29
No files matched your search
+24
-9
@@ -15,6 +15,18 @@ import (
|
||||
"github.com/nadoo/glider/proxy/socks"
|
||||
)
|
||||
|
||||
// NewClearTextServer returns a trojan cleartext proxy server.
|
||||
func NewClearTextServer(s string, p proxy.Proxy) (proxy.Server, error) {
|
||||
t, err := NewTrojan(s, nil, p)
|
||||
if err != nil {
|
||||
log.F("[trojan] create instance error: %s", err)
|
||||
return nil, err
|
||||
}
|
||||
|
||||
t.clearText = true
|
||||
return t, nil
|
||||
}
|
||||
|
||||
// NewTrojanServer returns a trojan proxy server.
|
||||
func NewTrojanServer(s string, p proxy.Proxy) (proxy.Server, error) {
|
||||
t, err := NewTrojan(s, nil, p)
|
||||
@@ -60,18 +72,21 @@ func (s *Trojan) ListenAndServe() {
|
||||
}
|
||||
|
||||
// Serve serves a connection.
|
||||
func (s *Trojan) Serve(cc net.Conn) {
|
||||
defer cc.Close()
|
||||
func (s *Trojan) Serve(c net.Conn) {
|
||||
defer c.Close()
|
||||
|
||||
if cc, ok := cc.(*net.TCPConn); ok {
|
||||
cc.SetKeepAlive(true)
|
||||
if c, ok := c.(*net.TCPConn); ok {
|
||||
c.SetKeepAlive(true)
|
||||
}
|
||||
|
||||
c := tls.Server(cc, s.tlsConfig)
|
||||
err := c.Handshake()
|
||||
if err != nil {
|
||||
log.F("[trojan] error in tls handshake: %s", err)
|
||||
return
|
||||
if !s.clearText {
|
||||
tlsConn := tls.Server(c, s.tlsConfig)
|
||||
err := tlsConn.Handshake()
|
||||
if err != nil {
|
||||
log.F("[trojan] error in tls handshake: %s", err)
|
||||
return
|
||||
}
|
||||
c = tlsConn
|
||||
}
|
||||
|
||||
cmd, target, err := s.readHeader(c)
|
||||
|
||||
Reference in new issue
Block a user