From: David Yat Sin <dyatsin@sangoma.com>
Date: Mon, 18 Jul 2011 22:24:54 +0000 (-0400)
Subject: Merge remote branch 'fsorig/master'
X-Git-Tag: v1.2-rc1~108^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c3cbb3df885a29af1a111d59b3d1a74d059bf9fd;p=thirdparty%2Ffreeswitch.git

Merge remote branch 'fsorig/master'

Conflicts:
	libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_trace.c
---

c3cbb3df885a29af1a111d59b3d1a74d059bf9fd
diff --cc libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_trace.c
index 523b2b9d97,e745d1436d..abb6577924
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_trace.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_trace.c
@@@ -114,7 -114,7 +114,7 @@@ void sngisdn_trace_interpreted_q921(sng
  {
  	char *data_str = ftdm_calloc(1,200); /* TODO Find a proper size */
   	sngisdn_decode_q921(data_str, data, data_len);
- 	ftdm_log(FTDM_LOG_INFO, "[SNGISDN Q921] %s FRAME %s:\n%s\n", signal_data->ftdm_span->name, ftdm_trace_dir2str(dir), data_str);
 -	ftdm_log(FTDM_LOG_DEBUG, "[SNGISDN Q921] %s FRAME %s:%s\n", signal_data->ftdm_span->name, ftdm_trace_dir2str(dir), data_str);
++	ftdm_log(FTDM_LOG_DEBUG, "[SNGISDN Q921] %s FRAME %s:\n%s\n", signal_data->ftdm_span->name, ftdm_trace_dir2str(dir), data_str);
  	ftdm_safe_free(data_str);
  }
  
@@@ -221,7 -219,7 +221,7 @@@ void sngisdn_trace_interpreted_q931(sng
  {
  	char *data_str = ftdm_calloc(1,MAX_DECODE_STR_LEN); /* TODO Find a proper size */
  	sngisdn_decode_q931(data_str, data, data_len);
- 	ftdm_log(FTDM_LOG_INFO, "[SNGISDN Q931] %s FRAME %s:\n%s\n", signal_data->ftdm_span->name, ftdm_trace_dir2str(dir), data_str);
 -	ftdm_log(FTDM_LOG_DEBUG, "[SNGISDN Q931] %s FRAME %s:%s\n", signal_data->ftdm_span->name, ftdm_trace_dir2str(dir), data_str);
++	ftdm_log(FTDM_LOG_DEBUG, "[SNGISDN Q931] %s FRAME %s:\n%s\n", signal_data->ftdm_span->name, ftdm_trace_dir2str(dir), data_str);
  	ftdm_safe_free(data_str);
  }