October 2008 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r9998 - freeswitch/trunk/src/mod/endpoints/mod_wanpipe unsupported/mod_wanpipe
by Freeswitch SVN 13 Oct '08

13 Oct '08

Author: brian Date: Mon Oct 13 15:36:49 2008 New Revision: 9998 Removed: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/ Changes in other areas also in this revision: Added: unsupported/mod_wanpipe/ - copied from r9997, /freeswitch/trunk/src/mod/endpoints/mod_wanpipe/ Log: move wanpipe to unsupported please see mod_openzap Diffs of changes in other areas also in this revision:

1 0

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

13 Oct '08

Author: anthm Date: Mon Oct 13 15:26:28 2008 New Revision: 9997 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: add more profile shutdown code to compensate for bug in sofia lib on nua_destroy 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 Mon Oct 13 15:26:28 2008 @@ -1633,7 +1633,7 @@ } if (!strcasecmp(argv[1], "stop") || !strcasecmp(argv[1], "restart")) { - int rsec = 3; + int rsec = 10; int diff = (int) (switch_timestamp(NULL) - profile->started); int remain = rsec - diff; if (diff < rsec) { 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 Mon Oct 13 15:26:28 2008 @@ -635,6 +635,14 @@ su_root_step(profile->s_root, 1000); } + sofia_clear_pflag_locked(profile, PFLAG_RUNNING); + + switch_core_session_hupall_matching_var("sofia_profile_name", profile->name, SWITCH_CAUSE_MANAGER_REQUEST); + while (profile->inuse) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Waiting for %d session(s)\n", profile->inuse); + su_root_step(profile->s_root, 1000); + } + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Write lock %s\n", profile->name); switch_thread_rwlock_wrlock(profile->rwlock); sofia_reg_unregister(profile); 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 Mon Oct 13 15:26:28 2008 @@ -2708,6 +2708,19 @@ for (hi = switch_hash_first(NULL, mod_sofia_globals.profile_hash); hi; hi = switch_hash_next(hi)) { switch_hash_this(hi, &var, NULL, &val); if ((pptr = (sofia_profile_t *) val)) { + int rsec = 10; + int diff = (int) (switch_timestamp(NULL) - pptr->started); + int remain = rsec - diff; + if (sofia_test_pflag(pptr, PFLAG_RESPAWN) || !sofia_test_pflag(pptr, PFLAG_RUNNING)) { + continue; + } + + if (diff < rsec) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, + "Profile %s must be up for at least %d seconds to stop/restart.\nPlease wait %d second%s\n", + pptr->name, rsec, remain, remain == 1 ? "" : "s"); + continue; + } sofia_set_pflag_locked(pptr, PFLAG_RESPAWN); sofia_clear_pflag_locked(pptr, PFLAG_RUNNING); }

1 0

[commit] r9996 - freeswitch/trunk/src
by Freeswitch SVN 13 Oct '08

13 Oct '08

Author: anthm Date: Mon Oct 13 15:25:52 2008 New Revision: 9996 Modified: freeswitch/trunk/src/switch_xml.c Log: fix race in xml reloader Modified: freeswitch/trunk/src/switch_xml.c ============================================================================== --- freeswitch/trunk/src/switch_xml.c (original) +++ freeswitch/trunk/src/switch_xml.c Mon Oct 13 15:25:52 2008 @@ -142,8 +142,7 @@ static switch_thread_rwlock_t *RWLOCK = NULL; static switch_thread_rwlock_t *B_RWLOCK = NULL; static switch_mutex_t *XML_LOCK = NULL; -static switch_mutex_t *XML_COUNT_LOCK = NULL; -static uint32_t lock_count = 0; + struct xml_section_t { const char *name; @@ -1524,9 +1523,6 @@ SWITCH_DECLARE(switch_xml_t) switch_xml_root(void) { - switch_mutex_lock(XML_COUNT_LOCK); - lock_count++; - switch_mutex_unlock(XML_COUNT_LOCK); switch_thread_rwlock_rdlock(RWLOCK); return MAIN_XML_ROOT; } @@ -1637,7 +1633,6 @@ *err = "Success"; switch_mutex_init(&XML_LOCK, SWITCH_MUTEX_NESTED, XML_MEMORY_POOL); - switch_mutex_init(&XML_COUNT_LOCK, SWITCH_MUTEX_NESTED, XML_MEMORY_POOL); switch_thread_rwlock_create(&RWLOCK, XML_MEMORY_POOL); switch_thread_rwlock_create(&B_RWLOCK, XML_MEMORY_POOL); @@ -1926,19 +1921,12 @@ char **a, *s; - if (!xml) + if (!xml) { return; - - if (switch_test_flag(xml, SWITCH_XML_ROOT)) { - switch_mutex_lock(XML_COUNT_LOCK); - if (lock_count > 0) { - switch_thread_rwlock_unlock(RWLOCK); - lock_count--; - } - switch_mutex_unlock(XML_COUNT_LOCK); } if (xml == MAIN_XML_ROOT) { + switch_thread_rwlock_unlock(RWLOCK); return; }

1 0

[commit] r9995 - freeswitch/trunk/src
by Freeswitch SVN 13 Oct '08

13 Oct '08

Author: mikej Date: Mon Oct 13 12:13:41 2008 New Revision: 9995 Modified: freeswitch/trunk/src/switch_cpp.cpp Log: don't allocate pool we don't use. Modified: freeswitch/trunk/src/switch_cpp.cpp ============================================================================== --- freeswitch/trunk/src/switch_cpp.cpp (original) +++ freeswitch/trunk/src/switch_cpp.cpp Mon Oct 13 12:13:41 2008 @@ -893,7 +893,6 @@ SWITCH_DECLARE(int) CoreSession::originate(CoreSession *a_leg_session, char *dest, int timeout) { - switch_memory_pool_t *pool = NULL; switch_core_session_t *aleg_core_session = NULL; switch_call_cause_t cause; @@ -911,11 +910,6 @@ // use the 'a leg session' to do the thread swapping stuff. if (a_leg_session) a_leg_session->begin_allow_threads(); - if (switch_core_new_memory_pool(&pool) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "OH OH no pool\n"); - goto failed; - } - if (switch_ivr_originate(aleg_core_session, &session, &cause,

1 0

[commit] r9994 - freeswitch/trunk/src/include
by Freeswitch SVN 13 Oct '08

13 Oct '08

Author: mikej Date: Mon Oct 13 11:42:11 2008 New Revision: 9994 Modified: freeswitch/trunk/src/include/switch_types.h Log: lower stack count limit to 16 (attempt to fix FSCORE-202) Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Mon Oct 13 11:42:11 2008 @@ -348,7 +348,7 @@ typedef struct switch_directories switch_directories; SWITCH_DECLARE_DATA extern switch_directories SWITCH_GLOBAL_dirs; -#define SWITCH_MAX_STACKS 32 +#define SWITCH_MAX_STACKS 16 #define SWITCH_THREAD_STACKSIZE 240 * 1024 #define SWITCH_SYSTEM_THREAD_STACKSIZE 8192 * 1024 #define SWITCH_MAX_INTERVAL 120 /* we only do up to 120ms */

1 0

[commit] r9993 - freeswitch/trunk/src
by Freeswitch SVN 13 Oct '08

13 Oct '08

Author: mikej Date: Mon Oct 13 02:42:50 2008 New Revision: 9993 Modified: freeswitch/trunk/src/switch_loadable_module.c Log: fix autoload of modules. Modified: freeswitch/trunk/src/switch_loadable_module.c ============================================================================== --- freeswitch/trunk/src/switch_loadable_module.c (original) +++ freeswitch/trunk/src/switch_loadable_module.c Mon Oct 13 02:42:50 2008 @@ -815,11 +815,11 @@ path = switch_core_strdup(loadable_modules.pool, file); file = (char *) switch_cut_path(file); if ((dot = strchr(file, '.'))) { - dot = '\0'; + *dot = '\0'; } } else { if ((dot = strchr(file, '.'))) { - dot = '\0'; + *dot = '\0'; } len = strlen(dir); len += strlen(file);

1 0

[commit] r9985 - in freeswitch/trunk/src: . include mod/applications/mod_dptools mod/applications/mod_fifo mod/applications/mod_rss mod/applications/mod_voicemail mod/endpoints/mod_sofia mod/event_handlers/mod_cdr_csv mod/loggers/mod_logfile
by Freeswitch SVN 12 Oct '08

12 Oct '08

Author: mikej Date: Sun Oct 12 17:51:51 2008 New Revision: 9985 Modified: freeswitch/trunk/src/include/switch_apr.h freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.c freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c freeswitch/trunk/src/mod/loggers/mod_logfile/mod_logfile.c freeswitch/trunk/src/switch_apr.c freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_console.c freeswitch/trunk/src/switch_event.c freeswitch/trunk/src/switch_log.c freeswitch/trunk/src/switch_time.c Log: validate strftime format string input (when necessary) Modified: freeswitch/trunk/src/include/switch_apr.h ============================================================================== --- freeswitch/trunk/src/include/switch_apr.h (original) +++ freeswitch/trunk/src/include/switch_apr.h Sun Oct 12 17:51:51 2008 @@ -271,6 +271,16 @@ SWITCH_DECLARE(switch_status_t) switch_strftime(char *s, switch_size_t *retsize, switch_size_t max, const char *format, switch_time_exp_t *tm); /** + * formats the exploded time according to the format specified (does not validate format string) + * @param s string to write to + * @param retsize The length of the returned string + * @param max The maximum length of the string + * @param format The format for the time string + * @param tm The time to convert + */ +SWITCH_DECLARE(switch_status_t) switch_strftime_nocheck(char *s, switch_size_t *retsize, switch_size_t max, const char *format, switch_time_exp_t *tm); + +/** * switch_rfc822_date formats dates in the RFC822 * format in an efficient manner. It is a fixed length * format which requires the indicated amount of storage, Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Sun Oct 12 17:51:51 2008 @@ -1022,7 +1022,11 @@ thetime = switch_timestamp_now(); } switch_time_exp_lt(&tm, thetime); - switch_strftime(date, &retsize, sizeof(date), switch_strlen_zero(cmd) ? "%Y-%m-%d %T" : cmd, &tm); + if (switch_strlen_zero(cmd)) { + switch_strftime_nocheck(date, &retsize, sizeof(date), "%Y-%m-%d %T", &tm); + } else { + switch_strftime(date, &retsize, sizeof(date), cmd, &tm); + } stream->write_function(stream, "%s", date); return SWITCH_STATUS_SUCCESS; Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c (original) +++ freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Sun Oct 12 17:51:51 2008 @@ -520,7 +520,7 @@ ts = switch_timestamp_now(); switch_time_exp_lt(&tm, ts); - switch_strftime(date, &retsize, sizeof(date), "%Y-%m-%d %T", &tm); + switch_strftime_nocheck(date, &retsize, sizeof(date), "%Y-%m-%d %T", &tm); switch_channel_set_variable(channel, "fifo_status", "WAITING"); switch_channel_set_variable(channel, "fifo_timestamp", date); @@ -613,7 +613,7 @@ } else { ts = switch_timestamp_now(); switch_time_exp_lt(&tm, ts); - switch_strftime(date, &retsize, sizeof(date), "%Y-%m-%d %T", &tm); + switch_strftime_nocheck(date, &retsize, sizeof(date), "%Y-%m-%d %T", &tm); switch_channel_set_variable(channel, "fifo_status", cd.do_orbit ? "TIMEOUT" : "ABORTED"); switch_channel_set_variable(channel, "fifo_timestamp", date); @@ -709,7 +709,7 @@ ts = switch_timestamp_now(); switch_time_exp_lt(&tm, ts); - switch_strftime(date, &retsize, sizeof(date), "%Y-%m-%d %T", &tm); + switch_strftime_nocheck(date, &retsize, sizeof(date), "%Y-%m-%d %T", &tm); switch_channel_set_variable(channel, "fifo_status", "WAITING"); switch_channel_set_variable(channel, "fifo_timestamp", date); @@ -883,7 +883,7 @@ ts = switch_timestamp_now(); switch_time_exp_lt(&tm, ts); - switch_strftime(date, &retsize, sizeof(date), "%Y-%m-%d %T", &tm); + switch_strftime_nocheck(date, &retsize, sizeof(date), "%Y-%m-%d %T", &tm); switch_channel_set_variable(channel, "fifo_status", "TALKING"); switch_channel_set_variable(channel, "fifo_target", uuid); switch_channel_set_variable(channel, "fifo_timestamp", date); @@ -910,7 +910,7 @@ ts = switch_timestamp_now(); switch_time_exp_lt(&tm, ts); - switch_strftime(date, &retsize, sizeof(date), "%Y-%m-%d %T", &tm); + switch_strftime_nocheck(date, &retsize, sizeof(date), "%Y-%m-%d %T", &tm); switch_channel_set_variable(channel, "fifo_status", "WAITING"); switch_channel_set_variable(channel, "fifo_timestamp", date); Modified: freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.c (original) +++ freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.c Sun Oct 12 17:51:51 2008 @@ -480,7 +480,7 @@ char dtmf[5] = ""; switch_time_exp_lt(&tm, switch_timestamp_now()); - switch_strftime(date, &retsize, sizeof(date), "%I:%M %p", &tm); + switch_strftime_nocheck(date, &retsize, sizeof(date), "%I:%M %p", &tm); switch_snprintf(buf, sizeof(buf), 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 Sun Oct 12 17:51:51 2008 @@ -2728,7 +2728,7 @@ free(dbuf); switch_time_exp_lt(&tm, ts); - switch_strftime(date, &retsize, sizeof(date), "%Y-%m-%d %T", &tm); + switch_strftime_nocheck(date, &retsize, sizeof(date), "%Y-%m-%d %T", &tm); switch_channel_set_variable(channel, "RECORD_DATE", date); switch_channel_set_variable(channel, "RECORD_SOFTWARE", "FreeSWITCH"); switch_channel_set_variable(channel, "RECORD_TITLE", profile->record_title); @@ -3176,13 +3176,13 @@ if (l_created) { switch_time_exp_lt(&tm, l_created); - switch_strftime(create_date, &retsize, sizeof(create_date), fmt, &tm); - switch_strftime(rss_date, &retsize, sizeof(create_date), "%D %T", &tm); + switch_strftime_nocheck(create_date, &retsize, sizeof(create_date), fmt, &tm); + switch_strftime_nocheck(rss_date, &retsize, sizeof(create_date), "%D %T", &tm); } if (l_read) { switch_time_exp_lt(&tm, l_read); - switch_strftime(read_date, &retsize, sizeof(read_date), fmt, &tm); + switch_strftime_nocheck(read_date, &retsize, sizeof(read_date), fmt, &tm); } switch_snprintf(heard, sizeof(heard), *read_date == '\0' ? "never" : read_date); @@ -3256,13 +3256,13 @@ if (l_created) { switch_time_exp_lt(&tm, l_created); - switch_strftime(create_date, &retsize, sizeof(create_date), fmt, &tm); - switch_strftime(rss_date, &retsize, sizeof(create_date), fmt, &tm); + switch_strftime_nocheck(create_date, &retsize, sizeof(create_date), fmt, &tm); + switch_strftime_nocheck(rss_date, &retsize, sizeof(create_date), fmt, &tm); } if (l_read) { switch_time_exp_lt(&tm, l_read); - switch_strftime(read_date, &retsize, sizeof(read_date), fmt, &tm); + switch_strftime_nocheck(read_date, &retsize, sizeof(read_date), fmt, &tm); } holder->x_item = switch_xml_add_child_d(holder->x_channel, "item", holder->items++); 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 Sun Oct 12 17:51:51 2008 @@ -1251,7 +1251,7 @@ switch_size_t retsize; switch_time_exp_lt(&tm, switch_time_from_sec(etime)); - switch_strftime(exp_buf, &retsize, sizeof(exp_buf), "%Y-%m-%d %T", &tm); + switch_strftime_nocheck(exp_buf, &retsize, sizeof(exp_buf), "%Y-%m-%d %T", &tm); } cb->stream->write_function(cb->stream, Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c Sun Oct 12 17:51:51 2008 @@ -100,7 +100,7 @@ if (globals.rotate) { switch_time_exp_lt(&tm, switch_timestamp_now()); - switch_strftime(date, &retsize, sizeof(date), "%Y-%m-%d-%H-%M-%S", &tm); + switch_strftime_nocheck(date, &retsize, sizeof(date), "%Y-%m-%d-%H-%M-%S", &tm); len = strlen(fd->path) + strlen(date) + 2; p = switch_mprintf("%s.%s", fd->path, date); Modified: freeswitch/trunk/src/mod/loggers/mod_logfile/mod_logfile.c ============================================================================== --- freeswitch/trunk/src/mod/loggers/mod_logfile/mod_logfile.c (original) +++ freeswitch/trunk/src/mod/loggers/mod_logfile/mod_logfile.c Sun Oct 12 17:51:51 2008 @@ -125,7 +125,7 @@ switch_mutex_lock(globals.mutex); switch_time_exp_lt(&tm, switch_timestamp_now()); - switch_strftime(date, &retsize, sizeof(date), "%Y-%m-%d-%H-%M-%S", &tm); + switch_strftime_nocheck(date, &retsize, sizeof(date), "%Y-%m-%d-%H-%M-%S", &tm); profile->log_size = 0; Modified: freeswitch/trunk/src/switch_apr.c ============================================================================== --- freeswitch/trunk/src/switch_apr.c (original) +++ freeswitch/trunk/src/switch_apr.c Sun Oct 12 17:51:51 2008 @@ -104,6 +104,57 @@ SWITCH_DECLARE(switch_status_t) switch_strftime(char *s, switch_size_t *retsize, switch_size_t max, const char *format, switch_time_exp_t *tm) { + const char *p = format; + + if (!p) return SWITCH_STATUS_FALSE; + + while (*p) { + if (*p == '%') { + switch (*(++p)) { + case 'C': + case 'D': + case 'r': + case 'R': + case 'T': + case 'e': + case 'a': + case 'A': + case 'b': + case 'B': + case 'c': + case 'd': + case 'H': + case 'I': + case 'j': + case 'm': + case 'M': + case 'p': + case 'S': + case 'U': + case 'w': + case 'W': + case 'x': + case 'X': + case 'y': + case 'Y': + case 'z': + case 'Z': + case '%': + p++; + continue; + case '\0': + default: + return SWITCH_STATUS_FALSE; + } + } + p++; + } + + return apr_strftime(s, retsize, max, format, (apr_time_exp_t *) tm); +} + +SWITCH_DECLARE(switch_status_t) switch_strftime_nocheck(char *s, switch_size_t *retsize, switch_size_t max, const char *format, switch_time_exp_t *tm) +{ return apr_strftime(s, retsize, max, format, (apr_time_exp_t *) tm); } Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Sun Oct 12 17:51:51 2008 @@ -2105,40 +2105,39 @@ cid_buf = caller_profile->caller_id_number; } - if (caller_profile->times) { switch_time_exp_t tm; switch_size_t retsize; const char *fmt = "%Y-%m-%d %T"; switch_time_exp_lt(&tm, caller_profile->times->created); - switch_strftime(start, &retsize, sizeof(start), fmt, &tm); + switch_strftime_nocheck(start, &retsize, sizeof(start), fmt, &tm); switch_channel_set_variable(channel, "start_stamp", start); switch_time_exp_lt(&tm, caller_profile->times->profile_created); - switch_strftime(profile_start, &retsize, sizeof(profile_start), fmt, &tm); + switch_strftime_nocheck(profile_start, &retsize, sizeof(profile_start), fmt, &tm); switch_channel_set_variable(channel, "profile_start_stamp", profile_start); if (caller_profile->times->answered) { switch_time_exp_lt(&tm, caller_profile->times->answered); - switch_strftime(answer, &retsize, sizeof(answer), fmt, &tm); + switch_strftime_nocheck(answer, &retsize, sizeof(answer), fmt, &tm); switch_channel_set_variable(channel, "answer_stamp", answer); } if (caller_profile->times->progress) { switch_time_exp_lt(&tm, caller_profile->times->progress); - switch_strftime(progress, &retsize, sizeof(progress), fmt, &tm); + switch_strftime_nocheck(progress, &retsize, sizeof(progress), fmt, &tm); switch_channel_set_variable(channel, "progress_stamp", progress); } if (caller_profile->times->progress_media) { switch_time_exp_lt(&tm, caller_profile->times->progress_media); - switch_strftime(progress_media, &retsize, sizeof(progress_media), fmt, &tm); + switch_strftime_nocheck(progress_media, &retsize, sizeof(progress_media), fmt, &tm); switch_channel_set_variable(channel, "progress_media_stamp", progress_media); } switch_time_exp_lt(&tm, caller_profile->times->hungup); - switch_strftime(end, &retsize, sizeof(end), fmt, &tm); + switch_strftime_nocheck(end, &retsize, sizeof(end), fmt, &tm); switch_channel_set_variable(channel, "end_stamp", end); tt_created = (time_t) (caller_profile->times->created / 1000000); Modified: freeswitch/trunk/src/switch_console.c ============================================================================== --- freeswitch/trunk/src/switch_console.c (original) +++ freeswitch/trunk/src/switch_console.c Sun Oct 12 17:51:51 2008 @@ -289,7 +289,7 @@ } switch_time_exp_lt(&tm, switch_timestamp_now()); - switch_strftime(date, &retsize, sizeof(date), "%Y-%m-%d %T", &tm); + switch_strftime_nocheck(date, &retsize, sizeof(date), "%Y-%m-%d %T", &tm); if (channel == SWITCH_CHANNEL_ID_LOG) { fprintf(handle, "[%d] %s %s:%d %s() %s", (int) getpid(), date, filep, line, func, data); Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Sun Oct 12 17:51:51 2008 @@ -1008,7 +1008,7 @@ switch_event_add_header_string(*event, SWITCH_STACK_BOTTOM, "FreeSWITCH-IPv6", guess_ip_v6); switch_time_exp_lt(&tm, ts); - switch_strftime(date, &retsize, sizeof(date), "%Y-%m-%d %T", &tm); + switch_strftime_nocheck(date, &retsize, sizeof(date), "%Y-%m-%d %T", &tm); switch_event_add_header_string(*event, SWITCH_STACK_BOTTOM, "Event-Date-Local", date); switch_rfc822_date(date, ts); switch_event_add_header_string(*event, SWITCH_STACK_BOTTOM, "Event-Date-GMT", date); Modified: freeswitch/trunk/src/switch_log.c ============================================================================== --- freeswitch/trunk/src/switch_log.c (original) +++ freeswitch/trunk/src/switch_log.c Sun Oct 12 17:51:51 2008 @@ -265,7 +265,7 @@ switch_time_exp_t tm; switch_time_exp_lt(&tm, now); - switch_strftime(date, &retsize, sizeof(date), "%Y-%m-%d %T", &tm); + switch_strftime_nocheck(date, &retsize, sizeof(date), "%Y-%m-%d %T", &tm); len = (uint32_t) (strlen(extra_fmt) + strlen(date) + strlen(filep) + 32 + strlen(funcp) + strlen(fmt)); new_fmt = malloc(len + 1); Modified: freeswitch/trunk/src/switch_time.c ============================================================================== --- freeswitch/trunk/src/switch_time.c (original) +++ freeswitch/trunk/src/switch_time.c Sun Oct 12 17:51:51 2008 @@ -571,7 +571,7 @@ if (tzdef) { /* The lookup of the zone may fail. */ tztime( &timep, tzdef, &tm ); tm2switchtime( &tm, &stm ); - switch_strftime(date, &retsize, len, switch_strlen_zero(format) ? "%Y-%m-%d %T" : format, &stm); + switch_strftime_nocheck(date, &retsize, len, switch_strlen_zero(format) ? "%Y-%m-%d %T" : format, &stm); if (!switch_strlen_zero_buf(date)) { return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r9984 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 12 Oct '08

12 Oct '08

Author: brian Date: Sun Oct 12 00:19:54 2008 New Revision: 9984 Modified: freeswitch/trunk/conf/dialplan/default.xml Log: thats a bug Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Sun Oct 12 00:19:54 2008 @@ -287,8 +287,8 @@ </extension>  - <extension name="0911"> - <condition field="destination_number" expression="0911"> + <extension name="mad_boss"> + <condition field="destination_number" expression="^0911$">  <action application="set" data="conference_auto_outcall_caller_id_name=Mad Boss"/>

1 0

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

12 Oct '08

Author: brian Date: Sat Oct 11 23:56:11 2008 New Revision: 9983 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Log: move these messages into debug Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Sat Oct 11 23:56:11 2008 @@ -127,7 +127,9 @@ gateway_ptr->status = SOFIA_GATEWAY_UP; break; case REG_STATE_REGISTER: - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Registered %s\n", gateway_ptr->name); + if (profile->debug) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Registered %s\n", gateway_ptr->name); + } if (gateway_ptr->expires > 60) { gateway_ptr->expires = now + (gateway_ptr->freq - 15); } else { @@ -1163,8 +1165,9 @@ switch_snprintf(authentication, sizeof(authentication), "%s:%s:%s:%s", scheme, realm, gateway->auth_username, gateway->register_password); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Authenticating '%s' with '%s'.\n", profile->username, authentication); - + if (profile->debug) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Authenticating '%s' with '%s'.\n", profile->username, authentication); + } ss_state = nua_callstate_authenticating;

1 0

[commit] r9982 - freeswitch/trunk/src/mod/xml_int/mod_xml_ldap
by Freeswitch SVN 12 Oct '08

12 Oct '08

Author: jskopis Date: Sat Oct 11 22:57:28 2008 New Revision: 9982 Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_ldap/Makefile freeswitch/trunk/src/mod/xml_int/mod_xml_ldap/mod_xml_ldapv2.c Log: can "fallback" to h350 style directory Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_ldap/Makefile ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_ldap/Makefile (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_ldap/Makefile Sat Oct 11 22:57:28 2008 @@ -1,6 +1,6 @@ switch_srcdir=../../../.. -LDAP=openldap-2.3.19 +LDAP=openldap-2.4.11 LDAP_DIR=$(switch_srcdir)/libs/$(LDAP) LDAPLA=$(LDAP_DIR)/libraries/libldap_r/libldap_r.la Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_ldap/mod_xml_ldapv2.c ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_ldap/mod_xml_ldapv2.c (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_ldap/mod_xml_ldapv2.c Sat Oct 11 22:57:28 2008 @@ -20,6 +20,7 @@ xml_ldap_query_type_t bt; char *url; char *basedn; + char *h350base; char *binddn; char *bindpass; char *filter; @@ -34,6 +35,7 @@ static switch_xml_t xml_ldap_search(const char *section, const char *tag_name, const char *key_name, const char *key_value, switch_event_t *params, void *user_data); +static switch_status_t tryh350(switch_xml_t *, int *, LDAP *, char *, char *, char *); static switch_status_t do_config(void); static switch_status_t trysearch( switch_xml_t *pxml, int *xoff, LDAP *ld, char *basedn, char *filter); void rec( switch_xml_t *, int*, LDAP *ld, char *); @@ -106,6 +108,7 @@ binding->bt = XML_LDAP_CONFIG; } else if (!strncmp(binding->bindings, "directory",strlen(binding->bindings))) { binding->bt = XML_LDAP_DIRECTORY; + binding->h350base = strdup("dc=example"); } else if (!strncmp(binding->bindings, "dialplain",strlen(binding->bindings))) { binding->bt = XML_LDAP_DIALPLAN; } else if (!strncmp(binding->bindings, "phrases",strlen(binding->bindings))) { @@ -150,6 +153,87 @@ return SWITCH_STATUS_SUCCESS; } +static switch_status_t tryh350(switch_xml_t *pxml, int *xoff, LDAP *ld, char *basedn, char *dir_domain, char *dir_exten) { + switch_status_t ret = SWITCH_STATUS_FALSE; + int off = *xoff; + char *key = NULL; + char **val = NULL; + char *filter = NULL; + BerElement *ber = NULL; + switch_xml_t xml = *pxml, save; + LDAPMessage *msg, *entry; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "trying h350search in base %s with filter SIPIdentityUserName=%s\n", basedn, dir_exten); + + filter = switch_mprintf("(SIPIdentityUserName=%s)",dir_exten); + + if ( (ldap_search_s(ld, basedn, LDAP_SCOPE_SUB, filter, NULL, 0, &msg) != LDAP_SUCCESS) ) goto cleanup; + + if ( ldap_count_entries(ld, msg) > 0 ) { + ret = SWITCH_STATUS_SUCCESS; + xml = switch_xml_add_child_d(xml, "section", off++); + switch_xml_set_attr_d(xml, "name", "directory"); + + xml = switch_xml_add_child_d(xml, "domain", off++); + switch_xml_set_attr_d(xml, "name", dir_domain); + + xml = switch_xml_add_child_d(xml, "user", off++); + switch_xml_set_attr_d(xml, "id", dir_exten); + switch_xml_set_attr_d(xml, "mailbox", dir_exten); + + save = switch_xml_add_child_d(xml, "variables", off++); + xml = switch_xml_add_child_d(save, "variable", off++); + switch_xml_set_attr_d(xml, "name", "accountcode"); + switch_xml_set_attr_d(xml, "value", dir_exten); + + xml = save; + + save = switch_xml_add_child_d(xml, "params", off++); + xml = switch_xml_add_child_d(save, "param", off++); + for ( + entry = ldap_first_entry(ld, msg); + entry != NULL; + entry = ldap_next_entry(ld, entry) ) { + + + for ( + key = ldap_first_attribute(ld, entry, &ber); + key != NULL; + key = ldap_next_attribute(ld, entry, ber) ) { + + if ( !strncasecmp(key,"SIPIdentityPassword",strlen(key)) ) { + val = ldap_get_values(ld,entry,key); + switch_xml_set_attr_d(xml, "name", "password"); + switch_xml_set_attr_d(xml, "value", val[0]); + xml = switch_xml_add_child_d(save, "param", off++); + switch_xml_set_attr_d(xml, "name", "vm-password"); + switch_xml_set_attr_d(xml, "value", val[0]); + ldap_memfree(key); + ldap_value_free(val); + } else { + ldap_memfree(key); + continue; + } + + } + ber_free(ber,0); + } + + ldap_msgfree(entry); + ldap_msgfree(msg); + } else { + ret = SWITCH_STATUS_FALSE; + } + + cleanup: + switch_safe_free(filter); + switch_safe_free(key); + + return ret; +} + + + + static switch_status_t trysearch ( switch_xml_t *pxml, int *xoff, LDAP *ld, char *basedn, char *filter) { switch_status_t ret; int off = *xoff; @@ -162,7 +246,8 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "trying search in base %s with filter %s\n", basedn, filter); - ldap_search_s(ld, basedn, LDAP_SCOPE_ONE, filter, NULL, 0, &msg); + if ( (ldap_search_s(ld, basedn, LDAP_SCOPE_ONE, filter, NULL, 0, &msg) != LDAP_SUCCESS) ) goto cleanup; + if ( ldap_count_entries(ld, msg) > 0 ) { ret = SWITCH_STATUS_SUCCESS; @@ -206,6 +291,8 @@ ret = SWITCH_STATUS_FALSE; } + cleanup: + switch_safe_free(basedn); switch_safe_free(filter); switch_safe_free(key); @@ -294,6 +381,7 @@ break; case XML_LDAP_DIRECTORY: + switch_log_printf(SWITCH_CHANNEL_LOG,SWITCH_LOG_ERROR, "from cb got %s=%s\n", hi->name, hi->value); if (!strncmp(hi->name, "user", strlen(hi->name))) { dir_exten = strdup(hi->value); } else if (!strncmp(hi->name, "domain", strlen(hi->name))) { @@ -319,9 +407,11 @@ if(!dir_exten) { filter = switch_mprintf(binding->filter,"objectclass","*","(!(objectclass=fsuser))"); basedn = switch_mprintf(binding->basedn,dir_domain); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "setting filter %s and basedn %s\n", filter, basedn); } else { - filter = switch_mprintf(binding->filter,key_name,key_value,"object_class=*"); + filter = switch_mprintf(binding->filter,"id",dir_exten,"(objectclass=*)"); basedn = switch_mprintf(binding->basedn,dir_domain); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "setting filter %s and basedn %s\n", filter, basedn); } break; @@ -343,6 +433,7 @@ trysearch(&xml,&xoff,ld, basedn, filter); + if(binding->bt == XML_LDAP_DIRECTORY ) tryh350(&xml,&xoff,ld,binding->h350base, dir_domain, dir_exten); ldap_unbind_s(ld);

1 0