forked from loweel/zabov
				
			- optimization: blackholeip is parsed only once at startup
							parent
							
								
									b9f17b3c19
								
							
						
					
					
						commit
						9b4e4fbcb9
					
				| 
						 | 
				
			
			@ -110,7 +110,7 @@ func init() {
 | 
			
		|||
		conf.ZabovUpDNS = confRaw["upstream"].(string)
 | 
			
		||||
		conf.ZabovSingleBL = confRaw["singlefilters"].(string)
 | 
			
		||||
		conf.ZabovDoubleBL = confRaw["doublefilters"].(string)
 | 
			
		||||
		conf.ZabovAddBL = confRaw["blackholeip"].(string)
 | 
			
		||||
		conf.ZabovAddBL = net.ParseIP(confRaw["blackholeip"].(string))
 | 
			
		||||
		conf.ZabovHostsFile = confRaw["hostsfile"].(string)
 | 
			
		||||
 | 
			
		||||
		conf.ZabovDNSArray = fileByLines(conf.ZabovUpDNS)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -282,7 +282,7 @@ func (mydns *handler) ServeDNS(w dns.ResponseWriter, r *dns.Msg) {
 | 
			
		|||
 | 
			
		||||
			msg.Answer = append(msg.Answer, &dns.A{
 | 
			
		||||
				Hdr: dns.RR_Header{Name: domain, Rrtype: dns.TypeA, Class: dns.ClassINET, Ttl: 60},
 | 
			
		||||
				A:   net.ParseIP(ZabovConfig.ZabovAddBL),
 | 
			
		||||
				A:   ZabovConfig.ZabovAddBL,
 | 
			
		||||
			})
 | 
			
		||||
			go logQuery(remIP, fqdn, QType, config, timetable, "killed")
 | 
			
		||||
		} else {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										2
									
								
								main.go
								
								
								
								
							
							
						
						
									
										2
									
								
								main.go
								
								
								
								
							| 
						 | 
				
			
			@ -37,7 +37,7 @@ type handler struct{}
 | 
			
		|||
type ZabovConfig struct {
 | 
			
		||||
	ZabovSingleBL  string   // json:singlefilters -> ZabovSingleBL list of urls returning a file with just names of domains
 | 
			
		||||
	ZabovDoubleBL  string   // json:doublefilters -> ZabovDoubleBL list of urls returning a file with  IP<space>domain
 | 
			
		||||
	ZabovAddBL     string   // json:blackholeip  -> ZabovAddBL is the IP we want to send all the clients to. Usually is 127.0.0.1
 | 
			
		||||
	ZabovAddBL     net.IP   // json:blackholeip  -> ZabovAddBL is the IP we want to send all the clients to. Usually is 127.0.0.1
 | 
			
		||||
	ZabovHostsFile string   // json:hostsfile -> ZabovHostsFile is the file we use to keep our hosts
 | 
			
		||||
	ZabovUpDNS     string   // json:upstream -> ZabovUpDNS keeps the name of upstream DNSs
 | 
			
		||||
	ZabovDNSArray  []string // contains all the DNS we mention, parsed from ZabovUpDNS file
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue