From 70974640ab35fd8b7d60a9c6875a40973fca8999 Mon Sep 17 00:00:00 2001 From: Cecylia Bocovich Date: Wed, 23 Jul 2025 12:45:37 -0400 Subject: [PATCH] Defer SQS client IP extraction to ClientOffers Now that both SQS and AMP cache are pulling remote addresses from the SDP, avoid duplicate decodings of the ClientPollRequest by extracting the remote addr in ClientOffers. --- broker/sqs.go | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/broker/sqs.go b/broker/sqs.go index 6ad6b8d..16a97c9 100644 --- a/broker/sqs.go +++ b/broker/sqs.go @@ -12,7 +12,6 @@ import ( "github.com/aws/aws-sdk-go-v2/service/sqs/types" "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/messages" "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/sqsclient" - "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2/common/util" ) const ( @@ -148,26 +147,9 @@ func (r *sqsHandler) handleMessage(mainCtx context.Context, message *types.Messa encPollReq = []byte(*message.Body) - // Get best guess Client IP for geolocating - remoteAddr := "" - req, err := messages.DecodeClientPollRequest(encPollReq) - if err != nil { - log.Printf("SQSHandler: error encounted when decoding client poll request %s: %v\n", *clientID, err) - } else { - sdp, err := util.DeserializeSessionDescription(req.Offer) - if err != nil { - log.Printf("SQSHandler: error encounted when deserializing session desc %s: %v\n", *clientID, err) - } else { - candidateAddrs := util.GetCandidateAddrs(sdp.SDP) - if len(candidateAddrs) > 0 { - remoteAddr = candidateAddrs[0].String() - } - } - } - arg := messages.Arg{ Body: encPollReq, - RemoteAddr: remoteAddr, + RemoteAddr: "", RendezvousMethod: messages.RendezvousSqs, Context: ctx, }