[svn-commits] mmichelson: branch group/v14_colp r147198 - /team/group/v14_colp/channels/

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Tue Oct  7 12:19:08 2008
New Revision: 147198

URL: http://svn.digium.com/view/asterisk?view=rev&rev=147198
Log:
Fix compilation


Modified:
    team/group/v14_colp/channels/chan_sip.c

Modified: team/group/v14_colp/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/group/v14_colp/channels/chan_sip.c?view=diff&rev=147198&r1=147197&r2=147198
==============================================================================
--- team/group/v14_colp/channels/chan_sip.c (original)
+++ team/group/v14_colp/channels/chan_sip.c Tue Oct  7 12:19:08 2008
@@ -809,7 +809,7 @@
 #define SIP_G726_NONSTANDARD	(1 << 31)	/*!< Use non-standard packing for G726-32 data */
 
 #define SIP_FLAGS_TO_COPY \
-	(SIP_PROMISCREDIR | SIP_TRUSTRPID | SIP_PAGE2_SENDRPID | SIP_DTMF | SIP_REINVITE | \
+	(SIP_PROMISCREDIR | SIP_TRUSTRPID | SIP_DTMF | SIP_REINVITE | \
 	 SIP_PROG_INBAND | SIP_USECLIENTCODE | SIP_NAT | SIP_G726_NONSTANDARD | \
 	 SIP_USEREQPHONE | SIP_INSECURE_PORT | SIP_INSECURE_INVITE)
 
@@ -851,7 +851,7 @@
 #define SIP_PAGE2_SENDRPID_PAI    (2 << 30)   /*!< Use "P-Asserted-Identity" header */
 
 #define SIP_PAGE2_FLAGS_TO_COPY \
-	(SIP_PAGE2_ALLOWSUBSCRIBE | SIP_PAGE2_ALLOWOVERLAP | SIP_PAGE2_VIDEOSUPPORT | \
+	(SIP_PAGE2_ALLOWSUBSCRIBE | SIP_PAGE2_ALLOWOVERLAP | SIP_PAGE2_VIDEOSUPPORT | SIP_PAGE2_SENDRPID | \
 	SIP_PAGE2_T38SUPPORT | SIP_PAGE2_RFC2833_COMPENSATE | SIP_PAGE2_BUGGY_MWI | SIP_PAGE2_UDPTL_DESTINATION)
 
 /* SIP packet flags */
@@ -6344,7 +6344,7 @@
 	fromdomain = S_OR(p->fromdomain, ast_inet_ntoa(p->ourip));
 
 	snprintf(tmp, sizeof(tmp), "\"%s\" <sip:%s@%s>", lid_name, lid_num, fromdomain);
-	if (ast_test_flag(&p->flags[1], SIP_SENDRPID_RPID)) {
+	if (ast_test_flag(&p->flags[1], SIP_PAGE2_SENDRPID_RPID)) {
 		snprintf(tmp + strlen(tmp), sizeof(tmp) - strlen(tmp), ";party=%s", ast_test_flag(&p->flags[0], SIP_OUTGOING) ? "calling" : "called");
 	}