[Asterisk-cvs] asterisk/channels chan_iax2.c, 1.381, 1.382 chan_sip.c, 1.915, 1.916

kpfleming kpfleming
Mon Nov 21 14:31:15 CST 2005


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

Modified Files:
	chan_iax2.c chan_sip.c 
Log Message:
fix a bug found during a recent upgrade


Index: chan_iax2.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_iax2.c,v
retrieving revision 1.381
retrieving revision 1.382
diff -u -d -r1.381 -r1.382
--- chan_iax2.c	21 Nov 2005 13:04:36 -0000	1.381
+++ chan_iax2.c	21 Nov 2005 19:20:26 -0000	1.382
@@ -8104,7 +8104,7 @@
 	if (!temponly) {
 		peer = peerl.peers;
 		while(peer) {
-			if (!strcasecmp(peer->name, name)) {	
+			if (!strcmp(peer->name, name)) {	
 				break;
 			}
 			prev = peer;
@@ -8297,7 +8297,7 @@
 	if (!temponly) {
 		user = userl.users;
 		while(user) {
-			if (!strcasecmp(user->name, name)) {	
+			if (!strcmp(user->name, name)) {	
 				break;
 			}
 			prev = user;

Index: chan_sip.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_sip.c,v
retrieving revision 1.915
retrieving revision 1.916
diff -u -d -r1.915 -r1.916
--- chan_sip.c	21 Nov 2005 00:57:35 -0000	1.915
+++ chan_sip.c	21 Nov 2005 19:20:26 -0000	1.916
@@ -11967,7 +11967,11 @@
 
 	if (!realtime)
 		/* Note we do NOT use find_peer here, to avoid realtime recursion */
-		peer = ASTOBJ_CONTAINER_FIND_UNLINK(&peerl, name);
+		/* We also use a case-sensitive comparison (unlike find_peer) so
+		   that case changes made to the peer name will be properly handled
+		   during reload
+		*/
+		peer = ASTOBJ_CONTAINER_FIND_UNLINK_FULL(&peerl, name, name, 0, 0, strcmp);
 
 	if (peer) {
 		/* Already in the list, remove it and it will be added back (or FREE'd)  */




More information about the svn-commits mailing list