]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
freetdm: Removed ftmod_sangoma_boost
authorDavid Yat Sin <dyatsin@sangoma.com>
Wed, 16 Feb 2011 16:06:26 +0000 (11:06 -0500)
committerDavid Yat Sin <dyatsin@sangoma.com>
Wed, 16 Feb 2011 16:07:30 +0000 (11:07 -0500)
13 files changed:
libs/freetdm/Makefile.am
libs/freetdm/configure.ac
libs/freetdm/src/ftmod/ftmod_sangoma_boost/BOOST.limitations [deleted file]
libs/freetdm/src/ftmod/ftmod_sangoma_boost/boost-tasks.txt [deleted file]
libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftdm_sangoma_boost.h [deleted file]
libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.2008.vcproj [deleted file]
libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.2010.vcxproj [deleted file]
libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.2010.vcxproj.filters [deleted file]
libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c [deleted file]
libs/freetdm/src/ftmod/ftmod_sangoma_boost/sangoma_boost_client.c [deleted file]
libs/freetdm/src/ftmod/ftmod_sangoma_boost/sangoma_boost_client.h [deleted file]
libs/freetdm/src/ftmod/ftmod_sangoma_boost/sangoma_boost_interface.h [deleted file]
libs/freetdm/src/ftmod/ftmod_sangoma_boost/sigboost.h [deleted file]

index b3353f32de2201bfb6e6b425fd7d368939d3ef56..a26035b2ef770d99e300f160b61516057c01b074 100644 (file)
@@ -39,7 +39,6 @@ libdir = @libdir@
 library_includedir = $(prefix)/include
 
 INCS  = -I$(FT_SRCDIR)/$(SRC)/include -I$(FT_SRCDIR)/$(SRC)/include/private
-INCS += -I$(FT_SRCDIR)/$(SRC)/ftmod/ftmod_sangoma_boost
 
 if HAVE_SNG_SS7
 INCS += -I/usr/include/sng_ss7
@@ -109,7 +108,6 @@ core-install: install-libLTLIBRARIES
 # tools & test programs
 #
 noinst_PROGRAMS  = testtones detect_tones detect_dtmf testpri testr2 testanalog testapp testcid
-noinst_PROGRAMS += testsangomaboost
 
 testapp_SOURCES = $(SRC)/testapp.c
 testapp_LDADD   = libfreetdm.la
@@ -143,17 +141,6 @@ testr2_SOURCES = $(SRC)/testr2.c
 testr2_LDADD   = libfreetdm.la
 testr2_CFLAGS  = $(AM_CFLAGS) $(FTDM_CFLAGS)
 
-if HAVE_SCTP
-noinst_PROGRAMS  += testboost
-testboost_SOURCES = $(SRC)/testboost.c
-testboost_LDADD   = libfreetdm.la
-testboost_CFLAGS  = $(AM_CFLAGS) $(FTDM_CFLAGS)
-endif
-
-testsangomaboost_SOURCES = $(SRC)/testsangomaboost.c
-testsangomaboost_LDADD   = libfreetdm.la
-testsangomaboost_CFLAGS  = $(AM_CFLAGS) $(FTDM_CFLAGS)
-
 testanalog_SOURCES = $(SRC)/testanalog.c
 testanalog_LDADD   = libfreetdm.la
 testanalog_CFLAGS  = $(AM_CFLAGS) $(FTDM_CFLAGS)
@@ -201,14 +188,6 @@ ftmod_isdn_la_LDFLAGS  = -shared -module -avoid-version $(LIBISDN_LDFLAGS) $(PCA
 ftmod_isdn_la_LIBADD   = libfreetdm.la $(LIBISDN_LIBS) $(PCAP_LIBS)
 endif
 
-if HAVE_SCTP
-mod_LTLIBRARIES += ftmod_sangoma_boost.la
-ftmod_sangoma_boost_la_SOURCES = $(SRC)/ftmod/ftmod_sangoma_boost/sangoma_boost_client.c $(SRC)/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c
-ftmod_sangoma_boost_la_CFLAGS  = $(AM_CFLAGS) $(FTDM_CFLAGS)
-ftmod_sangoma_boost_la_LDFLAGS = -shared -module -avoid-version
-ftmod_sangoma_boost_la_LIBADD  = libfreetdm.la
-endif
-
 if HAVE_LIBPRI
 mod_LTLIBRARIES += ftmod_libpri.la
 ftmod_libpri_la_SOURCES = $(SRC)/ftmod/ftmod_libpri/ftmod_libpri.c $(SRC)/ftmod/ftmod_libpri/lpwrap_pri.c
index 1f4fc9c6ac616f55124adb67e86809ac3df7affb..38f849b9e6d3a6a11c22705d9a46654f3383c322 100644 (file)
@@ -121,8 +121,7 @@ AC_CHECK_LIB([dl], [dlopen])
 AC_CHECK_LIB([pthread], [pthread_create])
 AC_CHECK_LIB([m], [cos])
 
-AC_CHECK_HEADERS([netinet/sctp.h netdb.h sys/select.h])
-AM_CONDITIONAL([HAVE_SCTP],[test "${ac_cv_header_netinet_sctp_h}" = "yes"])
+AC_CHECK_HEADERS([netdb.h sys/select.h])
 
 AC_CHECK_FUNC([gethostbyname_r],
        [], [AC_CHECK_LIB([nsl], [gethostbyname_r])]
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_boost/BOOST.limitations b/libs/freetdm/src/ftmod/ftmod_sangoma_boost/BOOST.limitations
deleted file mode 100644 (file)
index 663b7d3..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-== Boost sigmod current limitations ==
-- we don't support having openzap spans with physical channels
-  belonging to other physical spans. this is due to netborder sangoma abstraction, therefore
-  any openzap span using sigboost must have only channels belonging to the corresponding
-  physical span.
-
-  This is the reason we added group functionality in openzap core, furthermore, previous groups in openzap
-  were only possible through adding of b-channels to a single span, but this forces the user to create groups
-  of channels only whithin the same type of trunk among other things.
-
-- all spans must be configured and then started, cannot configure, start, configure start etc
-  this is due to netborder telesoft abstraction. that requires configuring everything and
-  then starting everything at once.
-
-- sangoma_prid and sangoma_brid on Windows had to be compiled hacking make/Makefile.platform to comment all VC runtime checks, 
-  otherwise when running in debug mode exceptions are thrown due to loss of data ie short to char conversions.
-
-== TODO ==
-- proper upper layer management of HW alarms (this must be done in mod_openzap.c)
-
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_boost/boost-tasks.txt b/libs/freetdm/src/ftmod/ftmod_sangoma_boost/boost-tasks.txt
deleted file mode 100644 (file)
index f0eab3a..0000000
+++ /dev/null
@@ -1,146 +0,0 @@
-== General Design ==
-
-NBE will do its current loading of spans and configuration process through Sangoma Board Manager (SBM).
-After doing SangomaBoardManager::getInstance().configure -> start. It will proceed to initalize
-the openzap stack (just as the TelesoftStack is loaded after starting SMB. The procedure will be:
-
-- create a static or malloced zap_io_interface_t
-- call zap_global_set_logger with the logging hooks.
-- call zap_global_set_memhandler() with the memory hooks.
-- call zap_global_init() to initialize the stack
-- call zap_add_io_iface() to add the I/O iface.
-- iterate over all SBM spans configured for BRI or any boost-managed signaling and:
-    * call zap_span_create(NBE I/O mod, in_ptrSpan, SMB span name)
-    * Fill in some members like: 
-      span->trunk_type = E1/T1/J1/FXO/FXS etc ...
-    * iterate over all channels in SMB span and:
-      * zap_span_add_channel(zap_span, sock, type:CAS|BCHAN|DCHAN|ETC)
-    * call zap_configure_span("sangoma_boost", span, sigmsg_callback, "param1", value1, "param2", value1 ...)
-    * zap_span_start(span);
-
-
-At this point, NBE would receive signaling msgs via sigmsg_callback registered when configuring
-and NBE would request hangup or making calls throug openzap API, like zap_set_state_* and zap_channel_outgoing_call() to place calls.
-
-When NBE wants to check for link status. 
-
-      zap_get_siglink_state() which would return 
-      ZAP_SIG_STATE_UP (D-chan UP, R2 bits in IDLE, ss7?)
-      ZAP_SIG_STATE_SUSPENDED (D-chan in power saving mode?)
-      ZAP_SIG_STATE_DOWN (D-chan down, R2 bits in blocked, ss7?)
-
-      Whenever a state in sig link changes, the sigmsg_callback will be used to notify NBE or any other user.
-
-NOTE: right now hardware alarms notification in openzap is seriously broken,
-see ozmod_libpri.c process_event ... reads an event from hardware (zap_event_t *),
-then checks the event type, if its ZAP_OOB_ALARM_TRAP prepares a zap_sigmsg_t
-(signaling event) setting its event_id to ZAP_OOB_ALARM_TRAP, which is *WRONG*
-because event_id is of type zap_signal_event_t and not zap_oob_event_t!
-this means on alarm the user will get ZAP_SIGEVENT_PROGRESS_MEDIA!! which is
-value 7 that is in conflict with ZAP_OOB_ALARM_TRAP, I think a separate
-callback should be used if the outside user wants to be notified about
-hardware events like HW DTMF or so. Currently there is alreadya  generic DTMF
-listener.
-
-== Tasks Stage 1 / OpenZAP and Boost changes (To be tested with FreeSWITCH) ==
-
-- Change malloc and other mem functions in openzap
-  to use internal hooks provided via zap_global_set_memhandler()
-  which would be called before zap_global_init(), this is
-  already done for the logger via zap_global_set_logger()
-  
-  question: should the mem routines allow for memory pool ptr?
-            this could be useful to provide a memory pool to
-            the whole module.
-
-  question: should we allow hooks for threads and locking?
-            I think we can skip this one unless needed. They already
-            use their own threading abstraction which is working for
-            Linux and Windows. If we ever need to profile threading
-            we can add profiling hooks.
-
-  question: I had to add openzap calls to the hash table and libteletone implementations, is that acceptable?
-
-- Modify zap_global_init() API
-  
-  This API must just initialize vars, mutexes etc.
-  and NOT DO ANY CONFIGURATION LOADING, PARSING, SPAN CREATION and I/O
-  configuration, which is what is currently doing. 
-  We don't want zap_global_init() to create the spans based on that configuration
-  since NBE will have its own configuration and will take care of creating
-  the needed data structures on its own.
-
-- Add new zap_std_io_config() API 
-
-  This API will parse the standard openzap.conf module and create the spans.  
-  This will be used by FS but not by NBE, which will create the openzap spans by itself.
-  The NBE flow to initialize openzap will be:
-
-- Add new API zap_global_add_io_iface(), 
-
-  This API will add a new I/O interface structure to the internal openzap hash of I/O structs. 
-  This is needed because NBE I/O structure will NOT be loaded from an openzap module (.so/.dll)
-  but rather just registered on runtime (probably from a static structure in NBE code).
-  This openzap hash is used by zap_api_execute() for example, to find the module that can 
-  handle a given API, ie (oz libpri status). This is an example of how an openzap I/O interface 
-  can decide to implement just the ->api() member to handle commands and NOTHING else,
-  so I/O interfaces not necessary are hardware-related.
-
-- Add new zap_channel_get_siglink_state(zap_channel, zap_siglink_status_t &status)
-
-- Modify mod_openzap.c to read proto= setting in boost spans, this will determine wich boost sig
-  module will handle the configuration and those channels.
-
-    <boost_spans> <span sigmod="bri|ss7|blah"> <param="proto-specific-setting" value="setting"> </span> </boost_spans>
-
-    Then as first config arg to zap_config_span() the boost proto module name would be included as "sigmod" which will be used
-    by ozmod_sangoma_boost to decide which sig module must handle that span configuration
-
-- Create minimal boost mod interface.
-   ozmod_boost_ss7 should load sig boost mods and get interface via dlsym(boost_get_interface) boost_get_interface(boost_iface);
-  The boost interface will have
-    * const char *name                  // boost sigmod name (brid,ss7d)
-    * set_write_boost_msg_cb(callback)  // tell the stack how to send us boost messages
-    * set_sig_status_cb(callback);      // tell the stack how to notify us about link status changes
-    * write_boost_msg(struct boost_msg) // send a boost msg to the stack
-    * configure_span(zap_span_t span, "configuration", value, "configuration", value) // configure a given span
-    * get_sig_status(openzap_sigstatus_t status)
-    * start(span) // to start a given openzap span
-    * stop(span) // to stop the stack on a given openzap span
-
-- Migrate current sangoma_brid sig module to openzap
-  * Make sangoma_brid a library
-  * Move from using malloc, threading, locking, logging and I/O to openzap functions. Export the boost sigmod interface and its supporting code.
-
-== State 2 Tasks == 
-
-- Create the I/O NBE interface and supporting functions. It must be possible to poll over the span
-  given that ozmod_sangoma_boost BRI module and others may need to *wait* for data. The poll()
-  function in I/O NBE interface would wait on a pthread condition or Windows event, which would
-  be triggered by some external NBE component registered with Sangoma Board Manager (SMB) for d-chan
-  data, whenever d-chan data arrives, saves the data in a buffer and triggers the condition to wakeup
-  any waiter, then the waiter (sangoma_brid or any other boost client) calls zap_channel_read which calls
-  our own I/O NBE interface read method and retrieves the data from the buffer.
-
-    Dropped alternative design:
-    Another option is to add a new API zap_span_push_incoming_data(span/chan, data); However this changes
-    the model openzap has followed and I don't think fits that well, since now we have 2 different models
-    to support in openzap. 
-
-== TODO ==
-
-- how about logging specific modules, like, just ozmod_boost, or just the BRI stack?
-  more work to be done so the BRI module uses zap_log instead of current syslog
-  then work to be done to be able to filter logs from specific openzap code? is it worth it?
-
-- remove FORCE_SEGFAULT from sprid
-
-
-=== Shortcomings ==
-
-- we had to drop smg support in the branch where we work on sangoma prid.
-  After all, most people using sangoma_prid is using freeswitch/openzap and not Sangoma Media Gateway
-  The problem is in freeswitch/openzap mode, sangoma_boost ozmod takes care of span events (POLLPRI)
-  where in SMG and Netborder POLLPRI is done typically by sangoma board manager.
-
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftdm_sangoma_boost.h b/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftdm_sangoma_boost.h
deleted file mode 100644 (file)
index 6fbf272..0000000
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (c) 2007, Anthony Minessale II
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 
- * * Neither the name of the original author; nor the names of any contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- * 
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER
- * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef FTDM_SANGOMA_BOOST_H
-#define FTDM_SANGOMA_BOOST_H
-#include "sangoma_boost_client.h"
-#include "freetdm.h"
-
-#define MAX_CHANS_PER_TRUNKGROUP 1024
-
-typedef enum {
-       FTDM_SANGOMA_BOOST_RUNNING = (1 << 0),
-       FTDM_SANGOMA_BOOST_RESTARTING = (1 << 1),
-       FTDM_SANGOMA_BOOST_EVENTS_RUNNING = (1 << 2),
-} ftdm_sangoma_boost_flag_t;
-
-typedef struct ftdm_sangoma_boost_data {
-       sangomabc_connection_t mcon;
-       sangomabc_connection_t pcon;
-       int iteration;
-       uint32_t flags;
-       boost_sigmod_interface_t *sigmod;
-       ftdm_queue_t *boost_queue;      
-} ftdm_sangoma_boost_data_t;
-
-typedef struct ftdm_sangoma_boost_trunkgroup {
-       ftdm_mutex_t *mutex;
-       ftdm_size_t size;                       /* Number of b-channels in group */     
-       unsigned int last_used_index; /* index of last b-channel used */
-       ftdm_channel_t* ftdmchans[MAX_CHANS_PER_TRUNKGROUP];
-       //TODO need to merge congestion timeouts to this struct
-} ftdm_sangoma_boost_trunkgroup_t;
-#endif
-
-/* For Emacs:
- * Local Variables:
- * mode:c
- * indent-tabs-mode:t
- * tab-width:4
- * c-basic-offset:4
- * End:
- * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4:
- */
-
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.2008.vcproj b/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.2008.vcproj
deleted file mode 100644 (file)
index 73e4218..0000000
+++ /dev/null
@@ -1,373 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>\r
-<VisualStudioProject\r
-       ProjectType="Visual C++"\r
-       Version="9.00"\r
-       Name="ftmod_sangoma_boost"\r
-       ProjectGUID="{D021EF2A-460D-4827-A0F7-41FDECF46F1B}"\r
-       RootNamespace="ftmod_sangoma_boost"\r
-       Keyword="Win32Proj"\r
-       TargetFrameworkVersion="196613"\r
-       >\r
-       <Platforms>\r
-               <Platform\r
-                       Name="Win32"\r
-               />\r
-               <Platform\r
-                       Name="x64"\r
-               />\r
-       </Platforms>\r
-       <ToolFiles>\r
-       </ToolFiles>\r
-       <Configurations>\r
-               <Configuration\r
-                       Name="Debug|Win32"\r
-                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
-                       IntermediateDirectory="$(ConfigurationName)"\r
-                       ConfigurationType="2"\r
-                       CharacterSet="1"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\include;..\..\isdn\include"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FTMOD_SANGOMA_BOOST_EXPORTS"\r
-                               MinimalRebuild="true"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               UsePrecompiledHeader="0"\r
-                               WarningLevel="4"\r
-                               WarnAsError="true"\r
-                               DebugInformationFormat="4"\r
-                               DisableSpecificWarnings="4100"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLinkerTool"\r
-                               AdditionalDependencies="freetdm.lib"\r
-                               LinkIncremental="2"\r
-                               AdditionalLibraryDirectories="&quot;$(OutDir)&quot;"\r
-                               GenerateDebugInformation="true"\r
-                               SubSystem="2"\r
-                               TargetMachine="1"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManifestTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCAppVerifierTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
-               </Configuration>\r
-               <Configuration\r
-                       Name="Debug|x64"\r
-                       OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"\r
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
-                       ConfigurationType="2"\r
-                       CharacterSet="1"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                               TargetEnvironment="3"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\include;..\..\isdn\include"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FTMOD_SANGOMA_BOOST_EXPORTS"\r
-                               MinimalRebuild="true"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               UsePrecompiledHeader="0"\r
-                               WarningLevel="4"\r
-                               WarnAsError="true"\r
-                               DebugInformationFormat="3"\r
-                               DisableSpecificWarnings="4100"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLinkerTool"\r
-                               AdditionalDependencies="freetdm.lib"\r
-                               LinkIncremental="2"\r
-                               AdditionalLibraryDirectories="&quot;$(OutDir)&quot;"\r
-                               GenerateDebugInformation="true"\r
-                               SubSystem="2"\r
-                               TargetMachine="17"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManifestTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCAppVerifierTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
-               </Configuration>\r
-               <Configuration\r
-                       Name="Release|Win32"\r
-                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
-                       IntermediateDirectory="$(ConfigurationName)"\r
-                       ConfigurationType="2"\r
-                       CharacterSet="1"\r
-                       WholeProgramOptimization="1"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               EnableIntrinsicFunctions="true"\r
-                               AdditionalIncludeDirectories="..\..\include"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FTMOD_SANGOMA_BOOST_EXPORTS"\r
-                               RuntimeLibrary="2"\r
-                               EnableFunctionLevelLinking="true"\r
-                               UsePrecompiledHeader="0"\r
-                               WarningLevel="4"\r
-                               WarnAsError="true"\r
-                               DebugInformationFormat="3"\r
-                               DisableSpecificWarnings="4100"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLinkerTool"\r
-                               LinkIncremental="1"\r
-                               GenerateDebugInformation="true"\r
-                               SubSystem="2"\r
-                               OptimizeReferences="2"\r
-                               EnableCOMDATFolding="2"\r
-                               TargetMachine="1"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManifestTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCAppVerifierTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
-               </Configuration>\r
-               <Configuration\r
-                       Name="Release|x64"\r
-                       OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"\r
-                       IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"\r
-                       ConfigurationType="2"\r
-                       CharacterSet="1"\r
-                       WholeProgramOptimization="1"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                               TargetEnvironment="3"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               Optimization="2"\r
-                               EnableIntrinsicFunctions="true"\r
-                               AdditionalIncludeDirectories="..\..\include"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FTMOD_SANGOMA_BOOST_EXPORTS"\r
-                               RuntimeLibrary="2"\r
-                               EnableFunctionLevelLinking="true"\r
-                               UsePrecompiledHeader="0"\r
-                               WarningLevel="4"\r
-                               WarnAsError="false"\r
-                               DebugInformationFormat="3"\r
-                               DisableSpecificWarnings="4100"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLinkerTool"\r
-                               LinkIncremental="1"\r
-                               GenerateDebugInformation="true"\r
-                               SubSystem="2"\r
-                               OptimizeReferences="2"\r
-                               EnableCOMDATFolding="2"\r
-                               TargetMachine="17"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManifestTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCAppVerifierTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
-               </Configuration>\r
-       </Configurations>\r
-       <References>\r
-       </References>\r
-       <Files>\r
-               <Filter\r
-                       Name="Source Files"\r
-                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
-                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
-                       >\r
-                       <File\r
-                               RelativePath="ftmod_sangoma_boost.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="sangoma_boost_client.c"\r
-                               >\r
-                       </File>\r
-               </Filter>\r
-               <Filter\r
-                       Name="Header Files"\r
-                       Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
-                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
-                       >\r
-                       <File\r
-                               RelativePath="ftdm_sangoma_boost.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="sangoma_boost_client.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="sangoma_boost_interface.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="sigboost.h"\r
-                               >\r
-                       </File>\r
-               </Filter>\r
-       </Files>\r
-       <Globals>\r
-       </Globals>\r
-</VisualStudioProject>\r
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.2010.vcxproj b/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.2010.vcxproj
deleted file mode 100644 (file)
index 684e432..0000000
+++ /dev/null
@@ -1,206 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <ItemGroup Label="ProjectConfigurations">\r
-    <ProjectConfiguration Include="Debug|Win32">\r
-      <Configuration>Debug</Configuration>\r
-      <Platform>Win32</Platform>\r
-    </ProjectConfiguration>\r
-    <ProjectConfiguration Include="Debug|x64">\r
-      <Configuration>Debug</Configuration>\r
-      <Platform>x64</Platform>\r
-    </ProjectConfiguration>\r
-    <ProjectConfiguration Include="Release|Win32">\r
-      <Configuration>Release</Configuration>\r
-      <Platform>Win32</Platform>\r
-    </ProjectConfiguration>\r
-    <ProjectConfiguration Include="Release|x64">\r
-      <Configuration>Release</Configuration>\r
-      <Platform>x64</Platform>\r
-    </ProjectConfiguration>\r
-  </ItemGroup>\r
-  <PropertyGroup Label="Globals">\r
-    <ProjectName>ftmod_sangoma_boost</ProjectName>\r
-    <ProjectGuid>{D021EF2A-460D-4827-A0F7-41FDECF46F1B}</ProjectGuid>\r
-    <RootNamespace>ftmod_sangoma_boost</RootNamespace>\r
-    <Keyword>Win32Proj</Keyword>\r
-  </PropertyGroup>\r
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">\r
-    <ConfigurationType>DynamicLibrary</ConfigurationType>\r
-    <CharacterSet>Unicode</CharacterSet>\r
-    <WholeProgramOptimization>true</WholeProgramOptimization>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">\r
-    <ConfigurationType>DynamicLibrary</ConfigurationType>\r
-    <CharacterSet>Unicode</CharacterSet>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">\r
-    <ConfigurationType>DynamicLibrary</ConfigurationType>\r
-    <CharacterSet>Unicode</CharacterSet>\r
-    <WholeProgramOptimization>true</WholeProgramOptimization>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">\r
-    <ConfigurationType>DynamicLibrary</ConfigurationType>\r
-    <CharacterSet>Unicode</CharacterSet>\r
-  </PropertyGroup>\r
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
-  <ImportGroup Label="ExtensionSettings">\r
-  </ImportGroup>\r
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">\r
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
-  </ImportGroup>\r
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">\r
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
-  </ImportGroup>\r
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">\r
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
-  </ImportGroup>\r
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">\r
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
-  </ImportGroup>\r
-  <PropertyGroup Label="UserMacros" />\r
-  <PropertyGroup>\r
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\r
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>\r
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>\r
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>\r
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>\r
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>\r
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>\r
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>\r
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>\r
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>\r
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>\r
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>\r
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>\r
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>\r
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />\r
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />\r
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>\r
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />\r
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />\r
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>\r
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />\r
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />\r
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>\r
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />\r
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />\r
-  </PropertyGroup>\r
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
-    <ClCompile>\r
-      <Optimization>Disabled</Optimization>\r
-      <AdditionalIncludeDirectories>..\..\include;..\..\isdn\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;FTMOD_SANGOMA_BOOST_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-      <MinimalRebuild>true</MinimalRebuild>\r
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
-      <PrecompiledHeader>\r
-      </PrecompiledHeader>\r
-      <WarningLevel>Level4</WarningLevel>\r
-      <TreatWarningAsError>true</TreatWarningAsError>\r
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>\r
-      <DisableSpecificWarnings>4100;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
-    </ClCompile>\r
-    <Link>\r
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>\r
-      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
-      <GenerateDebugInformation>true</GenerateDebugInformation>\r
-      <SubSystem>Windows</SubSystem>\r
-      <TargetMachine>MachineX86</TargetMachine>\r
-    </Link>\r
-  </ItemDefinitionGroup>\r
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
-    <ClCompile>\r
-      <Optimization>MaxSpeed</Optimization>\r
-      <IntrinsicFunctions>true</IntrinsicFunctions>\r
-      <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;FTMOD_SANGOMA_BOOST_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
-      <FunctionLevelLinking>true</FunctionLevelLinking>\r
-      <PrecompiledHeader>\r
-      </PrecompiledHeader>\r
-      <WarningLevel>Level4</WarningLevel>\r
-      <TreatWarningAsError>true</TreatWarningAsError>\r
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
-      <DisableSpecificWarnings>4100;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
-    </ClCompile>\r
-    <Link>\r
-      <GenerateDebugInformation>true</GenerateDebugInformation>\r
-      <SubSystem>Windows</SubSystem>\r
-      <OptimizeReferences>true</OptimizeReferences>\r
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
-      <TargetMachine>MachineX86</TargetMachine>\r
-    </Link>\r
-  </ItemDefinitionGroup>\r
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
-    <Midl>\r
-      <TargetEnvironment>X64</TargetEnvironment>\r
-    </Midl>\r
-    <ClCompile>\r
-      <Optimization>Disabled</Optimization>\r
-      <AdditionalIncludeDirectories>..\..\include;..\..\isdn\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;FTMOD_SANGOMA_BOOST_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-      <MinimalRebuild>true</MinimalRebuild>\r
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
-      <PrecompiledHeader>\r
-      </PrecompiledHeader>\r
-      <WarningLevel>Level4</WarningLevel>\r
-      <TreatWarningAsError>true</TreatWarningAsError>\r
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
-      <DisableSpecificWarnings>4100;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
-    </ClCompile>\r
-    <Link>\r
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>\r
-      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
-      <GenerateDebugInformation>true</GenerateDebugInformation>\r
-      <SubSystem>Windows</SubSystem>\r
-      <TargetMachine>MachineX64</TargetMachine>\r
-    </Link>\r
-  </ItemDefinitionGroup>\r
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
-    <Midl>\r
-      <TargetEnvironment>X64</TargetEnvironment>\r
-    </Midl>\r
-    <ClCompile>\r
-      <Optimization>MaxSpeed</Optimization>\r
-      <IntrinsicFunctions>true</IntrinsicFunctions>\r
-      <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;FTMOD_SANGOMA_BOOST_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
-      <FunctionLevelLinking>true</FunctionLevelLinking>\r
-      <PrecompiledHeader>\r
-      </PrecompiledHeader>\r
-      <WarningLevel>Level4</WarningLevel>\r
-      <TreatWarningAsError>false</TreatWarningAsError>\r
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
-      <DisableSpecificWarnings>4100;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
-    </ClCompile>\r
-    <Link>\r
-      <GenerateDebugInformation>true</GenerateDebugInformation>\r
-      <SubSystem>Windows</SubSystem>\r
-      <OptimizeReferences>true</OptimizeReferences>\r
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
-      <TargetMachine>MachineX64</TargetMachine>\r
-    </Link>\r
-  </ItemDefinitionGroup>\r
-  <ItemGroup>\r
-    <ClCompile Include="ftmod_sangoma_boost.c" />\r
-    <ClCompile Include="sangoma_boost_client.c" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <ClInclude Include="ftdm_sangoma_boost.h" />\r
-    <ClInclude Include="sangoma_boost_client.h" />\r
-    <ClInclude Include="sangoma_boost_interface.h" />\r
-    <ClInclude Include="sigboost.h" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\..\..\msvc\freetdm.2010.vcxproj">\r
-      <Project>{93b8812c-3ec4-4f78-8970-ffbfc99e167d}</Project>\r
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
-  <ImportGroup Label="ExtensionTargets">\r
-  </ImportGroup>\r
-</Project>
\ No newline at end of file
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.2010.vcxproj.filters b/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.2010.vcxproj.filters
deleted file mode 100644 (file)
index 2aeed15..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <ItemGroup>\r
-    <Filter Include="Source Files">\r
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>\r
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>\r
-    </Filter>\r
-    <Filter Include="Header Files">\r
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>\r
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>\r
-    </Filter>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <ClCompile Include="ftmod_sangoma_boost.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="sangoma_boost_client.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <ClInclude Include="ftdm_sangoma_boost.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="sangoma_boost_client.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="sangoma_boost_interface.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="sigboost.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-  </ItemGroup>\r
-</Project>
\ No newline at end of file
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c b/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c
deleted file mode 100644 (file)
index d0bc14c..0000000
+++ /dev/null
@@ -1,2730 +0,0 @@
-/*
- * Copyright (c) 2007, Anthony Minessale II
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 
- * * Neither the name of the original author; nor the names of any contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- * 
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER
- * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Contributors: 
- *
- * Moises Silva <moy@sangoma.com>
- * David Yat Sin <dyatsin@sangoma.com>
- * Nenad Corbic <ncorbic@sangoma.com>
- *
- */
-
-/* NOTE:
-On __WINDOWS__ platform this code works with sigmod ONLY, don't try to make sense of any socket code for win
-I basically ifdef out everything that the compiler complained about
-*/
-
-#include "private/ftdm_core.h"
-#include "sangoma_boost_client.h"
-#include "ftdm_sangoma_boost.h"
-#ifdef HAVE_SYS_SELECT_H
-#include <sys/select.h>
-#endif
-
-/* Boost signaling modules global hash and its mutex */
-ftdm_mutex_t *g_boost_modules_mutex = NULL;
-ftdm_hash_t *g_boost_modules_hash = NULL;
-
-#define MAX_TRUNK_GROUPS 64
-//TODO need to merge congestion_timeouts with ftdm_sangoma_boost_trunkgroups
-static time_t congestion_timeouts[MAX_TRUNK_GROUPS];
-
-static ftdm_sangoma_boost_trunkgroup_t *g_trunkgroups[MAX_TRUNK_GROUPS];
-
-static ftdm_io_interface_t ftdm_sangoma_boost_interface;
-static ftdm_status_t ftdm_sangoma_boost_list_sigmods(ftdm_stream_handle_t *stream);
-
-#define BOOST_QUEUE_SIZE 500
-
-/* get freetdm span and chan depending on the span mode */
-#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
-
-/**
- * \brief SANGOMA boost notification flag
- */
-typedef enum {
-       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;
-
-/**
- * \brief SANGOMA boost request status
- */
-typedef enum {
-       BST_FREE,
-       BST_WAITING,
-       BST_READY,
-       BST_FAIL
-} sangoma_boost_request_status_t;
-
-/**
- * \brief SANGOMA boost request structure
- */
-typedef struct {
-       sangoma_boost_request_status_t status;
-       sangomabc_short_event_t event;
-       ftdm_span_t *span;
-       ftdm_channel_t *ftdmchan;
-       int hangup_cause;
-       int flags;
-} sangoma_boost_request_t;
-
-typedef struct {
-       int call_setup_id;
-       int last_event_id;
-} sangoma_boost_call_t;
-
-#define CALL_DATA(ftdmchan) ((sangoma_boost_call_t*)((ftdmchan)->call_data))
-
-//#define MAX_REQ_ID FTDM_MAX_PHYSICAL_SPANS_PER_LOGICAL_SPAN * FTDM_MAX_CHANNELS_PHYSICAL_SPAN
-#define MAX_REQ_ID 6000
-
-static uint16_t SETUP_GRID[FTDM_MAX_PHYSICAL_SPANS_PER_LOGICAL_SPAN+1][FTDM_MAX_CHANNELS_PHYSICAL_SPAN+1] = {{ 0 }};
-
-static sangoma_boost_request_t OUTBOUND_REQUESTS[MAX_REQ_ID+1] = {{ 0 }};
-
-static ftdm_mutex_t *request_mutex = NULL;
-
-static uint8_t req_map[MAX_REQ_ID+1] = { 0 };
-static uint8_t nack_map[MAX_REQ_ID+1] = { 0 };
-
-/**
- * \brief Releases span and channel from setup grid
- *
- * \note This is ALWAYS based on freetdm span/chan numbers! not boost event numbers
- *       is totally brain damaged to use event->span or event->chan to release the request
- *       use BOOST_SPAN_EVENT and BOOST_SPAN_CHAN to get the right index!!
- *
- * \param span Span number
- * \param chan Channel number
- * \param func Calling function
- * \param line Line number on request
- * \return NULL if not found, channel otherwise
- */
-static void __release_request_id_span_chan(int span, int chan, const char *func, int line)
-{
-       int id;
-
-       ftdm_mutex_lock(request_mutex);
-       if ((id = SETUP_GRID[span][chan])) {
-               ftdm_assert(id <= MAX_REQ_ID, "Invalid request id\n");
-               req_map[id] = 0;
-               SETUP_GRID[span][chan] = 0;
-       }
-       ftdm_mutex_unlock(request_mutex);
-}
-#define release_request_id_span_chan(s, c) __release_request_id_span_chan(s, c, __FUNCTION__, __LINE__)
-
-/**
- * \brief Releases request ID
- * \param func Calling function
- * \param line Line number on request
- * \return NULL if not found, channel otherwise
- */
-static void __release_request_id(sangoma_boost_request_id_t r, const char *func, int line)
-{
-       ftdm_assert(r <= MAX_REQ_ID, "Invalid request id\n");
-       ftdm_mutex_lock(request_mutex);
-       req_map[r] = 0;
-       ftdm_mutex_unlock(request_mutex);
-}
-#define release_request_id(r) __release_request_id(r, __FUNCTION__, __LINE__)
-
-static sangoma_boost_request_id_t last_req = 0;
-
-/**
- * \brief Gets the first available tank request ID
- * \param func Calling function
- * \param line Line number on request
- * \return 0 on failure, request ID on success
- */
-static sangoma_boost_request_id_t __next_request_id(const char *func, int line)
-{
-       sangoma_boost_request_id_t r = 0, i = 0;
-       int found=0;
-       
-       ftdm_mutex_lock(request_mutex);
-       //r = ++last_req;
-       //while(!r || req_map[r]) {
-
-       for (i=1; i<= MAX_REQ_ID; i++){
-               r = ++last_req;
-
-               if (r >= MAX_REQ_ID) {
-                       r = last_req = 1;
-               }
-
-               if (req_map[r]) {
-                       /* Busy find another */
-                       continue;
-
-               }
-
-               req_map[r] = 1;
-               found=1;
-               break;
-
-       }
-
-       ftdm_mutex_unlock(request_mutex);
-
-       if (!found) {
-               return 0;
-       }
-
-       return r;
-}
-#define next_request_id() __next_request_id(__FUNCTION__, __LINE__)
-
-
-static void print_request_ids(void)
-{
-       sangoma_boost_request_id_t i = 0;
-       int cnt=0;
-
-       ftdm_mutex_lock(request_mutex);
-
-       for (i=1; i<= MAX_REQ_ID; i++){
-               if (req_map[i]) {
-                       ftdm_log(FTDM_LOG_CRIT, "Used Request ID=%i\n",i);
-                       cnt++;
-               }
-       }
-
-       ftdm_mutex_unlock(request_mutex);
-       ftdm_log(FTDM_LOG_CRIT, "Total Request IDs=%i\n",cnt);
-       
-       return;
-}
-
-
-/**
- * \brief Finds the channel that triggered an event
- * \param span Span where to search the channel
- * \param event SANGOMA event
- * \param force Do not wait for the channel to be available if in use
- * \return NULL if not found, channel otherwise
- */
-static ftdm_channel_t *find_ftdmchan(ftdm_span_t *span, sangomabc_short_event_t *event, int force)
-{
-       uint32_t i;
-       ftdm_channel_t *ftdmchan = NULL;
-
-       ftdm_sangoma_boost_data_t *sangoma_boost_data = span->signal_data;
-       uint32_t targetspan = BOOST_EVENT_SPAN(sangoma_boost_data->sigmod, event);
-       uint32_t targetchan = BOOST_EVENT_CHAN(sangoma_boost_data->sigmod, event);
-
-       /* NC: Sanity check in case the call setup id does not relate
-              to span.  This can happen if RESTART is received on a
-                  full load. Where stray ACK messages can arrive after
-                  a RESTART has taken place.
-        */
-       if (!span) {
-               ftdm_log(FTDM_LOG_CRIT, "No Span for Event=%s s%dc%d cid=%d\n",
-                                               BOOST_DECODE_EVENT_ID(event->event_id),
-                                               targetspan,
-                                               targetchan,
-                                               event->call_setup_id);
-               return NULL;
-       }
-
-
-       for(i = 1; i <= span->chan_count; i++) {
-               if (span->channels[i]->physical_span_id == targetspan && span->channels[i]->physical_chan_id == targetchan) {
-                       ftdmchan = span->channels[i];
-                       if (force || (ftdmchan->state == FTDM_CHANNEL_STATE_DOWN && !ftdm_test_flag(ftdmchan, FTDM_CHANNEL_INUSE))) {
-                               break;
-                       } else {
-                               ftdmchan = NULL;
-                               ftdm_log(FTDM_LOG_DEBUG, "Channel %d:%d ~ %d:%d is already in use in state %s\n",
-                                               span->channels[i]->span_id,
-                                               span->channels[i]->chan_id,
-                                               span->channels[i]->physical_span_id,
-                                               span->channels[i]->physical_chan_id,
-                                               ftdm_channel_state2str(span->channels[i]->state));
-                               break;
-                       }
-               }
-       }
-
-       return ftdmchan;
-}
-
-static int check_congestion(int trunk_group)
-{
-       if (congestion_timeouts[trunk_group]) {
-               time_t now = time(NULL);
-
-               if (now >= congestion_timeouts[trunk_group]) {
-                       congestion_timeouts[trunk_group] = 0;
-               } else {
-                       return 1;
-               }
-       }
-
-       return 0;
-}
-
-
-/**
- * \brief Requests an sangoma boost channel on a span (outgoing call)
- * \param span Span where to get a channel
- * \param chan_id Specific channel to get (0 for any)
- * \param direction Call direction
- * \param caller_data Caller information
- * \param ftdmchan Channel to initialise
- * \return Success or failure
- */
-static FIO_CHANNEL_REQUEST_FUNCTION(sangoma_boost_channel_request)
-{
-       ftdm_sangoma_boost_data_t *sangoma_boost_data = span->signal_data;
-       ftdm_status_t status = FTDM_FAIL;
-       sangoma_boost_request_id_t r;
-       sangomabc_event_t event = {0};
-       /* sanity has to be more than 8 seconds.
-        * In PRI specs, timeout is 4 seconds for remote switch to respond to a SETUP,
-        * and PRI stack will retransmit a second SETUP after the first timeout, so
-        * we should allow for at least 8 seconds.
-        */
-
-       int boost_request_timeout = 10000;
-       sangoma_boost_request_status_t st;
-       char dnis[128] = "";
-       char *gr = NULL;
-       uint32_t count = 0;
-       int tg=0;
-
-       /* NC: On large number of calls 10 seconds is not enough.
-               Resetting to 30 seconds. Especially on ss7 when
-               links are reset during large call volume */
-       if (!sangoma_boost_data->sigmod) {
-               boost_request_timeout = 30000;
-       }
-       
-       if (sangoma_boost_data->sigmod) {
-               ftdm_log(FTDM_LOG_CRIT, "This function should not be called when sigmod was configured in boost\n");
-               *ftdmchan = NULL;
-               return FTDM_FAIL;
-       }
-
-       if (ftdm_test_flag(span, FTDM_SPAN_SUSPENDED)) {
-               ftdm_log(FTDM_LOG_CRIT, "SPAN is Suspended.\n");
-               *ftdmchan = NULL;
-               return FTDM_FAIL;
-       }
-
-       if (check_congestion(tg)) {
-               ftdm_log(FTDM_LOG_CRIT, "All circuits are busy. Trunk Group=%i (CONGESTION)\n",tg+1);
-               *ftdmchan = NULL;
-               return FTDM_FAIL;
-       }
-
-       if (count >= span->chan_count) {
-               ftdm_log(FTDM_LOG_CRIT, "All circuits are busy.\n");
-               *ftdmchan = NULL;
-               return FTDM_FAIL;
-       }
-
-       r = next_request_id();
-       if (r == 0) {
-               ftdm_log(FTDM_LOG_CRIT, "All tanks ids are busy.\n");
-               *ftdmchan = NULL;
-               return FTDM_FAIL;
-       }
-
-       /* After this point we must release request id before we leave the function
-          in case of an error. */
-
-       ftdm_set_string(dnis, caller_data->dnis.digits);
-
-       if ((gr = strchr(dnis, '@'))) {
-               *gr++ = '\0';
-       }
-
-       if (gr && *(gr+1)) {
-               tg = atoi(gr+1);
-               if (tg > 0) {
-                       tg--;
-               }
-       }
-       
-       sangomabc_call_init(&event, caller_data->cid_num.digits, dnis, r);
-
-       event.trunk_group = tg;
-
-
-       ftdm_span_channel_use_count(span, &count);
-
-       if (gr && *(gr+1)) {
-               switch(*gr) {
-                               case 'g':
-                                               event.hunt_group = SIGBOOST_HUNTGRP_SEQ_ASC;
-                                               break;
-                               case 'G':
-                                               event.hunt_group = SIGBOOST_HUNTGRP_SEQ_DESC;
-                                               break;
-                               case 'r':
-                                               event.hunt_group = SIGBOOST_HUNTGRP_RR_ASC;
-                                               break;
-                               case 'R':
-                                               event.hunt_group = SIGBOOST_HUNTGRP_RR_DESC;
-                                               break;
-                               default:
-                                               ftdm_log(FTDM_LOG_WARNING, "Failed to determine huntgroup (%s)\n", gr);
-                                                                       event.hunt_group = SIGBOOST_HUNTGRP_SEQ_ASC;
-               }
-       }
-
-       ftdm_set_string(event.calling_name, caller_data->cid_name);
-       ftdm_set_string(event.rdnis.digits, caller_data->rdnis.digits);
-       if (strlen(caller_data->rdnis.digits)) {
-                       event.rdnis.digits_count = (uint8_t)strlen(caller_data->rdnis.digits)+1;
-                       event.rdnis.ton = caller_data->rdnis.type;
-                       event.rdnis.npi = caller_data->rdnis.plan;
-       }
-    
-       event.calling.screening_ind = caller_data->screen;
-       event.calling.presentation_ind = caller_data->pres;
-
-       event.calling.ton = caller_data->cid_num.type;
-       event.calling.npi = caller_data->cid_num.plan;
-
-       event.called.ton = caller_data->dnis.type;
-       event.called.npi = caller_data->dnis.plan;
-
-       /* we're making a contract now that FreeTDM values for capability, layer 1 and such will be the same as for boost */
-       event.bearer.capability = caller_data->bearer_capability;
-       event.bearer.uil1p = caller_data->bearer_layer1;
-
-       if (caller_data->raw_data_len) {
-               ftdm_set_string(event.custom_data, caller_data->raw_data);
-               event.custom_data_size = (uint16_t)caller_data->raw_data_len;
-       }
-
-       OUTBOUND_REQUESTS[r].status = BST_WAITING;
-       OUTBOUND_REQUESTS[r].span = span;
-
-       if (sangomabc_connection_write(&sangoma_boost_data->mcon, &event) <= 0) {
-               ftdm_log(FTDM_LOG_CRIT, "Failed to tx boost event [%s]\n", strerror(errno));
-               status = OUTBOUND_REQUESTS[r].status = FTDM_FAIL;
-               if (!sangoma_boost_data->sigmod) {
-                       *ftdmchan = NULL;
-               }
-               goto done;
-       }
-
-       while(ftdm_running() && OUTBOUND_REQUESTS[r].status == BST_WAITING) {
-               ftdm_sleep(1);
-               if (--boost_request_timeout <= 0) {
-                       status = FTDM_FAIL;
-                       if (!sangoma_boost_data->sigmod) {
-                               *ftdmchan = NULL;
-                       }
-                       ftdm_log(FTDM_LOG_CRIT, "Csid:%d Timed out waiting for boost channel request response, current status: BST_WAITING\n", r);
-                       goto done;
-               }
-       }
-
-       if (OUTBOUND_REQUESTS[r].status == BST_READY && OUTBOUND_REQUESTS[r].ftdmchan) {
-               *ftdmchan = OUTBOUND_REQUESTS[r].ftdmchan;
-               status = FTDM_SUCCESS;
-       } else {
-               status = FTDM_FAIL;
-               if (!sangoma_boost_data->sigmod) {
-                       *ftdmchan = NULL;
-               }
-       }
-
- done:
-       
-       st = OUTBOUND_REQUESTS[r].status;
-       OUTBOUND_REQUESTS[r].status = BST_FREE; 
-
-       if (status == FTDM_FAIL) {
-               if (st == BST_FAIL) {
-                       caller_data->hangup_cause = OUTBOUND_REQUESTS[r].hangup_cause;
-               } else {
-                       caller_data->hangup_cause = FTDM_CAUSE_RECOVERY_ON_TIMER_EXPIRE;
-               }
-       }
-       
-       if (st == BST_FAIL) {
-               release_request_id(r);
-       } else if (st != BST_READY) {
-               ftdm_assert_return(r <= MAX_REQ_ID, FTDM_FAIL, "Invalid index\n");
-               nack_map[r] = 1;
-               if (sangoma_boost_data->sigmod) {
-                       sangomabc_exec_command(&sangoma_boost_data->mcon,
-                                                               BOOST_SPAN((*ftdmchan)),
-                                                               BOOST_CHAN((*ftdmchan)),
-                                                               r,
-                                                               SIGBOOST_EVENT_CALL_START_NACK,
-                                                               0, 0);
-               } else {
-                       sangomabc_exec_command(&sangoma_boost_data->mcon,
-                                                               0,
-                                                               0,
-                                                               r,
-                                                               SIGBOOST_EVENT_CALL_START_NACK,
-                                                               0, 0);
-               }
-       }
-
-       return status;
-}
-
-/**
- * \brief Starts an sangoma boost channel (outgoing call)
- * \param ftdmchan Channel to initiate call on
- * \return Success
- */
-static FIO_CHANNEL_OUTGOING_CALL_FUNCTION(sangoma_boost_outgoing_call)
-{
-       ftdm_sangoma_boost_data_t *sangoma_boost_data = ftdmchan->span->signal_data;
-
-       if (!sangoma_boost_data->sigmod) {
-               return FTDM_SUCCESS;
-       }
-
-       ftdm_set_flag(ftdmchan, FTDM_CHANNEL_OUTBOUND);
-
-       ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_DIALING);
-
-       return FTDM_SUCCESS;
-}
-
-/**
- * \brief Handler for call start ack no media event
- * \param mcon sangoma boost connection
- * \param event Event to handle
- */
-static void handle_call_progress(ftdm_span_t *span, sangomabc_connection_t *mcon, sangomabc_short_event_t *event)
-{
-       ftdm_channel_t *ftdmchan;
-
-
-       if ((ftdmchan = find_ftdmchan(span, event, 1))) {
-               ftdm_sangoma_boost_data_t *sangoma_boost_data = ftdmchan->span->signal_data;
-               ftdm_mutex_lock(ftdmchan->mutex);
-               if (!sangoma_boost_data->sigmod && ftdmchan->state == FTDM_CHANNEL_STATE_HOLD) {
-                       if ((event->flags & SIGBOOST_PROGRESS_MEDIA)) {
-                               ftdmchan->init_state = FTDM_CHANNEL_STATE_PROGRESS_MEDIA;
-                               ftdm_log(FTDM_LOG_DEBUG, "Channel init state updated to PROGRESS_MEDIA [Csid:%d]\n", event->call_setup_id);
-                       } else if ((event->flags & SIGBOOST_PROGRESS_RING)) {
-                               ftdmchan->init_state = FTDM_CHANNEL_STATE_PROGRESS;
-                               ftdm_log(FTDM_LOG_DEBUG, "Channel init state updated to PROGRESS [Csid:%d]\n", event->call_setup_id);
-                       } else {
-                               ftdmchan->init_state = FTDM_CHANNEL_STATE_IDLE;
-                               ftdm_log(FTDM_LOG_DEBUG, "Channel init state updated to IDLE [Csid:%d]\n", event->call_setup_id);
-                       }                       
-               } else {
-                       if ((event->flags & SIGBOOST_PROGRESS_MEDIA)) {
-                               ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_PROGRESS_MEDIA);
-                       } else if ((event->flags & SIGBOOST_PROGRESS_RING)) {
-                               ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_PROGRESS);
-                       } else {
-                               ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_IDLE);
-                       }
-               }
-               ftdm_mutex_unlock(ftdmchan->mutex);
-       }
-}
-
-/**
- * \brief Handler for call start ack event
- * \param mcon sangoma boost connection
- * \param event Event to handle
- */
-static void handle_call_start_ack(sangomabc_connection_t *mcon, sangomabc_short_event_t *event)
-{
-       
-       ftdm_channel_t *ftdmchan = NULL;
-       uint32_t event_span = BOOST_EVENT_SPAN(mcon->sigmod, event);
-       uint32_t event_chan = BOOST_EVENT_CHAN(mcon->sigmod, event);
-
-       
-       if (nack_map[event->call_setup_id]) {
-               /* In this scenario outgoing call was alrady stopped
-                  via NACK and now we are expecting an NACK_ACK.
-              If we receive an ACK its a race condition thus
-                  ignor it */
-               return;
-       }
-
-       if (mcon->sigmod) {
-               ftdmchan = OUTBOUND_REQUESTS[event->call_setup_id].ftdmchan;
-       } else {
-               ftdmchan = find_ftdmchan(OUTBOUND_REQUESTS[event->call_setup_id].span, event, 0);
-       }
-
-
-       if (ftdmchan) {
-               ftdm_sangoma_boost_data_t *sangoma_boost_data = ftdmchan->span->signal_data;
-               if (!mcon->sigmod && ftdm_channel_open_chan(ftdmchan) != FTDM_SUCCESS) {
-                       ftdm_log(FTDM_LOG_ERROR, "Failed to open FTDM channel [%s]\n", ftdmchan->last_error);
-               } else {
-
-                       /* Only bind the setup id to GRID when we are sure that channel is ready
-                          otherwise we could overwite the original call */
-                       OUTBOUND_REQUESTS[event->call_setup_id].event = *event;
-                       SETUP_GRID[event_span][event_chan] = event->call_setup_id;
-
-                       ftdm_set_flag(ftdmchan, FTDM_CHANNEL_OUTBOUND);
-                       ftdm_set_flag_locked(ftdmchan, FTDM_CHANNEL_INUSE);
-                       ftdmchan->sflags = SFLAG_RECVD_ACK;
-
-                       if ((event->flags & SIGBOOST_PROGRESS_MEDIA)) {
-                               if (sangoma_boost_data->sigmod) {
-                                       ftdm_log(FTDM_LOG_DEBUG, "Channel state changing to PROGRESS_MEDIA [Csid:%d]\n", event->call_setup_id);
-                                       ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_PROGRESS_MEDIA);
-                               } else {
-                                       ftdmchan->init_state = FTDM_CHANNEL_STATE_PROGRESS_MEDIA;
-                                       ftdm_log(FTDM_LOG_DEBUG, "Channel init state changed to PROGRESS_MEDIA [Csid:%d]\n", event->call_setup_id);
-                               }
-                       } else if ((event->flags & SIGBOOST_PROGRESS_RING)) {
-                               if (sangoma_boost_data->sigmod) {
-                                       ftdm_log(FTDM_LOG_DEBUG, "Channel state changing to PROGRESS [Csid:%d]\n", event->call_setup_id);
-                                       ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_PROGRESS);
-                               } else {
-                                       ftdmchan->init_state = FTDM_CHANNEL_STATE_PROGRESS;
-                                       ftdm_log(FTDM_LOG_DEBUG, "Channel init state changed to PROGRESS [Csid:%d]\n", event->call_setup_id);
-                               }
-                       } else {
-                               if (sangoma_boost_data->sigmod) {
-                                       /* should we set a state here? */
-                               } else {
-                                       ftdmchan->init_state = FTDM_CHANNEL_STATE_IDLE;
-                                       ftdm_log(FTDM_LOG_DEBUG, "Channel init state changed to IDLE [Csid:%d]\n", event->call_setup_id);
-                               }
-                       }
-                       if (!sangoma_boost_data->sigmod) {
-                               ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_HOLD);
-                               ftdm_log(FTDM_LOG_DEBUG, "Assigned chan %d:%d (%d:%d) to CSid=%d\n", 
-                                               ftdmchan->span_id, ftdmchan->chan_id, event_span, event_chan, event->call_setup_id);
-                               OUTBOUND_REQUESTS[event->call_setup_id].ftdmchan = ftdmchan;
-                       }
-                       OUTBOUND_REQUESTS[event->call_setup_id].flags = event->flags;
-                       OUTBOUND_REQUESTS[event->call_setup_id].status = BST_READY;
-                       return;
-               }
-
-       } else {
-
-               ftdm_assert(!mcon->sigmod, "CALL STOP ACK: Invalid Sigmod Path");
-               if ((ftdmchan = find_ftdmchan(OUTBOUND_REQUESTS[event->call_setup_id].span, (sangomabc_short_event_t*)event, 1))) {
-                               int r;
-                               /* NC: If we get CALL START ACK and channel is in active state
-                                               then we are completely out of sync with the other end.
-                                               Treat CALL START ACK as CALL STOP and hangup the current call.
-                               */
-
-                               if (ftdmchan->state == FTDM_CHANNEL_STATE_UP ||
-                                       ftdmchan->state == FTDM_CHANNEL_STATE_PROGRESS_MEDIA ||
-                                       ftdmchan->state == FTDM_CHANNEL_STATE_PROGRESS) {
-                                       ftdm_log(FTDM_LOG_CRIT, "FTDMCHAN CALL ACK STATE UP -> Changed to TERMINATING %d:%d\n", event_span, event_chan);
-                                       ftdm_set_state_r(ftdmchan, FTDM_CHANNEL_STATE_TERMINATING, r);
-                               } else if (ftdmchan->state == FTDM_CHANNEL_STATE_HANGUP ||  ftdm_test_sflag(ftdmchan, SFLAG_HANGUP)) {
-                                       ftdm_log(FTDM_LOG_CRIT, "FTDMCHAN CALL ACK STATE HANGUP  -> Changed to HANGUP COMPLETE %d:%d\n", event_span, event_chan);
-                                       ftdm_set_state_r(ftdmchan, FTDM_CHANNEL_STATE_HANGUP_COMPLETE, r);
-                               } else {
-                                       ftdm_log(FTDM_LOG_CRIT, "FTDMCHAN STATE INVALID State %s on IN CALL ACK %d:%d\n",
-                                                ftdm_channel_state2str(ftdmchan->state), event_span, event_chan);
-                               }
-                               ftdm_set_sflag(ftdmchan, SFLAG_SENT_FINAL_MSG);
-                               ftdmchan=NULL;
-               }
-       }
-
-
-       if (!ftdmchan) {
-               ftdm_log(FTDM_LOG_CRIT, "START ACK CANT FIND A CHAN %d:%d\n", event_span, event_chan);
-       } else {
-               /* only reason to be here is failed to open channel when we we're in sigmod  */
-               ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_TERMINATING);
-               ftdm_set_sflag(ftdmchan, SFLAG_SENT_FINAL_MSG);
-       }
-       
-       sangomabc_exec_command(mcon,
-                                          event->span,
-                                          event->chan,
-                                          event->call_setup_id,
-                                          SIGBOOST_EVENT_CALL_STOPPED,
-                                          FTDM_CAUSE_DESTINATION_OUT_OF_ORDER, 0);
-       OUTBOUND_REQUESTS[event->call_setup_id].status = BST_FAIL;
-       OUTBOUND_REQUESTS[event->call_setup_id].hangup_cause = FTDM_CAUSE_DESTINATION_OUT_OF_ORDER;
-}
-
-/**
- * \brief Handler for call done event
- * \param span Span where event was fired
- * \param mcon sangoma boost connection
- * \param event Event to handle
- */
-static void handle_call_done(ftdm_span_t *span, sangomabc_connection_t *mcon, sangomabc_short_event_t *event)
-{
-       ftdm_channel_t *ftdmchan;
-       int r = 0;
-
-       if ((ftdmchan = find_ftdmchan(span, event, 1))) {
-               ftdm_sangoma_boost_data_t *sangoma_boost_data = ftdmchan->span->signal_data;
-               ftdm_mutex_lock(ftdmchan->mutex);
-
-               if (sangoma_boost_data->sigmod) {
-                       /* not really completely done, but if we ever get an incoming call before moving to HANGUP_COMPLETE
-                        * handle_incoming_call() will take care of moving the state machine to release the channel */
-                       sangomabc_exec_command(&sangoma_boost_data->mcon,
-                                                               BOOST_SPAN(ftdmchan),
-                                                               BOOST_CHAN(ftdmchan),
-                                                               0,
-                                                               SIGBOOST_EVENT_CALL_RELEASED,
-                                                               0, 0);
-               }
-
-               if (ftdmchan->state == FTDM_CHANNEL_STATE_DOWN || ftdmchan->state == FTDM_CHANNEL_STATE_HANGUP_COMPLETE || ftdm_test_sflag(ftdmchan, SFLAG_TERMINATING)) {
-                       goto done;
-               }
-
-               ftdm_set_state_r(ftdmchan, FTDM_CHANNEL_STATE_HANGUP_COMPLETE, r);
-               if (r) {
-                       ftdm_mutex_unlock(ftdmchan->mutex);
-                       return;
-               }
-       } 
-
- done:
-       
-       if (ftdmchan) {
-               ftdm_mutex_unlock(ftdmchan->mutex);
-       }
-
-       if (event->call_setup_id) {
-               release_request_id(event->call_setup_id);
-       } else {
-               release_request_id_span_chan(BOOST_EVENT_SPAN(mcon->sigmod, event), BOOST_EVENT_CHAN(mcon->sigmod, event));
-       }
-}
-
-
-/**
- * \brief Handler for call start nack event
- * \param span Span where event was fired
- * \param mcon sangoma boost connection
- * \param event Event to handle
- */
-static void handle_call_start_nack(ftdm_span_t *span, sangomabc_connection_t *mcon, sangomabc_short_event_t *event)
-{
-       ftdm_channel_t *ftdmchan;
-       ftdm_sangoma_boost_data_t *sangoma_boost_data = span->signal_data;
-
-       if (event->release_cause == SIGBOOST_CALL_SETUP_NACK_ALL_CKTS_BUSY) {
-               uint32_t count = 0;
-               int delay = 0;
-               int tg=event->trunk_group;
-
-               ftdm_span_channel_use_count(span, &count);
-
-               delay = (int) (count / 100) * 2;
-               
-               if (delay > 10) {
-                       delay = 10;
-               } else if (delay < 1) {
-                       delay = 1;
-               }
-
-               if (tg < 0 || tg >= MAX_TRUNK_GROUPS) {
-                       ftdm_log(FTDM_LOG_CRIT, "Invalid All Ckt Busy trunk group number %i\n", tg);
-                       tg=0;
-               }
-               
-               congestion_timeouts[tg] = time(NULL) + delay;
-               event->release_cause = 17;
-
-       } else if (event->release_cause == SIGBOOST_CALL_SETUP_CSUPID_DBL_USE) {
-               event->release_cause = 17;
-       }
-
-       if (event->call_setup_id) {
-               if (sangoma_boost_data->sigmod) {
-                       ftdmchan = OUTBOUND_REQUESTS[event->call_setup_id].ftdmchan;
-                       CALL_DATA(ftdmchan)->last_event_id = event->event_id;
-                       CALL_DATA(ftdmchan)->call_setup_id = event->call_setup_id;
-                       ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_TERMINATING);
-                       ftdm_clear_sflag_locked(ftdmchan, SFLAG_SENT_FINAL_MSG);
-               } else {
-                       sangomabc_exec_command(mcon,
-                                                  0,
-                                                  0,
-                                                  event->call_setup_id,
-                                                  SIGBOOST_EVENT_CALL_START_NACK_ACK,
-                                                  0, 0);
-                       OUTBOUND_REQUESTS[event->call_setup_id].event = *event;
-                       OUTBOUND_REQUESTS[event->call_setup_id].status = BST_FAIL;
-                       OUTBOUND_REQUESTS[event->call_setup_id].hangup_cause = event->release_cause;
-                       ftdm_log(FTDM_LOG_DEBUG, "setting outbound request status %d to BST_FAIL\n", event->call_setup_id);
-               }
-               return;
-       } else {
-               if ((ftdmchan = find_ftdmchan(span, event, 1))) {
-                       int r = 0;
-
-                       /* if there is no call setup id this should not be an outbound channel for sure */
-                       ftdm_assert(!ftdm_test_flag(ftdmchan, FTDM_CHANNEL_OUTBOUND), "Yay, outbound flag should not be set here!\n");
-
-                       CALL_DATA(ftdmchan)->last_event_id = event->event_id;
-                       ftdm_mutex_lock(ftdmchan->mutex);
-                       ftdm_set_state_r(ftdmchan, FTDM_CHANNEL_STATE_TERMINATING, r);
-                       if (r == FTDM_SUCCESS) {
-                               ftdmchan->caller_data.hangup_cause = event->release_cause;
-                       }
-                       ftdm_mutex_unlock(ftdmchan->mutex);
-                       if (r) {
-                               return;
-                       }
-               } 
-       }
-
-       if (ftdmchan) {
-               ftdm_set_sflag_locked(ftdmchan, SFLAG_SENT_FINAL_MSG);
-       }
-
-       /* nobody else will do it so we have to do it ourselves */
-       sangomabc_exec_command(mcon,
-                                          event->span,
-                                          event->chan,
-                                          event->call_setup_id,
-                                          SIGBOOST_EVENT_CALL_START_NACK_ACK,
-                                          0, 0);
-}
-
-static void handle_call_released(ftdm_span_t *span, sangomabc_connection_t *mcon, sangomabc_short_event_t *event)
-{
-       ftdm_channel_t *ftdmchan;
-       
-       if ((ftdmchan = find_ftdmchan(span, event, 1))) {
-               ftdm_log(FTDM_LOG_DEBUG, "Releasing completely chan s%dc%d\n", BOOST_EVENT_SPAN(mcon->sigmod, event), 
-                               BOOST_EVENT_CHAN(mcon->sigmod, event));
-               ftdm_channel_close(&ftdmchan);
-       } else {
-               ftdm_log(FTDM_LOG_CRIT, "Odd, We could not find chan: s%dc%d to release the call completely!!\n", 
-                               BOOST_EVENT_SPAN(mcon->sigmod, event), BOOST_EVENT_CHAN(mcon->sigmod, event));
-       }
-}
-
-/**
- * \brief Handler for call stop event
- * \param span Span where event was fired
- * \param mcon sangoma boost connection
- * \param event Event to handle
- */
-static void handle_call_stop(ftdm_span_t *span, sangomabc_connection_t *mcon, sangomabc_short_event_t *event)
-{
-       ftdm_channel_t *ftdmchan;
-       
-       if ((ftdmchan = find_ftdmchan(span, event, 1))) {
-               int r = 0;
-
-               ftdm_mutex_lock(ftdmchan->mutex);
-               
-               if (ftdm_test_sflag(ftdmchan, SFLAG_HANGUP) ||
-                       ftdmchan->state == FTDM_CHANNEL_STATE_DOWN ||
-                       ftdmchan->state == FTDM_CHANNEL_STATE_TERMINATING) {
-
-                       /* NC: Checking for state DOWN because ss7box can
-                               send CALL_STOP twice in a row.  If we do not check for
-                               STATE_DOWN we will set the state back to termnating
-                               and block the channel forever
-                       */
-
-                       /* racing condition where both sides initiated a hangup 
-                        * Do not change current state as channel is already clearing
-                        * itself through local initiated hangup */
-                       
-                       sangomabc_exec_command(mcon,
-                                               BOOST_SPAN(ftdmchan),
-                                               BOOST_CHAN(ftdmchan),
-                                               0,
-                                               SIGBOOST_EVENT_CALL_STOPPED_ACK,
-                                               0, 0);
-                       ftdm_mutex_unlock(ftdmchan->mutex);
-                       return;
-               } else if (ftdmchan->state == FTDM_CHANNEL_STATE_HOLD) {
-                       ftdmchan->init_state = FTDM_CHANNEL_STATE_TERMINATING;
-                       ftdm_log(FTDM_LOG_DEBUG, "Channel init state updated to TERMINATING [Csid:%d]\n", event->call_setup_id);
-                       OUTBOUND_REQUESTS[event->call_setup_id].hangup_cause = event->release_cause;
-                       ftdmchan->caller_data.hangup_cause = event->release_cause;
-                       ftdm_mutex_unlock(ftdmchan->mutex);
-                       return;
-               } else {
-                       ftdm_set_state_r(ftdmchan, FTDM_CHANNEL_STATE_TERMINATING, r);
-               }
-
-               if (r == FTDM_SUCCESS) {
-                       ftdmchan->caller_data.hangup_cause = event->release_cause;
-               }
-
-               ftdm_mutex_unlock(ftdmchan->mutex);
-
-               if (r) {
-                       return;
-               }
-       } else { /* we have to do it ourselves.... */
-               ftdm_log(FTDM_LOG_CRIT, "Odd, We could not find chan: s%dc%d\n", 
-                               BOOST_EVENT_SPAN(mcon->sigmod, event), BOOST_EVENT_CHAN(mcon->sigmod, event));
-               release_request_id_span_chan(BOOST_EVENT_SPAN(mcon->sigmod, event), BOOST_EVENT_CHAN(mcon->sigmod, event));
-       }
-}
-
-/**
- * \brief Handler for call answer event
- * \param span Span where event was fired
- * \param mcon sangoma boost connection
- * \param event Event to handle
- */
-static void handle_call_answer(ftdm_span_t *span, sangomabc_connection_t *mcon, sangomabc_short_event_t *event)
-{
-       ftdm_channel_t *ftdmchan;
-       
-       if ((ftdmchan = find_ftdmchan(span, event, 1))) {
-               ftdm_mutex_lock(ftdmchan->mutex);
-
-               if (ftdm_test_sflag(ftdmchan, SFLAG_HANGUP) ||
-                       ftdmchan->state == FTDM_CHANNEL_STATE_DOWN ||
-                       ftdmchan->state == FTDM_CHANNEL_STATE_TERMINATING) {
-
-                       /* NC: Do nothing here because we are in process
-                               of stopping the call. So ignore the ANSWER. */
-                       ftdm_log(FTDM_LOG_DEBUG, "Got answer but call is already hangup %d:%d\n", BOOST_EVENT_SPAN(mcon->sigmod, event), 
-                                       BOOST_EVENT_CHAN(mcon->sigmod, event));
-
-               } else if (ftdmchan->state == FTDM_CHANNEL_STATE_HOLD) {
-                       ftdmchan->init_state = FTDM_CHANNEL_STATE_UP;
-
-               } else {
-                       int r = 0;
-                       ftdm_set_state_r(ftdmchan, FTDM_CHANNEL_STATE_UP, r);
-               }
-               ftdm_mutex_unlock(ftdmchan->mutex);
-       } else {
-               ftdm_log(FTDM_LOG_CRIT, "Could not find channel %d:%d on answer message!\n", BOOST_EVENT_SPAN(mcon->sigmod, event), BOOST_EVENT_CHAN(mcon->sigmod, event));
-               sangomabc_exec_command(mcon,
-                                  event->span,
-                                  event->chan,
-                                  event->call_setup_id,
-                                  SIGBOOST_EVENT_CALL_STOPPED,
-                                  FTDM_CAUSE_DESTINATION_OUT_OF_ORDER, 0);
-       }
-}
-
-static __inline__ void stop_loop(ftdm_channel_t *ftdmchan);
-
-/**
- * \brief Handler for call start event
- * \param span Span where event was fired
- * \param mcon sangoma boost connection
- * \param event Event to handle
- */
-static void handle_call_start(ftdm_span_t *span, sangomabc_connection_t *mcon, sangomabc_event_t *event)
-{
-       ftdm_channel_t *ftdmchan = NULL;
-       int hangup_cause = FTDM_CAUSE_CALL_REJECTED;
-       int retry = 1;
-
-tryagain:
-
-       if (!(ftdmchan = find_ftdmchan(span, (sangomabc_short_event_t*)event, 0))) {
-               if ((ftdmchan = find_ftdmchan(span, (sangomabc_short_event_t*)event, 1))) {
-                       int r;
-
-                        /* NC: If we get CALL START and channel is in active state
-                               then we are completely out of sync with the other end.
-                                   Treat CALL START as CALL STOP and hangup the current call.
-                                       The incoming call will also be NACKed.
-                         */
-
-                       if (ftdmchan->state == FTDM_CHANNEL_STATE_UP ||
-                               ftdmchan->state == FTDM_CHANNEL_STATE_PROGRESS_MEDIA ||
-                               ftdmchan->state == FTDM_CHANNEL_STATE_PROGRESS) {
-                               ftdm_log(FTDM_LOG_CRIT, "s%dc%d: FTDMCHAN STATE UP -> Changed to TERMINATING\n", 
-                                               BOOST_EVENT_SPAN(mcon->sigmod, event), BOOST_EVENT_CHAN(mcon->sigmod, event));
-                               ftdm_set_state_r(ftdmchan, FTDM_CHANNEL_STATE_TERMINATING, r);
-                       } else if (ftdmchan->state == FTDM_CHANNEL_STATE_HANGUP ||  ftdm_test_sflag(ftdmchan, SFLAG_HANGUP)) {
-                               ftdm_log(FTDM_LOG_CRIT, "s%dc%d: FTDMCHAN STATE HANGUP -> Changed to HANGUP COMPLETE\n", 
-                                               BOOST_EVENT_SPAN(mcon->sigmod, event), BOOST_EVENT_CHAN(mcon->sigmod, event));
-                               ftdm_set_state_r(ftdmchan, FTDM_CHANNEL_STATE_HANGUP_COMPLETE, r);
-                       } else if (ftdmchan->state == FTDM_CHANNEL_STATE_DIALING) {
-                               ftdm_log(FTDM_LOG_WARNING, "s%dc%d: Collision, hanging up incoming call\n", 
-                                               BOOST_EVENT_SPAN(mcon->sigmod, event), BOOST_EVENT_CHAN(mcon->sigmod, event));
-                               /* dont hangup the outgoing call, the other side will send a call start nack too
-                                * and there we will move to terminating. If we move to terminating here. We used to move
-                                * to terminating here, but that introduces a problem in handle_call_start_nack where
-                                * when receiving call start nack we move the channel from DOWN to TERMINATING ( cuz we already
-                                * hangup here ) and the channel gets stuck in terminating forever. So at this point we're trusting
-                                * the other side to send the call start nack ( or proceed with the call )
-                                * ftdm_set_state_r(ftdmchan, FTDM_CHANNEL_STATE_TERMINATING, r);
-                                */
-                       } else if (ftdmchan->state == FTDM_CHANNEL_STATE_IN_LOOP && retry) {
-                               retry = 0;
-                               stop_loop(ftdmchan);
-                               ftdm_channel_advance_states(ftdmchan);
-                               goto tryagain;
-                       } else {
-                               ftdm_log(FTDM_LOG_ERROR, "s%dc%d: rejecting incoming call in channel state %s\n", 
-                                               BOOST_EVENT_SPAN(mcon->sigmod, event), BOOST_EVENT_CHAN(mcon->sigmod, event), 
-                                               ftdm_channel_state2str(ftdmchan->state));
-                       }
-                       ftdm_set_sflag(ftdmchan, SFLAG_SENT_FINAL_MSG);
-                       ftdmchan = NULL;
-               } else {
-                       ftdm_log(FTDM_LOG_CRIT, "s%dc%d: incoming call in invalid channel (channel not found)!\n", 
-                                       BOOST_EVENT_SPAN(mcon->sigmod, event), BOOST_EVENT_CHAN(mcon->sigmod, event));
-               }
-               goto error;
-       }
-
-       if (ftdm_channel_open_chan(ftdmchan) != FTDM_SUCCESS) {
-               ftdm_log(FTDM_LOG_ERROR, "s%dc%d: failed to open channel on incoming call, rejecting!\n", 
-                       BOOST_EVENT_SPAN(mcon->sigmod, event), BOOST_EVENT_CHAN(mcon->sigmod, event));
-               goto error;
-       }
-       
-       ftdm_log(FTDM_LOG_DEBUG, "Got call start from s%dc%d mapped to freetdm logical s%dc%d, physical s%dc%d\n", 
-                       event->span, event->chan, 
-                       ftdmchan->span_id, ftdmchan->chan_id,
-                       ftdmchan->physical_span_id, ftdmchan->physical_chan_id);
-
-       ftdmchan->sflags = 0;
-       ftdm_set_string(ftdmchan->caller_data.cid_num.digits, (char *)event->calling.digits);
-       ftdm_set_string(ftdmchan->caller_data.cid_name, (char *)event->calling.digits);
-       ftdm_set_string(ftdmchan->caller_data.ani.digits, (char *)event->calling.digits);
-       ftdm_set_string(ftdmchan->caller_data.dnis.digits, (char *)event->called.digits);
-       ftdm_set_string(ftdmchan->caller_data.rdnis.digits, (char *)event->rdnis.digits);
-       if (event->custom_data_size) {
-               ftdm_set_string(ftdmchan->caller_data.raw_data, event->custom_data);
-               ftdmchan->caller_data.raw_data_len = event->custom_data_size;
-       }
-
-       if (strlen(event->calling_name)) {
-               ftdm_set_string(ftdmchan->caller_data.cid_name, (char *)event->calling_name);
-       }
-
-       ftdmchan->caller_data.cid_num.plan = event->calling.npi;
-       ftdmchan->caller_data.cid_num.type = event->calling.ton;
-
-       ftdmchan->caller_data.ani.plan = event->calling.npi;
-       ftdmchan->caller_data.ani.type = event->calling.ton;
-
-       ftdmchan->caller_data.dnis.plan = event->called.npi;
-       ftdmchan->caller_data.dnis.type = event->called.ton;
-
-       ftdmchan->caller_data.rdnis.plan = event->rdnis.npi;
-       ftdmchan->caller_data.rdnis.type = event->rdnis.ton;
-
-       ftdmchan->caller_data.screen = event->calling.screening_ind;
-       ftdmchan->caller_data.pres = event->calling.presentation_ind;
-
-       ftdmchan->caller_data.bearer_capability = event->bearer.capability;
-       ftdmchan->caller_data.bearer_layer1 = event->bearer.uil1p;
-
-       /* more info about custom data: http://www.ss7box.com/smg_manual.html#ISUP-IN-RDNIS-NEW */
-       if (event->custom_data_size) {
-               char* p = NULL;
-
-               p = strstr((char*)event->custom_data,"PRI001-ANI2-");
-               if (p!=NULL) {
-                       int ani2 = 0;
-                       sscanf(p, "PRI001-ANI2-%d", &ani2);
-                       snprintf(ftdmchan->caller_data.aniII, 5, "%.2d", ani2);
-               }       
-       }
-
-       ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_RING);
-       return;
-
- error:
-       hangup_cause = ftdmchan ? ftdmchan->caller_data.hangup_cause : FTDM_CAUSE_REQUESTED_CHAN_UNAVAIL;
-       sangomabc_exec_command(mcon,
-                                                  event->span,
-                                                  event->chan,
-                                                  event->call_setup_id,
-                                                  SIGBOOST_EVENT_CALL_START_NACK,
-                                                  hangup_cause, 0);
-               
-}
-
-static void handle_call_loop_start(ftdm_span_t *span, sangomabc_connection_t *mcon, sangomabc_short_event_t *event)
-{
-       ftdm_status_t res = FTDM_FAIL;
-       ftdm_channel_t *ftdmchan;
-
-       if (!(ftdmchan = find_ftdmchan(span, (sangomabc_short_event_t*)event, 0))) {
-               ftdm_log(FTDM_LOG_CRIT, "CANNOT START LOOP, CHAN NOT AVAILABLE %d:%d\n", BOOST_EVENT_SPAN(mcon->sigmod, event), BOOST_EVENT_CHAN(mcon->sigmod, event));
-               return;
-       }
-
-       if (ftdm_channel_open_chan(ftdmchan) != FTDM_SUCCESS) {
-               ftdm_log(FTDM_LOG_CRIT, "CANNOT START LOOP, CANT OPEN CHAN %d:%d\n", BOOST_EVENT_SPAN(mcon->sigmod, event), BOOST_EVENT_CHAN(mcon->sigmod, event));
-               return;
-       }
-
-       ftdm_set_state_r(ftdmchan, FTDM_CHANNEL_STATE_IN_LOOP, res);
-       if (res != FTDM_SUCCESS) {
-               ftdm_channel_t *toclose = ftdmchan;
-               ftdm_log(FTDM_LOG_CRIT, "yay, could not set the state of the channel to IN_LOOP, loop will fail\n");
-               ftdm_channel_close(&toclose);
-               return;
-       }
-       ftdm_log(FTDM_LOG_DEBUG, "%d:%d starting loop\n", ftdmchan->span_id, ftdmchan->chan_id);
-       ftdm_channel_command(ftdmchan, FTDM_COMMAND_ENABLE_LOOP, NULL);
-}
-
-static __inline__ void stop_loop(ftdm_channel_t *ftdmchan)
-{
-       ftdm_status_t res = FTDM_FAIL;
-       ftdm_channel_command(ftdmchan, FTDM_COMMAND_DISABLE_LOOP, NULL);
-       /* even when we did not sent a msg we set this flag to avoid sending call stop in the DOWN state handler */
-       ftdm_set_flag(ftdmchan, SFLAG_SENT_FINAL_MSG);
-       ftdm_set_state_r(ftdmchan, FTDM_CHANNEL_STATE_DOWN, res);
-       if (res != FTDM_SUCCESS) {
-               ftdm_log_chan_msg(ftdmchan, FTDM_LOG_CRIT, "yay, could not set the state of the channel from IN_LOOP to DOWN\n");
-       }
-}
-
-static void handle_call_loop_stop(ftdm_span_t *span, sangomabc_connection_t *mcon, sangomabc_short_event_t *event)
-{
-       ftdm_channel_t *ftdmchan;
-       if (!(ftdmchan = find_ftdmchan(span, (sangomabc_short_event_t*)event, 1))) {
-               ftdm_log(FTDM_LOG_CRIT, "CANNOT STOP LOOP, INVALID CHAN REQUESTED %d:%d\n", BOOST_EVENT_SPAN(mcon->sigmod, event), BOOST_EVENT_CHAN(mcon->sigmod, event));
-               return;
-       }
-       if (ftdmchan->state != FTDM_CHANNEL_STATE_IN_LOOP) {
-               ftdm_log(FTDM_LOG_WARNING, "Got stop loop request in a channel that is not in loop, ignoring ...\n");
-               return;
-       }
-       stop_loop(ftdmchan);
-}
-
-/**
- * \brief Handler for heartbeat event
- * \param mcon sangoma boost connection
- * \param event Event to handle
- */
-static void handle_heartbeat(sangomabc_connection_t *mcon, sangomabc_short_event_t *event)
-{
-       int err;
-       
-       err = sangomabc_connection_writep(mcon, (sangomabc_event_t*)event);
-       
-       if (err <= 0) {
-               ftdm_log(FTDM_LOG_CRIT, "Failed to tx on boost connection [%s]: %s\n", strerror(errno));
-       }
-    return;
-}
-
-/**
- * \brief Handler for restart ack event
- * \param mcon sangoma boost connection
- * \param span Span where event was fired
- * \param event Event to handle
- */
-static void handle_restart_ack(sangomabc_connection_t *mcon, ftdm_span_t *span, sangomabc_short_event_t *event)
-{
-       ftdm_log(FTDM_LOG_DEBUG, "RECV RESTART ACK\n");
-}
-
-/**
- * \brief Handler for restart event
- * \param mcon sangoma boost connection
- * \param span Span where event was fired
- * \param event Event to handle
- */
-static void handle_restart(sangomabc_connection_t *mcon, ftdm_span_t *span, sangomabc_short_event_t *event)
-{
-       ftdm_sangoma_boost_data_t *sangoma_boost_data = span->signal_data;
-
-    mcon->rxseq_reset = 0;
-       ftdm_set_flag((&sangoma_boost_data->mcon), MSU_FLAG_DOWN);
-       ftdm_set_flag_locked(span, FTDM_SPAN_SUSPENDED);
-       ftdm_set_flag(sangoma_boost_data, FTDM_SANGOMA_BOOST_RESTARTING);
-       
-}
-
-/**
- * \brief Handler for incoming digit event
- * \param mcon sangoma boost connection
- * \param span Span where event was fired
- * \param event Event to handle
- */
-static void handle_incoming_digit(sangomabc_connection_t *mcon, ftdm_span_t *span, sangomabc_event_t *event)
-{
-       ftdm_channel_t *ftdmchan = NULL;
-       char digits[MAX_DIALED_DIGITS + 2] = "";
-       
-       if (!(ftdmchan = find_ftdmchan(span, (sangomabc_short_event_t *)event, 1))) {
-               ftdm_log(FTDM_LOG_ERROR, "Invalid channel\n");
-               return;
-       }
-       
-       if (event->called_number_digits_count == 0) {
-               ftdm_log(FTDM_LOG_WARNING, "Error Incoming digit with len %s %d [w%dg%d]\n",
-                               event->called_number_digits,
-                               event->called_number_digits_count,
-                               BOOST_EVENT_SPAN(mcon->sigmod, event), BOOST_EVENT_CHAN(mcon->sigmod, event));
-               return;
-       }
-
-       ftdm_log(FTDM_LOG_WARNING, "Incoming digit with len %s %d [w%dg%d]\n",
-                                       event->called_number_digits,
-                                       event->called_number_digits_count,
-                                       BOOST_EVENT_SPAN(mcon->sigmod, event), BOOST_EVENT_CHAN(mcon->sigmod, event));
-
-       memcpy(digits, event->called_number_digits, event->called_number_digits_count);
-       ftdm_channel_queue_dtmf(ftdmchan, digits);
-
-       return;
-}
-
-
-/**
- * \brief Checks if span has state changes pending and processes 
- * \param span Span where event was fired
- * \param event Event to handle
- * \return The locked FTDM channel associated to the event if any, NULL otherwise
- */
-static ftdm_channel_t* event_process_states(ftdm_span_t *span, sangomabc_short_event_t *event) 
-{
-    ftdm_channel_t *ftdmchan = NULL;
-               ftdm_sangoma_boost_data_t *signal_data = span->signal_data;
-    
-    switch (event->event_id) {
-        case SIGBOOST_EVENT_CALL_START_NACK:
-        case SIGBOOST_EVENT_CALL_START_NACK_ACK:
-            if (event->call_setup_id && !signal_data->sigmod) {
-                return NULL;
-            } 
-            //if event->span and event->chan is valid, fall-through
-        case SIGBOOST_EVENT_CALL_START:
-        case SIGBOOST_EVENT_CALL_START_ACK:
-        case SIGBOOST_EVENT_CALL_STOPPED:
-        case SIGBOOST_EVENT_CALL_PROGRESS:
-        case SIGBOOST_EVENT_CALL_ANSWERED:
-        case SIGBOOST_EVENT_CALL_STOPPED_ACK:
-        case SIGBOOST_EVENT_DIGIT_IN:
-        case SIGBOOST_EVENT_INSERT_CHECK_LOOP:
-        case SIGBOOST_EVENT_REMOVE_CHECK_LOOP:
-        case SIGBOOST_EVENT_CALL_RELEASED:
-            if (!(ftdmchan = find_ftdmchan(span, (sangomabc_short_event_t*)event, 1))) {
-                ftdm_log(FTDM_LOG_CRIT, "could not find channel %d:%d to process pending state changes!\n",
-                                                                       BOOST_EVENT_SPAN(signal_data->sigmod, event),
-                                                                       BOOST_EVENT_CHAN(signal_data->sigmod, event));
-                return NULL;
-            }
-            break;
-        case SIGBOOST_EVENT_HEARTBEAT:
-        case SIGBOOST_EVENT_SYSTEM_RESTART_ACK:
-        case SIGBOOST_EVENT_SYSTEM_RESTART:
-        case SIGBOOST_EVENT_AUTO_CALL_GAP_ABATE:
-            return NULL;
-        default:
-            ftdm_log(FTDM_LOG_CRIT, "Unhandled event id: %d\n", event->event_id);
-            return NULL;
-    }
-
-    ftdm_mutex_lock(ftdmchan->mutex);
-    ftdm_channel_advance_states(ftdmchan);
-    return ftdmchan;
-}
-
-/**
- * \brief Handler for sangoma boost event
- * \param span Span where event was fired
- * \param mcon sangoma boost connection
- * \param event Event to handle
- */
-static int parse_sangoma_event(ftdm_span_t *span, sangomabc_connection_t *mcon, sangomabc_short_event_t *event)
-{
-    ftdm_channel_t* ftdmchan = NULL;
-       
-       if (!ftdm_running()) {
-               ftdm_log(FTDM_LOG_WARNING, "System is shutting down.\n");
-               return -1;
-       }
-
-    ftdm_assert_return(event->call_setup_id <= MAX_REQ_ID, -1, "Unexpected call setup id\n");
-
-       /* process all pending state changes for that channel before
-        * processing the new boost event */
-    ftdmchan = event_process_states(span, event);
-
-    switch(event->event_id) {
-    case SIGBOOST_EVENT_CALL_START:
-               handle_call_start(span, mcon, (sangomabc_event_t*)event);
-               break;
-    case SIGBOOST_EVENT_CALL_STOPPED:
-               handle_call_stop(span, mcon, event);
-               break;
-    case SIGBOOST_EVENT_CALL_RELEASED:
-               handle_call_released(span, mcon, event);
-               break;
-    case SIGBOOST_EVENT_CALL_START_ACK:
-               handle_call_start_ack(mcon, event);
-               break;
-    case SIGBOOST_EVENT_CALL_PROGRESS:
-               handle_call_progress(span, mcon, event);
-               break;
-    case SIGBOOST_EVENT_CALL_START_NACK:
-               handle_call_start_nack(span, mcon, event);
-               break;
-    case SIGBOOST_EVENT_CALL_ANSWERED:
-               handle_call_answer(span, mcon, event);
-               break;
-    case SIGBOOST_EVENT_HEARTBEAT:
-               handle_heartbeat(mcon, event);
-               break;
-    case SIGBOOST_EVENT_CALL_STOPPED_ACK:
-               handle_call_done(span, mcon, event);
-               break;
-    case SIGBOOST_EVENT_CALL_START_NACK_ACK:
-               /* On NACK ack span chan are always invalid
-                  All there is to do is to clear the id */
-               if (event->call_setup_id) {
-                       nack_map[event->call_setup_id] = 0;
-                       release_request_id(event->call_setup_id);
-               } else {
-                       handle_call_done(span, mcon, event);
-               }
-               break;
-    case SIGBOOST_EVENT_INSERT_CHECK_LOOP:
-               handle_call_loop_start(span, mcon, event);
-               break;
-    case SIGBOOST_EVENT_REMOVE_CHECK_LOOP:
-               handle_call_loop_stop(span, mcon, event);
-               break;
-    case SIGBOOST_EVENT_SYSTEM_RESTART_ACK:
-               handle_restart_ack(mcon, span, event);
-               break;
-       case SIGBOOST_EVENT_SYSTEM_RESTART:
-               handle_restart(mcon, span, event);
-               break;
-    case SIGBOOST_EVENT_AUTO_CALL_GAP_ABATE:
-               //handle_gap_abate(event);
-               break;
-       case SIGBOOST_EVENT_DIGIT_IN:
-               handle_incoming_digit(mcon, span, (sangomabc_event_t*)event);
-               break;
-    default:
-               ftdm_log(FTDM_LOG_WARNING, "No handler implemented for [%s]\n", sangomabc_event_id_name(event->event_id));
-               break;
-    }
-
-    if(ftdmchan != NULL) {
-       ftdm_channel_advance_states(ftdmchan);
-        ftdm_mutex_unlock(ftdmchan->mutex);
-    }
-
-    return 0;
-
-}
-
-/**
- * \brief Handler for channel state change
- * \param ftdmchan Channel to handle
- */
-static ftdm_status_t state_advance(ftdm_channel_t *ftdmchan)
-{
-       ftdm_sangoma_boost_data_t *sangoma_boost_data = ftdmchan->span->signal_data;
-       sangomabc_connection_t *mcon = &sangoma_boost_data->mcon;
-       ftdm_sigmsg_t sig;
-       ftdm_status_t status;
-
-
-       ftdm_assert_return(ftdmchan->last_state != ftdmchan->state, FTDM_FAIL, "Channel state already processed\n");
-
-       ftdm_log(FTDM_LOG_DEBUG, "%d:%d PROCESSING STATE [%s]\n", ftdmchan->span_id, ftdmchan->chan_id, ftdm_channel_state2str(ftdmchan->state));
-       
-       memset(&sig, 0, sizeof(sig));
-       sig.chan_id = ftdmchan->chan_id;
-       sig.span_id = ftdmchan->span_id;
-       sig.channel = ftdmchan;
-
-       ftdm_channel_complete_state(ftdmchan);
-
-       switch (ftdmchan->state) {
-       case FTDM_CHANNEL_STATE_DOWN:
-               {
-                       int call_stopped_ack_sent = 0;
-                       ftdm_sangoma_boost_data_t *sangoma_boost_data = ftdmchan->span->signal_data;
-
-                       if (ftdmchan->last_state == FTDM_CHANNEL_STATE_IN_LOOP) {
-                               ftdm_log(FTDM_LOG_DEBUG, "%d:%d terminating loop\n", ftdmchan->span_id, ftdmchan->chan_id);
-                       } else {
-                               release_request_id_span_chan(ftdmchan->physical_span_id, ftdmchan->physical_chan_id);
-
-                               if (!ftdm_test_sflag(ftdmchan, SFLAG_SENT_FINAL_MSG)) {
-                                       ftdm_set_sflag_locked(ftdmchan, SFLAG_SENT_FINAL_MSG);
-
-                                       if (ftdmchan->call_data && CALL_DATA(ftdmchan)->last_event_id == SIGBOOST_EVENT_CALL_START_NACK) {
-                                               sangomabc_exec_command(mcon,
-                                                                               BOOST_SPAN(ftdmchan),
-                                                                               BOOST_CHAN(ftdmchan),
-                                                                               CALL_DATA(ftdmchan)->call_setup_id,
-                                                                               SIGBOOST_EVENT_CALL_START_NACK_ACK,
-                                                                               0, 0);
-                                               
-                                       } else {
-                                               /* we got a call stop msg, time to reply with call stopped ack  */
-                                               sangomabc_exec_command(mcon,
-                                                                               BOOST_SPAN(ftdmchan),
-                                                                               BOOST_CHAN(ftdmchan),
-                                                                               0,
-                                                                               SIGBOOST_EVENT_CALL_STOPPED_ACK,
-                                                                               0, 0);
-                                               call_stopped_ack_sent = 1;
-                                       }
-                               }
-                       }
-
-                       ftdmchan->sflags = 0;
-                       memset(ftdmchan->call_data, 0, sizeof(sangoma_boost_call_t));
-                       if (sangoma_boost_data->sigmod && call_stopped_ack_sent) {
-                               /* we dont want to call ftdm_channel_close just yet until call released is received */
-                               ftdm_log(FTDM_LOG_DEBUG, "Waiting for call release confirmation before declaring chan %d:%d as available \n", 
-                                               ftdmchan->span_id, ftdmchan->chan_id);
-                       } else {
-                               ftdm_channel_t *toclose = ftdmchan;
-                               ftdm_channel_close(&toclose);
-                       }
-               }
-               break;
-       case FTDM_CHANNEL_STATE_PROGRESS_MEDIA:
-               {
-                       if (ftdm_test_flag(ftdmchan, FTDM_CHANNEL_OUTBOUND)) {
-                               sig.event_id = FTDM_SIGEVENT_PROGRESS_MEDIA;
-                               if ((status = ftdm_span_send_signal(ftdmchan->span, &sig) != FTDM_SUCCESS)) {
-                                       ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_HANGUP);
-                               }
-                       } else {
-                               if (!ftdm_test_sflag(ftdmchan, SFLAG_SENT_ACK)) {
-                                       ftdm_set_sflag(ftdmchan, SFLAG_SENT_ACK);
-                                       sangomabc_exec_command(mcon,
-                                                               BOOST_SPAN(ftdmchan),
-                                                               BOOST_CHAN(ftdmchan),
-                                                               0,
-                                                               SIGBOOST_EVENT_CALL_START_ACK,
-                                                               0, 0);
-                               }
-                               sangomabc_exec_command(mcon,
-                                                       BOOST_SPAN(ftdmchan),
-                                                       BOOST_CHAN(ftdmchan),
-                                                       0,
-                                                       SIGBOOST_EVENT_CALL_PROGRESS,
-                                                       0, SIGBOOST_PROGRESS_MEDIA);
-                       }
-               }
-               break;
-       case FTDM_CHANNEL_STATE_PROGRESS:
-               {
-                       if (ftdm_test_flag(ftdmchan, FTDM_CHANNEL_OUTBOUND)) {
-                               sig.event_id = FTDM_SIGEVENT_PROGRESS;
-                               if ((status = ftdm_span_send_signal(ftdmchan->span, &sig) != FTDM_SUCCESS)) {
-                                       ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_HANGUP);
-                               }
-                       } else {
-                               if (!ftdm_test_sflag(ftdmchan, SFLAG_SENT_ACK)) {
-                                       ftdm_set_sflag(ftdmchan, SFLAG_SENT_ACK);
-                                       sangomabc_exec_command(mcon,
-                                                               BOOST_SPAN(ftdmchan),
-                                                               BOOST_CHAN(ftdmchan),
-                                                               0,
-                                                               SIGBOOST_EVENT_CALL_START_ACK,
-                                                               0, SIGBOOST_PROGRESS_RING);
-                               }
-                       }
-               }
-               break;
-       case FTDM_CHANNEL_STATE_IDLE:
-       case FTDM_CHANNEL_STATE_HOLD:
-               {
-                       /* twiddle */
-               }
-               break;
-       case FTDM_CHANNEL_STATE_RING:
-               {
-                       if (!ftdm_test_flag(ftdmchan, FTDM_CHANNEL_OUTBOUND)) {
-                               sig.event_id = FTDM_SIGEVENT_START;
-                               if ((status = ftdm_span_send_signal(ftdmchan->span, &sig) != FTDM_SUCCESS)) {
-                                       ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_HANGUP);
-                               }
-                       }
-               }
-               break;
-       case FTDM_CHANNEL_STATE_RESTART:
-               {
-                       sig.event_id = FTDM_SIGEVENT_RESTART;
-                       status = ftdm_span_send_signal(ftdmchan->span, &sig);
-                       ftdm_set_sflag_locked(ftdmchan, SFLAG_SENT_FINAL_MSG);
-                       ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_DOWN);
-               }
-               break;
-       case FTDM_CHANNEL_STATE_UP:
-               {
-                       if (ftdm_test_flag(ftdmchan, FTDM_CHANNEL_OUTBOUND)) {
-                               sig.event_id = FTDM_SIGEVENT_UP;
-                               if ((status = ftdm_span_send_signal(ftdmchan->span, &sig) != FTDM_SUCCESS)) {
-                                       ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_HANGUP);
-                               }
-                       } else {
-                               if (!(ftdm_test_flag(ftdmchan, FTDM_CHANNEL_PROGRESS) || ftdm_test_flag(ftdmchan, FTDM_CHANNEL_MEDIA))) {
-                                       sangomabc_exec_command(mcon,
-                                                                          BOOST_SPAN(ftdmchan),
-                                                                          BOOST_CHAN(ftdmchan),                                                                   
-                                                                          0,
-                                                                          SIGBOOST_EVENT_CALL_START_ACK,
-                                                                          0, 0);
-                               }
-                               
-                               sangomabc_exec_command(mcon,
-                                                                  BOOST_SPAN(ftdmchan),
-                                                                  BOOST_CHAN(ftdmchan),                                                                   
-                                                                  0,
-                                                                  SIGBOOST_EVENT_CALL_ANSWERED,
-                                                                  0, 0);
-                       }
-               }
-               break;
-       case FTDM_CHANNEL_STATE_DIALING:
-               {
-                       char dnis[128] = "";
-                       sangoma_boost_request_id_t r;
-                       sangomabc_event_t event = {0};
-
-                       ftdm_assert(sangoma_boost_data->sigmod != NULL, "We should be in sigmod here!\n");
-                       
-                       ftdm_set_string(dnis, ftdmchan->caller_data.dnis.digits);
-
-                       r = next_request_id();
-                       if (r == 0) {
-                               ftdm_log(FTDM_LOG_CRIT, "All boost request ids are busy.\n");
-                               ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_TERMINATING);
-                               break;
-                       }
-                       
-                       sangomabc_call_init(&event, ftdmchan->caller_data.cid_num.digits, dnis, r);
-
-                       event.span = (uint8_t)ftdmchan->physical_span_id;
-                       event.chan = (uint8_t)ftdmchan->physical_chan_id;
-                       /* because we already have a span/chan here we bind to the SETUP_GRID now and not on call start ack */
-                       SETUP_GRID[event.span][event.chan] = event.call_setup_id;
-
-                       ftdm_set_string(event.calling_name, ftdmchan->caller_data.cid_name);
-                       ftdm_set_string(event.rdnis.digits, ftdmchan->caller_data.rdnis.digits);
-                       if (strlen(ftdmchan->caller_data.rdnis.digits)) {
-                               event.rdnis.digits_count = (uint8_t)strlen(ftdmchan->caller_data.rdnis.digits)+1;
-                               event.rdnis.ton = ftdmchan->caller_data.rdnis.type;
-                               event.rdnis.npi = ftdmchan->caller_data.rdnis.plan;
-                       }
-
-                       event.calling.screening_ind = ftdmchan->caller_data.screen;
-                       event.calling.presentation_ind = ftdmchan->caller_data.pres;
-
-                       event.calling.ton = ftdmchan->caller_data.cid_num.type;
-                       event.calling.npi = ftdmchan->caller_data.cid_num.plan;
-
-                       event.called.ton = ftdmchan->caller_data.dnis.type;
-                       event.called.npi = ftdmchan->caller_data.dnis.plan;
-
-                       if (ftdmchan->caller_data.raw_data_len) {
-                               ftdm_set_string(event.custom_data, ftdmchan->caller_data.raw_data);
-                               event.custom_data_size = (uint16_t)ftdmchan->caller_data.raw_data_len;
-                       }
-
-                       OUTBOUND_REQUESTS[r].status = BST_WAITING;
-                       OUTBOUND_REQUESTS[r].span = ftdmchan->span;
-                       OUTBOUND_REQUESTS[r].ftdmchan = ftdmchan;
-
-                       ftdm_log(FTDM_LOG_DEBUG, "Dialing number %s over boost channel with request id %d\n", event.called_number_digits, r);
-                       if (sangomabc_connection_write(&sangoma_boost_data->mcon, &event) <= 0) {
-                               release_request_id(r);
-                               ftdm_log(FTDM_LOG_CRIT, "Failed to tx boost event [%s]\n", strerror(errno));
-                               ftdm_set_state(ftdmchan, FTDM_CHANNEL_STATE_TERMINATING);
-                       }
-                       
-               }
-               break;
-       case FTDM_CHANNEL_STATE_HANGUP_COMPLETE:
-               {
-                       ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_DOWN);
-               }
-               break;
-       case FTDM_CHANNEL_STATE_HANGUP:
-               {
-                       ftdm_set_sflag_locked(ftdmchan, SFLAG_HANGUP);
-
-                       if (ftdm_test_sflag(ftdmchan, SFLAG_SENT_FINAL_MSG) || ftdm_test_sflag(ftdmchan, SFLAG_TERMINATING)) {
-                               ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_HANGUP_COMPLETE);
-                       } else {
-                               ftdm_set_sflag_locked(ftdmchan, SFLAG_SENT_FINAL_MSG);
-                               if (ftdm_test_flag(ftdmchan, FTDM_CHANNEL_ANSWERED) || 
-                                               ftdm_test_flag(ftdmchan, FTDM_CHANNEL_PROGRESS) || 
-                                               ftdm_test_flag(ftdmchan, FTDM_CHANNEL_MEDIA) ||
-                                               ftdm_test_sflag(ftdmchan, SFLAG_RECVD_ACK)) {
-                                       sangomabc_exec_command(mcon,
-                                                                          BOOST_SPAN(ftdmchan),
-                                                                          BOOST_CHAN(ftdmchan),
-                                                                          0,
-                                                                          SIGBOOST_EVENT_CALL_STOPPED,
-                                                                          ftdmchan->caller_data.hangup_cause, 0);
-                               } else {
-                                       sangomabc_exec_command(mcon,
-                                                                          BOOST_SPAN(ftdmchan),
-                                                                          BOOST_CHAN(ftdmchan),                                                                   
-                                                                          0,
-                                                                          SIGBOOST_EVENT_CALL_START_NACK,
-                                                                          ftdmchan->caller_data.hangup_cause, 0);
-                               }
-                       }
-               }
-               break;
-       case FTDM_CHANNEL_STATE_TERMINATING:
-               {
-                       ftdm_set_sflag_locked(ftdmchan, SFLAG_TERMINATING);
-                       sig.event_id = FTDM_SIGEVENT_STOP;
-                       status = ftdm_span_send_signal(ftdmchan->span, &sig);
-               }
-               break;
-       case FTDM_CHANNEL_STATE_IN_LOOP:
-               {
-                       /* nothing to do, we sent the FTDM_COMMAND_ENABLE_LOOP command in handle_call_loop_start() right away */
-               }
-               break;
-       default:
-               break;
-       }
-       return FTDM_SUCCESS;
-}
-
-/**
- * \brief Initialises outgoing requests array
- */
-static __inline__ void init_outgoing_array(void)
-{
-       memset(&OUTBOUND_REQUESTS, 0, sizeof(OUTBOUND_REQUESTS));
-}
-
-/**
- * \brief Checks current state on a span
- * \param span Span to check status on
- */
-static __inline__ void check_state(ftdm_span_t *span)
-{
-       ftdm_channel_t *ftdmchan = NULL;
-       ftdm_sangoma_boost_data_t *sangoma_boost_data = span->signal_data;
-       int susp = ftdm_test_flag(span, FTDM_SPAN_SUSPENDED);
-       
-       if (susp && ftdm_check_state_all(span, FTDM_CHANNEL_STATE_DOWN)) {
-               susp = 0;
-       }
-
-       if (ftdm_test_flag(span, FTDM_SPAN_STATE_CHANGE) || susp) {
-               uint32_t j;
-               ftdm_clear_flag_locked(span, FTDM_SPAN_STATE_CHANGE);
-               if (susp) {
-                       for(j = 1; j <= span->chan_count; j++) {
-                               if (ftdm_test_flag((span->channels[j]), FTDM_CHANNEL_STATE_CHANGE) || susp) {
-                                       ftdm_mutex_lock(span->channels[j]->mutex);
-                                       ftdm_clear_flag((span->channels[j]), FTDM_CHANNEL_STATE_CHANGE);
-                                       if (susp && span->channels[j]->state != FTDM_CHANNEL_STATE_DOWN) {
-                                               ftdm_set_state(span->channels[j], FTDM_CHANNEL_STATE_RESTART);
-                                       }
-                                       ftdm_channel_advance_states(span->channels[j]);
-                                       ftdm_mutex_unlock(span->channels[j]->mutex);
-                               }
-                       }
-               } else {
-                       while ((ftdmchan = ftdm_queue_dequeue(span->pendingchans))) {
-                               /* it can happen that someone else processed the chan states
-                                * but without taking the chan out of the queue, so check th
-                                * flag before advancing the state */
-                               ftdm_mutex_lock(ftdmchan->mutex);
-                               ftdm_channel_advance_states(ftdmchan);
-                               ftdm_mutex_unlock(ftdmchan->mutex);
-                       }
-               }
-       }
-
-       if (ftdm_test_flag(sangoma_boost_data, FTDM_SANGOMA_BOOST_RESTARTING)) {
-               if (ftdm_check_state_all(span, FTDM_CHANNEL_STATE_DOWN)) {
-                       sangomabc_exec_command(&sangoma_boost_data->mcon,
-                                                                  0,
-                                                                  0,
-                                                                  -1,
-                                                                  SIGBOOST_EVENT_SYSTEM_RESTART_ACK,
-                                                                  0, 0);       
-                       ftdm_clear_flag(sangoma_boost_data, FTDM_SANGOMA_BOOST_RESTARTING);
-                       ftdm_clear_flag_locked(span, FTDM_SPAN_SUSPENDED);
-                       ftdm_clear_flag((&sangoma_boost_data->mcon), MSU_FLAG_DOWN);
-                       init_outgoing_array();
-               }
-       }
-}
-
-
-/**
- * \brief Checks for events on a span
- * \param span Span to check for events
- */
-static __inline__ ftdm_status_t check_events(ftdm_span_t *span, int ms_timeout)
-{
-       ftdm_status_t status;
-       ftdm_sangoma_boost_data_t *sangoma_boost_data = span->signal_data;
-
-       status = ftdm_span_poll_event(span, ms_timeout, NULL);
-
-       switch(status) {
-       case FTDM_SUCCESS:
-               {
-                       ftdm_event_t *event;
-                       while (ftdm_span_next_event(span, &event) == FTDM_SUCCESS) {
-                               switch (event->enum_id) {
-                               case FTDM_OOB_ALARM_TRAP:
-                                       if (sangoma_boost_data->sigmod) {
-                                               sangoma_boost_data->sigmod->on_hw_link_status_change(event->channel, FTDM_HW_LINK_DISCONNECTED);
-                                       }
-                                       break;
-                               case FTDM_OOB_ALARM_CLEAR:
-                                       if (sangoma_boost_data->sigmod) {
-                                               sangoma_boost_data->sigmod->on_hw_link_status_change(event->channel, FTDM_HW_LINK_CONNECTED);
-                                       }
-                                       break;
-                               }
-                       }
-               }
-               break;
-       case FTDM_FAIL:
-               {
-                       if (!ftdm_running()) {
-                               break;
-                       }
-                       ftdm_log(FTDM_LOG_ERROR, "Boost Check Event Failure Failure: %s\n", span->last_error);
-                       return FTDM_FAIL;
-               }
-               break;
-       default:
-               break;
-       }
-
-       return FTDM_SUCCESS;
-}
-
-/**
- * \brief Main thread function for sangoma boost span (monitor)
- * \param me Current thread
- * \param obj Span to run in this thread
- */
-static void *ftdm_sangoma_events_run(ftdm_thread_t *me, void *obj)
-{
-       ftdm_span_t *span = (ftdm_span_t *) obj;
-       ftdm_sangoma_boost_data_t *sangoma_boost_data = span->signal_data;
-       unsigned errs = 0;
-
-       while (ftdm_test_flag(sangoma_boost_data, FTDM_SANGOMA_BOOST_EVENTS_RUNNING) && ftdm_running()) {
-               if (check_events(span, 100) != FTDM_SUCCESS) {
-                       if (errs++ > 50) {
-                               ftdm_log(FTDM_LOG_ERROR, "Too many event errors, quitting sangoma events thread\n");
-                               return NULL;
-                       }
-               }
-       }
-       
-       ftdm_log(FTDM_LOG_DEBUG, "Sangoma Boost Events thread ended.\n");
-
-       ftdm_clear_flag(sangoma_boost_data, FTDM_SANGOMA_BOOST_EVENTS_RUNNING);
-
-       return NULL;
-}
-
-static ftdm_status_t ftdm_boost_connection_open(ftdm_span_t *span)
-{
-       ftdm_sangoma_boost_data_t *sangoma_boost_data = span->signal_data;
-       if (sangoma_boost_data->sigmod) {
-               if (sangoma_boost_data->sigmod->start_span(span) != FTDM_SUCCESS) {
-                       return FTDM_FAIL;
-               }
-               ftdm_clear_flag(sangoma_boost_data, FTDM_SANGOMA_BOOST_RESTARTING);
-               ftdm_clear_flag_locked(span, FTDM_SPAN_SUSPENDED);
-               ftdm_clear_flag((&sangoma_boost_data->mcon), MSU_FLAG_DOWN);
-       } 
-
-       sangoma_boost_data->pcon = sangoma_boost_data->mcon;
-
-       /* when sigmod is present, all arguments: local_ip etc, are ignored by sangomabc_connection_open */
-       if (sangomabc_connection_open(&sangoma_boost_data->mcon,
-                                                                 sangoma_boost_data->mcon.cfg.local_ip,
-                                                                 sangoma_boost_data->mcon.cfg.local_port,
-                                                                 sangoma_boost_data->mcon.cfg.remote_ip,
-                                                                 sangoma_boost_data->mcon.cfg.remote_port) < 0) {
-               ftdm_log(FTDM_LOG_ERROR, "Error: Opening MCON Socket [%d] %s\n", sangoma_boost_data->mcon.socket, strerror(errno));
-               return FTDM_FAIL;
-       }
-
-       if (sangomabc_connection_open(&sangoma_boost_data->pcon,
-                                                         sangoma_boost_data->pcon.cfg.local_ip,
-                                                         ++sangoma_boost_data->pcon.cfg.local_port,
-                                                         sangoma_boost_data->pcon.cfg.remote_ip,
-                                                         ++sangoma_boost_data->pcon.cfg.remote_port) < 0) {
-               ftdm_log(FTDM_LOG_ERROR, "Error: Opening PCON Socket [%d] %s\n", sangoma_boost_data->pcon.socket, strerror(errno));
-               return FTDM_FAIL;
-       }
-
-       /* try to create the boost sockets interrupt objects */
-       if (ftdm_interrupt_create(&sangoma_boost_data->pcon.sock_interrupt, sangoma_boost_data->pcon.socket) != FTDM_SUCCESS) {
-               ftdm_log(FTDM_LOG_ERROR, "Span %s could not create its boost msock interrupt!\n", span->name);
-               return FTDM_FAIL;
-       }
-
-       if (ftdm_interrupt_create(&sangoma_boost_data->mcon.sock_interrupt, sangoma_boost_data->mcon.socket) != FTDM_SUCCESS) {
-               ftdm_log(FTDM_LOG_ERROR, "Span %s could not create its boost psock interrupt!\n", span->name);
-               return FTDM_FAIL;
-       }
-
-       return FTDM_SUCCESS;
-}
-
-/*! 
-  \brief wait for a boost event 
-  \return -1 on error, 0 on timeout, 1 when there are events
- */
-static int ftdm_boost_wait_event(ftdm_span_t *span)
-{
-               ftdm_status_t res;
-               ftdm_interrupt_t *ints[3];
-               int numints;
-               ftdm_sangoma_boost_data_t *sangoma_boost_data = span->signal_data;
-
-               ftdm_queue_get_interrupt(span->pendingchans, &ints[0]);
-               numints = 1;
-               /* if in queue mode wait for both the pendingchans queue and the boost msg queue */
-               if (sangoma_boost_data->sigmod) {
-                       ftdm_queue_get_interrupt(sangoma_boost_data->boost_queue, &ints[1]);
-                       numints = 2;
-               } 
-#ifndef __WINDOWS__
-               else {
-                       /* socket mode ... */
-                       ints[1] = sangoma_boost_data->mcon.sock_interrupt;
-                       ints[2] = sangoma_boost_data->pcon.sock_interrupt;
-                       numints = 3;
-                       sangoma_boost_data->iteration = 0;
-               }
-#endif
-               res = ftdm_interrupt_multiple_wait(ints, numints, 100);
-               if (FTDM_SUCCESS != res && FTDM_TIMEOUT != res) {
-                       ftdm_log(FTDM_LOG_CRIT, "Unexpected return value from interrupt waiting: %d\n", res);
-                       return -1;
-               }
-               return 0;
-}
-
-
-static sangomabc_event_t *ftdm_boost_read_event(ftdm_span_t *span)
-{
-       sangomabc_event_t *event = NULL;
-       sangomabc_connection_t *mcon, *pcon;
-       ftdm_sangoma_boost_data_t *sangoma_boost_data = span->signal_data;
-
-       mcon = &sangoma_boost_data->mcon;
-       pcon = &sangoma_boost_data->pcon;
-
-       event = sangomabc_connection_readp(pcon, sangoma_boost_data->iteration);
-
-       /* if there is no event and this is not a sigmod-driven span it's time to try the other connection for events */
-       if (!event && !sangoma_boost_data->sigmod) {
-               event = sangomabc_connection_read(mcon, sangoma_boost_data->iteration);
-       }
-
-       return event;
-}
-
-/**
- * \brief Main thread function for sangoma boost span (monitor)
- * \param me Current thread
- * \param obj Span to run in this thread
- */
-static void *ftdm_sangoma_boost_run(ftdm_thread_t *me, void *obj)
-{
-       ftdm_span_t *span = (ftdm_span_t *) obj;
-       sangomabc_connection_t *mcon, *pcon;
-       ftdm_sangoma_boost_data_t *sangoma_boost_data = span->signal_data;
-
-       mcon = &sangoma_boost_data->mcon;
-       pcon = &sangoma_boost_data->pcon;       
-
-       /* sigmod overrides socket functionality if not null */
-       if (sangoma_boost_data->sigmod) {
-               mcon->span = span;
-               pcon->span = span;
-               /* everything could be retrieved through span, but let's use shortcuts */
-               mcon->sigmod = sangoma_boost_data->sigmod;
-               pcon->sigmod = sangoma_boost_data->sigmod;
-               mcon->boost_queue = sangoma_boost_data->boost_queue;
-               pcon->boost_queue = sangoma_boost_data->boost_queue;
-       }
-
-       if (ftdm_boost_connection_open(span) != FTDM_SUCCESS) {
-               ftdm_log(FTDM_LOG_CRIT, "ftdm_boost_connection_open failed\n");
-               goto end;
-       }
-
-       init_outgoing_array();
-       if (!sangoma_boost_data->sigmod) {
-               sangomabc_exec_commandp(pcon,
-                                                  0,
-                                                  0,
-                                                  -1,
-                                                  SIGBOOST_EVENT_SYSTEM_RESTART,
-                                                  0);
-               ftdm_set_flag(mcon, MSU_FLAG_DOWN);
-       }
-
-       while (ftdm_test_flag(sangoma_boost_data, FTDM_SANGOMA_BOOST_RUNNING)) {
-               sangomabc_event_t *event = NULL;
-               
-               if (!ftdm_running()) {
-                       if (!sangoma_boost_data->sigmod) {
-                               sangomabc_exec_commandp(pcon,
-                                                                  0,
-                                                                  0,
-                                                                  -1,
-                                                                  SIGBOOST_EVENT_SYSTEM_RESTART,
-                                                                  0);
-                               ftdm_set_flag(mcon, MSU_FLAG_DOWN);
-                       }
-                       ftdm_log(FTDM_LOG_DEBUG, "ftdm is no longer running\n");
-                       break;
-               }
-
-               if (ftdm_boost_wait_event(span) < 0) {
-                       ftdm_log(FTDM_LOG_ERROR, "ftdm_boost_wait_event failed\n");
-               }
-               
-               while ((event = ftdm_boost_read_event(span))) {
-                       parse_sangoma_event(span, pcon, (sangomabc_short_event_t*)event);
-                       sangoma_boost_data->iteration++;
-               }
-               
-               check_state(span);
-       }
-
-end:
-       if (!sangoma_boost_data->sigmod) {
-               sangomabc_connection_close(&sangoma_boost_data->mcon);
-               sangomabc_connection_close(&sangoma_boost_data->pcon);
-       }
-
-       ftdm_clear_flag(sangoma_boost_data, FTDM_SANGOMA_BOOST_RUNNING);
-
-       ftdm_log(FTDM_LOG_DEBUG, "Sangoma Boost thread ended.\n");
-       return NULL;
-}
-
-#if 0
-static int sigmod_ss7box_isup_exec_cmd(ftdm_stream_handle_t *stream, char *cmd)
-{
-       FILE *fp;
-       int status=0;
-       char path[1024];
-       
-       fp = popen(cmd, "r");
-       if (fp == NULL) {
-               stream->write_function(stream, "%s: -ERR failed to execute cmd: %s\n",
-                               __FILE__,cmd);
-               return -1;
-       }
-       
-       while (fgets(path, sizeof(path)-1, fp) != NULL) {
-               path[sizeof(path)-1]='\0';
-               stream->write_function(stream,"%s", path);
-       }
-       
-       
-       status = pclose(fp);
-       if (status == -1) {
-               /* Error reported by pclose() */
-       } else {
-               /* Use macros described under wait() to inspect `status' in order
-               to determine success/failure of command executed by popen() */
-       }
-
-       return status;
-}
-#endif
-
-static void ftdm_cli_span_state_cmd(ftdm_span_t *span, char *state)
-{
-       unsigned int j;
-       int cnt=0;
-       ftdm_channel_state_t state_e = ftdm_str2ftdm_channel_state(state);
-       if (state_e == FTDM_CHANNEL_STATE_INVALID) {
-               ftdm_log(FTDM_LOG_CRIT, "Checking for channels not in the INVALID state is probably not what you want\n");
-       }
-       for(j = 1; j <= span->chan_count; j++) {
-               if (span->channels[j]->state != state_e) {
-                       ftdm_channel_t *ftdmchan = span->channels[j];
-                       ftdm_log(FTDM_LOG_CRIT, "Channel %i s%dc%d State=%s\n",
-                               j, ftdmchan->physical_span_id-1, ftdmchan->physical_chan_id-1, ftdm_channel_state2str(ftdmchan->state));
-                       cnt++;
-               }
-       }
-       ftdm_log(FTDM_LOG_CRIT, "Total Channel Cnt %i\n",cnt);
-}
-
-#define FTDM_BOOST_SYNTAX "list sigmods | <sigmod_name> <command> | tracelevel <span> <level>"
-/**
- * \brief API function to kill or debug a sangoma_boost span
- * \param stream API stream handler
- * \param data String containing argurments
- * \return Flags
- */
-static FIO_API_FUNCTION(ftdm_sangoma_boost_api)
-{
-       char *mycmd = NULL, *argv[10] = { 0 };
-       int argc = 0;
-
-       if (data) {
-               mycmd = ftdm_strdup(data);
-               argc = ftdm_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0])));
-       }
-
-       if (argc > 1) {
-               if (!strcasecmp(argv[0], "list")) {
-                       if (!strcasecmp(argv[1], "sigmods")) {
-                               if (ftdm_sangoma_boost_list_sigmods(stream) != FTDM_SUCCESS) {
-                                       stream->write_function(stream, "-ERR failed to list sigmods\n");
-                                       goto done;
-                               }
-                               goto done;
-                       }
-
-                       if (!strcasecmp(argv[1], "ids")) {
-                               print_request_ids();
-                               goto done;
-                       }
-               } else if (!strcasecmp(argv[0], "tracelevel")) {
-                       ftdm_status_t status;
-                       const char *levelname = NULL;
-                       int dbglevel;
-                       ftdm_sangoma_boost_data_t *sangoma_boost_data;
-                       ftdm_span_t *span;
-
-                       if (argc <= 2) {
-                               stream->write_function(stream, "-ERR usage: tracelevel <span> <level>\n");
-                               goto done;
-                       }
-
-                       status = ftdm_span_find_by_name(argv[1], &span);
-                       if (FTDM_SUCCESS != status) {
-                               stream->write_function(stream, "-ERR failed to find span by name %s\n", argv[1]);
-                               goto done;
-                       }
-
-                       if (span->signal_type != FTDM_SIGTYPE_SANGOMABOOST) {
-                               stream->write_function(stream, "-ERR span %s is not of boost type\n", argv[1]);
-                               goto done;
-                       }
-
-                       for (dbglevel = 0; (levelname = FTDM_LEVEL_NAMES[dbglevel]); dbglevel++) {
-                               if (!strcasecmp(levelname, argv[2])) {
-                                       break;
-                               }
-                       }
-
-                       if (!levelname) {
-                               stream->write_function(stream, "-ERR invalid log level %s\n", argv[2]);
-                               goto done;
-                       }
-
-                       sangoma_boost_data = span->signal_data;
-                       sangoma_boost_data->pcon.debuglevel = dbglevel;
-                       sangoma_boost_data->mcon.debuglevel = dbglevel;
-                       stream->write_function(stream, "+OK span %s has now trace level %s\n", argv[1], FTDM_LEVEL_NAMES[dbglevel]);
-                       goto done;
-#ifndef __WINDOWS__
-#if 0
-/* NC: This code crashes the kernel due to fork on heavy fs load */
-               } else if (!strcasecmp(argv[0], "ss7box_isupd_ckt")) {
-               
-                       if (!strcasecmp(argv[1], "used")) {
-                               stream->write_function(stream, "ss7box_isupd: in use\n", FTDM_BOOST_SYNTAX);
-                               sigmod_ss7box_isup_exec_cmd(stream, (char*) "ckt_report.sh inuse");
-                       } else if (!strcasecmp(argv[1], "reset")) {
-                               stream->write_function(stream, "ss7box_isupd: in reset\n", FTDM_BOOST_SYNTAX);
-                               sigmod_ss7box_isup_exec_cmd(stream, (char*) "ckt_report.sh reset");
-                       } else if (!strcasecmp(argv[1], "ready")) {
-                               stream->write_function(stream, "ss7box_isupd: ready \n", FTDM_BOOST_SYNTAX);
-                               sigmod_ss7box_isup_exec_cmd(stream, (char*) "ckt_report.sh free");
-                       } else {
-                               stream->write_function(stream, "ss7box_isupd: list\n", FTDM_BOOST_SYNTAX);
-                               sigmod_ss7box_isup_exec_cmd(stream, (char*) "ckt_report.sh");
-                       }
-
-                       goto done;
-#endif
-#endif
-
-               } else if (!strcasecmp(argv[0], "span")) {
-                       int err;
-                       sangomabc_connection_t *pcon;
-                       ftdm_sangoma_boost_data_t *sangoma_boost_data;
-                       ftdm_span_t *span;
-
-                       if (argc <= 2) {
-                               stream->write_function(stream, "-ERR invalid span usage: span <name> <cmd>\n");
-                               goto done;
-                       }
-
-                       err = ftdm_span_find_by_name(argv[1], &span);
-                       if (FTDM_SUCCESS != err) {
-                               stream->write_function(stream, "-ERR failed to find span by name %s\n",argv[1]);
-                               goto done;
-                       }
-
-                       if (!strcasecmp(argv[2], "restart")) {
-                               sangoma_boost_data = span->signal_data;
-                               pcon = &sangoma_boost_data->pcon;
-
-                               /* No need to set any span flags because
-                          our RESTART will generate a RESTART from the sig daemon */
-                               sangomabc_exec_commandp(pcon,
-                                                  0,
-                                                  0,
-                                                  -1,
-                                                  SIGBOOST_EVENT_SYSTEM_RESTART,
-                                                  0);          
-                       } else if (!strcasecmp(argv[2], "state")) {
-                               if (argc <= 3) {
-                                       stream->write_function(stream, "-ERR invalid span state: span <name> state <state name>\n");
-                                       goto done;
-                               }
-                               ftdm_cli_span_state_cmd(span,argv[3]);
-                       }
-
-                       goto done;
-
-               } else {
-                       boost_sigmod_interface_t *sigmod_iface = NULL;
-                       sigmod_iface = hashtable_search(g_boost_modules_hash, argv[0]);
-                       if (sigmod_iface) {
-                               char *p = strchr(data, ' ');
-                               if (++p) {
-                                       char* mydup = strdup(p);
-                                       if(sigmod_iface->exec_api == NULL) {
-                                               stream->write_function(stream, "%s does not support api functions\n", sigmod_iface->name);
-                                               goto done;
-                                       }
-                                       //stream->write_function(stream, "sigmod:%s command:%s\n", sigmod_iface->name, mydup);
-                                       if (sigmod_iface->exec_api(stream, mydup) != FTDM_SUCCESS) {
-                                               stream->write_function(stream, "-ERR:failed to execute command:%s\n", mydup);
-                                       }
-                                       free(mydup);
-                               }
-                               
-                               goto done;
-                       } else {
-                               stream->write_function(stream, "-ERR: Could not find sigmod %s\n", argv[0]);
-                       }
-               }
-       }
-       stream->write_function(stream, "-ERR: Usage: %s\n", FTDM_BOOST_SYNTAX);
-done:
-       ftdm_safe_free(mycmd);
-       return FTDM_SUCCESS;
-}
-
-/**
- * \brief Loads sangoma_boost IO module
- * \param fio FreeTDM IO interface
- * \return Success
- */
-static FIO_IO_LOAD_FUNCTION(ftdm_sangoma_boost_io_init)
-{
-       ftdm_assert(fio != NULL, "fio is NULL");
-       memset(&ftdm_sangoma_boost_interface, 0, sizeof(ftdm_sangoma_boost_interface));
-
-       ftdm_sangoma_boost_interface.name = "boost";
-       ftdm_sangoma_boost_interface.api = ftdm_sangoma_boost_api;
-
-       *fio = &ftdm_sangoma_boost_interface;
-
-       return FTDM_SUCCESS;
-}
-
-/**
- * \brief Loads sangoma boost signaling module
- * \param fio FreeTDM IO interface
- * \return Success
- */
-static FIO_SIG_LOAD_FUNCTION(ftdm_sangoma_boost_init)
-{
-       g_boost_modules_hash = create_hashtable(10, ftdm_hash_hashfromstring, ftdm_hash_equalkeys);
-       if (!g_boost_modules_hash) {
-               return FTDM_FAIL;
-       }
-       ftdm_mutex_create(&request_mutex);
-       ftdm_mutex_create(&g_boost_modules_mutex);
-       memset(&g_trunkgroups[0], 0, sizeof(g_trunkgroups));
-       return FTDM_SUCCESS;
-}
-
-static FIO_SIG_UNLOAD_FUNCTION(ftdm_sangoma_boost_destroy)
-{
-       ftdm_hash_iterator_t *i = NULL;
-       boost_sigmod_interface_t *sigmod = NULL;
-       const void *key = NULL;
-       void *val = NULL;
-       ftdm_dso_lib_t lib;
-       ftdm_log(FTDM_LOG_DEBUG, "Destroying sangoma boost module\n");
-       for (i = hashtable_first(g_boost_modules_hash); i; i = hashtable_next(i)) {
-               hashtable_this(i, &key, NULL, &val);
-               if (key && val) {
-                       sigmod = val;
-                       lib = sigmod->pvt;
-                       ftdm_log(FTDM_LOG_DEBUG, "destroying sigmod %s\n", sigmod->name);
-                       sigmod->on_unload();
-                       ftdm_dso_destroy(&lib);
-               }
-       }
-
-       hashtable_destroy(g_boost_modules_hash);
-       ftdm_mutex_destroy(&request_mutex);
-       ftdm_mutex_destroy(&g_boost_modules_mutex);
-       return FTDM_SUCCESS;
-}
-
-static ftdm_status_t ftdm_sangoma_boost_start(ftdm_span_t *span)
-{
-       int err;
-
-       ftdm_sangoma_boost_data_t *sangoma_boost_data = span->signal_data;
-
-       ftdm_set_flag(sangoma_boost_data, FTDM_SANGOMA_BOOST_RUNNING);
-       err = ftdm_thread_create_detached(ftdm_sangoma_boost_run, span);
-       if (err) {
-               ftdm_clear_flag(sangoma_boost_data, FTDM_SANGOMA_BOOST_RUNNING);
-               return err;
-       }
-
-       // launch the events thread to handle HW DTMF and possibly
-       // other events in the future
-       ftdm_set_flag(sangoma_boost_data, FTDM_SANGOMA_BOOST_EVENTS_RUNNING);
-       err = ftdm_thread_create_detached(ftdm_sangoma_events_run, span);
-       if (err) {
-               ftdm_clear_flag(sangoma_boost_data, FTDM_SANGOMA_BOOST_EVENTS_RUNNING);
-               ftdm_clear_flag(sangoma_boost_data, FTDM_SANGOMA_BOOST_RUNNING);
-       }
-
-       return err;
-}
-
-static ftdm_status_t ftdm_sangoma_boost_stop(ftdm_span_t *span)
-{
-       int cnt = 50;
-       ftdm_status_t status = FTDM_SUCCESS;
-       ftdm_sangoma_boost_data_t *sangoma_boost_data = span->signal_data;
-
-       if (sangoma_boost_data->sigmod) {
-               /* I think stopping the span before destroying the queue makes sense
-                  otherwise may be boost events would still arrive when the queue is already destroyed! */
-               status = sangoma_boost_data->sigmod->stop_span(span);
-               if (status != FTDM_SUCCESS) {
-                       ftdm_log(FTDM_LOG_CRIT, "Failed to stop span %s boost signaling\n", span->name);
-                       return FTDM_FAIL;
-               }
-               ftdm_queue_enqueue(sangoma_boost_data->boost_queue, NULL);
-       }
-
-       while (ftdm_test_flag(sangoma_boost_data, FTDM_SANGOMA_BOOST_RUNNING) && cnt-- > 0) {
-               ftdm_log(FTDM_LOG_DEBUG, "Waiting for boost thread\n");
-               ftdm_sleep(100);
-       }
-
-       if (!cnt) {
-               ftdm_log(FTDM_LOG_CRIT, "it seems boost thread in span %s may be stuck, we may segfault :-(\n", span->name);
-               return FTDM_FAIL;
-       }
-
-       cnt = 50;
-       while (ftdm_test_flag(sangoma_boost_data, FTDM_SANGOMA_BOOST_EVENTS_RUNNING) && cnt-- > 0) {
-               ftdm_log(FTDM_LOG_DEBUG, "Waiting for boost events thread\n");
-               ftdm_sleep(100);
-       }
-
-       if (!cnt) {
-               ftdm_log(FTDM_LOG_CRIT, "it seems boost events thread in span %s may be stuck, we may segfault :-(\n", span->name);
-               return FTDM_FAIL;
-       }
-
-       if (sangoma_boost_data->sigmod) {
-               ftdm_queue_destroy(&sangoma_boost_data->boost_queue);
-       }
-
-       return status;
-}
-
-static ftdm_state_map_t boost_state_map = {
-       {
-               {
-                       ZSD_OUTBOUND,
-                       ZSM_UNACCEPTABLE,
-                       {FTDM_ANY_STATE},
-                       {FTDM_CHANNEL_STATE_RESTART, FTDM_END}
-               },
-               {
-                       ZSD_OUTBOUND,
-                       ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_RESTART, FTDM_END},
-                       {FTDM_CHANNEL_STATE_DOWN, FTDM_END}
-               },
-               {
-                       ZSD_OUTBOUND,
-                       ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_DOWN, FTDM_END},
-                       {FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_CHANNEL_STATE_PROGRESS, FTDM_CHANNEL_STATE_DIALING, FTDM_CHANNEL_STATE_IDLE, FTDM_CHANNEL_STATE_HOLD, FTDM_END}
-               },
-               {
-                       ZSD_OUTBOUND,
-                       ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_HOLD, FTDM_END},
-                       {FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_CHANNEL_STATE_PROGRESS, 
-                        FTDM_CHANNEL_STATE_IDLE, FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_UP, FTDM_CHANNEL_STATE_HANGUP, FTDM_END}
-               },
-               {
-                       ZSD_OUTBOUND,
-                       ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_IDLE, FTDM_CHANNEL_STATE_DIALING, FTDM_END},
-                       {FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_CHANNEL_STATE_PROGRESS, FTDM_END}
-               },
-               {
-                       ZSD_OUTBOUND,
-                       ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_CHANNEL_STATE_PROGRESS, FTDM_CHANNEL_STATE_IDLE, FTDM_CHANNEL_STATE_DIALING, FTDM_END},
-                       {FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_UP, FTDM_END}
-               },
-               {
-                       ZSD_OUTBOUND,
-                       ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_TERMINATING, FTDM_END},
-                       {FTDM_CHANNEL_STATE_HANGUP_COMPLETE, FTDM_CHANNEL_STATE_HANGUP, FTDM_END}
-               },
-               {
-                       ZSD_OUTBOUND,
-                       ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_HANGUP_COMPLETE, FTDM_END},
-                       {FTDM_CHANNEL_STATE_DOWN, FTDM_END},
-               },
-               {
-                       ZSD_OUTBOUND,
-                       ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_UP, FTDM_END},
-                       {FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_TERMINATING, FTDM_END}
-               },
-
-               /****************************************/
-               {
-                       ZSD_INBOUND,
-                       ZSM_UNACCEPTABLE,
-                       {FTDM_ANY_STATE},
-                       {FTDM_CHANNEL_STATE_RESTART, FTDM_END}
-               },
-               {
-                       ZSD_INBOUND,
-                       ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_RESTART, FTDM_END},
-                       {FTDM_CHANNEL_STATE_DOWN, FTDM_END}
-               },
-               {
-                       ZSD_INBOUND,
-                       ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_DOWN},
-                       {FTDM_CHANNEL_STATE_IN_LOOP, FTDM_END}
-               },
-               {
-                       ZSD_INBOUND,
-                       ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_IN_LOOP},
-                       {FTDM_CHANNEL_STATE_DOWN, FTDM_END}
-               },
-               {
-                       ZSD_INBOUND,
-                       ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_DOWN, FTDM_END},
-                       {FTDM_CHANNEL_STATE_RING, FTDM_END}
-               },
-               {
-                       ZSD_INBOUND,
-                       ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_RING, FTDM_END},
-                       {FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_PROGRESS, FTDM_CHANNEL_STATE_PROGRESS_MEDIA,FTDM_END}
-               },
-               {
-                       ZSD_INBOUND,
-                       ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_TERMINATING, FTDM_END},
-                       {FTDM_CHANNEL_STATE_HANGUP_COMPLETE, FTDM_CHANNEL_STATE_HANGUP, FTDM_END},
-               },
-               {
-                       ZSD_INBOUND,
-                       ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_HANGUP_COMPLETE, FTDM_CHANNEL_STATE_TERMINATING, FTDM_END},
-                       {FTDM_CHANNEL_STATE_DOWN, FTDM_END},
-               },
-               {
-                       ZSD_INBOUND,
-                       ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_PROGRESS, FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_END},
-                       {FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_TERMINATING, FTDM_CHANNEL_STATE_UP, FTDM_CHANNEL_STATE_PROGRESS_MEDIA, FTDM_END},
-               },
-               {
-                       ZSD_INBOUND,
-                       ZSM_UNACCEPTABLE,
-                       {FTDM_CHANNEL_STATE_UP, FTDM_END},
-                       {FTDM_CHANNEL_STATE_HANGUP, FTDM_CHANNEL_STATE_TERMINATING, FTDM_END},
-               },
-               
-
-       }
-};
-
-static BOOST_WRITE_MSG_FUNCTION(ftdm_boost_write_msg)
-{
-       sangomabc_short_event_t *shortmsg = NULL;
-       ftdm_sangoma_boost_data_t *sangoma_boost_data = NULL;
-       sangomabc_queue_element_t *element = NULL;
-
-       ftdm_assert_return(msg != NULL, FTDM_FAIL, "Boost message to write was null");
-
-       if (!span) {
-               shortmsg = msg;
-               ftdm_log(FTDM_LOG_ERROR, "Unexpected boost message %d\n", shortmsg->event_id);
-               return FTDM_FAIL;
-       }
-       /* duplicate the event and enqueue it */
-       element = ftdm_calloc(1, sizeof(*element));
-       if (!element) {
-               return FTDM_FAIL;
-       }
-       memcpy(element->boostmsg, msg, msglen);
-       element->size = msglen;
-
-       sangoma_boost_data = span->signal_data;
-       return ftdm_queue_enqueue(sangoma_boost_data->boost_queue, element);
-}
-
-static BOOST_SIG_STATUS_CB_FUNCTION(ftdm_boost_sig_status_change)
-{
-       ftdm_sigmsg_t sig;
-       ftdm_log(FTDM_LOG_NOTICE, "%d:%d Signaling link status changed to %s\n", ftdmchan->span_id, ftdmchan->chan_id, ftdm_signaling_status2str(status));
-       
-       memset(&sig, 0, sizeof(sig));
-       sig.chan_id = ftdmchan->chan_id;
-       sig.span_id = ftdmchan->span_id;
-       sig.channel = ftdmchan;
-       sig.event_id = FTDM_SIGEVENT_SIGSTATUS_CHANGED;
-       sig.ev_data.sigstatus.status = status;
-       ftdm_span_send_signal(ftdmchan->span, &sig);
-       return;
-}
-
-static FIO_CHANNEL_SET_SIG_STATUS_FUNCTION(sangoma_boost_set_channel_sig_status)
-{
-       ftdm_sangoma_boost_data_t *sangoma_boost_data = ftdmchan->span->signal_data;
-       if (!sangoma_boost_data->sigmod) {
-               ftdm_log(FTDM_LOG_ERROR, "Cannot set signaling status in boost channel with no signaling module configured\n");
-               return FTDM_FAIL;
-       }
-       if (!sangoma_boost_data->sigmod->set_channel_sig_status) {
-               ftdm_log(FTDM_LOG_ERROR, "Cannot set signaling status in boost channel: method not implemented\n");
-               return FTDM_NOTIMPL;
-       }
-       return sangoma_boost_data->sigmod->set_channel_sig_status(ftdmchan, status);
-}
-
-static FIO_CHANNEL_GET_SIG_STATUS_FUNCTION(sangoma_boost_get_channel_sig_status)
-{
-       ftdm_sangoma_boost_data_t *sangoma_boost_data = ftdmchan->span->signal_data;
-       if (!sangoma_boost_data->sigmod) {
-               return FTDM_FAIL;
-       }
-       if (!sangoma_boost_data->sigmod->get_channel_sig_status) {
-               return FTDM_NOTIMPL;
-       }
-       return sangoma_boost_data->sigmod->get_channel_sig_status(ftdmchan, status);
-}
-
-static FIO_SPAN_SET_SIG_STATUS_FUNCTION(sangoma_boost_set_span_sig_status)
-{
-       ftdm_sangoma_boost_data_t *sangoma_boost_data = span->signal_data;
-       if (!sangoma_boost_data->sigmod) {
-               ftdm_log(FTDM_LOG_ERROR, "Cannot set signaling status in boost span with no signaling module configured\n");
-               return FTDM_FAIL;
-       }
-       if (!sangoma_boost_data->sigmod->set_span_sig_status) {
-               ftdm_log(FTDM_LOG_ERROR, "Cannot set signaling status in boost span: method not implemented\n");
-               return FTDM_NOTIMPL;
-       }
-       return sangoma_boost_data->sigmod->set_span_sig_status(span, status);
-}
-
-static FIO_SPAN_GET_SIG_STATUS_FUNCTION(sangoma_boost_get_span_sig_status)
-{
-       ftdm_sangoma_boost_data_t *sangoma_boost_data = span->signal_data;
-       if (!sangoma_boost_data->sigmod) {
-               return FTDM_FAIL;
-       }
-       if (!sangoma_boost_data->sigmod->get_span_sig_status) {
-               ftdm_log(FTDM_LOG_ERROR, "Cannot get signaling status in boost span: method not implemented\n");
-               return FTDM_NOTIMPL;
-       }
-       return sangoma_boost_data->sigmod->get_span_sig_status(span, status);
-}
-
-/**
- * \brief Initialises an sangoma boost span from configuration variables
- * \param span Span to configure
- * \param sig_cb Callback function for event signals
- * \param ap List of configuration variables
- * \return Success or failure
- */
-static FIO_CONFIGURE_SPAN_SIGNALING_FUNCTION(ftdm_sangoma_boost_configure_span)
-{
-#define FAIL_CONFIG_RETURN(retstatus) \
-               if (sangoma_boost_data) \
-                       ftdm_safe_free(sangoma_boost_data); \
-               if (err) \
-                       ftdm_safe_free(err) \
-               if (hash_locked) \
-                       ftdm_mutex_unlock(g_boost_modules_mutex); \
-               if (lib) \
-                       ftdm_dso_destroy(&lib); \
-               return retstatus;
-
-       boost_sigmod_interface_t *sigmod_iface = NULL;
-       ftdm_sangoma_boost_data_t *sangoma_boost_data = NULL;
-       const char *local_ip = "127.0.0.65", *remote_ip = "127.0.0.66";
-       const char *sigmod = NULL;
-       int local_port = 53000, remote_port = 53000;
-       const char *var = NULL, *val = NULL;
-       int hash_locked = 0;
-       ftdm_dso_lib_t lib = NULL;
-       char path[255] = "";
-       char *err = NULL;
-       unsigned int j = 0;
-       unsigned paramindex = 0;
-       ftdm_status_t rc = FTDM_SUCCESS;
-
-       for (; ftdm_parameters[paramindex].var; paramindex++) {
-               var = ftdm_parameters[paramindex].var;
-               val = ftdm_parameters[paramindex].val;
-               if (!strcasecmp(var, "sigmod")) {
-                       sigmod = val;
-               } else if (!strcasecmp(var, "local_ip")) {
-                       local_ip = val;
-               } else if (!strcasecmp(var, "remote_ip")) {
-                       remote_ip = val;
-               } else if (!strcasecmp(var, "local_port")) {
-                       local_port = atoi(val);
-               } else if (!strcasecmp(var, "remote_port")) {
-                       remote_port = atoi(val);
-               } else if (!strcasecmp(var, "outbound-called-ton")) {
-                       ftdm_set_ton(val, &span->default_caller_data.dnis.type);
-               } else if (!strcasecmp(var, "outbound-called-npi")) {
-                       ftdm_set_npi(val, &span->default_caller_data.dnis.plan);
-               } else if (!strcasecmp(var, "outbound-calling-ton")) {
-                       ftdm_set_ton(val, &span->default_caller_data.cid_num.type);
-               } else if (!strcasecmp(var, "outbound-calling-npi")) {
-                       ftdm_set_npi(val, &span->default_caller_data.cid_num.plan);
-               } else if (!strcasecmp(var, "outbound-rdnis-ton")) {
-                       ftdm_set_ton(val, &span->default_caller_data.rdnis.type);
-               } else if (!strcasecmp(var, "outbound-rdnis-npi")) {
-                       ftdm_set_npi(val, &span->default_caller_data.rdnis.plan);
-               } else if (!sigmod) {
-                       snprintf(span->last_error, sizeof(span->last_error), "Unknown parameter [%s]", var);
-                       FAIL_CONFIG_RETURN(FTDM_FAIL);
-               }
-       }
-
-       if (!sigmod) {
-#ifndef HAVE_NETINET_SCTP_H
-               ftdm_log(FTDM_LOG_CRIT, "No sigmod attribute in span %s, you must either specify a sigmod or re-compile with SCTP available to use socket mode boost!\n", span->name);
-               ftdm_set_string(span->last_error, "No sigmod configuration was set and there is no SCTP available!");
-               FAIL_CONFIG_RETURN(FTDM_FAIL);
-#else
-               if (!local_ip && local_port && remote_ip && remote_port && sig_cb) {
-                       ftdm_set_string(span->last_error, "missing Sangoma boost IP parameters");
-                       FAIL_CONFIG_RETURN(FTDM_FAIL);
-               }
-#endif
-       }
-
-       sangoma_boost_data = ftdm_calloc(1, sizeof(*sangoma_boost_data));
-       if (!sangoma_boost_data) {
-               FAIL_CONFIG_RETURN(FTDM_FAIL);
-       }
-
-       /* WARNING: be sure to release this mutex on errors inside this if() */
-       ftdm_mutex_lock(g_boost_modules_mutex);
-       hash_locked = 1;
-       if (sigmod && !(sigmod_iface = hashtable_search(g_boost_modules_hash, (void *)sigmod))) {
-               ftdm_build_dso_path(sigmod, path, sizeof(path));        
-               lib = ftdm_dso_open(path, &err);
-               if (!lib) {
-                       ftdm_log(FTDM_LOG_ERROR, "Error loading Sangoma boost signaling module '%s': %s\n", path, err);
-                       snprintf(span->last_error, sizeof(span->last_error), "Failed to load sangoma boost signaling module %s", path);
-
-                       FAIL_CONFIG_RETURN(FTDM_FAIL);
-               }
-               if (!(sigmod_iface = (boost_sigmod_interface_t *)ftdm_dso_func_sym(lib, BOOST_INTERFACE_NAME_STR, &err))) {
-                       ftdm_log(FTDM_LOG_ERROR, "Failed to read Sangoma boost signaling module interface '%s': %s\n", path, err);
-                       snprintf(span->last_error, sizeof(span->last_error), "Failed to read Sangoma boost signaling module interface '%s': %s", path, err);
-
-                       FAIL_CONFIG_RETURN(FTDM_FAIL);
-               }
-               rc = sigmod_iface->on_load();
-               if (rc != FTDM_SUCCESS) {
-                       ftdm_log(FTDM_LOG_ERROR, "Failed to load Sangoma boost signaling module interface '%s': on_load method failed (%d)\n", path, rc);
-                       FAIL_CONFIG_RETURN(FTDM_FAIL);
-               }
-               sigmod_iface->pvt = lib;
-               sigmod_iface->set_write_msg_cb(ftdm_boost_write_msg);
-               sigmod_iface->set_sig_status_cb(ftdm_boost_sig_status_change);
-               hashtable_insert(g_boost_modules_hash, (void *)sigmod_iface->name, sigmod_iface, HASHTABLE_FLAG_NONE);
-               lib = NULL; /* destroying the lib will be done when going down and NOT on FAIL_CONFIG_RETURN */
-       }
-       ftdm_mutex_unlock(g_boost_modules_mutex);
-       hash_locked = 0;
-
-       if (sigmod_iface) {
-               /* try to create the boost queue */
-               if (ftdm_queue_create(&sangoma_boost_data->boost_queue, BOOST_QUEUE_SIZE) != FTDM_SUCCESS) {
-                       ftdm_log(FTDM_LOG_ERROR, "Span %s could not create its boost queue!\n", span->name);
-                       FAIL_CONFIG_RETURN(FTDM_FAIL);
-               }
-               ftdm_log(FTDM_LOG_NOTICE, "Span %s will use Sangoma Boost Signaling Module %s\n", span->name, sigmod_iface->name);
-               sangoma_boost_data->sigmod = sigmod_iface;
-               sigmod_iface->configure_span(span, ftdm_parameters);
-       } else {
-               ftdm_log(FTDM_LOG_NOTICE, "Span %s will use boost socket mode\n", span->name);
-               ftdm_set_string(sangoma_boost_data->mcon.cfg.local_ip, local_ip);
-               sangoma_boost_data->mcon.cfg.local_port = local_port;
-               ftdm_set_string(sangoma_boost_data->mcon.cfg.remote_ip, remote_ip);
-               sangoma_boost_data->mcon.cfg.remote_port = remote_port;
-       }
-
-       for (j = 1; j <= span->chan_count; j++) {
-               span->channels[j]->call_data = ftdm_calloc(1, sizeof(sangoma_boost_call_t));
-               if (!span->channels[j]->call_data) {
-                       FAIL_CONFIG_RETURN(FTDM_FAIL);
-               }
-       }
-
-       span->signal_cb = sig_cb;
-       span->start = ftdm_sangoma_boost_start;
-       span->stop = ftdm_sangoma_boost_stop;
-       span->signal_data = sangoma_boost_data;
-       span->signal_type = FTDM_SIGTYPE_SANGOMABOOST;
-       span->outgoing_call = sangoma_boost_outgoing_call;
-       span->channel_request = sangoma_boost_channel_request;
-       span->get_channel_sig_status = sangoma_boost_get_channel_sig_status;
-       span->set_channel_sig_status = sangoma_boost_set_channel_sig_status;
-       span->get_span_sig_status = sangoma_boost_get_span_sig_status;
-       span->set_span_sig_status = sangoma_boost_set_span_sig_status;
-       span->state_map = &boost_state_map;
-       span->state_processor = state_advance;
-       sangoma_boost_data->mcon.debuglevel = FTDM_LOG_LEVEL_DEBUG;
-       sangoma_boost_data->pcon.debuglevel = FTDM_LOG_LEVEL_DEBUG;
-       ftdm_clear_flag(span, FTDM_SPAN_SUGGEST_CHAN_ID);
-       ftdm_set_flag(span, FTDM_SPAN_USE_CHAN_QUEUE);
-       if (sigmod_iface) {
-               /* the core will do the hunting */
-               span->channel_request = NULL;
-       } 
-       ftdm_set_flag_locked(span, FTDM_SPAN_SUSPENDED);
-       return FTDM_SUCCESS;
-}
-
-static ftdm_status_t ftdm_sangoma_boost_list_sigmods(ftdm_stream_handle_t *stream)
-{
-       ftdm_hash_iterator_t *i = NULL;
-       boost_sigmod_interface_t *sigmod_iface = NULL;
-       const void *key = NULL;
-       void *val = NULL;
-
-       stream->write_function(stream, "List of loaded sigmod modules:\n");
-       for (i = hashtable_first(g_boost_modules_hash); i; i = hashtable_next(i)) {
-               hashtable_this(i, &key, NULL, &val);
-               if (key && val) {
-                       sigmod_iface = val;
-                       stream->write_function(stream, "  %s\n", sigmod_iface->name);
-               }
-       }
-       stream->write_function(stream, "\n");
-       return FTDM_SUCCESS;
-}
-
-/**
- * \brief FreeTDM sangoma boost signaling module definition
- */
-EX_DECLARE_DATA ftdm_module_t ftdm_module = { 
-       /*.name =*/ "sangoma_boost",
-       /*.io_load =*/ ftdm_sangoma_boost_io_init,
-       /*.io_unload =*/ NULL,
-       /*.sig_load = */ ftdm_sangoma_boost_init,
-       /*.sig_configure =*/ NULL,
-       /*.sig_unload = */ftdm_sangoma_boost_destroy,
-       /*.configure_span_signaling = */ ftdm_sangoma_boost_configure_span
-};
-
-/* For Emacs:
- * Local Variables:
- * mode:c
- * indent-tabs-mode:t
- * tab-width:4
- * c-basic-offset:4
- * End:
- * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4:
- */
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_boost/sangoma_boost_client.c b/libs/freetdm/src/ftmod/ftmod_sangoma_boost/sangoma_boost_client.c
deleted file mode 100644 (file)
index 6ddb74d..0000000
+++ /dev/null
@@ -1,589 +0,0 @@
-/*
- * Copyright (c) 2007, Anthony Minessale II, Nenad Corbic
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 
- * * Neither the name of the original author; nor the names of any contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- * 
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER
- * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#define _GNU_SOURCE
-
-#if HAVE_NETDB_H
-#include <netdb.h>
-#endif
-
-#include "freetdm.h"
-#include "sangoma_boost_client.h"
-
-#ifndef HAVE_GETHOSTBYNAME_R
-extern int gethostbyname_r (const char *__name, 
-                                                       struct hostent *__result_buf, 
-                                                       char *__buf, size_t __buflen, 
-                                                       struct hostent **__result, 
-                                                       int *__h_errnop);
-#endif
-
-struct sangomabc_map {
-       uint32_t event_id;
-       const char *name;
-};
-
-static struct sangomabc_map sangomabc_table[] = {
-       {SIGBOOST_EVENT_CALL_START, "CALL_START"},
-       {SIGBOOST_EVENT_CALL_START_ACK, "CALL_START_ACK"}, 
-       {SIGBOOST_EVENT_CALL_START_NACK, "CALL_START_NACK"},
-       {SIGBOOST_EVENT_CALL_PROGRESS, "CALL PROGRESS"},
-       {SIGBOOST_EVENT_CALL_START_NACK_ACK, "CALL_START_NACK_ACK"}, 
-       {SIGBOOST_EVENT_CALL_ANSWERED, "CALL_ANSWERED"}, 
-       {SIGBOOST_EVENT_CALL_STOPPED, "CALL_STOPPED"}, 
-       {SIGBOOST_EVENT_CALL_STOPPED_ACK, "CALL_STOPPED_ACK"}, 
-       {SIGBOOST_EVENT_CALL_RELEASED, "CALL_RELEASED"}, 
-       {SIGBOOST_EVENT_SYSTEM_RESTART, "SYSTEM_RESTART"}, 
-       {SIGBOOST_EVENT_SYSTEM_RESTART_ACK, "SYSTEM_RESTART_ACK"}, 
-       {SIGBOOST_EVENT_HEARTBEAT, "HEARTBEAT"}, 
-       {SIGBOOST_EVENT_INSERT_CHECK_LOOP, "LOOP START"}, 
-       {SIGBOOST_EVENT_REMOVE_CHECK_LOOP, "LOOP STOP"},
-       {SIGBOOST_EVENT_AUTO_CALL_GAP_ABATE, "AUTO_CALL_GAP_ABATE"},
-       {SIGBOOST_EVENT_DIGIT_IN, "DIGIT_IN"}
-}; 
-
-
-
-static void sangomabc_print_event_call(sangomabc_connection_t *mcon, sangomabc_event_t *event, int priority, int dir, const char *file, const char *func, int line)
-{
-       if (event->event_id == SIGBOOST_EVENT_HEARTBEAT)
-               return;
-
-       ftdm_log(file, func, line, mcon->debuglevel, "%s EVENT (%s): %s:(%X) [w%dg%d] CSid=%i Seq=%i Cn=[%s] Cd=[%s] Ci=[%s] Rdnis=[%s]\n",
-                   dir ? "TX":"RX",
-                       priority ? "P":"N",
-                       sangomabc_event_id_name(event->event_id),
-                       event->event_id,
-                       BOOST_EVENT_SPAN(mcon->sigmod, event),
-                       BOOST_EVENT_CHAN(mcon->sigmod, event),
-                       event->call_setup_id,
-                       event->fseqno,
-                       strlen(event->calling_name)?event->calling_name:"N/A",
-                       (event->called_number_digits_count ? (char *) event->called_number_digits : "N/A"),
-                       (event->calling_number_digits_count ? (char *) event->calling_number_digits : "N/A"),
-                       event->isup_in_rdnis);
-
-}
-static void sangomabc_print_event_short(sangomabc_connection_t *mcon, sangomabc_short_event_t *event, int priority, int dir, const char *file, const char *func, int line)
-{
-       if (event->event_id == SIGBOOST_EVENT_HEARTBEAT)
-               return;
-       ftdm_log(file, func, line, mcon->debuglevel, "%s EVENT (%s): %s:(%X) [s%dc%d] Rc=%i CSid=%i Seq=%i \n",
-                          dir ? "TX":"RX", 
-                          priority ? "P":"N",
-                           sangomabc_event_id_name(event->event_id), 
-                           event->event_id, 
-                          BOOST_EVENT_SPAN(mcon->sigmod, event),
-                          BOOST_EVENT_CHAN(mcon->sigmod, event),
-                           event->release_cause, 
-                           event->call_setup_id, 
-                           event->fseqno);
-}
-
-
-static int create_conn_socket(sangomabc_connection_t *mcon, char *local_ip, int local_port, char *ip, int port)
-{
-#ifndef WIN32
-       int rc;
-       struct hostent *result, *local_result;
-       char buf[512], local_buf[512];
-       int err = 0, local_err = 0;
-
-       if (mcon->sigmod) {
-               ftdm_log(FTDM_LOG_WARNING, "I should not be called on a sigmod-managed connection!\n");
-               return 0;
-       }
-
-       memset(&mcon->remote_hp, 0, sizeof(mcon->remote_hp));
-       memset(&mcon->local_hp, 0, sizeof(mcon->local_hp));
-#ifdef HAVE_NETINET_SCTP_H
-       ftdm_log(FTDM_LOG_DEBUG, "Creating SCTP socket L=%s:%d R=%s:%d\n", 
-                       local_ip, local_port, ip, port);
-       mcon->socket = socket(AF_INET, SOCK_SEQPACKET, IPPROTO_SCTP);
-#else
-       ftdm_log(FTDM_LOG_DEBUG, "Creating UDP socket L=%s:%d R=%s:%d\n", 
-                       local_ip, local_port, ip, port);
-       mcon->socket = socket(AF_INET, SOCK_DGRAM, 0);
-#endif
-       if (mcon->socket >= 0) {
-               int flag;
-
-               flag = 1;
-#ifdef HAVE_GETHOSTBYNAME_R_FIVE
-               gethostbyname_r(ip, &mcon->remote_hp, buf, sizeof(buf), &err);
-               gethostbyname_r(local_ip, &mcon->local_hp, local_buf, sizeof(local_buf), &local_err);
-               if (!err && !local_err) {
-#else
-               gethostbyname_r(ip, &mcon->remote_hp, buf, sizeof(buf), &result, &err);
-               gethostbyname_r(local_ip, &mcon->local_hp, local_buf, sizeof(local_buf), &local_result, &local_err);
-               if (result && local_result) {
-#endif
-                       mcon->remote_addr.sin_family = mcon->remote_hp.h_addrtype;
-                       memcpy((char *) &mcon->remote_addr.sin_addr.s_addr, mcon->remote_hp.h_addr_list[0], mcon->remote_hp.h_length);
-                       mcon->remote_addr.sin_port = htons(port);
-
-                       mcon->local_addr.sin_family = mcon->local_hp.h_addrtype;
-                       memcpy((char *) &mcon->local_addr.sin_addr.s_addr, mcon->local_hp.h_addr_list[0], mcon->local_hp.h_length);
-                       mcon->local_addr.sin_port = htons(local_port);
-
-#ifdef HAVE_NETINET_SCTP_H
-                       setsockopt(mcon->socket, IPPROTO_SCTP, SCTP_NODELAY, 
-                                          (char *)&flag, sizeof(int));
-#endif
-
-                       if ((rc = bind(mcon->socket, 
-                                                  (struct sockaddr *) &mcon->local_addr, 
-                                                  sizeof(mcon->local_addr))) < 0) {
-                               close(mcon->socket);
-                               mcon->socket = -1;
-                       } else {
-#ifdef HAVE_NETINET_SCTP_H
-                               rc=listen(mcon->socket, 100);
-                               if (rc) {
-                                       close(mcon->socket);
-                                       mcon->socket = -1;
-                               }
-#endif
-                       }
-               }
-       }
-
-       return mcon->socket;
-#else
-       return 0;
-#endif // ifndef WIN32
-}
-
-int sangomabc_connection_close(sangomabc_connection_t *mcon)
-{
-#ifndef WIN32
-       if (mcon->sigmod) {
-               ftdm_log(FTDM_LOG_WARNING, "I should not be called on a sigmod-managed connection!\n");
-               return 0;
-       }
-       if (mcon->socket > -1) {
-               close(mcon->socket);
-       }
-
-       if (mcon->mutex) {
-               ftdm_mutex_lock(mcon->mutex);
-               ftdm_mutex_unlock(mcon->mutex);
-               ftdm_mutex_destroy(&mcon->mutex);
-       }
-       memset(mcon, 0, sizeof(*mcon));
-       mcon->socket = -1;
-#endif
-       return 0;
-}
-
-int sangomabc_connection_open(sangomabc_connection_t *mcon, char *local_ip, int local_port, char *ip, int port)
-{
-       ftdm_mutex_create(&mcon->mutex);
-       if (mcon->sigmod) {
-               /*value of mcon->socket will be ignored in sigmod mode */
-               return 0;
-       }
-#ifndef WIN32
-       create_conn_socket(mcon, local_ip, local_port, ip, port);
-       return mcon->socket;
-#else
-       return 0;
-#endif
-}
-
-
-int sangomabc_exec_command(sangomabc_connection_t *mcon, int span, int chan, int id, int cmd, int cause, int flags)
-{
-       sangomabc_event_t *oevent;
-       sangomabc_short_event_t sevent;
-       sangomabc_event_t fevent;
-       int retry = 5;
-
-       if (boost_full_event(cmd)) {
-               sangomabc_event_init((void *)&fevent, cmd, chan, span);
-               oevent = &fevent;
-       } else {
-               sangomabc_event_init(&sevent, cmd, chan, span);
-               sevent.release_cause = (uint8_t)cause;
-               oevent = (sangomabc_event_t *)&sevent;
-       }
-       oevent->flags = flags;
-
-       if (cmd == SIGBOOST_EVENT_SYSTEM_RESTART || cmd == SIGBOOST_EVENT_SYSTEM_RESTART_ACK) {
-               mcon->rxseq_reset = 1;
-               mcon->txseq = 0;
-               mcon->rxseq = 0;
-               mcon->txwindow = 0;
-       }
-
-       if (id >= 0) {
-               oevent->call_setup_id = (uint16_t)id;
-       }
-
-       while (sangomabc_connection_write(mcon, (sangomabc_event_t*)oevent) <= 0) {
-               if (--retry <= 0) {
-                   ftdm_log(FTDM_LOG_CRIT, "Failed to tx on boost socket: %s\n", strerror(errno));
-                   return -1;
-               } else {
-                   ftdm_log(FTDM_LOG_WARNING, "Failed to tx on boost socket: %s :retry %i\n", strerror(errno), retry);
-                   ftdm_sleep(1);
-               }
-       }
-
-       return 0;
-}
-
-
-int sangomabc_exec_commandp(sangomabc_connection_t *pcon, int span, int chan, int id, int cmd, int cause)
-{
-    sangomabc_short_event_t oevent;
-    int retry = 5;
-
-    sangomabc_event_init(&oevent, cmd, chan, span);
-    oevent.release_cause = (uint8_t)cause;
-
-    if (id >= 0) {
-        oevent.call_setup_id = (uint16_t)id;
-    }
-
-    while (sangomabc_connection_writep(pcon, (sangomabc_event_t*)&oevent) <= 0) {
-        if (--retry <= 0) {
-            ftdm_log(FTDM_LOG_CRIT, "Failed to tx on boost socket: %s\n", strerror(errno));
-            return -1;
-        } else {
-            ftdm_log(FTDM_LOG_WARNING, "Failed to tx on boost socket: %s :retry %i\n", strerror(errno), retry);
-                       ftdm_sleep(1);
-        }
-    }
-
-    return 0;
-}
-
-sangomabc_event_t *__sangomabc_connection_read(sangomabc_connection_t *mcon, int iteration, const char *file, const char *func, int line)
-{
-#ifndef WIN32
-       unsigned int fromlen = sizeof(struct sockaddr_in);
-#endif
-       int bytes = 0;
-       int msg_ok = 0;
-       sangomabc_queue_element_t *e = NULL;
-
-       if (mcon->sigmod) {
-               e = ftdm_queue_dequeue(mcon->boost_queue);
-               if (e) {
-                       bytes = (int)e->size;
-                       memcpy(&mcon->event, e->boostmsg, bytes);
-                       ftdm_safe_free(e);
-               }
-       } 
-#ifndef WIN32  
-       else {
-               bytes = recvfrom(mcon->socket, &mcon->event, sizeof(mcon->event), MSG_DONTWAIT, 
-                                                (struct sockaddr *) &mcon->local_addr, &fromlen);
-       }
-#endif
-       if (bytes <= 0) {
-               return NULL;
-       }
-
-       if (mcon->event.version != SIGBOOST_VERSION) {
-               ftdm_log(FTDM_LOG_CRIT, "Invalid Boost Version %i  Expecting %i\n",mcon->event.version, SIGBOOST_VERSION);
-       }   
-
-       if ((bytes >= MIN_SIZE_CALLSTART_MSG) && boost_full_event(mcon->event.event_id)) {
-               msg_ok=1;
-               
-       } else if (bytes == sizeof(sangomabc_short_event_t)) {
-               msg_ok=1;
-
-       } else {
-               msg_ok=0;
-       }
-
-       if (msg_ok) {
-               if (sangomabc_test_flag(mcon, MSU_FLAG_DOWN)) {
-                       if (mcon->event.event_id != SIGBOOST_EVENT_SYSTEM_RESTART && 
-                               mcon->event.event_id != SIGBOOST_EVENT_SYSTEM_RESTART_ACK && 
-                               mcon->event.event_id != SIGBOOST_EVENT_HEARTBEAT) {
-                               ftdm_log(file, func, line, FTDM_LOG_LEVEL_WARNING, "Not reading packets when connection is down. [%s]\n", 
-                                               sangomabc_event_id_name(mcon->event.event_id));
-                               return NULL;
-                       }
-               }
-               
-               if  (boost_full_event(mcon->event.event_id)) {
-                       sangomabc_print_event_call(mcon, &mcon->event, 0, 0, file, func, line);
-               } else {
-                       sangomabc_print_event_short(mcon, (sangomabc_short_event_t*)&mcon->event, 0, 0, file, func, line);
-               }
-
-#if 0
-/* NC: NOT USED ANY MORE */
-               if (mcon->rxseq_reset) {
-                       //if (mcon->event.event_id == SIGBOOST_EVENT_SYSTEM_RESTART_ACK) {
-                               ftdm_log(FTDM_LOG_DEBUG, "Rx sync ok\n");
-                               mcon->rxseq = mcon->event.fseqno;
-                               return &mcon->event;
-                               //}
-                       errno=EAGAIN;
-                       ftdm_log(FTDM_LOG_DEBUG, "Waiting for rx sync...\n");
-                       return NULL;
-               }
-#endif
-               
-               mcon->txwindow = mcon->txseq - mcon->event.bseqno;
-               mcon->rxseq++;
-
-#if 0
-               if (mcon->rxseq != mcon->event.fseqno) {
-                       ftdm_log(FTDM_LOG_CRIT, "Invalid Sequence Number Expect=%i Rx=%i\n", mcon->rxseq, mcon->event.fseqno);
-                       return NULL;
-               }
-#endif
-
-               return &mcon->event;
-       } else {
-               if (iteration == 0) {
-                       ftdm_log(FTDM_LOG_CRIT, "NC -  Invalid Event length from boost rxlen=%i evsz=%i\n", bytes, sizeof(mcon->event));
-                       return NULL;
-               }
-       }
-
-       return NULL;
-}
-
-sangomabc_event_t *__sangomabc_connection_readp(sangomabc_connection_t *mcon, int iteration, const char *file, const char *func, int line)
-{
-#ifndef WIN32
-       unsigned int fromlen = sizeof(struct sockaddr_in);
-#endif
-       int bytes = 0;
-
-       if (mcon->sigmod) {
-               /* priority stuff is handled just the same when there is a sigmod */
-               return sangomabc_connection_read(mcon, iteration);
-       } 
-#ifndef WIN32
-       else {
-               bytes = recvfrom(mcon->socket, &mcon->event, sizeof(mcon->event), MSG_DONTWAIT, (struct sockaddr *) &mcon->local_addr, &fromlen);
-       }
-#endif 
-       if (bytes <= 0) {
-               return NULL;
-       }
-
-    if (mcon->event.version != SIGBOOST_VERSION) {
-               ftdm_log(FTDM_LOG_CRIT, "Invalid Boost Version %i  Expecting %i\n",mcon->event.version, SIGBOOST_VERSION);
-    }   
-
-       if (bytes == sizeof(sangomabc_short_event_t)) {
-
-               if  (boost_full_event(mcon->event.event_id)) {
-                       sangomabc_print_event_call(mcon, &mcon->event, 1, 0, file, func, line);
-               } else {
-                       sangomabc_print_event_short(mcon, (sangomabc_short_event_t*)&mcon->event, 1, 0, file, func, line);
-               }
-
-               return &mcon->event;
-       } else {
-               if (iteration == 0) {
-                       ftdm_log(FTDM_LOG_CRIT, "Critical Error: PQ Invalid Event lenght from boost rxlen=%i evsz=%i\n", bytes, sizeof(mcon->event));
-                       return NULL;
-               }
-       }
-
-       return NULL;
-}
-
-
-int __sangomabc_connection_write(sangomabc_connection_t *mcon, sangomabc_event_t *event, const char *file, const char *func, int line)
-{
-       int err = 0;
-       int event_size=MIN_SIZE_CALLSTART_MSG+event->isup_in_rdnis_size;
-
-       ftdm_assert_return(event != NULL, -1, "No event!");
-       ftdm_assert_return(mcon->socket >= 0, -1, "No mcon->socket!");
-       ftdm_assert_return(mcon->mutex != NULL, -1, "No mcon->mutex!");
-
-       ftdm_assert_return(event->span <= FTDM_MAX_PHYSICAL_SPANS_PER_LOGICAL_SPAN, -1, "Invalid span when writing boost event\n");
-       ftdm_assert_return(event->chan <= FTDM_MAX_CHANNELS_PHYSICAL_SPAN, -1, "Invalid chan when writing boost event\n");
-
-       if (!boost_full_event(event->event_id)) {
-               event_size=sizeof(sangomabc_short_event_t);
-       }       
-
-       if (sangomabc_test_flag(mcon, MSU_FLAG_DOWN)) {
-               if (event->event_id != SIGBOOST_EVENT_SYSTEM_RESTART && 
-                       event->event_id != SIGBOOST_EVENT_SYSTEM_RESTART_ACK && 
-                       event->event_id != SIGBOOST_EVENT_HEARTBEAT) {
-                       ftdm_log(file, func, line, FTDM_LOG_LEVEL_WARNING, "Not writing packets when connection is down. [%s]\n",
-                                       sangomabc_event_id_name(event->event_id));
-                       return 0;
-               }
-       }
-
-       ftdm_mutex_lock(mcon->mutex);
-       if (event->event_id == SIGBOOST_EVENT_SYSTEM_RESTART_ACK) {
-               mcon->txseq=0;
-               mcon->rxseq=0;
-               event->fseqno=0;        
-       } else {
-               event->fseqno = mcon->txseq++;
-       }
-       event->bseqno = mcon->rxseq;
-       event->version = SIGBOOST_VERSION; 
-
-       if (boost_full_event(event->event_id)) {
-               sangomabc_print_event_call(mcon, event, 0, 1, file, func, line);
-       } else {
-               sangomabc_print_event_short(mcon, (sangomabc_short_event_t*)event, 0, 1, file, func, line);
-       }
-
-       if (mcon->sigmod) {
-               mcon->sigmod->write_msg(mcon->span, event, event_size);
-               err = event_size;
-       } 
-#ifndef WIN32
-       else {
-               err = sendto(mcon->socket, event, event_size, 0, (struct sockaddr *) &mcon->remote_addr, sizeof(mcon->remote_addr));
-       }
-#endif
-
-       ftdm_mutex_unlock(mcon->mutex);
-
-       ftdm_assert_return(err == event_size, -1, "Failed to send the boost message completely!");
-
-       return err;
-}
-
-
-int __sangomabc_connection_writep(sangomabc_connection_t *mcon, sangomabc_event_t *event, const char *file, const char *func, int line)
-{
-       int err = 0;
-       int event_size=sizeof(sangomabc_event_t);
-
-       if (!mcon->sigmod) {
-               ftdm_assert_return(event != NULL, -1, "No event!");
-               ftdm_assert_return(mcon->socket >= 0, -1, "No mcon->socket!");
-               ftdm_assert_return(mcon->mutex != NULL, -1, "No mcon->mutex!");
-       }
-    
-       if (!boost_full_event(event->event_id)) {
-               event_size=sizeof(sangomabc_short_event_t);
-       }       
-
-       ftdm_mutex_lock(mcon->mutex);
-       event->version = SIGBOOST_VERSION; 
-       if (mcon->sigmod) {
-               mcon->sigmod->write_msg(mcon->span, event, event_size);
-           err = event_size;
-
-       } 
-#ifndef WIN32
-       else {
-               err = sendto(mcon->socket, event, event_size, 0, (struct sockaddr *) &mcon->remote_addr, sizeof(mcon->remote_addr));
-       }
-#endif
-       ftdm_mutex_unlock(mcon->mutex);
-
-       ftdm_assert_return(err == event_size, -1, "Failed to send boost message completely!");
-
-       if (boost_full_event(event->event_id)) {
-               sangomabc_print_event_call(mcon, event, 1, 1, file, func, line);
-       } else {
-               sangomabc_print_event_short(mcon, (sangomabc_short_event_t*)event, 1, 1, file, func, line);
-       }
-
-       return err;
-}
-
-
-void sangomabc_call_init(sangomabc_event_t *event, const char *calling, const char *called, int setup_id)
-{
-       memset(event, 0, sizeof(sangomabc_event_t));
-       event->event_id = SIGBOOST_EVENT_CALL_START;
-
-       if (calling) {
-               strncpy((char*)event->calling_number_digits, calling, sizeof(event->calling_number_digits)-1);
-               event->calling_number_digits_count = (uint8_t)strlen(calling);
-       }
-
-       if (called) {
-               strncpy((char*)event->called_number_digits, called, sizeof(event->called_number_digits)-1);
-               event->called_number_digits_count = (uint8_t)strlen(called);
-       }
-               
-       event->call_setup_id = (uint16_t)setup_id;
-       
-}
-
-void sangomabc_event_init(sangomabc_short_event_t *event, sangomabc_event_id_t event_id, int chan, int span)
-{
-       if (boost_full_event(event_id)) {
-               memset(event, 0, sizeof(sangomabc_event_t));
-       } else {
-               memset(event, 0, sizeof(sangomabc_short_event_t));
-       }
-       event->event_id = event_id;
-       event->chan = (uint8_t)chan;
-       event->span = (uint8_t)span;
-}
-
-const char *sangomabc_event_id_name(uint32_t event_id)
-{
-       unsigned int x;
-       const char *ret = NULL;
-
-       for (x = 0 ; x < sizeof(sangomabc_table)/sizeof(struct sangomabc_map); x++) {
-               if (sangomabc_table[x].event_id == event_id) {
-                       ret = sangomabc_table[x].name;
-                       break;
-               }
-       }
-
-       return ret;
-}
-
-
-/* For Emacs:
- * Local Variables:
- * mode:c
- * indent-tabs-mode:t
- * tab-width:4
- * c-basic-offset:4
- * End:
- * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4:
- */
-
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_boost/sangoma_boost_client.h b/libs/freetdm/src/ftmod/ftmod_sangoma_boost/sangoma_boost_client.h
deleted file mode 100644 (file)
index e333c4a..0000000
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * Copyright (c) 2007, Anthony Minessale II, Nenad Corbic
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 
- * * Neither the name of the original author; nor the names of any contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- * 
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER
- * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef _SANGOMABC_H
-#define _SANGOMABC_H
-
-#include "sangoma_boost_interface.h"
-
-#include <ctype.h>
-#include <string.h>
-#ifndef WIN32
-#include <unistd.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#ifdef HAVE_NETINET_SCTP_H
-#include <netinet/sctp.h>
-#endif
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <sys/time.h>
-#endif
-#include <stdlib.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <stdarg.h>
-#include "sigboost.h"
-
-#define sangomabc_test_flag(p,flag) ((p)->flags & (flag))
-
-#define sangomabc_set_flag(p,flag)             do {            \
-               ((p)->flags |= (flag));                                 \
-       } while (0)
-
-#define sangomabc_clear_flag(p,flag)           do {    \
-               ((p)->flags &= ~(flag));                                \
-       } while (0)
-
-#define sangomabc_copy_flags(dest,src,flagz)   do {    \
-               (dest)->flags &= ~(flagz);                                      \
-               (dest)->flags |= ((src)->flags & (flagz));      \
-       } while (0)
-
-typedef  t_sigboost_callstart sangomabc_event_t;
-typedef  t_sigboost_short sangomabc_short_event_t;
-typedef uint32_t sangomabc_event_id_t;
-
-typedef struct sangomabc_ip_cfg
-{
-       char local_ip[25];
-       int local_port;
-       char remote_ip[25];
-       int remote_port;
-}sangomabc_ip_cfg_t;
-
-typedef enum {
-       MSU_FLAG_EVENT = (1 << 0),
-       MSU_FLAG_DOWN = (1 << 1)
-} sangomabc_flag_t;
-
-
-struct sangomabc_connection {
-       ftdm_socket_t socket;
-       struct sockaddr_in local_addr;
-       struct sockaddr_in remote_addr;
-       sangomabc_event_t event;
-       struct hostent remote_hp;
-       struct hostent local_hp;
-       unsigned int flags;
-       ftdm_mutex_t *mutex;
-       FILE *log;
-       unsigned int txseq;
-       unsigned int rxseq;
-       unsigned int txwindow;
-       unsigned int rxseq_reset;
-       sangomabc_ip_cfg_t cfg;
-       /* boost signaling mod interface pointer (if not working in TCP mode) */
-       boost_sigmod_interface_t *sigmod;
-       ftdm_queue_t *boost_queue;      
-       ftdm_interrupt_t *sock_interrupt;
-       ftdm_span_t *span;
-       int debuglevel;
-};
-
-typedef struct sangomabc_connection sangomabc_connection_t;
-
-typedef struct sangomabc_queue_element {
-       unsigned char boostmsg[sizeof(sangomabc_event_t)];
-       ftdm_size_t size;
-} sangomabc_queue_element_t;
-
-/* disable nagle's algorythm */
-static __inline__ void sctp_no_nagle(int socket)
-{
-#ifdef HAVE_NETINET_SCTP_H
-    int flag = 1;
-    setsockopt(socket, IPPROTO_SCTP, SCTP_NODELAY, (char *) &flag, sizeof(int));
-#endif
-}
-
-int sangomabc_connection_close(sangomabc_connection_t *mcon);
-int sangomabc_connection_open(sangomabc_connection_t *mcon, char *local_ip, int local_port, char *ip, int port);
-sangomabc_event_t *__sangomabc_connection_read(sangomabc_connection_t *mcon, int iteration, const char *file, const char *func, int line);
-sangomabc_event_t *__sangomabc_connection_readp(sangomabc_connection_t *mcon, int iteration, const char *file, const char *func, int line);
-int __sangomabc_connection_write(sangomabc_connection_t *mcon, sangomabc_event_t *event, const char *file, const char *func, int line);
-int __sangomabc_connection_writep(sangomabc_connection_t *mcon, sangomabc_event_t *event, const char *file, const char *func, int line);
-#define sangomabc_connection_write(_m,_e) __sangomabc_connection_write(_m, _e, __FILE__, __FUNCTION__, __LINE__)
-#define sangomabc_connection_writep(_m,_e) __sangomabc_connection_writep(_m, _e, __FILE__, __FUNCTION__, __LINE__)
-#define sangomabc_connection_read(_m,_e) __sangomabc_connection_read(_m, _e, __FILE__, __FUNCTION__, __LINE__)
-#define sangomabc_connection_readp(_m,_e) __sangomabc_connection_readp(_m, _e, __FILE__, __FUNCTION__, __LINE__)
-void sangomabc_event_init(sangomabc_short_event_t *event, sangomabc_event_id_t event_id, int chan, int span);
-void sangomabc_call_init(sangomabc_event_t *event, const char *calling, const char *called, int setup_id);
-const char *sangomabc_event_id_name(uint32_t event_id);
-int sangomabc_exec_command(sangomabc_connection_t *mcon, int span, int chan, int id, int cmd, int cause, int flags);
-int sangomabc_exec_commandp(sangomabc_connection_t *pcon, int span, int chan, int id, int cmd, int cause);
-
-#define BOOST_EVENT_SPAN(sigmod, event) ((sigmod) ? event->span : event->span + 1)
-#define BOOST_EVENT_CHAN(sigmod, event) ((sigmod) ? event->chan : event->chan + 1)
-
-
-#endif
-
-
-/* For Emacs:
- * Local Variables:
- * mode:c
- * indent-tabs-mode:t
- * tab-width:4
- * c-basic-offset:4
- * End:
- * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4:
- */
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_boost/sangoma_boost_interface.h b/libs/freetdm/src/ftmod/ftmod_sangoma_boost/sangoma_boost_interface.h
deleted file mode 100644 (file)
index f6130db..0000000
+++ /dev/null
@@ -1,254 +0,0 @@
-/*
- * Copyright (c) 2009, Sangoma Technologies
- * Moises Silva <moy@sangoma.com>
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 
- * * Neither the name of the original author; nor the names of any contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- * 
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER
- * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef SANGOMA_BOOST_INTERFACE_H
-#define SANGOMA_BOOST_INTERFACE_H
-
-#include "private/ftdm_core.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*! 
-  \brief Callback used to notify signaling status changes on a channel
-  \param ftdmchan The freetdm channel where the signaling status just changed
-  \param status The new signaling status
- */
-#define BOOST_SIG_STATUS_CB_ARGS (ftdm_channel_t *ftdmchan, ftdm_signaling_status_t status)
-typedef void (*boost_sig_status_cb_func_t) BOOST_SIG_STATUS_CB_ARGS;
-#define BOOST_SIG_STATUS_CB_FUNCTION(name) void name BOOST_SIG_STATUS_CB_ARGS
-
-/*! 
-  \brief Write a boost msg to a boost endpoint 
-  \param span The freetdm span where this msg was generated
-  \param msg The generic message pointer, owned by the caller
-  \param msglen The length of the provided structure pointed by msg
-  \return FTDM_SUCCESS or FTDM_FAIL
-
-   The msg buffer is owned by the caller and it should
-   be either t_sigboost_callstart or t_sigboost_short
-   the endpoint receiving the msg will first cast to
-   t_sigboost_short, check the event type, and if needed.
- */
-#define BOOST_WRITE_MSG_ARGS (ftdm_span_t *span, void *msg, ftdm_size_t msglen)
-typedef ftdm_status_t (*boost_write_msg_func_t) BOOST_WRITE_MSG_ARGS;
-#define BOOST_WRITE_MSG_FUNCTION(name) ftdm_status_t name BOOST_WRITE_MSG_ARGS
-
-/*! 
-  \brief Set the callback to be used by a signaling module to write boost messages
-  \param callback The callback to be used by the signaling module
-
-   The provided callback will be used for the signaling boost module to notify the
-   user with boost messages.
- */
-#define BOOST_SET_WRITE_MSG_CB_ARGS (boost_write_msg_func_t callback)
-typedef void (*boost_set_write_msg_cb_func_t) BOOST_SET_WRITE_MSG_CB_ARGS;
-#define BOOST_SET_WRITE_MSG_CB_FUNCTION(name) void name BOOST_SET_WRITE_MSG_CB_ARGS
-
-/*! 
-  \brief Notify hardware status change
-  \param ftdmchan The freetdm channel
-  \param status The hw status 
-  \return FTDM_SUCCESS or FTDM_FAIL 
- */
-#define BOOST_ON_HW_LINK_STATUS_CHANGE_ARGS (ftdm_channel_t *ftdmchan, ftdm_channel_hw_link_status_t status)
-typedef void (*boost_on_hw_link_status_change_func_t) BOOST_ON_HW_LINK_STATUS_CHANGE_ARGS;
-#define BOOST_ON_HW_LINK_STATUS_CHANGE_FUNCTION(name) void name BOOST_ON_HW_LINK_STATUS_CHANGE_ARGS
-
-/*! 
-  \brief Set signaling status callback used by the signaling module to report signaling status changes
-  \param callback The callback to be used by the signaling module
-
-   The provided callback will be used for the signaling boost module to notify the
-   user with signaling link status changes.
- */
-#define BOOST_SET_SIG_STATUS_CB_ARGS (boost_sig_status_cb_func_t callback)
-typedef void (*boost_set_sig_status_cb_func_t) BOOST_SET_SIG_STATUS_CB_ARGS;
-#define BOOST_SET_SIG_STATUS_CB_FUNCTION(name) void name BOOST_SET_SIG_STATUS_CB_ARGS
-
-/*! 
-  \brief Get the signaling status on the given channel.
-  \param ftdmchan The freetdm channel
-  \param status The status pointer where the current signaling status will be set
- */
-#define BOOST_GET_CHANNEL_SIG_STATUS_ARGS (ftdm_channel_t *ftdmchan, ftdm_signaling_status_t *status)
-typedef ftdm_status_t (*boost_get_channel_sig_status_func_t) BOOST_GET_CHANNEL_SIG_STATUS_ARGS;
-#define BOOST_GET_CHANNEL_SIG_STATUS_FUNCTION(name) ftdm_status_t name BOOST_GET_CHANNEL_SIG_STATUS_ARGS
-
-/*! 
-  \brief Set the signaling status on the given channel.
-  \param ftdmchan The freetdm channel
-  \param status The new status for the channel
-  \return FTDM_SUCCESS or FTDM_FAIL 
- */
-#define BOOST_SET_CHANNEL_SIG_STATUS_ARGS (ftdm_channel_t *ftdmchan, ftdm_signaling_status_t status)
-typedef ftdm_status_t (*boost_set_channel_sig_status_func_t) BOOST_SET_CHANNEL_SIG_STATUS_ARGS;
-#define BOOST_SET_CHANNEL_SIG_STATUS_FUNCTION(name) ftdm_status_t name BOOST_SET_CHANNEL_SIG_STATUS_ARGS
-
-/*! 
-  \brief Get the signaling status on the given span.
-  \param span The freetdm span 
-  \param status The status pointer where the current signaling status will be set
- */
-#define BOOST_GET_SPAN_SIG_STATUS_ARGS (ftdm_span_t *span, ftdm_signaling_status_t *status)
-typedef ftdm_status_t (*boost_get_span_sig_status_func_t) BOOST_GET_SPAN_SIG_STATUS_ARGS;
-#define BOOST_GET_SPAN_SIG_STATUS_FUNCTION(name) ftdm_status_t name BOOST_GET_SPAN_SIG_STATUS_ARGS
-
-/*! 
-  \brief Set the signaling status on the given span.
-  \param ftdmchan The freetdm span
-  \param status The new status for the span
-  \return FTDM_SUCCESS or FTDM_FAIL 
- */
-#define BOOST_SET_SPAN_SIG_STATUS_ARGS (ftdm_span_t *span, ftdm_signaling_status_t status)
-typedef ftdm_status_t (*boost_set_span_sig_status_func_t) BOOST_SET_SPAN_SIG_STATUS_ARGS;
-#define BOOST_SET_SPAN_SIG_STATUS_FUNCTION(name) ftdm_status_t name BOOST_SET_SPAN_SIG_STATUS_ARGS
-
-/*! 
-  \brief Configure the given span signaling
-  \param span The freetdm span
-  \param parameters The array of configuration key,value pairs (must be null terminated)
-  \return FTDM_SUCCESS or FTDM_FAIL 
- */
-#define BOOST_CONFIGURE_SPAN_ARGS (ftdm_span_t *span, ftdm_conf_parameter_t *parameters) 
-typedef ftdm_status_t (*boost_configure_span_func_t) BOOST_CONFIGURE_SPAN_ARGS;
-#define BOOST_CONFIGURE_SPAN_FUNCTION(name) ftdm_status_t name BOOST_CONFIGURE_SPAN_ARGS
-
-/*! 
-  \brief Start the given span
-  \param span The freetdm span
-  \return FTDM_SUCCESS or FTDM_FAIL 
- */
-#define BOOST_START_SPAN_ARGS (ftdm_span_t *span) 
-typedef ftdm_status_t (*boost_start_span_func_t) BOOST_START_SPAN_ARGS;
-#define BOOST_START_SPAN_FUNCTION(name) ftdm_status_t name BOOST_START_SPAN_ARGS
-
-/*! 
-  \brief Stop the given span
-  \param span The freetdm span
-  \return FTDM_SUCCESS or FTDM_FAIL 
- */
-#define BOOST_STOP_SPAN_ARGS (ftdm_span_t *span) 
-typedef ftdm_status_t (*boost_stop_span_func_t) BOOST_START_SPAN_ARGS;
-#define BOOST_STOP_SPAN_FUNCTION(name) ftdm_status_t name BOOST_STOP_SPAN_ARGS
-
-/*! 
-  \brief Called when the module is being loaded BEFORE calling anything else
-  \return FTDM_SUCCESS or FTDM_FAIL
- */
-#define BOOST_ON_LOAD_ARGS (void) 
-typedef ftdm_status_t (*boost_on_load_func_t) BOOST_ON_LOAD_ARGS;
-#define BOOST_ON_LOAD_FUNCTION(name) ftdm_status_t name BOOST_ON_LOAD_ARGS 
-
-/*! 
-  \brief Called when the module is being unloaded, last chance to stop everything!
- */
-#define BOOST_ON_UNLOAD_ARGS (void) 
-typedef ftdm_status_t (*boost_on_unload_func_t) BOOST_ON_UNLOAD_ARGS;
-#define BOOST_ON_UNLOAD_FUNCTION(name) ftdm_status_t name BOOST_ON_UNLOAD_ARGS 
-
-/*!
-       \brief Called when user wants to execute sigmod api function
-       \return FTDM_SUCCESS or FTDM_FAIL
- */
-#define BOOST_API_ARGS (ftdm_stream_handle_t *stream, char *cmd)
-typedef ftdm_status_t (*boost_api_func_t) BOOST_API_ARGS;
-#define BOOST_API_FUNCTION(name) ftdm_status_t name BOOST_API_ARGS
-
-
-/*! 
-  \brief The boost signaling module interface 
- */
-typedef struct boost_sigmod_interface_s {
-       /*! \brief Module name */
-       const char *name;
-       /*! \brief write boost message function */
-       boost_write_msg_func_t write_msg;       
-       /*! \brief set the user write boost message function */
-       boost_set_write_msg_cb_func_t set_write_msg_cb;
-       /*! \brief set the user signaling status function */
-       boost_set_sig_status_cb_func_t set_sig_status_cb;
-       /*! \brief get channel signaling status */
-       boost_get_channel_sig_status_func_t get_channel_sig_status;
-       /*! \brief set channel signaling status */
-       boost_set_channel_sig_status_func_t set_channel_sig_status;
-       /*! \brief get span signaling status */
-       boost_get_span_sig_status_func_t get_span_sig_status;
-       /*! \brief set span signaling status */
-       boost_set_span_sig_status_func_t set_span_sig_status;
-       /*! \brief set notify hardware link status change */
-       boost_on_hw_link_status_change_func_t on_hw_link_status_change;
-       /*! \brief configure span signaling */
-       boost_configure_span_func_t configure_span;
-       /*! \brief start freetdm span */
-       boost_start_span_func_t start_span;
-       /*! \brief stop freetdm span */
-       boost_stop_span_func_t stop_span;
-       /*! \brief the module was just loaded */
-       boost_on_load_func_t on_load;
-       /*! \brief the module is about to be unloaded */
-       boost_on_unload_func_t on_unload;
-       /*! \brief module api function */
-       boost_api_func_t  exec_api;
-       /*! \brief private pointer for the interface user */
-       void *pvt;
-} boost_sigmod_interface_t;
-
-#ifdef __cplusplus
-} // extern C
-#endif
-
-#define BOOST_INTERFACE_NAME boost_sigmod_interface
-#define BOOST_INTERFACE_NAME_STR "boost_sigmod_interface"
-/* use this in your sig boost module to declare your interface */
-#ifndef WIN32
-#define BOOST_INTERFACE boost_sigmod_interface_t BOOST_INTERFACE_NAME
-#else
-#define BOOST_INTERFACE __declspec(dllexport) boost_sigmod_interface_t BOOST_INTERFACE_NAME
-#endif
-#endif
-
-
-/* For Emacs:
- * Local Variables:
- * mode:c
- * indent-tabs-mode:t
- * tab-width:4
- * c-basic-offset:4
- * End:
- * For VIM:
- * vim:set softtabstop=4 shiftwidth=4 tabstop=4:
- */
-
diff --git a/libs/freetdm/src/ftmod/ftmod_sangoma_boost/sigboost.h b/libs/freetdm/src/ftmod/ftmod_sangoma_boost/sigboost.h
deleted file mode 100644 (file)
index 7975dc5..0000000
+++ /dev/null
@@ -1,221 +0,0 @@
-/****************************************************************************
- * sigboost.h     $Revision: 1.13 $
- *
- * Definitions for the sigboost interface.
- *
- * WARNING WARNING WARNING
- *
- * This file is used by sangoma_mgd and perhaps other programs. Any changes 
- * to this file must be coordinated with other user programs,
- *
- * Copyright (C) 2005  Xygnada Technology, Inc.
- * 
-****************************************************************************/
-#ifndef _SIGBOOST_H_
-#define _SIGBOOST_H_
-
-#define SIGBOOST_VERSION 103
-
-// handy to define integer types that actually work on both Lin and Win
-#include <freetdm.h>
-
-enum   e_sigboost_event_id_values
-{
-       SIGBOOST_EVENT_CALL_START                       = 0x80, /*128*/
-       SIGBOOST_EVENT_CALL_START_ACK                   = 0x81, /*129*/
-       SIGBOOST_EVENT_CALL_START_NACK                  = 0x82, /*130*/
-       SIGBOOST_EVENT_CALL_START_NACK_ACK              = 0x83, /*131*/
-       SIGBOOST_EVENT_CALL_ANSWERED                    = 0x84, /*132*/
-       SIGBOOST_EVENT_CALL_STOPPED                     = 0x85, /*133*/
-       SIGBOOST_EVENT_CALL_STOPPED_ACK                 = 0x86, /*134*/
-       SIGBOOST_EVENT_SYSTEM_RESTART                   = 0x87, /*135*/
-       SIGBOOST_EVENT_SYSTEM_RESTART_ACK               = 0x88, /*136*/
-       /* CALL_RELEASED is aimed to fix a race condition that became obvious
-        * when the boost socket was replaced by direct function calls
-        * and the channel hunting was moved to freetdm, the problem is
-        * we can get CALL_STOPPED msg and reply with CALL_STOPPED_ACK
-        * but the signaling module will still (in PRI) send RELEASE and
-        * wait for RELEASE_COMPLETE from the isdn network before
-        * marking the channel as available, therefore freetdm should
-        * also not mark the channel as available until CALL_RELEASED
-        * is received, for socket mode we can continue working as usual
-        * with CALL_STOPPED being the last step because the hunting is
-        * done in the signaling module.
-        * */
-       SIGBOOST_EVENT_CALL_RELEASED                    = 0x51, /* 81 */
-       SIGBOOST_EVENT_CALL_PROGRESS                    = 0x50, /*decimal  80*/
-       /* Following IDs are ss7boost to sangoma_mgd only. */
-       SIGBOOST_EVENT_HEARTBEAT                        = 0x89, /*137*/
-       SIGBOOST_EVENT_INSERT_CHECK_LOOP                = 0x8a, /*138*/
-       SIGBOOST_EVENT_REMOVE_CHECK_LOOP                = 0x8b, /*139*/
-       SIGBOOST_EVENT_AUTO_CALL_GAP_ABATE              = 0x8c, /*140*/
-       SIGBOOST_EVENT_DIGIT_IN                                 = 0x8d, /*141*/
-};
-
-#define BOOST_DECODE_EVENT_ID(id) \
-       (id==SIGBOOST_EVENT_CALL_START)?"SIGBOOST_EVENT_CALL_START": \
-       (id==SIGBOOST_EVENT_CALL_START_ACK)?"SIGBOOST_EVENT_CALL_START_ACK": \
-       (id==SIGBOOST_EVENT_CALL_START_NACK)?"SIGBOOST_EVENT_CALL_START_NACK": \
-       (id==SIGBOOST_EVENT_CALL_ANSWERED)?"SIGBOOST_EVENT_CALL_ANSWERED": \
-       (id==SIGBOOST_EVENT_CALL_STOPPED)?"SIGBOOST_EVENT_CALL_STOPPED": \
-       (id==SIGBOOST_EVENT_CALL_STOPPED_ACK)?"SIGBOOST_EVENT_CALL_STOPPED_ACK": \
-       (id==SIGBOOST_EVENT_SYSTEM_RESTART)?"SIGBOOST_EVENT_SYSTEM_RESTART": \
-       (id==SIGBOOST_EVENT_SYSTEM_RESTART_ACK)?"SIGBOOST_EVENT_SYSTEM_RESTART_ACK": \
-       (id==SIGBOOST_EVENT_CALL_RELEASED)?"SIGBOOST_EVENT_CALL_RELEASED": \
-       (id==SIGBOOST_EVENT_CALL_PROGRESS)?"SIGBOOST_EVENT_CALL_PROGRESS": \
-       (id==SIGBOOST_EVENT_HEARTBEAT)?"SIGBOOST_EVENT_HEARTBEAT": \
-       (id==SIGBOOST_EVENT_INSERT_CHECK_LOOP)?"SIGBOOST_EVENT_INSERT_CHECK_LOOP": \
-       (id==SIGBOOST_EVENT_REMOVE_CHECK_LOOP)?"SIGBOOST_EVENT_REMOVE_CHECK_LOOP": \
-       (id==SIGBOOST_EVENT_AUTO_CALL_GAP_ABATE)?"SIGBOOST_EVENT_AUTO_CALL_GAP_ABATE": \
-       (id==SIGBOOST_EVENT_DIGIT_IN)?"SIGBOOST_EVENT_DIGIT_IN": "Unknown"
-
-enum   e_sigboost_release_cause_values
-{
-       SIGBOOST_RELEASE_CAUSE_UNDEFINED                = 0,
-       SIGBOOST_RELEASE_CAUSE_NORMAL                   = 16,
-       /* probable elimination */
-       //SIGBOOST_RELEASE_CAUSE_BUSY                   = 0x91, /* 145 */
-       //SIGBOOST_RELEASE_CAUSE_CALLED_NOT_EXIST       = 0x92, /* 146 */
-       //SIGBOOST_RELEASE_CAUSE_CIRCUIT_RESET          = 0x93, /* 147 */
-       //SIGBOOST_RELEASE_CAUSE_NOANSWER               = 0x94, /* 148 */
-};
-
-enum   e_sigboost_call_setup_ack_nack_cause_values
-{
-       //SIGBOOST_CALL_SETUP_NACK_ALL_CKTS_BUSY                = 34,  /* Q.850 value - don't use */
-       SIGBOOST_CALL_SETUP_NACK_ALL_CKTS_BUSY          = 117,  /* non Q.850 value indicates local all ckt busy 
-                                                                  causing sangoma_mgd to perform automatic call 
-                                                                  gapping*/
-       SIGBOOST_CALL_SETUP_NACK_TEST_CKT_BUSY          = 17,  /* Q.850 value */
-       SIGBOOST_CALL_SETUP_NACK_INVALID_NUMBER         = 28,  /* Q.850 value */
-       SIGBOOST_CALL_SETUP_CSUPID_DBL_USE              = 200, /* unused Q.850 value */
-};
-
-
-enum   e_sigboost_huntgroup_values
-{
-       SIGBOOST_HUNTGRP_SEQ_ASC        = 0x00, /* sequential with lowest available first */
-       SIGBOOST_HUNTGRP_SEQ_DESC       = 0x01, /* sequential with highest available first */
-       SIGBOOST_HUNTGRP_RR_ASC         = 0x02, /* round-robin with lowest available first */
-       SIGBOOST_HUNTGRP_RR_DESC        = 0x03, /* round-robin with highest available first */
-};
-
-enum e_sigboost_event_info_par_values
-{
-       SIGBOOST_EVI_SPARE                                              = 0x00, 
-       SIGBOOST_EVI_ALERTING                                   = 0x01, 
-       SIGBOOST_EVI_PROGRESS                                   = 0x02, 
-};
-
-enum e_sigboost_progress_flags
-{
-       SIGBOOST_PROGRESS_RING = (1 << 0),
-       SIGBOOST_PROGRESS_MEDIA = (1 << 1)
-};
-
-#define MAX_DIALED_DIGITS      31
-
-/* Next two defines are used to create the range of values for call_setup_id
- * in the t_sigboost structure.
- * 0..((CORE_MAX_SPANS * CORE_MAX_CHAN_PER_SPAN) - 1) */
-#define CORE_MAX_SPANS                 200
-#define CORE_MAX_CHAN_PER_SPAN         32
-#define MAX_PENDING_CALLS      CORE_MAX_SPANS * CORE_MAX_CHAN_PER_SPAN
-/* 0..(MAX_PENDING_CALLS-1) is range of call_setup_id below */
-
-/* Should only be used by server */
-#define MAX_CALL_SETUP_ID   0xFFFF
-
-#define SIZE_CUSTOM    900
-#define SIZE_RDNIS  SIZE_CUSTOM
-
-
-#pragma pack(1)
-
-typedef struct
-{
-       uint8_t                 capability;
-       uint8_t                 uil1p;
-} t_sigboost_bearer;
-
-typedef struct
-{
-       uint8_t                 digits_count;
-       char                    digits [MAX_DIALED_DIGITS + 1]; /* it's a null terminated string */
-       uint8_t                 npi;
-       uint8_t                 ton;
-       uint8_t                 screening_ind;
-       uint8_t                 presentation_ind;
-}t_sigboost_digits;
-
-typedef struct
-{
-       uint16_t                version;
-       uint32_t                event_id;
-       /* delete sequence numbers - SCTP does not need them */
-       uint32_t                fseqno;
-       uint32_t                bseqno;
-       uint16_t                call_setup_id;
-       uint32_t                trunk_group;
-       uint8_t                 span;
-       uint8_t                 chan;
-       uint32_t                flags;
-       /* struct timeval       tv; */ 
-       t_sigboost_digits called;
-       t_sigboost_digits calling;
-       t_sigboost_digits rdnis;
-       /* ref. Q.931 Table 4-11 and Q.951 Section 3 */
-       char                    calling_name[MAX_DIALED_DIGITS + 1];
-       t_sigboost_bearer       bearer;
-       uint8_t                 hunt_group;
-       uint16_t                custom_data_size;
-       char                    custom_data[SIZE_CUSTOM]; /* it's a null terminated string */
-
-} t_sigboost_callstart;
-
-#define called_number_digits_count             called.digits_count
-#define called_number_digits                   called.digits
-#define calling_number_digits_count            calling.digits_count
-#define calling_number_digits                  calling.digits
-#define calling_number_screening_ind   calling.screening_ind
-#define calling_number_presentation            calling.presentation_ind
-
-#define isup_in_rdnis_size                             custom_data_size
-#define isup_in_rdnis                                  custom_data
-
-
-#define MIN_SIZE_CALLSTART_MSG  sizeof(t_sigboost_callstart) - SIZE_CUSTOM
-
-typedef struct
-{
-       uint16_t                version;
-       uint32_t                event_id;
-       /* delete sequence numbers - SCTP does not need them */
-       uint32_t                fseqno;
-       uint32_t                bseqno;
-       uint16_t                call_setup_id;
-       uint32_t                trunk_group;
-       uint8_t                 span;
-       uint8_t                 chan;
-       uint32_t                flags;
-       /* struct timeval       tv; */ 
-       uint8_t                 release_cause;
-} t_sigboost_short;
-#pragma pack()
-
-
-static __inline__ int boost_full_event(int event_id)
-{
-        switch (event_id) {
-        case SIGBOOST_EVENT_CALL_START:
-        case SIGBOOST_EVENT_DIGIT_IN:
-       case SIGBOOST_EVENT_CALL_PROGRESS:
-               return 1;
-        default:
-               break;
-        }
-
-        return 0;
-}
-
-#endif