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

Stop exporting internal code

Browse source
This commit is contained in:
Cecylia Bocovich 2021-10-01 13:24:16 -04:00
parent 5927c2bdf9
commit 5339ed2dd7
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
server/lib/http.go
View file

@ -60,14 +60,14 @@ func (conn *overrideReadConn) Read(p []byte) (int, error) {
return conn.Reader.Read(p) return conn.Reader.Read(p)
} }
type HTTPHandler struct { type httpHandler struct {
// pconn is the adapter layer between stream-oriented WebSocket // pconn is the adapter layer between stream-oriented WebSocket
// connections and the packet-oriented KCP layer. // connections and the packet-oriented KCP layer.
pconn *turbotunnel.QueuePacketConn pconn *turbotunnel.QueuePacketConn
ln *SnowflakeListener ln *SnowflakeListener
} }
func (handler *HTTPHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { func (handler *httpHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
ws, err := upgrader.Upgrade(w, r, nil) ws, err := upgrader.Upgrade(w, r, nil)
if err != nil { if err != nil {
log.Println(err) log.Println(err)
@ -114,7 +114,7 @@ func (handler *HTTPHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
// of their stream. These clients use the WebSocket as a raw pipe, and expect // of their stream. These clients use the WebSocket as a raw pipe, and expect
// their session to begin and end when this single WebSocket does. // their session to begin and end when this single WebSocket does.
func oneshotMode(conn net.Conn, addr net.Addr, ln *SnowflakeListener) error { func oneshotMode(conn net.Conn, addr net.Addr, ln *SnowflakeListener) error {
return ln.QueueConn(&SnowflakeClientConn{Conn: conn, address: addr}) return ln.queueConn(&SnowflakeClientConn{Conn: conn, address: addr})
} }
// turbotunnelMode handles clients that sent turbotunnel.Token at the start of // turbotunnelMode handles clients that sent turbotunnel.Token at the start of

6
server/lib/snowflake.go
View file

@ -35,7 +35,7 @@ func NewSnowflakeServer(getCertificate func(*tls.ClientHelloInfo) (*tls.Certific
func (t *Transport) Listen(addr net.Addr) (*SnowflakeListener, error) { func (t *Transport) Listen(addr net.Addr) (*SnowflakeListener, error) {
listener := &SnowflakeListener{addr: addr, queue: make(chan net.Conn, 65534)} listener := &SnowflakeListener{addr: addr, queue: make(chan net.Conn, 65534)}
handler := HTTPHandler{ handler := httpHandler{
// pconn is shared among all connections to this server. It // pconn is shared among all connections to this server. It
// overlays packet-based client sessions on top of ephemeral // overlays packet-based client sessions on top of ephemeral
// WebSocket connections. // WebSocket connections.
@ -187,7 +187,7 @@ func (l *SnowflakeListener) acceptStreams(conn *kcp.UDPSession) error {
} }
return err return err
} }
l.QueueConn(&SnowflakeClientConn{Conn: stream, address: addr}) l.queueConn(&SnowflakeClientConn{Conn: stream, address: addr})
} }
} }
@ -226,7 +226,7 @@ func (l *SnowflakeListener) acceptSessions(ln *kcp.Listener) error {
} }
} }
func (l *SnowflakeListener) QueueConn(conn net.Conn) error { func (l *SnowflakeListener) queueConn(conn net.Conn) error {
select { select {
case <-l.closed: case <-l.closed:
return fmt.Errorf("accepted connection on closed listener") return fmt.Errorf("accepted connection on closed listener")