October 2008 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r10095 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 21 Oct '08

21 Oct '08

Author: anthm Date: Tue Oct 21 14:13:35 2008 New Revision: 10095 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: add debug message Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Tue Oct 21 14:13:35 2008 @@ -1316,6 +1316,7 @@ } route_uri = sofia_overcome_sip_uri_weakness(tech_pvt->session, route_uri, 0, SWITCH_TRUE, NULL); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s Setting proxy route to %s\n", route_uri, switch_channel_get_name(channel)); } nua_invite(tech_pvt->nh,

1 0

[commit] r10094 - freeswitch/trunk/src
by Freeswitch SVN 21 Oct '08

21 Oct '08

Author: anthm Date: Tue Oct 21 14:04:20 2008 New Revision: 10094 Modified: freeswitch/trunk/src/switch_rtp.c Log: even more room for t38 Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Tue Oct 21 14:04:20 2008 @@ -1275,7 +1275,7 @@ return_cng_frame(); } - if (bytes && bytes < 8) { + if (bytes && bytes < 5) { continue; }

1 0

[commit] r10093 - freeswitch/trunk/src/mod/applications/mod_commands
by Freeswitch SVN 21 Oct '08

21 Oct '08

Author: anthm Date: Tue Oct 21 13:41:55 2008 New Revision: 10093 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Log: add all modifier to break command Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Tue Oct 21 13:41:55 2008 @@ -1604,11 +1604,12 @@ return SWITCH_STATUS_SUCCESS; } -#define BREAK_SYNTAX "<uuid>" +#define BREAK_SYNTAX "<uuid> [all]" SWITCH_STANDARD_API(break_function) { switch_core_session_t *psession = NULL; - + char *mycmd, *flag; + if (session) { return SWITCH_STATUS_FALSE; } @@ -1618,11 +1619,22 @@ return SWITCH_STATUS_SUCCESS; } - if (!(psession = switch_core_session_locate(cmd))) { + mycmd = strdup(cmd); + switch_assert(mycmd); + + if ((flag = strchr(mycmd, ' '))) { + *flag++ = '\0'; + } + + if (!(psession = switch_core_session_locate(mycmd))) { stream->write_function(stream, "-ERR No Such Channel!\n"); return SWITCH_STATUS_SUCCESS; } + if (flag && !strcasecmp(flag, "all")) { + switch_core_session_flush_private_events(session); + } + switch_channel_set_flag(switch_core_session_get_channel(psession), CF_BREAK); switch_core_session_rwunlock(psession);

1 0

[commit] r10092 - freeswitch/trunk/src
by Freeswitch SVN 21 Oct '08

21 Oct '08

Author: anthm Date: Tue Oct 21 13:16:39 2008 New Revision: 10092 Modified: freeswitch/trunk/src/switch_rtp.c Log: make room for t38 packets Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Tue Oct 21 13:16:39 2008 @@ -980,7 +980,7 @@ switch_set_flag(rtp_session, SWITCH_RTP_FLAG_BREAK); if (rtp_session->sock_input) { - char o[8] = "PING..."; + char o[4] = "DOH"; switch_size_t len = sizeof(o); switch_socket_sendto(rtp_session->sock_input, rtp_session->local_addr, 0, (void *) o, &len); @@ -1275,7 +1275,7 @@ return_cng_frame(); } - if (bytes && bytes <= 12) { + if (bytes && bytes < 8) { continue; }

1 0

[commit] r10091 - freeswitch/trunk/src/mod/xml_int/mod_xml_rpc
by Freeswitch SVN 21 Oct '08

21 Oct '08

Author: mikej Date: Tue Oct 21 12:40:49 2008 New Revision: 10091 Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c Log: tweak windows build Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c Tue Oct 21 12:40:49 2008 @@ -714,7 +714,6 @@ val = xmlrpc_build_value(envP, "s", "ERROR!"); } - done: /* xmlrpc-c requires us to free memory it malloced from xmlrpc_decompose_value */ switch_safe_free(command); switch_safe_free(arg);

1 0

[commit] r10090 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 21 Oct '08

21 Oct '08

Author: anthm Date: Tue Oct 21 12:27:57 2008 New Revision: 10090 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: can't win Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Tue Oct 21 12:27:57 2008 @@ -230,7 +230,11 @@ switch_channel_t *channel = switch_core_session_get_channel(session); switch_call_cause_t cause = switch_channel_get_cause(channel); int sip_cause = hangup_cause_to_sip(cause); - const char *ps_cause = switch_channel_get_variable(channel, SWITCH_PROTO_SPECIFIC_HANGUP_CAUSE_VARIABLE); + const char *ps_cause = NULL, *use_my_cause; + + if (!((use_my_cause = switch_channel_get_variable(channel, "sip_ignore_remote_cause")) && switch_true(use_my_cause))) { + ps_cause = switch_channel_get_variable(channel, SWITCH_PROTO_SPECIFIC_HANGUP_CAUSE_VARIABLE); + } if (!switch_strlen_zero(ps_cause) && (!strncasecmp(ps_cause, "sip:", 4) || !strncasecmp(ps_cause, "sips:", 5))) { int new_cause = atoi(sofia_glue_strip_proto(ps_cause));

1 0

[commit] r10089 - in freeswitch/trunk/src: . include include/private mod/applications/mod_commands
by Freeswitch SVN 21 Oct '08

21 Oct '08

Author: anthm Date: Tue Oct 21 12:22:38 2008 New Revision: 10089 Modified: freeswitch/trunk/src/include/private/switch_core_pvt.h freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c freeswitch/trunk/src/switch_core_io.c freeswitch/trunk/src/switch_core_session.c Log: add scheduler support for heartbeat Modified: freeswitch/trunk/src/include/private/switch_core_pvt.h ============================================================================== --- freeswitch/trunk/src/include/private/switch_core_pvt.h (original) +++ freeswitch/trunk/src/include/private/switch_core_pvt.h Tue Oct 21 12:22:38 2008 @@ -153,6 +153,7 @@ switch_codec_t bug_codec; uint32_t read_frame_count; uint32_t track_duration; + uint32_t track_id; }; struct switch_media_bug { Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Tue Oct 21 12:22:38 2008 @@ -119,6 +119,9 @@ ///\{ +SWITCH_DECLARE(void) switch_core_session_sched_heartbeat(switch_core_session_t *session, uint32_t seconds); +SWITCH_DECLARE(void) switch_core_session_unsched_heartbeat(switch_core_session_t *session); + SWITCH_DECLARE(void) switch_core_session_enable_heartbeat(switch_core_session_t *session, uint32_t seconds); SWITCH_DECLARE(void) switch_core_session_disable_heartbeat(switch_core_session_t *session); Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Tue Oct 21 12:22:38 2008 @@ -2352,13 +2352,14 @@ return SWITCH_STATUS_SUCCESS; } -#define HEARTBEAT_SYNTAX "<uuid> <on|off|<seconds>>" +#define HEARTBEAT_SYNTAX "<uuid> [sched] <on|off|<seconds>>" SWITCH_STANDARD_API(uuid_session_heartbeat_function) { - char *mycmd = NULL, *argv[2] = { 0 }; + char *mycmd = NULL, *argv[3] = { 0 }; uint32_t seconds = 60; int argc, tmp; switch_core_session_t *l_session = NULL; + int x = 0, sched = 0; if (switch_strlen_zero(cmd) || !(mycmd = strdup(cmd))) { goto error; @@ -2366,26 +2367,38 @@ argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); - if (argc != 2 || !argv[0]) { + if (argc < 2 || !argv[0]) { goto error; } - + if (!(l_session = switch_core_session_locate(argv[0]))) { stream->write_function(stream, "-ERR Usage: cannot locate session.\n"); return SWITCH_STATUS_SUCCESS; } + + if (!strcasecmp(argv[1], "sched")) { + x = 2; + sched++; + } else { + x = 1; + } - if (switch_is_number(argv[1])) { - tmp = atoi(argv[1]); + if (switch_is_number(argv[x])) { + tmp = atoi(argv[x]); if (tmp > 0) { seconds = tmp; } - } else if (!switch_true(argv[1])) { + } else if (!switch_true(argv[x])) { seconds = 0; } if (seconds) { - switch_core_session_enable_heartbeat(l_session, seconds); + if (sched) { + switch_core_session_sched_heartbeat(l_session, seconds); + } else { + switch_core_session_enable_heartbeat(l_session, seconds); + } + } else { switch_core_session_disable_heartbeat(l_session); } Modified: freeswitch/trunk/src/switch_core_io.c ============================================================================== --- freeswitch/trunk/src/switch_core_io.c (original) +++ freeswitch/trunk/src/switch_core_io.c Tue Oct 21 12:22:38 2008 @@ -122,7 +122,7 @@ *frame = NULL; - if (session->read_codec && session->track_duration) { + if (session->read_codec && !session->track_id && session->track_duration) { if (session->read_frame_count == 0) { switch_event_t *event; session->read_frame_count = (session->read_codec->implementation->actual_samples_per_second / Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Tue Oct 21 12:22:38 2008 @@ -780,6 +780,39 @@ } +SWITCH_STANDARD_SCHED_FUNC(sch_heartbeat_callback) +{ + switch_event_t *event; + switch_core_session_t *session; + char *uuid = task->cmd_arg; + + if ((session = switch_core_session_locate(uuid))) { + switch_event_create(&event, SWITCH_EVENT_SESSION_HEARTBEAT); + switch_channel_event_set_data(session->channel, event); + switch_event_fire(&event); + switch_core_session_rwunlock(session); + } + + /* reschedule this task */ + task->runtime = switch_timestamp(NULL) + session->track_duration; +} + +SWITCH_DECLARE(void) switch_core_session_unsched_heartbeat(switch_core_session_t *session) +{ + if (session->track_id) { + switch_scheduler_del_task_id(session->track_id); + session->track_id = 0; + } +} + +SWITCH_DECLARE(void) switch_core_session_sched_heartbeat(switch_core_session_t *session, uint32_t seconds) +{ + + switch_core_session_unsched_heartbeat(session); + session->track_id = switch_scheduler_add_task(switch_timestamp(NULL), sch_heartbeat_callback, (char *) __SWITCH_FUNC__, + switch_core_session_get_uuid(session), 0, strdup(switch_core_session_get_uuid(session)), SSHF_FREE_ARG); +} + SWITCH_DECLARE(void) switch_core_session_enable_heartbeat(switch_core_session_t *session, uint32_t seconds) { switch_assert(session != NULL); @@ -788,17 +821,28 @@ seconds = 60; } + if (switch_channel_test_flag(session->channel, CF_PROXY_MODE)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "%s using scheduler due to bypass_media mode\n", switch_channel_get_name(session->channel)); + switch_core_session_sched_heartbeat(session, seconds); + return; + } + + switch_core_session_unsched_heartbeat(session); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "%s setting session heartbeat to %u second(s).\n", switch_channel_get_name(session->channel), seconds); session->track_duration = seconds; session->read_frame_count = 0; + } SWITCH_DECLARE(void) switch_core_session_disable_heartbeat(switch_core_session_t *session) { + switch_core_session_unsched_heartbeat(session); switch_assert(session != NULL); session->read_frame_count = 0; session->track_duration = 0; + } static void *SWITCH_THREAD_FUNC switch_core_session_thread(switch_thread_t *thread, void *obj)

1 0

[commit] r10088 - freeswitch/trunk/src/mod/applications/mod_voicemail
by Freeswitch SVN 20 Oct '08

20 Oct '08

Author: mikej Date: Mon Oct 20 19:42:00 2008 New Revision: 10088 Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Log: add vm-a1-hash param to override the a1-hash for voicemail Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c (original) +++ freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Mon Oct 20 19:42:00 2008 @@ -1583,7 +1583,7 @@ switch_xml_t x_domain = NULL, x_domain_root = NULL, x_user = NULL, x_params, x_param; switch_status_t status; char pass_buf[80] = "", *mypass = NULL, id_buf[80] = "", *myfolder = NULL; - const char *thepass = NULL, *myid = id, *actual_id = NULL, *thehash = NULL; + const char *thepass = NULL, *myid = id, *actual_id = NULL, *thehash = NULL, *vmhash = NULL; char term = 0; uint32_t timeout, attempts = 0; int failed = 0; @@ -1981,6 +1981,8 @@ if (!strcasecmp(var, "a1-hash")) { thehash = val; + } else if (!strcasecmp(var, "vm-a1-hash")) { + vmhash = val; } else if (!strcasecmp(var, "password")) { thepass = val; } else if (!strcasecmp(var, "vm-password")) { @@ -1993,6 +1995,10 @@ thepass = cbt.password; } } + + if (vmhash) { + thehash = vmhash; + } if (!auth) { if (!switch_strlen_zero(cbt.password) && !strcmp(cbt.password, mypass)) {

1 0

[commit] r10087 - in freeswitch/trunk/src: . include mod/applications/mod_commands mod/applications/mod_voicemail
by Freeswitch SVN 20 Oct '08

20 Oct '08

Author: anthm Date: Mon Oct 20 19:27:29 2008 New Revision: 10087 Modified: freeswitch/trunk/src/include/switch_apr.h freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c freeswitch/trunk/src/switch_apr.c Log: all vm to auth from the same a1-hash param used by sip (part deux) Modified: freeswitch/trunk/src/include/switch_apr.h ============================================================================== --- freeswitch/trunk/src/include/switch_apr.h (original) +++ freeswitch/trunk/src/include/switch_apr.h Mon Oct 20 19:27:29 2008 @@ -510,6 +510,7 @@ #define SWITCH_UUID_FORMATTED_LENGTH 36 #define SWITCH_MD5_DIGESTSIZE 16 +#define SWITCH_MD5_DIGEST_STRING_SIZE 33 /** * Format a UUID into a string, following the standard format @@ -540,6 +541,7 @@ * @param inputLen The length of the message block */ SWITCH_DECLARE(switch_status_t) switch_md5(unsigned char digest[SWITCH_MD5_DIGESTSIZE], const void *input, switch_size_t inputLen); +SWITCH_DECLARE(switch_status_t) switch_md5_string(char digest_str[SWITCH_MD5_DIGEST_STRING_SIZE], const void *input, switch_size_t inputLen); /** @} */ Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Mon Oct 20 19:27:29 2008 @@ -192,6 +192,22 @@ return SWITCH_STATUS_SUCCESS; } + + +SWITCH_STANDARD_API(md5_function) +{ + char digest[SWITCH_MD5_DIGEST_STRING_SIZE] = { 0 }; + + if (switch_strlen_zero(cmd)) { + stream->write_function(stream, "%s", "!err!"); + } else { + switch_md5_string(digest, (void *) cmd, strlen(cmd)); + stream->write_function(stream, "%s", digest); + } + + return SWITCH_STATUS_SUCCESS; +} + SWITCH_STANDARD_API(url_decode_function) { char *reply = ""; @@ -2725,6 +2741,7 @@ switch_api_interface_t *commands_api_interface; *module_interface = switch_loadable_module_create_module_interface(pool, modname); + SWITCH_ADD_API(commands_api_interface, "md5", "md5", md5_function, "<data>"); SWITCH_ADD_API(commands_api_interface, "hupall", "hupall", hupall_api_function, "<cause> [<var> <value>]"); SWITCH_ADD_API(commands_api_interface, "strftime_tz", "strftime_tz", strftime_tz_api_function, "<Timezone_name> [format string]"); SWITCH_ADD_API(commands_api_interface, "originate", "Originate a Call", originate_function, ORIGINATE_SYNTAX); Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c (original) +++ freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Mon Oct 20 19:27:29 2008 @@ -2003,9 +2003,9 @@ if (!auth && (thepass || thehash) && mypass) { if (thehash) { - unsigned char digest[SWITCH_MD5_DIGESTSIZE] = { 0 }; + char digest[SWITCH_MD5_DIGEST_STRING_SIZE] = { 0 }; char *lpbuf = switch_mprintf("%s:%s:%s", myid, domain_name, mypass); - switch_md5(digest, (void *) lpbuf, strlen(lpbuf)); + switch_md5_string(digest, (void *) lpbuf, strlen(lpbuf)); if (!strcmp(digest, thehash)) { auth++; } Modified: freeswitch/trunk/src/switch_apr.c ============================================================================== --- freeswitch/trunk/src/switch_apr.c (original) +++ freeswitch/trunk/src/switch_apr.c Mon Oct 20 19:27:29 2008 @@ -813,6 +813,20 @@ return apr_md5(digest, input, inputLen); } +SWITCH_DECLARE(switch_status_t) switch_md5_string(char digest_str[SWITCH_MD5_DIGEST_STRING_SIZE], const void *input, switch_size_t inputLen) +{ + unsigned char digest[SWITCH_MD5_DIGESTSIZE]; + apr_status_t status = apr_md5(digest, input, inputLen); + int x; + + digest_str[SWITCH_MD5_DIGEST_STRING_SIZE - 1] = '\0'; + + for( x = 0; x < SWITCH_MD5_DIGESTSIZE; x++) { + switch_snprintf(digest_str + (x * 2), 3, "%02x", digest[x]); + } + + return status; +} /* FIFO queues (apr-util) */

1 0

[commit] r10086 - freeswitch/trunk/src/mod/applications/mod_voicemail
by Freeswitch SVN 20 Oct '08

20 Oct '08

Author: anthm Date: Mon Oct 20 18:52:09 2008 New Revision: 10086 Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Log: all vm to auth from the same a1-hash param used by sip Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c (original) +++ freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Mon Oct 20 18:52:09 2008 @@ -1583,7 +1583,7 @@ switch_xml_t x_domain = NULL, x_domain_root = NULL, x_user = NULL, x_params, x_param; switch_status_t status; char pass_buf[80] = "", *mypass = NULL, id_buf[80] = "", *myfolder = NULL; - const char *thepass = NULL, *myid = id, *actual_id = NULL; + const char *thepass = NULL, *myid = id, *actual_id = NULL, *thehash = NULL; char term = 0; uint32_t timeout, attempts = 0; int failed = 0; @@ -1972,14 +1972,16 @@ x_params = switch_xml_child(x_user, "params"); - thepass = NULL; + thepass = thehash = NULL; switch_snprintf(sql, sizeof(sql), "select * from voicemail_prefs where username='%s' and domain='%s'", myid, domain_name); vm_execute_sql_callback(profile, profile->mutex, sql, prefs_callback, &cbt); for (x_param = switch_xml_child(x_params, "param"); x_param; x_param = x_param->next) { const char *var = switch_xml_attr_soft(x_param, "name"); const char *val = switch_xml_attr_soft(x_param, "value"); - if (!strcasecmp(var, "password")) { + if (!strcasecmp(var, "a1-hash")) { + thehash = val; + } else if (!strcasecmp(var, "password")) { thepass = val; } else if (!strcasecmp(var, "vm-password")) { thepass = val; @@ -1999,8 +2001,20 @@ auth++; } - if (!auth && (thepass && mypass && !strcmp(thepass, mypass))) { - auth++; + if (!auth && (thepass || thehash) && mypass) { + if (thehash) { + unsigned char digest[SWITCH_MD5_DIGESTSIZE] = { 0 }; + char *lpbuf = switch_mprintf("%s:%s:%s", myid, domain_name, mypass); + switch_md5(digest, (void *) lpbuf, strlen(lpbuf)); + if (!strcmp(digest, thehash)) { + auth++; + } + switch_safe_free(lpbuf); + } + + if (!auth && thepass && !strcmp(thepass, mypass)) { + auth++; + } } }

1 0