September 2008 - freeswitch-svn@lists.freeswitch.org

[Freeswitch-svn] [commit] r9443 - freeswitch/trunk/src/mod/applications/mod_fax
by Freeswitch SVN 04 Sep '08

04 Sep '08

Author: agx Date: Thu Sep 4 09:45:22 2008 New Revision: 9443 Modified: freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.c Log: fix write_coded changing Modified: freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.c (original) +++ freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.c Thu Sep 4 09:45:22 2008 @@ -145,22 +145,22 @@ static void phase_e_handler(t30_state_t *s, void *user_data, int result) { t30_stats_t t; - const char *local_ident = NULL; const char *far_ident = NULL; switch_channel_t *chan = (switch_channel_t *) user_data; char buf[128]; + switch_assert(user_data != NULL); + if (result == T30_ERR_OK) { t30_get_transfer_statistics(s, &t); far_ident = switch_str_nil( t30_get_tx_ident(s) ); - local_ident = switch_str_nil( t30_get_rx_ident(s) ); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "==============================================================================\n"); //TODO: add received/transmitted ? switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Fax successfully processed.\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Remote station id: %s\n", far_ident); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Local station id: %s\n", local_ident); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Local station id: %s\n", switch_str_nil( t30_get_rx_ident(s)) ); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Pages transferred: %i\n", t.pages_transferred); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Image resolution: %i x %i\n", t.x_resolution, t.y_resolution); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Transfer Rate: %i\n", t.bit_rate); @@ -171,6 +171,14 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "station model: %s\n", t30_get_rx_model(s)); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "==============================================================================\n"); + //TODO: is the buffer too little? anyway <MikeJ> is going to write a new set_variable function that will allow a printf like syntax very soon + switch_snprintf(buf, sizeof(buf), "%d", t.pages_transferred); + switch_channel_set_variable(chan, "FAX_PAGES", buf); + switch_snprintf(buf, sizeof(buf), "%dx%d", t.x_resolution, t.y_resolution); + switch_channel_set_variable(chan, "FAX_SIZE", buf); + switch_snprintf(buf, sizeof(buf), "%d", t.bit_rate); + switch_channel_set_variable(chan, "FAX_SPEED", buf); + } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "==============================================================================\n"); //TODO: add received/transmitted ? @@ -179,15 +187,7 @@ } //TODO: remove the assert once this has been tested - switch_assert(user_data != NULL); switch_channel_set_variable(chan, "FAX_REMOTESTATIONID", far_ident); - //TODO: is the buffer too little? anyway <MikeJ> is going to write a new set_variable function that will allow a printf like syntax very soon - switch_snprintf(buf, sizeof(buf), "%d", t.pages_transferred); - switch_channel_set_variable(chan, "FAX_PAGES", buf); - switch_snprintf(buf, sizeof(buf), "%dx%d", t.x_resolution, t.y_resolution); - switch_channel_set_variable(chan, "FAX_SIZE", buf); - switch_snprintf(buf, sizeof(buf), "%d", t.bit_rate); - switch_channel_set_variable(chan, "FAX_SPEED", buf); switch_snprintf(buf, sizeof(buf), "%d", result); switch_channel_set_variable(chan, "FAX_RESULT", buf); switch_snprintf(buf, sizeof(buf), "%s", t30_completion_code_to_str(result)); @@ -216,6 +216,7 @@ { switch_channel_t *channel; switch_codec_t *orig_read_codec = NULL; + switch_codec_t *orig_write_codec = NULL; switch_codec_t read_codec = {0}; switch_codec_t write_codec = {0}; switch_frame_t *read_frame = {0}; @@ -329,9 +330,16 @@ span_log_set_message_handler(&fax.logging, span_message); span_log_set_message_handler(&fax.t30.logging, span_message); if (debug) { + /* TODO: original span_log_set_level(&fax.logging, SPAN_LOG_SHOW_SEVERITY | SPAN_LOG_SHOW_PROTOCOL | SPAN_LOG_FLOW); span_log_set_level(&fax.t30.logging, SPAN_LOG_SHOW_SEVERITY | SPAN_LOG_SHOW_PROTOCOL | SPAN_LOG_FLOW); - } + */ + span_log_set_level(&fax.logging, SPAN_LOG_NONE|SPAN_LOG_FLOW|SPAN_LOG_FLOW_2|SPAN_LOG_FLOW_3|SPAN_LOG_ERROR|SPAN_LOG_PROTOCOL_ERROR|SPAN_LOG_WARNING|SPAN_LOG_PROTOCOL_WARNING|SPAN_LOG_DEBUG|SPAN_LOG_DEBUG_2|SPAN_LOG_DEBUG_3 ); + span_log_set_level(&fax.t30.logging, SPAN_LOG_NONE|SPAN_LOG_FLOW|SPAN_LOG_FLOW_2|SPAN_LOG_FLOW_3|SPAN_LOG_ERROR|SPAN_LOG_PROTOCOL_ERROR|SPAN_LOG_WARNING|SPAN_LOG_PROTOCOL_WARNING|SPAN_LOG_DEBUG|SPAN_LOG_DEBUG_2|SPAN_LOG_DEBUG_3 ); + } else { + span_log_set_level(&fax.logging, SPAN_LOG_SHOW_SEVERITY | SPAN_LOG_SHOW_PROTOCOL ); + span_log_set_level(&fax.t30.logging, SPAN_LOG_SHOW_SEVERITY | SPAN_LOG_SHOW_PROTOCOL ); + } /* We're now ready to answer the channel and process the audio of the call */ @@ -360,24 +368,27 @@ SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL, switch_core_session_get_pool(session)) == SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Raw Codec Activation Success L16\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Raw Codec Activation Success L16 on Leg-A\n"); } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Raw Codec Activation Failed L16"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Raw Codec Activation Failed L16 on Leg-A"); goto done; } + // NEW + orig_write_codec = switch_core_session_get_write_codec(session); + if (switch_core_codec_init(&write_codec, "L16", NULL, - orig_read_codec->implementation->samples_per_second, - orig_read_codec->implementation->microseconds_per_frame / 1000, + orig_write_codec->implementation->samples_per_second, + orig_write_codec->implementation->microseconds_per_frame / 1000, 1, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL, switch_core_session_get_pool(session)) == SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Raw Codec Activation Success L16\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Raw Codec Activation Success L16 on Leg-B\n"); } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Raw Codec Activation Failed L16"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Raw Codec Activation Failed L16 on Leg-B"); goto done; } @@ -409,7 +420,10 @@ write_frame.samples = tx; if (switch_core_session_write_frame(session, &write_frame, -1, 0) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Bad Write\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Bad Write, datalen: %d, samples: %d\n", + write_frame.datalen, + write_frame.samples + ); goto done; } } @@ -438,6 +452,10 @@ switch_core_session_set_read_codec(session, orig_read_codec); } + if (orig_write_codec) { + switch_core_session_set_write_codec(session, orig_write_codec); + } + } SWITCH_STANDARD_APP(txfax_function)

1 0

[Freeswitch-svn] [commit] r9442 - freeswitch/trunk/src/mod/applications/mod_fax
by Freeswitch SVN 04 Sep '08

04 Sep '08

Author: agx Date: Thu Sep 4 08:07:55 2008 New Revision: 9442 Modified: freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.c Log: both rxfax and txfax now answer the channell correctly Modified: freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.c (original) +++ freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.c Thu Sep 4 08:07:55 2008 @@ -152,17 +152,9 @@ if (result == T30_ERR_OK) { t30_get_transfer_statistics(s, &t); - far_ident = t30_get_tx_ident(s); - - if (!switch_strlen_zero(far_ident)) { - far_ident = ""; - } - - local_ident = t30_get_rx_ident(s); - - if (!switch_strlen_zero(local_ident)) { - local_ident = ""; - } + + far_ident = switch_str_nil( t30_get_tx_ident(s) ); + local_ident = switch_str_nil( t30_get_rx_ident(s) ); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "==============================================================================\n"); //TODO: add received/transmitted ? @@ -243,6 +235,10 @@ const char *fax_local_ecm = NULL; const char *fax_local_v17 = NULL; + /* make sure we have a valid channel when starting the FAX application */ + channel = switch_core_session_get_channel(session); + switch_assert(channel != NULL); + /* set output varialbles to a reasonable result */ switch_channel_set_variable(channel, "FAX_REMOTESTATIONID", "unknown"); switch_channel_set_variable(channel, "FAX_PAGES", "0"); @@ -270,7 +266,7 @@ /* file_name - Sets the TIFF filename where do you want to save the fax */ file_name = switch_core_session_strdup(session, data); /* it is important that file_name is not NULL or an empty string */ - if (!switch_strlen_zero(file_name)) { + if (switch_strlen_zero(file_name)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "fax filename is NULL or empty string\n"); return; } @@ -339,10 +335,6 @@ /* We're now ready to answer the channel and process the audio of the call */ - /* make sure we have a valid channel when starting the FAX application */ - channel = switch_core_session_get_channel(session); - switch_assert(channel != NULL); - /* Answer the call, otherwise we're not getting incoming audio */ switch_channel_answer(channel);

1 0

[Freeswitch-svn] [commit] r9441 - freeswitch/trunk/src/mod/applications/mod_fax
by Freeswitch SVN 04 Sep '08

04 Sep '08

Author: agx Date: Thu Sep 4 07:17:50 2008 New Revision: 9441 Modified: freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.c Log: fix comments in source code Modified: freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.c (original) +++ freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.c Thu Sep 4 07:17:50 2008 @@ -105,7 +105,7 @@ /* - * This function is called whenever a single new page has been received + * This function is called whenever a single new page has been received/transmitted */ static int phase_d_handler(t30_state_t *s, void *user_data, int result) @@ -165,7 +165,8 @@ } switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "==============================================================================\n"); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Fax successfully received.\n"); + //TODO: add received/transmitted ? + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Fax successfully processed.\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Remote station id: %s\n", far_ident); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Local station id: %s\n", local_ident); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Pages transferred: %i\n", t.pages_transferred); @@ -180,7 +181,8 @@ } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "==============================================================================\n"); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Fax receive not successful - result (%d) %s.\n", result, t30_completion_code_to_str(result)); + //TODO: add received/transmitted ? + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Fax processing not successful - result (%d) %s.\n", result, t30_completion_code_to_str(result)); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "==============================================================================\n"); } @@ -213,7 +215,11 @@ return FALSE; } -//OLD: SWITCH_STANDARD_APP(rxfax_function) +/* + * Main fax processing function: + * - calling_party is boolean: TRUE = TxFax and FALSE = RxFax + */ + void process_fax(switch_core_session_t *session, char *data, int calling_party) { switch_channel_t *channel; @@ -226,7 +232,7 @@ fax_state_t fax; int16_t buf[512]; int tx = 0; - //int calling_party = FALSE; // FALSE = RxFax, TRUE = TxFax + /*TODO: int calling_party = FALSE; DEPRECATED */ /* Channels variable parsing */ char *file_name = NULL; const char *fax_local_debug = NULL; @@ -243,7 +249,8 @@ switch_channel_set_variable(channel, "FAX_SIZE", "0"); switch_channel_set_variable(channel, "FAX_SPEED", "0"); switch_channel_set_variable(channel, "FAX_RESULT", "1"); - switch_channel_set_variable(channel, "FAX_ERROR", "fax not received yet"); + //TODO: add received/transmitted ? + switch_channel_set_variable(channel, "FAX_ERROR", "fax not processed yet"); /* * SpanDSP initialization @@ -275,13 +282,13 @@ /* FAX_DEBUG - enable extra debugging if defined */ debug = ( NULL != switch_channel_get_variable(channel, "FAX_DEBUG") ); - /* FAX_LOCAL_NUMBER - Set the receiving station phone number */ + /* FAX_LOCAL_NUMBER - Set your station phone number */ t30_set_tx_ident(&fax.t30, switch_str_nil(switch_channel_get_variable(channel, "FAX_LOCAL_NUMBER"))); - /* FAX_LOCAL_NAME - Set the receiving station ID name (string) */ + /* FAX_LOCAL_NAME - Set your station ID name (string) */ t30_set_tx_page_header_info(&fax.t30, switch_str_nil(switch_channel_get_variable(channel, "FAX_LOCAL_NAME"))); - /* FAX_LOCAL_SUBNAME - Set the receiving station ID sub name */ + /* FAX_LOCAL_SUBNAME - Set your station ID sub name */ t30_set_tx_sub_address(&fax.t30, switch_str_nil(switch_channel_get_variable(channel, "FAX_LOCAL_SUBNAME"))); /* FAX_DISABLE_ECM - Set if you want ECM on or OFF */ @@ -305,7 +312,7 @@ /* Configure more spanDSP internal options */ - // Select whether silent audio will be sent when FAX transmit is idle. + /* Select whether silent audio will be sent when FAX transmit is idle. */ fax_set_transmit_on_idle(&fax, TRUE); /* Support for different image sizes && resolutions */ @@ -332,11 +339,11 @@ /* We're now ready to answer the channel and process the audio of the call */ - // make sure we have a valid channel when starting the FAX application + /* make sure we have a valid channel when starting the FAX application */ channel = switch_core_session_get_channel(session); switch_assert(channel != NULL); - // Answer the call, otherwise we're not getting incoming audio + /* Answer the call, otherwise we're not getting incoming audio */ switch_channel_answer(channel); /* TODO: @@ -392,13 +399,13 @@ while(switch_channel_ready(channel)) { - // read new audio frame from the channel + /* read new audio frame from the channel */ status = switch_core_session_read_frame(session, &read_frame, -1, 0); if (!SWITCH_READ_ACCEPTABLE(status)) { goto done; } - // pass the new incoming audio frame to the fax_rx application + /* pass the new incoming audio frame to the fax_rx application */ fax_rx(&fax, (int16_t *)read_frame->data, read_frame->samples); if ((tx = fax_tx(&fax, (int16_t *) &buf, write_codec.implementation->samples_per_frame)) < 0) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Fax Error\n"); @@ -422,11 +429,11 @@ if (debug) switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FAX transmission has terminated.\n"); - // shutdown spandsp so it can create our tiff + /* shutdown spandsp so it can create our tiff */ t30_terminate(&fax.t30); fax_release(&fax); - // restore the original codecs over the channels + /* restore the original codecs over the channels */ if (read_codec.implementation) { switch_core_codec_destroy(&read_codec); }

1 0

[Freeswitch-svn] [commit] r9440 - freeswitch/trunk/src/mod/applications/mod_fax
by Freeswitch SVN 04 Sep '08

04 Sep '08

Author: agx Date: Thu Sep 4 07:12:14 2008 New Revision: 9440 Modified: freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.c Log: TxFax is there have fun Modified: freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.c (original) +++ freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.c Thu Sep 4 07:12:14 2008 @@ -32,6 +32,7 @@ #include <switch.h> #include <spandsp.h> +#include <spandsp/version.h> #define MAX_BLOCK_SIZE 240 @@ -212,7 +213,8 @@ return FALSE; } -SWITCH_STANDARD_APP(rxfax_function) +//OLD: SWITCH_STANDARD_APP(rxfax_function) +void process_fax(switch_core_session_t *session, char *data, int calling_party) { switch_channel_t *channel; switch_codec_t *orig_read_codec = NULL; @@ -224,7 +226,7 @@ fax_state_t fax; int16_t buf[512]; int tx = 0; - int calling_party = FALSE; + //int calling_party = FALSE; // FALSE = RxFax, TRUE = TxFax /* Channels variable parsing */ char *file_name = NULL; const char *fax_local_debug = NULL; @@ -265,7 +267,10 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "fax filename is NULL or empty string\n"); return; } - t30_set_rx_file(&fax.t30, file_name, -1); + if (calling_party) + t30_set_tx_file(&fax.t30, file_name, -1, -1); + else + t30_set_rx_file(&fax.t30, file_name, -1); /* FAX_DEBUG - enable extra debugging if defined */ debug = ( NULL != switch_channel_get_variable(channel, "FAX_DEBUG") ); @@ -337,6 +342,7 @@ /* TODO: * it could be a good idea to disable ECHOCAN on ZAP channels and to reset volumes too * anyone know how to do this if one of the channell is OpenZap isntead of Sofia? + * TIPS: perhaps "disable_ec" apps ? */ /* We store the original channel codec before switching both @@ -435,6 +441,16 @@ } +SWITCH_STANDARD_APP(txfax_function) +{ + process_fax(session, data, TRUE); +} + +SWITCH_STANDARD_APP(rxfax_function) +{ + process_fax(session, data, FALSE); +} + SWITCH_MODULE_LOAD_FUNCTION(mod_fax_load) { switch_application_interface_t *app_interface; @@ -442,11 +458,12 @@ /* connect my internal structure to the blank pointer passed to me */ *module_interface = switch_loadable_module_create_module_interface(pool, modname); - SWITCH_ADD_APP(app_interface, "rxfax", "Trivial FAX Receive Application", "Trivial FAX Receive Application", rxfax_function, "", SAF_NONE); + SWITCH_ADD_APP(app_interface, "rxfax", "FAX Receive Application", "FAX Receive Application", rxfax_function, "", SAF_NONE); + SWITCH_ADD_APP(app_interface, "txfax", "FAX Transmit Application", "FAX Transmit Application", txfax_function, "", SAF_NONE); - /* TODO: its important to debug the exact spandsp used - "RxFax using spandsp %i %i\n", SPANDSP_RELEASE_DATE, SPANDSP_RELEASE_TIME - */ + // TODO: ask if i can use LOG functions inside this macro + /* its important to debug the exact spandsp used */ + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "using spandsp %i %i\n", SPANDSP_RELEASE_DATE, SPANDSP_RELEASE_TIME ); /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS;

1 0

[Freeswitch-svn] [commit] r9439 - freeswitch/trunk/src/mod/applications/mod_fax
by Freeswitch SVN 04 Sep '08

04 Sep '08

Author: agx Date: Thu Sep 4 06:37:13 2008 New Revision: 9439 Modified: freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.c Log: moved spandsp initialization on top of the file in order that a "goto done" will not jump to the end of the file running spandsp functions on an unitialized fax pointer Modified: freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.c (original) +++ freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.c Thu Sep 4 06:37:13 2008 @@ -185,9 +185,8 @@ //TODO: remove the assert once this has been tested switch_assert(user_data != NULL); - //TODO: is the buffer too little? anyway <MikeJ> is going to write a new set_variable function that will allow a printf like syntax very soon switch_channel_set_variable(chan, "FAX_REMOTESTATIONID", far_ident); - + //TODO: is the buffer too little? anyway <MikeJ> is going to write a new set_variable function that will allow a printf like syntax very soon switch_snprintf(buf, sizeof(buf), "%d", t.pages_transferred); switch_channel_set_variable(chan, "FAX_PAGES", buf); switch_snprintf(buf, sizeof(buf), "%dx%d", t.x_resolution, t.y_resolution); @@ -236,11 +235,7 @@ const char *fax_local_ecm = NULL; const char *fax_local_v17 = NULL; - // make sure we have a valid channel when starting the FAX application - channel = switch_core_session_get_channel(session); - switch_assert(channel != NULL); - - /* reset output variables */ + /* set output varialbles to a reasonable result */ switch_channel_set_variable(channel, "FAX_REMOTESTATIONID", "unknown"); switch_channel_set_variable(channel, "FAX_PAGES", "0"); switch_channel_set_variable(channel, "FAX_SIZE", "0"); @@ -248,60 +243,16 @@ switch_channel_set_variable(channel, "FAX_RESULT", "1"); switch_channel_set_variable(channel, "FAX_ERROR", "fax not received yet"); - // Answer the call, otherwise we're not getting incoming audio - switch_channel_answer(channel); - - // TODO: could be a good idea to disable ECHOCAN on ZAP channels and to reset volumes too - - /* We store the original channel codec before switching both - * legs of the calls to a linear 16 bit codec that is the one - * used internally by spandsp and FS will do the transcoding - * from G.711 or any other original codec - */ - orig_read_codec = switch_core_session_get_read_codec(session); - - if (switch_core_codec_init(&read_codec, - "L16", - NULL, - orig_read_codec->implementation->samples_per_second, - orig_read_codec->implementation->microseconds_per_frame / 1000, - 1, - SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, - NULL, - switch_core_session_get_pool(session)) == SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Raw Codec Activation Success L16\n"); - } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Raw Codec Activation Failed L16"); - goto done; - } - - if (switch_core_codec_init(&write_codec, - "L16", - NULL, - orig_read_codec->implementation->samples_per_second, - orig_read_codec->implementation->microseconds_per_frame / 1000, - 1, - SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, - NULL, - switch_core_session_get_pool(session)) == SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Raw Codec Activation Success L16\n"); - } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Raw Codec Activation Failed L16"); - goto done; - } - - /* SpanDSP initialization */ - //TODO: check spandsp code to see if we need to clear the fax structure + /* + * SpanDSP initialization + * if fax_init by any chance fails to start we return quickly without touching anything else + */ + //TODO: ask Coppice to see if we need to clear the fax structure before fax_init is invoked memset(&fax, 0, sizeof(fax)); - fax_init(&fax, calling_party); - //TODO: fax_init return NULL in case of failed initialization - - // Select whether silent audio will be sent when FAX transmit is idle. - fax_set_transmit_on_idle(&fax, TRUE); - - //TODO: set spanlog debug to be outputted somewhere - span_log_set_message_handler(&fax.logging, span_message); - span_log_set_message_handler(&fax.t30.logging, span_message); + if (NULL == fax_init(&fax, calling_party)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "fax_init failed\n"); + return; + } /* * Enable options based on channel variables and input parameters @@ -309,16 +260,15 @@ /* file_name - Sets the TIFF filename where do you want to save the fax */ file_name = switch_core_session_strdup(session, data); - //TODO: check file_name is not NULL ? - switch_assert(file_name != NULL); + /* it is important that file_name is not NULL or an empty string */ + if (!switch_strlen_zero(file_name)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "fax filename is NULL or empty string\n"); + return; + } t30_set_rx_file(&fax.t30, file_name, -1); /* FAX_DEBUG - enable extra debugging if defined */ debug = ( NULL != switch_channel_get_variable(channel, "FAX_DEBUG") ); - if (debug) { - span_log_set_level(&fax.logging, SPAN_LOG_SHOW_SEVERITY | SPAN_LOG_SHOW_PROTOCOL | SPAN_LOG_FLOW); - span_log_set_level(&fax.t30.logging, SPAN_LOG_SHOW_SEVERITY | SPAN_LOG_SHOW_PROTOCOL | SPAN_LOG_FLOW); - } /* FAX_LOCAL_NUMBER - Set the receiving station phone number */ t30_set_tx_ident(&fax.t30, switch_str_nil(switch_channel_get_variable(channel, "FAX_LOCAL_NUMBER"))); @@ -344,10 +294,15 @@ t30_set_supported_modems(&fax.t30, T30_SUPPORT_V29 | T30_SUPPORT_V27TER); } - /* TODO + /* TODO, ask Coppice if this is really working or not and then add FAX_PASSWORD channel variable (don't forget the wiki part too) * t30_set_tx_password(&mc->fax.t30_state, "Password"); */ + /* Configure more spanDSP internal options */ + + // Select whether silent audio will be sent when FAX transmit is idle. + fax_set_transmit_on_idle(&fax, TRUE); + /* Support for different image sizes && resolutions */ t30_set_supported_image_sizes(&fax.t30, T30_SUPPORT_US_LETTER_LENGTH | T30_SUPPORT_US_LEGAL_LENGTH | T30_SUPPORT_UNLIMITED_LENGTH | T30_SUPPORT_215MM_WIDTH | T30_SUPPORT_255MM_WIDTH | T30_SUPPORT_303MM_WIDTH); @@ -362,15 +317,73 @@ t30_set_document_handler(&fax.t30, document_handler, session); } + /* set spanDSP logging functions - set spanlog debug messages to be outputted somewhere */ + span_log_set_message_handler(&fax.logging, span_message); + span_log_set_message_handler(&fax.t30.logging, span_message); + if (debug) { + span_log_set_level(&fax.logging, SPAN_LOG_SHOW_SEVERITY | SPAN_LOG_SHOW_PROTOCOL | SPAN_LOG_FLOW); + span_log_set_level(&fax.t30.logging, SPAN_LOG_SHOW_SEVERITY | SPAN_LOG_SHOW_PROTOCOL | SPAN_LOG_FLOW); + } - /* - * now we enter a loop where we read audio frames to the channels and will pass it to spandsp - * and if there is some outgoing frame we'll send it back to the calling fax machine + /* We're now ready to answer the channel and process the audio of the call */ + + // make sure we have a valid channel when starting the FAX application + channel = switch_core_session_get_channel(session); + switch_assert(channel != NULL); + + // Answer the call, otherwise we're not getting incoming audio + switch_channel_answer(channel); + + /* TODO: + * it could be a good idea to disable ECHOCAN on ZAP channels and to reset volumes too + * anyone know how to do this if one of the channell is OpenZap isntead of Sofia? + */ + + /* We store the original channel codec before switching both + * legs of the calls to a linear 16 bit codec that is the one + * used internally by spandsp and FS will do the transcoding + * from G.711 or any other original codec */ + orig_read_codec = switch_core_session_get_read_codec(session); + + if (switch_core_codec_init(&read_codec, + "L16", + NULL, + orig_read_codec->implementation->samples_per_second, + orig_read_codec->implementation->microseconds_per_frame / 1000, + 1, + SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, + NULL, + switch_core_session_get_pool(session)) == SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Raw Codec Activation Success L16\n"); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Raw Codec Activation Failed L16"); + goto done; + } + + if (switch_core_codec_init(&write_codec, + "L16", + NULL, + orig_read_codec->implementation->samples_per_second, + orig_read_codec->implementation->microseconds_per_frame / 1000, + 1, + SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, + NULL, + switch_core_session_get_pool(session)) == SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Raw Codec Activation Success L16\n"); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Raw Codec Activation Failed L16"); + goto done; + } write_frame.codec = &write_codec; write_frame.data = buf; + /* + * now we enter a loop where we read audio frames to the channels and will pass it to spandsp + * and if there is some outgoing frame we'll send it back to the calling fax machine + */ + while(switch_channel_ready(channel)) { // read new audio frame from the channel

1 0

[Freeswitch-svn] [commit] r9438 - freeswitch/trunk/src/mod/applications/mod_fax
by Freeswitch SVN 04 Sep '08

04 Sep '08

Author: agx Date: Thu Sep 4 06:17:55 2008 New Revision: 9438 Modified: freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.c Log: improved phase_e_handler Modified: freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.c (original) +++ freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.c Thu Sep 4 06:17:55 2008 @@ -170,7 +170,13 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Pages transferred: %i\n", t.pages_transferred); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Image resolution: %i x %i\n", t.x_resolution, t.y_resolution); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Transfer Rate: %i\n", t.bit_rate); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "local ident: %s\n", t30_get_tx_ident(s)); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "remote ident: %s\n", t30_get_rx_ident(s)); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "station country: %s\n", t30_get_rx_country(s)); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "station vendor: %s\n", t30_get_rx_vendor(s)); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "station model: %s\n", t30_get_rx_model(s)); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "==============================================================================\n"); + } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "==============================================================================\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Fax receive not successful - result (%d) %s.\n", result, t30_completion_code_to_str(result)); @@ -179,7 +185,7 @@ //TODO: remove the assert once this has been tested switch_assert(user_data != NULL); - //TODO: is the buffer too little? + //TODO: is the buffer too little? anyway <MikeJ> is going to write a new set_variable function that will allow a printf like syntax very soon switch_channel_set_variable(chan, "FAX_REMOTESTATIONID", far_ident); switch_snprintf(buf, sizeof(buf), "%d", t.pages_transferred); @@ -193,18 +199,6 @@ switch_snprintf(buf, sizeof(buf), "%s", t30_completion_code_to_str(result)); switch_channel_set_variable(chan, "FAX_ERROR", buf); - /* TODO */ - #ifdef TODO - printf("%d: Phase E: local ident '%s'\n", i, info->ident); - if ((u = t30_get_rx_ident(s))) - printf("%d: Phase E: remote ident '%s'\n", i, u); - if ((u = t30_get_rx_country(s))) - printf("%d: Phase E: Remote was made in '%s'\n", i, u); - if ((u = t30_get_rx_vendor(s))) - printf("%d: Phase E: Remote was made by '%s'\n", i, u); - if ((u = t30_get_rx_model(s))) - printf("%d: Phase E: Remote is model '%s'\n", i, u); - #endif } /*

1 0

[Freeswitch-svn] [commit] r9437 - freeswitch/trunk/src/mod/applications/mod_fax
by Freeswitch SVN 04 Sep '08

04 Sep '08

Author: agx Date: Thu Sep 4 06:06:24 2008 New Revision: 9437 Modified: freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.c Log: improved phase_d_handler Modified: freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.c (original) +++ freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.c Thu Sep 4 06:06:24 2008 @@ -110,11 +110,16 @@ static int phase_d_handler(t30_state_t *s, void *user_data, int result) { t30_stats_t t; + int session; + switch_assert(user_data != NULL); + session = (intptr_t) user_data; if (result) { t30_get_transfer_statistics(s, &t); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "==============================================================================\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Phase D handler on channel %d - (0x%X) %s\n", session, session, result, t30_frametype(result)); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Pages transferred: %i\n", t.pages_transferred); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Pages in the file: %i\n", t.pages_in_file); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Image size: %i x %i\n", t.width, t.length); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Image resolution %i x %i\n", t.x_resolution, t.y_resolution); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Transfer Rate: %i\n", t.bit_rate); @@ -123,21 +128,11 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Compression type %i %s\n", t.encoding, t4_encoding_to_str(t.encoding)); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Image size (bytes) %i\n", t.image_size); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "ECM %s\n", (t.error_correcting_mode) ? "on" : "off"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "local ident: %s\n", t30_get_tx_ident(s)); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "remote ident: %s\n", t30_get_rx_ident(s)); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "bits per row - min %d, max %d\n", s->t4.min_row_bits, s->t4.max_row_bits); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "==============================================================================\n"); } - - /* TODO */ - #ifdef TODO - printf("%d: Phase D handler on channel %d - (0x%X) %s\n", i, i, result, t30_frametype(result)); - printf("%d: Phase D: pages in the file %d\n", i, t.pages_in_file); - printf("%d: Phase D: image size %d x %d\n", i, t.width, t.length); - printf("%d: Phase D: image size %d bytes\n", i, t.image_size); - if ((u = t30_get_tx_ident(s))) - printf("%d: Phase D: local ident '%s'\n", i, u); - if ((u = t30_get_rx_ident(s))) - printf("%d: Phase D: remote ident '%s'\n", i, u); - printf("%d: Phase D: bits per row - min %d, max %d\n", i, s->t4.min_row_bits, s->t4.max_row_bits); - #endif return T30_ERR_OK; } @@ -366,11 +361,11 @@ | T30_SUPPORT_R8_RESOLUTION | T30_SUPPORT_R16_RESOLUTION); /* set phase handlers callbaks */ - t30_set_phase_d_handler(&fax.t30, phase_d_handler, NULL); + t30_set_phase_d_handler(&fax.t30, phase_d_handler, session); t30_set_phase_e_handler(&fax.t30, phase_e_handler, channel); if (debug) { t30_set_phase_b_handler(&fax.t30, phase_b_handler, session); - t30_set_document_handler(&fax.t30, document_handler, NULL ); + t30_set_document_handler(&fax.t30, document_handler, session); }

1 0

[Freeswitch-svn] [commit] r9436 - freeswitch/trunk/src/mod/applications/mod_fax
by Freeswitch SVN 04 Sep '08

04 Sep '08

Author: agx Date: Thu Sep 4 05:59:55 2008 New Revision: 9436 Modified: freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.c Log: improved phase_b_handler Modified: freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.c (original) +++ freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.c Thu Sep 4 05:59:55 2008 @@ -46,10 +46,12 @@ { int fs_log_level; - // TODO: maybe is better to use switch_assert here? + /* TODO: maybe is better to use switch_assert here? if (msg==NULL) { return; } + */ + switch_assert(msg!=NULL); switch (level) { @@ -85,25 +87,18 @@ static int phase_b_handler(t30_state_t *s, void *user_data, int result) { int session; + const char *u = NULL; switch_assert(user_data != NULL); session = (intptr_t) user_data; - /* TODO */ - #if TODO - if ((u = t30_get_rx_ident(s))) - printf("%d: Phase B: remote ident '%s'\n", i, u); - if ((u = t30_get_rx_sub_address(s))) - printf("%d: Phase B: remote sub-address '%s'\n", i, u); - if ((u = t30_get_rx_polled_sub_address(s))) - printf("%d: Phase B: remote polled sub-address '%s'\n", i, u); - if ((u = t30_get_rx_selective_polling_address(s))) - printf("%d: Phase B: remote selective polling address '%s'\n", i, u); - if ((u = t30_get_rx_sender_ident(s))) - printf("%d: Phase B: remote sender ident '%s'\n", i, u); - if ((u = t30_get_rx_password(s))) - printf("%d: Phase B: remote password '%s'\n", i, u); - printf("%d: Phase B handler on channel %d - (0x%X) %s\n", i, i, result, t30_frametype(result)); - #endif - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Phase B handler on session %d - (0x%X) %s\n", session, result, t30_frametype(result)); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "==============================================================================\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Phase B: handler on session %d - (0x%X) %s\n", session, result, t30_frametype(result)); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "remote ident: %s\n", t30_get_rx_ident(s)); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "remote sub-address: %s\n", t30_get_rx_sub_address(s)); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "remote polled sub-address: %s\n", t30_get_rx_polled_sub_address(s)); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "remote sel. polling addr.: %s\n", t30_get_rx_selective_polling_address(s)); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "remote sender ident: %s\n", t30_get_rx_sender_ident(s)); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "remote password: %s\n", t30_get_rx_password(s)); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "==============================================================================\n"); return T30_ERR_OK; };

1 0

[Freeswitch-svn] [commit] r9435 - freeswitch/trunk/src/mod/applications/mod_fax
by Freeswitch SVN 04 Sep '08

04 Sep '08

Author: agx Date: Thu Sep 4 05:33:04 2008 New Revision: 9435 Modified: freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.c Log: improved mod_fax options, logging and debugging Modified: freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.c (original) +++ freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.c Thu Sep 4 05:33:04 2008 @@ -41,23 +41,40 @@ /* * output spandsp lowlevel messages */ + static void span_message(int level, const char *msg) { - int fs_log_level = SWITCH_LOG_NOTICE; + int fs_log_level; + // TODO: maybe is better to use switch_assert here? if (msg==NULL) { return; } - // TODO: verify all the span_log_levels available - if (level == SPAN_LOG_ERROR) { - fs_log_level = SWITCH_LOG_ERROR; - } else if (level == SPAN_LOG_WARNING) { - fs_log_level = SWITCH_LOG_WARNING; - } else { - fs_log_level = SWITCH_LOG_DEBUG; + switch (level) + { + /* TODO: i need to ask Coppice what SPAN_LOG_NONE and SPA_LOG_FLOW are exactly for + SPAN_LOG_NONE: + return; + SPAN_LOG_FLOW: + SPAN_LOG_FLOW_2: + SPAN_LOG_FLOW_3: + if (!debug) + return; + fs_log_level = SWITCH_LOG_DEBUG; + break; + */ + SPAN_LOG_ERROR: + SPAN_LOG_PROTOCOL_ERROR: + fs_log_level = SWITCH_LOG_ERROR; + break; + SPAN_LOG_WARNING: + SPAN_LOG_PROTOCOL_WARNING: + fs_log_level = SWITCH_LOG_WARNING; + break; + default: /* SPAN_LOG_DEBUG, SPAN_LOG_DEBUG_2, SPAN_LOG_DEBUG_3 */ + fs_log_level = SWITCH_LOG_DEBUG; } - switch_log_printf(SWITCH_CHANNEL_LOG, fs_log_level, "%s", msg ); } @@ -67,10 +84,69 @@ static int phase_b_handler(t30_state_t *s, void *user_data, int result) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "MARK: Entering phase D\n"); + int session; + switch_assert(user_data != NULL); + session = (intptr_t) user_data; + /* TODO */ + #if TODO + if ((u = t30_get_rx_ident(s))) + printf("%d: Phase B: remote ident '%s'\n", i, u); + if ((u = t30_get_rx_sub_address(s))) + printf("%d: Phase B: remote sub-address '%s'\n", i, u); + if ((u = t30_get_rx_polled_sub_address(s))) + printf("%d: Phase B: remote polled sub-address '%s'\n", i, u); + if ((u = t30_get_rx_selective_polling_address(s))) + printf("%d: Phase B: remote selective polling address '%s'\n", i, u); + if ((u = t30_get_rx_sender_ident(s))) + printf("%d: Phase B: remote sender ident '%s'\n", i, u); + if ((u = t30_get_rx_password(s))) + printf("%d: Phase B: remote password '%s'\n", i, u); + printf("%d: Phase B handler on channel %d - (0x%X) %s\n", i, i, result, t30_frametype(result)); + #endif + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Phase B handler on session %d - (0x%X) %s\n", session, result, t30_frametype(result)); + return T30_ERR_OK; +}; + + +/* + * This function is called whenever a single new page has been received + */ + +static int phase_d_handler(t30_state_t *s, void *user_data, int result) +{ + t30_stats_t t; + + if (result) { + t30_get_transfer_statistics(s, &t); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "==============================================================================\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Pages transferred: %i\n", t.pages_transferred); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Image size: %i x %i\n", t.width, t.length); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Image resolution %i x %i\n", t.x_resolution, t.y_resolution); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Transfer Rate: %i\n", t.bit_rate); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Bad rows %i\n", t.bad_rows); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Longest bad row run %i\n", t.longest_bad_row_run); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Compression type %i %s\n", t.encoding, t4_encoding_to_str(t.encoding)); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Image size (bytes) %i\n", t.image_size); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "ECM %s\n", (t.error_correcting_mode) ? "on" : "off"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "==============================================================================\n"); + } + + /* TODO */ + #ifdef TODO + printf("%d: Phase D handler on channel %d - (0x%X) %s\n", i, i, result, t30_frametype(result)); + printf("%d: Phase D: pages in the file %d\n", i, t.pages_in_file); + printf("%d: Phase D: image size %d x %d\n", i, t.width, t.length); + printf("%d: Phase D: image size %d bytes\n", i, t.image_size); + if ((u = t30_get_tx_ident(s))) + printf("%d: Phase D: local ident '%s'\n", i, u); + if ((u = t30_get_rx_ident(s))) + printf("%d: Phase D: remote ident '%s'\n", i, u); + printf("%d: Phase D: bits per row - min %d, max %d\n", i, s->t4.min_row_bits, s->t4.max_row_bits); + #endif return T30_ERR_OK; } + /* * This function is called when the fax has finished his job */ @@ -116,41 +192,41 @@ //TODO: is the buffer too little? switch_channel_set_variable(chan, "FAX_REMOTESTATIONID", far_ident); - snprintf(buf, sizeof(buf), "%d", t.pages_transferred); + switch_snprintf(buf, sizeof(buf), "%d", t.pages_transferred); switch_channel_set_variable(chan, "FAX_PAGES", buf); - snprintf(buf, sizeof(buf), "%dx%d", t.x_resolution, t.y_resolution); + switch_snprintf(buf, sizeof(buf), "%dx%d", t.x_resolution, t.y_resolution); switch_channel_set_variable(chan, "FAX_SIZE", buf); - snprintf(buf, sizeof(buf), "%d", t.bit_rate); + switch_snprintf(buf, sizeof(buf), "%d", t.bit_rate); switch_channel_set_variable(chan, "FAX_SPEED", buf); - snprintf(buf, sizeof(buf), "%d", result); + switch_snprintf(buf, sizeof(buf), "%d", result); switch_channel_set_variable(chan, "FAX_RESULT", buf); - snprintf(buf, sizeof(buf), "%s", t30_completion_code_to_str(result)); + switch_snprintf(buf, sizeof(buf), "%s", t30_completion_code_to_str(result)); switch_channel_set_variable(chan, "FAX_ERROR", buf); -} + /* TODO */ + #ifdef TODO + printf("%d: Phase E: local ident '%s'\n", i, info->ident); + if ((u = t30_get_rx_ident(s))) + printf("%d: Phase E: remote ident '%s'\n", i, u); + if ((u = t30_get_rx_country(s))) + printf("%d: Phase E: Remote was made in '%s'\n", i, u); + if ((u = t30_get_rx_vendor(s))) + printf("%d: Phase E: Remote was made by '%s'\n", i, u); + if ((u = t30_get_rx_model(s))) + printf("%d: Phase E: Remote is model '%s'\n", i, u); + #endif +} /* - * This function is called whenever a single new page has been received + * Document Handler - callback function for T.30 end of document handling. */ -static int phase_d_handler(t30_state_t *s, void *user_data, int result) +static int document_handler(t30_state_t *s, void *user_data, int event) { - t30_stats_t t; - - if (result) { - t30_get_transfer_statistics(s, &t); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "==============================================================================\n"); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Pages transferred: %i\n", t.pages_transferred); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Image size: %i x %i\n", t.width, t.length); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Image resolution %i x %i\n", t.x_resolution, t.y_resolution); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Transfer Rate: %i\n", t.bit_rate); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Bad rows %i\n", t.bad_rows); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Longest bad row run %i\n", t.longest_bad_row_run); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Compression type %i %s\n", t.encoding, t4_encoding_to_str(t.encoding)); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Image size (bytes) %i\n", t.image_size); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "==============================================================================\n"); - } - return T30_ERR_OK; + int i; + i = (intptr_t) user_data; + printf("%d: Document handler on channel %d - event %d\n", i, i, event); + return FALSE; } SWITCH_STANDARD_APP(rxfax_function) @@ -236,7 +312,7 @@ fax_init(&fax, calling_party); //TODO: fax_init return NULL in case of failed initialization - //TODO: did i ported this from app_TXfax.c and it has no use there? + // Select whether silent audio will be sent when FAX transmit is idle. fax_set_transmit_on_idle(&fax, TRUE); //TODO: set spanlog debug to be outputted somewhere @@ -250,40 +326,27 @@ /* file_name - Sets the TIFF filename where do you want to save the fax */ file_name = switch_core_session_strdup(session, data); //TODO: check file_name is not NULL ? + switch_assert(file_name != NULL); t30_set_rx_file(&fax.t30, file_name, -1); /* FAX_DEBUG - enable extra debugging if defined */ - fax_local_debug = switch_channel_get_variable(channel, "FAX_DEBUG"); - debug = (fax_local_debug == NULL) ? FALSE : TRUE; + debug = ( NULL != switch_channel_get_variable(channel, "FAX_DEBUG") ); if (debug) { span_log_set_level(&fax.logging, SPAN_LOG_SHOW_SEVERITY | SPAN_LOG_SHOW_PROTOCOL | SPAN_LOG_FLOW); span_log_set_level(&fax.t30.logging, SPAN_LOG_SHOW_SEVERITY | SPAN_LOG_SHOW_PROTOCOL | SPAN_LOG_FLOW); } /* FAX_LOCAL_NUMBER - Set the receiving station phone number */ - fax_local_number = switch_channel_get_variable(channel, "FAX_LOCAL_NUMBER"); - if (fax_local_number==NULL) { - fax_local_number=""; - } - t30_set_tx_ident(&fax.t30, fax_local_number); + t30_set_tx_ident(&fax.t30, switch_str_nil(switch_channel_get_variable(channel, "FAX_LOCAL_NUMBER"))); /* FAX_LOCAL_NAME - Set the receiving station ID name (string) */ - fax_local_name = switch_channel_get_variable(channel, "FAX_LOCAL_NAME"); - if (fax_local_name==NULL) { - fax_local_name=""; - } - t30_set_tx_page_header_info(&fax.t30, fax_local_name); + t30_set_tx_page_header_info(&fax.t30, switch_str_nil(switch_channel_get_variable(channel, "FAX_LOCAL_NAME"))); /* FAX_LOCAL_SUBNAME - Set the receiving station ID sub name */ - fax_local_subname = switch_channel_get_variable(channel, "FAX_LOCAL_SUBNAME"); - if (fax_local_subname==NULL) { - fax_local_subname=""; - } - t30_set_tx_sub_address(&fax.t30, fax_local_subname); + t30_set_tx_sub_address(&fax.t30, switch_str_nil(switch_channel_get_variable(channel, "FAX_LOCAL_SUBNAME"))); /* FAX_DISABLE_ECM - Set if you want ECM on or OFF */ - fax_local_ecm = switch_channel_get_variable(channel, "FAX_DISABLE_ECM"); - if (fax_local_ecm == NULL ) { + if (NULL != switch_channel_get_variable(channel, "FAX_DISABLE_ECM")) { t30_set_ecm_capability(&fax.t30, TRUE); t30_set_supported_compressions(&fax.t30, T30_SUPPORT_T4_1D_COMPRESSION | T30_SUPPORT_T4_2D_COMPRESSION | T30_SUPPORT_T6_COMPRESSION); } else { @@ -291,13 +354,16 @@ } /* FAX_DISABLE_V17 - set if you want 9600 or V17 (14.400) */ - fax_local_v17 = switch_channel_get_variable(channel, "FAX_DISABLE_V17"); - if (fax_local_v17 == NULL) { + if (NULL != switch_channel_get_variable(channel, "FAX_DISABLE_V17")) { t30_set_supported_modems(&fax.t30, T30_SUPPORT_V29 | T30_SUPPORT_V27TER | T30_SUPPORT_V17 ); } else { t30_set_supported_modems(&fax.t30, T30_SUPPORT_V29 | T30_SUPPORT_V27TER); } + /* TODO + * t30_set_tx_password(&mc->fax.t30_state, "Password"); + */ + /* Support for different image sizes && resolutions */ t30_set_supported_image_sizes(&fax.t30, T30_SUPPORT_US_LETTER_LENGTH | T30_SUPPORT_US_LEGAL_LENGTH | T30_SUPPORT_UNLIMITED_LENGTH | T30_SUPPORT_215MM_WIDTH | T30_SUPPORT_255MM_WIDTH | T30_SUPPORT_303MM_WIDTH); @@ -305,18 +371,22 @@ | T30_SUPPORT_R8_RESOLUTION | T30_SUPPORT_R16_RESOLUTION); /* set phase handlers callbaks */ - t30_set_phase_b_handler(&fax.t30, phase_b_handler, NULL); t30_set_phase_d_handler(&fax.t30, phase_d_handler, NULL); t30_set_phase_e_handler(&fax.t30, phase_e_handler, channel); + if (debug) { + t30_set_phase_b_handler(&fax.t30, phase_b_handler, session); + t30_set_document_handler(&fax.t30, document_handler, NULL ); + } - // TODO: ?? what this does ?? - write_frame.codec = &write_codec; - write_frame.data = buf; /* * now we enter a loop where we read audio frames to the channels and will pass it to spandsp * and if there is some outgoing frame we'll send it back to the calling fax machine */ + + write_frame.codec = &write_codec; + write_frame.data = buf; + while(switch_channel_ready(channel)) { // read new audio frame from the channel @@ -345,6 +415,10 @@ done: + // TODO: this is here to see if it gets called "pre" or "post" the document handler + if (debug) + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FAX transmission has terminated.\n"); + // shutdown spandsp so it can create our tiff t30_terminate(&fax.t30); fax_release(&fax);

1 0

[Freeswitch-svn] [commit] r9434 - freeswitch/trunk/src/mod/applications/mod_fax
by Freeswitch SVN 04 Sep '08

04 Sep '08

Author: anthm Date: Thu Sep 4 03:08:34 2008 New Revision: 9434 Modified: freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.c Log: code cleanup Modified: freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.c (original) +++ freeswitch/trunk/src/mod/applications/mod_fax/mod_fax.c Thu Sep 4 03:08:34 2008 @@ -43,15 +43,21 @@ */ static void span_message(int level, const char *msg) { - if (msg==NULL) return; int fs_log_level = SWITCH_LOG_NOTICE; + + if (msg==NULL) { + return; + } + // TODO: verify all the span_log_levels available - if (level == SPAN_LOG_ERROR) + if (level == SPAN_LOG_ERROR) { fs_log_level = SWITCH_LOG_ERROR; - else if (level == SPAN_LOG_WARNING) + } else if (level == SPAN_LOG_WARNING) { fs_log_level = SWITCH_LOG_WARNING; - else + } else { fs_log_level = SWITCH_LOG_DEBUG; + } + switch_log_printf(SWITCH_CHANNEL_LOG, fs_log_level, "%s", msg ); } @@ -62,7 +68,7 @@ static int phase_b_handler(t30_state_t *s, void *user_data, int result) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "MARK: Entering phase D\n"); - return T30_ERR_OK; + return T30_ERR_OK; } /* @@ -75,41 +81,41 @@ const char *local_ident = NULL; const char *far_ident = NULL; switch_channel_t *chan = (switch_channel_t *) user_data; + char buf[128]; - if (result == T30_ERR_OK) - { - t30_get_transfer_statistics(s, &t); - far_ident = t30_get_tx_ident(s); - if (!switch_strlen_zero(far_ident)) { - far_ident = ""; - } - local_ident = t30_get_rx_ident(s); - if (!switch_strlen_zero(local_ident)) { - local_ident = ""; - } - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "==============================================================================\n"); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Fax successfully received.\n"); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Remote station id: %s\n", far_ident); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Local station id: %s\n", local_ident); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Pages transferred: %i\n", t.pages_transferred); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Image resolution: %i x %i\n", t.x_resolution, t.y_resolution); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Transfer Rate: %i\n", t.bit_rate); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "==============================================================================\n"); - + if (result == T30_ERR_OK) { + t30_get_transfer_statistics(s, &t); + far_ident = t30_get_tx_ident(s); + + if (!switch_strlen_zero(far_ident)) { + far_ident = ""; } - else - { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "==============================================================================\n"); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Fax receive not successful - result (%d) %s.\n", result, t30_completion_code_to_str(result)); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "==============================================================================\n"); - + + local_ident = t30_get_rx_ident(s); + + if (!switch_strlen_zero(local_ident)) { + local_ident = ""; } + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "==============================================================================\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Fax successfully received.\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Remote station id: %s\n", far_ident); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Local station id: %s\n", local_ident); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Pages transferred: %i\n", t.pages_transferred); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Image resolution: %i x %i\n", t.x_resolution, t.y_resolution); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Transfer Rate: %i\n", t.bit_rate); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "==============================================================================\n"); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "==============================================================================\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Fax receive not successful - result (%d) %s.\n", result, t30_completion_code_to_str(result)); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "==============================================================================\n"); + } //TODO: remove the assert once this has been tested - assert(user_data != NULL); + switch_assert(user_data != NULL); //TODO: is the buffer too little? switch_channel_set_variable(chan, "FAX_REMOTESTATIONID", far_ident); - char buf[128]; + snprintf(buf, sizeof(buf), "%d", t.pages_transferred); switch_channel_set_variable(chan, "FAX_PAGES", buf); snprintf(buf, sizeof(buf), "%dx%d", t.x_resolution, t.y_resolution); @@ -131,21 +137,19 @@ { t30_stats_t t; - if (result) - { - t30_get_transfer_statistics(s, &t); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "==============================================================================\n"); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Pages transferred: %i\n", t.pages_transferred); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Image size: %i x %i\n", t.width, t.length); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Image resolution %i x %i\n", t.x_resolution, t.y_resolution); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Transfer Rate: %i\n", t.bit_rate); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Bad rows %i\n", t.bad_rows); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Longest bad row run %i\n", t.longest_bad_row_run); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Compression type %i %s\n", t.encoding, - t4_encoding_to_str(t.encoding)); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Image size (bytes) %i\n", t.image_size); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "==============================================================================\n"); - } + if (result) { + t30_get_transfer_statistics(s, &t); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "==============================================================================\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Pages transferred: %i\n", t.pages_transferred); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Image size: %i x %i\n", t.width, t.length); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Image resolution %i x %i\n", t.x_resolution, t.y_resolution); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Transfer Rate: %i\n", t.bit_rate); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Bad rows %i\n", t.bad_rows); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Longest bad row run %i\n", t.longest_bad_row_run); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Compression type %i %s\n", t.encoding, t4_encoding_to_str(t.encoding)); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Image size (bytes) %i\n", t.image_size); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "==============================================================================\n"); + } return T30_ERR_OK; } @@ -174,7 +178,7 @@ // make sure we have a valid channel when starting the FAX application channel = switch_core_session_get_channel(session); - assert(channel != NULL); + switch_assert(channel != NULL); /* reset output variables */ switch_channel_set_variable(channel, "FAX_REMOTESTATIONID", "unknown"); @@ -337,7 +341,6 @@ goto done; } } - } done: @@ -386,5 +389,5 @@ * c-basic-offset:4 * End: * For VIM: - * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4: */

1 0