Merged revisions 67156 via svnmerge from
authorJason Parker <jparker@digium.com>
Mon, 4 Jun 2007 23:29:22 +0000 (23:29 +0000)
committerJason Parker <jparker@digium.com>
Mon, 4 Jun 2007 23:29:22 +0000 (23:29 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r67156 | qwell | 2007-06-04 18:26:28 -0500 (Mon, 04 Jun 2007) | 6 lines

Fix for skinny keepalives.
If there is no traffic from the phone for (keep_alive * 1100) ms (arbitrarily
 adding 10% for network issues, etc),  unregister the device.

Issue 8394, patch by DEA.

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@67157 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channels/chan_skinny.c

index 3ef4a4b..fec60f7 100644 (file)
@@ -4438,15 +4438,21 @@ static int get_input(struct skinnysession *s)
        fds[0].fd = s->fd;
        fds[0].events = POLLIN;
        fds[0].revents = 0;
        fds[0].fd = s->fd;
        fds[0].events = POLLIN;
        fds[0].revents = 0;
-       res = poll(fds, 1, -1);
-
+       res = poll(fds, 1, (keep_alive * 1100)); /* If nothing has happen, client is dead */
+                                                /* we add 10% to the keep_alive to deal */
+                                                /* with network delays, etc */
        if (res < 0) {
        if (res < 0) {
-               if (errno != EINTR)
-               {
+               if (errno != EINTR) {
                        ast_log(LOG_WARNING, "Select returned error: %s\n", strerror(errno));
                        return res;
                }
                        ast_log(LOG_WARNING, "Select returned error: %s\n", strerror(errno));
                        return res;
                }
-       }
+       } else if (res == 0) {
+               if (skinnydebug)
+                       ast_verbose("Skinny Client was lost, unregistering\n");
+               skinny_unregister(NULL, s);
+               return -1;
+       }
+                    
        if (fds[0].revents) {
                ast_mutex_lock(&s->lock);
                memset(s->inbuf,0,sizeof(s->inbuf));
        if (fds[0].revents) {
                ast_mutex_lock(&s->lock);
                memset(s->inbuf,0,sizeof(s->inbuf));