gofmt -s
This commit is contained in:
parent
85b661b2a6
commit
0cea3842b9
|
@ -61,9 +61,9 @@ func TestSplit(t *testing.T) {
|
||||||
|
|
||||||
func TestSplit2(t *testing.T) {
|
func TestSplit2(t *testing.T) {
|
||||||
splitter := map[string][]int{
|
splitter := map[string][]int{
|
||||||
"www.miek.nl.": []int{0, 4, 9},
|
"www.miek.nl.": {0, 4, 9},
|
||||||
"www.miek.nl": []int{0, 4, 9},
|
"www.miek.nl": {0, 4, 9},
|
||||||
"nl": []int{0},
|
"nl": {0},
|
||||||
}
|
}
|
||||||
for s, i := range splitter {
|
for s, i := range splitter {
|
||||||
x := Split(s)
|
x := Split(s)
|
||||||
|
@ -125,13 +125,13 @@ func TestCountLabel(t *testing.T) {
|
||||||
|
|
||||||
func TestSplitDomainName(t *testing.T) {
|
func TestSplitDomainName(t *testing.T) {
|
||||||
labels := map[string][]string{
|
labels := map[string][]string{
|
||||||
"miek.nl": []string{"miek", "nl"},
|
"miek.nl": {"miek", "nl"},
|
||||||
".": nil,
|
".": nil,
|
||||||
"www.miek.nl.": []string{"www", "miek", "nl"},
|
"www.miek.nl.": {"www", "miek", "nl"},
|
||||||
"www.miek.nl": []string{"www", "miek", "nl"},
|
"www.miek.nl": {"www", "miek", "nl"},
|
||||||
"www..miek.nl": []string{"www", "", "miek", "nl"},
|
"www..miek.nl": {"www", "", "miek", "nl"},
|
||||||
`www\.miek.nl`: []string{`www\.miek`, "nl"},
|
`www\.miek.nl`: {`www\.miek`, "nl"},
|
||||||
`www\\.miek.nl`: []string{`www\\`, "miek", "nl"},
|
`www\\.miek.nl`: {`www\\`, "miek", "nl"},
|
||||||
}
|
}
|
||||||
domainLoop:
|
domainLoop:
|
||||||
for domain, splits := range labels {
|
for domain, splits := range labels {
|
||||||
|
@ -155,13 +155,13 @@ func TestIsDomainName(t *testing.T) {
|
||||||
lab int
|
lab int
|
||||||
}
|
}
|
||||||
names := map[string]*ret{
|
names := map[string]*ret{
|
||||||
"..": &ret{false, 1},
|
"..": {false, 1},
|
||||||
"@.": &ret{true, 1},
|
"@.": {true, 1},
|
||||||
"www.example.com": &ret{true, 3},
|
"www.example.com": {true, 3},
|
||||||
"www.e%ample.com": &ret{true, 3},
|
"www.e%ample.com": {true, 3},
|
||||||
"www.example.com.": &ret{true, 3},
|
"www.example.com.": {true, 3},
|
||||||
"mi\\k.nl.": &ret{true, 2},
|
"mi\\k.nl.": {true, 2},
|
||||||
"mi\\k.nl": &ret{true, 2},
|
"mi\\k.nl": {true, 2},
|
||||||
}
|
}
|
||||||
for d, ok := range names {
|
for d, ok := range names {
|
||||||
l, k := IsDomainName(d)
|
l, k := IsDomainName(d)
|
||||||
|
|
|
@ -768,7 +768,7 @@ func TestRfc1982(t *testing.T) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestEmpty(t *testing.T) {
|
func TestEmpty(t *testing.T) {
|
||||||
for _ = range ParseZone(strings.NewReader(""), "", "") {
|
for range ParseZone(strings.NewReader(""), "", "") {
|
||||||
t.Errorf("should be empty")
|
t.Errorf("should be empty")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1208,11 +1208,11 @@ func TestNewPrivateKey(t *testing.T) {
|
||||||
t.Skip("skipping test in short mode.")
|
t.Skip("skipping test in short mode.")
|
||||||
}
|
}
|
||||||
algorithms := []algorithm{
|
algorithms := []algorithm{
|
||||||
algorithm{ECDSAP256SHA256, 256},
|
{ECDSAP256SHA256, 256},
|
||||||
algorithm{ECDSAP384SHA384, 384},
|
{ECDSAP384SHA384, 384},
|
||||||
algorithm{RSASHA1, 1024},
|
{RSASHA1, 1024},
|
||||||
algorithm{RSASHA256, 2048},
|
{RSASHA256, 2048},
|
||||||
algorithm{DSA, 1024},
|
{DSA, 1024},
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, algo := range algorithms {
|
for _, algo := range algorithms {
|
||||||
|
|
|
@ -9,24 +9,24 @@ func TestDedup(t *testing.T) {
|
||||||
newRR(t, "mIek.nl. IN A 127.0.0.1"),
|
newRR(t, "mIek.nl. IN A 127.0.0.1"),
|
||||||
newRR(t, "mieK.nl. IN A 127.0.0.1"),
|
newRR(t, "mieK.nl. IN A 127.0.0.1"),
|
||||||
newRR(t, "miek.Nl. IN A 127.0.0.1"),
|
newRR(t, "miek.Nl. IN A 127.0.0.1"),
|
||||||
}: []string{"mIek.nl.\t3600\tIN\tA\t127.0.0.1"},
|
}: {"mIek.nl.\t3600\tIN\tA\t127.0.0.1"},
|
||||||
[...]RR{
|
[...]RR{
|
||||||
newRR(t, "miEk.nl. 2000 IN A 127.0.0.1"),
|
newRR(t, "miEk.nl. 2000 IN A 127.0.0.1"),
|
||||||
newRR(t, "mieK.Nl. 1000 IN A 127.0.0.1"),
|
newRR(t, "mieK.Nl. 1000 IN A 127.0.0.1"),
|
||||||
newRR(t, "Miek.nL. 500 IN A 127.0.0.1"),
|
newRR(t, "Miek.nL. 500 IN A 127.0.0.1"),
|
||||||
}: []string{"miEk.nl.\t500\tIN\tA\t127.0.0.1"},
|
}: {"miEk.nl.\t500\tIN\tA\t127.0.0.1"},
|
||||||
[...]RR{
|
[...]RR{
|
||||||
newRR(t, "miek.nl. IN A 127.0.0.1"),
|
newRR(t, "miek.nl. IN A 127.0.0.1"),
|
||||||
newRR(t, "miek.nl. CH A 127.0.0.1"),
|
newRR(t, "miek.nl. CH A 127.0.0.1"),
|
||||||
newRR(t, "miek.nl. IN A 127.0.0.1"),
|
newRR(t, "miek.nl. IN A 127.0.0.1"),
|
||||||
}: []string{"miek.nl.\t3600\tIN\tA\t127.0.0.1",
|
}: {"miek.nl.\t3600\tIN\tA\t127.0.0.1",
|
||||||
"miek.nl.\t3600\tCH\tA\t127.0.0.1",
|
"miek.nl.\t3600\tCH\tA\t127.0.0.1",
|
||||||
},
|
},
|
||||||
[...]RR{
|
[...]RR{
|
||||||
newRR(t, "miek.nl. CH A 127.0.0.1"),
|
newRR(t, "miek.nl. CH A 127.0.0.1"),
|
||||||
newRR(t, "miek.nl. IN A 127.0.0.1"),
|
newRR(t, "miek.nl. IN A 127.0.0.1"),
|
||||||
newRR(t, "miek.de. IN A 127.0.0.1"),
|
newRR(t, "miek.de. IN A 127.0.0.1"),
|
||||||
}: []string{"miek.nl.\t3600\tCH\tA\t127.0.0.1",
|
}: {"miek.nl.\t3600\tCH\tA\t127.0.0.1",
|
||||||
"miek.nl.\t3600\tIN\tA\t127.0.0.1",
|
"miek.nl.\t3600\tIN\tA\t127.0.0.1",
|
||||||
"miek.de.\t3600\tIN\tA\t127.0.0.1",
|
"miek.de.\t3600\tIN\tA\t127.0.0.1",
|
||||||
},
|
},
|
||||||
|
@ -34,7 +34,7 @@ func TestDedup(t *testing.T) {
|
||||||
newRR(t, "miek.de. IN A 127.0.0.1"),
|
newRR(t, "miek.de. IN A 127.0.0.1"),
|
||||||
newRR(t, "miek.nl. 200 IN A 127.0.0.1"),
|
newRR(t, "miek.nl. 200 IN A 127.0.0.1"),
|
||||||
newRR(t, "miek.nl. 300 IN A 127.0.0.1"),
|
newRR(t, "miek.nl. 300 IN A 127.0.0.1"),
|
||||||
}: []string{"miek.de.\t3600\tIN\tA\t127.0.0.1",
|
}: {"miek.de.\t3600\tIN\tA\t127.0.0.1",
|
||||||
"miek.nl.\t200\tIN\tA\t127.0.0.1",
|
"miek.nl.\t200\tIN\tA\t127.0.0.1",
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
@ -57,7 +57,7 @@ func BenchmarkDedup(b *testing.B) {
|
||||||
}
|
}
|
||||||
m := make(map[string]RR)
|
m := make(map[string]RR)
|
||||||
for i := 0; i < b.N; i++ {
|
for i := 0; i < b.N; i++ {
|
||||||
Dedup(rrs,m )
|
Dedup(rrs, m)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -20,11 +20,11 @@ import (
|
||||||
)
|
)
|
||||||
|
|
||||||
var skipLen = map[string]struct{}{
|
var skipLen = map[string]struct{}{
|
||||||
"NSEC": struct{}{},
|
"NSEC": {},
|
||||||
"NSEC3": struct{}{},
|
"NSEC3": {},
|
||||||
"OPT": struct{}{},
|
"OPT": {},
|
||||||
"WKS": struct{}{},
|
"WKS": {},
|
||||||
"IPSECKEY": struct{}{},
|
"IPSECKEY": {},
|
||||||
}
|
}
|
||||||
|
|
||||||
var packageHdr = `
|
var packageHdr = `
|
||||||
|
|
128
zscan_rr.go
128
zscan_rr.go
|
@ -2203,68 +2203,68 @@ func setCAA(h RR_Header, c chan lex, o, f string) (RR, *ParseError, string) {
|
||||||
}
|
}
|
||||||
|
|
||||||
var typeToparserFunc = map[uint16]parserFunc{
|
var typeToparserFunc = map[uint16]parserFunc{
|
||||||
TypeAAAA: parserFunc{setAAAA, false},
|
TypeAAAA: {setAAAA, false},
|
||||||
TypeAFSDB: parserFunc{setAFSDB, false},
|
TypeAFSDB: {setAFSDB, false},
|
||||||
TypeA: parserFunc{setA, false},
|
TypeA: {setA, false},
|
||||||
TypeCAA: parserFunc{setCAA, true},
|
TypeCAA: {setCAA, true},
|
||||||
TypeCDS: parserFunc{setCDS, true},
|
TypeCDS: {setCDS, true},
|
||||||
TypeCDNSKEY: parserFunc{setCDNSKEY, true},
|
TypeCDNSKEY: {setCDNSKEY, true},
|
||||||
TypeCERT: parserFunc{setCERT, true},
|
TypeCERT: {setCERT, true},
|
||||||
TypeCNAME: parserFunc{setCNAME, false},
|
TypeCNAME: {setCNAME, false},
|
||||||
TypeDHCID: parserFunc{setDHCID, true},
|
TypeDHCID: {setDHCID, true},
|
||||||
TypeDLV: parserFunc{setDLV, true},
|
TypeDLV: {setDLV, true},
|
||||||
TypeDNAME: parserFunc{setDNAME, false},
|
TypeDNAME: {setDNAME, false},
|
||||||
TypeKEY: parserFunc{setKEY, true},
|
TypeKEY: {setKEY, true},
|
||||||
TypeDNSKEY: parserFunc{setDNSKEY, true},
|
TypeDNSKEY: {setDNSKEY, true},
|
||||||
TypeDS: parserFunc{setDS, true},
|
TypeDS: {setDS, true},
|
||||||
TypeEID: parserFunc{setEID, true},
|
TypeEID: {setEID, true},
|
||||||
TypeEUI48: parserFunc{setEUI48, false},
|
TypeEUI48: {setEUI48, false},
|
||||||
TypeEUI64: parserFunc{setEUI64, false},
|
TypeEUI64: {setEUI64, false},
|
||||||
TypeGID: parserFunc{setGID, false},
|
TypeGID: {setGID, false},
|
||||||
TypeGPOS: parserFunc{setGPOS, false},
|
TypeGPOS: {setGPOS, false},
|
||||||
TypeHINFO: parserFunc{setHINFO, true},
|
TypeHINFO: {setHINFO, true},
|
||||||
TypeHIP: parserFunc{setHIP, true},
|
TypeHIP: {setHIP, true},
|
||||||
TypeIPSECKEY: parserFunc{setIPSECKEY, true},
|
TypeIPSECKEY: {setIPSECKEY, true},
|
||||||
TypeKX: parserFunc{setKX, false},
|
TypeKX: {setKX, false},
|
||||||
TypeL32: parserFunc{setL32, false},
|
TypeL32: {setL32, false},
|
||||||
TypeL64: parserFunc{setL64, false},
|
TypeL64: {setL64, false},
|
||||||
TypeLOC: parserFunc{setLOC, true},
|
TypeLOC: {setLOC, true},
|
||||||
TypeLP: parserFunc{setLP, false},
|
TypeLP: {setLP, false},
|
||||||
TypeMB: parserFunc{setMB, false},
|
TypeMB: {setMB, false},
|
||||||
TypeMD: parserFunc{setMD, false},
|
TypeMD: {setMD, false},
|
||||||
TypeMF: parserFunc{setMF, false},
|
TypeMF: {setMF, false},
|
||||||
TypeMG: parserFunc{setMG, false},
|
TypeMG: {setMG, false},
|
||||||
TypeMINFO: parserFunc{setMINFO, false},
|
TypeMINFO: {setMINFO, false},
|
||||||
TypeMR: parserFunc{setMR, false},
|
TypeMR: {setMR, false},
|
||||||
TypeMX: parserFunc{setMX, false},
|
TypeMX: {setMX, false},
|
||||||
TypeNAPTR: parserFunc{setNAPTR, false},
|
TypeNAPTR: {setNAPTR, false},
|
||||||
TypeNID: parserFunc{setNID, false},
|
TypeNID: {setNID, false},
|
||||||
TypeNIMLOC: parserFunc{setNIMLOC, true},
|
TypeNIMLOC: {setNIMLOC, true},
|
||||||
TypeNINFO: parserFunc{setNINFO, true},
|
TypeNINFO: {setNINFO, true},
|
||||||
TypeNSAPPTR: parserFunc{setNSAPPTR, false},
|
TypeNSAPPTR: {setNSAPPTR, false},
|
||||||
TypeNSEC3PARAM: parserFunc{setNSEC3PARAM, false},
|
TypeNSEC3PARAM: {setNSEC3PARAM, false},
|
||||||
TypeNSEC3: parserFunc{setNSEC3, true},
|
TypeNSEC3: {setNSEC3, true},
|
||||||
TypeNSEC: parserFunc{setNSEC, true},
|
TypeNSEC: {setNSEC, true},
|
||||||
TypeNS: parserFunc{setNS, false},
|
TypeNS: {setNS, false},
|
||||||
TypeOPENPGPKEY: parserFunc{setOPENPGPKEY, true},
|
TypeOPENPGPKEY: {setOPENPGPKEY, true},
|
||||||
TypePTR: parserFunc{setPTR, false},
|
TypePTR: {setPTR, false},
|
||||||
TypePX: parserFunc{setPX, false},
|
TypePX: {setPX, false},
|
||||||
TypeSIG: parserFunc{setSIG, true},
|
TypeSIG: {setSIG, true},
|
||||||
TypeRKEY: parserFunc{setRKEY, true},
|
TypeRKEY: {setRKEY, true},
|
||||||
TypeRP: parserFunc{setRP, false},
|
TypeRP: {setRP, false},
|
||||||
TypeRRSIG: parserFunc{setRRSIG, true},
|
TypeRRSIG: {setRRSIG, true},
|
||||||
TypeRT: parserFunc{setRT, false},
|
TypeRT: {setRT, false},
|
||||||
TypeSOA: parserFunc{setSOA, false},
|
TypeSOA: {setSOA, false},
|
||||||
TypeSPF: parserFunc{setSPF, true},
|
TypeSPF: {setSPF, true},
|
||||||
TypeSRV: parserFunc{setSRV, false},
|
TypeSRV: {setSRV, false},
|
||||||
TypeSSHFP: parserFunc{setSSHFP, true},
|
TypeSSHFP: {setSSHFP, true},
|
||||||
TypeTALINK: parserFunc{setTALINK, false},
|
TypeTALINK: {setTALINK, false},
|
||||||
TypeTA: parserFunc{setTA, true},
|
TypeTA: {setTA, true},
|
||||||
TypeTLSA: parserFunc{setTLSA, true},
|
TypeTLSA: {setTLSA, true},
|
||||||
TypeTXT: parserFunc{setTXT, true},
|
TypeTXT: {setTXT, true},
|
||||||
TypeUID: parserFunc{setUID, false},
|
TypeUID: {setUID, false},
|
||||||
TypeUINFO: parserFunc{setUINFO, true},
|
TypeUINFO: {setUINFO, true},
|
||||||
TypeURI: parserFunc{setURI, true},
|
TypeURI: {setURI, true},
|
||||||
TypeWKS: parserFunc{setWKS, true},
|
TypeWKS: {setWKS, true},
|
||||||
TypeX25: parserFunc{setX25, false},
|
TypeX25: {setX25, false},
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue