diff options
| author | Cecylia Bocovich <cohosh@torproject.org> | 2022-04-11 11:38:52 -0400 |
|---|---|---|
| committer | Cecylia Bocovich <cohosh@torproject.org> | 2022-04-11 11:38:52 -0400 |
| commit | d807e9d370e79ede725e45edf259223820bb7dc9 (patch) | |
| tree | 66db9ef04fb80f3a8e6c69d5b2802c11f7e2c417 /client | |
| parent | 2f89fbc2ed3e25d2b4be76edc600cca37de91864 (diff) | |
| download | snowflake-d807e9d370e79ede725e45edf259223820bb7dc9.tar.gz snowflake-d807e9d370e79ede725e45edf259223820bb7dc9.zip | |
Move tor-specific code outside of client library
Diffstat (limited to 'client')
| -rw-r--r-- | client/lib/lib_test.go | 5 | ||||
| -rw-r--r-- | client/pt_event_logger.go (renamed from client/lib/pt_event_logger.go) | 2 | ||||
| -rw-r--r-- | client/snowflake.go | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/client/lib/lib_test.go b/client/lib/lib_test.go index 45e8fe2..e1b6427 100644 --- a/client/lib/lib_test.go +++ b/client/lib/lib_test.go @@ -6,6 +6,7 @@ import ( "testing" "time" + "git.torproject.org/pluggable-transports/snowflake.git/v2/common/event" . "github.com/smartystreets/goconvey/convey" ) @@ -171,8 +172,8 @@ func TestSnowflakeClient(t *testing.T) { func TestWebRTCPeer(t *testing.T) { Convey("WebRTCPeer", t, func(c C) { - eventsLogger := NewPTEventLogger() - p := &WebRTCPeer{closed: make(chan struct{}), eventsLogger: eventsLogger} + p := &WebRTCPeer{closed: make(chan struct{}), + eventsLogger: event.NewSnowflakeEventDispatcher()} Convey("checks for staleness", func() { go p.checkForStaleness(time.Second) <-time.After(2 * time.Second) diff --git a/client/lib/pt_event_logger.go b/client/pt_event_logger.go index 25883c4..788c074 100644 --- a/client/lib/pt_event_logger.go +++ b/client/pt_event_logger.go @@ -1,4 +1,4 @@ -package snowflake_client +package main import ( "fmt" diff --git a/client/snowflake.go b/client/snowflake.go index 33834ad..ac66a0d 100644 --- a/client/snowflake.go +++ b/client/snowflake.go @@ -104,7 +104,7 @@ func socksAcceptLoop(ln *pt.SocksListener, config sf.ClientConfig, shutdown chan log.Println("Failed to start snowflake transport: ", err) return } - transport.AddSnowflakeEventListener(sf.NewPTEventLogger()) + transport.AddSnowflakeEventListener(NewPTEventLogger()) err = conn.Grant(&net.TCPAddr{IP: net.IPv4zero, Port: 0}) if err != nil { log.Printf("conn.Grant error: %s", err) |