Modify source address check for CKR

src/yggdrasil/ckr.go

@@ -99,7 +99,7 @@ func (c *cryptokey) getPublicKeyForAddress(addr address) (boxPubKey, error) {
 	// Check if the address is a valid Yggdrasil address - if so it
 	// is exempt from all CKR checking
 	if addr.isValid() {
-		return
+		return boxPubKey{}, errors.New("Cannot look up CKR for Yggdrasil addresses")
 	}
 
 	// Check if there's a cache entry for this addr

src/yggdrasil/router.go

@@ -124,14 +124,11 @@ func (r *router) sendPacket(bs []byte) {
 	}
 	var sourceAddr address
 	var sourceSubnet subnet
+	var dest address
+	var snet subnet
 	copy(sourceAddr[:], bs[8:])
 	copy(sourceSubnet[:], bs[8:])
-	if !sourceAddr.isValid() && !sourceSubnet.isValid() {
-		return
-	}
-	var dest address
 	copy(dest[:], bs[24:])
-	var snet subnet
 	copy(snet[:], bs[24:])
 	if !dest.isValid() && !snet.isValid() {
 		if key, err := r.cryptokey.getPublicKeyForAddress(dest); err == nil {
@@ -144,6 +141,10 @@ func (r *router) sendPacket(bs []byte) {
 		} else {
 			return
 		}
+	} else {
+		if !sourceAddr.isValid() && !sourceSubnet.isValid() {
+			return
+		}
 	}
 	doSearch := func(packet []byte) {
 		var nodeID, mask *NodeID