Compare commits

...

4 Commits

Author SHA1 Message Date
angt
99262777fc Update mud 2016-04-17 10:16:13 +00:00
angt
b0f60caab2 Update mud 2016-04-14 20:12:45 +00:00
angt
efd5e0bb36 Remove down-timeout and use timeout for send-timeout 2016-04-08 14:38:07 +00:00
angt
ade4617d53 Update mud 2016-04-08 13:00:52 +00:00
2 changed files with 6 additions and 16 deletions

2
mud

Submodule mud updated: ecec237a56...3b86683636

View File

@@ -242,9 +242,6 @@ int main (int argc, char **argv)
gt.timeout = 5000;
long down_timeout = 0;
long send_timeout = 0;
long pong_timeout = 0;
long time_tolerance = 0;
struct option opts[] = {
@@ -257,9 +254,6 @@ int main (int argc, char **argv)
{ "multiqueue", NULL, option_option },
{ "statefile", &statefile, option_str },
{ "timeout", &gt.timeout, option_long },
{ "down-timeout", &down_timeout, option_long },
{ "send-timeout", &send_timeout, option_long },
{ "pong-timeout", &pong_timeout, option_long },
{ "time-tolerance", &time_tolerance, option_long },
{ "version", NULL, option_option },
{ NULL },
@@ -314,14 +308,7 @@ int main (int argc, char **argv)
mud_set_key(mud, gt.key, sizeof(gt.key));
if (down_timeout > 0)
mud_set_down_timeout_msec(mud, down_timeout);
if (send_timeout > 0)
mud_set_send_timeout_msec(mud, send_timeout);
if (pong_timeout > 0)
mud_set_pong_timeout_msec(mud, pong_timeout);
mud_set_send_timeout_msec(mud, gt.timeout);
if (time_tolerance > 0)
mud_set_time_tolerance_sec(mud, time_tolerance);
@@ -371,9 +358,12 @@ int main (int argc, char **argv)
}
struct timeval timeout = {
.tv_usec = 1000,
.tv_usec = 100000,
};
if (mud_can_push(mud))
timeout.tv_usec = 1000;
if _0_(select(mud_fd+1, &rfds, NULL, NULL, &timeout)==-1) {
if (errno==EINTR)
continue;