Merge lp:~chipaca/snapweb/mdns-nicer-with-ipv6 into lp:~snappy-dev/snapweb/trunk

[John Lenton]

Handle IPv6 addresses better wrt mdns.

[Sergio Schvezov (sergiusens)]

Thanks for this great improvement!

review: Approve

Unmerged revisions

166. By John Lenton on 2015-10-27

handle ipv6 better in the mdns rrs

165. By John Lenton on 2015-10-26

bump snappy revision

164. By John Lenton on 2015-10-26

also nuke the now-useless config

163. By John Lenton on 2015-10-01

fxi typo

162. By John Lenton on 2015-10-01

silly tweaks to build and package

161. By John Lenton on 2015-09-25

update package version

160. By John Lenton on 2015-09-25

build again, ok? ta

=== modified file 'avahi/avahi.go'
--- avahi/avahi.go	2015-05-07 23:00:26 +0000
+++ avahi/avahi.go	2015-10-27 15:43:20 +0000
@@ -39,18 +39,22 @@
 )
 
 const timeoutMinutes = 10
-const inAddr = `%s.local. 60 IN A %s`
-const inPtr = `%s.in-addr.arpa. 60 IN PTR %s.local.`
+const in4Addr = `%s.local. 60 IN A %s`
+const in6Addr = `%s.local. 60 in AAAA %s`
 
 var mdnsPublish = mdns.Publish
 
-func tryPublish(hostname, ip string) {
-	rr := fmt.Sprintf(inAddr, hostname, ip)
+func tryPublish(hostname string, ip net.IP) {
+	inAddr := in4Addr
+	if ip.To4() == nil {
+		inAddr = in6Addr
+	}
+	rr := fmt.Sprintf(inAddr, hostname, ip.String())
 
 	logger.Println("Publishing", rr)
 
 	if err := mdnsPublish(rr); err != nil {
-		logger.Printf(`Unable to publish record "%s": %v`, rr, err)
+		logger.Printf(`Unable to publish record %q: %v`, rr, err)
 		return
 	}
 }
@@ -102,17 +106,17 @@
 		return
 	}
 
-	if strings.ContainsRune(hostname, '.') {
-		hostname = strings.Split(hostname, ".")[0]
+	if idx := strings.IndexByte(hostname, '.'); idx > -1 {
+		hostname = hostname[:idx]
 	}
 
 	if hostname == hostnameLocalhost {
 		hostname = hostnameWedbm
 	}
 
-	for _, ip := range addrs {
-		ip := strings.Split(ip.String(), "/")[0]
-		if strings.HasPrefix(ip, "127.") {
+	for _, addr := range addrs {
+		ip, _, err := net.ParseCIDR(addr.String())
+		if ip == nil || err != nil || ip.IsLoopback() {
 			continue
 		}
 

=== modified file 'pkg/meta/package.yaml'
--- pkg/meta/package.yaml	2015-10-27 15:43:20 +0000
+++ pkg/meta/package.yaml	2015-10-27 15:43:20 +0000
@@ -3,7 +3,7 @@
 icon: meta/webdm-icon.png
 source: lp:webdm
 type: framework
-version: 0.9.3
+version: 0.9.4
 architectures: UNKNOWN_ARCH
 services:
     - name: snappyd