3 files changed, 22 insertions, 14 deletions

diff --git a/toxav/msi.c b/toxav/msi.c
index 88f62ebd..26b37292 100644
--- a/toxav/msi.c
+++ b/toxav/msi.c
@@ -959,6 +959,7 @@ void handle_remote_connection_change(Messenger *messenger, int friend_num, uint8
                 for ( ; i < session->calls[j]->peer_count; i ++ )
                     if ( session->calls[j]->peers[i] == friend_num ) {
                         invoke_callback(j, MSI_OnPeerTimeout);
+                        terminate_call(session, session->calls[j]);
                         LOGGER_DEBUG("Remote: %d timed out!", friend_num);
                         return; /* TODO: On group calls change behaviour */
                     }
diff --git a/toxcore/TCP_client.c b/toxcore/TCP_client.c
index 82720ae8..6ead44a5 100644
--- a/toxcore/TCP_client.c
+++ b/toxcore/TCP_client.c
@@ -198,6 +198,7 @@ void routing_status_handler(TCP_Client_Connection *con, int (*status_callback)(v
 }
 
 static int send_ping_response(TCP_Client_Connection *con);
+static int send_ping_request(TCP_Client_Connection *con);
 
 /* return 1 on success.
  * return 0 if could not send packet.
@@ -211,7 +212,7 @@ int send_data(TCP_Client_Connection *con, uint8_t con_id, const uint8_t *data, u
     if (con->connections[con_id].status != 2)
         return -1;
 
-    if (send_ping_response(con) == 0)
+    if (send_ping_response(con) == 0 || send_ping_request(con) == 0)
         return 0;
 
     uint8_t packet[1 + length];
@@ -286,12 +287,21 @@ static int send_disconnect_notification(TCP_Client_Connection *con, uint8_t id)
  * return 0 if could not send packet.
  * return -1 on failure (connection must be killed).
  */
-static int send_ping_request(TCP_Client_Connection *con, uint64_t ping_id)
+static int send_ping_request(TCP_Client_Connection *con)
 {
+    if (!con->ping_request_id)
+        return 1;
+
     uint8_t packet[1 + sizeof(uint64_t)];
     packet[0] = TCP_PACKET_PING;
-    memcpy(packet + 1, &ping_id, sizeof(uint64_t));
-    return write_packet_TCP_secure_connection(con, packet, sizeof(packet));
+    memcpy(packet + 1, &con->ping_request_id, sizeof(uint64_t));
+    int ret;
+
+    if ((ret = write_packet_TCP_secure_connection(con, packet, sizeof(packet))) == 1) {
+        con->ping_request_id = 0;
+    }
+
+    return ret;
 }
 
 /* return 1 on success.
@@ -539,6 +549,8 @@ static int do_confirmed_TCP(TCP_Client_Connection *conn)
 {
     send_pending_data(conn);
     send_ping_response(conn);
+    send_ping_request(conn);
+
     uint8_t packet[MAX_PACKET_SIZE];
     int len;
 
@@ -548,16 +560,9 @@ static int do_confirmed_TCP(TCP_Client_Connection *conn)
         if (!ping_id)
             ++ping_id;
 
-        int ret = send_ping_request(conn, ping_id);
-
-        if (ret == 1) {
-            conn->last_pinged = unix_time();
-            conn->ping_id = ping_id;
-        } else {
-            if (is_timeout(conn->last_pinged, TCP_PING_FREQUENCY + TCP_PING_TIMEOUT)) {
-                conn->status = TCP_CLIENT_DISCONNECTED;
-            }
-        }
+        conn->ping_request_id = conn->ping_id = ping_id;
+        send_ping_request(conn);
+        conn->last_pinged = unix_time();
     }
 
     if (conn->ping_id && is_timeout(conn->last_pinged, TCP_PING_TIMEOUT)) {
diff --git a/toxcore/TCP_client.h b/toxcore/TCP_client.h
index e6d232ed..f57f79e6 100644
--- a/toxcore/TCP_client.h
+++ b/toxcore/TCP_client.h
@@ -58,6 +58,8 @@ typedef struct  {
     uint64_t ping_id;
 
     uint64_t ping_response_id;
+    uint64_t ping_request_id;
+
     void *net_crypto_pointer;
     uint32_t net_crypto_location;
     struct {