Tweak hold flags some more. They can be of three states when active: active, inactive...

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 88ca01a3bb999a5b4091199712599f9474501a6c..0b897e95d8c20a18ee1c55ea2e4d8cc45623b90c 100644 (file)
--- 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);
        }