mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-19 11:42:27 +00:00
try to enable ringback on H.323->SIP calls (bug #1645) and clean up code a lil bit
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@2976 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -598,8 +598,7 @@ static int oh323_indicate(struct ast_channel *c, int condition)
|
|||||||
switch(condition) {
|
switch(condition) {
|
||||||
case AST_CONTROL_RINGING:
|
case AST_CONTROL_RINGING:
|
||||||
if (c->_state == AST_STATE_RING) {
|
if (c->_state == AST_STATE_RING) {
|
||||||
// transmit_response(p, "180 Ringing", &p->initreq);
|
return -1;
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
case AST_CONTROL_BUSY:
|
case AST_CONTROL_BUSY:
|
||||||
@@ -1024,11 +1023,8 @@ int setup_incoming_call(call_details_t cd)
|
|||||||
} else {
|
} else {
|
||||||
/* Either this call is not from the Gatekeeper
|
/* Either this call is not from the Gatekeeper
|
||||||
or we are not allowing gk routed calls */
|
or we are not allowing gk routed calls */
|
||||||
|
|
||||||
|
|
||||||
user = find_user(cd);
|
user = find_user(cd);
|
||||||
|
|
||||||
|
|
||||||
if (!user) {
|
if (!user) {
|
||||||
sprintf(p->callerid, "%s <%s>", p->cd.call_source_aliases, p->cd.call_source_e164);
|
sprintf(p->callerid, "%s <%s>", p->cd.call_source_aliases, p->cd.call_source_e164);
|
||||||
if (!ast_strlen_zero(p->cd.call_dest_e164)) {
|
if (!ast_strlen_zero(p->cd.call_dest_e164)) {
|
||||||
@@ -1086,7 +1082,6 @@ int setup_incoming_call(call_details_t cd)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* I know this is horrid, don't kill me saddam */
|
|
||||||
exit:
|
exit:
|
||||||
/* allocate a channel and tell asterisk about it */
|
/* allocate a channel and tell asterisk about it */
|
||||||
c = oh323_new(p, AST_STATE_RINGING, cd.call_token);
|
c = oh323_new(p, AST_STATE_RINGING, cd.call_token);
|
||||||
|
Reference in New Issue
Block a user