[asterisk-commits] qwell: branch qwell/dial_events r389355 - /team/qwell/dial_events/apps/

[SVN commits to the Asterisk project]

Author: qwell
Date: Tue May 21 09:54:08 2013
New Revision: 389355

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=389355
Log:
Address review feedback.

Modified:
    team/qwell/dial_events/apps/app_followme.c
    team/qwell/dial_events/apps/app_queue.c

Modified: team/qwell/dial_events/apps/app_followme.c
URL: http://svnview.digium.com/svn/asterisk/team/qwell/dial_events/apps/app_followme.c?view=diff&rev=389355&r1=389354&r2=389355
==============================================================================
--- team/qwell/dial_events/apps/app_followme.c (original)
+++ team/qwell/dial_events/apps/app_followme.c Tue May 21 09:54:08 2013
@@ -830,16 +830,16 @@
 					case AST_CONTROL_BUSY:
 						ast_verb(3, "%s is busy\n", ast_channel_name(winner));
 						if (tmpuser) {
+							/* Outbound call was busy.  Drop it. */
 							ast_channel_publish_dial(caller, winner, NULL, "BUSY");
-							/* Outbound call was busy.  Drop it. */
 							clear_caller(tmpuser);
 						}
 						break;
 					case AST_CONTROL_CONGESTION:
 						ast_verb(3, "%s is circuit-busy\n", ast_channel_name(winner));
 						if (tmpuser) {
+							/* Outbound call was congested.  Drop it. */
 							ast_channel_publish_dial(caller, winner, NULL, "CONGESTION");
-							/* Outbound call was congested.  Drop it. */
 							clear_caller(tmpuser);
 						}
 						break;
@@ -987,8 +987,8 @@
 					ast_verb(3, "The calling channel hungup. Need to drop everyone.\n");
 					return NULL;
 				}
+				/* Outgoing channel hung up. */
 				ast_channel_publish_dial(caller, winner, NULL, "NOANSWER");
-				/* Outgoing channel hung up. */
 				clear_caller(tmpuser);
 			}
 		} else {
@@ -1160,7 +1160,9 @@
 				}
 				ast_channel_unlock(tmpuser->ochan);
 				destroy_calling_node(tmpuser);
-			}
+				continue;
+			}
+
 			ast_channel_publish_dial(caller, tmpuser->ochan, tmpuser->dialarg, NULL);
 		}
 		AST_LIST_TRAVERSE_SAFE_END;

Modified: team/qwell/dial_events/apps/app_queue.c
URL: http://svnview.digium.com/svn/asterisk/team/qwell/dial_events/apps/app_queue.c?view=diff&rev=389355&r1=389354&r2=389355
==============================================================================
--- team/qwell/dial_events/apps/app_queue.c (original)
+++ team/qwell/dial_events/apps/app_queue.c Tue May 21 09:54:08 2013
@@ -4559,7 +4559,7 @@
 			if ((f->frametype == AST_FRAME_DTMF) && caller_disconnect && (f->subclass.integer == '*')) {
 				ast_verb(3, "User hit %c to disconnect call.\n", f->subclass.integer);
 				*to = 0;
-				publish_dial_end_event(in, outgoing, NULL, "EXITCONTEXT");
+				publish_dial_end_event(in, outgoing, NULL, "CANCEL");
 				ast_frfree(f);
 				if (ast_channel_cdr(in) && ast_channel_state(in) != AST_STATE_UP) {
 					ast_cdr_noanswer(ast_channel_cdr(in));