diff options
author | Matthew Nicholson <mnicholson@digium.com> | 2011-05-05 18:09:23 +0000 |
---|---|---|
committer | Matthew Nicholson <mnicholson@digium.com> | 2011-05-05 18:09:23 +0000 |
commit | 89da27b780c540d428913494423a080e88e3355c (patch) | |
tree | 1b590daa8ae8b742579ef9b40ef3333c7d3d70cc /channels | |
parent | 00dc1556ab60944d6af9245543a2fcf11f60fa1f (diff) |
Merged revisions 317196 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r317196 | mnicholson | 2011-05-05 13:02:52 -0500 (Thu, 05 May 2011) | 8 lines
Set SO_KEEPALIVE on SIP TCP sockets so that they eventually go away when a peer
abruptly disappears. This mostly occurs after a successful registration.
(closes issue #17544)
Reported by: marcelloceschia
Patches:
(modified) tcptls.patch uploaded by st (license 907)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@317198 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels')
-rw-r--r-- | channels/chan_sip.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index df9ee5119..09aec761f 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -2542,6 +2542,12 @@ static void *_sip_tcp_helper_thread(struct sip_pvt *pvt, struct ast_tcptls_sessi } } + flags = 1; + if (setsockopt(tcptls_session->fd, SOL_SOCKET, SO_KEEPALIVE, &flags, sizeof(flags))) { + ast_log(LOG_ERROR, "error enabling TCP keep-alives on sip socket: %s\n", strerror(errno)); + goto cleanup; + } + me->threadid = pthread_self(); ast_debug(2, "Starting thread for %s server\n", tcptls_session->ssl ? "SSL" : "TCP"); |