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

Merge pull request #368 from mrd0ll4r/udp-connect-af

Browse source 
udp: set address family for connect metrics
This commit is contained in:
mrd0ll4r 2017-12-07 19:10:30 +01:00 • committed by GitHub
commit 15bd5c41f3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
frontend/udp/frontend.go
View file

@ -6,6 +6,7 @@ import (
"bytes" "bytes"
"context" "context"
"encoding/binary" "encoding/binary"
"fmt"
"math/rand" "math/rand"
"net" "net"
"sync" "sync"
@ -273,6 +274,16 @@ func (t *Frontend) handleRequest(r Request, w ResponseWriter) (actionName string
return return
} }
af = new(bittorrent.AddressFamily)
if r.IP.To4() != nil {
*af = bittorrent.IPv4
} else if len(r.IP) == net.IPv6len { // implies r.IP.To4() == nil
*af = bittorrent.IPv6
} else {
// Should never happen - we got the IP straight from the UDP packet.
panic(fmt.Sprintf("udp: invalid IP: neither v4 nor v6, IP: %#v", r.IP))
}
WriteConnectionID(w, txID, NewConnectionID(r.IP, timecache.Now(), t.PrivateKey)) WriteConnectionID(w, txID, NewConnectionID(r.IP, timecache.Now(), t.PrivateKey))
case announceActionID, announceV6ActionID: case announceActionID, announceV6ActionID:
@ -314,9 +325,8 @@ func (t *Frontend) handleRequest(r Request, w ResponseWriter) (actionName string
} else if len(r.IP) == net.IPv6len { // implies r.IP.To4() == nil } else if len(r.IP) == net.IPv6len { // implies r.IP.To4() == nil
req.AddressFamily = bittorrent.IPv6 req.AddressFamily = bittorrent.IPv6
} else { } else {
log.Error("udp: invalid IP: neither v4 nor v6", log.Fields{"IP": r.IP}) // Should never happen - we got the IP straight from the UDP packet.
WriteError(w, txID, bittorrent.ErrInvalidIP) panic(fmt.Sprintf("udp: invalid IP: neither v4 nor v6, IP: %#v", r.IP))
return
} }
af = new(bittorrent.AddressFamily) af = new(bittorrent.AddressFamily)
*af = req.AddressFamily *af = req.AddressFamily