From: kapil <kgupta@sangoma.com>
Date: Thu, 16 Aug 2012 20:43:00 +0000 (-0400)
Subject: Merge branch 'nsg-4.3' of ssh://git.sangoma.com/smg_freeswitch into nsg-4.3
X-Git-Tag: v1.2.3^2~71^2^2~50^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=106e17f7a2da77e3637ff765530e3abfa8b0e9fb;p=thirdparty%2Ffreeswitch.git

Merge branch 'nsg-4.3' of ssh://git.sangoma.com/smg_freeswitch into nsg-4.3
---

106e17f7a2da77e3637ff765530e3abfa8b0e9fb
diff --cc libs/freetdm/mod_freetdm/tdm.c
index ed0d00a1c3,f344f5a096..a97465c90f
--- a/libs/freetdm/mod_freetdm/tdm.c
+++ b/libs/freetdm/mod_freetdm/tdm.c
@@@ -667,15 -664,10 +667,15 @@@ static switch_status_t channel_receive_
  		} else if (!strcasecmp(command, kECHOCANCEL)) {
  			const char *szval = switch_event_get_header(event, kECHOCANCEL);
  			int enabled = !!switch_true(szval);
 +		
 +			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FreeTDM sending echo cancel [%s] command \n",enabled ? "enable" : "disable");
  			
  			if (FTDM_SUCCESS != ftdm_channel_command(tech_pvt->ftdm_channel, enabled ? FTDM_COMMAND_ENABLE_ECHOCANCEL : FTDM_COMMAND_DISABLE_ECHOCANCEL, NULL)) {
-                 switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to %s echo cancellation.\n", enabled ? "enable" : "disable");
+                 switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Failed to %s echo cancellation.\n", enabled ? "enable" : "disable");
  			}
 +
 +		} else {
 +			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FreeTDM received unknown command [%s] \n",command);
  		}
      }