From: Moises Silva <moy@sangoma.com>
Date: Thu, 23 Jun 2011 20:13:41 +0000 (-0400)
Subject: Merge branch 'master' into smgmaster
X-Git-Tag: v1.2.3^2~71^2^2~240
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1c09adb34fd50a4c8137fd42364054deba0017a0;p=thirdparty%2Ffreeswitch.git

Merge branch 'master' into smgmaster
---

1c09adb34fd50a4c8137fd42364054deba0017a0
diff --cc libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c
index db372b0f97,69016113b0..2794eb497c
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c
@@@ -2901,14 -2901,14 +2901,14 @@@ static int ftmod_ss7_fill_in_ccSpan(sng
  		g_ftdm_sngss7_data.cfg.isupCkt[x].chan			= count;
  
  		if (timeslot.siglink) {
- 			g_ftdm_sngss7_data.cfg.isupCkt[x].type		= SIG;
+ 			g_ftdm_sngss7_data.cfg.isupCkt[x].type		= SNG_CKT_SIG;
  		} else if (timeslot.gap) {
- 			g_ftdm_sngss7_data.cfg.isupCkt[x].type		= HOLE;
+ 			g_ftdm_sngss7_data.cfg.isupCkt[x].type		= SNG_CKT_HOLE;
  		} else {
- 			g_ftdm_sngss7_data.cfg.isupCkt[x].type		= VOICE;
+ 			g_ftdm_sngss7_data.cfg.isupCkt[x].type		= SNG_CKT_VOICE;
  			
  			/* throw the flag to indicate that we need to start call control */
 -			sngss7_set_flag(&g_ftdm_sngss7_data.cfg, SNGSS7_CC);
 +			sngss7_set_flag(&g_ftdm_sngss7_data.cfg, SNGSS7_CC_PRESENT);
  		}
  
  		if (timeslot.channel) {