January 2009 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r11065 - freeswitch/trunk/src/mod/applications/mod_easyroute
by FreeSWITCH SVN 03 Jan '09

03 Jan '09

Author: silik0n Date: Sat Jan 3 16:39:12 2009 New Revision: 11065 Log: Now we\'re really ready Modified: freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.c Modified: freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.c (original) +++ freeswitch/trunk/src/mod/applications/mod_easyroute/mod_easyroute.c Sat Jan 3 16:39:12 2009 @@ -32,7 +32,7 @@ * Take Incoming DIDs and Lookup where to send them as well as retrieve * the number of channels they are allowed you use * - * Big Thanks to CP, for funding this work. + * Big Thanks to CP and Joseph Watson (Powercode Systems, LLC) for funding this work. * */

1 0

[commit] r11064 - freeswitch/trunk/src/mod/xml_int/mod_xml_rpc
by FreeSWITCH SVN 03 Jan '09

03 Jan '09

Author: brian Date: Sat Jan 3 13:57:31 2009 New Revision: 11064 Log: TIMMAH!!!!!! Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c 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 Sat Jan 3 13:57:31 2009 @@ -178,6 +178,7 @@ if ((dp = strchr(user, '@'))) { *dp++ = '\0'; domain_name = dp; + at++; } if (!domain_name) {

1 0

[commit] r11063 - freeswitch/trunk/src/mod/applications/mod_conference
by FreeSWITCH SVN 03 Jan '09

03 Jan '09

Author: brian Date: Sat Jan 3 13:24:45 2009 New Revision: 11063 Log: shush compiler Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Sat Jan 3 13:24:45 2009 @@ -3061,15 +3061,13 @@ switch_xml_t x_member = NULL, x_members = NULL, x_flags; int moff = 0; char i[30] = ""; - + char *ival = i; switch_assert(conference != NULL); switch_assert(x_conference != NULL); switch_xml_set_attr_d(x_conference, "name", conference->name); - - switch_snprintf(i, sizeof(i), "%d", conference->count); - switch_xml_set_attr_d(x_conference, "member-count", i); + switch_xml_set_attr_d(x_conference, "member-count", ival); if (switch_test_flag(conference, CFLAG_LOCKED)) { switch_xml_set_attr_d(x_conference, "locked", "true");

1 0

[commit] r11062 - freeswitch/trunk/src/mod/applications/mod_conference
by FreeSWITCH SVN 03 Jan '09

03 Jan '09

Author: anthm Date: Sat Jan 3 13:04:30 2009 New Revision: 11062 Log: add 'conference xml_list' and 'conference myconf xml_list' Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Sat Jan 3 13:04:30 2009 @@ -3038,6 +3038,142 @@ return ret_status; } + +static void add_x_tag(switch_xml_t x_member, const char *name, const char *value, int off) +{ + switch_size_t dlen = strlen(value) * 3; + char *data; + switch_xml_t x_tag; + + x_tag = switch_xml_add_child_d(x_member, name, off); + switch_assert(x_tag); + + switch_zmalloc(data, dlen); + + switch_url_encode(value, data, dlen); + switch_xml_set_txt_d(x_tag, data); + free(data); +} + +static void conference_xlist(conference_obj_t *conference, switch_xml_t x_conference, int off) +{ + conference_member_t *member = NULL; + switch_xml_t x_member = NULL, x_members = NULL, x_flags; + int moff = 0; + char i[30] = ""; + + switch_assert(conference != NULL); + switch_assert(x_conference != NULL); + + switch_xml_set_attr_d(x_conference, "name", conference->name); + + + switch_snprintf(i, sizeof(i), "%d", conference->count); + switch_xml_set_attr_d(x_conference, "member-count", i); + + if (switch_test_flag(conference, CFLAG_LOCKED)) { + switch_xml_set_attr_d(x_conference, "locked", "true"); + } + + x_members = switch_xml_add_child_d(x_conference, "members", 0); + switch_assert(x_members); + + switch_mutex_lock(conference->member_mutex); + + for (member = conference->members; member; member = member->next) { + switch_channel_t *channel; + switch_caller_profile_t *profile; + char *uuid; + char *name; + uint32_t count = 0; + switch_xml_t x_tag; + int toff = 0; + + if (switch_test_flag(member, MFLAG_NOCHANNEL)) { + continue; + } + + uuid = switch_core_session_get_uuid(member->session); + channel = switch_core_session_get_channel(member->session); + profile = switch_channel_get_caller_profile(channel); + name = switch_channel_get_name(channel); + + + x_member = switch_xml_add_child_d(x_members, "member", moff++); + switch_assert(x_member); + + switch_snprintf(i, sizeof(i), "%d", member->id); + + add_x_tag(x_member, "id", i, toff++); + add_x_tag(x_member, "uuid", uuid, toff++); + add_x_tag(x_member, "caller_id_name", profile->caller_id_name, toff++); + add_x_tag(x_member, "caller_id_number", profile->caller_id_number, toff++); + + + x_flags = switch_xml_add_child_d(x_member, "flags", count++); + switch_assert(x_flags); + + x_tag = switch_xml_add_child_d(x_flags, "can_hear", count++); + switch_xml_set_txt_d(x_tag, switch_test_flag(member, MFLAG_CAN_HEAR) ? "true" : "false"); + + x_tag = switch_xml_add_child_d(x_flags, "can_speak", count++); + switch_xml_set_txt_d(x_tag, switch_test_flag(member, MFLAG_CAN_SPEAK) ? "true" : "false"); + + x_tag = switch_xml_add_child_d(x_flags, "talking", count++); + switch_xml_set_txt_d(x_tag, switch_test_flag(member, MFLAG_TALKING) ? "true" : "false"); + + x_tag = switch_xml_add_child_d(x_flags, "has_video", count++); + switch_xml_set_txt_d(x_tag, switch_channel_test_flag(switch_core_session_get_channel(member->session), CF_VIDEO) ? "true" : "false"); + + x_tag = switch_xml_add_child_d(x_flags, "has_floor", count++); + switch_xml_set_txt_d(x_tag, (member == member->conference->floor_holder) ? "true" : "false"); + + } + + switch_mutex_unlock(conference->member_mutex); +} +static switch_status_t conf_api_sub_xml_list(conference_obj_t *conference, switch_stream_handle_t *stream, int argc, char **argv) +{ + int count = 0; + switch_hash_index_t *hi; + void *val; + switch_xml_t x_conference, x_conferences; + int off = 0; + char *ebuf; + + x_conferences = switch_xml_new("conferences"); + switch_assert(x_conferences); + + if (conference == NULL) { + for (hi = switch_hash_first(NULL, globals.conference_hash); hi; hi = switch_hash_next(hi)) { + switch_hash_this(hi, NULL, NULL, &val); + conference = (conference_obj_t *) val; + + x_conference = switch_xml_add_child_d(x_conferences, "conference", off++); + switch_assert(conference); + + count++; + conference_xlist(conference, x_conference, off); + + } + } else { + x_conference = switch_xml_add_child_d(x_conferences, "conference", off++); + switch_assert(conference); + count++; + conference_xlist(conference, x_conference, off); + } + + + ebuf = switch_xml_toxml(x_conferences, SWITCH_TRUE); + + stream->write_function(stream, "%s", ebuf); + + switch_xml_free(x_conferences); + free(ebuf); + + return SWITCH_STATUS_SUCCESS; +} + static switch_status_t conf_api_sub_play(conference_obj_t *conference, switch_stream_handle_t *stream, int argc, char **argv) { int ret_status = SWITCH_STATUS_GENERR; @@ -3578,6 +3714,7 @@ /* Entries in this list should be kept in sync with the enum above */ static api_command_t conf_api_sub_commands[] = { {"list", (void_fn_t) &conf_api_sub_list, CONF_API_SUB_ARGS_SPLIT, "<confname> list [delim <string>]"}, + {"xml_list", (void_fn_t) &conf_api_sub_xml_list, CONF_API_SUB_ARGS_SPLIT, "<confname> xml_list"}, {"energy", (void_fn_t) &conf_api_sub_energy, CONF_API_SUB_MEMBER_TARGET, "<confname> energy <member_id|all|last> [<newval>]"}, {"volume_in", (void_fn_t) &conf_api_sub_volume_in, CONF_API_SUB_MEMBER_TARGET, @@ -3778,6 +3915,8 @@ /* special case the list command, because it doesn't require a conference argument */ if (strcasecmp(argv[0], "list") == 0) { conf_api_sub_list(NULL, stream, argc, argv); + } else if (strcasecmp(argv[0], "xml_list") == 0) { + conf_api_sub_xml_list(NULL, stream, argc, argv); } else if (strcasecmp(argv[0], "help") == 0 || strcasecmp(argv[0], "commands") == 0) { stream->write_function(stream, "%s\n", api_syntax); } else if (argv[1] && strcasecmp(argv[1], "dial") == 0) {

1 0

[commit] r11061 - freeswitch/trunk/src
by FreeSWITCH SVN 03 Jan '09

03 Jan '09

Author: anthm Date: Fri Jan 2 22:10:11 2009 New Revision: 11061 Log: fix issue MODENDP-165 Modified: freeswitch/trunk/src/switch_ivr_bridge.c freeswitch/trunk/src/switch_ivr_originate.c Modified: freeswitch/trunk/src/switch_ivr_bridge.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_bridge.c (original) +++ freeswitch/trunk/src/switch_ivr_bridge.c Fri Jan 2 22:10:11 2009 @@ -829,8 +829,8 @@ switch_channel_set_variable(peer_channel, SWITCH_BRIDGE_VARIABLE, switch_core_session_get_uuid(session)); if (!switch_channel_media_ready(caller_channel) || - !(switch_channel_test_flag(peer_channel, CF_ANSWERED) || switch_channel_test_flag(peer_channel, CF_EARLY_MEDIA))) { - if ((status = switch_ivr_wait_for_answer(session, peer_session)) != SWITCH_STATUS_SUCCESS) { + (!switch_channel_test_flag(peer_channel, CF_ANSWERED) && !switch_channel_test_flag(peer_channel, CF_EARLY_MEDIA))) { + if ((status = switch_ivr_wait_for_answer(session, peer_session)) != SWITCH_STATUS_SUCCESS || !switch_channel_ready(caller_channel)) { switch_channel_state_t w_state = switch_channel_get_state(caller_channel); switch_channel_hangup(peer_channel, SWITCH_CAUSE_ALLOTTED_TIMEOUT); if (w_state < CS_HANGUP && w_state != CS_ROUTING && w_state != CS_PARK && @@ -850,6 +850,7 @@ switch_core_session_rwunlock(peer_session); goto done; } + if (switch_channel_test_flag(peer_channel, CF_ANSWERED) && !switch_channel_test_flag(caller_channel, CF_ANSWERED)) { switch_channel_answer(caller_channel); } Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Fri Jan 2 22:10:11 2009 @@ -330,7 +330,7 @@ } if ((switch_channel_test_flag(peer_channel, CF_ANSWERED) || switch_channel_test_flag(peer_channel, CF_EARLY_MEDIA))) { - return SWITCH_STATUS_SUCCESS; + goto end; } switch_zmalloc(write_frame.data, SWITCH_RECOMMENDED_BUFFER_SIZE); @@ -551,7 +551,9 @@ switch_safe_free(write_frame.data); - return status; + end: + + return (!caller_channel || switch_channel_ready(caller_channel)) ? status : SWITCH_STATUS_FALSE; } static void process_import(switch_core_session_t *session, switch_channel_t *peer_channel)

1 0

[commit] r11060 - freeswitch/trunk/src/mod/event_handlers/mod_event_socket
by FreeSWITCH SVN 02 Jan '09

02 Jan '09

Author: mikej Date: Fri Jan 2 15:55:09 2009 New Revision: 11060 Log: add debug logs Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Fri Jan 2 15:55:09 2009 @@ -778,6 +778,7 @@ stream->write_function(stream, " <reply type=\"success\">Listener %u Created</reply>\n", listener->id); xmlize_listener(listener, stream); stream->write_function(stream, "</data>\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Creating event-sink listener [%u]\n", listener->id); goto end; } else if (!strcasecmp(wcmd, "destroy-listener")) { @@ -789,6 +790,7 @@ } if ((listener = find_listener(idl))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Destroying event-sink listener [%u]\n", idl); remove_listener(listener); stream->write_function(stream, "<data>\n <reply type=\"success\">listener %u destroyed</reply>\n", listener->id); xmlize_listener(listener, stream); @@ -796,6 +798,7 @@ expire_listener(&listener); goto end; } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Request to destroy unknown event-sink listener [%u]\n", idl); stream->write_function(stream, "<data><reply type=\"error\">Can't find listener</reply></data>\n"); goto end; }

1 0

[commit] r11059 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 02 Jan '09

02 Jan '09

Author: mikej Date: Fri Jan 2 14:58:36 2009 New Revision: 11059 Log: better error message Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c 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 Fri Jan 2 14:58:36 2009 @@ -1252,8 +1252,8 @@ break; default: sofia_private->gateway->state = REG_STATE_FAILED; - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%s Registration Failed with status %d. failure #%d\n", - sofia_private->gateway->name, status, ++sofia_private->gateway->failures); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%s Registration Failed with status %s [%d]. failure #%d\n", + sofia_private->gateway->name, switch_str_nil(phrase), status, ++sofia_private->gateway->failures); break; } if (ostate != sofia_private->gateway->state) {

1 0

[commit] r11058 - freeswitch/trunk/docs
by FreeSWITCH SVN 02 Jan '09

02 Jan '09

Author: mcollins Date: Fri Jan 2 13:35:59 2009 New Revision: 11058 Log: Bump Doxygen version to 1.0.2 Modified: freeswitch/trunk/docs/Doxygen.conf Modified: freeswitch/trunk/docs/Doxygen.conf ============================================================================== --- freeswitch/trunk/docs/Doxygen.conf (original) +++ freeswitch/trunk/docs/Doxygen.conf Fri Jan 2 13:35:59 2009 @@ -4,7 +4,7 @@ # Project related configuration options #--------------------------------------------------------------------------- PROJECT_NAME = FreeSWITCH -PROJECT_NUMBER = 1.0.1 +PROJECT_NUMBER = 1.0.2 OUTPUT_DIRECTORY = . CREATE_SUBDIRS = NO OUTPUT_LANGUAGE = English

1 0

[commit] r11057 - freeswitch/trunk/libs/esl
by FreeSWITCH SVN 02 Jan '09

02 Jan '09

Author: silik0n Date: Fri Jan 2 12:40:26 2009 New Revision: 11057 Log: why didnt we do this earlier Modified: freeswitch/trunk/libs/esl/fs_cli.c Modified: freeswitch/trunk/libs/esl/fs_cli.c ============================================================================== --- freeswitch/trunk/libs/esl/fs_cli.c (original) +++ freeswitch/trunk/libs/esl/fs_cli.c Fri Jan 2 12:40:26 2009 @@ -285,6 +285,17 @@ goto end; } + + if (!strncasecmp(cmd, "debug", 5)){ + int tmp_debug = atoi(cmd+6); + if (tmp_debug > -1 && tmp_debug < 8){ + esl_global_set_default_logger(tmp_debug); + printf("fs_cli debug level set to %d\n", tmp_debug); + } else { + printf("fs_cli debug level must be 0 - 7\n"); + } + goto end; + } printf("Unknown command [%s]\n", cmd); } else {

1 0

[commit] r11056 - freeswitch/trunk/src/mod/event_handlers/mod_event_socket
by FreeSWITCH SVN 02 Jan '09

02 Jan '09

Author: anthm Date: Fri Jan 2 12:39:31 2009 New Revision: 11056 Log: tweak Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Fri Jan 2 12:39:31 2009 @@ -719,6 +719,7 @@ listener->last_flush = switch_timestamp(NULL); if (events) { + char delim = ','; if (switch_stristr("xml", format)) { listener->format = EVENT_FORMAT_XML; @@ -727,11 +728,15 @@ } edup = strdup(events); - + + if (strchr(edup, ' ')) { + delim = ' '; + } + for (cur = edup; cur; count++) { switch_event_types_t type; - if ((next = strchr(cur, ' '))) { + if ((next = strchr(cur, delim))) { *next++ = '\0'; }

1 0