Some tidying in tracker/udp

diff --git a/tracker/udp/client.go b/tracker/udp/client.go
index 0095a912aaac378995dd359f4bfa57d6d53e5380..42f0d14e6a99e6a4a226a25adef43d91c4469b14 100644 (file)
--- a/tracker/udp/client.go
+++ b/tracker/udp/client.go
@@ -125,7 +125,7 @@ func (cl *Client) requestWriter(ctx context.Context, action Action, body []byte,
                        return
                }
                buf.Reset()
-               err = binary.Write(&buf, binary.BigEndian, RequestHeader{
+               err = Write(&buf, RequestHeader{
                        ConnectionId:  connId,
                        Action:        action,
                        TransactionId: tId,

diff --git a/tracker/udp/protocol.go b/tracker/udp/protocol.go
index 4a8dc6681512f14710023f5992647b001b124ec4..f6beb4c6d55c3e495730fcac1caebfc23c717d4e 100644 (file)
--- a/tracker/udp/protocol.go
+++ b/tracker/udp/protocol.go
@@ -13,9 +13,11 @@ const (
        ActionAnnounce
        ActionScrape
        ActionError
+)
 
-       ConnectRequestConnectionId = 0x41727101980
+const ConnectRequestConnectionId = 0x41727101980
 
+const (
        // BEP 41
        optionTypeEndOfOptions = 0
        optionTypeNOP          = 1
@@ -57,7 +59,7 @@ type InfoHash = [20]byte
 
 func marshal(data interface{}) (b []byte, err error) {
        var buf bytes.Buffer
-       err = binary.Write(&buf, binary.BigEndian, data)
+       err = Write(&buf, data)
        b = buf.Bytes()
        return
 }
@@ -70,6 +72,7 @@ func mustMarshal(data interface{}) []byte {
        return b
 }
 
+// This is for fixed-size, builtin types only I think.
 func Write(w io.Writer, data interface{}) error {
        return binary.Write(w, binary.BigEndian, data)
 }