archives/snowflake
2
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake.git synced 2025-10-13 11:11:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move the development to gitlab

Browse source 
Related: tpo/anti-censorship/team#86
This commit is contained in:
meskio 2023-05-30 19:54:04 +02:00
parent 88608ad44a
commit 82cc0f38f7
No known key found for this signature in database
GPG key ID: 52B8F5AC97A2DA86
38 changed files with 78 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Vagrantfile vendored
View file

@ -4,7 +4,7 @@ require 'yaml'
srvpath = Pathname.new(File.dirname(__FILE__)).realpath srvpath = Pathname.new(File.dirname(__FILE__)).realpath
configfile = YAML.load_file(File.join(srvpath, "/.gitlab-ci.yml")) 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 # set up essential environment variables
env = configfile['variables'] env = configfile['variables']

4
broker/amp.go
View file

@ -5,8 +5,8 @@ import (
"net/http" "net/http"
"strings" "strings"
"git.torproject.org/pluggable-transports/snowflake.git/v2/common/amp" "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/amp"
"git.torproject.org/pluggable-transports/snowflake.git/v2/common/messages" "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/messages"
) )
// ampClientOffers is the AMP-speaking endpoint for client poll messages, // ampClientOffers is the AMP-speaking endpoint for client poll messages,

2
broker/bridge-list.go
View file

@ -29,7 +29,7 @@ import (
"io" "io"
"sync" "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") var ErrBridgeNotFound = errors.New("bridge not found")

2
broker/bridge-list_test.go
View file

@ -3,8 +3,8 @@ package main
import ( import (
"bytes" "bytes"
"encoding/hex" "encoding/hex"
"git.torproject.org/pluggable-transports/snowflake.git/v2/common/bridgefingerprint"
. "github.com/smartystreets/goconvey/convey" . "github.com/smartystreets/goconvey/convey"
"gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/bridgefingerprint"
"testing" "testing"
) )

10
broker/broker.go
View file

@ -10,9 +10,9 @@ import (
"container/heap" "container/heap"
"crypto/tls" "crypto/tls"
"flag" "flag"
"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/ipsetsink" "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/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/ipsetsink/sinkcluster"
"io" "io"
"log" "log"
"net/http" "net/http"
@ -23,10 +23,10 @@ import (
"syscall" "syscall"
"time" "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"
"github.com/prometheus/client_golang/prometheus/promhttp" "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" "golang.org/x/crypto/acme/autocert"
) )

2
broker/http.go
View file

@ -10,7 +10,7 @@ import (
"net/http" "net/http"
"os" "os"
"git.torproject.org/pluggable-transports/snowflake.git/v2/common/messages" "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/messages"
) )
const ( const (

4
broker/ipc.go
View file

@ -8,10 +8,10 @@ import (
"net" "net"
"time" "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" "github.com/prometheus/client_golang/prometheus"
"gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/messages"
) )
const ( const (

4
broker/metrics.go
View file

@ -14,10 +14,10 @@ import (
"sync" "sync"
"time" "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" "github.com/prometheus/client_golang/prometheus"
"gitlab.torproject.org/tpo/anti-censorship/geoip" "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 ( const (

4
broker/snowflake-broker_test.go
View file

@ -15,9 +15,9 @@ import (
"testing" "testing"
"time" "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" . "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 { func NullLogger() *log.Logger {

2
client/lib/lib_test.go
View file

@ -6,8 +6,8 @@ import (
"testing" "testing"
"time" "time"
"git.torproject.org/pluggable-transports/snowflake.git/v2/common/event"
. "github.com/smartystreets/goconvey/convey" . "github.com/smartystreets/goconvey/convey"
"gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/event"
) )
type FakeDialer struct { type FakeDialer struct {

10
client/lib/rendezvous.go
View file

@ -12,13 +12,13 @@ import (
"sync" "sync"
"time" "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" "github.com/pion/webrtc/v3"
utls "github.com/refraction-networking/utls" 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 ( const (

2
client/lib/rendezvous_ampcache.go
View file

@ -8,7 +8,7 @@ import (
"net/http" "net/http"
"net/url" "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 // ampCacheRendezvous is a RendezvousMethod that communicates with the

6
client/lib/rendezvous_test.go
View file

@ -9,10 +9,10 @@ import (
"net/http" "net/http"
"testing" "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" . "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 // mockTransport's RoundTrip method returns a response with a fake status and

6
client/lib/snowflake.go
View file

@ -35,13 +35,13 @@ import (
"strings" "strings"
"time" "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/ice/v2"
"github.com/pion/webrtc/v3" "github.com/pion/webrtc/v3"
"github.com/xtaci/kcp-go/v5" "github.com/xtaci/kcp-go/v5"
"github.com/xtaci/smux" "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 ( const (

2
client/lib/turbotunnel.go
View file

@ -7,7 +7,7 @@ import (
"net" "net"
"time" "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") var errNotImplemented = errors.New("not implemented")

2
client/lib/webrtc.go
View file

@ -11,9 +11,9 @@ import (
"sync" "sync"
"time" "time"
"git.torproject.org/pluggable-transports/snowflake.git/v2/common/event"
"github.com/pion/ice/v2" "github.com/pion/ice/v2"
"github.com/pion/webrtc/v3" "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. // WebRTCPeer represents a WebRTC connection to a remote snowflake proxy.

8
client/snowflake.go
View file

@ -16,11 +16,11 @@ import (
"sync" "sync"
"syscall" "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" 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 ( const (

2
common/event/interface.go
View file

@ -3,8 +3,8 @@ package event
import ( import (
"fmt" "fmt"
"git.torproject.org/pluggable-transports/snowflake.git/v2/common/safelog"
"github.com/pion/webrtc/v3" "github.com/pion/webrtc/v3"
"gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/safelog"
) )
type SnowflakeEvent interface { type SnowflakeEvent interface {

2
common/ipsetsink/sinkcluster/writer.go
View file

@ -7,7 +7,7 @@ import (
"log" "log"
"time" "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 { func NewClusterWriter(writer WriteSyncer, writeInterval time.Duration, sink *ipsetsink.IPSetSink) *ClusterWriter {

2
common/ipsetsink/sinkcluster/writer_test.go
View file

@ -6,7 +6,7 @@ import (
"testing" "testing"
"time" "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" . "github.com/smartystreets/goconvey/convey"
) )

6
common/messages/client.go
View file

@ -1,15 +1,15 @@
//Package for communication with the snowflake broker //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 package messages
import ( import (
"bytes" "bytes"
"encoding/json" "encoding/json"
"fmt" "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" const ClientVersion = "1.0"

4
common/messages/proxy.go
View file

@ -1,6 +1,6 @@
//Package for communication with the snowflake broker //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 package messages
import ( import (
@ -9,7 +9,7 @@ import (
"fmt" "fmt"
"strings" "strings"
"git.torproject.org/pluggable-transports/snowflake.git/v2/common/nat" "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/nat"
) )
const ( const (

2
common/safelog/log.go
View file

@ -1,6 +1,6 @@
//Package for a safer logging wrapper around the standard logging package //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 package safelog
import ( import (

2
common/utls/client_hello_id_version.go
View file

@ -1,7 +1,7 @@
package utls package utls
import ( import (
"git.torproject.org/pluggable-transports/snowflake.git/v2/common/version" "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/version"
"strings" "strings"
) )

2
distinctcounter/counter.go
View file

@ -7,7 +7,7 @@ import (
"os" "os"
"time" "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() { func main() {

6
doc/using-the-snowflake-library.md
View file

@ -12,7 +12,7 @@ package main
import ( import (
"log" "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() { func main() {
@ -54,7 +54,7 @@ package main
import ( import (
"log" "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 { type StubMethod struct {
@ -110,7 +110,7 @@ import (
"log" "log"
"net" "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" "golang.org/x/crypto/acme/autocert"
) )

2
go.mod
View file

@ -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 go 1.15

6
probetest/probetest.go
View file

@ -20,9 +20,9 @@ import (
"strings" "strings"
"time" "time"
"git.torproject.org/pluggable-transports/snowflake.git/v2/common/messages" "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/messages"
"git.torproject.org/pluggable-transports/snowflake.git/v2/common/safelog" "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/safelog"
"git.torproject.org/pluggable-transports/snowflake.git/v2/common/util" "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/util"
"github.com/pion/webrtc/v3" "github.com/pion/webrtc/v3"
"golang.org/x/crypto/acme/autocert" "golang.org/x/crypto/acme/autocert"

4
proxy/lib/proxy-go_test.go
View file

@ -11,10 +11,10 @@ import (
"strings" "strings"
"testing" "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/pion/webrtc/v3"
. "github.com/smartystreets/goconvey/convey" . "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 // Set up a mock broker to communicate with

4
proxy/lib/pt_event_logger.go
View file

@ -1,12 +1,12 @@
package snowflake_proxy package snowflake_proxy
import ( import (
"git.torproject.org/pluggable-transports/snowflake.git/v2/common/task" "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/task"
"io" "io"
"log" "log"
"time" "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 { func NewProxyEventLogger(logPeriod time.Duration, output io.Writer) event.SnowflakeEventReceiver {

12
proxy/lib/snowflake.go
View file

@ -40,15 +40,15 @@ import (
"sync" "sync"
"time" "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/gorilla/websocket"
"github.com/pion/ice/v2" "github.com/pion/ice/v2"
"github.com/pion/webrtc/v3" "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 ( const (

2
proxy/lib/webrtcconn.go
View file

@ -10,10 +10,10 @@ import (
"sync" "sync"
"time" "time"
"git.torproject.org/pluggable-transports/snowflake.git/v2/common/event"
"github.com/pion/ice/v2" "github.com/pion/ice/v2"
"github.com/pion/sdp/v3" "github.com/pion/sdp/v3"
"github.com/pion/webrtc/v3" "github.com/pion/webrtc/v3"
"gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/event"
) )
var remoteIPPatterns = []*regexp.Regexp{ var remoteIPPatterns = []*regexp.Regexp{

8
proxy/main.go
View file

@ -11,10 +11,10 @@ import (
"strings" "strings"
"time" "time"
"git.torproject.org/pluggable-transports/snowflake.git/v2/common/event" "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/event"
"git.torproject.org/pluggable-transports/snowflake.git/v2/common/safelog" "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/safelog"
"git.torproject.org/pluggable-transports/snowflake.git/v2/common/version" "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/version"
sf "git.torproject.org/pluggable-transports/snowflake.git/v2/proxy/lib" sf "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/proxy/lib"
) )
func main() { func main() {

6
server/lib/http.go
View file

@ -15,10 +15,10 @@ import (
"sync" "sync"
"time" "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" "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 const requestTimeout = 10 * time.Second

2
server/lib/snowflake.go
View file

@ -44,9 +44,9 @@ import (
"sync" "sync"
"time" "time"
"git.torproject.org/pluggable-transports/snowflake.git/v2/common/turbotunnel"
"github.com/xtaci/kcp-go/v5" "github.com/xtaci/kcp-go/v5"
"github.com/xtaci/smux" "github.com/xtaci/smux"
"gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/turbotunnel"
"golang.org/x/net/http2" "golang.org/x/net/http2"
) )

2
server/lib/turbotunnel.go
View file

@ -4,7 +4,7 @@ import (
"net" "net"
"sync" "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. // clientIDMap is a fixed-capacity mapping from ClientIDs to a net.Addr.

2
server/lib/turbotunnel_test.go
View file

@ -5,7 +5,7 @@ import (
"net" "net"
"testing" "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) { func TestClientIDMap(t *testing.T) {

6
server/server.go
View file

@ -19,12 +19,12 @@ import (
"sync" "sync"
"syscall" "syscall"
"git.torproject.org/pluggable-transports/snowflake.git/v2/common/safelog" "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/safelog"
"git.torproject.org/pluggable-transports/snowflake.git/v2/common/version" "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/version"
"golang.org/x/crypto/acme/autocert" "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" 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" const ptMethodName = "snowflake"