mesh.cat/meshname
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove comments and debug stuff

Browse Source
This commit is contained in:
cynic 2024-05-25 06:12:57 +00:00
parent 9f31f76d02
commit 5b4fd41ffa
1 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/meshname/server.go
View File

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