3 files changed, 9 insertions, 0 deletions

diff --git a/toxcore/Lossless_UDP.c b/toxcore/Lossless_UDP.c
index 01f9ccc2..c0db8a10 100644
--- a/toxcore/Lossless_UDP.c
+++ b/toxcore/Lossless_UDP.c
@@ -1083,6 +1083,9 @@ static void do_new(Lossless_UDP *ludp)
 
         if (tmp->status != LUDP_NO_CONNECTION && tmp->killat < temp_time)
             tmp->status = LUDP_TIMED_OUT;
+
+        if (tmp->inbound == LUDP_CONNECTION_INBOUND && tmp->status == LUDP_TIMED_OUT)
+            kill_connection(ludp, tmp_i);
     }
 }
 
diff --git a/toxcore/Messenger.c b/toxcore/Messenger.c
index 50f4851b..2772d6d0 100644
--- a/toxcore/Messenger.c
+++ b/toxcore/Messenger.c
@@ -2140,6 +2140,8 @@ void do_inbound(Messenger *m)
                 accept_crypto_inbound(m->net_crypto, inconnection, public_key, secret_nonce, session_key);
 
             set_friend_status(m, friend_id, FRIEND_CONFIRMED);
+        } else {
+            kill_connection(m->net_crypto->lossless_udp, inconnection);
         }
     }
 }
diff --git a/toxcore/net_crypto.c b/toxcore/net_crypto.c
index 16a6784f..d2dbc90f 100644
--- a/toxcore/net_crypto.c
+++ b/toxcore/net_crypto.c
@@ -573,7 +573,11 @@ int crypto_inbound(Net_Crypto *c, uint8_t *public_key, uint8_t *secret_nonce, ui
 
                 if (handle_cryptohandshake(c, public_key, secret_nonce, session_key, temp_data, len)) {
                     return incoming_con;
+                } else {
+                    kill_connection(c->lossless_udp, incoming_con);
                 }
+            } else {
+                kill_connection(c->lossless_udp, incoming_con);
             }
         } else {
             break;