SOURCES: asterisk-t30.patch - Finished T.30 support
aredridel
aredridel at pld-linux.org
Wed Oct 5 22:20:08 CEST 2005
Author: aredridel Date: Wed Oct 5 20:20:08 2005 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- Finished T.30 support
---- Files affected:
SOURCES:
asterisk-t30.patch (1.1 -> 1.2)
---- Diffs:
================================================================
Index: SOURCES/asterisk-t30.patch
diff -u SOURCES/asterisk-t30.patch:1.1 SOURCES/asterisk-t30.patch:1.2
--- SOURCES/asterisk-t30.patch:1.1 Tue Sep 20 20:04:49 2005
+++ SOURCES/asterisk-t30.patch Wed Oct 5 22:20:03 2005
@@ -1,26 +1,1424 @@
-diff -ur asterisk-1.0.9-o/apps/Makefile asterisk-1.0.9-n/apps/Makefile
+diff -urN asterisk-1.0.9-o/apps/app_rxfax.c asterisk-1.0.9-n/apps/app_rxfax.c
+--- asterisk-1.0.9-o/apps/app_rxfax.c 1969-12-31 17:00:00.000000000 -0700
++++ asterisk-1.0.9-n/apps/app_rxfax.c 2005-09-20 13:01:02.000000000 -0600
+@@ -0,0 +1,367 @@
++/*
++ * Asterisk -- A telephony toolkit for Linux.
++ *
++ * Trivial application to receive a TIFF FAX file
++ *
++ * Copyright (C) 2003, Steve Underwood
++ *
++ * Steve Underwood <steveu at coppice.org>
++ *
++ * This program is free software, distributed under the terms of
++ * the GNU General Public License
++ */
++
++#include <asterisk/lock.h>
++#include <asterisk/file.h>
++#include <asterisk/logger.h>
++#include <asterisk/channel.h>
++#include <asterisk/pbx.h>
++#include <asterisk/module.h>
++#include <asterisk/translate.h>
++#include <asterisk/dsp.h>
++#include <asterisk/manager.h>
++#include <string.h>
++#include <stdlib.h>
++#include <stdint.h>
++#include <pthread.h>
++#include <errno.h>
++#include <tiffio.h>
++
++#include <spandsp.h>
++
++static char *tdesc = "Trivial FAX Receive Application";
++
++static char *app = "RxFAX";
++
++static char *synopsis = "Receive a FAX to a file";
++
++static char *descrip =
++" RxFAX(filename[|caller][|debug]): Receives a FAX from the channel into the\n"
++"given filename. If the file exists it will be overwritten. The file\n"
++"should be in TIFF/F format.\n"
++"The \"caller\" option makes the application behave as a calling machine,\n"
++"rather than the answering machine. The default behaviour is to behave as\n"
++"an answering machine.\n"
++"Uses LOCALSTATIONID to identify itself to the remote end.\n"
++" LOCALHEADERINFO to generate a header line on each page.\n"
++"Sets REMOTESTATIONID to the sender CSID.\n"
++" FAXPAGES to the number of pages received.\n"
++" FAXBITRATE to the transmition rate.\n"
++" FAXRESOLUTION to the resolution.\n"
++"Returns -1 when the user hangs up.\n"
++"Returns 0 otherwise.\n";
++
++STANDARD_LOCAL_USER;
++
++LOCAL_USER_DECL;
++
++#define MAX_BLOCK_SIZE 240
++
++static void t30_flush(t30_state_t *s, int which)
++{
++ //TODO:
++}
++/*- End of function --------------------------------------------------------*/
++
++static void phase_e_handler(t30_state_t *s, void *user_data, int result)
++{
++ struct ast_channel *chan;
++ t30_stats_t t;
++ char local_ident[21];
++ char far_ident[21];
++ char buf[11];
++
++ chan = (struct ast_channel *) user_data;
++ if (result)
++ {
++ fax_get_transfer_statistics(s, &t);
++ fax_get_far_ident(s, far_ident);
++ fax_get_local_ident(s, local_ident);
++ ast_log(LOG_DEBUG, "==============================================================================\n");
++ ast_log(LOG_DEBUG, "Fax successfully received.\n");
++ ast_log(LOG_DEBUG, "Remote station id: %s\n", far_ident);
++ ast_log(LOG_DEBUG, "Local station id: %s\n", local_ident);
++ ast_log(LOG_DEBUG, "Pages transferred: %i\n", t.pages_transferred);
++ ast_log(LOG_DEBUG, "Image resolution: %i x %i\n", t.column_resolution, t.row_resolution);
++ ast_log(LOG_DEBUG, "Transfer Rate: %i\n", t.bit_rate);
++ ast_log(LOG_DEBUG, "==============================================================================\n");
++ manager_event(EVENT_FLAG_CALL,
++ "FaxReceived", "Channel: %s\nExten: %s\nCallerID: %s\nRemoteStationID: %s\nLocalStationID: %s\nPagesTransferred: %i\nResolution: %i\nTransferRate: %i\nFileName: %s\n",
++ chan->name,
++ chan->exten,
++#if (ASTERISK_VERSION_NUM <= 011000)
++ chan->callerid,
++#else
++ (chan->cid.cid_num) ? chan->cid.cid_num : "",
++#endif
++ far_ident,
++ local_ident,
++ t.pages_transferred,
++ t.row_resolution,
++ t.bit_rate,
++ s->rx_file);
++ pbx_builtin_setvar_helper(chan, "REMOTESTATIONID", far_ident);
++ snprintf(buf, sizeof(buf), "%i", t.pages_transferred);
++ pbx_builtin_setvar_helper(chan, "FAXPAGES", buf);
++ snprintf(buf, sizeof(buf), "%i", t.row_resolution);
++ pbx_builtin_setvar_helper(chan, "FAXRESOLUTION", buf);
++ snprintf(buf, sizeof(buf), "%i", t.bit_rate);
++ pbx_builtin_setvar_helper(chan, "FAXBITRATE", buf);
++ }
++ else
++ {
++ ast_log(LOG_DEBUG, "==============================================================================\n");
++ ast_log(LOG_DEBUG, "Fax receive not successful.\n");
++ ast_log(LOG_DEBUG, "==============================================================================\n");
++ }
++}
++/*- End of function --------------------------------------------------------*/
++
++static void phase_d_handler(t30_state_t *s, void *user_data, int result)
++{
++ struct ast_channel *chan;
++ t30_stats_t t;
++
++ chan = (struct ast_channel *) user_data;
++ if (result)
++ {
++ fax_get_transfer_statistics(s, &t);
++ ast_log(LOG_DEBUG, "==============================================================================\n");
++ ast_log(LOG_DEBUG, "Pages transferred: %i\n", t.pages_transferred);
++ ast_log(LOG_DEBUG, "Image size: %i x %i\n", t.columns, t.rows);
++ ast_log(LOG_DEBUG, "Image resolution %i x %i\n", t.column_resolution, t.row_resolution);
++ ast_log(LOG_DEBUG, "Transfer Rate: %i\n", t.bit_rate);
++ ast_log(LOG_DEBUG, "Bad rows %i\n", t.bad_rows);
++ ast_log(LOG_DEBUG, "Longest bad row run %i\n", t.longest_bad_row_run);
++ ast_log(LOG_DEBUG, "Compression type %i\n", t.encoding);
++ ast_log(LOG_DEBUG, "Image size (bytes) %i\n", t.image_size);
++ ast_log(LOG_DEBUG, "==============================================================================\n");
++ }
++}
++/*- End of function --------------------------------------------------------*/
++
++static int rxfax_exec(struct ast_channel *chan, void *data)
++{
++ int res = 0;
++ char template_file[256];
++ char target_file[256];
++ char *s;
++ char *t;
++ char *v;
++ char *x;
++ int option;
++ int len;
++ int i;
++ t30_state_t fax;
++ int calling_party;
++ int verbose;
++ int samples;
++
++ struct localuser *u;
++ struct ast_frame *inf = NULL;
++ struct ast_frame outf;
++
++ int original_read_fmt;
++ int original_write_fmt;
++
++ uint8_t __buf[sizeof(uint16_t)*MAX_BLOCK_SIZE + 2*AST_FRIENDLY_OFFSET];
++ uint8_t *buf = __buf + AST_FRIENDLY_OFFSET;
++
++ if (chan == NULL)
++ {
++ ast_log(LOG_WARNING, "Fax receive channel is NULL. Giving up.\n");
++ return -1;
++ }
++
++ /* The next few lines of code parse out the filename and header from the input string */
++ if (data == NULL)
++ {
++ /* No data implies no filename or anything is present */
++ ast_log(LOG_WARNING, "Rxfax requires an argument (filename)\n");
++ return -1;
++ }
++
++ calling_party = FALSE;
++ verbose = FALSE;
++ target_file[0] = '\0';
++
++ for (option = 0, v = s = data; v; option++, s++)
++ {
++ t = s;
++ v = strchr(s, '|');
++ s = (v) ? v : s + strlen(s);
++ strncpy(buf, t, s - t);
++ buf[s - t] = '\0';
++ if (option == 0)
++ {
++ /* The first option is always the file name */
++ len = s - t;
++ if (len > 255)
++ len = 255;
++ strncpy(target_file, t, len);
++ target_file[len] = '\0';
++ /* Allow the use of %d in the file name for a wild card of sorts, to
++ create a new file with the specified name scheme */
++ if ((x = strchr(target_file, '%')) && x[1] == 'd')
++ {
++ strcpy(template_file, target_file);
++ i = 0;
++ do
++ {
++ snprintf(target_file, 256, template_file, 1);
++ i++;
++ }
++ while (ast_fileexists(target_file, "", chan->language) != -1);
++ }
++ }
++ else if (strncmp("caller", t, s - t) == 0)
++ {
++ calling_party = TRUE;
++ }
++ else if (strncmp("debug", t, s - t) == 0)
++ {
++ verbose = TRUE;
++ }
++ }
++
++ /* Done parsing */
++
++ LOCAL_USER_ADD(u);
++
++ if (chan->_state != AST_STATE_UP)
++ {
++ /* Shouldn't need this, but checking to see if channel is already answered
++ * Theoretically asterisk should already have answered before running the app */
++ res = ast_answer(chan);
++ }
++
++ if (!res)
++ {
++ original_read_fmt = chan->readformat;
++ if (original_read_fmt != AST_FORMAT_SLINEAR)
++ {
++ res = ast_set_read_format(chan, AST_FORMAT_SLINEAR);
++ if (res < 0)
++ {
++ ast_log(LOG_WARNING, "Unable to set to linear read mode, giving up\n");
++ return -1;
++ }
++ }
++ original_write_fmt = chan->writeformat;
++ if (original_write_fmt != AST_FORMAT_SLINEAR)
++ {
++ res = ast_set_write_format(chan, AST_FORMAT_SLINEAR);
++ if (res < 0)
++ {
++ ast_log(LOG_WARNING, "Unable to set to linear write mode, giving up\n");
++ res = ast_set_read_format(chan, original_read_fmt);
++ if (res)
++ ast_log(LOG_WARNING, "Unable to restore read format on '%s'\n", chan->name);
++ return -1;
++ }
++ }
++ fax_init(&fax, calling_party, NULL);
++ fax.verbose = verbose;
++ x = pbx_builtin_getvar_helper(chan, "LOCALSTATIONID");
++ if (x && x[0])
++ fax_set_local_ident(&fax, x);
++ x = pbx_builtin_getvar_helper(chan, "LOCALHEADERINFO");
++ if (x && x[0])
++ fax_set_header_info(&fax, x);
++ fax_set_rx_file(&fax, target_file);
++ //fax_set_phase_b_handler(&fax, phase_b_handler, chan);
++ fax_set_phase_d_handler(&fax, phase_d_handler, chan);
++ fax_set_phase_e_handler(&fax, phase_e_handler, chan);
++ while (ast_waitfor(chan, -1) > -1)
++ {
++ inf = ast_read(chan);
++ if (inf == NULL)
++ {
++ res = -1;
++ break;
++ }
++ if (inf->frametype == AST_FRAME_VOICE)
++ {
++ if (fax_rx_process(&fax, inf->data, inf->samples))
++ break;
++ samples = (inf->samples <= MAX_BLOCK_SIZE) ? inf->samples : MAX_BLOCK_SIZE;
++ len = fax_tx_process(&fax, (int16_t *) &buf[AST_FRIENDLY_OFFSET], samples);
++ if (len)
++ {
++ memset(&outf, 0, sizeof(outf));
++ outf.frametype = AST_FRAME_VOICE;
++ outf.subclass = AST_FORMAT_SLINEAR;
++ outf.datalen = len*sizeof(int16_t);
++ outf.samples = len;
++ outf.data = &buf[AST_FRIENDLY_OFFSET];
++ outf.offset = AST_FRIENDLY_OFFSET;
++ outf.src = "RxFAX";
++ if (ast_write(chan, &outf) < 0)
++ {
++ ast_log(LOG_WARNING, "Unable to write frame to channel; %s\n", strerror(errno));
++ break;
++ }
++ }
++ }
++ ast_frfree(inf);
++ }
++ if (inf == NULL)
++ {
++ ast_log(LOG_DEBUG, "Got hangup\n");
++ res = -1;
++ }
++ if (original_read_fmt != AST_FORMAT_SLINEAR)
++ {
++ res = ast_set_read_format(chan, original_read_fmt);
++ if (res)
++ ast_log(LOG_WARNING, "Unable to restore read format on '%s'\n", chan->name);
++ }
++ if (original_write_fmt != AST_FORMAT_SLINEAR)
++ {
++ res = ast_set_write_format(chan, original_write_fmt);
++ if (res)
++ ast_log(LOG_WARNING, "Unable to restore write format on '%s'\n", chan->name);
++ }
++ fax_release(&fax);
++ }
++ else
++ {
++ ast_log(LOG_WARNING, "Could not answer channel '%s'\n", chan->name);
++ }
++ LOCAL_USER_REMOVE(u);
++ return res;
++}
++/*- End of function --------------------------------------------------------*/
++
++int unload_module(void)
++{
++ STANDARD_HANGUP_LOCALUSERS;
++ return ast_unregister_application(app);
++}
++/*- End of function --------------------------------------------------------*/
++
++int load_module(void)
++{
++ return ast_register_application(app, rxfax_exec, synopsis, descrip);
++}
++
++char *description(void)
++{
++ return tdesc;
++}
++/*- End of function --------------------------------------------------------*/
++
++int usecount(void)
++{
++ int res;
++ STANDARD_USECOUNT(res);
++ return res;
++}
++/*- End of function --------------------------------------------------------*/
++
++char *key(void)
++{
++ return ASTERISK_GPL_KEY;
++}
++/*- End of function --------------------------------------------------------*/
++/*- End of file ------------------------------------------------------------*/
+diff -urN asterisk-1.0.9-o/apps/app_rxfax_test.c asterisk-1.0.9-n/apps/app_rxfax_test.c
+--- asterisk-1.0.9-o/apps/app_rxfax_test.c 1969-12-31 17:00:00.000000000 -0700
++++ asterisk-1.0.9-n/apps/app_rxfax_test.c 2005-09-20 13:01:02.000000000 -0600
+@@ -0,0 +1,400 @@
++/*
++ * Asterisk -- A telephony toolkit for Linux.
++ *
++ * Trivial application to receive a TIFF FAX file
++ *
++ * Copyright (C) 2003, Steve Underwood
++ *
++ * Steve Underwood <steveu at coppice.org>
++ *
++ * This program is free software, distributed under the terms of
++ * the GNU General Public License
++ */
++
++#include <asterisk/lock.h>
++#include <asterisk/file.h>
++#include <asterisk/logger.h>
++#include <asterisk/channel.h>
++#include <asterisk/pbx.h>
++#include <asterisk/module.h>
++#include <asterisk/translate.h>
++#include <asterisk/dsp.h>
++#include <asterisk/manager.h>
++#include <string.h>
++#include <stdlib.h>
++#include <stdint.h>
++#include <pthread.h>
++#include <errno.h>
++#include <tiffio.h>
++
++#include <spandsp.h>
++
++static char *tdesc = "Trivial FAX Receive Application";
++
++static char *app = "RxFAX";
++
++static char *synopsis = "Receive a FAX to a file";
++
++static char *descrip =
++" RxFAX(filename[|caller][|debug]): Receives a FAX from the channel into the\n"
++"given filename. If the file exists it will be overwritten. The file\n"
++"should be in TIFF/F format.\n"
++"The \"caller\" option makes the application behave as a calling machine,\n"
++"rather than the answering machine. The default behaviour is to behave as\n"
++"an answering machine.\n"
++"Uses LOCALSTATIONID to identify itself to the remote end.\n"
++" LOCALHEADERINFO to generate a header line on each page.\n"
++"Sets REMOTESTATIONID to the sender CSID.\n"
++" FAXPAGES to the number of pages received.\n"
++" FAXBITRATE to the transmition rate.\n"
++" FAXRESOLUTION to the resolution.\n"
++"Returns -1 when the user hangs up.\n"
++"Returns 0 otherwise.\n";
++
++STANDARD_LOCAL_USER;
++
++LOCAL_USER_DECL;
++
++#define MAX_BLOCK_SIZE 240
++
++static void t30_flush(t30_state_t *s, int which)
++{
++ //TODO:
++}
++/*- End of function --------------------------------------------------------*/
++
++static void phase_e_handler(t30_state_t *s, void *user_data, int result)
++{
++ struct ast_channel *chan;
++ t30_stats_t t;
++ char local_ident[21];
++ char far_ident[21];
++ char buf[11];
++
++ chan = (struct ast_channel *) user_data;
++ if (result)
++ {
++ fax_get_transfer_statistics(s, &t);
++ fax_get_far_ident(s, far_ident);
++ fax_get_local_ident(s, local_ident);
++ ast_log(LOG_DEBUG, "==============================================================================\n");
++ ast_log(LOG_DEBUG, "Fax successfully received.\n");
++ ast_log(LOG_DEBUG, "Remote station id: %s\n", far_ident);
++ ast_log(LOG_DEBUG, "Local station id: %s\n", local_ident);
++ ast_log(LOG_DEBUG, "Pages transferred: %i\n", t.pages_transferred);
++ ast_log(LOG_DEBUG, "Image resolution: %i x %i\n", t.column_resolution, t.row_resolution);
++ ast_log(LOG_DEBUG, "Transfer Rate: %i\n", t.bit_rate);
++ ast_log(LOG_DEBUG, "==============================================================================\n");
++ manager_event(EVENT_FLAG_CALL,
++ "FaxReceived", "Channel: %s\nExten: %s\nCallerID: %s\nRemoteStationID: %s\nLocalStationID: %s\nPagesTransferred: %i\nResolution: %i\nTransferRate: %i\nFileName: %s\n",
++ chan->name,
++ chan->exten,
++#if (ASTERISK_VERSION_NUM <= 011000)
++ chan->callerid,
++#else
++ (chan->cid.cid_num) ? chan->cid.cid_num : "",
++#endif
++ far_ident,
++ local_ident,
++ t.pages_transferred,
++ t.row_resolution,
++ t.bit_rate,
++ s->rx_file);
++ pbx_builtin_setvar_helper(chan, "REMOTESTATIONID", far_ident);
++ snprintf(buf, sizeof(buf), "%i", t.pages_transferred);
++ pbx_builtin_setvar_helper(chan, "FAXPAGES", buf);
++ snprintf(buf, sizeof(buf), "%i", t.row_resolution);
++ pbx_builtin_setvar_helper(chan, "FAXRESOLUTION", buf);
++ snprintf(buf, sizeof(buf), "%i", t.bit_rate);
++ pbx_builtin_setvar_helper(chan, "FAXBITRATE", buf);
++ }
++ else
++ {
++ ast_log(LOG_DEBUG, "==============================================================================\n");
++ ast_log(LOG_DEBUG, "Fax receive not successful.\n");
++ ast_log(LOG_DEBUG, "==============================================================================\n");
++ }
++}
++/*- End of function --------------------------------------------------------*/
++
++static void phase_d_handler(t30_state_t *s, void *user_data, int result)
++{
++ struct ast_channel *chan;
++ t30_stats_t t;
++
++ chan = (struct ast_channel *) user_data;
++ if (result)
++ {
++ fax_get_transfer_statistics(s, &t);
++ ast_log(LOG_DEBUG, "==============================================================================\n");
++ ast_log(LOG_DEBUG, "Pages transferred: %i\n", t.pages_transferred);
++ ast_log(LOG_DEBUG, "Image size: %i x %i\n", t.columns, t.rows);
++ ast_log(LOG_DEBUG, "Image resolution %i x %i\n", t.column_resolution, t.row_resolution);
++ ast_log(LOG_DEBUG, "Transfer Rate: %i\n", t.bit_rate);
++ ast_log(LOG_DEBUG, "Bad rows %i\n", t.bad_rows);
++ ast_log(LOG_DEBUG, "Longest bad row run %i\n", t.longest_bad_row_run);
++ ast_log(LOG_DEBUG, "Compression type %i\n", t.encoding);
++ ast_log(LOG_DEBUG, "Image size (bytes) %i\n", t.image_size);
++ ast_log(LOG_DEBUG, "==============================================================================\n");
++ }
++}
++/*- End of function --------------------------------------------------------*/
++
++static void *fax_gen_alloc(struct ast_channel *chan, void *params)
++{
++ return params;
++}
++/*- End of function --------------------------------------------------------*/
++
++static void fax_gen_release(struct ast_channel *chan, void *data)
++{
++ return;
++}
++/*- End of function --------------------------------------------------------*/
++
++static int fax_gen_generate(struct ast_channel *chan, void *data, int len, int samples)
++{
++ struct ast_frame f;
++ uint8_t buf[sizeof(uint16_t)*MAX_BLOCK_SIZE + 2*AST_FRIENDLY_OFFSET];
++ t30_state_t *fax;
++
++ fax = (t30_state_t *) data;
++ if (len > sizeof (buf))
++ {
++ ast_log (LOG_WARNING, "Only doing %d bytes (%d bytes requested)\n", (int)(sizeof (buf) / sizeof (signed short)), len);
++ len = sizeof (buf);
++ samples = len / 2;
++ }
++ len = fax_tx_process(fax, (int16_t *) &buf[AST_FRIENDLY_OFFSET], samples);
++ f.frametype = AST_FRAME_VOICE;
++ f.subclass = AST_FORMAT_SLINEAR;
++ f.offset = AST_FRIENDLY_OFFSET;
++ f.mallocd = 0;
++ f.data = &buf[AST_FRIENDLY_OFFSET];
++ f.datalen = len*sizeof(int16_t);
++ f.samples = len;
++ f.src = "app_txfax";
++ if (ast_write(chan, &f) < 0)
++ {
++ ast_log (LOG_WARNING, "Failed to write frame to '%s': %s\n", chan->name, strerror(errno));
++ return -1;
++ }
++ return 0;
++}
++/*- End of function --------------------------------------------------------*/
++
++static struct ast_generator fax_gen =
++{
++ alloc:fax_gen_alloc,
++ release:fax_gen_release,
++ generate:fax_gen_generate,
++};
++
++static int rxfax_exec(struct ast_channel *chan, void *data)
++{
++ int res = 0;
++ char template_file[256];
++ char target_file[256];
++ char *s;
++ char *t;
++ char *v;
++ char *x;
++ int option;
++ int i;
++ t30_state_t fax;
++ int calling_party;
++ int verbose;
++
++ struct localuser *u;
++ struct ast_frame *inf = NULL;
++
++ int original_read_fmt;
++ int original_write_fmt;
++
++ if (chan == NULL)
++ {
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/asterisk-t30.patch?r1=1.1&r2=1.2&f=u
More information about the pld-cvs-commit
mailing list