- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r13167 - in freeswitch/trunk/src: . include
by FreeSWITCH SVN 27 Apr '09

27 Apr '09

Author: anthm Date: Mon Apr 27 12:45:04 2009 New Revision: 13167 Log: FSCORE-357 Modified: freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_core_session.c freeswitch/trunk/src/switch_ivr_bridge.c Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Mon Apr 27 12:45:04 2009 @@ -677,6 +677,8 @@ SWITCH_DECLARE(void) switch_core_session_hupall_matching_var(_In_ const char *var_name, _In_ const char *var_val, _In_ switch_call_cause_t cause); SWITCH_DECLARE(void) switch_core_session_hupall_endpoint(const switch_endpoint_interface_t *endpoint_interface, switch_call_cause_t cause); +SWITCH_DECLARE(switch_status_t) switch_core_session_get_partner(switch_core_session_t *session, switch_core_session_t **partner); + /*! \brief Send a message to another session using it's uuid \param uuid_str the unique id of the session you want to send a message to Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Mon Apr 27 12:45:04 2009 @@ -764,7 +764,7 @@ state = switch_channel_get_running_state(other_channel); mystate = switch_channel_get_running_state(channel); - if (mystate != ostate || state >= CS_HANGUP || state == want_state) { + if (mystate != ostate || state >= CS_HANGUP || state >= want_state) { break; } switch_cond_next(); Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Mon Apr 27 12:45:04 2009 @@ -75,6 +75,19 @@ return session; } +SWITCH_DECLARE(switch_status_t) switch_core_session_get_partner(switch_core_session_t *session, switch_core_session_t **partner) +{ + const char *uuid; + + if ((uuid = switch_channel_get_variable(session->channel, SWITCH_SIGNAL_BOND_VARIABLE))) { + *partner = switch_core_session_locate(uuid); + return SWITCH_STATUS_SUCCESS; + } + + *partner = NULL; + return SWITCH_STATUS_FALSE; +} + SWITCH_DECLARE(void) switch_core_session_hupall_matching_var(const char *var_name, const char *var_val, switch_call_cause_t cause) { Modified: freeswitch/trunk/src/switch_ivr_bridge.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_bridge.c (original) +++ freeswitch/trunk/src/switch_ivr_bridge.c Mon Apr 27 12:45:04 2009 @@ -508,15 +508,24 @@ if (switch_true(switch_channel_get_variable(channel, SWITCH_COPY_XML_CDR_VARIABLE))) { + switch_core_session_t *other_session; + switch_channel_t *other_channel; switch_xml_t cdr; char *xml_text; - if (switch_ivr_generate_xml_cdr(session, &cdr) == SWITCH_STATUS_SUCCESS) { - if ((xml_text = switch_xml_toxml(cdr, SWITCH_FALSE))) { - switch_channel_set_variable_partner(channel, "b_leg_cdr", xml_text); - switch_safe_free(xml_text); + if (switch_core_session_get_partner(session, &other_session) == SWITCH_STATUS_SUCCESS) { + other_channel = switch_core_session_get_channel(other_session); + + switch_channel_wait_for_state(channel, other_channel, CS_REPORTING); + + if (switch_ivr_generate_xml_cdr(session, &cdr) == SWITCH_STATUS_SUCCESS) { + if ((xml_text = switch_xml_toxml(cdr, SWITCH_FALSE))) { + switch_channel_set_variable(other_channel, "b_leg_cdr", xml_text); + switch_safe_free(xml_text); + } + switch_xml_free(cdr); } - switch_xml_free(cdr); + switch_core_session_rwunlock(other_session); } }

1 0

[commit] r13166 - in freeswitch/trunk/src: . mod/applications/mod_dptools mod/endpoints/mod_sofia
by FreeSWITCH SVN 27 Apr '09

27 Apr '09

Author: anthm Date: Mon Apr 27 12:31:34 2009 New Revision: 13166 Log: keep presence up to date Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c freeswitch/trunk/src/switch_core_state_machine.c 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 Mon Apr 27 12:31:34 2009 @@ -1114,7 +1114,7 @@ goto error; } - if (argc != need) { + if (argc < need) { goto error; } @@ -1122,12 +1122,19 @@ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "proto", "dp"); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "login", __FILE__); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "from", argv[1]); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "rpid", argv[2]); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "status", argv[3]); if (type == SWITCH_EVENT_PRESENCE_IN) { - switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "rpid", argv[2]); - switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "status", argv[3]); + if (!strncasecmp(argv[3], "cs_", 3) || switch_stristr("hangup", argv[3])) { + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "channel-state", "CS_HANGUP"); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "status", "CS_HANGUP"); + } + } else { + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "status", "CS_HANGUP"); } switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "event_type", "presence"); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "alt_event_type", "dialog"); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "event_count", "%d", 0); switch_event_fire(&event); } stream->write_function(stream, "Event Sent"); Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Mon Apr 27 12:31:34 2009 @@ -634,11 +634,15 @@ event->event_id == SWITCH_EVENT_PRESENCE_IN ? "IN" : "OUT", profile->name); } - if (mod_sofia_globals.debug_presence > 1) { + if (mod_sofia_globals.debug_presence) { char *buf; switch_event_serialize(event, &buf, SWITCH_FALSE); switch_assert(buf); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "DUMP PRESENCE SQL:\n%s\nEVENT DUMP:\n%s\n", sql, buf); + if (mod_sofia_globals.debug_presence > 1) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "DUMP PRESENCE SQL:\n%s\nEVENT DUMP:\n%s\n", sql, buf); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "EVENT DUMP:\n%s\n", buf); + } free(buf); } @@ -946,16 +950,18 @@ static char *gen_pidf(char *user_agent, char *id, char *url, char *open, char *rpid, char *prpid, char *status, const char **ct) { + char *ret = NULL; + if (switch_stristr("polycom", user_agent)) { *ct = "application/xpidf+xml"; - + /* of course!, lets make a big deal over dashes. Now the stupidity is complete. */ if (!strcmp(prpid, "on-the-phone")) { prpid = "onthephone"; } - return switch_mprintf( + ret = switch_mprintf( "<?xml version=\"1.0\"?>\n" "<!DOCTYPE presence PUBLIC \"-//IETF//DTD RFCxxxx XPIDF 1.0//EN\" \"xpidf.dtd\">\n" "<presence>\n" @@ -973,7 +979,7 @@ ); } else { *ct = "application/pidf+xml"; - return switch_mprintf( + ret = switch_mprintf( "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?> \n" "<presence xmlns='urn:ietf:params:xml:ns:pidf' \n" "xmlns:dm='urn:ietf:params:xml:ns:pidf:data-model' \n" @@ -993,6 +999,9 @@ " </dm:person>\n" "</presence>", id, open, prpid, status); } + + + return ret; } static int sofia_presence_sub_callback(void *pArg, int argc, char **argv, char **columnNames) @@ -1305,6 +1314,12 @@ } } + if (mod_sofia_globals.debug_presence > 0 && pl) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "send payload:\n%s\n", pl); + } + + + nua_notify(nh, TAG_IF(*expires_str, SIPTAG_EXPIRES_STR(expires_str)), SIPTAG_SUBSCRIPTION_STATE_STR(sstr), Modified: freeswitch/trunk/src/switch_core_state_machine.c ============================================================================== --- freeswitch/trunk/src/switch_core_state_machine.c (original) +++ freeswitch/trunk/src/switch_core_state_machine.c Mon Apr 27 12:31:34 2009 @@ -443,7 +443,7 @@ switch_channel_set_variable(session->channel, "hangup_cause", switch_channel_cause2str(cause)); switch_channel_set_variable_printf(session->channel, "hangup_cause_q850", "%d", cause_q850); - switch_channel_presence(session->channel, "unavailable", switch_channel_cause2str(cause), NULL); + switch_channel_presence(session->channel, "unknown", switch_channel_cause2str(cause), NULL); switch_channel_set_timestamps(session->channel);

1 0

[commit] r13165 - freeswitch/trunk/src/mod/formats/mod_local_stream
by FreeSWITCH SVN 27 Apr '09

27 Apr '09

Author: mrene Date: Mon Apr 27 12:27:20 2009 New Revision: 13165 Log: MODFORM-27 Modified: freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c Modified: freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c (original) +++ freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c Mon Apr 27 12:27:20 2009 @@ -557,6 +557,88 @@ return SWITCH_STATUS_SUCCESS; } +#define SHOW_LOCAL_STREAM_SYNTAX "[local_stream_name [xml]]" +SWITCH_STANDARD_API(show_local_stream_function) +{ + local_stream_source_t *source = NULL; + char *mycmd = NULL, *argv[2] = { 0 }; + char *local_stream_name = NULL; + int argc = 0; + switch_hash_index_t *hi; + const void *var; + void *val; + switch_bool_t xml = SWITCH_FALSE; + + switch_mutex_lock(globals.mutex); + + if (switch_strlen_zero(cmd)) { + for (hi = switch_hash_first(NULL, globals.source_hash); hi; hi = switch_hash_next(hi)) { + switch_hash_this(hi, &var, NULL, &val); + if ((source = (local_stream_source_t *) val)) { + stream->write_function(stream, "%s,%s\n", source->name, source->location); + } + } + } else { + if (!(mycmd = strdup(cmd))) { + goto usage; + } + + if ((argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0]))))) { + local_stream_name = argv[0]; + if (argc > 1 && !strcasecmp("xml", argv[1])) { + xml = SWITCH_TRUE; + } + } + + source = switch_core_hash_find(globals.source_hash, local_stream_name); + if (source) { + if (xml) { + stream->write_function(stream, "<?xml version=\"1.0\"?>\n<local_stream name=\"%s\">\n", source->name); + stream->write_function(stream, " <location>%s</location>\n", source->location); + stream->write_function(stream, " <channels>%d</channels>\n", source->channels); + stream->write_function(stream, " <rate>%d</rate>\n", source->rate); + stream->write_function(stream, " <interval>%d<interval>\n", source->interval); + stream->write_function(stream, " <samples>%d</samples>\n", source->samples); + stream->write_function(stream, " <prebuf>%d</prebuf>\n", source->prebuf); + stream->write_function(stream, " <timer>%s</timer>\n", source->timer_name); + stream->write_function(stream, " <total>%d</total>\n", source->total); + stream->write_function(stream, " <shuffle>%s</shuffle>\n", (source->shuffle) ? "true" : "false"); + stream->write_function(stream, " <ready>%s</ready>\n", (source->ready) ? "true" : "false"); + stream->write_function(stream, " <stopped>%s</stopped>\n", (source->stopped) ? "true" : "false"); + stream->write_function(stream, "</local_stream>\n"); + } else { + stream->write_function(stream, "%s\n", source->name); + stream->write_function(stream, " location: %s\n", source->location); + stream->write_function(stream, " channels: %d\n", source->channels); + stream->write_function(stream, " rate: %d\n", source->rate); + stream->write_function(stream, " interval: %d\n", source->interval); + stream->write_function(stream, " samples: %d\n", source->samples); + stream->write_function(stream, " prebuf: %d\n", source->prebuf); + stream->write_function(stream, " timer: %s\n", source->timer_name); + stream->write_function(stream, " total: %d\n", source->total); + stream->write_function(stream, " shuffle: %s\n", (source->shuffle) ? "true" : "false"); + stream->write_function(stream, " ready: %s\n", (source->ready) ? "true" : "false"); + stream->write_function(stream, " stopped: %s\n", (source->stopped) ? "true" : "false"); + } + } else { + stream->write_function(stream, "-ERR Cannot locate local_stream %s!\n",local_stream_name); + goto done; + } + } + + stream->write_function(stream,"+OK"); + goto done; + + usage: + stream->write_function(stream, "-USAGE: %s\n", SHOW_LOCAL_STREAM_SYNTAX); + + done: + + switch_mutex_unlock(globals.mutex); + switch_safe_free(mycmd); + return SWITCH_STATUS_SUCCESS; +} + #define START_LOCAL_STREAM_SYNTAX "<local_stream_name> [<path>] [<rate>] [<shuffle>] [<prebuf>] [<channels>] [<interval>] [<timer_name>]" SWITCH_STANDARD_API(start_local_stream_function) { @@ -758,6 +840,7 @@ SWITCH_ADD_API(commands_api_interface, "stop_local_stream", "Stops and unloads a local_stream", stop_local_stream_function, STOP_LOCAL_STREAM_SYNTAX); SWITCH_ADD_API(commands_api_interface, "start_local_stream", "Starts a new local_stream", start_local_stream_function, START_LOCAL_STREAM_SYNTAX); + SWITCH_ADD_API(commands_api_interface, "show_local_stream", "Shows a local stream", show_local_stream_function, SHOW_LOCAL_STREAM_SYNTAX); /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS;

1 0

[commit] r13164 - freeswitch/trunk/src/mod/applications/mod_dptools
by FreeSWITCH SVN 27 Apr '09

27 Apr '09

Author: anthm Date: Mon Apr 27 10:52:34 2009 New Revision: 13164 Log: clean up presence function Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c 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 Mon Apr 27 10:52:34 2009 @@ -1094,20 +1094,28 @@ return SWITCH_STATUS_SUCCESS; } + +#define PRESENCE_USAGE "[in|out] <user> <rpid> <message>" SWITCH_STANDARD_API(presence_api_function) { switch_event_t *event; char *lbuf, *argv[4]; int argc = 0; switch_event_types_t type = SWITCH_EVENT_PRESENCE_IN; + int need = 4; if (!switch_strlen_zero(cmd) && (lbuf = strdup(cmd)) - && (argc = switch_separate_string(lbuf, '|', argv, (sizeof(argv) / sizeof(argv[0])))) > 0) { + && (argc = switch_separate_string(lbuf, ' ', argv, (sizeof(argv) / sizeof(argv[0])))) > 0) { + if (!strcasecmp(argv[0], "out")) { type = SWITCH_EVENT_PRESENCE_OUT; - } else if (argc != 4) { - stream->write_function(stream, "Invalid"); - return SWITCH_STATUS_SUCCESS; + need = 2; + } else if (strcasecmp(argv[0], "in")) { + goto error; + } + + if (argc != need) { + goto error; } if (switch_event_create(&event, type) == SWITCH_STATUS_SUCCESS) { @@ -1119,14 +1127,22 @@ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "status", argv[3]); } switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "event_type", "presence"); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "alt_event_type", "dialog"); switch_event_fire(&event); } stream->write_function(stream, "Event Sent"); switch_safe_free(lbuf); } else { - stream->write_function(stream, "Invalid"); + goto error; } + return SWITCH_STATUS_SUCCESS; + + error: + + stream->write_function(stream, "Invalid: presence %s", PRESENCE_USAGE); + return SWITCH_STATUS_SUCCESS; + } SWITCH_STANDARD_API(chat_api_function) @@ -2599,7 +2615,7 @@ SWITCH_ADD_API(api_interface, "strepoch", "Convert a date string into epoch time", strepoch_api_function, "<string>"); SWITCH_ADD_API(api_interface, "chat", "chat", chat_api_function, "<proto>|<from>|<to>|<message>|[<content-type>]"); SWITCH_ADD_API(api_interface, "strftime", "strftime", strftime_api_function, "<format_string>"); - SWITCH_ADD_API(api_interface, "presence", "presence", presence_api_function, "<user> <rpid> <message>"); + SWITCH_ADD_API(api_interface, "presence", "presence", presence_api_function, PRESENCE_USAGE); SWITCH_ADD_APP(app_interface, "privacy", "Set privacy on calls", "Set caller privacy on calls.", privacy_function, "off|on|name|full|number", SAF_SUPPORT_NOMEDIA);

1 0

[commit] r13163 - freeswitch/trunk/src
by FreeSWITCH SVN 27 Apr '09

27 Apr '09

Author: mrene Date: Mon Apr 27 10:51:19 2009 New Revision: 13163 Log: FSCORE-356 Modified: freeswitch/trunk/src/switch_core_state_machine.c Modified: freeswitch/trunk/src/switch_core_state_machine.c ============================================================================== --- freeswitch/trunk/src/switch_core_state_machine.c (original) +++ freeswitch/trunk/src/switch_core_state_machine.c Mon Apr 27 10:51:19 2009 @@ -432,6 +432,7 @@ const char *hook_var; switch_core_session_t *use_session = NULL; switch_call_cause_t cause = switch_channel_get_cause(session->channel); + switch_call_cause_t cause_q850 = switch_channel_get_cause_q850(session->channel); switch_event_t *event; switch_channel_set_hangup_time(session->channel); @@ -441,6 +442,7 @@ switch_channel_stop_broadcast(session->channel); switch_channel_set_variable(session->channel, "hangup_cause", switch_channel_cause2str(cause)); + switch_channel_set_variable_printf(session->channel, "hangup_cause_q850", "%d", cause_q850); switch_channel_presence(session->channel, "unavailable", switch_channel_cause2str(cause), NULL); switch_channel_set_timestamps(session->channel);

1 0

[commit] r13162 - freeswitch/trunk/src/mod/endpoints/mod_loopback
by FreeSWITCH SVN 27 Apr '09

27 Apr '09

Author: anthm Date: Mon Apr 27 09:15:55 2009 New Revision: 13162 Log: add loopback_bowout variable (set to false to skip auto-bowout) Modified: freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c Modified: freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c Mon Apr 27 09:15:55 2009 @@ -640,21 +640,27 @@ ) { const char *a_uuid = switch_channel_get_variable(channel, SWITCH_SIGNAL_BOND_VARIABLE); const char *b_uuid = switch_channel_get_variable(tech_pvt->other_channel, SWITCH_SIGNAL_BOND_VARIABLE); - + const char *vetoa, *vetob; + switch_set_flag_locked(tech_pvt, TFLAG_BOWOUT); switch_set_flag_locked(tech_pvt->other_tech_pvt, TFLAG_BOWOUT); + + vetoa = switch_channel_get_variable(tech_pvt->channel, "loopback_bowout"); + vetob = switch_channel_get_variable(tech_pvt->other_tech_pvt->channel, "loopback_bowout"); + + if ((!vetoa || switch_true(vetoa)) && (!vetob || switch_true(vetob))) { + switch_clear_flag_locked(tech_pvt, TFLAG_WRITE); + switch_clear_flag_locked(tech_pvt->other_tech_pvt, TFLAG_WRITE); + + if (a_uuid && b_uuid) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, + "%s detected bridge on both ends, attempting direct connection.\n", switch_channel_get_name(channel)); - switch_clear_flag_locked(tech_pvt, TFLAG_WRITE); - switch_clear_flag_locked(tech_pvt->other_tech_pvt, TFLAG_WRITE); - - if (a_uuid && b_uuid) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, - "%s detected bridge on both ends, attempting direct connection.\n", switch_channel_get_name(channel)); - - /* channel_masquerade eat your heart out....... */ - switch_ivr_uuid_bridge(a_uuid, b_uuid); - switch_mutex_unlock(tech_pvt->mutex); - return SWITCH_STATUS_SUCCESS; + /* channel_masquerade eat your heart out....... */ + switch_ivr_uuid_bridge(a_uuid, b_uuid); + switch_mutex_unlock(tech_pvt->mutex); + return SWITCH_STATUS_SUCCESS; + } } } @@ -675,9 +681,10 @@ if (switch_queue_trypush(tech_pvt->other_tech_pvt->frame_queue, clone) != SWITCH_STATUS_SUCCESS) { switch_frame_free(&clone); } + + switch_set_flag_locked(tech_pvt->other_tech_pvt, TFLAG_WRITE); } - switch_set_flag_locked(tech_pvt->other_tech_pvt, TFLAG_WRITE); status = SWITCH_STATUS_SUCCESS; }

1 0

[commit] r13161 - freeswitch/trunk/src
by FreeSWITCH SVN 27 Apr '09

27 Apr '09

Author: anthm Date: Mon Apr 27 09:14:42 2009 New Revision: 13161 Log: auto-sync idle timers Modified: freeswitch/trunk/src/switch_time.c Modified: freeswitch/trunk/src/switch_time.c ============================================================================== --- freeswitch/trunk/src/switch_time.c (original) +++ freeswitch/trunk/src/switch_time.c Mon Apr 27 09:14:42 2009 @@ -324,7 +324,12 @@ #else int cond_index = 1; #endif + int delta = (int)(private_info->reference - TIMER_MATRIX[timer->interval].tick); + /* sync up timer if it's not been called for a while otherwise it will return instantly several times until it catches up */ + if (delta < 0) { + private_info->reference = timer->tick = TIMER_MATRIX[timer->interval].tick; + } timer_step(timer); while (globals.RUNNING == 1 && private_info->ready && TIMER_MATRIX[timer->interval].tick < private_info->reference) {

1 0

[commit] r13160 - freeswitch/trunk/support-d
by FreeSWITCH SVN 27 Apr '09

27 Apr '09

Author: mrene Date: Mon Apr 27 08:14:51 2009 New Revision: 13160 Log: Add make to apt prereqs Modified: freeswitch/trunk/support-d/prereq.sh Modified: freeswitch/trunk/support-d/prereq.sh ============================================================================== --- freeswitch/trunk/support-d/prereq.sh (original) +++ freeswitch/trunk/support-d/prereq.sh Mon Apr 27 08:14:51 2009 @@ -2,7 +2,7 @@ NEEDED_PACKAGES_YUM='automake autoconf libtool screen gdb gcc-c++ compat-gcc-32 compat-gcc-32-c++ subversion ncurses-devel unixODBC-devel make wget' -NEEDED_PACAKGES_APT='automake autoconf libtool screen gdb libncurses5-dev unixodbc-dev subversion emacs22-nox gcc g++ ' +NEEDED_PACAKGES_APT='automake autoconf libtool screen gdb libncurses5-dev unixodbc-dev subversion emacs22-nox gcc g++ make' NEEDED_PACKAGES_PKG_ADD=''

1 0

[commit] r13159 - freeswitch/trunk/support-d
by FreeSWITCH SVN 27 Apr '09

27 Apr '09

Author: anthm Date: Sun Apr 26 22:07:55 2009 New Revision: 13159 Log: update Modified: freeswitch/trunk/support-d/.emacs Modified: freeswitch/trunk/support-d/.emacs ============================================================================== --- freeswitch/trunk/support-d/.emacs (original) +++ freeswitch/trunk/support-d/.emacs Sun Apr 26 22:07:55 2009 @@ -178,7 +178,7 @@ ;; Customize face attributes (setq font-lock-face-attributes ;; Symbol-for-Face Foreground Background Bold Italic Underline - '((font-lock-comment-face "DarkGreen") + '((font-lock-comment-face "green") (font-lock-preprocessor-face "gray") (font-lock-string-face "Sienna") (font-lock-keyword-face "purple") @@ -186,6 +186,13 @@ (font-lock-variable-name-face "Yellow") (font-lock-type-face "Yellow") (font-lock-reference-face "Purple") + + (font-lock-builtin-face "limegreen") + (font-lock-constant-face "yellow") + (font-lock-doc-face "limegreen") + (font-lock-highlighting-face "limegreen") + (font-lock-warning-face "limegreen") + )) ;; Load the font-lock package. (require 'font-lock) @@ -197,6 +204,10 @@ + + + +

1 0

[commit] r13158 - freeswitch/trunk/src/mod/endpoints/mod_loopback
by FreeSWITCH SVN 27 Apr '09

27 Apr '09

Author: anthm Date: Sun Apr 26 21:04:48 2009 New Revision: 13158 Log: make a little more optimal Modified: freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c Modified: freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c Sun Apr 26 21:04:48 2009 @@ -36,6 +36,8 @@ #include <math.h> #include <string.h> +#define FRAME_QUEUE_LEN 3 + SWITCH_MODULE_LOAD_FUNCTION(mod_loopback_load); SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_loopback_shutdown); SWITCH_MODULE_DEFINITION(mod_loopback, mod_loopback_load, mod_loopback_shutdown, NULL); @@ -187,7 +189,7 @@ switch_mutex_init(&tech_pvt->flag_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session)); switch_mutex_init(&tech_pvt->mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session)); switch_core_session_set_private(session, tech_pvt); - switch_queue_create(&tech_pvt->frame_queue, 3, switch_core_session_get_pool(session)); + switch_queue_create(&tech_pvt->frame_queue, FRAME_QUEUE_LEN, switch_core_session_get_pool(session)); tech_pvt->session = session; tech_pvt->channel = switch_core_session_get_channel(session); } @@ -658,18 +660,21 @@ if (switch_test_flag(tech_pvt, TFLAG_LINKED)) { switch_frame_t *clone; + if (frame->codec->implementation != tech_pvt->write_codec.implementation) { /* change codecs to match */ tech_init(tech_pvt, session, frame->codec); tech_init(tech_pvt->other_tech_pvt, tech_pvt->other_session, frame->codec); } - if (switch_frame_dup(frame, &clone) != SWITCH_STATUS_SUCCESS) { - abort(); - } + if (switch_queue_size(tech_pvt->other_tech_pvt->frame_queue) < FRAME_QUEUE_LEN) { + if (switch_frame_dup(frame, &clone) != SWITCH_STATUS_SUCCESS) { + abort(); + } - if (switch_queue_trypush(tech_pvt->other_tech_pvt->frame_queue, clone) != SWITCH_STATUS_SUCCESS) { - switch_frame_free(&clone); + if (switch_queue_trypush(tech_pvt->other_tech_pvt->frame_queue, clone) != SWITCH_STATUS_SUCCESS) { + switch_frame_free(&clone); + } } switch_set_flag_locked(tech_pvt->other_tech_pvt, TFLAG_WRITE);

1 0