5 files changed, 67 insertions, 5 deletions

diff --git a/client.c b/client.c
index 20243e5..517b89e 100644
--- a/client.c
+++ b/client.c
@@ -244,14 +244,33 @@ int handle_server_tcp_fin_frame(protocol_frame *rcvd_frame)
         log_printf(L_WARNING, "Friend #%d tried to close tunnel while server is #%d\n", rcvd_frame->friendnumber, tun->friendnumber);
         return -1;
     }
-    
+
+        client_close_tunnel(tun);
+
+    return 0;
+}
+
+/* Delete tunnel and clear client-side fdset */
+int client_close_tunnel(tunnel *tun) 
+{
     if(tun->sockfd)
     {
         FD_CLR(tun->sockfd, &client_master_fdset);
     }
+
     tunnel_delete(tun);
+}
 
-    return 0;
+/* Close and delete all tunnels (when server went offline) */
+int client_close_all_connections()
+{
+        tunnel *tmp = NULL;
+        tunnel *tun = NULL;
+
+        HASH_ITER(hh, by_id, tun, tmp)
+        {
+                client_close_tunnel(tun);
+        }
 }
 
 /* Main loop for the client */
@@ -262,6 +281,7 @@ int do_client_loop(uint8_t *tox_id_str)
     uint32_t friendnumber = 0;
     TOX_CONNECTION last_friend_connection_status = TOX_CONNECTION_NONE;
     time_t last_friend_connection_status_received = 0;
+        time_t connection_lost_timestamp = 0;
     struct timeval tv;
     fd_set fds;
     static time_t invitation_sent_time = 0;
@@ -308,6 +328,7 @@ int do_client_loop(uint8_t *tox_id_str)
                 {
                     uint8_t* data = (uint8_t *)"Hi, fellow tuntox instance!";
                     uint16_t length = sizeof(data);
+                                        /* https://github.com/TokTok/c-toxcore/blob/acb6b2d8543c8f2ea0c2e60dc046767cf5cc0de8/toxcore/tox.h#L1168 */
                     TOX_ERR_FRIEND_ADD add_error;
 
                     if(use_shared_secret)
@@ -592,7 +613,13 @@ int do_client_loop(uint8_t *tox_id_str)
                             if(friend_connection_status != last_friend_connection_status)
                             {
                                 const char* status = readable_connection_status(friend_connection_status);
-                                log_printf(L_INFO, "Friend connection status changed to: %s\n", status);
+                                log_printf(L_INFO, "Friend connection status changed to: %s (%d)\n", status, friend_connection_status);
+
+                                                                if(friend_connection_status == TOX_CONNECTION_NONE)
+                                                                {
+                                                                        state = CLIENT_STATE_CONNECTION_LOST;
+                                                                        connection_lost_timestamp = time(NULL);
+                                                                }
                             }
 
                             last_friend_connection_status_received = time(NULL);
@@ -601,6 +628,39 @@ int do_client_loop(uint8_t *tox_id_str)
                     }
                 }
                 break;
+                        case CLIENT_STATE_CONNECTION_LOST:
+                                {
+                                        TOX_CONNECTION friend_connection_status;
+                                        friend_connection_status = tox_friend_get_connection_status(tox, friendnumber, &friend_query_error);
+                                        if(friend_query_error != TOX_ERR_FRIEND_QUERY_OK)
+                                        {
+                                                log_printf(L_DEBUG, "tox_friend_get_connection_status: error %u\n", friend_query_error);
+                                        }
+                                        else
+                                        {
+                                                if(friend_connection_status == TOX_CONNECTION_NONE)
+                                                {
+                                                        /* https://github.com/TokTok/c-toxcore/blob/acb6b2d8543c8f2ea0c2e60dc046767cf5cc0de8/toxcore/tox.h#L1267 */
+                                                        TOX_ERR_FRIEND_DELETE tox_delete_error;
+
+                                                        log_printf(L_WARNING, "Lost connection to server, closing all tunnels and re-adding friend\n");
+                                                        client_close_all_connections();
+                                                        tox_friend_delete(tox, friendnumber, &tox_delete_error);
+                                                        if(tox_delete_error)
+                                                        {
+                                                                log_printf(L_ERROR, "Error when deleting server from friend list: %d\n", tox_delete_error);
+                                                        }
+                                                        state = CLIENT_STATE_INITIAL;
+                                                }
+                                                else
+                                                {
+                                                        state = CLIENT_STATE_FORWARDING;
+                                                }
+                                        }
+                                }
+                                break;
+                        case 0xffffffff:
+                                log_printf(L_ERROR, "You forgot a break statement\n");
             case CLIENT_STATE_SHUTDOWN:
                 exit(0);
                 break;
diff --git a/client.h b/client.h
index db71d40..be68f25 100644
--- a/client.h
+++ b/client.h
@@ -13,6 +13,7 @@
 #define CLIENT_STATE_SHUTDOWN 11
 #define CLIENT_STATE_BIND_PORT 12
 #define CLIENT_STATE_SETUP_PIPE 13
+#define CLIENT_STATE_CONNECTION_LOST 14
 
 int handle_pong_frame();
 int handle_acktunnel_frame(protocol_frame *rcvd_frame);
diff --git a/gitversion.c b/gitversion.c
index 52f9d71..8d1bb5f 100644
--- a/gitversion.c
+++ b/gitversion.c
@@ -5,5 +5,5 @@ const char *gitversion = GITVERSION;
 
 void print_version()
 {
-    log_printf(L_INFO, "Tuntox built from git commit %s", gitversion);
+    log_printf(L_INFO, "Tuntox built from git commit %s, toxcore version %d.%d.%d", gitversion, tox_version_major(), tox_version_minor(), tox_version_patch());
 }
diff --git a/gitversion.h b/gitversion.h
index a5dd0be..bc45093 100644
--- a/gitversion.h
+++ b/gitversion.h
@@ -1 +1 @@
-#define GITVERSION "0.0.9"
+#define GITVERSION "121acd73ddba12659713f27abef7524b9a0c6a48"
diff --git a/main.h b/main.h
index 90f393e..17fb9b9 100644
--- a/main.h
+++ b/main.h
@@ -4,6 +4,7 @@
 #include <arpa/inet.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <limits.h>
 #include <netdb.h>
 #include <netinet/in.h>
 #include <pwd.h>