diff options
| author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-05-02 17:52:45 +0000 |
|---|---|---|
| committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-05-02 17:52:45 +0000 |
| commit | 4696367480f82cbfce5503707e111a20538288cc (patch) | |
| tree | 16f05eb8f45e52bc52f5321447986804884361a8 | |
| parent | 11f924e7d3ec92d99a99de2cffcc26308e02c951 (diff) | |
Let OSS know how to deal with indication -1
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@2861 f38db490-d61c-443f-a65b-d21fe96a405b
| -rwxr-xr-x | channels/chan_oss.c | 3 | ||||
| -rwxr-xr-x | channels/chan_sip.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/channels/chan_oss.c b/channels/chan_oss.c index 15e9b82c2..89eec2e7c 100755 --- a/channels/chan_oss.c +++ b/channels/chan_oss.c @@ -681,6 +681,9 @@ static int oss_indicate(struct ast_channel *chan, int cond) 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; diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 10858a2f0..a75f2f803 100755 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -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); - if (!__ourip.sin_addr.s_addr) + if (!__ourip.s_addr) return 0; } else memcpy(&__ourip, hp->h_addr, sizeof(__ourip)); |