Let OSS know how to deal with indication -1
authorMark Spencer <markster@digium.com>
Sun, 2 May 2004 17:52:45 +0000 (17:52 +0000)
committerMark Spencer <markster@digium.com>
Sun, 2 May 2004 17:52:45 +0000 (17:52 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@2861 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channels/chan_oss.c
channels/chan_sip.c

index 15e9b82..89eec2e 100755 (executable)
@@ -681,6 +681,9 @@ static int oss_indicate(struct ast_channel *chan, int cond)
        case AST_CONTROL_RINGING:
                res = 0;
                break;
        case AST_CONTROL_RINGING:
                res = 0;
                break;
+       case -1:
+               cursound = -1;
+               return 0;
        default:
                ast_log(LOG_WARNING, "Don't know how to display condition %d on %s\n", cond, chan->name);
                return -1;
        default:
                ast_log(LOG_WARNING, "Don't know how to display condition %d on %s\n", cond, chan->name);
                return -1;
index 10858a2..a75f2f8 100755 (executable)
@@ -6899,7 +6899,7 @@ static int reload_config(void)
                hp = ast_gethostbyname(ourhost, &ahp);
                if (!hp) {
                        ast_log(LOG_WARNING, "Unable to get IP address for %s, SIP disabled\n", ourhost);
                hp = ast_gethostbyname(ourhost, &ahp);
                if (!hp) {
                        ast_log(LOG_WARNING, "Unable to get IP address for %s, SIP disabled\n", ourhost);
-                       if (!__ourip.sin_addr.s_addr)
+                       if (!__ourip.s_addr)
                                return 0;
                } else
                        memcpy(&__ourip, hp->h_addr, sizeof(__ourip));
                                return 0;
                } else
                        memcpy(&__ourip, hp->h_addr, sizeof(__ourip));