mirrors/dnscrypt-proxy
1
0
Fork 0
mirror of https://github.com/DNSCrypt/dnscrypt-proxy.git synced 2025-04-06 22:57:37 +03:00
Code Issues Projects Releases Packages Wiki Activity

We want to support multiple servers simultaneously

Browse source 
Prepare for that
This commit is contained in:
Frank Denis 2018-01-09 16:59:06 +01:00
parent 553f6afb00
commit 721313a603
2 changed files with 67 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

40
dnscrypt-proxy.go
View file

@ -3,22 +3,19 @@ package main
import (
"crypto/rand"
"encoding/binary"
"encoding/hex"
"fmt"
"log"
"net"
"strings"
"time"
"golang.org/x/crypto/curve25519"
"golang.org/x/crypto/ed25519"
)
type Proxy struct {
proxyPublicKey [32]byte
proxySecretKey [32]byte
questionSizeEstimator QuestionSizeEstimator
serversInfo []ServerInfo
serversInfo ServersInfo
timeout time.Duration
}
@ -33,7 +30,7 @@ func NewProxy(listenAddrStr string, serverAddrStr string, serverPkStr string, pr
log.Fatal(err)
}
curve25519.ScalarBaseMult(&proxy.proxyPublicKey, &proxy.proxySecretKey)
proxy.fetchServerInfo(serverAddrStr, serverPkStr, providerName)
proxy.serversInfo.registerServer(&proxy, serverAddrStr, serverPkStr, providerName)
listenUDPAddr, err := net.ResolveUDPAddr("udp", listenAddrStr)
if err != nil {
log.Fatal(err)
@ -69,7 +66,7 @@ func (proxy *Proxy) udpListener(listenAddr *net.UDPAddr) error {
}
packet := buffer[:length]
go func() {
proxy.processIncomingQuery(&proxy.serversInfo[0], packet, &clientAddr, clientPc)
proxy.processIncomingQuery(proxy.serversInfo.getOne(), packet, &clientAddr, clientPc)
}()
}
}
@ -99,7 +96,7 @@ func (proxy *Proxy) tcpListener(listenAddr *net.TCPAddr) error {
return
}
packet := buffer[2:length]
proxy.processIncomingQuery(&proxy.serversInfo[0], packet, nil, clientPc)
proxy.processIncomingQuery(proxy.serversInfo.getOne(), packet, nil, clientPc)
}()
}
}
@ -142,32 +139,3 @@ func (proxy *Proxy) processIncomingQuery(serverInfo *ServerInfo, packet []byte,
proxy.questionSizeEstimator.blindAdjust()
}
}
func (proxy *Proxy) fetchServerInfo(serverAddrStr string, serverPkStr string, providerName string) {
serverPublicKey, err := hex.DecodeString(strings.Replace(serverPkStr, ":", "", -1))
if err != nil || len(serverPublicKey) != ed25519.PublicKeySize {
log.Fatal("Invalid public key")
}
certInfo, err := FetchCurrentCert(proxy, serverPublicKey, serverAddrStr, providerName)
if err != nil {
log.Fatal(err)
}
remoteUDPAddr, err := net.ResolveUDPAddr("udp", serverAddrStr)
if err != nil {
log.Fatal(err)
}
remoteTCPAddr, err := net.ResolveTCPAddr("tcp", serverAddrStr)
if err != nil {
log.Fatal(err)
}
serverInfo := ServerInfo{
MagicQuery: certInfo.MagicQuery,
ServerPk: certInfo.ServerPk,
SharedKey: certInfo.SharedKey,
CryptoConstruction: certInfo.CryptoConstruction,
Timeout: TimeoutMin,
UDPAddr: remoteUDPAddr,
TCPAddr: remoteTCPAddr,
}
proxy.serversInfo = append(proxy.serversInfo, serverInfo)
}