From c5283061cf864aff040bad2b9654e5a216ad598d Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Fri, 2 Feb 2018 15:07:12 +0100 Subject: [PATCH] Properly remove the default port --- dnscrypt-proxy/stamps.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dnscrypt-proxy/stamps.go b/dnscrypt-proxy/stamps.go index 3f858f5d..7fe51aaf 100644 --- a/dnscrypt-proxy/stamps.go +++ b/dnscrypt-proxy/stamps.go @@ -7,6 +7,7 @@ import ( "errors" "fmt" "net" + "strconv" "strings" "github.com/jedisct1/dlog" @@ -196,8 +197,8 @@ func (stamp *ServerStamp) dnsCryptString() string { binary.LittleEndian.PutUint64(bin[1:9], uint64(stamp.props)) serverAddrStr := stamp.serverAddrStr - if strings.HasSuffix(serverAddrStr, ":"+string(DefaultPort)) { - serverAddrStr = serverAddrStr[:1+len(string(DefaultPort))] + if strings.HasSuffix(serverAddrStr, ":"+strconv.Itoa(DefaultPort)) { + serverAddrStr = serverAddrStr[:len(serverAddrStr)-1-len(strconv.Itoa(DefaultPort))] } bin = append(bin, uint8(len(serverAddrStr))) bin = append(bin, []uint8(serverAddrStr)...) @@ -219,8 +220,8 @@ func (stamp *ServerStamp) dohString() string { binary.LittleEndian.PutUint64(bin[1:9], uint64(stamp.props)) serverAddrStr := stamp.serverAddrStr - if strings.HasSuffix(serverAddrStr, ":"+string(DefaultPort)) { - serverAddrStr = serverAddrStr[:1+len(string(DefaultPort))] + if strings.HasSuffix(serverAddrStr, ":"+strconv.Itoa(DefaultPort)) { + serverAddrStr = serverAddrStr[:len(serverAddrStr)-1-len(strconv.Itoa(DefaultPort))] } bin = append(bin, uint8(len(serverAddrStr))) bin = append(bin, []uint8(serverAddrStr)...)