summaryrefslogtreecommitdiffhomepage
path: root/src/receive.go
diff options
context:
space:
mode:
authorMathias Hall-Andersen <mathias@hall-andersen.dk>2017-10-16 21:33:47 +0200
committerMathias Hall-Andersen <mathias@hall-andersen.dk>2017-10-16 21:33:47 +0200
commite86d03dca23e5adcbd1c7bd30157bc7d19a932d7 (patch)
tree5792ecf8bad5a76c96033ceeef32a91df7d344b2 /src/receive.go
parenta72b0f7ae5dda27d839bb317b7c01d11b215e77a (diff)
Initial implementation of source caching
Yet untested.
Diffstat (limited to 'src/receive.go')
-rw-r--r--src/receive.go18
1 files changed, 8 insertions, 10 deletions
diff --git a/src/receive.go b/src/receive.go
index 664f1ba..1f05b2f 100644
--- a/src/receive.go
+++ b/src/receive.go
@@ -331,7 +331,7 @@ func (device *Device) RoutineHandshake() {
return
}
- srcBytes := elem.endpoint.SourceToBytes()
+ srcBytes := elem.endpoint.SrcToBytes()
if device.IsUnderLoad() {
// verify MAC2 field
@@ -340,8 +340,7 @@ func (device *Device) RoutineHandshake() {
// construct cookie reply
- logDebug.Println("Sending cookie reply to:", elem.endpoint.SourceToString())
-
+ logDebug.Println("Sending cookie reply to:", elem.endpoint.SrcToString())
sender := binary.LittleEndian.Uint32(elem.packet[4:8]) // "sender" always follows "type"
reply, err := device.mac.CreateReply(elem.packet, sender, srcBytes)
if err != nil {
@@ -365,9 +364,7 @@ func (device *Device) RoutineHandshake() {
// check ratelimiter
- if !device.ratelimiter.Allow(
- elem.endpoint.DestinationIP(),
- ) {
+ if !device.ratelimiter.Allow(elem.endpoint.DstIP()) {
continue
}
}
@@ -398,7 +395,7 @@ func (device *Device) RoutineHandshake() {
if peer == nil {
logInfo.Println(
"Recieved invalid initiation message from",
- elem.endpoint.DestinationToString(),
+ elem.endpoint.DstToString(),
)
continue
}
@@ -412,7 +409,8 @@ func (device *Device) RoutineHandshake() {
// TODO: Discover destination address also, only update on change
peer.mutex.Lock()
- peer.endpoint = elem.endpoint
+ peer.endpoint.set = true
+ peer.endpoint.value = elem.endpoint
peer.mutex.Unlock()
// create response
@@ -435,7 +433,7 @@ func (device *Device) RoutineHandshake() {
// send response
- _, err = peer.SendBuffer(packet)
+ err = peer.SendBuffer(packet)
if err == nil {
peer.TimerAnyAuthenticatedPacketTraversal()
}
@@ -458,7 +456,7 @@ func (device *Device) RoutineHandshake() {
if peer == nil {
logInfo.Println(
"Recieved invalid response message from",
- elem.endpoint.DestinationToString(),
+ elem.endpoint.DstToString(),
)
continue
}