mirrors/dns
1
0
Fork 0
mirror of https://github.com/miekg/dns.git synced 2025-08-15 05:56:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update the documentation

Browse Source
This commit is contained in:
Miek Gieben 2012-02-15 12:50:23 +01:00
parent dc64d717eb
commit 596e0618a7
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
zscan.go
View File

@ -91,7 +91,8 @@ type Token struct {
} }
// NewRR reads the RR contained in the string s. Only the first RR is returned. // NewRR reads the RR contained in the string s. Only the first RR is returned.
// The class defaults to IN and TTL defaults to DefaultTtl // The class defaults to IN and TTL defaults to DefaultTtl. The full zone file
// syntax like $TTL, $ORIGIN, etc. is supported.
func NewRR(s string) (RR, error) { func NewRR(s string) (RR, error) {
if s[len(s)-1] != '\n' { // We need a closing newline if s[len(s)-1] != '\n' { // We need a closing newline
return ReadRR(strings.NewReader(s+"\n"), "") return ReadRR(strings.NewReader(s+"\n"), "")
@ -111,7 +112,9 @@ func ReadRR(q io.Reader, filename string) (RR, error) {
// ParseZone reads a RFC 1035 zone from r. It returns Tokens on the // ParseZone reads a RFC 1035 zone from r. It returns Tokens on the
// returned channel, which consist out the parsed RR or an error. // returned channel, which consist out the parsed RR or an error.
// If there is an error the RR is nil. // If there is an error the RR is nil. The string file is only used
// in error reporting. The string origin is used as the initial origin, as
// if the file would start with: $ORIGIN origin
// The channel t is closed by ParseZone when the end of r is reached. // The channel t is closed by ParseZone when the end of r is reached.
func ParseZone(r io.Reader, origin, file string) chan Token { func ParseZone(r io.Reader, origin, file string) chan Token {
t := make(chan Token) t := make(chan Token)
@ -145,8 +148,12 @@ func parseZone(r io.Reader, origin, f string, t chan Token, include int) {
if origin == "" { if origin == "" {
origin = "." origin = "."
} }
if !isFqdn(origin) {
t <- Token{Error: &ParseError{f, "bad initial origin name", lex{}}}
return
}
if _, _, ok := IsDomainName(origin); !ok { if _, _, ok := IsDomainName(origin); !ok {
t <- Token{Error: &ParseError{f, "bad origin name", lex{}}} t <- Token{Error: &ParseError{f, "bad initial origin name", lex{}}}
return return
} }
st := _EXPECT_OWNER_DIR st := _EXPECT_OWNER_DIR