From: Nenad Corbic <ncorbic@sangoma.com>
Date: Thu, 15 Apr 2010 23:59:21 +0000 (-0400)
Subject: conflict
X-Git-Tag: git2svn-syncpoint-master~209
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7269d4618c1f2059920045c48f802bf1188ea426;p=thirdparty%2Ffreeswitch.git

conflict
---

7269d4618c1f2059920045c48f802bf1188ea426
diff --cc libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c
index 89d6de354d,c950798b09..f788de3f71
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c
@@@ -69,15 -69,19 +69,18 @@@ static ftdm_status_t ftdm_sangoma_boost
  #define BOOST_SPAN(ftdmchan) ((ftdm_sangoma_boost_data_t*)(ftdmchan)->span->signal_data)->sigmod ? ftdmchan->physical_span_id : ftdmchan->physical_span_id-1
  #define BOOST_CHAN(ftdmchan) ((ftdm_sangoma_boost_data_t*)(ftdmchan)->span->signal_data)->sigmod ? ftdmchan->physical_chan_id : ftdmchan->physical_chan_id-1
  
+ #define BOOST_EVENT_SPAN(sigmod, event) ((sigmod)? event->span:event->span+1)
+ #define BOOST_EVENT_CHAN(sigmod, event) ((sigmod)? event->chan:event->chan+1)
+ 
  /**
 - * \brief Strange flag
 + * \brief SANGOMA boost notification flag
   */
  typedef enum {
 -	SFLAG_FREE_REQ_ID = (1 << 0),
 -	SFLAG_SENT_FINAL_MSG = (1 << 1),
 -	SFLAG_SENT_ACK = (1 << 2),
 -	SFLAG_RECVD_ACK = (1 << 3),
 -	SFLAG_HANGUP = (1 << 4),
 -	SFLAG_TERMINATING = (1 << 5)
 +	SFLAG_SENT_FINAL_MSG = (1 << 0),
 +	SFLAG_SENT_ACK = (1 << 1),
 +	SFLAG_RECVD_ACK = (1 << 2),
 +	SFLAG_HANGUP = (1 << 3),
 +	SFLAG_TERMINATING = (1 << 4)
  } sflag_t;
  
  typedef uint16_t sangoma_boost_request_id_t;
@@@ -620,11 -615,9 +617,6 @@@ static void handle_call_start_ack(sango
  		return;
  	}
  
- 	if (mcon->sigmod) {
- 		event_span = event->span;
- 		event_chan = event->chan;
- 	}
 -	OUTBOUND_REQUESTS[event->call_setup_id].event = *event;
 -	SETUP_GRID[event->span][event->chan] = event->call_setup_id;
--
  	if (mcon->sigmod) {
  		ftdmchan = OUTBOUND_REQUESTS[event->call_setup_id].ftdmchan;
  	} else {