Merge remote-tracking branch 'upstream/master'

main.go

@@ -10,6 +10,10 @@ import (
 	"time"
 )
 
+const (
+	LOCAL_DOMAIN = "weave"
+)
+
 var zone = new(weavedns.ZoneDb)
 
 func makeDNSReply(r *dns.Msg, name string, addr net.IP) *dns.Msg {
@@ -33,7 +37,7 @@ func handleMDNS(w dns.ResponseWriter, r *dns.Msg) {
 		q := r.Question[0]
 		ip, err := zone.MatchLocal(q.Name)
 		if err == nil {
-			m := makeDNSReply(r, q.Name, net.ParseIP(ip))
+			m := makeDNSReply(r, q.Name, ip)
 			mdnsClient.SendResponse(m)
 		} else if mdnsClient.IsInflightQuery(r) {
 			// ignore this - it's our own query received via multicast
@@ -47,7 +51,7 @@ func handleLocal(w dns.ResponseWriter, r *dns.Msg) {
 	q := r.Question[0]
 	ip, err := zone.MatchLocal(q.Name)
 	if err == nil {
-		m := makeDNSReply(r, q.Name, net.ParseIP(ip))
+		m := makeDNSReply(r, q.Name, ip)
 		w.WriteMsg(m)
 	} else {
 		log.Printf("Failed lookup for %s; sending mDNS query", q.Name)
@@ -115,11 +119,11 @@ func main() {
 	}
 
 	LocalServeMux := dns.NewServeMux()
-	LocalServeMux.HandleFunc("local", handleLocal)
+	LocalServeMux.HandleFunc(LOCAL_DOMAIN, handleLocal)
 	go weavedns.ListenHttp(zone)
 
 	MDNSServeMux := dns.NewServeMux()
-	MDNSServeMux.HandleFunc("local", handleMDNS)
+	MDNSServeMux.HandleFunc(LOCAL_DOMAIN, handleMDNS)
 
 	conn, err := weavedns.LinkLocalMulticastListener(iface)
 	if err != nil {
@@ -128,6 +132,8 @@ func main() {
 	mdnsClient, err = weavedns.NewMDNSClient()
 	if err != nil {
 		log.Fatal(err)
+	} else {
+		log.Printf("Using mDNS on %s", ifaceName)
 	}
 	mdnsClient.Start()
 
@@ -137,5 +143,7 @@ func main() {
 	err = dns.ListenAndServe(address, "udp", LocalServeMux)
 	if err != nil {
 		log.Fatal(err)
+	} else {
+		log.Printf("Listening for DNS on %s", address)
 	}
 }

server/http.go

@@ -3,6 +3,7 @@ package weavedns
 import (
 	"fmt"
 	"log"
+	"net"
 	"net/http"
 )
 
@@ -14,12 +15,20 @@ func ListenHttp(db Zone) {
 	http.HandleFunc("/add", func(w http.ResponseWriter, r *http.Request) {
 		name := r.FormValue("name")
 		addr := r.FormValue("ip")
-		weave_ip := r.FormValue("weave_ip")
-		if name != "" && addr != "" && weave_ip != "" {
-			log.Printf("Adding %s, %s, %s", name, addr, weave_ip)
-			db.AddRecord(name, addr, weave_ip)
+		weave_cidr := r.FormValue("weave_cidr")
+		if name != "" && addr != "" && weave_cidr != "" {
+			ip := net.ParseIP(addr)
+			weave_ip, subnet, err := net.ParseCIDR(weave_cidr)
+			if err == nil && ip != nil {
+				log.Printf("Adding %s (%s) -> %s", name, addr, weave_cidr)
+				db.AddRecord(name, ip, weave_ip, subnet)
+			} else if err != nil {
+				log.Printf("Invalid CIDR in request: %s", weave_cidr)
+			} else {
+				log.Printf("Invalid IP in request: %s", addr)
+			}
 		} else {
-			log.Printf("Invalid request: %s, %s, %s", name, addr, weave_ip)
+			log.Printf("Invalid request: %s, %s, %s", name, addr, weave_cidr)
 		}
 	})
 	address := fmt.Sprintf(":%d", UPDATE_PORT)

server/zone.go

@@ -3,19 +3,20 @@ package weavedns
 import (
 	"github.com/miekg/dns"
 	"log"
+	"net"
 	"sync"
 )
 
 type Zone interface {
-	AddRecord(name string, ip string, weave_ip string) error
-	MatchLocal(name string) (string, error)
-	MatchGlobal(name string) (string, error)
+	AddRecord(string, net.IP, net.IP, *net.IPNet) error
+	MatchLocal(string) (net.IP, error)
 }
 
 type Record struct {
 	Name    string
-	Ip      string
-	WeaveIp string
+	Ip      net.IP
+	WeaveIp net.IP
+	Subnet  *net.IPNet
 }
 
 type ZoneDb struct {
@@ -30,31 +31,25 @@ func (ops LookupError) Error() string {
 }
 
 // Stop gap.
-func (zone *ZoneDb) match(name string) (string, error) {
+func (zone *ZoneDb) match(name string) (net.IP, error) {
 	for _, r := range zone.recs {
 		log.Printf("%s == %s ?", r.Name, name)
 		if r.Name == name {
 			return r.WeaveIp, nil
 		}
 	}
-	return "", LookupError(name)
+	return nil, LookupError(name)
 }
 
-func (zone *ZoneDb) MatchLocal(name string) (string, error) {
+func (zone *ZoneDb) MatchLocal(name string) (net.IP, error) {
 	zone.mx.Lock()
 	defer zone.mx.Unlock()
 	return zone.match(name)
 }
 
-func (zone *ZoneDb) MatchGlobal(name string) (string, error) {
+func (zone *ZoneDb) AddRecord(name string, ip net.IP, weave_ip net.IP, weave_subnet *net.IPNet) error {
 	zone.mx.Lock()
 	defer zone.mx.Unlock()
-	return zone.match(name)
-}
-
-func (zone *ZoneDb) AddRecord(name string, ip string, weave_ip string) error {
-	zone.mx.Lock()
-	defer zone.mx.Unlock()
-	zone.recs = append(zone.recs, Record{dns.Fqdn(name), ip, weave_ip})
+	zone.recs = append(zone.recs, Record{dns.Fqdn(name), ip, weave_ip, weave_subnet})
 	return nil
 }