revert my changes that converted the jb on the channel to be dynamically

allocated. These changes caused crashes when using a channel type that did
not support the jitterbuffer. Instead of fixing why it's crashing, I'm going
to implement this in a better way next week. The way I did it caused a
jitterbuffer to be allocated on every channel where the channel type supported
jitterbuffers, even if they were disabled.


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@35746 f38db490-d61c-443f-a65b-d21fe96a405b

8 files changed, 56 insertions, 96 deletions

diff --git a/channels/chan_alsa.c b/channels/chan_alsa.c
index d274b736b..5c921b918 100644
--- a/channels/chan_alsa.c
+++ b/channels/chan_alsa.c
@@ -812,23 +812,19 @@ static struct ast_channel *alsa_new(struct chan_alsa_pvt *p, int state)
 			ast_string_field_set(tmp, language, language);
 		p->owner = tmp;
 		ast_setstate(tmp, state);
-		if (ast_jb_configure(tmp, &global_jbconf)) {
-			ast_hangup(tmp);
-			p->owner = NULL;
-			return NULL;
-		}
+		ast_mutex_lock(&usecnt_lock);
+		usecnt++;
+		ast_mutex_unlock(&usecnt_lock);
+		ast_update_use_count();
 		if (state != AST_STATE_DOWN) {
 			if (ast_pbx_start(tmp)) {
 				ast_log(LOG_WARNING, "Unable to start PBX on %s\n", tmp->name);
 				ast_hangup(tmp);
-				p->owner = NULL;
-				return NULL;
+				tmp = NULL;
 			}
 		}
-		ast_mutex_lock(&usecnt_lock);
-		usecnt++;
-		ast_mutex_unlock(&usecnt_lock);
-		ast_update_use_count();
+		if (tmp)
+			ast_jb_configure(tmp, &global_jbconf);
 	}
 	return tmp;
 }
diff --git a/channels/chan_h323.c b/channels/chan_h323.c
index 42c9b6101..36c0582b8 100644
--- a/channels/chan_h323.c
+++ b/channels/chan_h323.c
@@ -746,6 +746,9 @@ static struct ast_channel *__oh323_new(struct oh323_pvt *pvt, int state, const c
 	/* Don't hold a oh323_pvt lock while we allocate a chanel */
 	ast_mutex_unlock(&pvt->lock);
 	ch = ast_channel_alloc(1);
+	/* Update usage counter */
+	ast_atomic_fetchadd_int(&__mod_desc->usecnt, +1);
+	ast_update_use_count();
 	ast_mutex_lock(&pvt->lock);
 	if (ch) {
 		ch->tech = &oh323_tech;
@@ -800,25 +803,17 @@ static struct ast_channel *__oh323_new(struct oh323_pvt *pvt, int state, const c
 			ch->cid.cid_dnid = strdup(pvt->exten);
 		}
 		ast_setstate(ch, state);
-		/* Configure the new channel jb */
-		if (pvt->rtp) {
-			if (ast_jb_configure(ch, &global_jbconf)) {
-				ast_hangup(ch);
-				pvt->owner = NULL;
-				return NULL;
-			}
-		}
 		if (state != AST_STATE_DOWN) {
 			if (ast_pbx_start(ch)) {
 				ast_log(LOG_WARNING, "Unable to start PBX on %s\n", ch->name);
 				ast_hangup(ch);
-				pvt->owner = NULL;
-				return NULL;
+				ch = NULL;
 			}
 		}
-		/* Update usage counter */
-		ast_atomic_fetchadd_int(&__mod_desc->usecnt, +1);
-		ast_update_use_count();
+
+		/* Configure the new channel jb */
+		if (ch && pvt && pvt->rtp)
+			ast_jb_configure(ch, &global_jbconf);
 	} else  {
 		ast_log(LOG_WARNING, "Unable to allocate channel structure\n");
 	}
diff --git a/channels/chan_jingle.c b/channels/chan_jingle.c
index b9aae9d54..16bd521da 100644
--- a/channels/chan_jingle.c
+++ b/channels/chan_jingle.c
@@ -756,6 +756,9 @@ static struct ast_channel *jingle_new(struct jingle *client, struct jingle_pvt *
 	if (!ast_strlen_zero(client->musicclass))
 		ast_string_field_set(tmp, musicclass, client->musicclass);
 	i->owner = tmp;
+	ast_mutex_lock(&usecnt_lock);
+	usecnt++;
+	ast_mutex_unlock(&usecnt_lock);
 	ast_copy_string(tmp->context, client->context, sizeof(tmp->context));
 	ast_copy_string(tmp->exten, i->exten, sizeof(tmp->exten));
 	if (!ast_strlen_zero(i->cid_num))
@@ -766,26 +769,16 @@ static struct ast_channel *jingle_new(struct jingle *client, struct jingle_pvt *
 		tmp->cid.cid_dnid = ast_strdup(i->exten);
 	tmp->priority = 1;
 	ast_setstate(tmp, state);
-	/* Configure the new channel jb */
-	if (i->rtp) {
-		if (ast_jb_configure(tmp, &global_jbconf)) {
-			ast_hangup(tmp);
-			i->owner = NULL;
-			return NULL;
-		}
-	}
 	if (state != AST_STATE_DOWN && ast_pbx_start(tmp)) {
 		ast_log(LOG_WARNING, "Unable to start PBX on %s\n", tmp->name);
 		tmp->hangupcause = AST_CAUSE_SWITCH_CONGESTION;
 		ast_hangup(tmp);
-		i->owner = NULL;
-		return NULL;
+		tmp = NULL;
 	}
 
-	ast_mutex_lock(&usecnt_lock);
-	usecnt++;
-	ast_mutex_unlock(&usecnt_lock);
-	ast_update_use_count();
+	/* Configure the new channel jb */
+	if (tmp && i && i->rtp)
+		ast_jb_configure(tmp, &global_jbconf);
 
 	return tmp;
 }
diff --git a/channels/chan_mgcp.c b/channels/chan_mgcp.c
index c32de10fa..9d9499fe6 100644
--- a/channels/chan_mgcp.c
+++ b/channels/chan_mgcp.c
@@ -1478,6 +1478,8 @@ static struct ast_channel *mgcp_new(struct mgcp_subchannel *sub, int state)
 		if (i->amaflags)
 			tmp->amaflags = i->amaflags;
 		sub->owner = tmp;
+		ast_atomic_fetchadd_int(&__mod_desc->usecnt, +1);
+		ast_update_use_count();
 		tmp->callgroup = i->callgroup;
 		tmp->pickupgroup = i->pickupgroup;
 		ast_string_field_set(tmp, call_forward, i->call_forward);
@@ -1488,28 +1490,22 @@ static struct ast_channel *mgcp_new(struct mgcp_subchannel *sub, int state)
 		if (!i->adsi)
 			tmp->adsicpe = AST_ADSI_UNAVAILABLE;
 		tmp->priority = 1;
-		/* Configure the new channel jb */
-		if (sub->rtp) {
-			if (ast_jb_configure(tmp, &global_jbconf)) {
-				ast_hangup(tmp);
-				sub->owner = NULL;
-				return NULL;
-			}
-		}
 		if (state != AST_STATE_DOWN) {
 			if (ast_pbx_start(tmp)) {
 				ast_log(LOG_WARNING, "Unable to start PBX on %s\n", tmp->name);
 				ast_hangup(tmp);
-				sub->owner = NULL;
-				return NULL;
+				tmp = NULL;
 			}
 		}
+		/* SC: verbose level check */
 		if (option_verbose > 2) {
 			ast_verbose(VERBOSE_PREFIX_3 "MGCP mgcp_new(%s) created in state: %s\n",
 				tmp->name, ast_state2str(state));
 		}
-		ast_atomic_fetchadd_int(&__mod_desc->usecnt, +1);
-		ast_update_use_count();
+
+		/* Configure the new channel jb */
+		if (tmp && sub && sub->rtp)
+			ast_jb_configure(tmp, &global_jbconf);
 	} else {
 		ast_log(LOG_WARNING, "Unable to allocate channel structure\n");
 	}
diff --git a/channels/chan_oss.c b/channels/chan_oss.c
index 36a418bd0..98ca519de 100644
--- a/channels/chan_oss.c
+++ b/channels/chan_oss.c
@@ -1000,24 +1000,21 @@ static struct ast_channel *oss_new(struct chan_oss_pvt *o,
 
 	o->owner = c;
 	ast_setstate(c, state);
-	if (ast_jb_configure(c, &global_jbconf)) {
-		ast_hangup(c);
-		o->owner = NULL;
-		return NULL;
-	}
+	ast_mutex_lock(&usecnt_lock);
+	usecnt++;
+	ast_mutex_unlock(&usecnt_lock);
+	ast_update_use_count();
 	if (state != AST_STATE_DOWN) {
 		if (ast_pbx_start(c)) {
 			ast_log(LOG_WARNING, "Unable to start PBX on %s\n", c->name);
 			ast_hangup(c);
-			o->owner = NULL;
-			return NULL;
+			o->owner = c = NULL;
+			/* XXX what about the channel itself ? */
+			/* XXX what about usecnt ? */
 		}
 	}
-
-	ast_mutex_lock(&usecnt_lock);
-	usecnt++;
-	ast_mutex_unlock(&usecnt_lock);
-	ast_update_use_count();
+	if (c)
+		ast_jb_configure(c, &global_jbconf);
 
 	return c;
 }
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 2dbf6ddd0..498087cdc 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -3648,6 +3648,9 @@ static struct ast_channel *sip_new(struct sip_pvt *i, int state, const char *tit
 	if (!ast_strlen_zero(i->musicclass))
 		ast_string_field_set(tmp, musicclass, i->musicclass);
 	i->owner = tmp;
+	ast_mutex_lock(&usecnt_lock);
+	usecnt++;
+	ast_mutex_unlock(&usecnt_lock);
 	ast_copy_string(tmp->context, i->context, sizeof(tmp->context));
 	ast_copy_string(tmp->exten, i->exten, sizeof(tmp->exten));
 	if (!ast_strlen_zero(i->cid_num)) 
@@ -3668,20 +3671,11 @@ static struct ast_channel *sip_new(struct sip_pvt *i, int state, const char *tit
 	if (!ast_strlen_zero(i->callid))
 		pbx_builtin_setvar_helper(tmp, "SIPCALLID", i->callid);
 	ast_setstate(tmp, state);
-	/* Configure the new channel jb */
-	if (i->rtp) {
-		if (ast_jb_configure(tmp, &global_jbconf)) {
-			ast_hangup(tmp);
-			i->owner = NULL;
-			return NULL;
-		}
-	}
 	if (state != AST_STATE_DOWN && ast_pbx_start(tmp)) {
 		ast_log(LOG_WARNING, "Unable to start PBX on %s\n", tmp->name);
 		tmp->hangupcause = AST_CAUSE_SWITCH_CONGESTION;
 		ast_hangup(tmp);
-		i->owner = NULL;
-		return NULL;
+		tmp = NULL;
 	}
 	/* Set channel variables for this call from configuration */
 	for (v = i->chanvars ; v ; v = v->next)
@@ -3690,9 +3684,9 @@ static struct ast_channel *sip_new(struct sip_pvt *i, int state, const char *tit
 	if (recordhistory)
 		append_history(i, "NewChan", "Channel %s - from %s", tmp->name, i->callid);
 
-	ast_mutex_lock(&usecnt_lock);
-	usecnt++;
-	ast_mutex_unlock(&usecnt_lock);
+	/* Configure the new channel jb */
+	if (tmp && i && i->rtp)
+		ast_jb_configure(tmp, &global_jbconf);
 
 	return tmp;
 }
diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c
index da7d118f6..899bd13df 100644
--- a/channels/chan_skinny.c
+++ b/channels/chan_skinny.c
@@ -2516,6 +2516,10 @@ static struct ast_channel *skinny_new(struct skinny_line *l, int state)
 		if (l->amaflags)
 			tmp->amaflags = l->amaflags;
 
+		ast_mutex_lock(&usecnt_lock);
+		usecnt++;
+		ast_mutex_unlock(&usecnt_lock);
+		ast_update_use_count();
 		tmp->callgroup = l->callgroup;
 		tmp->pickupgroup = l->pickupgroup;
 		ast_string_field_set(tmp, call_forward, l->call_forward);
@@ -2526,29 +2530,18 @@ static struct ast_channel *skinny_new(struct skinny_line *l, int state)
 		tmp->priority = 1;
 		tmp->adsicpe = AST_ADSI_UNAVAILABLE;
 
-		/* Configure the new channel jb */
-		if (sub->rtp) {
-			if (ast_jb_configure(tmp, &global_jbconf)) {
-				ast_hangup(tmp);
-				sub->owner = NULL;
-				return NULL;
-			}
-		}
 		if (state != AST_STATE_DOWN) {
 			if (ast_pbx_start(tmp)) {
 				ast_log(LOG_WARNING, "Unable to start PBX on %s\n", tmp->name);
 				ast_hangup(tmp);
-				sub->owner = NULL;
-				return NULL;
+				tmp = NULL;
 			}
 		}
-	}
-
-	ast_mutex_lock(&usecnt_lock);
-	usecnt++;
-	ast_mutex_unlock(&usecnt_lock);
-	ast_update_use_count();
 
+		/* Configure the new channel jb */
+		if (tmp && sub->rtp)
+			ast_jb_configure(tmp, &global_jbconf);
+	}
 	return tmp;
 }
 
diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index 255ab663c..2f8e767f8 100644
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -5188,11 +5188,7 @@ static struct ast_channel *zt_new(struct zt_pvt *i, int state, int startpbx, int
 	zt_confmute(i, 0);
 	ast_setstate(tmp, state);
 	/* Configure the new channel jb */
-	if (ast_jb_configure(tmp, &global_jbconf)) {
-		ast_hangup(tmp);
-		i->owner = NULL;
-		return NULL;
-	}
+	ast_jb_configure(tmp, &global_jbconf);
 	if (startpbx) {
 		if (ast_pbx_start(tmp)) {
 			ast_log(LOG_WARNING, "Unable to start PBX on %s\n", tmp->name);