diff --git a/pkg/meshname/server.go b/pkg/meshname/server.go index 859ee42..0420d5f 100644 --- a/pkg/meshname/server.go +++ b/pkg/meshname/server.go @@ -63,9 +63,7 @@ func (s *MeshnameServer) Start() error { } if s.enableMeshIP { for mtld, subnet := range s.meshipNetworks { - //dns.HandleFunc("meship", s.handleMeshIPRequest) dns.HandleFunc(mtld, s.handleMeshIPRequest) - //s.log.Debugln("Handling: meship ::/0") s.log.Debugln("Handling as meship:", mtld, subnet) } } @@ -90,23 +88,17 @@ func (s *MeshnameServer) Start() error { } func (s *MeshnameServer) handleMeshnameRequest(w dns.ResponseWriter, r *dns.Msg) { - s.log.Debugln("== handleMeshnameRequest ==") var remoteLookups = make(map[string][]dns.Question) m := new(dns.Msg) m.SetReply(r) - s.log.Debugln(r.String()) // DEBUG - s.log.Debugln(s.networks) // DEBUG var tldList []string for tld := range s.networks { tldList = append(tldList, tld) } - s.log.Debugln("tldList:", tldList) // DEBUG for _, q := range r.Question { - s.log.Debugln("q.Name:", q.Name) // DEBUG labels := dns.SplitDomainName(q.Name) - s.log.Debugln("labels:", labels) // DEBUG if len(labels) < 2 { s.log.Debugln("Error: invalid domain requested") continue @@ -126,15 +118,12 @@ func (s *MeshnameServer) handleMeshnameRequest(w dns.ResponseWriter, r *dns.Msg) firstPartLabels := dns.SplitDomainName(firstPart) // define hostname ("subDomain") subDomain = firstPartLabels[len(firstPartLabels)-1] - s.log.Debugln(tld, domainParts, firstPart, firstPartLabels, subDomain) if len(firstPartLabels) == 1 { s.handleMeshIPRequest(w, r) return } } } - //subDomain := labels[len(labels)-2] - s.log.Debugln("subDomain:", subDomain) // DEBUG resolvedAddr, err := IPFromDomain(&subDomain) if err != nil { @@ -143,7 +132,6 @@ func (s *MeshnameServer) handleMeshnameRequest(w dns.ResponseWriter, r *dns.Msg) } // check subnet validity - //tld := labels[len(labels)-1] if subnet, ok := s.networks[tld]; ok && subnet.Contains(resolvedAddr) { remoteLookups[resolvedAddr.String()] = append(remoteLookups[resolvedAddr.String()], q) } else { @@ -172,7 +160,6 @@ func (s *MeshnameServer) handleMeshnameRequest(w dns.ResponseWriter, r *dns.Msg) } func (s *MeshnameServer) handleMeshIPRequest(w dns.ResponseWriter, r *dns.Msg) { - s.log.Debugln("== handleMeshIPRequest ==") m := new(dns.Msg) m.SetReply(r) s.log.Debugln(r.String())