tracker fixes

This commit is contained in:
idk
2022-07-29 23:00:13 -04:00
parent cda34d75ad
commit 079c851e09
3 changed files with 9 additions and 6 deletions

2
go.mod
View File

@ -3,6 +3,6 @@ module github.com/xgfone/bt
go 1.11
require (
github.com/eyedeekay/i2pkeys v0.0.0-20220310055120-b97558c06ac8 // indirect
github.com/eyedeekay/i2pkeys v0.0.0-20220310055120-b97558c06ac8
github.com/eyedeekay/sam3 v0.32.33-0.20220303231856-3c910e4b33dc
)

View File

@ -34,7 +34,7 @@ var ErrInvalidAddr = fmt.Errorf("invalid compact information of ip and port")
// Address represents a client/server listening on a UDP port implementing
// the DHT protocol.
type Address struct {
IP net.Addr // For IPv4, its length must be 4.
IP net.Addr
Port uint16
}

View File

@ -60,11 +60,14 @@ type AnnounceRequest struct {
}
// ToHTTPAnnounceRequest creates a new httptracker.AnnounceRequest from itself.
func (ar AnnounceRequest) ToHTTPAnnounceRequest() httptracker.AnnounceRequest {
var ip string
if len(ar.IP.String()) != 0 {
func (ar *AnnounceRequest) ToHTTPAnnounceRequest() httptracker.AnnounceRequest {
ip := "127.0.0.1"
if ar.IP != nil {
ip = ar.IP.String()
}
if ar.Port == 0 {
ar.Port = 6881
}
return httptracker.AnnounceRequest{
InfoHash: ar.InfoHash,
@ -81,7 +84,7 @@ func (ar AnnounceRequest) ToHTTPAnnounceRequest() httptracker.AnnounceRequest {
}
// ToUDPAnnounceRequest creates a new udptracker.AnnounceRequest from itself.
func (ar AnnounceRequest) ToUDPAnnounceRequest() udptracker.AnnounceRequest {
func (ar *AnnounceRequest) ToUDPAnnounceRequest() udptracker.AnnounceRequest {
return udptracker.AnnounceRequest{
InfoHash: ar.InfoHash,
PeerID: ar.PeerID,