diff options
author | irungentoo <irungentoo@gmail.com> | 2015-04-24 11:09:42 -0400 |
---|---|---|
committer | irungentoo <irungentoo@gmail.com> | 2015-04-24 11:09:42 -0400 |
commit | 3e256e429f6b2d3b8d3b49c1beac62f3b2f138ee (patch) | |
tree | d9190ef9e206a754e805a29919cf5707b9ec2cac /toxcore/TCP_connection.c | |
parent | e24d57d46745a4f646b3efd5df5281bbf762a0be (diff) |
Fixed a couple possible issues with the friend connection callback.
A TCP callback could be received when only a UDP connection was present.
Increased a UDP timeout to make it less likely to time out and switch to TCP.
Diffstat (limited to 'toxcore/TCP_connection.c')
-rw-r--r-- | toxcore/TCP_connection.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/toxcore/TCP_connection.c b/toxcore/TCP_connection.c index 7b478611..fe39dc52 100644 --- a/toxcore/TCP_connection.c +++ b/toxcore/TCP_connection.c | |||
@@ -1124,6 +1124,19 @@ int add_tcp_relay_connection(TCP_Connections *tcp_c, int connections_number, IP_ | |||
1124 | } | 1124 | } |
1125 | } | 1125 | } |
1126 | 1126 | ||
1127 | /* return number of online tcp relays tied to the connection on success. | ||
1128 | * return 0 on failure. | ||
1129 | */ | ||
1130 | unsigned int tcp_connection_to_online_tcp_relays(TCP_Connections *tcp_c, int connections_number) | ||
1131 | { | ||
1132 | TCP_Connection_to *con_to = get_connection(tcp_c, connections_number); | ||
1133 | |||
1134 | if (!con_to) | ||
1135 | return 0; | ||
1136 | |||
1137 | return online_tcp_connection_from_conn(con_to); | ||
1138 | } | ||
1139 | |||
1127 | /* Copy a maximum of max_num TCP relays we are connected to to tcp_relays. | 1140 | /* Copy a maximum of max_num TCP relays we are connected to to tcp_relays. |
1128 | * NOTE that the family of the copied ip ports will be set to TCP_INET or TCP_INET6. | 1141 | * NOTE that the family of the copied ip ports will be set to TCP_INET or TCP_INET6. |
1129 | * | 1142 | * |