Browse Source

Use abh/dns fork to include EDNS-CLIENT-SUBNET fix

https://github.com/abh/dns/commit/0bcd43e7cc0be454c0a1d2ebee778684fb31fd38
Ask Bjørn Hansen 12 years ago
parent
commit
b918963e35
7 changed files with 8 additions and 8 deletions
  1. 1 1
      picker.go
  2. 1 1
      serve.go
  3. 2 2
      serve_test.go
  4. 1 1
      zone.go
  5. 1 1
      zone_test.go
  6. 1 1
      zones.go
  7. 1 1
      zones_test.go

+ 1 - 1
picker.go

@@ -1,7 +1,7 @@
 package main
 package main
 
 
 import (
 import (
-	"github.com/miekg/dns"
+	"github.com/abh/dns"
 	"math/rand"
 	"math/rand"
 )
 )
 
 

+ 1 - 1
serve.go

@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"encoding/json"
 	"fmt"
 	"fmt"
 	"github.com/abh/geodns/countries"
 	"github.com/abh/geodns/countries"
-	"github.com/miekg/dns"
+	"github.com/abh/dns"
 	"log"
 	"log"
 	"net"
 	"net"
 	"os"
 	"os"

+ 2 - 2
serve_test.go

@@ -1,7 +1,7 @@
 package main
 package main
 
 
 import (
 import (
-	"github.com/miekg/dns"
+	"github.com/abh/dns"
 	. "launchpad.net/gocheck"
 	. "launchpad.net/gocheck"
 	"net"
 	"net"
 	"strings"
 	"strings"
@@ -114,7 +114,7 @@ func (s *ServeSuite) TestServingEDNS(c *C) {
 
 
 	c.Log("Testing www.test.example.com from .dk, should match www.europe (a cname)")
 	c.Log("Testing www.test.example.com from .dk, should match www.europe (a cname)")
 
 
-	r = exchangeSubnet(c, "www.test.example.com.", dns.TypeA, "194.239.134.1")
+	r = exchangeSubnet(c, "www.test.example.com.", dns.TypeA, "194.239.134.0")
 	c.Check(r.Answer, HasLen, 1)
 	c.Check(r.Answer, HasLen, 1)
 	if len(r.Answer) > 0 {
 	if len(r.Answer) > 0 {
 		// EDNS-SUBNET test (request A, respond CNAME)
 		// EDNS-SUBNET test (request A, respond CNAME)

+ 1 - 1
zone.go

@@ -3,7 +3,7 @@ package main
 import (
 import (
 	"github.com/abh/geodns/countries"
 	"github.com/abh/geodns/countries"
 	"github.com/abh/go-metrics"
 	"github.com/abh/go-metrics"
-	"github.com/miekg/dns"
+	"github.com/abh/dns"
 	"strings"
 	"strings"
 	"time"
 	"time"
 )
 )

+ 1 - 1
zone_test.go

@@ -1,7 +1,7 @@
 package main
 package main
 
 
 import (
 import (
-	"github.com/miekg/dns"
+	"github.com/abh/dns"
 	. "launchpad.net/gocheck"
 	. "launchpad.net/gocheck"
 )
 )
 
 

+ 1 - 1
zones.go

@@ -4,7 +4,7 @@ import (
 	"camlistore.org/pkg/errorutil"
 	"camlistore.org/pkg/errorutil"
 	"encoding/json"
 	"encoding/json"
 	"fmt"
 	"fmt"
-	"github.com/miekg/dns"
+	"github.com/abh/dns"
 	"io/ioutil"
 	"io/ioutil"
 	"log"
 	"log"
 	"net"
 	"net"

+ 1 - 1
zones_test.go

@@ -1,7 +1,7 @@
 package main
 package main
 
 
 import (
 import (
-	"github.com/miekg/dns"
+	"github.com/abh/dns"
 	"io"
 	"io"
 	"io/ioutil"
 	"io/ioutil"
 	. "launchpad.net/gocheck"
 	. "launchpad.net/gocheck"