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

Rename these internal values 

_UDP and _TCP are ugly, just lowercase them.
This commit is contained in:
Miek Gieben 2013-05-13 12:02:29 +02:00
parent 6d46e39bc7
commit 72f4cd81d8
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
server.go
View File

@ -42,8 +42,8 @@ type response struct {
tsigTimersOnly bool tsigTimersOnly bool
tsigRequestMAC string tsigRequestMAC string
tsigSecret map[string]string // the tsig secrets tsigSecret map[string]string // the tsig secrets
_UDP *net.UDPConn // i/o connection if UDP was used udp *net.UDPConn // i/o connection if UDP was used
_TCP *net.TCPConn // i/o connection if TCP was used tcp *net.TCPConn // i/o connection if TCP was used
remoteAddr net.Addr // address of the client remoteAddr net.Addr // address of the client
} }
@ -387,8 +387,8 @@ func serve(a net.Addr, h Handler, m []byte, u *net.UDPConn, t *net.TCPConn, tsig
// Request has been read in serveUDP or serveTCP // Request has been read in serveUDP or serveTCP
w := new(response) w := new(response)
w.tsigSecret = tsigSecret w.tsigSecret = tsigSecret
w._UDP = u w.udp = u
w._TCP = t w.tcp = t
w.remoteAddr = a w.remoteAddr = a
req := new(Msg) req := new(Msg)
if req.Unpack(m) != nil { if req.Unpack(m) != nil {
@ -448,10 +448,10 @@ func (w *response) WriteMsg(m *Msg) (err error) {
// Write implements the ResponseWriter.Write method. // Write implements the ResponseWriter.Write method.
func (w *response) Write(m []byte) (int, error) { func (w *response) Write(m []byte) (int, error) {
switch { switch {
case w._UDP != nil: case w.udp != nil:
n, err := w._UDP.WriteTo(m, w.remoteAddr) n, err := w.udp.WriteTo(m, w.remoteAddr)
return n, err return n, err
case w._TCP != nil: case w.tcp != nil:
lm := len(m) lm := len(m)
if len(m) > MaxMsgSize { if len(m) > MaxMsgSize {
return 0, &Error{Err: "message too large"} return 0, &Error{Err: "message too large"}
@ -459,13 +459,13 @@ func (w *response) Write(m []byte) (int, error) {
l := make([]byte, 2) l := make([]byte, 2)
l[0], l[1] = packUint16(uint16(lm)) l[0], l[1] = packUint16(uint16(lm))
m = append(l, m...) m = append(l, m...)
n, err := w._TCP.Write(m) n, err := w.tcp.Write(m)
if err != nil { if err != nil {
return n, err return n, err
} }
i := n i := n
if i < lm { if i < lm {
j, err := w._TCP.Write(m[i:lm]) j, err := w.tcp.Write(m[i:lm])
if err != nil { if err != nil {
return i, err return i, err
} }
@ -491,14 +491,14 @@ func (w *response) Hijack() { w.hijacked = true }
// Close implements the ResponseWriter.Close method // Close implements the ResponseWriter.Close method
func (w *response) Close() error { func (w *response) Close() error {
if w._UDP != nil { if w.udp != nil {
e := w._UDP.Close() e := w.udp.Close()
w._UDP = nil w.udp = nil
return e return e
} }
if w._TCP != nil { if w.tcp != nil {
e := w._TCP.Close() e := w.tcp.Close()
w._TCP = nil w.tcp = nil
return e return e
} }
// no-op // no-op