diff options
| author | Mark Spencer <markster@digium.com> | 2005-02-11 21:16:34 +0000 |
|---|---|---|
| committer | Mark Spencer <markster@digium.com> | 2005-02-11 21:16:34 +0000 |
| commit | d44286366bc13db379ebea0a3d4bf1d34afe8744 (patch) | |
| tree | ef1bb195aeb6dbe4c24b31928a7d67fcb87eab85 /channels/chan_sip.c | |
| parent | 5611ff040e38d7d33e15042fe446604b5f0c30e3 (diff) | |
Flagify hold (bug #3456)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5010 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_sip.c')
| -rwxr-xr-x | channels/chan_sip.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index a8ab00768..cff4aaa13 100755 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -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) |