[asterisk-commits] branch oej/test-this-branch r15186 - in /team/oej/test-this-branch: ./ channe...

[asterisk-commits at lists.digium.com]

Author: oej
Date: Sun Mar 26 22:37:12 2006
New Revision: 15186

URL: http://svn.digium.com/view/asterisk?rev=15186&view=rev
Log:
Resolve conflicts caused by merges of patches to the trunk that svn tried
to re-merge into this branch where they already was merged into a happy
family.... ;-)

Modified:
    team/oej/test-this-branch/   (props changed)
    team/oej/test-this-branch/channels/chan_sip.c
    team/oej/test-this-branch/configs/sip.conf.sample

Propchange: team/oej/test-this-branch/
------------------------------------------------------------------------------
    automerge = http://edvina.net/training/

Propchange: team/oej/test-this-branch/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sun Mar 26 22:37:12 2006
@@ -1,1 +1,1 @@
-/trunk:1-15098
+/trunk:1-15184

Modified: team/oej/test-this-branch/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/oej/test-this-branch/channels/chan_sip.c?rev=15186&r1=15185&r2=15186&view=diff
==============================================================================
--- team/oej/test-this-branch/channels/chan_sip.c (original)
+++ team/oej/test-this-branch/channels/chan_sip.c Sun Mar 26 22:37:12 2006
@@ -688,15 +688,16 @@
 #define SIP_PAGE2_DEBUG_CONSOLE 	(1 << 6)
 #define SIP_PAGE2_DYNAMIC		(1 << 7)	/*!< Dynamic Peers register with Asterisk */
 #define SIP_PAGE2_SELFDESTRUCT		(1 << 8)	/*!< Automatic peers need to destruct themselves */
-#define SIP_PAGE2_SUBSCRIBEMWIONLY	(1 << 9)	/*!< Only support subscription-related MWI notification */
-#define SIP_PAGE2_VIDEOSUPPORT		(1 << 10)	/*!< Support video for this peer */
-#define SIP_PAGE2_PEER_REGISTER		(1 << 11)	/*!< Register this peer with service */
-#define SIP_PAGE2_ALLOWOVERLAP		(1 << 12)	/*!< Allow overlap dialing */
-#define SIP_PAGE2_ALLOWSUBSCRIBE	(1 << 13)	/*!< Allow SUBSCRIBE */
+#define SIP_PAGE2_VIDEOSUPPORT		(1 << 9)	/*!< Support video for this peer */
+#define SIP_PAGE2_ALLOWSUBSCRIBE	(1 << 10)	/*!< Allow subscriptions from this peer? */
+#define SIP_PAGE2_ALLOWOVERLAP		(1 << 11)	/*!< Allow overlap dialing ? */
+#define SIP_PAGE2_PEER_REGISTER		(1 << 12)	/*!< Register this peer with service */
+
 #define SIP_PAGE2_T38SUPPORT		(7 << 14)       /*!< T38 Fax Passthrough Support, need three bits */
 #define SIP_PAGE2_T38SUPPORT_UDPTL	(1 << 14)       /*!< 15: T38 Fax Passthrough Support */
 #define SIP_PAGE2_T38SUPPORT_RTP	(2 << 14)       /*!< 16: T38 Fax Passthrough Support */
 #define SIP_PAGE2_T38SUPPORT_TCP	(4 << 14)       /*!< 17: T38 Fax Passthrough Support */
+#define SIP_PAGE2_SUBSCRIBEMWIONLY	(1 << 22)	/*!< Only support subscription-related MWI notification */
 
 #define SIP_PAGE2_FLAGS_TO_COPY \
 	(SIP_PAGE2_VIDEOSUPPORT | SIP_PAGE2_ALLOWOVERLAP | SIP_PAGE2_ALLOWSUBSCRIBE  \
@@ -763,7 +764,7 @@
 	ast_group_t pickupgroup;		/*!< Pickup group */
 	int lastinvite;				/*!< Last Cseq of invite */
 	unsigned int flags;			/*!< SIP_ flags */	
-	struct ast_flags flags_page2;		/*!< SIP_PAGE2 flags */
+	struct ast_flags flags_page2;		/*!< SIP PAGE2 flags */
 	int timer_t1;				/*!< SIP timer T1, ms rtt */
 	unsigned int sipoptions;		/*!< Supported SIP sipoptions on the other end */
 	int capability;				/*!< Special capability (codec) */
@@ -11757,6 +11758,7 @@
 	}
 
 	if (!ignore && !p->initreq.headers) {	/* Set up dialog, new subscription */
+
 		/* Use this as the basis */
 		if (debug)
 			ast_verbose("Creating new subscription\n");
@@ -13504,6 +13506,10 @@
 	ast_set_flag(&global_flags_page2, SIP_PAGE2_ALLOWOVERLAP);	/* Default for peers, users: TRUE */
 
 	global_rtautoclear = 120;
+	global_allowsubscribe = TRUE;					/* Global flag, default = TRUE */
+	ast_set_flag(&global_flags_page2, SIP_PAGE2_ALLOWSUBSCRIBE);	/* Default for peers, users: TRUE */
+	ast_set_flag(&global_flags_page2, SIP_PAGE2_ALLOWOVERLAP);	/* Default for peers, users: TRUE */
+
 	ast_set_flag(&global_flags_page2, SIP_PAGE2_RTUPDATE);
 
 	/* Initialize some reasonable defaults at SIP reload (used both for channel and as default for peers and users */

Modified: team/oej/test-this-branch/configs/sip.conf.sample
URL: http://svn.digium.com/view/asterisk/team/oej/test-this-branch/configs/sip.conf.sample?rev=15186&r1=15185&r2=15186&view=diff
==============================================================================
--- team/oej/test-this-branch/configs/sip.conf.sample (original)
+++ team/oej/test-this-branch/configs/sip.conf.sample Sun Mar 26 22:37:12 2006
@@ -353,9 +353,9 @@
 ; amaflags		      amaflags
 ; call-limit		      call-limit
 ; restrictcid		      restrictcid
+; allowoverlap		      allowoverlap
+; allowsubscribe	      allowsubscribe
 ; subscribecontext	      subscribecontext
-; allowsubscribe	      allowsubscribe
-; allowoverlap		      allowoverlap
 ; videosupport		      videosupport
 ; maxcallbitrate	      maxcallbitrate
 ;                             mailbox