From: Moises Silva <moy@sangoma.com>
Date: Sat, 17 Dec 2011 22:21:14 +0000 (-0500)
Subject: Merge remote branch 'fsorig/master'
X-Git-Tag: v1.2-rc1~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7e31b9cc28fe5bc254b32b591a8d57f57363b551;p=thirdparty%2Ffreeswitch.git

Merge remote branch 'fsorig/master'

Conflicts:
	libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_rcv.c
	libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_support.c
---

7e31b9cc28fe5bc254b32b591a8d57f57363b551
diff --cc libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_rcv.c
index 8ae33cee0a,72b6def4ae..fe11e194b2
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_rcv.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_rcv.c
@@@ -990,19 -997,21 +997,21 @@@ void sngisdn_rcv_sng_log(uint8_t level
  
      switch (level) {
  		case SNG_LOGLEVEL_DEBUG:
 -			ftdm_log(FTDM_LOG_DEBUG, "sng_isdn->%s", data);
 +			ftdm_log(FTDM_LOG_DEBUG, "sng_isdn->%s\n", data);
  			break;
  		case SNG_LOGLEVEL_WARN:
- 			ftdm_log(FTDM_LOG_INFO, "sng_isdn->%s\n", data);
+ 			if ( strncmp(data, "Invalid Q.921/Q.931 frame", 25) ) {
+ 				ftdm_log(FTDM_LOG_INFO, "sng_isdn->%s", data);
+ 			}
  			break;
  		case SNG_LOGLEVEL_INFO:
 -			ftdm_log(FTDM_LOG_INFO, "sng_isdn->%s", data);
 +			ftdm_log(FTDM_LOG_INFO, "sng_isdn->%s\n", data);
  			break;
  		case SNG_LOGLEVEL_STATS:
 -			ftdm_log(FTDM_LOG_INFO, "sng_isdn->%s", data);
 +			ftdm_log(FTDM_LOG_INFO, "sng_isdn->%s\n", data);
  			break;
  		case SNG_LOGLEVEL_ERROR:
 -			ftdm_log(FTDM_LOG_ERROR, "sng_isdn->%s", data);
 +			ftdm_log(FTDM_LOG_ERROR, "sng_isdn->%s\n", data);
  			/*ftdm_assert(0, "Got an error from stack");*/
  			break;
  		case SNG_LOGLEVEL_CRIT: