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

[Freeswitch-svn] [commit] r9378 - freeswitch/trunk/src/mod/applications/mod_voicemail
by Freeswitch SVN 28 Aug '08

28 Aug '08

Author: mikej Date: Thu Aug 28 01:28:05 2008 New Revision: 9378 Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Log: (MODAPP-124) Update mwi light after delete vm via web. 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 Thu Aug 28 01:28:05 2008 @@ -1105,7 +1105,7 @@ } -static void message_count(vm_profile_t *profile, const char *myid, const char *domain_name, char *myfolder, +static void message_count(vm_profile_t *profile, const char *myid, const char *domain_name, const char *myfolder, int *total_new_messages, int *total_saved_messages, int *total_new_urgent_messages, int *total_saved_urgent_messages) { char msg_count[80] = ""; @@ -1315,6 +1315,38 @@ return status; } + +static void +update_mwi(vm_profile_t *profile, const char *id, const char *domain_name, + const char *myfolder) +{ + char *mwi_id; + const char *yn = "no"; + int total_new_messages = 0; + int total_saved_messages = 0; + int total_new_urgent_messages = 0; + int total_saved_urgent_messages = 0; + switch_event_t *event; + + message_count(profile, id, domain_name, myfolder, &total_new_messages, &total_saved_messages, &total_new_urgent_messages, &total_saved_urgent_messages); + + if (switch_event_create(&event, SWITCH_EVENT_MESSAGE_WAITING) != SWITCH_STATUS_SUCCESS) { + return; + } + + if (total_new_messages || total_new_urgent_messages) { + yn = "yes"; + } + mwi_id = switch_mprintf("%s@%s", id, domain_name); + switch_assert(mwi_id); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "MWI-Messages-Waiting", "%s", yn); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "MWI-Message-Account", mwi_id); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "MWI-Voice-Message", "%d/%d (%d/%d)", total_new_messages, total_saved_messages, total_new_urgent_messages, total_saved_urgent_messages); + switch_event_fire(&event); + switch_safe_free(mwi_id); +} + + static void voicemail_check_main(switch_core_session_t *session, const char *profile_name, const char *domain_name, const char *id, int auth) { vm_check_state_t vm_check_state = VM_CHECK_START; @@ -1440,7 +1472,6 @@ listen_callback_t cbt; char sql[256]; int cur_message, total_messages; - switch_event_t *event; message_count(profile, myid, domain_name, myfolder, &total_new_messages, &total_saved_messages, &total_new_urgent_messages, &total_saved_urgent_messages); @@ -1487,24 +1518,7 @@ vm_execute_sql(profile, sql, profile->mutex); vm_check_state = VM_CHECK_FOLDER_SUMMARY; - message_count(profile, id, domain_name, myfolder, &total_new_messages, &total_saved_messages, - &total_new_urgent_messages, &total_saved_urgent_messages); - - if (switch_event_create(&event, SWITCH_EVENT_MESSAGE_WAITING) == SWITCH_STATUS_SUCCESS) { - char *mwi_id; - const char *yn = "no"; - if (total_new_messages || total_new_urgent_messages) { - yn = "yes"; - } - mwi_id = switch_mprintf("%s@%s", myid, domain_name); - switch_assert(mwi_id); - switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "MWI-Messages-Waiting", yn); - switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "MWI-Message-Account", mwi_id); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "MWI-Voice-Message", "%d/%d (%d/%d)", - total_new_messages, total_saved_messages, total_new_urgent_messages, total_saved_urgent_messages); - switch_event_fire(&event); - switch_safe_free(mwi_id); - } + update_mwi(profile, id, domain_name, myfolder); } break; case VM_CHECK_CONFIG: @@ -1918,12 +1932,6 @@ if (insert_db && switch_file_exists(file_path, pool) == SWITCH_STATUS_SUCCESS) { char *usql; - switch_event_t *event; - char *mwi_id = NULL; - int total_new_messages = 0; - int total_saved_messages = 0; - int total_new_urgent_messages = 0; - int total_saved_urgent_messages = 0; usql = switch_mprintf("insert into voicemail_msgs values(%ld,0,'%q','%q','%q','%q','%q','%q','%q','%u','','%q')", (long) switch_timestamp(NULL), myid, domain_name, uuid_str, caller_id_name, caller_id_number, @@ -1931,22 +1939,7 @@ vm_execute_sql(profile, usql, profile->mutex); switch_safe_free(usql); - message_count(profile, myid, domain_name, myfolder, &total_new_messages, &total_saved_messages, - &total_new_urgent_messages, &total_saved_urgent_messages); - - if (switch_event_create(&event, SWITCH_EVENT_MESSAGE_WAITING) == SWITCH_STATUS_SUCCESS) { - const char *yn = "no"; - if (total_new_messages || total_new_urgent_messages) { - yn = "yes"; - } - mwi_id = switch_mprintf("%s@%s", myid, domain_name); - switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "MWI-Messages-Waiting", yn); - switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "MWI-Message-Account", mwi_id); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "MWI-Voice-Message", "%d/%d (%d/%d)", - total_new_messages, total_saved_messages, total_new_urgent_messages, total_saved_urgent_messages); - switch_event_fire(&event); - switch_safe_free(mwi_id); - } + update_mwi(profile, myid, domain_name, myfolder); } if (send_mail && !switch_strlen_zero(vm_email) && switch_file_exists(file_path, pool) == SWITCH_STATUS_SUCCESS) { @@ -2829,6 +2822,7 @@ static void do_del(vm_profile_t *profile, char *user, char *domain, char *file, switch_stream_handle_t *stream) { + char *myfolder = "inbox"; char *sql; struct holder holder; char *ref = NULL; @@ -2848,6 +2842,8 @@ vm_execute_sql(profile, sql, profile->mutex); free(sql); + update_mwi(profile, user, domain, myfolder); + if (ref) { stream->write_function(stream, "Content-type: text/html\n\n<h2>Message Deleted</h2>\n" "<META http-equiv=\"refresh\" content=\"1;URL=%s\">", ref); }

1 0

[Freeswitch-svn] [commit] r9377 - freeswitch/trunk/src/mod/applications/mod_voicemail
by Freeswitch SVN 28 Aug '08

28 Aug '08

Author: mikej Date: Thu Aug 28 01:17:02 2008 New Revision: 9377 Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Log: Pfix voicemail created email date (int overflow) from MODAPP-125 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 Thu Aug 28 01:17:02 2008 @@ -1212,7 +1212,7 @@ int total_saved_urgent_messages = 0; int32_t message_len = 0; char *p; - long l_duration = 0; + switch_time_t l_duration = 0; switch_core_time_duration_t duration; char duration_str[80]; @@ -1223,7 +1223,7 @@ message_count(profile, cbt->user, cbt->domain, cbt->in_folder, &total_new_messages, &total_saved_messages, &total_new_urgent_messages, &total_saved_urgent_messages); - switch_time_exp_lt(&tm, atoi(cbt->created_epoch) * 1000000); + switch_time_exp_lt(&tm, switch_time_make (atol(cbt->created_epoch), 0)); switch_strftime(date, &retsize, sizeof(date), profile->date_fmt, &tm); switch_snprintf(tmp, sizeof(tmp), "%d", total_new_messages); @@ -1246,7 +1246,7 @@ switch_channel_set_variable(channel, "voicemail_priority", tmp); message_len = atoi(cbt->message_len); - l_duration = atol(cbt->message_len) * 1000000; + l_duration = switch_time_make (atol(cbt->message_len), 0); switch_core_measure_time(l_duration, &duration); duration.day += duration.yr * 365; duration.hr += duration.day * 24; @@ -1961,7 +1961,7 @@ int total_new_urgent_messages = 0; int total_saved_urgent_messages = 0; char *p; - long l_duration = 0; + switch_time_t l_duration = 0; switch_core_time_duration_t duration; char duration_str[80]; switch_time_exp_t tm; @@ -1998,7 +1998,7 @@ if (vm_notify_email) { switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "voicemail_notify_email", vm_notify_email); } - l_duration = (long) message_len *1000000; + l_duration = switch_time_make (message_len, 0); switch_core_measure_time(l_duration, &duration); duration.day += duration.yr * 365; duration.hr += duration.day * 24; @@ -2865,7 +2865,7 @@ switch_size_t retsize; switch_time_t l_created = 0; switch_time_t l_read = 0; - long l_duration = 0; + switch_time_t l_duration = 0; switch_core_time_duration_t duration; char duration_str[80]; const char *fmt = "%a, %e %b %Y %T %z"; @@ -2882,7 +2882,7 @@ } if (argc > 9) { - l_duration = atol(argv[9]) * 1000000; + l_duration = switch_time_make (atol(argv[9]), 0); } if ((fname = strrchr(argv[8], '/'))) { @@ -2957,7 +2957,7 @@ switch_file_t *fd; switch_time_t l_created = 0; switch_time_t l_read = 0; - long l_duration = 0; + switch_time_t l_duration = 0; switch_core_time_duration_t duration; char duration_str[80]; const char *fmt = "%a, %e %b %Y %T %z"; @@ -2972,7 +2972,7 @@ } if (argc > 9) { - l_duration = atol(argv[9]) * 1000000; + l_duration = switch_time_make (atol(argv[9]), 0); } switch_core_measure_time(l_duration, &duration);

1 0

[Freeswitch-svn] [commit] r9376 - freeswitch/trunk/src/mod/applications/mod_voicemail
by Freeswitch SVN 28 Aug '08

28 Aug '08

Author: mikej Date: Thu Aug 28 01:05:16 2008 New Revision: 9376 Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Log: whitespace cleanup MODAPP-133 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 Thu Aug 28 01:05:16 2008 @@ -2134,7 +2134,7 @@ switch_status_t status = SWITCH_STATUS_SUCCESS; int istag = 0, isall = 0; int argc = 0; - char *argv[4]; + char *argv[4]; char *box, *path, *cid_num, *cid_name; switch_memory_pool_t *pool = NULL;

1 0

[Freeswitch-svn] [commit] r9375 - freeswitch/trunk/src/mod/applications/mod_voicemail
by Freeswitch SVN 28 Aug '08

28 Aug '08

Author: mikej Date: Thu Aug 28 01:02:18 2008 New Revision: 9375 Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Log: merge voicemail_3_improve_storage_dir.diff patch from MODAPP-133 allows the "storage-dir" parameter to be set on a per-user basis <param name="storage-dir" value="/path/to/storage" /> prevents mod_voicemail to always create recursively SWITCH_GLOBAL_dirs.storage_dir. That may be useless when the old storage-dir (or the new per user i have introduced) is used. In fact, the directory is anyway always checked and maked, if necessary 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 Thu Aug 28 01:02:18 2008 @@ -1336,6 +1336,7 @@ int total_saved_urgent_messages = 0; int heard_auto_saved = 0, heard_auto_new = 0; char *vm_email = NULL; + char *vm_storage_dir = NULL; char global_buf[2] = ""; switch_input_args_t args = { 0 }; const char *caller_id_name = NULL; @@ -1739,6 +1740,8 @@ thepass = val; } else if (!strcasecmp(var, "vm-mailto")) { vm_email = switch_core_session_strdup(session, val); + } else if (!strcasecmp(var, "storage-dir")) { + vm_storage_dir = switch_core_session_strdup(session, val); } else if (!switch_strlen_zero(cbt.password) && !thepass) { thepass = cbt.password; } @@ -1749,13 +1752,15 @@ if (auth || !thepass || (thepass && mypass && !strcmp(thepass, mypass)) || (!switch_strlen_zero(cbt.password) && !strcmp(cbt.password, mypass))) { if (!dir_path) { - if (switch_strlen_zero(profile->storage_dir)) { + if (!switch_strlen_zero(vm_storage_dir)) { + dir_path = switch_core_session_sprintf(session, "%s%s%s", vm_storage_dir, SWITCH_PATH_SEPARATOR, myid); + } else if ( !switch_strlen_zero(profile->storage_dir) ) { + dir_path = switch_core_session_sprintf(session, "%s%s%s", profile->storage_dir, SWITCH_PATH_SEPARATOR, myid); + } else { dir_path = switch_core_session_sprintf(session, "%s%svoicemail%s%s%s%s%s%s", SWITCH_GLOBAL_dirs.storage_dir, SWITCH_PATH_SEPARATOR, SWITCH_PATH_SEPARATOR, profile->name, SWITCH_PATH_SEPARATOR, domain_name, SWITCH_PATH_SEPARATOR, myid); - } else { - dir_path = switch_core_session_sprintf(session, "%s%s%s", profile->storage_dir, SWITCH_PATH_SEPARATOR, myid); } if (switch_dir_make_recursive(dir_path, SWITCH_DEFAULT_DIR_PERMS, switch_core_session_get_pool(session)) != SWITCH_STATUS_SUCCESS) { @@ -1824,6 +1829,7 @@ int send_notify = 0; int insert_db = 1; int email_attach = 0; + char *vm_storage_dir = NULL; char *myfolder = "inbox"; int priority = 3; const char *tmp; @@ -1879,13 +1885,14 @@ } } - - if (switch_strlen_zero(profile->storage_dir)) { + if (!switch_strlen_zero(vm_storage_dir)) { + dir_path = switch_mprintf("%s%s%s", vm_storage_dir, SWITCH_PATH_SEPARATOR, myid); + } else if (!switch_strlen_zero(profile->storage_dir)) { + dir_path = switch_mprintf("%s%s%s", profile->storage_dir, SWITCH_PATH_SEPARATOR, myid); + } else { dir_path = switch_mprintf("%s%svoicemail%s%s%s%s%s%s", SWITCH_GLOBAL_dirs.storage_dir, SWITCH_PATH_SEPARATOR, SWITCH_PATH_SEPARATOR, profile->name, SWITCH_PATH_SEPARATOR, domain_name, SWITCH_PATH_SEPARATOR, myid); - } else { - dir_path = switch_mprintf("%s%s%s", profile->storage_dir, SWITCH_PATH_SEPARATOR, myid); } if (switch_dir_make_recursive(dir_path, SWITCH_DEFAULT_DIR_PERMS, pool) != SWITCH_STATUS_SUCCESS) { @@ -2257,6 +2264,7 @@ switch_size_t retsize; switch_time_t ts = switch_timestamp_now(); char *dbuf = NULL; + char *vm_storage_dir = NULL; int send_main = 0; int send_notify = 0; int insert_db = 1; @@ -2280,19 +2288,6 @@ return SWITCH_STATUS_FALSE; } - if (switch_strlen_zero(profile->storage_dir)) { - dir_path = switch_core_session_sprintf(session, "%s%svoicemail%s%s%s%s%s%s", SWITCH_GLOBAL_dirs.storage_dir, - SWITCH_PATH_SEPARATOR, - SWITCH_PATH_SEPARATOR, profile->name, SWITCH_PATH_SEPARATOR, domain_name, SWITCH_PATH_SEPARATOR, id); - } else { - dir_path = switch_core_session_sprintf(session, "%s%s%s", profile->storage_dir, SWITCH_PATH_SEPARATOR, id); - } - - if (switch_dir_make_recursive(dir_path, SWITCH_DEFAULT_DIR_PERMS, switch_core_session_get_pool(session)) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error creating %s\n", dir_path); - goto end; - } - if (id) { int ok = 1; switch_event_t *params = NULL; @@ -2318,6 +2313,8 @@ } else if (!strcasecmp(var, "vm-email-all-messages")) { send_main = switch_true(val); send_mail++; + } else if (!strcasecmp(var, "storage-dir")) { + vm_storage_dir = switch_core_session_strdup(session, val); } else if (!strcasecmp(var, "vm-notify-email-all-messages")) { send_notify = switch_true(val); send_mail++; @@ -2367,6 +2364,21 @@ } } + if (!switch_strlen_zero(vm_storage_dir)) { + dir_path = switch_core_session_sprintf(session, "%s%s%s", vm_storage_dir, SWITCH_PATH_SEPARATOR, id); + } else if (!switch_strlen_zero(profile->storage_dir)) { + dir_path = switch_core_session_sprintf(session, "%s%s%s", profile->storage_dir, SWITCH_PATH_SEPARATOR, id); + } else { + dir_path = switch_core_session_sprintf(session, "%s%svoicemail%s%s%s%s%s%s", SWITCH_GLOBAL_dirs.storage_dir, + SWITCH_PATH_SEPARATOR, + SWITCH_PATH_SEPARATOR, profile->name, SWITCH_PATH_SEPARATOR, domain_name, SWITCH_PATH_SEPARATOR, id); + } + + if (switch_dir_make_recursive(dir_path, SWITCH_DEFAULT_DIR_PERMS, switch_core_session_get_pool(session)) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error creating %s\n", dir_path); + goto end; + } + switch_snprintf(sql, sizeof(sql), "select * from voicemail_prefs where username='%s' and domain='%s'", id, domain_name); vm_execute_sql_callback(profile, profile->mutex, sql, prefs_callback, &cbt); @@ -2524,12 +2536,6 @@ int x = 0, check = 0, auth = 0; switch_channel_t *channel = switch_core_session_get_channel(session); - if (switch_dir_make_recursive(SWITCH_GLOBAL_dirs.storage_dir, SWITCH_DEFAULT_DIR_PERMS, switch_core_session_get_pool(session)) != - SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error creating %s\n", SWITCH_GLOBAL_dirs.storage_dir); - return; - } - if (!switch_strlen_zero(data)) { mydata = switch_core_session_strdup(session, data); argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0])));

1 0

[Freeswitch-svn] [commit] r9374 - freeswitch/trunk/src/mod/applications/mod_voicemail
by Freeswitch SVN 28 Aug '08

28 Aug '08

Author: mikej Date: Wed Aug 27 22:21:21 2008 New Revision: 9374 Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Log: fix handling of error cases in voicemail_inject (MODAPP-133) 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 Wed Aug 27 22:21:21 2008 @@ -2141,6 +2141,7 @@ if ((argc = switch_separate_string(dup, ' ', argv, (sizeof(argv) / sizeof(argv[0])))) < 2) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "not enough args [%s]\n", data); + status = SWITCH_STATUS_FALSE; goto end; } @@ -2166,6 +2167,7 @@ if (!(user && domain)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "invalid syntax [%s][%s]\n", switch_str_nil(user), switch_str_nil(domain)); + status = SWITCH_STATUS_FALSE; goto end; } @@ -2175,6 +2177,7 @@ if (!profile) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't find profile\n"); + status = SWITCH_STATUS_FALSE; } else { switch_xml_t x_domain, xml_root; switch_event_t *my_params = NULL; @@ -2187,6 +2190,7 @@ if (switch_xml_locate_domain(domain, my_params, &xml_root, &x_domain) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Cannot locate domain %s\n", domain); + status = SWITCH_STATUS_FALSE; switch_event_destroy(&my_params); goto end; }

1 0

[Freeswitch-svn] [commit] r9373 - freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml
by Freeswitch SVN 27 Aug '08

27 Aug '08

Author: brian Date: Wed Aug 27 18:10:57 2008 New Revision: 9373 Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c Log: tweak message to be more clear its a context and not a domain Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c ============================================================================== --- freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c (original) +++ freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c Wed Aug 27 18:10:57 2008 @@ -225,7 +225,7 @@ caller_profile->context = "default"; } - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Processing %s->%s@%s\n", + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Processing %s->%s in context %s\n", caller_profile->caller_id_name, caller_profile->destination_number, caller_profile->context); /* get our handle to the "dialplan" section of the config */

1 0

[Freeswitch-svn] [commit] r9372 - freeswitch/trunk/src/mod/endpoints/mod_portaudio
by Freeswitch SVN 27 Aug '08

27 Aug '08

Author: anthm Date: Wed Aug 27 11:48:03 2008 New Revision: 9372 Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Log: fix cpu race on inbound call to pa when no ring file is set Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Wed Aug 27 11:48:03 2008 @@ -266,6 +266,8 @@ if (globals.ring_stream) { WriteAudioStream(globals.ring_stream, abuf, (long) olen, &globals.timer); } + } else { + switch_yield(10000); } } switch_clear_flag_locked((&globals), GFLAG_RING);

1 0

[Freeswitch-svn] [commit] r9371 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 27 Aug '08

27 Aug '08

Author: brian Date: Wed Aug 27 00:05:25 2008 New Revision: 9371 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: rfc3261 section 18.1.1 grrr Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Wed Aug 27 00:05:25 2008 @@ -544,7 +544,7 @@ TAG_IF(sofia_test_pflag(profile, PFLAG_TLS), NUTAG_SIPS_URL(profile->tls_bindurl)), TAG_IF(sofia_test_pflag(profile, PFLAG_TLS), NUTAG_CERTIFICATE_DIR(profile->tls_cert_dir)), TAG_IF(sofia_test_pflag(profile, PFLAG_TLS), TPTAG_TLS_VERSION(profile->tls_version)), - TAG_IF(!strchr(profile->sipip, ':'), NTATAG_UDP_MTU(65536)), + TAG_IF(!strchr(profile->sipip, ':'), NTATAG_UDP_MTU(65535)), NTATAG_SERVER_RPORT(profile->rport_level), TAG_IF(tportlog, TPTAG_LOG(1)), TAG_END()); /* Last tag should always finish the sequence */

1 0

[Freeswitch-svn] [commit] r9370 - freeswitch/trunk/src/mod/languages/mod_spidermonkey_curl
by Freeswitch SVN 26 Aug '08

26 Aug '08

Author: anthm Date: Tue Aug 26 14:39:59 2008 New Revision: 9370 Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_curl/mod_spidermonkey_curl.c Log: add optional content-type arg Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_curl/mod_spidermonkey_curl.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey_curl/mod_spidermonkey_curl.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_curl/mod_spidermonkey_curl.c Tue Aug 26 14:39:59 2008 @@ -159,7 +159,7 @@ if (argc > 7) { char *content_type = JS_GetStringBytes(JS_ValueToString(cx, argv[7])); - snprintf(ct, sizeof(ct), "Content-Type: %s", content_type); + switch_snprintf(ct, sizeof(ct), "Content-Type: %s", content_type); } headers = curl_slist_append(headers, ct);

1 0

[Freeswitch-svn] [commit] r9369 - freeswitch/trunk/src/mod/languages/mod_spidermonkey_curl
by Freeswitch SVN 26 Aug '08

26 Aug '08

Author: anthm Date: Tue Aug 26 14:39:17 2008 New Revision: 9369 Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_curl/mod_spidermonkey_curl.c Log: add optional content-type arg Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_curl/mod_spidermonkey_curl.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey_curl/mod_spidermonkey_curl.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_curl/mod_spidermonkey_curl.c Tue Aug 26 14:39:17 2008 @@ -123,17 +123,12 @@ method = JS_GetStringBytes(JS_ValueToString(cx, argv[0])); url = JS_GetStringBytes(JS_ValueToString(cx, argv[1])); - if (argc > 2) { - char *content_type = JS_GetStringBytes(JS_ValueToString(cx, argv[2])); - snprintf(ct, sizeof(ct), "Content-Type: %s", content_type); - } - co->curl_handle = curl_easy_init(); if (!strncasecmp(url, "https", 5)) { curl_easy_setopt(co->curl_handle, CURLOPT_SSL_VERIFYPEER, 0); curl_easy_setopt(co->curl_handle, CURLOPT_SSL_VERIFYHOST, 0); } - headers = curl_slist_append(headers, ct); + if (argc > 2) { data = JS_GetStringBytes(JS_ValueToString(cx, argv[2])); @@ -162,7 +157,12 @@ } } + if (argc > 7) { + char *content_type = JS_GetStringBytes(JS_ValueToString(cx, argv[7])); + snprintf(ct, sizeof(ct), "Content-Type: %s", content_type); + } + headers = curl_slist_append(headers, ct); curl_easy_setopt(co->curl_handle, CURLOPT_HTTPHEADER, headers);

1 0