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

Merge pull request #58 from gavaletz/master 

Make DNS Client compatible with Google App Engine.
This commit is contained in:
Miek Gieben 2013-10-02 11:27:53 -07:00
parent 1e0d11ad8f de1a10559b
commit 2b51554878
4 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
client.go
View File

@ -166,7 +166,7 @@ func (w *reply) read(p []byte) (n int, err error) {
switch w.client.Net {
case "tcp", "tcp4", "tcp6":
setTimeouts(w)
n, err = w.conn.(*net.TCPConn).Read(p[0:2])
n, err = w.conn.Read(p[0:2])
if err != nil || n != 2 {
return n, err
}
@ -177,13 +177,13 @@ func (w *reply) read(p []byte) (n int, err error) {
if int(l) > len(p) {
return int(l), io.ErrShortBuffer
}
n, err = w.conn.(*net.TCPConn).Read(p[:l])
n, err = w.conn.Read(p[:l])
if err != nil {
return n, err
}
i := n
for i < int(l) {
j, err := w.conn.(*net.TCPConn).Read(p[i:int(l)])
j, err := w.conn.Read(p[i:int(l)])
if err != nil {
return i, err
}
@ -192,7 +192,7 @@ func (w *reply) read(p []byte) (n int, err error) {
n = i
case "", "udp", "udp4", "udp6":
setTimeouts(w)
n, _, err = w.conn.(*net.UDPConn).ReadFromUDP(p)
n, err = w.conn.Read(p)
if err != nil {
return n, err
}
@ -251,7 +251,7 @@ func (w *reply) write(p []byte) (n int, err error) {
n = i
case "", "udp", "udp4", "udp6":
setTimeouts(w)
n, err = w.conn.(*net.UDPConn).Write(p)
n, err = w.conn.Write(p)
if err != nil {
return n, err
}

2
server.go
View File

@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
// +build !appengine
// DNS server implementation.
package dns

2
server_test.go
View File

@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
// +build !appengine
package dns
import (

2
xfr.go
View File

@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
// +build !appengine
package dns
// New Transfer