提交 24c3b8d9 authored 作者: Sergey Khripchenko's avatar Sergey Khripchenko 提交者: Andrey Volk

FS-11669 Fix timeout in switch_wait_sock() and switch_wait_socklist()

上级 5c78fc6f
...@@ -3214,7 +3214,7 @@ SWITCH_DECLARE(int) switch_wait_sock(switch_os_socket_t sock, uint32_t ms, switc ...@@ -3214,7 +3214,7 @@ SWITCH_DECLARE(int) switch_wait_sock(switch_os_socket_t sock, uint32_t ms, switc
} }
tv.tv_sec = ms / 1000; tv.tv_sec = ms / 1000;
tv.tv_usec = (ms % 1000) * ms; tv.tv_usec = (ms % 1000) * 1000;
s = select(sock + 1, (flags & SWITCH_POLL_READ) ? rfds : NULL, (flags & SWITCH_POLL_WRITE) ? wfds : NULL, (flags & SWITCH_POLL_ERROR) ? efds : NULL, &tv); s = select(sock + 1, (flags & SWITCH_POLL_READ) ? rfds : NULL, (flags & SWITCH_POLL_WRITE) ? wfds : NULL, (flags & SWITCH_POLL_ERROR) ? efds : NULL, &tv);
...@@ -3320,7 +3320,7 @@ SWITCH_DECLARE(int) switch_wait_socklist(switch_waitlist_t *waitlist, uint32_t l ...@@ -3320,7 +3320,7 @@ SWITCH_DECLARE(int) switch_wait_socklist(switch_waitlist_t *waitlist, uint32_t l
} }
tv.tv_sec = ms / 1000; tv.tv_sec = ms / 1000;
tv.tv_usec = (ms % 1000) * ms; tv.tv_usec = (ms % 1000) * 1000;
s = select(max_fd + 1, (flags & SWITCH_POLL_READ) ? rfds : NULL, (flags & SWITCH_POLL_WRITE) ? wfds : NULL, (flags & SWITCH_POLL_ERROR) ? efds : NULL, &tv); s = select(max_fd + 1, (flags & SWITCH_POLL_READ) ? rfds : NULL, (flags & SWITCH_POLL_WRITE) ? wfds : NULL, (flags & SWITCH_POLL_ERROR) ? efds : NULL, &tv);
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论