Merge branch 'master' into dirtydebug

[meshlink] / src / protocol_key.c

diff --git a/src/protocol_key.c b/src/protocol_key.c
index 0eeddb861bf675630de4be970d39052a69f6bc9a..e41ec42223f149782bc98c90ca5f832311632175 100644 (file)
--- a/src/protocol_key.c
+++ b/src/protocol_key.c
@@ -386,7 +386,7 @@ bool ans_key_h(connection_t *c, const char *request) {
                                update_node_udp(from, &sa);
                        }
 
-                       if(from->options & OPTION_PMTU_DISCOVERY)
+                       if(from->options & OPTION_PMTU_DISCOVERY && !(from->options & OPTION_TCPONLY))
                                send_mtu_probe(from);
                }
 
@@ -395,14 +395,22 @@ bool ans_key_h(connection_t *c, const char *request) {
 
        /* Check and lookup cipher and digest algorithms */
 
-       if(!(from->outcipher = cipher_open_by_nid(cipher))) {
-               logger(DEBUG_ALWAYS, LOG_ERR, "Node %s (%s) uses unknown cipher!", from->name, from->hostname);
-               return false;
+       if(cipher) {
+               if(!(from->outcipher = cipher_open_by_nid(cipher))) {
+                       logger(DEBUG_ALWAYS, LOG_ERR, "Node %s (%s) uses unknown cipher!", from->name, from->hostname);
+                       return false;
+               }
+       } else {
+               from->outcipher = NULL;
        }
 
-       if(!(from->outdigest = digest_open_by_nid(digest, maclength))) {
-               logger(DEBUG_ALWAYS, LOG_ERR, "Node %s (%s) uses unknown digest!", from->name, from->hostname);
-               return false;
+       if(digest) {
+               if(!(from->outdigest = digest_open_by_nid(digest, maclength))) {
+                       logger(DEBUG_ALWAYS, LOG_ERR, "Node %s (%s) uses unknown digest!", from->name, from->hostname);
+                       return false;
+               }
+       } else {
+               from->outdigest = NULL;
        }
 
        if(maclength != digest_length(from->outdigest)) {
@@ -435,7 +443,7 @@ bool ans_key_h(connection_t *c, const char *request) {
                update_node_udp(from, &sa);
        }
 
-       if(from->options & OPTION_PMTU_DISCOVERY)
+       if(from->options & OPTION_PMTU_DISCOVERY && !(from->options & OPTION_TCPONLY))
                send_mtu_probe(from);
 
        return true;