aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/config.go11
-rw-r--r--src/noise_protocol.go2
2 files changed, 4 insertions, 9 deletions
diff --git a/src/config.go b/src/config.go
index d92e8d7..2d9ac50 100644
--- a/src/config.go
+++ b/src/config.go
@@ -106,17 +106,17 @@ func ipcSetOperation(device *Device, socket *bufio.ReadWriter) *IPCError {
key := parts[0]
value := parts[1]
+ fmt.Println(key, value)
+
switch key {
/* interface configuration */
case "private_key":
+ var sk NoisePrivateKey
if value == "" {
- device.mutex.Lock()
- device.privateKey = NoisePrivateKey{}
- device.mutex.Unlock()
+ device.SetPrivateKey(sk)
} else {
- var sk NoisePrivateKey
err := sk.FromHex(value)
if err != nil {
logError.Println("Failed to set private_key:", err)
@@ -183,9 +183,7 @@ func ipcSetOperation(device *Device, socket *bufio.ReadWriter) *IPCError {
switch key {
case "remove":
- peer.mutex.Lock()
device.RemovePeer(peer.handshake.remoteStatic)
- peer.mutex.Unlock()
logDebug.Println("Removing", peer.String())
peer = nil
@@ -236,7 +234,6 @@ func ipcSetOperation(device *Device, socket *bufio.ReadWriter) *IPCError {
return &IPCError{Code: ipcErrorInvalidValue}
}
ones, _ := network.Mask.Size()
- logError.Println(network, ones, network.IP)
device.routingTable.Insert(network.IP, uint(ones), peer)
default:
diff --git a/src/noise_protocol.go b/src/noise_protocol.go
index 5fe6fb2..ea0fd52 100644
--- a/src/noise_protocol.go
+++ b/src/noise_protocol.go
@@ -253,8 +253,6 @@ func (device *Device) ConsumeMessageInitiation(msg *MessageInitiation) *Peer {
}
hash = mixHash(hash, msg.Timestamp[:])
- // TODO: check for flood attack
-
// check for replay attack
return timestamp.After(handshake.lastTimestamp)