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

lib/model: Introducer can remove stuff it introduced (fixes #1015)

Browse Source 
GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/3522
This commit is contained in:
Audrius Butkevicius
2016-11-07 16:40:48 +00:00
committed by Jakob Borg
parent bfb48b5dde
commit a1a91d5ef4
6 changed files with 739 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/config/deviceconfiguration.go
View File

@@ -9,12 +9,14 @@ package config
import "github.com/syncthing/syncthing/lib/protocol"
type DeviceConfiguration struct {
DeviceID protocol.DeviceID `xml:"id,attr" json:"deviceID"`
Name string `xml:"name,attr,omitempty" json:"name"`
Addresses []string `xml:"address,omitempty" json:"addresses"`
Compression protocol.Compression `xml:"compression,attr" json:"compression"`
CertName string `xml:"certName,attr,omitempty" json:"certName"`
Introducer bool `xml:"introducer,attr" json:"introducer"`
DeviceID protocol.DeviceID `xml:"id,attr" json:"deviceID"`
Name string `xml:"name,attr,omitempty" json:"name"`
Addresses []string `xml:"address,omitempty" json:"addresses"`
Compression protocol.Compression `xml:"compression,attr" json:"compression"`
CertName string `xml:"certName,attr,omitempty" json:"certName"`
Introducer bool `xml:"introducer,attr" json:"introducer"`
SkipIntroductionRemovals bool `xml:"skipIntroductionRemovals,attr" json:"skipIntroductionRemovals"`
IntroducedBy protocol.DeviceID `xml:"introducedBy,attr" json:"introducedBy"`
}
func NewDeviceConfiguration(id protocol.DeviceID, name string) DeviceConfiguration {