[asterisk-commits] mjordan: branch certified-11.2 r381415 - in /certified/branches/11.2: ./ apps...

[SVN commits to the Asterisk project]

Author: mjordan
Date: Thu Feb 14 09:21:05 2013
New Revision: 381415

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=381415
Log:
app_confbridge: Fix error messages on exiting conference.

A marked user ending a conference with only end_marked users generates
error messages:
ERROR[0000][C-00000000]: confbridge/conf_state.c:47 conf_invalid_event_fn: Invalid event for confbridge user ''

* The MULTI_MARKED state was doing too much when it was kicking out the
end_marked users from the conference.  The kicked out users will clean up
after themselves when they exit the conference.

(closes issue ASTERISK-20991)
Reported by: Jeremy Kister
Tested by: rmudgett
........

Merged revisions 380892 from http://svn.asterisk.org/svn/asterisk/branches/11

Modified:
    certified/branches/11.2/   (props changed)
    certified/branches/11.2/apps/confbridge/conf_state_multi_marked.c

Propchange: certified/branches/11.2/
------------------------------------------------------------------------------
--- branch-11-merged (original)
+++ branch-11-merged Thu Feb 14 09:21:05 2013
@@ -1,1 +1,1 @@
-/branches/11:378038,378287,378321,378409-378411,378582,378687,378690,378984,379513,379790,380465,380894,381306
+/branches/11:378038,378287,378321,378409-378411,378582,378687,378690,378984,379513,379790,380465,380892,380894,381306

Modified: certified/branches/11.2/apps/confbridge/conf_state_multi_marked.c
URL: http://svnview.digium.com/svn/asterisk/certified/branches/11.2/apps/confbridge/conf_state_multi_marked.c?view=diff&rev=381415&r1=381414&r2=381415
==============================================================================
--- certified/branches/11.2/apps/confbridge/conf_state_multi_marked.c (original)
+++ certified/branches/11.2/apps/confbridge/conf_state_multi_marked.c Thu Feb 14 09:21:05 2013
@@ -95,8 +95,6 @@
 		AST_LIST_TRAVERSE_SAFE_BEGIN(&cbu->conference_bridge->active_list, cbu_iter, list) {
 			/* Kick ENDMARKED cbu_iters */
 			if (ast_test_flag(&cbu_iter->u_profile, USER_OPT_ENDMARKED)) {
-				AST_LIST_REMOVE_CURRENT(list);
-				cbu_iter->conference_bridge->activeusers--;
 				cbu_iter->kicked = 1;
 				ast_bridge_remove(cbu_iter->conference_bridge->bridge, cbu_iter->chan);
 			} else if (ast_test_flag(&cbu_iter->u_profile, USER_OPT_WAITMARKED) &&
@@ -143,7 +141,8 @@
 			case 0:
 				conf_change_state(cbu, CONF_STATE_SINGLE_MARKED);
 				break;
-			case 1: break; /* Stay in marked */
+			case 1:
+				break; /* Stay in marked */
 			}
 			break;
 		}
@@ -153,7 +152,8 @@
 		case 0:
 			conf_change_state(cbu, CONF_STATE_MULTI);
 			break;
-		default: break; /* Stay in marked */
+		default:
+			break; /* Stay in marked */
 		}
 	}
 }