perso/syncthing-arm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Encapsulate local discovery address in struct

Browse Source 
The XDR encoder doesn't understart slices of strings very well. It can
encode and decode them, but there's no way to set limits on the length
of the strings themselves (only on the length of the slice), and the
generated diagrams are incorrect. This trivially works around this,
while also documenting what the string actually is (a URL).
This commit is contained in:
Jakob Borg
2015-09-22 23:27:58 +02:00
parent 6124bbb12a
commit e522811a52
3 changed files with 212 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/discover/local.go
View File

@@ -117,7 +117,12 @@ func (c *localClient) Error() error {
}
func (c *localClient) announcementPkt() Announce {
addrs := c.addrList.AllAddresses()
var addrs []Address
for _, addr := range c.addrList.AllAddresses() {
addrs = append(addrs, Address{
URL: addr,
})
}
var relays []Relay
for _, relay := range c.relayStat.Relays() {
@@ -198,7 +203,7 @@ func (c *localClient) registerDevice(src net.Addr, device Device) bool {
var validAddresses []string
for _, addr := range device.Addresses {
u, err := url.Parse(addr)
u, err := url.Parse(addr.URL)
if err != nil {
continue
}
@@ -216,7 +221,7 @@ func (c *localClient) registerDevice(src net.Addr, device Device) bool {
u.Host = fmt.Sprintf("%s:%d", host, tcpAddr.Port)
validAddresses = append(validAddresses, u.String())
} else {
validAddresses = append(validAddresses, addr)
validAddresses = append(validAddresses, addr.URL)
}
}