From d4eb9d127b439ce7af802f4f6c1f08135cfbb082 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Wed, 23 Sep 2015 14:33:23 +0200 Subject: Rename tde.TDE into tde.Conn --- tde/tde.go | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) (limited to 'tde') diff --git a/tde/tde.go b/tde/tde.go index 8fa3a54..93b6010 100644 --- a/tde/tde.go +++ b/tde/tde.go @@ -6,38 +6,36 @@ import ( "net" ) -type TDE struct { - net.Conn -} +const maxLen = 240 // max PDU len incl. header + +type Conn struct{ net.Conn } -func (t TDE) Write(p []byte) (n int, err error) { +func (c Conn) Write(p []byte) (n int, err error) { size := uint16(len(p)) - if err := binary.Write(t.Conn, binary.BigEndian, size); err != nil { + if err := binary.Write(c.Conn, binary.BigEndian, size); err != nil { return 0, err } - return t.Conn.Write(p) + return c.Conn.Write(p) } -func (t TDE) Read(p []byte) (n int, err error) { +func (c Conn) Read(p []byte) (n int, err error) { var size uint16 - if err := binary.Read(t.Conn, binary.BigEndian, &size); err != nil { + if err := binary.Read(c.Conn, binary.BigEndian, &size); err != nil { return 0, err } - return t.Conn.Read(p[:size]) + return c.Conn.Read(p[:size]) } -const maxLen = 240 - func ReadAll(r io.Reader) ([]byte, error) { p := make([]byte, maxLen) n, err := r.Read(p) return p[:n], err } -func Dial(service string) (TDE, error) { +func Dial(service string) (Conn, error) { conn, err := net.Dial("tcp", service) if err != nil { - return TDE{}, err + return Conn{}, err } - return TDE{conn}, nil + return Conn{conn}, nil } -- cgit v1.2.3