Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
O
obfs4-deprecated
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
leap
obfs4-deprecated
Commits
69ffcc39
Commit
69ffcc39
authored
9 years ago
by
Yawning Angel
Browse files
Options
Downloads
Patches
Plain Diff
Delay transport initialization till after logging has been setup.
parent
cf4dd074
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
ChangeLog
+2
-0
2 additions, 0 deletions
ChangeLog
obfs4proxy/obfs4proxy.go
+4
-0
4 additions, 0 deletions
obfs4proxy/obfs4proxy.go
transports/transports.go
+5
-6
5 additions, 6 deletions
transports/transports.go
with
11 additions
and
6 deletions
ChangeLog
+
2
−
0
View file @
69ffcc39
Changes in version 0.0.6 - UNRELEASED:
- Delay transport factory initialization till after logging has been
initialized.
Changes in version 0.0.5 - 2015-04-15:
- Go vet/fmt fixes, and misc. code cleanups. Patches by mvdan.
...
...
This diff is collapsed.
Click to expand it.
obfs4proxy/obfs4proxy.go
+
4
−
0
View file @
69ffcc39
...
...
@@ -347,6 +347,10 @@ func main() {
if
err
=
log
.
Init
(
*
enableLogging
,
path
.
Join
(
stateDir
,
obfs4proxyLogFile
),
*
unsafeLogging
);
err
!=
nil
{
golog
.
Fatalf
(
"[ERROR]: %s - failed to initialize logging"
,
execName
)
}
if
err
=
transports
.
Init
();
err
!=
nil
{
log
.
Errorf
(
"%s - failed to initialize transports: %s"
,
execName
,
err
)
os
.
Exit
(
-
1
)
}
log
.
Noticef
(
"%s - launched"
,
getVersion
())
...
...
This diff is collapsed.
Click to expand it.
transports/transports.go
+
5
−
6
View file @
69ffcc39
...
...
@@ -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
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment