Revision
17490
Author
moy
Date
2010-05-05 12:16:37 -0500 (Wed, 05 May 2010)

Log Message

freetdm: remove SCTP requirement, now is optional

Modified Paths

Diff

Modified: freeswitch/trunk/libs/freetdm/Makefile.am (17489 => 17490)


--- freeswitch/trunk/libs/freetdm/Makefile.am	2010-05-05 16:15:09 UTC (rev 17489)
+++ freeswitch/trunk/libs/freetdm/Makefile.am	2010-05-05 17:16:37 UTC (rev 17490)
@@ -37,9 +37,7 @@
 library_includedir = $(PREFIX)/include
 
 INCS      = -I$(FT_SRCDIR)/$(SRC)/include -I$(FT_SRCDIR)/$(SRC)/isdn/include -I$(FT_SRCDIR)/$(SRC)/include/private
-if HAVE_SCTP
-INCS +=  -I$(FT_SRCDIR)/$(SRC)/ftmod/ftmod_sangoma_boost 
-endif
+INCS +=   -I$(FT_SRCDIR)/$(SRC)/ftmod/ftmod_sangoma_boost 
 MY_CFLAGS = $(INCS) $(FTDM_CFLAGS) -DFTDM_CONFIG_DIR=\"@confdir@\" -DFTDM_MOD_DIR=\"$(moddir)\" @COMP_VENDOR_CFLAGS@ @DEFS@
 COMPILE   = $(CC) $(MY_CFLAGS) $(INCS)
 LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(COMPILE)

Modified: freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c (17489 => 17490)


--- freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c	2010-05-05 16:15:09 UTC (rev 17489)
+++ freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c	2010-05-05 17:16:37 UTC (rev 17490)
@@ -2515,6 +2515,11 @@
 	}
 
 	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");
+		ftdm_set_string(span->last_error, "No sigmod configuration was set and there is no SCTP available!");
+		FAIL_CONFIG_RETURN(FTDM_FAIL);
+#endif
 		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);