[Asterisk-cvs] asterisk/channels chan_sip.c,1.594,1.595

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv6077/channels

Modified Files:
	chan_sip.c 
Log Message:
Merge drumkilla's bitfield patch for SIP (bug #3083)


Index: chan_sip.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_sip.c,v
retrieving revision 1.594
retrieving revision 1.595
diff -u -d -r1.594 -r1.595
--- chan_sip.c	19 Dec 2004 18:22:47 -0000	1.594
+++ chan_sip.c	19 Dec 2004 20:50:55 -0000	1.595
@@ -139,6 +139,8 @@
 #define DEFAULT_NOTIFYMIME "application/simple-message-summary"
 static char default_notifymime[AST_MAX_EXTENSION] = DEFAULT_NOTIFYMIME;
 
+static struct ast_flags global_flags = {0};		/* global SIP_ flags */
+
 static int srvlookup = 0;		/* SRV Lookup on or off. Default is off, RFC behavior is on */
 
 static int pedanticsipchecking = 0;	/* Extra checking ?  Default off */
@@ -151,8 +153,6 @@
 
 static int global_rtpholdtimeout = 0;
[...1333 lines suppressed...]
 		}
 		/* Reset lastrtprx timer */
@@ -9428,7 +9416,7 @@
 	ast_mutex_lock(&peerl.lock);
 	for (peer=peerl.peers;peer;) {
 		/* Assume all will be deleted, and we'll find out for sure later */
-		peer->delme = 1;
+		ast_set_flag(peer, SIP_DELME);
 		peer = peer->next;
 	}
 	ast_mutex_unlock(&peerl.lock);
@@ -9443,7 +9431,7 @@
 	peerlast = NULL;
 	for (peer=peerl.peers;peer;) {
 		peernext = peer->next;
-		if (peer->delme) {
+		if (ast_test_flag(peer, SIP_DELME)) {
 			destroy_peer(peer);
 			if (peerlast)
 				peerlast->next = peernext;