1 files changed, 11 insertions, 59 deletions

diff --git a/hostname.go b/hostname.go
index 9eb1a65..10211ba 100644
--- a/hostname.go
+++ b/hostname.go
@@ -22,14 +22,7 @@ func getHostname() {
 		log.Error(err, "FQDN hostname error")
 		return
 	}
-	if (me.fqdn != nil) {
-		if (me.hostname != s) {
-			me.fqdn.SetText(s)
-			me.hostname = s
-			me.changed = true
-		}
-	}
-	log.Log(NET, "FQDN =", s)
+	me.status.SetHostname(s)
 
 	dn := run("domainname")
 	if (me.domainname.S != dn) {
@@ -47,17 +40,17 @@ func getHostname() {
 
 	var test string
 	test = hshort + "." + dn
-	if (me.hostname != test) {
-		log.Info("me.hostname", me.hostname, "does not equal", test)
-		if (me.hostnameStatusOLD.S != "BROKEN") {
-			log.Log(CHANGE, "me.hostname", me.hostname, "does not equal", test)
+	if (me.status.GetHostname() != test) {
+		log.Log(CHANGE, "me.hostname", me.status.GetHostname(), "does not equal", test)
+		if (me.hostnameStatus.S != "BROKEN") {
+			log.Log(CHANGE, "me.hostname", me.status.GetHostname(), "does not equal", test)
 			me.changed = true
-			me.hostnameStatusOLD.SetText("BROKEN")
+			me.hostnameStatus.SetText("BROKEN")
 		}
 	} else {
-		if (me.hostnameStatusOLD.S != "VALID") {
-			log.Log(CHANGE, "me.hostname", me.hostname, "is valid")
-			me.hostnameStatusOLD.SetText("VALID")
+		if (me.hostnameStatus.S != "VALID") {
+			log.Log(CHANGE, "me.hostname", me.status.GetHostname(), "is valid")
+			me.hostnameStatus.SetText("VALID")
 			me.changed = true
 		}
 		// enable the cloudflare button if the provider is cloudflare
@@ -76,7 +69,7 @@ func getHostname() {
 // check that all the OS settings are correct here
 // On Linux, /etc/hosts, /etc/hostname
 //      and domainname and hostname
-func goodHostname(h string) bool {
+func goodHostname() bool {
 	hostname := shell.Chomp(shell.Cat("/etc/hostname"))
 	log.Log(NOW, "hostname =", hostname)
 
@@ -93,30 +86,6 @@ func goodHostname(h string) bool {
 	return false
 }
 
-/*
-func digAAAA(s string) []string {
-	var aaaa []string
-	// lookup the IP address from DNS
-	rrset := dnssecsocket.Dnstrace(s, "AAAA")
-	// log.Spew(args.VerboseDNS, SPEW, rrset)
-	for i, rr := range rrset {
-		ipaddr := dns.Field(rr, 1)
-		// how the hell do you detect a RRSIG	AAAA record here?
-		if (ipaddr == "28") {
-			continue
-		}
-		log.Log(NOW, "r.Answer =", i, "rr =", rr, "ipaddr =", ipaddr)
-		aaaa = append(aaaa, ipaddr)
-		me.ipv6s[ipaddr] = rr
-	}
-	log.Info(args.VerboseDNS, "aaaa =", aaaa)
-	log.Println("digAAAA() returned =", aaaa)
-	log.Println("digAAAA() me.ipv6s =", me.ipv6s)
-	os.Exit(0)
-	return aaaa
-}
-*/
-
 func digAAAA(hostname string) []string {
 	var blah, ipv6Addresses []string
 	// domain := hostname
@@ -128,7 +97,7 @@ func digAAAA(hostname string) []string {
 
 	if (len(blah) == 0) {
 		log.Println("digAAAA() RUNNING dnsAAAAlookupDoH(domain)")
-		ipv6Addresses, _ = dnsAAAAlookupDoH(hostname)
+		ipv6Addresses = lookupDoH(hostname, "AAAA")
 		log.Println("digAAAA() has ipv6Addresses =", strings.Join(ipv6Addresses, " "))
 		for _, addr := range ipv6Addresses {
 			log.Println(addr)
@@ -141,20 +110,3 @@ func digAAAA(hostname string) []string {
 
 	return blah
 }
-
-/*
-func dnsHttpsLookup(domain string, recordType uint16) ([]string, error) {
-	domain := "google.com"
-	dnsLookupDoH(domain string) ([]string, error) {
-	ipv6Addresses, err := dnsLookupDoH(domain)
-	if err != nil {
-		log.Println("Error:", err)
-		return
-	}
-
-	log.Printf("IPv6 Addresses for %s:\n", domain)
-	for _, addr := range ipv6Addresses {
-		log.Println(addr)
-	}
-}
-*/