LBRYCommunity/tracker
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

udp: style nitpicks

Browse source
This commit is contained in:
Jimmy Zelinskie 2015-02-25 21:47:01 -05:00
parent 14a6278de0
commit 8deef98874
1 changed files with 20 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
udp/protocol.go
View file

@ -13,19 +13,6 @@ import (
"github.com/chihaya/chihaya/tracker/models" "github.com/chihaya/chihaya/tracker/models"
) )
// initialConnectionID is the magic initial connection ID specified by BEP 15.
var initialConnectionID = []byte{0, 0, 0x04, 0x17, 0x27, 0x10, 0x19, 0x80}
// eventIDs maps IDs to event names.
var eventIDs = []string{"", "completed", "started", "stopped"}
var (
errMalformedPacket = models.ProtocolError("malformed packet")
errMalformedIP = models.ProtocolError("malformed IP address")
errMalformedEvent = models.ProtocolError("malformed event ID")
errBadConnectionID = models.ProtocolError("bad connection ID")
)
const ( const (
connectActionID uint32 = iota connectActionID uint32 = iota
announceActionID announceActionID
@ -33,6 +20,24 @@ const (
errorActionID errorActionID
) )
var (
// initialConnectionID is the magic initial connection ID specified by BEP 15.
initialConnectionID = []byte{0, 0, 0x04, 0x17, 0x27, 0x10, 0x19, 0x80}
// eventIDs maps IDs to event names.
eventIDs = []string{
"",
"completed",
"started",
"stopped",
}
errMalformedPacket = models.ProtocolError("malformed packet")
errMalformedIP = models.ProtocolError("malformed IP address")
errMalformedEvent = models.ProtocolError("malformed event ID")
errBadConnectionID = models.ProtocolError("bad connection ID")
)
// handleTorrentError writes err to w if err is a models.ClientError. // handleTorrentError writes err to w if err is a models.ClientError.
func handleTorrentError(err error, w *Writer) { func handleTorrentError(err error, w *Writer) {
if err == nil { if err == nil {
@ -61,7 +66,6 @@ func (s *Server) handlePacket(packet []byte, addr *net.UDPAddr) (response []byte
connectionID: connID, connectionID: connID,
transactionID: transactionID, transactionID: transactionID,
} }
defer func() { response = writer.buf.Bytes() }() defer func() { response = writer.buf.Bytes() }()
if action != 0 && !s.connIDGen.Matches(connID, addr.IP) { if action != 0 && !s.connIDGen.Matches(connID, addr.IP) {
@ -121,9 +125,9 @@ func (s *Server) newAnnounce(packet []byte, ip net.IP) (*models.Announce, error)
return nil, errMalformedEvent return nil, errMalformedEvent
} }
ipbuf := packet[84:88] ipbytes := packet[84:88]
if s.config.AllowIPSpoofing && !bytes.Equal(ipbuf, []byte{0, 0, 0, 0}) { if s.config.AllowIPSpoofing && !bytes.Equal(ipbuf, []byte{0, 0, 0, 0}) {
ip = net.ParseIP(string(ipbuf)) ip = net.ParseIP(string(ipbytes))
} }
if ip == nil { if ip == nil {