go-gost/gost
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update registry

Browse Source
This commit is contained in:
ginuerzh
2022-02-27 22:32:15 +08:00
parent 0aee4f0ebd
commit 07132d8de7
115 changed files with 651 additions and 680 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/listener/dns/listener.go
View File

@ -17,7 +17,7 @@ import (
)
func init() {
registry.RegisterListener("dns", NewListener)
registry.ListenerRegistry().Register("dns", NewListener)
}
type dnsListener struct {

14
pkg/listener/ftcp/listener.go
View File

@ -13,7 +13,7 @@ import (
)
func init() {
registry.RegisterListener("ftcp", NewListener)
registry.ListenerRegistry().Register("ftcp", NewListener)
}
type ftcpListener struct {
@ -69,7 +69,7 @@ func (l *ftcpListener) Accept() (conn net.Conn, err error) {
func (l *ftcpListener) Close() error {
err := l.conn.Close()
l.connPool.Range(func(k interface{}, v *serverConn) bool {
l.connPool.Range(func(k any, v *serverConn) bool {
v.Close()
return true
})
@ -128,7 +128,7 @@ type connPool struct {
m sync.Map
}
func (p *connPool) Get(key interface{}) (conn *serverConn, ok bool) {
func (p *connPool) Get(key any) (conn *serverConn, ok bool) {
v, ok := p.m.Load(key)
if ok {
conn, ok = v.(*serverConn)
@ -136,18 +136,18 @@ func (p *connPool) Get(key interface{}) (conn *serverConn, ok bool) {
return
}
func (p *connPool) Set(key interface{}, conn *serverConn) {
func (p *connPool) Set(key any, conn *serverConn) {
p.m.Store(key, conn)
atomic.AddInt64(&p.size, 1)
}
func (p *connPool) Delete(key interface{}) {
func (p *connPool) Delete(key any) {
p.m.Delete(key)
atomic.AddInt64(&p.size, -1)
}
func (p *connPool) Range(f func(key interface{}, value *serverConn) bool) {
p.m.Range(func(k, v interface{}) bool {
func (p *connPool) Range(f func(key any, value *serverConn) bool) {
p.m.Range(func(k, v any) bool {
return f(k, v.(*serverConn))
})
}

2
pkg/listener/grpc/listener.go
View File

@ -13,7 +13,7 @@ import (
)
func init() {
registry.RegisterListener("grpc", NewListener)
registry.ListenerRegistry().Register("grpc", NewListener)
}
type grpcListener struct {

4
pkg/listener/http2/h2/listener.go
View File

@ -16,8 +16,8 @@ import (
)
func init() {
registry.RegisterListener("h2c", NewListener)
registry.RegisterListener("h2", NewTLSListener)
registry.ListenerRegistry().Register("h2c", NewListener)
registry.ListenerRegistry().Register("h2", NewTLSListener)
}
type h2Listener struct {

2
pkg/listener/http2/listener.go
View File

@ -15,7 +15,7 @@ import (
)
func init() {
registry.RegisterListener("http2", NewListener)
registry.ListenerRegistry().Register("http2", NewListener)
}
type http2Listener struct {

4
pkg/listener/http3/listener.go
View File

@ -12,8 +12,8 @@ import (
)
func init() {
registry.RegisterListener("http3", NewListener)
registry.RegisterListener("h3", NewListener)
registry.ListenerRegistry().Register("http3", NewListener)
registry.ListenerRegistry().Register("h3", NewListener)
}
type http3Listener struct {

2
pkg/listener/kcp/listener.go
View File

@ -15,7 +15,7 @@ import (
)
func init() {
registry.RegisterListener("kcp", NewListener)
registry.ListenerRegistry().Register("kcp", NewListener)
}
type kcpListener struct {

2
pkg/listener/obfs/http/listener.go
View File

@ -10,7 +10,7 @@ import (
)
func init() {
registry.RegisterListener("ohttp", NewListener)
registry.ListenerRegistry().Register("ohttp", NewListener)
}
type obfsListener struct {

2
pkg/listener/obfs/tls/listener.go
View File

@ -10,7 +10,7 @@ import (
)
func init() {
registry.RegisterListener("otls", NewListener)
registry.ListenerRegistry().Register("otls", NewListener)
}
type obfsListener struct {

4
pkg/listener/pht/listener.go
View File

@ -13,8 +13,8 @@ import (
)
func init() {
registry.RegisterListener("pht", NewListener)
registry.RegisterListener("phts", NewTLSListener)
registry.ListenerRegistry().Register("pht", NewListener)
registry.ListenerRegistry().Register("phts", NewTLSListener)
}
type phtListener struct {

2
pkg/listener/quic/listener.go
View File

@ -13,7 +13,7 @@ import (
)
func init() {
registry.RegisterListener("quic", NewListener)
registry.ListenerRegistry().Register("quic", NewListener)
}
type quicListener struct {

2
pkg/listener/redirect/udp/listener.go
View File

@ -10,7 +10,7 @@ import (
)
func init() {
registry.RegisterListener("redu", NewListener)
registry.ListenerRegistry().Register("redu", NewListener)
}
type redirectListener struct {

2
pkg/listener/rtcp/listener.go
View File

@ -13,7 +13,7 @@ import (
)
func init() {
registry.RegisterListener("rtcp", NewListener)
registry.ListenerRegistry().Register("rtcp", NewListener)
}
type rtcpListener struct {

2
pkg/listener/rudp/listener.go
View File

@ -13,7 +13,7 @@ import (
)
func init() {
registry.RegisterListener("rudp", NewListener)
registry.ListenerRegistry().Register("rudp", NewListener)
}
type rudpListener struct {

4
pkg/listener/ssh/listener.go
View File

@ -14,7 +14,7 @@ import (
)
func init() {
registry.RegisterListener("ssh", NewListener)
registry.ListenerRegistry().Register("ssh", NewListener)
}
type sshListener struct {
@ -99,7 +99,7 @@ func (l *sshListener) serveConn(conn net.Conn) {
start := time.Now()
l.logger.Infof("%s <> %s", conn.RemoteAddr(), conn.LocalAddr())
defer func() {
l.logger.WithFields(map[string]interface{}{
l.logger.WithFields(map[string]any{
"duration": time.Since(start),
}).Infof("%s >< %s", conn.RemoteAddr(), conn.LocalAddr())
}()

4
pkg/listener/sshd/listener.go
View File

@ -23,7 +23,7 @@ const (
)
func init() {
registry.RegisterListener("sshd", NewListener)
registry.ListenerRegistry().Register("sshd", NewListener)
}
type sshdListener struct {
@ -108,7 +108,7 @@ func (l *sshdListener) serveConn(conn net.Conn) {
start := time.Now()
l.logger.Infof("%s <> %s", conn.RemoteAddr(), conn.LocalAddr())
defer func() {
l.logger.WithFields(map[string]interface{}{
l.logger.WithFields(map[string]any{
"duration": time.Since(start),
}).Infof("%s >< %s", conn.RemoteAddr(), conn.LocalAddr())
}()

2
pkg/listener/tap/listener.go
View File

@ -11,7 +11,7 @@ import (
)
func init() {
registry.RegisterListener("tap", NewListener)
registry.ListenerRegistry().Register("tap", NewListener)
}
type tapListener struct {

2
pkg/listener/tcp/listener.go
View File

@ -10,7 +10,7 @@ import (
)
func init() {
registry.RegisterListener("tcp", NewListener)
registry.ListenerRegistry().Register("tcp", NewListener)
}
type tcpListener struct {

2
pkg/listener/tls/listener.go
View File

@ -11,7 +11,7 @@ import (
)
func init() {
registry.RegisterListener("tls", NewListener)
registry.ListenerRegistry().Register("tls", NewListener)
}
type tlsListener struct {

2
pkg/listener/tls/mux/listener.go
View File

@ -12,7 +12,7 @@ import (
)
func init() {
registry.RegisterListener("mtls", NewListener)
registry.ListenerRegistry().Register("mtls", NewListener)
}
type mtlsListener struct {

2
pkg/listener/tun/listener.go
View File

@ -11,7 +11,7 @@ import (
)
func init() {
registry.RegisterListener("tun", NewListener)
registry.ListenerRegistry().Register("tun", NewListener)
}
type tunListener struct {

2
pkg/listener/udp/listener.go
View File

@ -11,7 +11,7 @@ import (
)
func init() {
registry.RegisterListener("udp", NewListener)
registry.ListenerRegistry().Register("udp", NewListener)
}
type udpListener struct {

6
pkg/listener/ws/listener.go
View File

@ -15,8 +15,8 @@ import (
)
func init() {
registry.RegisterListener("ws", NewListener)
registry.RegisterListener("wss", NewTLSListener)
registry.ListenerRegistry().Register("ws", NewListener)
registry.ListenerRegistry().Register("wss", NewTLSListener)
}
type wsListener struct {
@ -121,7 +121,7 @@ func (l *wsListener) Addr() net.Addr {
func (l *wsListener) upgrade(w http.ResponseWriter, r *http.Request) {
if l.logger.IsLevelEnabled(logger.DebugLevel) {
log := l.logger.WithFields(map[string]interface{}{
log := l.logger.WithFields(map[string]any{
"local": l.addr.String(),
"remote": r.RemoteAddr,
})

6
pkg/listener/ws/mux/listener.go
View File

@ -16,8 +16,8 @@ import (
)
func init() {
registry.RegisterListener("mws", NewListener)
registry.RegisterListener("mwss", NewTLSListener)
registry.ListenerRegistry().Register("mws", NewListener)
registry.ListenerRegistry().Register("mwss", NewTLSListener)
}
type mwsListener struct {
@ -126,7 +126,7 @@ func (l *mwsListener) Addr() net.Addr {
func (l *mwsListener) upgrade(w http.ResponseWriter, r *http.Request) {
if l.logger.IsLevelEnabled(logger.DebugLevel) {
log := l.logger.WithFields(map[string]interface{}{
log := l.logger.WithFields(map[string]any{
"local": l.addr.String(),
"remote": r.RemoteAddr,
})