From: Joshua Colp <jcolp@digium.com>
Date: Sat, 12 May 2007 21:10:45 +0000 (+0000)
Subject: Tweak hold flags some more. They can be of three states when active: active, inactive... 
X-Git-Tag: 1.4.5~191
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=699aa6ad74eb124016b405c5059ca708ddc12f85;p=thirdparty%2Fasterisk.git

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/branches/1.4@64086 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 88ca01a3bb..0b897e95d8 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -776,8 +776,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: ???? */
 #define SIP_PAGE2_BUGGY_MWI		(1 << 26)	/*!< 26: Buggy CISCO MWI fix */
 #define SIP_PAGE2_OUTGOING_CALL         (1 << 27)       /*!< 27: Is this an outgoing call? */
@@ -5277,7 +5278,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, 1);
 	}