niklas/cool-dns
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

moved blocking wait

Browse Source
This commit is contained in:
Niklas 2020-12-26 21:34:11 +01:00
parent 5ce381f370
commit 0da61804f7
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
coolDns.go
View File

@ -224,12 +224,6 @@ func listenAndServer(server *dns.ServeMux, address string) {
log.Fatalf("Failed to set tcp listener %s\n", err.Error()) log.Fatalf("Failed to set tcp listener %s\n", err.Error())
} }
}() }()
sig := make(chan os.Signal)
signal.Notify(sig, syscall.SIGINT, syscall.SIGTERM)
s := <-sig
log.Printf("Signal (%v) received, stopping\n", s)
os.Exit(0)
} }
func checkACL(alcRules []string, aclList map[string]*net.IPNet, ip net.IP) bool { func checkACL(alcRules []string, aclList map[string]*net.IPNet, ip net.IP) bool {
@ -331,21 +325,28 @@ func main() {
config, err := loadConfig(*configPath) config, err := loadConfig(*configPath)
if err != nil { if err != nil {
log.Fatalf("Failed to load config: %s", err.Error()) log.Fatalf("Failed to load config: %s\n", err.Error())
} }
zones, err := loadZones(config.Zones) zones, err := loadZones(config.Zones)
if err != nil { if err != nil {
log.Fatalf("Failed to load zones: %s", err.Error()) log.Fatalf("Failed to load zones: %s\n", err.Error())
} }
aclList, err := createACLList(config.ACL) aclList, err := createACLList(config.ACL)
if err != nil { if err != nil {
log.Fatalf("Failed to parse ACL rules: %s", err.Error()) log.Fatalf("Failed to parse ACL rules: %s\n", err.Error())
} }
server := createServer(zones, *config, aclList) server := createServer(zones, *config, aclList)
log.Printf("Start listening on udp %s and tcp %s\n", config.Address, config.Address)
listenAndServer(server, config.Address) listenAndServer(server, config.Address)
log.Printf("Start listening on udp %s and tcp %s\n", config.Address, config.Address)
sig := make(chan os.Signal)
signal.Notify(sig, syscall.SIGINT, syscall.SIGTERM)
s := <-sig
log.Printf("Signal (%v) received, stopping\n", s)
os.Exit(0)
} }