Mirrors/coredns
1
0
Fork 0
mirror of https://github.com/coredns/coredns.git synced 2025-11-01 18:53:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

Reverse middleware change ipseparator (#753)

Browse Source 
* change IPv4 separator from - to .

* fix reverse middleware tests and README to adapt with . instead of -
This commit is contained in:
jremond
2017-06-25 04:59:33 -04:00
committed by Miek Gieben
parent ab0f810158
commit ea90702bfc
3 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
middleware/reverse/network.go
View File

@@ -18,7 +18,7 @@ type network struct {
// TODO: we might want to get rid of these regexes.
const hexDigit = "0123456789abcdef"
const templateNameIP = "{ip}"
const regexMatchV4 = "((?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\-){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?))"
const regexMatchV4 = "((?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?))"
const regexMatchV6 = "([0-9a-fA-F]{32})"
// hostnameToIP converts the hostname back to an ip, based on the template
@@ -32,7 +32,7 @@ func (network *network) hostnameToIP(rname string) net.IP {
}
if network.IPnet.IP.To4() != nil {
matchedIP = net.ParseIP(strings.Replace(match[1], "-", ".", 4))
matchedIP = net.ParseIP(match[1])
} else {
// TODO: can probably just allocate a []byte and use that.
var buf bytes.Buffer
@@ -58,10 +58,7 @@ func (network *network) hostnameToIP(rname string) net.IP {
func (network *network) ipToHostname(ip net.IP) (name string) {
if ipv4 := ip.To4(); ipv4 != nil {
// replace . to -
name = uitoa(ipv4[0]) + "-" +
uitoa(ipv4[1]) + "-" +
uitoa(ipv4[2]) + "-" +
uitoa(ipv4[3])
name = ipv4.String()
} else {
// assume v6
// ensure zeros are present in string