mirror of
https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake.git
synced 2025-10-13 20:11:19 -04:00
Use variables for string matching
The legacy code does case matching on these exact strings so it's better to ensure they're constant.
This commit is contained in:
parent
87ad06a5e2
commit
c3c84fdb48
3 changed files with 7 additions and 5 deletions
|
@ -177,10 +177,10 @@ func clientOffers(i *IPC, w http.ResponseWriter, r *http.Request) {
|
||||||
switch resp.Error {
|
switch resp.Error {
|
||||||
case "":
|
case "":
|
||||||
response = []byte(resp.Answer)
|
response = []byte(resp.Answer)
|
||||||
case "no snowflake proxies currently available":
|
case messages.StrNoProxies:
|
||||||
w.WriteHeader(http.StatusServiceUnavailable)
|
w.WriteHeader(http.StatusServiceUnavailable)
|
||||||
return
|
return
|
||||||
case "timed out waiting for answer!":
|
case messages.StrTimedOut:
|
||||||
w.WriteHeader(http.StatusGatewayTimeout)
|
w.WriteHeader(http.StatusGatewayTimeout)
|
||||||
return
|
return
|
||||||
default:
|
default:
|
||||||
|
|
|
@ -190,7 +190,7 @@ func (i *IPC) ClientOffers(arg messages.Arg, response *[]byte) error {
|
||||||
i.ctx.metrics.lock.Unlock()
|
i.ctx.metrics.lock.Unlock()
|
||||||
switch version {
|
switch version {
|
||||||
case v1:
|
case v1:
|
||||||
resp := &messages.ClientPollResponse{Error: "no snowflake proxies currently available"}
|
resp := &messages.ClientPollResponse{Error: messages.StrNoProxies}
|
||||||
return sendClientResponse(resp, response)
|
return sendClientResponse(resp, response)
|
||||||
default:
|
default:
|
||||||
panic("unknown version")
|
panic("unknown version")
|
||||||
|
@ -226,8 +226,7 @@ func (i *IPC) ClientOffers(arg messages.Arg, response *[]byte) error {
|
||||||
log.Println("Client: Timed out.")
|
log.Println("Client: Timed out.")
|
||||||
switch version {
|
switch version {
|
||||||
case v1:
|
case v1:
|
||||||
resp := &messages.ClientPollResponse{
|
resp := &messages.ClientPollResponse{Error: messages.StrTimedOut}
|
||||||
Error: "timed out waiting for answer!"}
|
|
||||||
err = sendClientResponse(resp, response)
|
err = sendClientResponse(resp, response)
|
||||||
default:
|
default:
|
||||||
panic("unknown version")
|
panic("unknown version")
|
||||||
|
|
|
@ -12,4 +12,7 @@ type Arg struct {
|
||||||
var (
|
var (
|
||||||
ErrBadRequest = errors.New("bad request")
|
ErrBadRequest = errors.New("bad request")
|
||||||
ErrInternal = errors.New("internal error")
|
ErrInternal = errors.New("internal error")
|
||||||
|
|
||||||
|
StrTimedOut = "timed out waiting for answer!"
|
||||||
|
StrNoProxies = "no snowflake proxies currently available"
|
||||||
)
|
)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue