From ff45bcf94546b22b4eef7c09fabd6d478554076c Mon Sep 17 00:00:00 2001 From: Michael Bridgen Date: Mon, 12 Jan 2015 17:42:23 +0000 Subject: [PATCH] Change Lookup method names The Local was redundant (and inaccurate in the case of the mDNS client implementation), and otherwise they are too nondescript. --- nameserver/http_test.go | 6 +++--- nameserver/mdns_client_test.go | 6 +++--- nameserver/mdns_lookup.go | 4 ++-- nameserver/mdns_server.go | 4 ++-- nameserver/server.go | 4 ++-- nameserver/zone.go | 8 ++++---- nameserver/zone_test.go | 12 ++++++------ 7 files changed, 22 insertions(+), 22 deletions(-) diff --git a/nameserver/http_test.go b/nameserver/http_test.go index a2d14380..44f3ba8f 100644 --- a/nameserver/http_test.go +++ b/nameserver/http_test.go @@ -43,7 +43,7 @@ func TestHttp(t *testing.T) { wt.AssertStatus(t, resp.StatusCode, http.StatusOK, "http response") // Check that the address is now there. - foundIP, err := zone.LookupLocal(successTestName) + foundIP, err := zone.LookupName(successTestName) wt.AssertNoErr(t, err) ip, _, _ := net.ParseCIDR(testAddr1) if !foundIP.Equal(ip) { @@ -70,7 +70,7 @@ func TestHttp(t *testing.T) { wt.AssertStatus(t, resp.StatusCode, http.StatusOK, "http response") // Check that the address is still resolvable. - _, err = zone.LookupLocal(successTestName) + _, err = zone.LookupName(successTestName) wt.AssertNoErr(t, err) // Delete the address record mentioning the other container @@ -79,7 +79,7 @@ func TestHttp(t *testing.T) { wt.AssertStatus(t, resp.StatusCode, http.StatusOK, "http response") // Check that the address is gone - _, err = zone.LookupLocal(successTestName) + _, err = zone.LookupName(successTestName) wt.AssertErrorType(t, err, (*LookupError)(nil), "fully-removed address") // Would like to shut down the http server at the end of this test diff --git a/nameserver/mdns_client_test.go b/nameserver/mdns_client_test.go index e684f8b4..aa9ad6a5 100644 --- a/nameserver/mdns_client_test.go +++ b/nameserver/mdns_client_test.go @@ -169,16 +169,16 @@ func TestAsLookup(t *testing.T) { defer mdnsClient.Shutdown() defer server.Shutdown() - ip, err := mdnsClient.LookupLocal(successTestName) + ip, err := mdnsClient.LookupName(successTestName) wt.AssertNoErr(t, err) if !testAddr.Equal(ip) { t.Fatalf("Returned address incorrect %s", ip) } - ip, err = mdnsClient.LookupLocal("foo.example.com.") + ip, err = mdnsClient.LookupName("foo.example.com.") wt.AssertErrorType(t, err, (*LookupError)(nil), "unknown hostname") - name, err := mdnsClient.ReverseLookupLocal(testInAddr) + name, err := mdnsClient.LookupInaddr(testInAddr) wt.AssertNoErr(t, err) if !(successTestName == name) { t.Fatalf("Expected name %s, got %s", successTestName, name) diff --git a/nameserver/mdns_lookup.go b/nameserver/mdns_lookup.go index a16a4fbd..0cbe413e 100644 --- a/nameserver/mdns_lookup.go +++ b/nameserver/mdns_lookup.go @@ -23,7 +23,7 @@ func mdnsLookup(client *MDNSClient, name string, qtype uint16) (*Response, error return nil, LookupError(name) } -func (client *MDNSClient) LookupLocal(name string) (net.IP, error) { +func (client *MDNSClient) LookupName(name string) (net.IP, error) { if r, e := mdnsLookup(client, name, dns.TypeA); r != nil { return r.Addr, nil } else { @@ -31,7 +31,7 @@ func (client *MDNSClient) LookupLocal(name string) (net.IP, error) { } } -func (client *MDNSClient) ReverseLookupLocal(inaddr string) (string, error) { +func (client *MDNSClient) LookupInaddr(inaddr string) (string, error) { if r, e := mdnsLookup(client, inaddr, dns.TypePTR); r != nil { return r.Name, nil } else { diff --git a/nameserver/mdns_server.go b/nameserver/mdns_server.go index 65695d21..a67a4b3e 100644 --- a/nameserver/mdns_server.go +++ b/nameserver/mdns_server.go @@ -52,7 +52,7 @@ func (s *MDNSServer) Start(ifi *net.Interface) error { handleLocal := s.makeHandler(dns.TypeA, func(zone Lookup, r *dns.Msg, q *dns.Question) *dns.Msg { - if ip, err := zone.LookupLocal(q.Name); err == nil { + if ip, err := zone.LookupName(q.Name); err == nil { return makeAddressReply(r, q, []net.IP{ip}) } else { return nil @@ -61,7 +61,7 @@ func (s *MDNSServer) Start(ifi *net.Interface) error { handleReverse := s.makeHandler(dns.TypePTR, func(zone Lookup, r *dns.Msg, q *dns.Question) *dns.Msg { - if name, err := zone.ReverseLookupLocal(q.Name); err == nil { + if name, err := zone.LookupInaddr(q.Name); err == nil { return makePTRReply(r, q, []string{name}) } else { return nil diff --git a/nameserver/server.go b/nameserver/server.go index 989e3663..f123da57 100644 --- a/nameserver/server.go +++ b/nameserver/server.go @@ -37,7 +37,7 @@ func queryHandler(lookups []Lookup) dns.HandlerFunc { Debug.Printf("Query: %+v", q) if q.Qtype == dns.TypeA { for _, lookup := range lookups { - if ip, err := lookup.LookupLocal(q.Name); err == nil { + if ip, err := lookup.LookupName(q.Name); err == nil { m := makeAddressReply(r, &q, []net.IP{ip}) w.WriteMsg(m) return @@ -56,7 +56,7 @@ func rdnsHandler(lookups []Lookup) dns.HandlerFunc { Debug.Printf("Reverse query: %+v", q) if q.Qtype == dns.TypePTR { for _, lookup := range lookups { - if name, err := lookup.ReverseLookupLocal(q.Name); err == nil { + if name, err := lookup.LookupInaddr(q.Name); err == nil { m := makePTRReply(r, &q, []string{name}) w.WriteMsg(m) return diff --git a/nameserver/zone.go b/nameserver/zone.go index 2a9baca0..ae07eb88 100644 --- a/nameserver/zone.go +++ b/nameserver/zone.go @@ -15,8 +15,8 @@ const ( var rdnsDomainLen = len(RDNS_DOMAIN) + 1 type Lookup interface { - LookupLocal(name string) (net.IP, error) - ReverseLookupLocal(inaddr string) (string, error) + LookupName(name string) (net.IP, error) + LookupInaddr(inaddr string) (string, error) } type Zone interface { @@ -61,7 +61,7 @@ func (zone *ZoneDb) indexOf(match func(Record) bool) int { return -1 } -func (zone *ZoneDb) LookupLocal(name string) (net.IP, error) { +func (zone *ZoneDb) LookupName(name string) (net.IP, error) { zone.mx.RLock() defer zone.mx.RUnlock() for _, r := range zone.recs { @@ -72,7 +72,7 @@ func (zone *ZoneDb) LookupLocal(name string) (net.IP, error) { return nil, LookupError(name) } -func (zone *ZoneDb) ReverseLookupLocal(inaddr string) (string, error) { +func (zone *ZoneDb) LookupInaddr(inaddr string) (string, error) { if revIP := net.ParseIP(inaddr[:len(inaddr)-rdnsDomainLen]); revIP != nil { revIP4 := revIP.To4() ip := []byte{revIP4[3], revIP4[2], revIP4[1], revIP4[0]} diff --git a/nameserver/zone_test.go b/nameserver/zone_test.go index c5298c1e..ef242ddb 100644 --- a/nameserver/zone_test.go +++ b/nameserver/zone_test.go @@ -27,7 +27,7 @@ func TestZone(t *testing.T) { wt.AssertNoErr(t, err) // Check that the address is now there. - foundIP, err := zone.LookupLocal(successTestName) + foundIP, err := zone.LookupName(successTestName) wt.AssertNoErr(t, err) if !foundIP.Equal(ip) { @@ -35,7 +35,7 @@ func TestZone(t *testing.T) { } // See if we can find the address by IP. - foundName, err := zone.ReverseLookupLocal("1.2.0.10.in-addr.arpa.") + foundName, err := zone.LookupInaddr("1.2.0.10.in-addr.arpa.") wt.AssertNoErr(t, err) if foundName != successTestName { @@ -50,14 +50,14 @@ func TestZone(t *testing.T) { err = zone.DeleteRecord(containerID, ip) wt.AssertNoErr(t, err) - _, err = zone.LookupLocal(successTestName) + _, err = zone.LookupName(successTestName) wt.AssertNoErr(t, err) err = zone.DeleteRecord(otherContainerID, ip) wt.AssertNoErr(t, err) // Check that the address is not there now. - _, err = zone.LookupLocal(successTestName) + _, err = zone.LookupName(successTestName) wt.AssertErrorType(t, err, (*LookupError)(nil), "after deleting record") // Delete a record that isn't there @@ -79,10 +79,10 @@ func TestDeleteFor(t *testing.T) { wt.AssertNoErr(t, err) } - _, err := zone.LookupLocal(name) + _, err := zone.LookupName(name) wt.AssertNoErr(t, err) err = zone.DeleteRecordsFor(id) - _, err = zone.LookupLocal(name) + _, err = zone.LookupName(name) wt.AssertErrorType(t, err, (*LookupError)(nil), "after deleting records for ident") }