This commit is contained in:
Miek Gieben 2014-07-27 20:38:11 +01:00
parent d178b7da2f
commit fb3a1585ad
2 changed files with 26 additions and 26 deletions

View File

@ -99,10 +99,10 @@ func ListenAndServe(addr string, network string, handler Handler) error {
return server.ListenAndServe() return server.ListenAndServe()
} }
// ActivateAndServe activates a server with a listener from systemd, // ActivateAndServe activates a server with a listener from systemd,
// l and p should not both be non-nil. // l and p should not both be non-nil.
// If both l and p are not nil only p will be used. // If both l and p are not nil only p will be used.
// Invoke handler for incoming queries. // Invoke handler for incoming queries.
func ActivateAndServe(l net.Listener, p net.PacketConn, handler Handler) error { func ActivateAndServe(l net.Listener, p net.PacketConn, handler Handler) error {
server := &Server{Listener: l, PacketConn: p, Handler: handler} server := &Server{Listener: l, PacketConn: p, Handler: handler}
return server.ActivateAndServe() return server.ActivateAndServe()
@ -486,7 +486,7 @@ func (w *response) Write(m []byte) (int, error) {
} }
// LocalAddr implements the ResponseWriter.LocalAddr method. // LocalAddr implements the ResponseWriter.LocalAddr method.
func (w *response) LocalAddr() net.Addr { func (w *response) LocalAddr() net.Addr {
if w.tcp != nil { if w.tcp != nil {
return w.tcp.LocalAddr() return w.tcp.LocalAddr()
} }

View File

@ -1621,27 +1621,27 @@ var rr_mk = map[uint16]func() RR{
TypeNSEC3: func() RR { return new(NSEC3) }, TypeNSEC3: func() RR { return new(NSEC3) },
TypeNSEC3PARAM: func() RR { return new(NSEC3PARAM) }, TypeNSEC3PARAM: func() RR { return new(NSEC3PARAM) },
TypeNSEC: func() RR { return new(NSEC) }, TypeNSEC: func() RR { return new(NSEC) },
// TypeOPENPGPKEY: func() RR { return new(OPENPGPKEY) }, // TypeOPENPGPKEY: func() RR { return new(OPENPGPKEY) },
TypeOPT: func() RR { return new(OPT) }, TypeOPT: func() RR { return new(OPT) },
TypePTR: func() RR { return new(PTR) }, TypePTR: func() RR { return new(PTR) },
TypeRKEY: func() RR { return new(RKEY) }, TypeRKEY: func() RR { return new(RKEY) },
TypeRP: func() RR { return new(RP) }, TypeRP: func() RR { return new(RP) },
TypePX: func() RR { return new(PX) }, TypePX: func() RR { return new(PX) },
TypeRRSIG: func() RR { return new(RRSIG) }, TypeRRSIG: func() RR { return new(RRSIG) },
TypeRT: func() RR { return new(RT) }, TypeRT: func() RR { return new(RT) },
TypeSOA: func() RR { return new(SOA) }, TypeSOA: func() RR { return new(SOA) },
TypeSPF: func() RR { return new(SPF) }, TypeSPF: func() RR { return new(SPF) },
TypeSRV: func() RR { return new(SRV) }, TypeSRV: func() RR { return new(SRV) },
TypeSSHFP: func() RR { return new(SSHFP) }, TypeSSHFP: func() RR { return new(SSHFP) },
TypeTA: func() RR { return new(TA) }, TypeTA: func() RR { return new(TA) },
TypeTALINK: func() RR { return new(TALINK) }, TypeTALINK: func() RR { return new(TALINK) },
TypeTKEY: func() RR { return new(TKEY) }, TypeTKEY: func() RR { return new(TKEY) },
TypeTLSA: func() RR { return new(TLSA) }, TypeTLSA: func() RR { return new(TLSA) },
TypeTSIG: func() RR { return new(TSIG) }, TypeTSIG: func() RR { return new(TSIG) },
TypeTXT: func() RR { return new(TXT) }, TypeTXT: func() RR { return new(TXT) },
TypeUID: func() RR { return new(UID) }, TypeUID: func() RR { return new(UID) },
TypeUINFO: func() RR { return new(UINFO) }, TypeUINFO: func() RR { return new(UINFO) },
TypeURI: func() RR { return new(URI) }, TypeURI: func() RR { return new(URI) },
TypeWKS: func() RR { return new(WKS) }, TypeWKS: func() RR { return new(WKS) },
TypeX25: func() RR { return new(X25) }, TypeX25: func() RR { return new(X25) },
} }