- Freeswitch-trunk - FreeSWITCH Mailing Lists

[GIT] branch master updated. git2svn-syncpoint-master-1630-g4b94154
by svnnotify＠freeswitch.org 28 Jan '11

28 Jan '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, master has been updated via 4b941542a309a8c7f7ad5d01cfef9d1c487376a8 (commit) from b889b44f1d632810662359f6becce869056a076c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 4b941542a309a8c7f7ad5d01cfef9d1c487376a8 Author: Anthony Minessale <anthm(a)freeswitch.org> Date: Thu Jan 27 10:34:05 2011 -0600 fix out of place parens in logic test diff --git a/src/switch_channel.c b/src/switch_channel.c index 918ad82..de472a9 100644 --- a/src/switch_channel.c +++ b/src/switch_channel.c @@ -2564,8 +2564,8 @@ SWITCH_DECLARE(switch_status_t) switch_channel_perform_mark_ring_ready_value(swi char *app; switch_event_t *event; - if (!switch_channel_test_flag(channel, CF_RING_READY) && !switch_channel_test_flag(channel, CF_EARLY_MEDIA && - !switch_channel_test_flag(channel, CF_ANSWERED))) { + if (!switch_channel_test_flag(channel, CF_RING_READY) && + !switch_channel_test_flag(channel, CF_EARLY_MEDIA) && !switch_channel_test_flag(channel, CF_ANSWERED)) { switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, switch_channel_get_uuid(channel), SWITCH_LOG_NOTICE, "Ring-Ready %s!\n", channel->name); switch_channel_set_flag_value(channel, CF_RING_READY, rv); if (channel->caller_profile && channel->caller_profile->times) { ----------------------------------------------------------------------- Summary of changes: src/switch_channel.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive --

1 0

[GIT] branch master updated. git2svn-syncpoint-master-1630-g4b94154
by svnnotify＠freeswitch.org 28 Jan '11

28 Jan '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, master has been updated via 4b941542a309a8c7f7ad5d01cfef9d1c487376a8 (commit) from b889b44f1d632810662359f6becce869056a076c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 4b941542a309a8c7f7ad5d01cfef9d1c487376a8 Author: Anthony Minessale <anthm(a)freeswitch.org> Date: Thu Jan 27 10:34:05 2011 -0600 fix out of place parens in logic test diff --git a/src/switch_channel.c b/src/switch_channel.c index 918ad82..de472a9 100644 --- a/src/switch_channel.c +++ b/src/switch_channel.c @@ -2564,8 +2564,8 @@ SWITCH_DECLARE(switch_status_t) switch_channel_perform_mark_ring_ready_value(swi char *app; switch_event_t *event; - if (!switch_channel_test_flag(channel, CF_RING_READY) && !switch_channel_test_flag(channel, CF_EARLY_MEDIA && - !switch_channel_test_flag(channel, CF_ANSWERED))) { + if (!switch_channel_test_flag(channel, CF_RING_READY) && + !switch_channel_test_flag(channel, CF_EARLY_MEDIA) && !switch_channel_test_flag(channel, CF_ANSWERED)) { switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, switch_channel_get_uuid(channel), SWITCH_LOG_NOTICE, "Ring-Ready %s!\n", channel->name); switch_channel_set_flag_value(channel, CF_RING_READY, rv); if (channel->caller_profile && channel->caller_profile->times) { ----------------------------------------------------------------------- Summary of changes: src/switch_channel.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive --

1 0

[GIT] branch master updated. git2svn-syncpoint-master-1630-g4b94154
by svnnotify＠freeswitch.org 28 Jan '11

28 Jan '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, master has been updated via 4b941542a309a8c7f7ad5d01cfef9d1c487376a8 (commit) from b889b44f1d632810662359f6becce869056a076c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 4b941542a309a8c7f7ad5d01cfef9d1c487376a8 Author: Anthony Minessale <anthm(a)freeswitch.org> Date: Thu Jan 27 10:34:05 2011 -0600 fix out of place parens in logic test diff --git a/src/switch_channel.c b/src/switch_channel.c index 918ad82..de472a9 100644 --- a/src/switch_channel.c +++ b/src/switch_channel.c @@ -2564,8 +2564,8 @@ SWITCH_DECLARE(switch_status_t) switch_channel_perform_mark_ring_ready_value(swi char *app; switch_event_t *event; - if (!switch_channel_test_flag(channel, CF_RING_READY) && !switch_channel_test_flag(channel, CF_EARLY_MEDIA && - !switch_channel_test_flag(channel, CF_ANSWERED))) { + if (!switch_channel_test_flag(channel, CF_RING_READY) && + !switch_channel_test_flag(channel, CF_EARLY_MEDIA) && !switch_channel_test_flag(channel, CF_ANSWERED)) { switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, switch_channel_get_uuid(channel), SWITCH_LOG_NOTICE, "Ring-Ready %s!\n", channel->name); switch_channel_set_flag_value(channel, CF_RING_READY, rv); if (channel->caller_profile && channel->caller_profile->times) { ----------------------------------------------------------------------- Summary of changes: src/switch_channel.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive --

1 0

[GIT] branch master updated. git2svn-syncpoint-master-1643-g97a2b4f
by git＠svn.freeswitch.org 28 Jan '11

28 Jan '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, master has been updated via 97a2b4f9025099bdab5718a13ee36d15a6152411 (commit) from 68b2756970bd4280eba700b7439afdff374fd9e3 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 97a2b4f9025099bdab5718a13ee36d15a6152411 Author: Raymond Chandler <intralanman(a)gmail.com> Date: Fri Jan 28 14:24:07 2011 -0500 test diff --git a/conf/freeswitch.xml b/conf/freeswitch.xml index 6ed99ef..80e7728 100644 --- a/conf/freeswitch.xml +++ b/conf/freeswitch.xml @@ -64,3 +64,4 @@ </document> + ----------------------------------------------------------------------- Summary of changes: conf/freeswitch.xml | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) hooks/post-receive --

1 0

[GIT] branch master updated. git2svn-syncpoint-master-1642-g68b2756
by git＠svn.freeswitch.org 28 Jan '11

28 Jan '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, master has been updated via 68b2756970bd4280eba700b7439afdff374fd9e3 (commit) from 9b0c16b5d48a7b9d0ea15ac429a8ca4c8eef8693 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 68b2756970bd4280eba700b7439afdff374fd9e3 Author: Raymond Chandler <intralanman(a)gmail.com> Date: Fri Jan 28 14:21:31 2011 -0500 test diff --git a/conf/freeswitch.xml b/conf/freeswitch.xml index 5fc9402..6ed99ef 100644 --- a/conf/freeswitch.xml +++ b/conf/freeswitch.xml @@ -63,3 +63,4 @@ </section> </document> + ----------------------------------------------------------------------- Summary of changes: conf/freeswitch.xml | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) hooks/post-receive --

1 0

[GIT] branch master updated. git2svn-syncpoint-master-1641-g9b0c16b
by git＠svn.freeswitch.org 28 Jan '11

28 Jan '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, master has been updated via 9b0c16b5d48a7b9d0ea15ac429a8ca4c8eef8693 (commit) from f05fe55594ffca6edc8f4e74204650aa219ed1ac (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 9b0c16b5d48a7b9d0ea15ac429a8ca4c8eef8693 Author: Raymond Chandler <intralanman(a)gmail.com> Date: Fri Jan 28 14:20:21 2011 -0500 test diff --git a/conf/freeswitch.xml b/conf/freeswitch.xml index 6ed99ef..5fc9402 100644 --- a/conf/freeswitch.xml +++ b/conf/freeswitch.xml @@ -63,4 +63,3 @@ </section> </document> - ----------------------------------------------------------------------- Summary of changes: conf/freeswitch.xml | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) hooks/post-receive --

1 0

[GIT] branch master updated. git2svn-syncpoint-master-1640-gf05fe55
by git＠svn.freeswitch.org 28 Jan '11

28 Jan '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, master has been updated via f05fe55594ffca6edc8f4e74204650aa219ed1ac (commit) from 08f494b80802aacf101705382f149ca4b028eb57 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit f05fe55594ffca6edc8f4e74204650aa219ed1ac Author: Raymond Chandler <intralanman(a)gmail.com> Date: Fri Jan 28 14:19:07 2011 -0500 test diff --git a/conf/freeswitch.xml b/conf/freeswitch.xml index 80e7728..6ed99ef 100644 --- a/conf/freeswitch.xml +++ b/conf/freeswitch.xml @@ -64,4 +64,3 @@ </document> - ----------------------------------------------------------------------- Summary of changes: conf/freeswitch.xml | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) hooks/post-receive --

1 0

[GIT] branch master updated. git2svn-syncpoint-master-1635-g314a2a1
by git＠svn.freeswitch.org 27 Jan '11

27 Jan '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, master has been updated via 314a2a1e2061ef321fa5f9b32a9c70ef0040cdb8 (commit) from 48c02b7cd2770f6aee1d6e89f5ecfe207231f398 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 314a2a1e2061ef321fa5f9b32a9c70ef0040cdb8 Author: Brian West <brian(a)freeswitch.org> Date: Thu Jan 27 10:40:49 2011 -0600 FS-3004 diff --git a/src/mod/applications/mod_spandsp/mod_spandsp_fax.c b/src/mod/applications/mod_spandsp/mod_spandsp_fax.c index 21c6a68..4dd936b 100644 --- a/src/mod/applications/mod_spandsp/mod_spandsp_fax.c +++ b/src/mod/applications/mod_spandsp/mod_spandsp_fax.c @@ -40,6 +40,9 @@ #define MAX_FEC_ENTRIES 4 #define MAX_FEC_SPAN 4 +#define SPANDSP_EVENT_TXFAXRESULT "spandsp::txfaxresult" +#define SPANDSP_EVENT_RXFAXRESULT "spandsp::rxfaxresult" + /***************************************************************************** OUR DEFINES AND STRUCTS *****************************************************************************/ @@ -305,7 +308,14 @@ static void phase_e_handler(t30_state_t *s, void *user_data, int result) switch_core_session_t *session; switch_channel_t *channel; pvt_t *pvt; - char *tmp; + char *fax_document_transferred_pages = NULL; + char *fax_document_total_pages = NULL; + char *fax_image_resolution = NULL; + char *fax_image_size = NULL; + char *fax_bad_rows = NULL; + char *fax_transfer_rate = NULL; + char *fax_result_code = NULL; + switch_event_t *event; pvt = (pvt_t *) user_data; switch_assert(pvt); @@ -353,13 +363,12 @@ static void phase_e_handler(t30_state_t *s, void *user_data, int result) switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "==============================================================================\n"); /* - Set our channel variables + Set our channel variables, variables are also used in event */ - tmp = switch_mprintf("%i", result); - if (tmp) { - switch_channel_set_variable(channel, "fax_result_code", tmp); - switch_safe_free(tmp); + fax_result_code = switch_core_session_sprintf(session, "%i", result); + if (fax_result_code) { + switch_channel_set_variable(channel, "fax_result_code", fax_result_code); } switch_channel_set_variable(channel, "fax_result_text", t30_completion_code_to_str(result)); @@ -368,49 +377,56 @@ static void phase_e_handler(t30_state_t *s, void *user_data, int result) switch_channel_set_variable(channel, "fax_local_station_id", local_ident); switch_channel_set_variable(channel, "fax_remote_station_id", far_ident); - tmp = switch_mprintf("%i", pvt->app_mode == FUNCTION_TX ? t.pages_tx : t.pages_rx); - if (tmp) { - switch_channel_set_variable(channel, "fax_document_transferred_pages", tmp); - switch_safe_free(tmp); + fax_document_transferred_pages = switch_core_session_sprintf(session, "%i", pvt->app_mode == FUNCTION_TX ? t.pages_tx : t.pages_rx); + if (fax_document_transferred_pages) { + switch_channel_set_variable(channel, "fax_document_transferred_pages", fax_document_transferred_pages); } - tmp = switch_mprintf("%i", t.pages_in_file); - if (tmp) { - switch_channel_set_variable(channel, "fax_document_total_pages", tmp); - switch_safe_free(tmp); + fax_document_total_pages = switch_core_session_sprintf(session, "%i", t.pages_in_file); + if (fax_document_total_pages) { + switch_channel_set_variable(channel, "fax_document_total_pages", fax_document_total_pages); } - tmp = switch_mprintf("%ix%i", t.x_resolution, t.y_resolution); - if (tmp) { - switch_channel_set_variable(channel, "fax_image_resolution", tmp); - switch_safe_free(tmp); + fax_image_resolution = switch_core_session_sprintf(session, "%ix%i", t.x_resolution, t.y_resolution); + if (fax_image_resolution) { + switch_channel_set_variable(channel, "fax_image_resolution", fax_image_resolution); } - tmp = switch_mprintf("%d", t.image_size); - if (tmp) { - switch_channel_set_variable(channel, "fax_image_size", tmp); - switch_safe_free(tmp); + fax_image_size = switch_core_session_sprintf(session, "%d", t.image_size); + if (fax_image_size) { + switch_channel_set_variable(channel, "fax_image_size", fax_image_size); } - tmp = switch_mprintf("%d", t.bad_rows); - if (tmp) { - switch_channel_set_variable(channel, "fax_bad_rows", tmp); - switch_safe_free(tmp); + fax_bad_rows = switch_core_session_sprintf(session, "%d", t.bad_rows); + if (fax_bad_rows) { + switch_channel_set_variable(channel, "fax_bad_rows", fax_bad_rows); } - tmp = switch_mprintf("%i", t.bit_rate); - if (tmp) { - switch_channel_set_variable(channel, "fax_transfer_rate", tmp); - switch_safe_free(tmp); + fax_transfer_rate = switch_core_session_sprintf(session, "%i", t.bit_rate); + if (fax_transfer_rate) { + switch_channel_set_variable(channel, "fax_transfer_rate", fax_transfer_rate); } /* switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING); */ pvt->done = 1; - /* - TODO Fire events - */ + /* Fire event */ + + if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, pvt->app_mode == FUNCTION_TX ? SPANDSP_EVENT_TXFAXRESULT : SPANDSP_EVENT_RXFAXRESULT) == SWITCH_STATUS_SUCCESS) { + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "fax-document-transferred-pages", fax_document_transferred_pages); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "fax-document-total-pages", fax_document_total_pages); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "fax-image-resolution", fax_image_resolution); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "fax-image-size", fax_image_size); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "fax-bad-rows", fax_bad_rows); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "fax-transfer-rate", fax_transfer_rate); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "fax-result-code", fax_result_code); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "fax-result-text", t30_completion_code_to_str(result)); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "fax-ecm-used", (t.error_correcting_mode) ? "on" : "off"); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "fax-local-station-id", local_ident); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "fax-remote-station-id", far_ident); + switch_core_session_queue_private_event(session, &event, SWITCH_FALSE); + } } static int t38_tx_packet_handler(t38_core_state_t *s, void *user_data, const uint8_t *buf, int len, int count) @@ -1026,7 +1042,6 @@ void mod_spandsp_fax_process_fax(switch_core_session_t *session, const char *dat switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Fax TX filename not set.\n"); goto done; } else if (pvt->app_mode == FUNCTION_RX) { - char *fname; const char *prefix; switch_time_t time; @@ -1036,11 +1051,7 @@ void mod_spandsp_fax_process_fax(switch_core_session_t *session, const char *dat prefix = globals.prepend_string; } - fname = switch_mprintf("%s/%s-%ld-%ld.tif", globals.spool, prefix, globals.total_sessions, time); - if (fname) { - pvt->filename = switch_core_session_strdup(session, fname); - switch_safe_free(fname); - } else { + if (!(pvt->filename = switch_core_session_sprintf(session, "%s/%s-%ld-%ld.tif", globals.spool, prefix, globals.total_sessions, time))) { switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Cannot automatically set fax RX destination file\n"); goto done; } ----------------------------------------------------------------------- Summary of changes: src/mod/applications/mod_spandsp/mod_spandsp_fax.c | 89 +++++++++++--------- 1 files changed, 50 insertions(+), 39 deletions(-) hooks/post-receive --

1 0

[GIT] branch master updated. git2svn-syncpoint-master-1634-g48c02b7
by git＠svn.freeswitch.org 27 Jan '11

27 Jan '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, master has been updated via 48c02b7cd2770f6aee1d6e89f5ecfe207231f398 (commit) from f954d21ab8f84ea3518525d6f8a5a25c5cd39d6b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 48c02b7cd2770f6aee1d6e89f5ecfe207231f398 Author: Raymond Chandler <intralanman(a)gmail.com> Date: Thu Jan 27 16:49:09 2011 -0500 test diff --git a/build/modules.conf.in b/build/modules.conf.in index b46c2ff..84a9e9a 100644 --- a/build/modules.conf.in +++ b/build/modules.conf.in @@ -112,4 +112,3 @@ say/mod_say_ru ## Experimental Modules (don't cry if they're broken) #../../contrib/mod/xml_int/mod_xml_odbc - ----------------------------------------------------------------------- Summary of changes: build/modules.conf.in | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) hooks/post-receive --

1 0

[GIT] branch master updated. git2svn-syncpoint-master-1630-g4b94154
by git＠svn.freeswitch.org 27 Jan '11

27 Jan '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "". The branch, master has been updated via 4b941542a309a8c7f7ad5d01cfef9d1c487376a8 (commit) from b889b44f1d632810662359f6becce869056a076c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 4b941542a309a8c7f7ad5d01cfef9d1c487376a8 Author: Anthony Minessale <anthm(a)freeswitch.org> Date: Thu Jan 27 10:34:05 2011 -0600 fix out of place parens in logic test diff --git a/src/switch_channel.c b/src/switch_channel.c index 918ad82..de472a9 100644 --- a/src/switch_channel.c +++ b/src/switch_channel.c @@ -2564,8 +2564,8 @@ SWITCH_DECLARE(switch_status_t) switch_channel_perform_mark_ring_ready_value(swi char *app; switch_event_t *event; - if (!switch_channel_test_flag(channel, CF_RING_READY) && !switch_channel_test_flag(channel, CF_EARLY_MEDIA && - !switch_channel_test_flag(channel, CF_ANSWERED))) { + if (!switch_channel_test_flag(channel, CF_RING_READY) && + !switch_channel_test_flag(channel, CF_EARLY_MEDIA) && !switch_channel_test_flag(channel, CF_ANSWERED)) { switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, switch_channel_get_uuid(channel), SWITCH_LOG_NOTICE, "Ring-Ready %s!\n", channel->name); switch_channel_set_flag_value(channel, CF_RING_READY, rv); if (channel->caller_profile && channel->caller_profile->times) { ----------------------------------------------------------------------- Summary of changes: src/switch_channel.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive --

1 0