Merge branch 'jcarr' of git.wit.org:jcarr/control-panel-dns into jcarr

Signed-off-by: Jeff Carr <jcarr@wit.com>

gui.go

@@ -61,6 +61,18 @@ func addDNSTab(window *gui.Node, title string) {
 		s := tb.GetText()
 		log("text =", s)
 	}
+<<<<<<< HEAD
+	g2.NewButton("dump Host.ifmap", func () {
+		for i, t := range me.ifmap {
+			log("int =", i, "name =", t.name, t.iface)
+		}
+	})
+	g2.NewButton("checkDNS()", func () {
+		me.checkDNS()
+	})
+	g2.NewButton("getHostname()", func () {
+		getHostname()
+=======
 	g2.NewButton("Network Interfaces", func () {
 		for i, t := range me.ifmap {
 			log("name =", t.iface.Name)
@@ -81,6 +93,7 @@ func addDNSTab(window *gui.Node, title string) {
 	})
 	g2.NewButton("checkDNS()", func () {
 		checkDNS()
+>>>>>>> eb554cfeb772d3ec3c9bc9612603a7c2c5681ea9
 	})
 	g2.NewButton("os.User()", func () {
 		user, _ := user.Current()

net.go

@@ -91,6 +91,8 @@ func checkInterface(i net.Interface) {
 	}
 }
 
+<<<<<<< HEAD
+=======
 func realAAAA() []string {
 	var aaaa []string
 
@@ -104,6 +106,7 @@ func realAAAA() []string {
 	return aaaa
 }
 
+>>>>>>> eb554cfeb772d3ec3c9bc9612603a7c2c5681ea9
 func checkDNS() (map[string]*IPtype, map[string]*IPtype) {
 	var ipv4s map[string]*IPtype
 	var ipv6s map[string]*IPtype