aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormeskio <meskio@torproject.org>2022-05-25 17:56:12 +0200
committermeskio <meskio@torproject.org>2022-05-25 18:09:09 +0200
commit3473b438e518f12fc1e0945b362e8cef25756b4f (patch)
treeb7f8aec4f81331349b5dbe253b646cc75303c03d
parent1d592b06e51b42ca4ed13ec219f012a2915c2b1d (diff)
downloadsnowflake-3473b438e518f12fc1e0945b362e8cef25756b4f.tar.gz
snowflake-3473b438e518f12fc1e0945b362e8cef25756b4f.zip
Move ptEventLogger into the client/snowflake.go
Remove client/pt_event_logger.go file as is very minimal.
-rw-r--r--client/pt_event_logger.go17
-rw-r--r--client/snowflake.go12
2 files changed, 12 insertions, 17 deletions
diff --git a/client/pt_event_logger.go b/client/pt_event_logger.go
deleted file mode 100644
index 483a3c6..0000000
--- a/client/pt_event_logger.go
+++ /dev/null
@@ -1,17 +0,0 @@
-package main
-
-import (
- pt "git.torproject.org/pluggable-transports/goptlib.git"
- "git.torproject.org/pluggable-transports/snowflake.git/v2/common/event"
-)
-
-func NewPTEventLogger() event.SnowflakeEventReceiver {
- return &ptEventLogger{}
-}
-
-type ptEventLogger struct {
-}
-
-func (p ptEventLogger) OnNewSnowflakeEvent(e event.SnowflakeEvent) {
- pt.Log(pt.LogSeverityNotice, e.String())
-}
diff --git a/client/snowflake.go b/client/snowflake.go
index ac66a0d..2cb6549 100644
--- a/client/snowflake.go
+++ b/client/snowflake.go
@@ -17,6 +17,7 @@ import (
pt "git.torproject.org/pluggable-transports/goptlib.git"
sf "git.torproject.org/pluggable-transports/snowflake.git/v2/client/lib"
+ "git.torproject.org/pluggable-transports/snowflake.git/v2/common/event"
"git.torproject.org/pluggable-transports/snowflake.git/v2/common/safelog"
)
@@ -24,6 +25,17 @@ const (
DefaultSnowflakeCapacity = 1
)
+type ptEventLogger struct {
+}
+
+func NewPTEventLogger() event.SnowflakeEventReceiver {
+ return &ptEventLogger{}
+}
+
+func (p ptEventLogger) OnNewSnowflakeEvent(e event.SnowflakeEvent) {
+ pt.Log(pt.LogSeverityNotice, e.String())
+}
+
// Exchanges bytes between two ReadWriters.
// (In this case, between a SOCKS connection and a snowflake transport conn)
func copyLoop(socks, sfconn io.ReadWriter) {