kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Flagify hold (bug #3456)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5010 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2005-02-11 21:16:34 +00:00
parent 5611ff040e
commit d44286366b
3 changed files with 77 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
channels/chan_sip.c
View File

@@ -302,6 +302,8 @@ struct sip_history {
#define SIP_OSPAUTH_NO (0 << 26)
#define SIP_OSPAUTH_YES (1 << 26)
#define SIP_OSPAUTH_EXCLUSIVE (2 << 26)
/* Call states */
#define SIP_CALL_ONHOLD (1 << 28)
/* a new page of flags */
#define SIP_PAGE2_RTCACHEFRIENDS (1 << 0)
@@ -409,7 +411,6 @@ static struct sip_pvt {
struct sip_history *history; /* History of this SIP dialog */
struct ast_variable *vars;
struct sip_pvt *next; /* Next call in chain */
int onhold; /* call on hold */
} *iflist = NULL;
#define FLAG_RESPONSE (1 << 0)
@@ -2834,22 +2835,22 @@ static int process_sdp(struct sip_pvt *p, struct sip_request *req)
/* Turn on/off music on hold if we are holding/unholding */
if (sin.sin_addr.s_addr && !sendonly) {
ast_moh_stop(ast_bridged_channel(p->owner));
if (callevents && p->onhold) {
if (callevents && ast_test_flag(p, SIP_CALL_ONHOLD)) {
manager_event(EVENT_FLAG_CALL, "Unhold",
"Channel: %s\r\n"
"Uniqueid: %s\r\n",
p->owner->name,
p->owner->uniqueid);
p->onhold = 0;
ast_clear_flag(p, SIP_CALL_ONHOLD);
}
} else {
if (callevents && !p->onhold) {
if (callevents && !ast_test_flag(p, SIP_CALL_ONHOLD)) {
manager_event(EVENT_FLAG_CALL, "Hold",
"Channel: %s\r\n"
"Uniqueid: %s\r\n",
p->owner->name,
p->owner->uniqueid);
p->onhold = 1;
ast_set_flag(p, SIP_CALL_ONHOLD);
}
ast_moh_start(ast_bridged_channel(p->owner), NULL);
if (sendonly)