diff options
author | meskio <meskio@torproject.org> | 2023-05-30 19:54:04 +0200 |
---|---|---|
committer | meskio <meskio@torproject.org> | 2023-05-31 10:01:47 +0200 |
commit | 82cc0f38f73c4ca4e12d22173562a092ebd4dea0 (patch) | |
tree | eb60616af613a8a62c610a3bf7ac19e6a8e796a1 | |
parent | 88608ad44a00d2a23680800d54ed03b167c09c89 (diff) | |
download | snowflake-82cc0f38f73c4ca4e12d22173562a092ebd4dea0.tar.gz snowflake-82cc0f38f73c4ca4e12d22173562a092ebd4dea0.zip |
Move the development to gitlab
Related: tpo/anti-censorship/team#86
38 files changed, 78 insertions, 78 deletions
diff --git a/Vagrantfile b/Vagrantfile index 36a31fe..739fbc8 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -4,7 +4,7 @@ require 'yaml' srvpath = Pathname.new(File.dirname(__FILE__)).realpath configfile = YAML.load_file(File.join(srvpath, "/.gitlab-ci.yml")) -remote_url = 'https://git.torproject.org/pluggable-transports/snowflake.git' +remote_url = 'https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake' # set up essential environment variables env = configfile['variables'] diff --git a/broker/amp.go b/broker/amp.go index 36987a7..4f047ec 100644 --- a/broker/amp.go +++ b/broker/amp.go @@ -5,8 +5,8 @@ import ( "net/http" "strings" - "git.torproject.org/pluggable-transports/snowflake.git/v2/common/amp" - "git.torproject.org/pluggable-transports/snowflake.git/v2/common/messages" + "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/amp" + "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/messages" ) // ampClientOffers is the AMP-speaking endpoint for client poll messages, diff --git a/broker/bridge-list.go b/broker/bridge-list.go index 4433a12..567e9e5 100644 --- a/broker/bridge-list.go +++ b/broker/bridge-list.go @@ -29,7 +29,7 @@ import ( "io" "sync" - "git.torproject.org/pluggable-transports/snowflake.git/v2/common/bridgefingerprint" + "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/bridgefingerprint" ) var ErrBridgeNotFound = errors.New("bridge not found") diff --git a/broker/bridge-list_test.go b/broker/bridge-list_test.go index 4b53821..d74a4be 100644 --- a/broker/bridge-list_test.go +++ b/broker/bridge-list_test.go @@ -3,8 +3,8 @@ package main import ( "bytes" "encoding/hex" - "git.torproject.org/pluggable-transports/snowflake.git/v2/common/bridgefingerprint" . "github.com/smartystreets/goconvey/convey" + "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/bridgefingerprint" "testing" ) diff --git a/broker/broker.go b/broker/broker.go index c356de9..c3541c1 100644 --- a/broker/broker.go +++ b/broker/broker.go @@ -10,9 +10,9 @@ import ( "container/heap" "crypto/tls" "flag" - "git.torproject.org/pluggable-transports/snowflake.git/v2/common/bridgefingerprint" - "git.torproject.org/pluggable-transports/snowflake.git/v2/common/ipsetsink" - "git.torproject.org/pluggable-transports/snowflake.git/v2/common/ipsetsink/sinkcluster" + "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/bridgefingerprint" + "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/ipsetsink" + "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/ipsetsink/sinkcluster" "io" "log" "net/http" @@ -23,10 +23,10 @@ import ( "syscall" "time" - "git.torproject.org/pluggable-transports/snowflake.git/v2/common/namematcher" - "git.torproject.org/pluggable-transports/snowflake.git/v2/common/safelog" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" + "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/namematcher" + "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/safelog" "golang.org/x/crypto/acme/autocert" ) diff --git a/broker/http.go b/broker/http.go index 32f6a71..6057faa 100644 --- a/broker/http.go +++ b/broker/http.go @@ -10,7 +10,7 @@ import ( "net/http" "os" - "git.torproject.org/pluggable-transports/snowflake.git/v2/common/messages" + "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/messages" ) const ( diff --git a/broker/ipc.go b/broker/ipc.go index a1397d8..b77c579 100644 --- a/broker/ipc.go +++ b/broker/ipc.go @@ -8,10 +8,10 @@ import ( "net" "time" - "git.torproject.org/pluggable-transports/snowflake.git/v2/common/bridgefingerprint" + "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/bridgefingerprint" - "git.torproject.org/pluggable-transports/snowflake.git/v2/common/messages" "github.com/prometheus/client_golang/prometheus" + "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/messages" ) const ( diff --git a/broker/metrics.go b/broker/metrics.go index 77b7675..b3f9d40 100644 --- a/broker/metrics.go +++ b/broker/metrics.go @@ -14,10 +14,10 @@ import ( "sync" "time" - "git.torproject.org/pluggable-transports/snowflake.git/v2/common/ipsetsink/sinkcluster" - "git.torproject.org/pluggable-transports/snowflake.git/v2/common/messages" "github.com/prometheus/client_golang/prometheus" "gitlab.torproject.org/tpo/anti-censorship/geoip" + "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/ipsetsink/sinkcluster" + "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/messages" ) const ( diff --git a/broker/snowflake-broker_test.go b/broker/snowflake-broker_test.go index 5eafd4a..37b17ec 100644 --- a/broker/snowflake-broker_test.go +++ b/broker/snowflake-broker_test.go @@ -15,9 +15,9 @@ import ( "testing" "time" - "git.torproject.org/pluggable-transports/snowflake.git/v2/common/amp" - "git.torproject.org/pluggable-transports/snowflake.git/v2/common/messages" . "github.com/smartystreets/goconvey/convey" + "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/amp" + "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/messages" ) func NullLogger() *log.Logger { diff --git a/client/lib/lib_test.go b/client/lib/lib_test.go index d53482c..5eab4a0 100644 --- a/client/lib/lib_test.go +++ b/client/lib/lib_test.go @@ -6,8 +6,8 @@ import ( "testing" "time" - "git.torproject.org/pluggable-transports/snowflake.git/v2/common/event" . "github.com/smartystreets/goconvey/convey" + "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/event" ) type FakeDialer struct { diff --git a/client/lib/rendezvous.go b/client/lib/rendezvous.go index 38e4620..ef0bf29 100644 --- a/client/lib/rendezvous.go +++ b/client/lib/rendezvous.go @@ -12,13 +12,13 @@ import ( "sync" "time" - "git.torproject.org/pluggable-transports/snowflake.git/v2/common/event" - "git.torproject.org/pluggable-transports/snowflake.git/v2/common/messages" - "git.torproject.org/pluggable-transports/snowflake.git/v2/common/nat" - "git.torproject.org/pluggable-transports/snowflake.git/v2/common/util" - utlsutil "git.torproject.org/pluggable-transports/snowflake.git/v2/common/utls" "github.com/pion/webrtc/v3" utls "github.com/refraction-networking/utls" + "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/event" + "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/messages" + "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/nat" + "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/util" + utlsutil "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/utls" ) const ( diff --git a/client/lib/rendezvous_ampcache.go b/client/lib/rendezvous_ampcache.go index 59456ae..593904e 100644 --- a/client/lib/rendezvous_ampcache.go +++ b/client/lib/rendezvous_ampcache.go @@ -8,7 +8,7 @@ import ( "net/http" "net/url" - "git.torproject.org/pluggable-transports/snowflake.git/v2/common/amp" + "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/amp" ) // ampCacheRendezvous is a RendezvousMethod that communicates with the diff --git a/client/lib/rendezvous_test.go b/client/lib/rendezvous_test.go index 21b9f57..918d723 100644 --- a/client/lib/rendezvous_test.go +++ b/client/lib/rendezvous_test.go @@ -9,10 +9,10 @@ import ( "net/http" "testing" - "git.torproject.org/pluggable-transports/snowflake.git/v2/common/amp" - "git.torproject.org/pluggable-transports/snowflake.git/v2/common/messages" - "git.torproject.org/pluggable-transports/snowflake.git/v2/common/nat" . "github.com/smartystreets/goconvey/convey" + "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/amp" + "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/messages" + "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/nat" ) // mockTransport's RoundTrip method returns a response with a fake status and diff --git a/client/lib/snowflake.go b/client/lib/snowflake.go index cc0005c..bcfadb3 100644 --- a/client/lib/snowflake.go +++ b/client/lib/snowflake.go @@ -35,13 +35,13 @@ import ( "strings" "time" - "git.torproject.org/pluggable-transports/snowflake.git/v2/common/event" - "git.torproject.org/pluggable-transports/snowflake.git/v2/common/nat" - "git.torproject.org/pluggable-transports/snowflake.git/v2/common/turbotunnel" "github.com/pion/ice/v2" "github.com/pion/webrtc/v3" "github.com/xtaci/kcp-go/v5" "github.com/xtaci/smux" + "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/event" + "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/nat" + "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/turbotunnel" ) const ( diff --git a/client/lib/turbotunnel.go b/client/lib/turbotunnel.go index 8cdce42..f2141e9 100644 --- a/client/lib/turbotunnel.go +++ b/client/lib/turbotunnel.go @@ -7,7 +7,7 @@ import ( "net" "time" - "git.torproject.org/pluggable-transports/snowflake.git/v2/common/encapsulation" + "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/encapsulation" ) var errNotImplemented = errors.New("not implemented") diff --git a/client/lib/webrtc.go b/client/lib/webrtc.go index 9afe1a4..7d986d3 100644 --- a/client/lib/webrtc.go +++ b/client/lib/webrtc.go @@ -11,9 +11,9 @@ import ( "sync" "time" - "git.torproject.org/pluggable-transports/snowflake.git/v2/common/event" "github.com/pion/ice/v2" "github.com/pion/webrtc/v3" + "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/event" ) // WebRTCPeer represents a WebRTC connection to a remote snowflake proxy. diff --git a/client/snowflake.go b/client/snowflake.go index 5db9b44..cb6fa82 100644 --- a/client/snowflake.go +++ b/client/snowflake.go @@ -16,11 +16,11 @@ import ( "sync" "syscall" - 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" - "git.torproject.org/pluggable-transports/snowflake.git/v2/common/version" pt "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/goptlib" + sf "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/client/lib" + "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/event" + "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/safelog" + "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/version" ) const ( diff --git a/common/event/interface.go b/common/event/interface.go index 6386430..a7fa532 100644 --- a/common/event/interface.go +++ b/common/event/interface.go @@ -3,8 +3,8 @@ package event import ( "fmt" - "git.torproject.org/pluggable-transports/snowflake.git/v2/common/safelog" "github.com/pion/webrtc/v3" + "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/safelog" ) type SnowflakeEvent interface { diff --git a/common/ipsetsink/sinkcluster/writer.go b/common/ipsetsink/sinkcluster/writer.go index 1c409e8..29cdb9c 100644 --- a/common/ipsetsink/sinkcluster/writer.go +++ b/common/ipsetsink/sinkcluster/writer.go @@ -7,7 +7,7 @@ import ( "log" "time" - "git.torproject.org/pluggable-transports/snowflake.git/v2/common/ipsetsink" + "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/ipsetsink" ) func NewClusterWriter(writer WriteSyncer, writeInterval time.Duration, sink *ipsetsink.IPSetSink) *ClusterWriter { diff --git a/common/ipsetsink/sinkcluster/writer_test.go b/common/ipsetsink/sinkcluster/writer_test.go index 5319cb2..dd8dc9f 100644 --- a/common/ipsetsink/sinkcluster/writer_test.go +++ b/common/ipsetsink/sinkcluster/writer_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "git.torproject.org/pluggable-transports/snowflake.git/v2/common/ipsetsink" + "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/ipsetsink" . "github.com/smartystreets/goconvey/convey" ) diff --git a/common/messages/client.go b/common/messages/client.go index 4adc2a4..da6359e 100644 --- a/common/messages/client.go +++ b/common/messages/client.go @@ -1,15 +1,15 @@ //Package for communication with the snowflake broker -// import "git.torproject.org/pluggable-transports/snowflake.git/v2/common/messages" +// import "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/messages" package messages import ( "bytes" "encoding/json" "fmt" - "git.torproject.org/pluggable-transports/snowflake.git/v2/common/bridgefingerprint" + "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/bridgefingerprint" - "git.torproject.org/pluggable-transports/snowflake.git/v2/common/nat" + "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/nat" ) const ClientVersion = "1.0" diff --git a/common/messages/proxy.go b/common/messages/proxy.go index ef53e07..e30dbf9 100644 --- a/common/messages/proxy.go +++ b/common/messages/proxy.go @@ -1,6 +1,6 @@ //Package for communication with the snowflake broker -// import "git.torproject.org/pluggable-transports/snowflake.git/v2/common/messages" +// import "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/messages" package messages import ( @@ -9,7 +9,7 @@ import ( "fmt" "strings" - "git.torproject.org/pluggable-transports/snowflake.git/v2/common/nat" + "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/nat" ) const ( diff --git a/common/safelog/log.go b/common/safelog/log.go index b6f9190..0969a83 100644 --- a/common/safelog/log.go +++ b/common/safelog/log.go @@ -1,6 +1,6 @@ //Package for a safer logging wrapper around the standard logging package -// import "git.torproject.org/pluggable-transports/snowflake.git/v2/common/safelog" +// import "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/safelog" package safelog import ( diff --git a/common/utls/client_hello_id_version.go b/common/utls/client_hello_id_version.go index 7228694..f17de21 100644 --- a/common/utls/client_hello_id_version.go +++ b/common/utls/client_hello_id_version.go @@ -1,7 +1,7 @@ package utls import ( - "git.torproject.org/pluggable-transports/snowflake.git/v2/common/version" + "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/version" "strings" ) diff --git a/distinctcounter/counter.go b/distinctcounter/counter.go index 67110b4..b87c965 100644 --- a/distinctcounter/counter.go +++ b/distinctcounter/counter.go @@ -7,7 +7,7 @@ import ( "os" "time" - "git.torproject.org/pluggable-transports/snowflake.git/v2/common/ipsetsink/sinkcluster" + "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/ipsetsink/sinkcluster" ) func main() { diff --git a/doc/using-the-snowflake-library.md b/doc/using-the-snowflake-library.md index 7fed2e3..ab9e474 100644 --- a/doc/using-the-snowflake-library.md +++ b/doc/using-the-snowflake-library.md @@ -12,7 +12,7 @@ package main import ( "log" - sf "git.torproject.org/pluggable-transports/snowflake.git/v2/client/lib" + sf "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/client/lib" ) func main() { @@ -54,7 +54,7 @@ package main import ( "log" - sf "git.torproject.org/pluggable-transports/snowflake.git/v2/client/lib" + sf "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/client/lib" ) type StubMethod struct { @@ -110,7 +110,7 @@ import ( "log" "net" - sf "git.torproject.org/pluggable-transports/snowflake.git/v2/server/lib" + sf "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/server/lib" "golang.org/x/crypto/acme/autocert" ) @@ -1,4 +1,4 @@ -module git.torproject.org/pluggable-transports/snowflake.git/v2 +module gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2 go 1.15 diff --git a/probetest/probetest.go b/probetest/probetest.go index 4b8baa4..5efce2d 100644 --- a/probetest/probetest.go +++ b/probetest/probetest.go @@ -20,9 +20,9 @@ import ( "strings" "time" - "git.torproject.org/pluggable-transports/snowflake.git/v2/common/messages" - "git.torproject.org/pluggable-transports/snowflake.git/v2/common/safelog" - "git.torproject.org/pluggable-transports/snowflake.git/v2/common/util" + "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/messages" + "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/safelog" + "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/util" "github.com/pion/webrtc/v3" "golang.org/x/crypto/acme/autocert" diff --git a/proxy/lib/proxy-go_test.go b/proxy/lib/proxy-go_test.go index b5ff86c..4ff970f 100644 --- a/proxy/lib/proxy-go_test.go +++ b/proxy/lib/proxy-go_test.go @@ -11,10 +11,10 @@ import ( "strings" "testing" - "git.torproject.org/pluggable-transports/snowflake.git/v2/common/messages" - "git.torproject.org/pluggable-transports/snowflake.git/v2/common/util" "github.com/pion/webrtc/v3" . "github.com/smartystreets/goconvey/convey" + "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/messages" + "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/util" ) // Set up a mock broker to communicate with diff --git a/proxy/lib/pt_event_logger.go b/proxy/lib/pt_event_logger.go index 745437b..0c5a8a9 100644 --- a/proxy/lib/pt_event_logger.go +++ b/proxy/lib/pt_event_logger.go @@ -1,12 +1,12 @@ package snowflake_proxy import ( - "git.torproject.org/pluggable-transports/snowflake.git/v2/common/task" + "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/task" "io" "log" "time" - "git.torproject.org/pluggable-transports/snowflake.git/v2/common/event" + "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/event" ) func NewProxyEventLogger(logPeriod time.Duration, output io.Writer) event.SnowflakeEventReceiver { diff --git a/proxy/lib/snowflake.go b/proxy/lib/snowflake.go index 1dceb42..ac47e1a 100644 --- a/proxy/lib/snowflake.go +++ b/proxy/lib/snowflake.go @@ -40,15 +40,15 @@ import ( "sync" "time" - "git.torproject.org/pluggable-transports/snowflake.git/v2/common/event" - "git.torproject.org/pluggable-transports/snowflake.git/v2/common/messages" - "git.torproject.org/pluggable-transports/snowflake.git/v2/common/namematcher" - "git.torproject.org/pluggable-transports/snowflake.git/v2/common/task" - "git.torproject.org/pluggable-transports/snowflake.git/v2/common/util" - "git.torproject.org/pluggable-transports/snowflake.git/v2/common/websocketconn" "github.com/gorilla/websocket" "github.com/pion/ice/v2" "github.com/pion/webrtc/v3" + "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/event" + "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/messages" + "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/namematcher" + "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/task" + "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/util" + "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/websocketconn" ) const ( diff --git a/proxy/lib/webrtcconn.go b/proxy/lib/webrtcconn.go index c876fbe..d37cf51 100644 --- a/proxy/lib/webrtcconn.go +++ b/proxy/lib/webrtcconn.go @@ -10,10 +10,10 @@ import ( "sync" "time" - "git.torproject.org/pluggable-transports/snowflake.git/v2/common/event" "github.com/pion/ice/v2" "github.com/pion/sdp/v3" "github.com/pion/webrtc/v3" + "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/event" ) var remoteIPPatterns = []*regexp.Regexp{ diff --git a/proxy/main.go b/proxy/main.go index 500b36a..87a88f9 100644 --- a/proxy/main.go +++ b/proxy/main.go @@ -11,10 +11,10 @@ import ( "strings" "time" - "git.torproject.org/pluggable-transports/snowflake.git/v2/common/event" - "git.torproject.org/pluggable-transports/snowflake.git/v2/common/safelog" - "git.torproject.org/pluggable-transports/snowflake.git/v2/common/version" - sf "git.torproject.org/pluggable-transports/snowflake.git/v2/proxy/lib" + "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/event" + "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/safelog" + "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/version" + sf "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/proxy/lib" ) func main() { diff --git a/server/lib/http.go b/server/lib/http.go index 8c0343f..1438fd4 100644 --- a/server/lib/http.go +++ b/server/lib/http.go @@ -15,10 +15,10 @@ import ( "sync" "time" - "git.torproject.org/pluggable-transports/snowflake.git/v2/common/encapsulation" - "git.torproject.org/pluggable-transports/snowflake.git/v2/common/turbotunnel" - "git.torproject.org/pluggable-transports/snowflake.git/v2/common/websocketconn" "github.com/gorilla/websocket" + "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/encapsulation" + "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/turbotunnel" + "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/websocketconn" ) const requestTimeout = 10 * time.Second diff --git a/server/lib/snowflake.go b/server/lib/snowflake.go index 3c3c440..f836035 100644 --- a/server/lib/snowflake.go +++ b/server/lib/snowflake.go @@ -44,9 +44,9 @@ import ( "sync" "time" - "git.torproject.org/pluggable-transports/snowflake.git/v2/common/turbotunnel" "github.com/xtaci/kcp-go/v5" "github.com/xtaci/smux" + "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/turbotunnel" "golang.org/x/net/http2" ) diff --git a/server/lib/turbotunnel.go b/server/lib/turbotunnel.go index d8f9d23..994b61e 100644 --- a/server/lib/turbotunnel.go +++ b/server/lib/turbotunnel.go @@ -4,7 +4,7 @@ import ( "net" "sync" - "git.torproject.org/pluggable-transports/snowflake.git/v2/common/turbotunnel" + "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/turbotunnel" ) // clientIDMap is a fixed-capacity mapping from ClientIDs to a net.Addr. diff --git a/server/lib/turbotunnel_test.go b/server/lib/turbotunnel_test.go index 2918844..26053ff 100644 --- a/server/lib/turbotunnel_test.go +++ b/server/lib/turbotunnel_test.go @@ -5,7 +5,7 @@ import ( "net" "testing" - "git.torproject.org/pluggable-transports/snowflake.git/v2/common/turbotunnel" + "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/turbotunnel" ) func TestClientIDMap(t *testing.T) { diff --git a/server/server.go b/server/server.go index d79916b..186f4cf 100644 --- a/server/server.go +++ b/server/server.go @@ -19,12 +19,12 @@ import ( "sync" "syscall" - "git.torproject.org/pluggable-transports/snowflake.git/v2/common/safelog" - "git.torproject.org/pluggable-transports/snowflake.git/v2/common/version" + "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/safelog" + "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/version" "golang.org/x/crypto/acme/autocert" - sf "git.torproject.org/pluggable-transports/snowflake.git/v2/server/lib" pt "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/goptlib" + sf "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/server/lib" ) const ptMethodName = "snowflake" |