mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-30 10:33:13 +00:00
Let OSS know how to deal with indication -1
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@2861 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -681,6 +681,9 @@ static int oss_indicate(struct ast_channel *chan, int cond)
|
|||||||
case AST_CONTROL_RINGING:
|
case AST_CONTROL_RINGING:
|
||||||
res = 0;
|
res = 0;
|
||||||
break;
|
break;
|
||||||
|
case -1:
|
||||||
|
cursound = -1;
|
||||||
|
return 0;
|
||||||
default:
|
default:
|
||||||
ast_log(LOG_WARNING, "Don't know how to display condition %d on %s\n", cond, chan->name);
|
ast_log(LOG_WARNING, "Don't know how to display condition %d on %s\n", cond, chan->name);
|
||||||
return -1;
|
return -1;
|
||||||
|
@@ -6899,7 +6899,7 @@ static int reload_config(void)
|
|||||||
hp = ast_gethostbyname(ourhost, &ahp);
|
hp = ast_gethostbyname(ourhost, &ahp);
|
||||||
if (!hp) {
|
if (!hp) {
|
||||||
ast_log(LOG_WARNING, "Unable to get IP address for %s, SIP disabled\n", ourhost);
|
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;
|
return 0;
|
||||||
} else
|
} else
|
||||||
memcpy(&__ourip, hp->h_addr, sizeof(__ourip));
|
memcpy(&__ourip, hp->h_addr, sizeof(__ourip));
|
||||||
|
Reference in New Issue
Block a user