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

cleanup: main: simplify proxy handling

Browse source
This commit is contained in:
Markus Linnala 2019-10-09 18:59:46 +03:00 • committed by Frank Denis
parent cab67ba5a9
commit 5bf5fe6c1d
3 changed files with 14 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

16
dnscrypt-proxy/main.go
View file

@ -22,7 +22,7 @@ const (
type App struct { type App struct {
wg sync.WaitGroup wg sync.WaitGroup
quit chan struct{} quit chan struct{}
proxy Proxy proxy *Proxy
} }
func main() { func main() {
@ -52,7 +52,7 @@ func main() {
} }
app.proxy = NewProxy() app.proxy = NewProxy()
_ = ServiceManagerStartNotify() _ = ServiceManagerStartNotify()
if err := ConfigLoad(&app.proxy, svcFlag); err != nil { if err := ConfigLoad(app.proxy, svcFlag); err != nil {
dlog.Fatal(err) dlog.Fatal(err)
} }
if len(*svcFlag) != 0 { if len(*svcFlag) != 0 {
@ -85,29 +85,27 @@ func main() {
} }
func (app *App) Start(service service.Service) error { func (app *App) Start(service service.Service) error {
proxy := &app.proxy if err := app.proxy.InitPluginsGlobals(); err != nil {
if err := InitPluginsGlobals(&proxy.pluginsGlobals, proxy); err != nil {
dlog.Fatal(err) dlog.Fatal(err)
} }
app.quit = make(chan struct{}) app.quit = make(chan struct{})
app.wg.Add(1) app.wg.Add(1)
if service != nil { if service != nil {
go func() { go func() {
app.AppMain(proxy) app.AppMain()
}() }()
} else { } else {
app.AppMain(proxy) app.AppMain()
} }
return nil return nil
} }
func (app *App) AppMain(proxy *Proxy) { func (app *App) AppMain() {
pidfile.Write() pidfile.Write()
proxy.StartProxy() app.proxy.StartProxy()
<-app.quit <-app.quit
dlog.Notice("Quit signal received...") dlog.Notice("Quit signal received...")
app.wg.Done() app.wg.Done()
} }
func (app *App) Stop(service service.Service) error { func (app *App) Stop(service service.Service) error {

10
dnscrypt-proxy/plugins.go
View file

@ -82,7 +82,7 @@ type PluginsState struct {
serverName string serverName string
} }
func InitPluginsGlobals(pluginsGlobals *PluginsGlobals, proxy *Proxy) error { func (proxy *Proxy) InitPluginsGlobals() error {
queryPlugins := &[]Plugin{} queryPlugins := &[]Plugin{}
if len(proxy.queryMeta) != 0 { if len(proxy.queryMeta) != 0 {
@ -143,11 +143,11 @@ func InitPluginsGlobals(pluginsGlobals *PluginsGlobals, proxy *Proxy) error {
} }
} }
(*pluginsGlobals).queryPlugins = queryPlugins proxy.pluginsGlobals.queryPlugins = queryPlugins
(*pluginsGlobals).responsePlugins = responsePlugins proxy.pluginsGlobals.responsePlugins = responsePlugins
(*pluginsGlobals).loggingPlugins = loggingPlugins proxy.pluginsGlobals.loggingPlugins = loggingPlugins
parseBlockedQueryResponse(proxy.blockedQueryResponse, pluginsGlobals) parseBlockedQueryResponse(proxy.blockedQueryResponse, &proxy.pluginsGlobals)
return nil return nil
} }

4
dnscrypt-proxy/proxy.go
View file

@ -501,8 +501,8 @@ func (proxy *Proxy) processIncomingQuery(serverInfo *ServerInfo, clientProto str
pluginsState.ApplyLoggingPlugins(&proxy.pluginsGlobals) pluginsState.ApplyLoggingPlugins(&proxy.pluginsGlobals)
} }
func NewProxy() Proxy { func NewProxy() *Proxy {
return Proxy{ return &Proxy{
serversInfo: NewServersInfo(), serversInfo: NewServersInfo(),
} }
} }