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

Rename *PollRequest methods to distinguish client/proxy

Browse source
This commit is contained in:
Arlo Breault 2022-03-08 17:49:28 -05:00
parent 6e29dc676c
commit 6fd0f1ae5d
8 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
broker/http.go
View file

@ -149,7 +149,7 @@ func clientOffers(i *IPC, w http.ResponseWriter, r *http.Request) {
Offer: string(body),
NAT: r.Header.Get("Snowflake-NAT-Type"),
}
body, err = req.EncodePollRequest()
body, err = req.EncodeClientPollRequest()
if err != nil {
log.Printf("Error shimming the legacy request: %s", err.Error())
w.WriteHeader(http.StatusInternalServerError)

2
broker/ipc.go
View file

@ -75,7 +75,7 @@ func (i *IPC) Debug(_ interface{}, response *string) error {
}
func (i *IPC) ProxyPolls(arg messages.Arg, response *[]byte) error {
sid, proxyType, natType, clients, err := messages.DecodePollRequest(arg.Body)
sid, proxyType, natType, clients, err := messages.DecodeProxyPollRequest(arg.Body)
if err != nil {
return messages.ErrBadRequest
}

2
client/lib/rendezvous.go
View file

@ -125,7 +125,7 @@ func (bc *BrokerChannel) Negotiate(offer *webrtc.SessionDescription) (
Offer: offerSDP,
NAT: bc.natType,
}
encReq, err := req.EncodePollRequest()
encReq, err := req.EncodeClientPollRequest()
bc.lock.Unlock()
if err != nil {
return nil, err

2
client/lib/rendezvous_test.go
View file

@ -45,7 +45,7 @@ func makeEncPollReq(offer string) []byte {
encPollReq, err := (&messages.ClientPollRequest{
Offer: offer,
NAT: nat.NATUnknown,
}).EncodePollRequest()
}).EncodeClientPollRequest()
if err != nil {
panic(err)
}

2
common/messages/client.go
View file

@ -54,7 +54,7 @@ type ClientPollRequest struct {
}
// Encodes a poll message from a snowflake client
func (req *ClientPollRequest) EncodePollRequest() ([]byte, error) {
func (req *ClientPollRequest) EncodeClientPollRequest() ([]byte, error) {
body, err := json.Marshal(req)
if err != nil {
return nil, err

8
common/messages/messages_test.go
View file

@ -97,7 +97,7 @@ func TestDecodeProxyPollRequest(t *testing.T) {
fmt.Errorf(""),
},
} {
sid, proxyType, natType, clients, err := DecodePollRequest([]byte(test.data))
sid, proxyType, natType, clients, err := DecodeProxyPollRequest([]byte(test.data))
So(sid, ShouldResemble, test.sid)
So(proxyType, ShouldResemble, test.proxyType)
So(natType, ShouldResemble, test.natType)
@ -110,9 +110,9 @@ func TestDecodeProxyPollRequest(t *testing.T) {
func TestEncodeProxyPollRequests(t *testing.T) {
Convey("Context", t, func() {
b, err := EncodePollRequest("ymbcCMto7KHNGYlp", "standalone", "unknown", 16)
b, err := EncodeProxyPollRequest("ymbcCMto7KHNGYlp", "standalone", "unknown", 16)
So(err, ShouldEqual, nil)
sid, proxyType, natType, clients, err := DecodePollRequest(b)
sid, proxyType, natType, clients, err := DecodeProxyPollRequest(b)
So(sid, ShouldEqual, "ymbcCMto7KHNGYlp")
So(proxyType, ShouldEqual, "standalone")
So(natType, ShouldEqual, "unknown")
@ -328,7 +328,7 @@ func TestEncodeClientPollRequests(t *testing.T) {
NAT: "unknown",
Offer: "fake",
}
b, err := req1.EncodePollRequest()
b, err := req1.EncodeClientPollRequest()
So(err, ShouldEqual, nil)
fmt.Println(string(b))
parts := bytes.SplitN(b, []byte("\n"), 2)

4
common/messages/proxy.go
View file

@ -92,7 +92,7 @@ type ProxyPollRequest struct {
Clients int
}
func EncodePollRequest(sid string, proxyType string, natType string, clients int) ([]byte, error) {
func EncodeProxyPollRequest(sid string, proxyType string, natType string, clients int) ([]byte, error) {
return json.Marshal(ProxyPollRequest{
Sid: sid,
Version: version,
@ -105,7 +105,7 @@ func EncodePollRequest(sid string, proxyType string, natType string, clients int
// Decodes a poll message from a snowflake proxy and returns the
// sid, proxy type, nat type and clients of the proxy on success
// and an error if it failed
func DecodePollRequest(data []byte) (sid string, proxyType string, natType string, clients int, err error) {
func DecodeProxyPollRequest(data []byte) (sid string, proxyType string, natType string, clients int, err error) {
var message ProxyPollRequest
err = json.Unmarshal(data, &message)

2
proxy/lib/snowflake.go
View file

@ -199,7 +199,7 @@ func (s *SignalingServer) pollOffer(sid string, shutdown chan struct{}) *webrtc.
default:
numClients := int((tokens.count() / 8) * 8) // Round down to 8
currentNATTypeLoaded := getCurrentNATType()
body, err := messages.EncodePollRequest(sid, "standalone", currentNATTypeLoaded, numClients)
body, err := messages.EncodeProxyPollRequest(sid, "standalone", currentNATTypeLoaded, numClients)
if err != nil {
log.Printf("Error encoding poll message: %s", err.Error())
return nil