Peer: Associate with a Config
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
parent
fbd923a060
commit
9026317b0e
@ -34,6 +34,18 @@ public class Config extends BaseObservable
|
||||
private String name;
|
||||
private final ObservableList<Peer> peers = new ObservableArrayList<>();
|
||||
|
||||
public Peer addPeer() {
|
||||
final Peer peer = new Peer(this);
|
||||
peers.add(peer);
|
||||
return peer;
|
||||
}
|
||||
|
||||
private Peer addPeer(final Peer peer) {
|
||||
final Peer copy = peer.copy(this);
|
||||
peers.add(copy);
|
||||
return copy;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int compareTo(@NonNull final Config config) {
|
||||
return getName().compareTo(config.getName());
|
||||
@ -53,7 +65,7 @@ public class Config extends BaseObservable
|
||||
name = source.name;
|
||||
peers.clear();
|
||||
for (final Peer peer : source.peers)
|
||||
peers.add(peer.copy());
|
||||
addPeer(peer);
|
||||
}
|
||||
|
||||
public Interface getInterface() {
|
||||
@ -92,8 +104,7 @@ public class Config extends BaseObservable
|
||||
if ("[Interface]".equals(line)) {
|
||||
currentPeer = null;
|
||||
} else if ("[Peer]".equals(line)) {
|
||||
currentPeer = new Peer();
|
||||
peers.add(currentPeer);
|
||||
currentPeer = addPeer();
|
||||
} else if (currentPeer == null) {
|
||||
iface.parseFrom(line);
|
||||
} else {
|
||||
|
@ -12,13 +12,22 @@ import com.android.databinding.library.baseAdapters.BR;
|
||||
|
||||
public class Peer extends BaseObservable implements Copyable<Peer>, Observable {
|
||||
private String allowedIPs;
|
||||
private Config config;
|
||||
private String endpoint;
|
||||
private String persistentKeepalive;
|
||||
private String publicKey;
|
||||
|
||||
public Peer(final Config config) {
|
||||
this.config = config;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Peer copy() {
|
||||
final Peer copy = new Peer();
|
||||
return copy(config);
|
||||
}
|
||||
|
||||
public Peer copy(final Config config) {
|
||||
final Peer copy = new Peer(config);
|
||||
copy.copyFrom(this);
|
||||
return copy;
|
||||
}
|
||||
@ -65,6 +74,11 @@ public class Peer extends BaseObservable implements Copyable<Peer>, Observable {
|
||||
throw new IllegalArgumentException(line);
|
||||
}
|
||||
|
||||
public void removeSelf() {
|
||||
config.getPeers().remove(this);
|
||||
config = null;
|
||||
}
|
||||
|
||||
public void setAllowedIPs(String allowedIPs) {
|
||||
if (allowedIPs != null && allowedIPs.isEmpty())
|
||||
allowedIPs = null;
|
||||
|
Loading…
Reference in New Issue
Block a user