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

Prepare support for multiple load balancing strategies

Browse source
This commit is contained in:
Frank Denis 2018-02-04 21:13:54 +01:00
parent f319088506
commit 88434fc39f
3 changed files with 30 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
dnscrypt-proxy/main.go
View file

@ -35,7 +35,7 @@ func main() {
svc = nil
dlog.Debug(err)
}
app.proxy = Proxy{}
app.proxy = NewProxy()
app.proxy.xTransport = NewXTransport(30 * time.Second)
if err := ConfigLoad(&app.proxy, svcFlag); err != nil {

6
dnscrypt-proxy/proxy.go
View file

@ -352,3 +352,9 @@ func ttlFromHTTPResponse(proxy *Proxy, resp *http.Response) *uint32 {
}
return &foundTTL
}
func NewProxy() Proxy {
return Proxy{
serversInfo: ServersInfo{lbStrategy: DefaultLBStrategy},
}
}

24
dnscrypt-proxy/serversInfo.go
View file

@ -56,10 +56,23 @@ type ServerInfo struct {
initialRtt int
}
type LBStrategy int
const (
LBStrategyNone = LBStrategy(iota)
LBStrategyP2
LBStrategyPH
LBStrategyFastest
LBStrategyRandom
)
const DefaultLBStrategy = LBStrategyP2
type ServersInfo struct {
sync.RWMutex
inner []ServerInfo
registeredServers []RegisteredServer
lbStrategy LBStrategy
}
func (serversInfo *ServersInfo) registerServer(proxy *Proxy, name string, stamp ServerStamp) error {
@ -155,7 +168,16 @@ func (serversInfo *ServersInfo) getOne() *ServerInfo {
if serversInfo.inner[candidate].rtt.Value() < serversInfo.inner[0].rtt.Value() {
serversInfo.inner[candidate], serversInfo.inner[0] = serversInfo.inner[0], serversInfo.inner[candidate]
}
candidate = rand.Intn(Max(Min(serversCount, 2), len(serversInfo.inner)))
switch serversInfo.lbStrategy {
case LBStrategyFastest:
candidate = 0
case LBStrategyPH:
candidate = rand.Intn(Min(Min(serversCount, 2), len(serversInfo.inner)/2))
case LBStrategyRandom:
candidate = rand.Intn(len(serversInfo.inner))
default:
candidate = rand.Intn(Min(Min(serversCount, 2), len(serversInfo.inner)))
}
serverInfo := &serversInfo.inner[candidate]
return serverInfo
}