summaryrefslogtreecommitdiff
path: root/transports
diff options
context:
space:
mode:
authorYawning Angel <yawning@torproject.org>2015-06-01 16:15:35 +0000
committerYawning Angel <yawning@torproject.org>2015-06-01 16:15:35 +0000
commit69ffcc39c63f4a9a192082da71eea6b06a1e75d7 (patch)
tree90ef84ad26bd739b1993347379967004fe2c704b /transports
parentcf4dd074fa78f72affa8c701bbb049f9ef547f77 (diff)
Delay transport initialization till after logging has been setup.
Diffstat (limited to 'transports')
-rw-r--r--transports/transports.go11
1 files changed, 5 insertions, 6 deletions
diff --git a/transports/transports.go b/transports/transports.go
index ba4e099..e35673b 100644
--- a/transports/transports.go
+++ b/transports/transports.go
@@ -41,7 +41,7 @@ import (
)
var transportMapLock sync.Mutex
-var transportMap map[string]base.Transport
+var transportMap map[string]base.Transport = make(map[string]base.Transport)
// Register registers a transport protocol.
func Register(transport base.Transport) error {
@@ -81,13 +81,12 @@ func Get(name string) base.Transport {
return t
}
-func init() {
- // Initialize the transport list.
- transportMap = make(map[string]base.Transport)
-
- // Register all the currently supported transports.
+// Init initializes all of the integrated transports.
+func Init() error {
Register(new(obfs2.Transport))
Register(new(obfs3.Transport))
Register(new(obfs4.Transport))
Register(new(scramblesuit.Transport))
+
+ return nil
}