mokhtar/local-ip.sh
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move logic back into

Browse Source
This commit is contained in:
m5r 2022-10-29 00:27:58 +02:00
parent bb3db9be47
commit 62ebedb848
No known key found for this signature in database
GPG Key ID: 5BC847276DD5DDEA
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
xip/xip.go
View File

@ -24,7 +24,7 @@ var (
dashedIpV4Regex = regexp.MustCompile(`(?:^|(?:[\w\d])+\.)(((25[0-5]|(2[0-4]|1\d|[1-9]|)\d)\-?\b){4})($|[.-])`) dashedIpV4Regex = regexp.MustCompile(`(?:^|(?:[\w\d])+\.)(((25[0-5]|(2[0-4]|1\d|[1-9]|)\d)\-?\b){4})($|[.-])`)
) )
func (xip *Xip) handleA(question dns.Question) *dns.A { func (xip *Xip) handleA(question dns.Question, message *dns.Msg) {
fqdn := question.Name fqdn := question.Name
for _, ipV4RE := range []*regexp.Regexp{dashedIpV4Regex, dottedIpV4Regex} { for _, ipV4RE := range []*regexp.Regexp{dashedIpV4Regex, dottedIpV4Regex} {
@ -33,10 +33,12 @@ func (xip *Xip) handleA(question dns.Question) *dns.A {
match = strings.ReplaceAll(match, "-", ".") match = strings.ReplaceAll(match, "-", ".")
ipV4Address := net.ParseIP(match).To4() ipV4Address := net.ParseIP(match).To4()
if ipV4Address == nil { if ipV4Address == nil {
return nil message.Rcode = dns.RcodeNameError
message.Ns = append(message.Ns, xip.SOARecord(question))
return
} }
resource := &dns.A{ record := &dns.A{
Hdr: dns.RR_Header{ Hdr: dns.RR_Header{
// Ttl: uint32((time.Hour * 24 * 7).Seconds()), // Ttl: uint32((time.Hour * 24 * 7).Seconds()),
Ttl: uint32((time.Second * 10).Seconds()), Ttl: uint32((time.Second * 10).Seconds()),
@ -47,11 +49,9 @@ func (xip *Xip) handleA(question dns.Question) *dns.A {
A: ipV4Address, A: ipV4Address,
} }
log.Printf("(%s) %s => %s\n", flyRegion, fqdn, ipV4Address) log.Printf("(%s) %s => %s\n", flyRegion, fqdn, ipV4Address)
return resource message.Answer = append(message.Answer, record)
} }
} }
return nil
} }
func (xip *Xip) SOARecord(question dns.Question) *dns.SOA { func (xip *Xip) SOARecord(question dns.Question) *dns.SOA {
@ -83,14 +83,7 @@ func (xip *Xip) handleQuery(message *dns.Msg) {
for _, question := range message.Question { for _, question := range message.Question {
switch question.Qtype { switch question.Qtype {
case dns.TypeA: case dns.TypeA:
record := xip.handleA(question) xip.handleA(question, message)
if record == nil {
message.Rcode = dns.RcodeNameError
message.Ns = append(message.Ns, xip.SOARecord(question))
return
}
message.Answer = append(message.Answer, record)
} }
} }
} }