tox_isconnected() now works on TCP only.

irungentoo · Aug 14, 2014 · 5376d40 · 5376d40
1 parent 1298932
commit 5376d40
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 1 deletion.
diff --git a/toxcore/onion_client.c b/toxcore/onion_client.c
@@ -1274,3 +1274,19 @@ void kill_onion_client(Onion_Client *onion_c)
     memset(onion_c, 0, sizeof(Onion_Client));
     free(onion_c);
 }
+
+
+/*  return 0 if we are not connected to the network.
+ *  return 1 if we are.
+ */
+int onion_isconnected(const Onion_Client *onion_c)
+{
+    unsigned int i;
+
+    for (i = 0; i < MAX_ONION_CLIENTS; ++i) {
+        if (!is_timeout(onion_c->clients_announce_list[i].timestamp, ONION_NODE_TIMEOUT))
+            return 1;
+    }
+
+    return 0;
+}
diff --git a/toxcore/onion_client.h b/toxcore/onion_client.h
@@ -236,4 +236,10 @@ Onion_Client *new_onion_client(Net_Crypto *c);
 
 void kill_onion_client(Onion_Client *onion_c);
 
+
+/*  return 0 if we are not connected to the network.
+ *  return 1 if we are.
+ */
+int onion_isconnected(const Onion_Client *onion_c);
+
 #endif
diff --git a/toxcore/tox.c b/toxcore/tox.c
@@ -796,7 +796,7 @@ int tox_bootstrap_from_address(Tox *tox, const char *address,
 int tox_isconnected(const Tox *tox)
 {
     const Messenger *m = tox;
-    return DHT_isconnected(m->dht);
+    return DHT_isconnected(m->dht) || onion_isconnected(m->onion_c);
 }
 
 /* Return the time in milliseconds before tox_do() should be called again