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

udp: add support for opentracker-style IPv6 announces

Browse source
This commit is contained in:
Leo Balduf 2016-09-02 16:42:01 -04:00
parent 10dff98f8e
commit d66ed27dd9
3 changed files with 34 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
frontend/udp/frontend.go
View file

@ -192,11 +192,11 @@ func (t *Frontend) handleRequest(r Request, w ResponseWriter) (actionName string
WriteConnectionID(w, txID, NewConnectionID(r.IP, time.Now(), t.PrivateKey)) WriteConnectionID(w, txID, NewConnectionID(r.IP, time.Now(), t.PrivateKey))
return return
case announceActionID: case announceActionID, announceV6ActionID:
actionName = "announce" actionName = "announce"
var req *bittorrent.AnnounceRequest var req *bittorrent.AnnounceRequest
req, err = ParseAnnounce(r, t.AllowIPSpoofing) req, err = ParseAnnounce(r, t.AllowIPSpoofing, actionID == announceV6ActionID)
if err != nil { if err != nil {
WriteError(w, txID, err) WriteError(w, txID, err)
return return
@ -209,7 +209,7 @@ func (t *Frontend) handleRequest(r Request, w ResponseWriter) (actionName string
return return
} }
WriteAnnounce(w, txID, resp) WriteAnnounce(w, txID, resp, actionID == announceV6ActionID)
go t.logic.AfterAnnounce(context.TODO(), req, resp) go t.logic.AfterAnnounce(context.TODO(), req, resp)

22
frontend/udp/parser.go
View file

@ -15,6 +15,7 @@ const (
announceActionID announceActionID
scrapeActionID scrapeActionID
errorActionID errorActionID
announceV6ActionID
) )
// Option-Types as described in BEP 41 and BEP 45. // Option-Types as described in BEP 41 and BEP 45.
@ -51,8 +52,17 @@ var (
// ParseAnnounce parses an AnnounceRequest from a UDP request. // ParseAnnounce parses an AnnounceRequest from a UDP request.
// //
// If allowIPSpoofing is true, IPs provided via params will be used. // If allowIPSpoofing is true, IPs provided via params will be used.
func ParseAnnounce(r Request, allowIPSpoofing bool) (*bittorrent.AnnounceRequest, error) { //
if len(r.Packet) < 98 { // If v6 is true the announce will be parsed as an IPv6 announce "the
// opentracker way", see
// http://opentracker.blog.h3q.com/2007/12/28/the-ipv6-situation/
func ParseAnnounce(r Request, allowIPSpoofing, v6 bool) (*bittorrent.AnnounceRequest, error) {
ipEnd := 84 + net.IPv4len
if v6 {
ipEnd = 84 + net.IPv6len
}
if len(r.Packet) < ipEnd+10 {
return nil, errMalformedPacket return nil, errMalformedPacket
} }
@ -68,7 +78,7 @@ func ParseAnnounce(r Request, allowIPSpoofing bool) (*bittorrent.AnnounceRequest
} }
ip := r.IP ip := r.IP
ipbytes := r.Packet[84:88] ipbytes := r.Packet[84:ipEnd]
if allowIPSpoofing { if allowIPSpoofing {
ip = net.IP(ipbytes) ip = net.IP(ipbytes)
} }
@ -77,10 +87,10 @@ func ParseAnnounce(r Request, allowIPSpoofing bool) (*bittorrent.AnnounceRequest
return nil, errMalformedIP return nil, errMalformedIP
} }
numWant := binary.BigEndian.Uint32(r.Packet[92:96]) numWant := binary.BigEndian.Uint32(r.Packet[ipEnd+4 : ipEnd+8])
port := binary.BigEndian.Uint16(r.Packet[96:98]) port := binary.BigEndian.Uint16(r.Packet[ipEnd+8 : ipEnd+10])
params, err := handleOptionalParameters(r.Packet[98:]) params, err := handleOptionalParameters(r.Packet[ipEnd+10:])
if err != nil { if err != nil {
return nil, err return nil, err
} }

16
frontend/udp/writer.go
View file

@ -25,15 +25,27 @@ func WriteError(w io.Writer, txID []byte, err error) {
} }
// WriteAnnounce encodes an announce response according to BEP 15. // WriteAnnounce encodes an announce response according to BEP 15.
func WriteAnnounce(w io.Writer, txID []byte, resp *bittorrent.AnnounceResponse) { // The peers returned will be resp.IPv6Peers or resp.IPv4Peers, depending on
// whether v6 is set. The action ID will be 4, according to
// http://opentracker.blog.h3q.com/2007/12/28/the-ipv6-situation/.
func WriteAnnounce(w io.Writer, txID []byte, resp *bittorrent.AnnounceResponse, v6 bool) {
var buf bytes.Buffer var buf bytes.Buffer
if v6 {
writeHeader(&buf, txID, announceV6ActionID)
} else {
writeHeader(&buf, txID, announceActionID) writeHeader(&buf, txID, announceActionID)
}
binary.Write(&buf, binary.BigEndian, uint32(resp.Interval/time.Second)) binary.Write(&buf, binary.BigEndian, uint32(resp.Interval/time.Second))
binary.Write(&buf, binary.BigEndian, uint32(resp.Incomplete)) binary.Write(&buf, binary.BigEndian, uint32(resp.Incomplete))
binary.Write(&buf, binary.BigEndian, uint32(resp.Complete)) binary.Write(&buf, binary.BigEndian, uint32(resp.Complete))
for _, peer := range resp.IPv4Peers { peers := resp.IPv4Peers
if v6 {
peers = resp.IPv6Peers
}
for _, peer := range peers {
buf.Write(peer.IP) buf.Write(peer.IP)
binary.Write(&buf, binary.BigEndian, peer.Port) binary.Write(&buf, binary.BigEndian, peer.Port)
} }