Browse Source

Revert "move init func to separate files"

This reverts commit 3de50a64129fb6da93a8792de6d55c22aa4d5373.
Darien Raymond 6 years ago
parent
commit
3b02c02ab4

+ 6 - 0
app/commander/commander.go

@@ -100,3 +100,9 @@ func (c *Commander) Close() error {
 
 	return nil
 }
+
+func init() {
+	common.Must(common.RegisterConfig((*Config)(nil), func(ctx context.Context, cfg interface{}) (interface{}, error) {
+		return NewCommander(ctx, cfg.(*Config))
+	}))
+}

+ 0 - 15
app/commander/init.go

@@ -1,15 +0,0 @@
-// +build !confonly
-
-package commander
-
-import (
-	"context"
-
-	"v2ray.com/core/common"
-)
-
-func init() {
-	common.Must(common.RegisterConfig((*Config)(nil), func(ctx context.Context, cfg interface{}) (interface{}, error) {
-		return NewCommander(ctx, cfg.(*Config))
-	}))
-}

+ 0 - 15
app/dns/init.go

@@ -1,15 +0,0 @@
-// +build !confonly
-
-package dns
-
-import (
-	"context"
-
-	"v2ray.com/core/common"
-)
-
-func init() {
-	common.Must(common.RegisterConfig((*Config)(nil), func(ctx context.Context, config interface{}) (interface{}, error) {
-		return New(ctx, config.(*Config))
-	}))
-}

+ 6 - 0
app/dns/server.go

@@ -220,3 +220,9 @@ func (s *Server) lookupIPInternal(domain string, option IPOption) ([]net.IP, err
 
 	return nil, newError("returning nil for domain ", domain).Base(lastErr)
 }
+
+func init() {
+	common.Must(common.RegisterConfig((*Config)(nil), func(ctx context.Context, config interface{}) (interface{}, error) {
+		return New(ctx, config.(*Config))
+	}))
+}

+ 7 - 0
transport/internet/kcp/config.go

@@ -3,6 +3,7 @@ package kcp
 import (
 	"crypto/cipher"
 
+	"v2ray.com/core/common"
 	"v2ray.com/core/transport/internet"
 )
 
@@ -96,3 +97,9 @@ func (c *Config) GetReceivingInFlightSize() uint32 {
 func (c *Config) GetReceivingBufferSize() uint32 {
 	return c.GetReadBufferSize() / c.GetMTUValue()
 }
+
+func init() {
+	common.Must(internet.RegisterProtocolConfigCreator(protocolName, func() interface{} {
+		return new(Config)
+	}))
+}

+ 5 - 0
transport/internet/kcp/dialer.go

@@ -6,6 +6,7 @@ import (
 	"io"
 	"sync/atomic"
 
+	"v2ray.com/core/common"
 	"v2ray.com/core/common/buf"
 	"v2ray.com/core/common/dice"
 	"v2ray.com/core/common/net"
@@ -91,3 +92,7 @@ func DialKCP(ctx context.Context, dest net.Destination, streamSettings *internet
 
 	return iConn, nil
 }
+
+func init() {
+	common.Must(internet.RegisterTransportDialer(protocolName, DialKCP))
+}

+ 0 - 22
transport/internet/kcp/init.go

@@ -1,22 +0,0 @@
-// +build !confonly
-
-package kcp
-
-import (
-	"v2ray.com/core/common"
-	"v2ray.com/core/transport/internet"
-)
-
-func init() {
-	common.Must(internet.RegisterTransportDialer(protocolName, DialKCP))
-}
-
-func init() {
-	common.Must(internet.RegisterTransportListener(protocolName, ListenKCP))
-}
-
-func init() {
-	common.Must(internet.RegisterProtocolConfigCreator(protocolName, func() interface{} {
-		return new(Config)
-	}))
-}

+ 5 - 0
transport/internet/kcp/listener.go

@@ -6,6 +6,7 @@ import (
 	"crypto/tls"
 	"sync"
 
+	"v2ray.com/core/common"
 	"v2ray.com/core/common/buf"
 	"v2ray.com/core/common/net"
 	"v2ray.com/core/transport/internet"
@@ -189,3 +190,7 @@ func (w *Writer) Close() error {
 func ListenKCP(ctx context.Context, address net.Address, port net.Port, streamSettings *internet.MemoryStreamConfig, addConn internet.ConnHandler) (internet.Listener, error) {
 	return NewListener(ctx, address, port, streamSettings, addConn)
 }
+
+func init() {
+	common.Must(internet.RegisterTransportListener(protocolName, ListenKCP))
+}

+ 4 - 0
transport/internet/quic/dialer.go

@@ -210,3 +210,7 @@ func Dial(ctx context.Context, dest net.Destination, streamSettings *internet.Me
 
 	return client.openConnection(destAddr, config, tlsConfig, streamSettings.SocketSettings)
 }
+
+func init() {
+	common.Must(internet.RegisterTransportDialer(protocolName, Dial))
+}

+ 5 - 0
transport/internet/quic/hub.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"time"
 
+	"v2ray.com/core/common"
 	"v2ray.com/core/common/net"
 	"v2ray.com/core/common/protocol/tls/cert"
 	"v2ray.com/core/common/signal/done"
@@ -130,3 +131,7 @@ func Listen(ctx context.Context, address net.Address, port net.Port, streamSetti
 
 	return listener, nil
 }
+
+func init() {
+	common.Must(internet.RegisterTransportListener(protocolName, Listen))
+}

+ 0 - 22
transport/internet/quic/init.go

@@ -1,22 +0,0 @@
-// +build !confonly
-
-package quic
-
-import (
-	"v2ray.com/core/common"
-	"v2ray.com/core/transport/internet"
-)
-
-func init() {
-	common.Must(internet.RegisterProtocolConfigCreator(protocolName, func() interface{} {
-		return new(Config)
-	}))
-}
-
-func init() {
-	common.Must(internet.RegisterTransportDialer(protocolName, Dial))
-}
-
-func init() {
-	common.Must(internet.RegisterTransportListener(protocolName, Listen))
-}

+ 11 - 0
transport/internet/quic/quic.go

@@ -1,5 +1,10 @@
 package quic
 
+import (
+	"v2ray.com/core/common"
+	"v2ray.com/core/transport/internet"
+)
+
 //go:generate errorgen
 
 // Here is some modification needs to be done before update quic vendor.
@@ -10,3 +15,9 @@ package quic
 
 const protocolName = "quic"
 const internalDomain = "quic.internal.v2ray.com"
+
+func init() {
+	common.Must(internet.RegisterProtocolConfigCreator(protocolName, func() interface{} {
+		return new(Config)
+	}))
+}