From adcb93ea26ba805bf3babce98190a29b270eb3e6 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Mon, 18 Jul 2016 01:23:18 +0200 Subject: Cleanup --- tracker/messages.go | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/tracker/messages.go b/tracker/messages.go index 7dd4429..1224a6c 100644 --- a/tracker/messages.go +++ b/tracker/messages.go @@ -6,7 +6,6 @@ import ( "encoding/binary" "fmt" "io/ioutil" - "log" "net" "net/http" "time" @@ -66,26 +65,26 @@ func (p Peer) String() string { type Peers []Peer func (p *Peers) UnmarshalBencode(b []byte) (int, error) { - if b[0] == 'l' { - log.Println("verbose") + switch b[0] { + case 'l': var tmp []Peer n, err := bencode.Unmarshal(b, &tmp) *p = Peers(tmp) return n, err - } - log.Println("compact") - var tmp []byte - n, err := bencode.Unmarshal(b, &tmp) - addr, err := peerAddr(tmp) - *p = make(Peers, len(addr)) - for i, v := range addr { - peer := Peer{ - IP: v.IP.String(), - Port: int(v.Port), + default: + var tmp []byte + n, err := bencode.Unmarshal(b, &tmp) + addr, err := peerAddr(tmp) + *p = make(Peers, len(addr)) + for i, v := range addr { + peer := Peer{ + IP: v.IP.String(), + Port: int(v.Port), + } + (*p)[i] = peer } - (*p)[i] = peer + return n, err } - return n, err } func (r Request) Get(announce string) (Response, error) { -- cgit v1.2.3