diff options
| author | Joshua Colp <jcolp@digium.com> | 2007-05-12 21:12:18 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2007-05-12 21:12:18 +0000 |
| commit | 38e951cfdaba360106e2b01fd65745213284f954 (patch) | |
| tree | 3f06acbf6d06a0f57c2c223a78eee96d6d4061e4 /channels/chan_sip.c | |
| parent | d4de7397067fcca973026ff7c8288f8cb3f8fe6a (diff) | |
Merged revisions 64086 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r64086 | file | 2007-05-12 17:10:45 -0400 (Sat, 12 May 2007) | 2 lines
Tweak hold flags some more. They can be of three states when active: active, inactive, one direction.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@64087 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_sip.c')
| -rw-r--r-- | channels/chan_sip.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 23bf71e83..b5e6f5890 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -802,8 +802,9 @@ struct sip_auth { #define SIP_PAGE2_T38SUPPORT_RTP (2 << 20) /*!< 21: T38 Fax Passthrough Support (not implemented) */ #define SIP_PAGE2_T38SUPPORT_TCP (4 << 20) /*!< 22: T38 Fax Passthrough Support (not implemented) */ #define SIP_PAGE2_CALL_ONHOLD (3 << 23) /*!< Call states */ +#define SIP_PAGE2_CALL_ONHOLD_ACTIVE (0 << 23) /*!< 23: Active hold */ #define SIP_PAGE2_CALL_ONHOLD_ONEDIR (1 << 23) /*!< 23: One directional hold */ -#define SIP_PAGE2_CALL_ONHOLD_INACTIVE (1 << 24) /*!< 24: Inactive */ +#define SIP_PAGE2_CALL_ONHOLD_INACTIVE (2 << 23) /*!< 23: Inactive hold */ #define SIP_PAGE2_RFC2833_COMPENSATE (1 << 25) /*!< 25: Compensate for buggy RFC2833 implementations */ #define SIP_PAGE2_BUGGY_MWI (1 << 26) /*!< 26: Buggy CISCO MWI fix */ #define SIP_PAGE2_NOTEXT (1 << 27) /*!< 27: Text not supported */ @@ -5725,7 +5726,7 @@ static int process_sdp(struct sip_pvt *p, struct sip_request *req) else if (sendonly == 2) /* Inactive stream */ ast_set_flag(&p->flags[1], SIP_PAGE2_CALL_ONHOLD_INACTIVE); else - ast_set_flag(&p->flags[1], SIP_PAGE2_CALL_ONHOLD); + ast_set_flag(&p->flags[1], SIP_PAGE2_CALL_ONHOLD_ACTIVE); if (global_notifyhold) sip_peer_hold(p, TRUE); } |