dlss
/
FedP2P
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Expose StringAddr

This commit is contained in:
Matt Joiner 2023-04-03 15:10:54 +10:00
parent e13fd755ee
commit 8d3e86e3c0
No known key found for this signature in database
GPG Key ID: 6B990B8185E7F782
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
client.go
View File

@ -1313,13 +1313,6 @@ func (cl *Client) AddTorrentSpec(spec *TorrentSpec) (t *Torrent, new bool, err e
return return
} }
type stringAddr string
var _ net.Addr = stringAddr("")
func (stringAddr) Network() string { return "" }
func (me stringAddr) String() string { return string(me) }
// The trackers will be merged with the existing ones. If the Info isn't yet known, it will be set. // The trackers will be merged with the existing ones. If the Info isn't yet known, it will be set.
// spec.DisallowDataDownload/Upload will be read and applied // spec.DisallowDataDownload/Upload will be read and applied
// The display name is replaced if the new spec provides one. Note that any `Storage` is ignored. // The display name is replaced if the new spec provides one. Note that any `Storage` is ignored.
@ -1344,7 +1337,7 @@ func (t *Torrent) MergeSpec(spec *TorrentSpec) error {
} }
for _, peerAddr := range spec.PeerAddrs { for _, peerAddr := range spec.PeerAddrs {
t.addPeer(PeerInfo{ t.addPeer(PeerInfo{
Addr: stringAddr(peerAddr), Addr: StringAddr(peerAddr),
Source: PeerSourceDirect, Source: PeerSourceDirect,
Trusted: true, Trusted: true,
}) })

11
string-addr.go Normal file
View File

@ -0,0 +1,11 @@
package torrent
import "net"
// This adds a net.Addr interface to a string address that has no presumed Network.
type StringAddr string
var _ net.Addr = StringAddr("")
func (StringAddr) Network() string { return "" }
func (me StringAddr) String() string { return string(me) }