Index: acmacros/ax_compare_version.m4
===================================================================
--- acmacros/ax_compare_version.m4 (revision 0)
+++ acmacros/ax_compare_version.m4 (revision 0)
@@ -0,0 +1,162 @@
+dnl @synopsis AX_COMPARE_VERSION(VERSION_A, OP, VERSION_B, [ACTION-IF-TRUE], [ACTION-IF-FALSE])
+dnl
+dnl This macro compares two version strings. It is used heavily in the
+dnl macro _AX_PATH_BDB for library checking. Due to the various number
+dnl of minor-version numbers that can exist, and the fact that string
+dnl comparisons are not compatible with numeric comparisons, this is
+dnl not necessarily trivial to do in a autoconf script. This macro
+dnl makes doing these comparisons easy.
+dnl
+dnl The six basic comparisons are available, as well as checking
+dnl equality limited to a certain number of minor-version levels.
+dnl
+dnl The operator OP determines what type of comparison to do, and can
+dnl be one of:
+dnl
+dnl eq - equal (test A == B)
+dnl ne - not equal (test A != B)
+dnl le - less than or equal (test A <= B)
+dnl ge - greater than or equal (test A >= B)
+dnl lt - less than (test A < B)
+dnl gt - greater than (test A > B)
+dnl
+dnl Additionally, the eq and ne operator can have a number after it to
+dnl limit the test to that number of minor versions.
+dnl
+dnl eq0 - equal up to the length of the shorter version
+dnl ne0 - not equal up to the length of the shorter version
+dnl eqN - equal up to N sub-version levels
+dnl neN - not equal up to N sub-version levels
+dnl
+dnl When the condition is true, shell commands ACTION-IF-TRUE are run,
+dnl otherwise shell commands ACTION-IF-FALSE are run. The environment
+dnl variable 'ax_compare_version' is always set to either 'true' or
+dnl 'false' as well.
+dnl
+dnl Examples:
+dnl
+dnl AX_COMPARE_VERSION([3.15.7],[lt],[3.15.8])
+dnl AX_COMPARE_VERSION([3.15],[lt],[3.15.8])
+dnl
+dnl would both be true.
+dnl
+dnl AX_COMPARE_VERSION([3.15.7],[eq],[3.15.8])
+dnl AX_COMPARE_VERSION([3.15],[gt],[3.15.8])
+dnl
+dnl would both be false.
+dnl
+dnl AX_COMPARE_VERSION([3.15.7],[eq2],[3.15.8])
+dnl
+dnl would be true because it is only comparing two minor versions.
+dnl
+dnl AX_COMPARE_VERSION([3.15.7],[eq0],[3.15])
+dnl
+dnl would be true because it is only comparing the lesser number of
+dnl minor versions of the two values.
+dnl
+dnl Note: The characters that separate the version numbers do not
+dnl matter. An empty string is the same as version 0. OP is evaluated
+dnl by autoconf, not configure, so must be a string, not a variable.
+dnl
+dnl The author would like to acknowledge Guido Draheim whose advice
+dnl about the m4_case and m4_ifvaln functions make this macro only
+dnl include the portions necessary to perform the specific comparison
+dnl specified by the OP argument in the final configure script.
+dnl
+dnl @category Misc
+dnl @author Tim Toolan <toolan@ele.uri.edu>
+dnl @version 2004-03-01
+dnl @license GPLWithACException
+
+dnl #########################################################################
+AC_DEFUN([AX_COMPARE_VERSION], [
+ # Used to indicate true or false condition
+ ax_compare_version=false
+
+ # Convert the two version strings to be compared into a format that
+ # allows a simple string comparison. The end result is that a version
+ # string of the form 1.12.5-r617 will be converted to the form
+ # 0001001200050617. In other words, each number is zero padded to four
+ # digits, and non digits are removed.
+ AS_VAR_PUSHDEF([A],[ax_compare_version_A])
+ A=`echo "$1" | sed -e 's/\([[0-9]]*\)/Z\1Z/g' \
+ -e 's/Z\([[0-9]]\)Z/Z0\1Z/g' \
+ -e 's/Z\([[0-9]][[0-9]]\)Z/Z0\1Z/g' \
+ -e 's/Z\([[0-9]][[0-9]][[0-9]]\)Z/Z0\1Z/g' \
+ -e 's/[[^0-9]]//g'`
+
+ AS_VAR_PUSHDEF([B],[ax_compare_version_B])
+ B=`echo "$3" | sed -e 's/\([[0-9]]*\)/Z\1Z/g' \
+ -e 's/Z\([[0-9]]\)Z/Z0\1Z/g' \
+ -e 's/Z\([[0-9]][[0-9]]\)Z/Z0\1Z/g' \
+ -e 's/Z\([[0-9]][[0-9]][[0-9]]\)Z/Z0\1Z/g' \
+ -e 's/[[^0-9]]//g'`
+
+ dnl # In the case of le, ge, lt, and gt, the strings are sorted as necessary
+ dnl # then the first line is used to determine if the condition is true.
+ dnl # The sed right after the echo is to remove any indented white space.
+ m4_case(m4_tolower($2),
+ [lt],[
+ ax_compare_version=`echo "x$A
+x$B" | sed 's/^ *//' | sort -r | sed "s/x${A}/false/;s/x${B}/true/;1q"`
+ ],
+ [gt],[
+ ax_compare_version=`echo "x$A
+x$B" | sed 's/^ *//' | sort | sed "s/x${A}/false/;s/x${B}/true/;1q"`
+ ],
+ [le],[
+ ax_compare_version=`echo "x$A
+x$B" | sed 's/^ *//' | sort | sed "s/x${A}/true/;s/x${B}/false/;1q"`
+ ],
+ [ge],[
+ ax_compare_version=`echo "x$A
+x$B" | sed 's/^ *//' | sort -r | sed "s/x${A}/true/;s/x${B}/false/;1q"`
+ ],[
+ dnl Split the operator from the subversion count if present.
+ m4_bmatch(m4_substr($2,2),
+ [0],[
+ # A count of zero means use the length of the shorter version.
+ # Determine the number of characters in A and B.
+ ax_compare_version_len_A=`echo "$A" | awk '{print(length)}'`
+ ax_compare_version_len_B=`echo "$B" | awk '{print(length)}'`
+
+ # Set A to no more than B's length and B to no more than A's length.
+ A=`echo "$A" | sed "s/\(.\{$ax_compare_version_len_B\}\).*/\1/"`
+ B=`echo "$B" | sed "s/\(.\{$ax_compare_version_len_A\}\).*/\1/"`
+ ],
+ [[0-9]+],[
+ # A count greater than zero means use only that many subversions
+ A=`echo "$A" | sed "s/\(\([[0-9]]\{4\}\)\{m4_substr($2,2)\}\).*/\1/"`
+ B=`echo "$B" | sed "s/\(\([[0-9]]\{4\}\)\{m4_substr($2,2)\}\).*/\1/"`
+ ],
+ [.+],[
+ AC_WARNING(
+ [illegal OP numeric parameter: $2])
+ ],[])
+
+ # Pad zeros at end of numbers to make same length.
+ ax_compare_version_tmp_A="$A`echo $B | sed 's/./0/g'`"
+ B="$B`echo $A | sed 's/./0/g'`"
+ A="$ax_compare_version_tmp_A"
+
+ # Check for equality or inequality as necessary.
+ m4_case(m4_tolower(m4_substr($2,0,2)),
+ [eq],[
+ test "x$A" = "x$B" && ax_compare_version=true
+ ],
+ [ne],[
+ test "x$A" != "x$B" && ax_compare_version=true
+ ],[
+ AC_WARNING([illegal OP parameter: $2])
+ ])
+ ])
+
+ AS_VAR_POPDEF([A])dnl
+ AS_VAR_POPDEF([B])dnl
+
+ dnl # Execute ACTION-IF-TRUE / ACTION-IF-FALSE.
+ if test "$ax_compare_version" = "true" ; then
+ m4_ifvaln([$4],[$4],[:])dnl
+ m4_ifvaln([$5],[else $5])dnl
+ fi
+]) dnl AX_COMPARE_VERSION
Index: configure.ac
===================================================================
--- configure.ac (revision 651)
+++ configure.ac (working copy)
@@ -531,6 +531,63 @@
#
#
+dnl app_rxfax, app_txfax
+AC_ARG_WITH(spandsp,
+ AC_HELP_STRING([--with-spandsp],[Include support for SpanDSP]),[echo "$with_spandsp" "$withval"],[with_spandsp="yes"])
+
+if test "$with_spandsp" = "yes"; then
+
+AC_CHECK_HEADERS([tiffio.h],[HAVE_TIFFIO_H=1])
+AC_CHECK_LIB([tiff],[TIFFGetVersion],[
+AC_LANG_PUSH([C])
+AC_LANG_SOURCE(
+[#include <tiffio.h>
+
+int main(int argc, char *argv[]) {
+ fputps(temp, TIFFGetVersion(), stdin);
+}
+])
+
+$(CC) $(CFLAGS) -o tiffversion conftest.c -ltiff
+
+tiffversion = `./tiffversion | $(AWK) '/Version/ { print $NF }'`
+rm ./tiffversion
+
+if test -z "$tiffversion"; then
+ AC_MSG_ERROR([Cannot determine version of libtiff.])
+fi
+
+AC_MSG_NOTICE([You appear to have version $tiffversion of libtiff.])
+
+AX_COMPARE_VERSION([3.5.7],[gt],[$tiffversion],[AC_MSG_ERROR([Your copy of libtiff is too old. You need at least version 3.5.7.])])
+AX_COMPARE_VERSION([3.6.1],[eq],[$tiffversion],[AC_MSG_ERROR([Version 3.6.1 of libtiff is known to cause problems with SpanDSP, please upgrade.])])
+HAVE_LIBTIFF=1
+
+])
+
+if test "$HAVE_LIBTIFF" = "1"; then
+
+AC_CHECK_HEADERS([spandsp.h],[HAVE_SPANDSP_H=1],[AC_MSG_ERROR([SpanDSP does not appear to be installed])],
+[#if HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#if HAVE_STDINT_H
+#include <stdint.h>
+#endif
+#if HAVE_TIFFIO_H
+#include <tiffio.h>
+#endif
+])
+
+AC_CHECK_HEADERS([spandsp/t38.h],[HAVE_SPANDSP_T38_H=1],[AC_MSG_ERROR(SpanDSP does not appear to be new enough. You must have version 0.0.3 or newer.)])
+AC_CHECK_LIB([spandsp],[t38_gateway_init],[HAVE_LIBSPANDSP=1],[AC_MSG_ERROR(SpanDSP does not appear to be new enough. You must have version 0.0.3 or newer.)])
+
+fi
+
+fi
+
+AM_CONDITIONAL([WANT_SPANDSP],[test -n "${HAVE_TIFFIO_H}" -a -n "${HAVE_LIBTIFF}" -a -n "${HAVE_SPANDSP_H}" -a -n "${HAVE_SPANDSP_T38_H}" -a -n "${HAVE_LIBSPANDSP}"])
+
##### ressources
dnl res_osp ... open settlement protocol handling
Index: apps/app_rxfax.c
===================================================================
--- apps/app_rxfax.c (revision 0)
+++ apps/app_rxfax.c (working copy)
@@ -1,5 +1,5 @@
/*
- * OpenPBX -- A telephony toolkit for Linux.
+ * OpenPBX -- An open source telephony toolkit.
*
* Trivial application to receive a TIFF FAX file
*
@@ -23,7 +23,7 @@
#include "openpbx.h"
-OPENPBX_FILE_VERSION(__FILE__, "$Revision$")
+OPENPBX_FILE_VERSION("$HeadURL$", "$Revision$")
#include "openpbx/lock.h"
#include "openpbx/file.h"
@@ -146,9 +146,9 @@
static int t38_tx_packet_handler(t38_state_t *s, void *user_data, const uint8_t *buf, int len)
{
struct opbx_frame outf;
+ struct ast_channel *chan;
- //if (s->opbx_chan == NULL)
- // return 0;
+ chan = (struct ast_channel *) user_data;
memset(&outf, 0, sizeof(outf));
outf.frametype = OPBX_FRAME_MODEM;
outf.subclass = OPBX_MODEM_T38;
@@ -158,8 +158,8 @@
outf.data = (uint8_t *) buf;
outf.offset = 0;
outf.src = "RxFAX";
- //if (opbx_write(s->opbx_chan, &outf) < 0)
- // opbx_log(LOG_WARNING, "Unable to write frame to channel; %s\n", strerror(errno));
+ if (opbx_write(chan, &outf) < 0)
+ opbx_log(LOG_WARNING, "Unable to write frame to channel; %s\n", strerror(errno));
return 0;
}
/*- End of function --------------------------------------------------------*/
@@ -300,7 +300,7 @@
t30_set_phase_d_handler(&fax.t30_state, phase_d_handler, chan);
t30_set_phase_e_handler(&fax.t30_state, phase_e_handler, chan);
- t38_terminal_init(&t38, calling_party, t38_tx_packet_handler, NULL);
+ t38_terminal_init(&t38, calling_party, t38_tx_packet_handler, chan);
if (verbose)
t38.t30_state.logging.level = SPAN_LOG_SHOW_SEVERITY | SPAN_LOG_SHOW_PROTOCOL | SPAN_LOG_FLOW;
x = pbx_builtin_getvar_helper(chan, "LOCALSTATIONID");
@@ -354,7 +354,6 @@
{
printf("T.38 frame received\n");
call_is_t38_mode = TRUE;
- //t38.opbx_chan = chan;
t38_rx_ifp_packet(&t38, 0, inf->data, inf->datalen);
}
opbx_frfree(inf);
Property changes on: apps/app_rxfax.c
___________________________________________________________________
Name: svn:keywords
+ HeadURL Revision
Index: apps/app_txfax.c
===================================================================
--- apps/app_txfax.c (revision 0)
+++ apps/app_txfax.c (working copy)
@@ -1,5 +1,5 @@
/*
- * OpenPBX -- A telephony toolkit for Linux.
+ * OpenPBX -- An open source telephony toolkit.
*
* Trivial application to send a TIFF file as a FAX
*
@@ -23,7 +23,7 @@
#include "openpbx.h"
-OPENPBX_FILE_VERSION(__FILE__, "$Revision$")
+OPENPBX_FILE_VERSION("$HeadURL$", "$Revision$")
#include "openpbx/lock.h"
#include "openpbx/file.h"
@@ -86,9 +86,9 @@
static int t38_tx_packet_handler(t38_state_t *s, void *user_data, const uint8_t *buf, int len)
{
struct opbx_frame outf;
+ struct ast_channel *chan;
- //if (s->opbx_chan == NULL)
- // return 0;
+ chan = (struct ast_channel *) user_data;
memset(&outf, 0, sizeof(outf));
outf.frametype = OPBX_FRAME_MODEM;
outf.subclass = OPBX_MODEM_T38;
@@ -98,8 +98,8 @@
outf.data = (char *) buf;
outf.offset = 0;
outf.src = "TxFAX";
- //if (opbx_write(s->opbx_chan, &outf) < 0)
- // opbx_log(LOG_WARNING, "Unable to write frame to channel; %s\n", strerror(errno));
+ if (opbx_write(chan, &outf) < 0)
+ opbx_log(LOG_WARNING, "Unable to write frame to channel; %s\n", strerror(errno));
return 0;
}
/*- End of function --------------------------------------------------------*/
@@ -233,7 +233,7 @@
//t30_set_phase_d_handler(&fax.t30_state, phase_d_handler, chan);
t30_set_phase_e_handler(&fax.t30_state, phase_e_handler, chan);
- t38_terminal_init(&t38, calling_party, t38_tx_packet_handler, NULL);
+ t38_terminal_init(&t38, calling_party, t38_tx_packet_handler, chan);
if (verbose)
t38.t30_state.logging.level = SPAN_LOG_SHOW_SEVERITY | SPAN_LOG_SHOW_PROTOCOL | SPAN_LOG_FLOW;
x = pbx_builtin_getvar_helper(chan, "LOCALSTATIONID");
@@ -287,7 +287,6 @@
{
//printf("T.38 frame received\n");
call_is_t38_mode = TRUE;
- //t38.opbx_chan = chan;
t38_rx_ifp_packet(&t38, 0, inf->data, inf->datalen);
}
opbx_frfree(inf);
Property changes on: apps/app_txfax.c
___________________________________________________________________
Name: svn:keywords
+ HeadURL Revision
Index: apps/Makefile.am
===================================================================
--- apps/Makefile.am (revision 651)
+++ apps/Makefile.am (working copy)
@@ -190,3 +190,12 @@
app_visdn_ppp_la_LIBADD = ${top_srcdir}/corelib/libopenpbx.la
endif WANT_VISDN
+if WANT_SPANDSP
+ opbxmod_LTLIBRARIES += app_rxfax.la app_txfax.la
+ app_rxfax_SOURCES = app_rxfax.c
+ app_rxfax_LIBADD = -lspandsp -ltiff
+ app_rxfax_LDFLAGS = -module -avoid-version -no-undefined
+ app_txfax_SOURCES = app_txfax.c
+ app_txfax_LIBADD = -lspandsp -ltiff
+ app_txfax_LDFLAGS = -module -avoid-version -no-undefined
+endif WANT_SPANDSP