[asterisk-commits] russell: branch 1.4 r114597 - in /branches/1.4: apps/app_chanspy.c main/http.c

[SVN commits to the Asterisk project]

Author: russell
Date: Wed Apr 23 15:49:18 2008
New Revision: 114597

URL: http://svn.digium.com/view/asterisk?view=rev&rev=114597
Log:
Fix an issue that caused getting the correct next channel to not always work.
Also, remove setting the amount of time to wait for a digit from 5 seconds back
down to 1/10 of a second.  I believe this was so the beep didn't get played over
and over really fast, but a while back I put in another fix for that issue.

(closes issue #12498)
Reported by: jsmith
Patches:
      app_chanspy_channel_walk.trunk.patch uploaded by jsmith (license 15)

Modified:
    branches/1.4/apps/app_chanspy.c
    branches/1.4/main/http.c

Modified: branches/1.4/apps/app_chanspy.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/apps/app_chanspy.c?view=diff&rev=114597&r1=114596&r2=114597
==============================================================================
--- branches/1.4/apps/app_chanspy.c (original)
+++ branches/1.4/apps/app_chanspy.c Wed Apr 23 15:49:18 2008
@@ -598,12 +598,11 @@
 			for (s = peer_name; s < ptr; s++)
 				*s = tolower(*s);
 
-		
 			/* We have to unlock the peer channel here to avoid a deadlock.
-			 * So, when we need it again, we have to lock the datastore and get
-			 * the pointer from there to see if the channel is still valid. */
+			 * So, when we need to dereference it again, we have to lock the 
+			 * datastore and get the pointer from there to see if the channel 
+			 * is still valid. */
 			ast_channel_unlock(peer);
-			peer = NULL;
 
 			if (!ast_test_flag(flags, OPTION_QUIET)) {
 				if (ast_fileexists(peer_name, NULL, NULL) != -1) {
@@ -620,7 +619,6 @@
 					ast_say_digits(chan, atoi(ptr), "", chan->language);
 			}
 			
-			waitms = 5000;
 			res = channel_spy(chan, peer_chanspy_ds, &volfactor, fd, flags);
 			num_spyed_upon++;	
 

Modified: branches/1.4/main/http.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/main/http.c?view=diff&rev=114597&r1=114596&r2=114597
==============================================================================
--- branches/1.4/main/http.c (original)
+++ branches/1.4/main/http.c Wed Apr 23 15:49:18 2008
@@ -437,7 +437,7 @@
 				
 				/* If we got a FireFox cookie string, the name's right  
 				    after "Cookie: "                                    */
-                                vname = cookie + 8;
+				vname = cookie + 8;
 				
 				/* If we got an IE cookie string, we need to skip to    
 				    past the version to get to the name                 */