[svn-commits] moy: branch moy/mfcr2-1.2 r130442 - /team/moy/mfcr2-1.2/channels/chan_zap.c

[SVN commits to the Digium repositories]

Author: moy
Date: Sat Jul 12 20:26:07 2008
New Revision: 130442

URL: http://svn.digium.com/view/asterisk?view=rev&rev=130442
Log:
updated OR2VAR_UNKNOWN to OR2_VAR_UNKNOWN to match latest openr2 version

Modified:
    team/moy/mfcr2-1.2/channels/chan_zap.c

Modified: team/moy/mfcr2-1.2/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/team/moy/mfcr2-1.2/channels/chan_zap.c?view=diff&rev=130442&r1=130441&r2=130442
==============================================================================
--- team/moy/mfcr2-1.2/channels/chan_zap.c (original)
+++ team/moy/mfcr2-1.2/channels/chan_zap.c Sat Jul 12 20:26:07 2008
@@ -372,7 +372,7 @@
 };
 
 static struct zt_mfcr2 r2links[NUM_SPANS];
-static openr2_variant_t mfcr2_cur_variant = OR2VAR_UNKNOWN;
+static openr2_variant_t mfcr2_cur_variant = OR2_VAR_UNKNOWN;
 static int mfcr2_cur_mfback_timeout = -1;
 static int mfcr2_cur_metering_pulse_timeout = -1;
 static int mfcr2_cur_max_ani = 10;
@@ -8044,8 +8044,8 @@
 			if (p->mfcr2) {
 				ast_mutex_lock(&p->lock);
 				if (p->mfcr2call) {
+					ast_mutex_unlock(&p->lock);
 					ast_log(LOG_DEBUG, "Yay!, someone just beat us in the race for channel %d.\n", p->channel);
-					ast_mutex_unlock(&p->lock);
 					goto next;
 				}
 				ast_mutex_unlock(&p->lock);
@@ -11388,7 +11388,7 @@
 				ast_copy_string(mfcr2_cur_logdir, v->value, sizeof(mfcr2_cur_logdir));
 			} else if (!strcasecmp(v->name, "mfcr2_variant")) {
 				mfcr2_cur_variant = openr2_proto_get_variant(v->value);
-				if (OR2VAR_UNKNOWN == mfcr2_cur_variant) {
+				if (OR2_VAR_UNKNOWN == mfcr2_cur_variant) {
 					ast_log(LOG_WARNING, "Unknown MFC/R2 variant '%s' at line %d.\n", v->value, v->lineno);
 				}
 			} else if (!strcasecmp(v->name, "mfcr2_mfback_timeout")) {