applications/tg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

maybe fixed conn restart

Browse Source
This commit is contained in:
Vysheng 2014-01-27 21:23:58 +04:00
parent 96b47dad13
commit fd4780b83c
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net.c
View File

@ -66,6 +66,7 @@ int ping_alarm (struct connection *c) {
if (verbosity > 2) { if (verbosity > 2) {
logprintf ("ping alarm\n"); logprintf ("ping alarm\n");
} }
assert (c->state == conn_ready || c->state == conn_connecting);
if (get_double_time () - c->last_receive_time > 20 * PING_TIMEOUT) { if (get_double_time () - c->last_receive_time > 20 * PING_TIMEOUT) {
if (verbosity) { if (verbosity) {
logprintf ( "fail connection: reason: ping timeout\n"); logprintf ( "fail connection: reason: ping timeout\n");
@ -97,10 +98,13 @@ void start_ping_timer (struct connection *c) {
void restart_connection (struct connection *c); void restart_connection (struct connection *c);
int fail_alarm (void *ev) { int fail_alarm (void *ev) {
((struct connection *)ev)->in_fail_timer = 0;
restart_connection (ev); restart_connection (ev);
return 0; return 0;
} }
void start_fail_timer (struct connection *c) { void start_fail_timer (struct connection *c) {
if (c->in_fail_timer) { return; }
c->in_fail_timer = 1;
c->ev.timeout = get_double_time () + 10; c->ev.timeout = get_double_time () + 10;
c->ev.alarm = (void *)fail_alarm; c->ev.alarm = (void *)fail_alarm;
c->ev.self = c; c->ev.self = c;

1
net.h
View File

@ -124,6 +124,7 @@ struct connection {
int packet_num; int packet_num;
int out_packet_num; int out_packet_num;
int last_connect_time; int last_connect_time;
int in_fail_timer;
struct connection_methods *methods; struct connection_methods *methods;
struct session *session; struct session *session;
void *extra; void *extra;