kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-03-15 05:08:26 +00:00
Code Issues Projects Releases Wiki Activity

add hangup to mod_fax and remove asteriskism

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@10506 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2008-11-21 21:17:12 +00:00
parent d25bd4791e
commit 0881d598d6
1 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/mod/applications/mod_fax/mod_fax.c
View File

@ -143,7 +143,7 @@ static void phase_e_handler(t30_state_t * s, void *user_data, int result)
const char *local_ident; const char *local_ident;
const char *far_ident; const char *far_ident;
switch_core_session_t *session; switch_core_session_t *session;
switch_channel_t *chan; switch_channel_t *channel;
pvt_t *pvt; pvt_t *pvt;
char *tmp; char *tmp;
@ -153,8 +153,8 @@ static void phase_e_handler(t30_state_t * s, void *user_data, int result)
session = pvt->session; session = pvt->session;
switch_assert(session); switch_assert(session);
chan = switch_core_session_get_channel(session); channel = switch_core_session_get_channel(session);
switch_assert(chan); switch_assert(channel);
t30_get_transfer_statistics(s, &t); t30_get_transfer_statistics(s, &t);
local_ident = switch_str_nil(t30_get_tx_ident(s)); local_ident = switch_str_nil(t30_get_tx_ident(s));
@ -171,11 +171,11 @@ static void phase_e_handler(t30_state_t * s, void *user_data, int result)
} else { } else {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Fax successfully managed. How ?\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Fax successfully managed. How ?\n");
} }
switch_channel_set_variable(chan, "fax_success", "1"); switch_channel_set_variable(channel, "fax_success", "1");
} else { } else {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Fax processing not successful - result (%d) %s.\n", result, switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Fax processing not successful - result (%d) %s.\n", result,
t30_completion_code_to_str(result)); t30_completion_code_to_str(result));
switch_channel_set_variable(chan, "fax_success", "0"); switch_channel_set_variable(channel, "fax_success", "0");
} }
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, "Remote station id: %s\n", far_ident);
@ -198,52 +198,54 @@ static void phase_e_handler(t30_state_t * s, void *user_data, int result)
tmp = switch_mprintf("%i", result); tmp = switch_mprintf("%i", result);
if (tmp) { if (tmp) {
switch_channel_set_variable(chan, "fax_result_code", tmp); switch_channel_set_variable(channel, "fax_result_code", tmp);
switch_safe_free(tmp); switch_safe_free(tmp);
} }
switch_channel_set_variable(chan, "fax_result_text", t30_completion_code_to_str(result)); switch_channel_set_variable(channel, "fax_result_text", t30_completion_code_to_str(result));
switch_channel_set_variable(chan, "fax_ecm_used", (t.error_correcting_mode) ? "on" : "off"); switch_channel_set_variable(channel, "fax_ecm_used", (t.error_correcting_mode) ? "on" : "off");
switch_channel_set_variable(chan, "fax_local_station_id", local_ident); switch_channel_set_variable(channel, "fax_local_station_id", local_ident);
switch_channel_set_variable(chan, "fax_remote_station_id", far_ident); switch_channel_set_variable(channel, "fax_remote_station_id", far_ident);
tmp = switch_mprintf("%i", t.pages_transferred); tmp = switch_mprintf("%i", t.pages_transferred);
if (tmp) { if (tmp) {
switch_channel_set_variable(chan, "fax_document_transferred_pages", tmp); switch_channel_set_variable(channel, "fax_document_transferred_pages", tmp);
switch_safe_free(tmp); switch_safe_free(tmp);
} }
tmp = switch_mprintf("%i", t.pages_in_file); tmp = switch_mprintf("%i", t.pages_in_file);
if (tmp) { if (tmp) {
switch_channel_set_variable(chan, "fax_document_total_pages", tmp); switch_channel_set_variable(channel, "fax_document_total_pages", tmp);
switch_safe_free(tmp); switch_safe_free(tmp);
} }
tmp = switch_mprintf("%ix%i", t.x_resolution, t.y_resolution); tmp = switch_mprintf("%ix%i", t.x_resolution, t.y_resolution);
if (tmp) { if (tmp) {
switch_channel_set_variable(chan, "fax_image_resolution", tmp); switch_channel_set_variable(channel, "fax_image_resolution", tmp);
switch_safe_free(tmp); switch_safe_free(tmp);
} }
tmp = switch_mprintf("%d", t.image_size); tmp = switch_mprintf("%d", t.image_size);
if (tmp) { if (tmp) {
switch_channel_set_variable(chan, "fax_image_size", tmp); switch_channel_set_variable(channel, "fax_image_size", tmp);
switch_safe_free(tmp); switch_safe_free(tmp);
} }
tmp = switch_mprintf("%d", t.bad_rows); tmp = switch_mprintf("%d", t.bad_rows);
if (tmp) { if (tmp) {
switch_channel_set_variable(chan, "fax_bad_rows", tmp); switch_channel_set_variable(channel, "fax_bad_rows", tmp);
switch_safe_free(tmp); switch_safe_free(tmp);
} }
tmp = switch_mprintf("%i", t.bit_rate); tmp = switch_mprintf("%i", t.bit_rate);
if (tmp) { if (tmp) {
switch_channel_set_variable(chan, "fax_transfer_rate", tmp); switch_channel_set_variable(channel, "fax_transfer_rate", tmp);
switch_safe_free(tmp); switch_safe_free(tmp);
} }
switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING);
/* /*
TODO Fire events TODO Fire events
*/ */
@ -253,15 +255,15 @@ static switch_status_t spanfax_init(pvt_t * pvt, transport_mode_t trans_mode)
{ {
switch_core_session_t *session; switch_core_session_t *session;
switch_channel_t *chan; switch_channel_t *channel;
fax_state_t *fax; fax_state_t *fax;
t30_state_t *t30; t30_state_t *t30;
session = (switch_core_session_t *) pvt->session; session = (switch_core_session_t *) pvt->session;
switch_assert(session); switch_assert(session);
chan = switch_core_session_get_channel(session); channel = switch_core_session_get_channel(session);
switch_assert(chan); switch_assert(channel);
switch (trans_mode) { switch (trans_mode) {
@ -306,19 +308,19 @@ static switch_status_t spanfax_init(pvt_t * pvt, transport_mode_t trans_mode)
if (pvt->disable_v17) { if (pvt->disable_v17) {
t30_set_supported_modems(t30, T30_SUPPORT_V29 | T30_SUPPORT_V27TER); t30_set_supported_modems(t30, T30_SUPPORT_V29 | T30_SUPPORT_V27TER);
switch_channel_set_variable(chan, "fax_v17_disabled", "1"); switch_channel_set_variable(channel, "fax_v17_disabled", "1");
} else { } else {
t30_set_supported_modems(t30, T30_SUPPORT_V29 | T30_SUPPORT_V27TER | T30_SUPPORT_V17); t30_set_supported_modems(t30, T30_SUPPORT_V29 | T30_SUPPORT_V27TER | T30_SUPPORT_V17);
switch_channel_set_variable(chan, "fax_v17_disabled", "0"); switch_channel_set_variable(channel, "fax_v17_disabled", "0");
} }
if (pvt->use_ecm) { if (pvt->use_ecm) {
t30_set_supported_compressions(t30, T30_SUPPORT_T4_1D_COMPRESSION | T30_SUPPORT_T4_2D_COMPRESSION | T30_SUPPORT_T6_COMPRESSION); t30_set_supported_compressions(t30, T30_SUPPORT_T4_1D_COMPRESSION | T30_SUPPORT_T4_2D_COMPRESSION | T30_SUPPORT_T6_COMPRESSION);
t30_set_ecm_capability(t30, TRUE); t30_set_ecm_capability(t30, TRUE);
switch_channel_set_variable(chan, "fax_ecm_requested", "1"); switch_channel_set_variable(channel, "fax_ecm_requested", "1");
} else { } else {
t30_set_supported_compressions(t30, T30_SUPPORT_T4_1D_COMPRESSION | T30_SUPPORT_T4_2D_COMPRESSION); t30_set_supported_compressions(t30, T30_SUPPORT_T4_1D_COMPRESSION | T30_SUPPORT_T4_2D_COMPRESSION);
switch_channel_set_variable(chan, "fax_ecm_requested", "0"); switch_channel_set_variable(channel, "fax_ecm_requested", "0");
} }
if (pvt->app_mode == FUNCTION_TX) { if (pvt->app_mode == FUNCTION_TX) {
@ -326,7 +328,7 @@ static switch_status_t spanfax_init(pvt_t * pvt, transport_mode_t trans_mode)
} else { } else {
t30_set_rx_file(t30, pvt->filename, -1); t30_set_rx_file(t30, pvt->filename, -1);
} }
switch_channel_set_variable(chan, "fax_filename", pvt->filename); switch_channel_set_variable(channel, "fax_filename", pvt->filename);
break; break;
case T38_MODE: case T38_MODE:
/* /*