community
/
dns
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gofmt

This commit is contained in:
Miek Gieben 2012-01-12 22:49:26 +01:00
parent 1d5e916a1e
commit 9b48d4b899
4 changed files with 89 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
client.go
View File

@ -229,7 +229,7 @@ func (c *Client) Exchange(m *Msg, a string) (r *Msg, err error) {
var n int var n int
out, ok := m.Pack() out, ok := m.Pack()
if !ok { if !ok {
return nil, ErrPack return nil, ErrPack
} }
var in []byte var in []byte
switch c.Net { switch c.Net {
@ -238,7 +238,7 @@ func (c *Client) Exchange(m *Msg, a string) (r *Msg, err error) {
case "udp": case "udp":
in = make([]byte, DefaultMsgSize) in = make([]byte, DefaultMsgSize)
} }
//TODO(mg): look at the buffer size here //TODO(mg): look at the buffer size here
if n, err = c.ExchangeBuffer(out, a, in); err != nil { if n, err = c.ExchangeBuffer(out, a, in); err != nil {
return nil, err return nil, err
} }
@ -359,7 +359,7 @@ func (w *reply) Send(m *Msg) error {
if !ok { if !ok {
return ErrSecret return ErrSecret
} }
// Compressie maakt dit stuk // Compressie maakt dit stuk
if err := TsigGenerate(m, w.Client().TsigSecret[secret], w.tsigRequestMAC, w.tsigTimersOnly); err != nil { if err := TsigGenerate(m, w.Client().TsigSecret[secret], w.tsigRequestMAC, w.tsigTimersOnly); err != nil {
return err return err
} }

61
parse_test.go
View File

@ -101,7 +101,7 @@ z2.miek.nl. 86400 IN NSEC miek.nl. TXT RRSIG NSEC
$TTL 100 $TTL 100
z3.miek.nl. IN NSEC miek.nl. TXT RRSIG NSEC` z3.miek.nl. IN NSEC miek.nl. TXT RRSIG NSEC`
// Need to implementen owner substitution in the lexer. // Need to implementen owner substitution in the lexer.
to := ParseZone(strings.NewReader(zone)) to := ParseZone(strings.NewReader(zone))
i := 0 i := 0
for x := range to { for x := range to {
if x.Error == nil { if x.Error == nil {
@ -117,10 +117,10 @@ z3.miek.nl. IN NSEC miek.nl. TXT RRSIG NSEC`
t.Fail() t.Fail()
} }
case 2: case 2:
if x.RR.String() != "z3.miek.nl.\t100\tIN\tNSEC\tmiek.nl. TXT RRSIG NSEC" { if x.RR.String() != "z3.miek.nl.\t100\tIN\tNSEC\tmiek.nl. TXT RRSIG NSEC" {
t.Logf("Failed to parse z3 %s", x.RR.String()) t.Logf("Failed to parse z3 %s", x.RR.String())
t.Fail() t.Fail()
} }
} }
} else { } else {
t.Logf("Failed to parse: %v\n", x.Error) t.Logf("Failed to parse: %v\n", x.Error)
@ -131,27 +131,26 @@ z3.miek.nl. IN NSEC miek.nl. TXT RRSIG NSEC`
} }
func TestDomainName(t *testing.T) { func TestDomainName(t *testing.T) {
tests := []string{"r\\.gieben.miek.nl.", "www\\.www.miek.nl."} tests := []string{"r\\.gieben.miek.nl.", "www\\.www.miek.nl."}
dbuff := make([]byte, 40) dbuff := make([]byte, 40)
for _, ts := range tests {
for _, ts := range tests { if _, ok := PackDomainName(ts, dbuff, 0, nil, false); !ok {
if _, ok := PackDomainName(ts, dbuff, 0, nil, false); !ok { t.Log("Not a valid domain name")
t.Log("Not a valid domain name") t.Fail()
t.Fail() continue
continue }
} n, _, ok := UnpackDomainName(dbuff, 0)
n, _, ok := UnpackDomainName(dbuff, 0) if !ok {
if !ok { t.Log("Failed to unpack packed domain name")
t.Log("Failed to unpack packed domain name") t.Fail()
t.Fail() continue
continue; }
} if ts != n {
if ts != n { t.Logf("Must be equal: in: %s, out: %s\n", ts, n)
t.Logf("Must be equal: in: %s, out: %s\n", ts, n) t.Fail()
t.Fail() }
} }
}
} }
func TestParseBrace(t *testing.T) { func TestParseBrace(t *testing.T) {
@ -161,8 +160,8 @@ func TestParseBrace(t *testing.T) {
`miek.nl. IN ( `miek.nl. IN (
3600 A 127.0.0.1)`: "miek.nl.\t3600\tIN\tA\t127.0.0.1", 3600 A 127.0.0.1)`: "miek.nl.\t3600\tIN\tA\t127.0.0.1",
"(miek.nl.) (A) (127.0.0.1)": "miek.nl.\t3600\tIN\tA\t127.0.0.1", "(miek.nl.) (A) (127.0.0.1)": "miek.nl.\t3600\tIN\tA\t127.0.0.1",
"miek.nl A 127.0.0.1": "miek.nl.\t3600\tIN\tA\t127.0.0.1", "miek.nl A 127.0.0.1": "miek.nl.\t3600\tIN\tA\t127.0.0.1",
"miek.nl. NS ns.miek.nl": "miek.nl.\t3600\tIN\tNS\tns.miek.nl.", "miek.nl. NS ns.miek.nl": "miek.nl.\t3600\tIN\tNS\tns.miek.nl.",
`(miek.nl.) ( `(miek.nl.) (
(IN) (IN)
(AAAA) (AAAA)
@ -171,16 +170,16 @@ func TestParseBrace(t *testing.T) {
(IN) (IN)
(AAAA) (AAAA)
(::1))`: "miek.nl.\t3600\tIN\tAAAA\t::1", (::1))`: "miek.nl.\t3600\tIN\tAAAA\t::1",
`((m)(i)ek.(n)l.) (SOA) (soa.) (soa.) ( `((m)(i)ek.(n)l.) (SOA) (soa.) (soa.) (
2009032802 ; serial 2009032802 ; serial
21600 ; refresh (6 hours) 21600 ; refresh (6 hours)
7(2)00 ; retry (2 hours) 7(2)00 ; retry (2 hours)
604()800 ; expire (1 week) 604()800 ; expire (1 week)
3600 ; minimum (1 hour) 3600 ; minimum (1 hour)
)`: "miek.nl.\t3600\tIN\tSOA\tsoa. soa. 2009032802 21600 7200 604800 3600", )`: "miek.nl.\t3600\tIN\tSOA\tsoa. soa. 2009032802 21600 7200 604800 3600",
"miek\\.nl. IN A 127.0.0.1": "miek\\.nl.\t3600\tIN\tA\t127.0.0.1", "miek\\.nl. IN A 127.0.0.1": "miek\\.nl.\t3600\tIN\tA\t127.0.0.1",
"miek.nl. IN A 127.0.0.1": "miek.nl.\t3600\tIN\tA\t127.0.0.1", "miek.nl. IN A 127.0.0.1": "miek.nl.\t3600\tIN\tA\t127.0.0.1",
"miek.nl. A 127.0.0.1": "miek.nl.\t3600\tIN\tA\t127.0.0.1", "miek.nl. A 127.0.0.1": "miek.nl.\t3600\tIN\tA\t127.0.0.1",
`miek.nl. 86400 IN SOA elektron.atoom.net. miekg.atoom.net. ( `miek.nl. 86400 IN SOA elektron.atoom.net. miekg.atoom.net. (
2009032802 ; serial 2009032802 ; serial
21600 ; refresh (6 hours) 21600 ; refresh (6 hours)
@ -231,7 +230,7 @@ func BenchmarkZoneParsing(b *testing.B) {
return return
} }
defer f.Close() defer f.Close()
to := ParseZone(f) to := ParseZone(f)
for x := range to { for x := range to {
x = x x = x
} }
@ -244,7 +243,7 @@ func TestZoneParsing(t *testing.T) {
} }
defer f.Close() defer f.Close()
start := time.Now().UnixNano() start := time.Now().UnixNano()
to := ParseZone(f) to := ParseZone(f)
var i int var i int
for x := range to { for x := range to {
t.Logf("%s\n", x.RR) t.Logf("%s\n", x.RR)

48
zscan.go
View File

@ -74,7 +74,7 @@ type lex struct {
} }
type Token struct { type Token struct {
RR // the scanned resource record RR // the scanned resource record
Error *ParseError // when an error occured, this is the specifics Error *ParseError // when an error occured, this is the specifics
} }
@ -147,13 +147,13 @@ func parseZone(r io.Reader, t chan Token) {
st = _EXPECT_OWNER_DIR st = _EXPECT_OWNER_DIR
case _OWNER: case _OWNER:
h.Name = l.token h.Name = l.token
if _, ok := IsDomainName(l.token); !ok { if _, ok := IsDomainName(l.token); !ok {
t <- Token{Error: &ParseError{"bad owner name", l}} t <- Token{Error: &ParseError{"bad owner name", l}}
return return
} }
if !IsFqdn(h.Name) { if !IsFqdn(h.Name) {
h.Name += origin h.Name += origin
} }
st = _EXPECT_OWNER_BL st = _EXPECT_OWNER_BL
case _DIRTTL: case _DIRTTL:
st = _EXPECT_DIRTTL_BL st = _EXPECT_DIRTTL_BL
@ -180,22 +180,22 @@ func parseZone(r io.Reader, t chan Token) {
defttl = ttl defttl = ttl
} }
st = _EXPECT_OWNER_DIR st = _EXPECT_OWNER_DIR
case _EXPECT_DIRORIGIN_BL: case _EXPECT_DIRORIGIN_BL:
if l.value != _BLANK { if l.value != _BLANK {
t <- Token{Error: &ParseError{"No blank after $-directive", l}} t <- Token{Error: &ParseError{"No blank after $-directive", l}}
return return
} }
st = _EXPECT_DIRORIGIN st = _EXPECT_DIRORIGIN
case _EXPECT_DIRORIGIN: case _EXPECT_DIRORIGIN:
if l.value != _STRING { if l.value != _STRING {
t <- Token{Error: &ParseError{"Expecting $ORIGIN value, not this...", l}} t <- Token{Error: &ParseError{"Expecting $ORIGIN value, not this...", l}}
return return
} }
if !IsFqdn(l.token) { if !IsFqdn(l.token) {
origin = l.token + origin // Append old origin if the new one isn't a fqdn origin = l.token + origin // Append old origin if the new one isn't a fqdn
} else { } else {
origin = l.token origin = l.token
} }
case _EXPECT_OWNER_BL: case _EXPECT_OWNER_BL:
if l.value != _BLANK { if l.value != _BLANK {
t <- Token{Error: &ParseError{"No blank after owner", l}} t <- Token{Error: &ParseError{"No blank after owner", l}}

64
zscan_rr.go
View File

@ -123,12 +123,12 @@ func setNS(h RR_Header, c chan lex, o string) (RR, *ParseError) {
l := <-c l := <-c
rr.Ns = l.token rr.Ns = l.token
if _, ok := IsDomainName(l.token); !ok { if _, ok := IsDomainName(l.token); !ok {
return nil, &ParseError{"bad NS Ns", l} return nil, &ParseError{"bad NS Ns", l}
} }
if !IsFqdn(rr.Ns) { if !IsFqdn(rr.Ns) {
rr.Ns += o rr.Ns += o
} }
return rr, nil return rr, nil
} }
@ -145,12 +145,12 @@ func setMX(h RR_Header, c chan lex, o string) (RR, *ParseError) {
<-c // _BLANK <-c // _BLANK
l = <-c // _STRING l = <-c // _STRING
rr.Mx = l.token rr.Mx = l.token
if _, ok := IsDomainName(l.token); !ok { if _, ok := IsDomainName(l.token); !ok {
return nil, &ParseError{"bad MX Mx", l} return nil, &ParseError{"bad MX Mx", l}
} }
if !IsFqdn(rr.Mx) { if !IsFqdn(rr.Mx) {
rr.Mx += o rr.Mx += o
} }
return rr, nil return rr, nil
} }
@ -160,12 +160,12 @@ func setCNAME(h RR_Header, c chan lex, o string) (RR, *ParseError) {
l := <-c l := <-c
rr.Cname = l.token rr.Cname = l.token
if _, ok := IsDomainName(l.token); !ok { if _, ok := IsDomainName(l.token); !ok {
return nil, &ParseError{"bad CNAME", l} return nil, &ParseError{"bad CNAME", l}
} }
if !IsFqdn(rr.Cname) { if !IsFqdn(rr.Cname) {
rr.Cname += o rr.Cname += o
} }
return rr, nil return rr, nil
} }
@ -176,21 +176,21 @@ func setSOA(h RR_Header, c chan lex, o string) (RR, *ParseError) {
l := <-c l := <-c
rr.Ns = l.token rr.Ns = l.token
<-c // _BLANK <-c // _BLANK
if _, ok := IsDomainName(l.token); !ok { if _, ok := IsDomainName(l.token); !ok {
return nil, &ParseError{"bad SOA mname", l} return nil, &ParseError{"bad SOA mname", l}
} }
if !IsFqdn(rr.Ns) { if !IsFqdn(rr.Ns) {
rr.Ns += o rr.Ns += o
} }
l = <-c l = <-c
rr.Mbox = l.token rr.Mbox = l.token
if _, ok := IsDomainName(l.token); !ok { if _, ok := IsDomainName(l.token); !ok {
return nil, &ParseError{"bad SOA rname", l} return nil, &ParseError{"bad SOA rname", l}
} }
if !IsFqdn(rr.Mbox) { if !IsFqdn(rr.Mbox) {
rr.Mbox += o rr.Mbox += o
} }
<-c // _BLANK <-c // _BLANK
var j int var j int
@ -274,12 +274,12 @@ func setRRSIG(h RR_Header, c chan lex, o string) (RR, *ParseError) {
<-c // _BLANK <-c // _BLANK
l = <-c l = <-c
rr.SignerName = l.token rr.SignerName = l.token
if _, ok := IsDomainName(l.token); !ok { if _, ok := IsDomainName(l.token); !ok {
return nil, &ParseError{"bad RRSIG signername", l} return nil, &ParseError{"bad RRSIG signername", l}
} }
if !IsFqdn(rr.SignerName) { if !IsFqdn(rr.SignerName) {
rr.SignerName += o rr.SignerName += o
} }
// Get the remaining data until we see a NEWLINE // Get the remaining data until we see a NEWLINE
l = <-c l = <-c
s := "" s := ""
@ -304,12 +304,12 @@ func setNSEC(h RR_Header, c chan lex, o string) (RR, *ParseError) {
l := <-c l := <-c
rr.NextDomain = l.token rr.NextDomain = l.token
if _, ok := IsDomainName(l.token); !ok { if _, ok := IsDomainName(l.token); !ok {
return nil, &ParseError{"bad NSEC nextdomain", l} return nil, &ParseError{"bad NSEC nextdomain", l}
} }
if !IsFqdn(rr.NextDomain) { if !IsFqdn(rr.NextDomain) {
rr.NextDomain += o rr.NextDomain += o
} }
rr.TypeBitMap = make([]uint16, 0) rr.TypeBitMap = make([]uint16, 0)
l = <-c l = <-c
@ -364,12 +364,12 @@ func setNSEC3(h RR_Header, c chan lex, o string) (RR, *ParseError) {
l = <-c l = <-c
rr.HashLength = uint8(len(l.token)) rr.HashLength = uint8(len(l.token))
rr.NextDomain = l.token rr.NextDomain = l.token
if _, ok := IsDomainName(l.token); !ok { if _, ok := IsDomainName(l.token); !ok {
return nil, &ParseError{"bad NSEC nextdomain", l} return nil, &ParseError{"bad NSEC nextdomain", l}
} }
if !IsFqdn(rr.NextDomain) { if !IsFqdn(rr.NextDomain) {
rr.NextDomain += o rr.NextDomain += o
} }
rr.TypeBitMap = make([]uint16, 0) rr.TypeBitMap = make([]uint16, 0)
l = <-c l = <-c