aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2015-09-23 14:33:23 +0200
committerDimitri Sokolyuk <demon@dim13.org>2015-09-23 14:33:23 +0200
commitd4eb9d127b439ce7af802f4f6c1f08135cfbb082 (patch)
tree611d52aa6861e3056aa972401c6cc10cfb1df9f2
parent3f062a3b9630d48c86846544445908b2e2e76dd5 (diff)
Rename tde.TDE into tde.Conn
-rw-r--r--misc/main.go6
-rw-r--r--tde/tde.go26
2 files changed, 15 insertions, 17 deletions
diff --git a/misc/main.go b/misc/main.go
index fbc967b..df6fa48 100644
--- a/misc/main.go
+++ b/misc/main.go
@@ -23,7 +23,7 @@ import (
*/
var service = flag.String("service", "192.168.240.20:33333", "PBX CTI Service")
-var conn tde.TDE
+var conn tde.Conn
func init() {
flag.Parse()
@@ -207,7 +207,7 @@ func dump(b []byte) {
fmt.Println(hex.Dump(b))
}
-func Ask(c tde.TDE, out []byte) []byte {
+func Ask(c tde.Conn, out []byte) []byte {
log.Println("Ask")
dump(out)
c.Write(out)
@@ -217,7 +217,7 @@ func Ask(c tde.TDE, out []byte) []byte {
return in
}
-func Status(c tde.TDE) {
+func Status(c tde.Conn) {
log.Println("Status")
in, _ := tde.ReadAll(c)
log.Printf("Packet length: 0x%.2X\n", len(in))
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
}