From 8e2af9eec5ae818aecf3784e6c616561dc202f0d Mon Sep 17 00:00:00 2001
From: Bryan Boreham <bjboreham@gmail.com>
Date: Mon, 20 Oct 2014 12:41:40 +0100
Subject: [PATCH] Tidy up exported/non-exported fields

---
 server/mdns_client.go      | 10 +++++-----
 server/mdns_client_test.go |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/server/mdns_client.go b/server/mdns_client.go
index 48d2aa7b..5f70321e 100644
--- a/server/mdns_client.go
+++ b/server/mdns_client.go
@@ -26,7 +26,7 @@ var (
 type ResponseA struct {
 	Name string
 	Addr net.IP
-	err  error
+	Err  error
 }
 
 type responseInfo struct {
@@ -39,7 +39,7 @@ type responseInfo struct {
 // a query in flight, then we don't want to send more queries out.
 type inflightQuery struct {
 	name          string
-	Id            uint16 // the DNS message ID
+	id            uint16 // the DNS message ID
 	responseInfos []*responseInfo
 }
 
@@ -201,18 +201,18 @@ func (c *MDNSClient) handleSendQuery(q mDNSQueryInfo) error {
 		m.RecursionDesired = false
 		buf, err := m.Pack()
 		if err != nil {
-			q.responseCh <- &ResponseA{err: err}
+			q.responseCh <- &ResponseA{Err: err}
 			close(q.responseCh)
 			return err
 		}
 		query = &inflightQuery{
 			name: q.name,
-			Id:   m.Id,
+			id:   m.Id,
 		}
 		c.inflight[q.name] = query
 		_, err = c.conn.WriteTo(buf, c.addr)
 		if err != nil {
-			q.responseCh <- &ResponseA{err: err}
+			q.responseCh <- &ResponseA{Err: err}
 			close(q.responseCh)
 			return err
 		}
diff --git a/server/mdns_client_test.go b/server/mdns_client_test.go
index 0eebf251..8d5795f0 100644
--- a/server/mdns_client_test.go
+++ b/server/mdns_client_test.go
@@ -96,8 +96,8 @@ func (c *testContext) checkResponse(t *testing.T, channel_ok bool, resp *Respons
 		c.channel = nil
 		return
 	}
-	if resp.err != nil {
-		t.Fatal(resp.err)
+	if resp.Err != nil {
+		t.Fatal(resp.Err)
 	}
 	log.Printf("Got address response %s addr %s", resp.Name, resp.Addr)
 	c.received_addr = resp.Addr