April 2008 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r8095 - freeswitch/trunk/libs/curl/lib
by Freeswitch SVN 12 Apr '08

12 Apr '08

Author: anthm Date: Sat Apr 12 01:34:07 2008 New Revision: 8095 Removed: freeswitch/trunk/libs/curl/lib/config.h.in Log: remove generated file. will require re-bootstrap/configure, sorry

1 0

[commit] r8094 - freeswitch/trunk/libs/xmlrpc-c
by Freeswitch SVN 12 Apr '08

12 Apr '08

Author: anthm Date: Sat Apr 12 01:13:58 2008 New Revision: 8094 Removed: freeswitch/trunk/libs/xmlrpc-c/xmlrpc_amconfig.h.in Log: remove generated file. will require re-bootstrap/configure, sorry

1 0

[commit] r8093 - freeswitch/trunk/src/mod/applications/mod_dptools
by Freeswitch SVN 12 Apr '08

12 Apr '08

Author: mikej Date: Sat Apr 12 00:59:15 2008 New Revision: 8093 Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Log: duplicate definition 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 Sat Apr 12 00:59:15 2008 @@ -208,11 +208,11 @@ } -#define eavesdrop_SYNTAX "<uuid>" +#define threeway_SYNTAX "<uuid>" SWITCH_STANDARD_APP(three_way_function) { if (switch_strlen_zero(data)) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Usage: %s\n", eavesdrop_SYNTAX); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Usage: %s\n", threeway_SYNTAX); } else { switch_ivr_eavesdrop_session(session, data, ED_MUX_READ | ED_MUX_WRITE); } @@ -1911,7 +1911,7 @@ SWITCH_ADD_APP(app_interface, "bind_meta_app", "Bind a key to an application", "Bind a key to an application", dtmf_bind_function, BIND_SYNTAX, SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "intercept", "intercept", "intercept", intercept_function, INTERCEPT_SYNTAX, SAF_NONE); SWITCH_ADD_APP(app_interface, "eavesdrop", "eavesdrop on a uuid", "eavesdrop on a uuid", eavesdrop_function, eavesdrop_SYNTAX, SAF_NONE); - SWITCH_ADD_APP(app_interface, "three_way", "three way call with a uuid", "three way call with a uuid", three_way_function, eavesdrop_SYNTAX, SAF_NONE); + SWITCH_ADD_APP(app_interface, "three_way", "three way call with a uuid", "three way call with a uuid", three_way_function, threeway_SYNTAX, SAF_NONE); SWITCH_ADD_APP(app_interface, "set_user", "Set a User", "Set a User", set_user_function, SET_USER_SYNTAX, SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "stop_dtmf", "stop inband dtmf", "Stop detecting inband dtmf.", stop_dtmf_session_function, "", SAF_NONE); SWITCH_ADD_APP(app_interface, "start_dtmf", "Detect dtmf", "Detect inband dtmf on the session", dtmf_session_function, "", SAF_NONE);

1 0

[commit] r8092 - in freeswitch/trunk/src/mod/applications: mod_dptools mod_enum
by Freeswitch SVN 11 Apr '08

11 Apr '08

Author: anthm Date: Fri Apr 11 19:26:47 2008 New Revision: 8092 Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c Log: update usage syntax 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 Fri Apr 11 19:26:47 2008 @@ -140,7 +140,7 @@ return 1; } -#define eavesdrop_SYNTAX "<uuid>" +#define eavesdrop_SYNTAX "[all | <uuid>]" SWITCH_STANDARD_APP(eavesdrop_function) { if (switch_strlen_zero(data)) { Modified: freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c (original) +++ freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c Fri Apr 11 19:26:47 2008 @@ -842,7 +842,7 @@ *module_interface = switch_loadable_module_create_module_interface(pool, modname); SWITCH_ADD_API(api_interface, "enum", "ENUM", enum_function, ""); SWITCH_ADD_API(api_interface, "enum_auto", "ENUM", enum_api, ""); - SWITCH_ADD_APP(app_interface, "enum", "Perform an ENUM lookup", "Perform an ENUM lookup", enum_app_function, "<number> [<root>]", SAF_SUPPORT_NOMEDIA); + SWITCH_ADD_APP(app_interface, "enum", "Perform an ENUM lookup", "Perform an ENUM lookup", enum_app_function, "[reload | <number> [<root>]]", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_DIALPLAN(dp_interface, "enum", enum_dialplan_hunt);

1 0

[commit] r8091 - in freeswitch/trunk/src: . mod/applications/mod_conference mod/applications/mod_dptools mod/applications/mod_fifo mod/endpoints/mod_sofia
by Freeswitch SVN 11 Apr '08

11 Apr '08

Author: anthm Date: Fri Apr 11 18:35:30 2008 New Revision: 8091 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c freeswitch/trunk/src/switch_ivr_async.c Log: add presence for conference and dial an eavesdrop 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 Fri Apr 11 18:35:30 2008 @@ -582,8 +582,8 @@ switch_event_add_header(event, SWITCH_STACK_BOTTOM, "event_count", "%d", EC++); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "unique-id", "%s", conference->name); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "channel-state", "%s", "CS_RING"); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "answer-state", "%s", "confirmed"); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "call-direction", "%s", "inbound"); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "answer-state", "%s", conference->count == 1 ? "early" : "confirmed"); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "call-direction", "%s", conference->count == 1 ? "outbound" : "inbound"); switch_event_fire(&event); } @@ -630,7 +630,7 @@ } if (test_eflag(conference, EFLAG_ADD_MEMBER) && - switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { conference_add_event_member_data(member, event); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "add-member"); switch_event_fire(&event); @@ -724,8 +724,8 @@ switch_event_add_header(event, SWITCH_STACK_BOTTOM, "event_count", "%d", EC++); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "unique-id", "%s", conference->name); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "channel-state", "%s", "CS_RING"); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "answer-state", "%s", "confirmed"); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "call-direction", "%s", "inbound"); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "answer-state", "%s", conference->count == 1 ? "early" : "confirmed"); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "call-direction", "%s", conference->count == 1 ? "outbound" : "inbound"); switch_event_fire(&event); } @@ -746,7 +746,7 @@ } if (test_eflag(conference, EFLAG_DEL_MEMBER) && - switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { conference_add_event_member_data(member, event); conference_add_event_data(conference, event); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "del-member"); @@ -1251,7 +1251,7 @@ } if (test_eflag(member->conference, EFLAG_ENERGY_LEVEL) && - switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { conference_add_event_member_data(member, event); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "energy-level"); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "New-Level", "%d", member->energy_level); @@ -1274,7 +1274,7 @@ member->energy_level = member->conference->energy_level; if (test_eflag(member->conference, EFLAG_ENERGY_LEVEL) && - switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { conference_add_event_member_data(member, event); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "energy-level"); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "New-Level", "%d", member->energy_level); @@ -1300,7 +1300,7 @@ } if (test_eflag(member->conference, EFLAG_ENERGY_LEVEL) && - switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { conference_add_event_member_data(member, event); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "energy-level"); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "New-Level", "%d", member->energy_level); @@ -1324,7 +1324,7 @@ switch_normalize_volume(member->volume_out_level); if (test_eflag(member->conference, EFLAG_VOLUME_LEVEL) && - switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { conference_add_event_member_data(member, event); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "volume-level"); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "New-Level", "%d", member->volume_out_level); @@ -1347,7 +1347,7 @@ member->volume_out_level = 0; if (test_eflag(member->conference, EFLAG_VOLUME_LEVEL) && - switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { conference_add_event_member_data(member, event); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "volume-level"); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "New-Level", "%d", member->volume_out_level); @@ -1371,7 +1371,7 @@ switch_normalize_volume(member->volume_out_level); if (test_eflag(member->conference, EFLAG_VOLUME_LEVEL) && - switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { conference_add_event_member_data(member, event); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "volume-level"); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "New-Level", "%d", member->volume_out_level); @@ -1395,7 +1395,7 @@ switch_normalize_volume(member->volume_in_level); if (test_eflag(member->conference, EFLAG_GAIN_LEVEL) && - switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { conference_add_event_member_data(member, event); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "gain-level"); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "New-Level", "%d", member->volume_in_level); @@ -1418,7 +1418,7 @@ member->volume_in_level = 0; if (test_eflag(member->conference, EFLAG_GAIN_LEVEL) && - switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { conference_add_event_member_data(member, event); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "gain-level"); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "New-Level", "%d", member->volume_in_level); @@ -1442,7 +1442,7 @@ switch_normalize_volume(member->volume_in_level); if (test_eflag(member->conference, EFLAG_GAIN_LEVEL) && - switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { conference_add_event_member_data(member, event); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "gain-level"); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "New-Level", "%d", member->volume_in_level); @@ -1458,7 +1458,7 @@ { switch_event_t *event; if (test_eflag(member->conference, EFLAG_DTMF) && - switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { conference_add_event_member_data(member, event); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "dtmf"); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "DTMF-Key", "%s", action->binded_dtmf); @@ -1515,7 +1515,7 @@ switch_clear_flag_locked(member, MFLAG_TALKING); if (test_eflag(member->conference, EFLAG_STOP_TALKING) && - switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { conference_add_event_member_data(member, event); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "stop-talking"); switch_event_fire(&event); @@ -1567,7 +1567,7 @@ !switch_test_flag(member->conference->floor_holder, MFLAG_TALKING) || member->score > member->conference->floor_holder->score + 200) { if (test_eflag(member->conference, EFLAG_FLOOR_CHANGE) && - switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { conference_add_event_member_data(member, event); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "floor-change"); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Old-ID", "%d", @@ -1581,7 +1581,7 @@ switch_mutex_unlock(member->conference->member_mutex); if (test_eflag(member->conference, EFLAG_START_TALKING) && - switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { conference_add_event_member_data(member, event); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "start-talking"); switch_event_fire(&event); @@ -1599,7 +1599,7 @@ switch_clear_flag_locked(member, MFLAG_TALKING); if (test_eflag(member->conference, EFLAG_STOP_TALKING) && - switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { conference_add_event_member_data(member, event); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "stop-talking"); switch_event_fire(&event); @@ -2681,7 +2681,7 @@ stream->write_function(stream, "OK mute %u\n", member->id); } if (test_eflag(member->conference, EFLAG_MUTE_MEMBER) && - switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { conference_add_event_member_data(member, event); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "mute-member"); switch_event_fire(&event); @@ -2709,7 +2709,7 @@ conference_member_say(member, msg, 0); } if (test_eflag(member->conference, EFLAG_UNMUTE_MEMBER) && - switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { conference_add_event_member_data(member, event); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "unmute-member"); switch_event_fire(&event); @@ -2771,7 +2771,7 @@ stream->write_function(stream, "OK kicked %u\n", member->id); } if (test_eflag(member->conference, EFLAG_KICK_MEMBER) && - switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { conference_add_event_member_data(member, event); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "kick-member"); switch_event_fire(&event); @@ -2805,7 +2805,7 @@ } if (test_eflag(member->conference, EFLAG_DTMF_MEMBER) && - switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { conference_add_event_member_data(member, event); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "dtmf-member"); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Digits", "%s", dtmf); @@ -2830,7 +2830,7 @@ stream->write_function(stream, "Energy %u = %d\n", member->id, member->energy_level); } if (test_eflag(member->conference, EFLAG_ENERGY_LEVEL_MEMBER) && - data && switch_event_create_subclass(& event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + data && switch_event_create_subclass(& event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { conference_add_event_member_data(member, event); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "energy-level-member"); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Energy-Level", "%d", member->energy_level); @@ -2856,7 +2856,7 @@ stream->write_function(stream, "Volume IN %u = %d\n", member->id, member->volume_in_level); } if (test_eflag(member->conference, EFLAG_VOLUME_IN_MEMBER) && - data && switch_event_create_subclass(& event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + data && switch_event_create_subclass(& event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { conference_add_event_member_data(member, event); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "volume-in-member"); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Volume-Level", "%u", member->volume_in_level); @@ -2882,7 +2882,7 @@ stream->write_function(stream, "Volume OUT %u = %d\n", member->id, member->volume_out_level); } if (test_eflag(member->conference, EFLAG_VOLUME_OUT_MEMBER) && data && - switch_event_create_subclass(& event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + switch_event_create_subclass(& event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { conference_add_event_member_data(member, event); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "volume-out-member"); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Volume-Level", "%u", member->volume_out_level); @@ -2972,7 +2972,7 @@ if (conference_play_file(conference, argv[2], 0, NULL, async) == SWITCH_STATUS_SUCCESS) { stream->write_function(stream, "(play) Playing file %s\n", argv[2]); if (test_eflag(conference, EFLAG_PLAY_FILE) && - switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { conference_add_event_data(conference, event); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "play-file"); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "File", "%s", argv[2]); @@ -2990,7 +2990,7 @@ if (conference_member_play_file(member, argv[2], 0) == SWITCH_STATUS_SUCCESS) { stream->write_function(stream, "(play) Playing file %s to member %u\n", argv[2], id); if (test_eflag(conference, EFLAG_PLAY_FILE_MEMBER) && - switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { conference_add_event_member_data(member, event); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "play-file-member"); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "File", "%s", argv[2]); @@ -3024,7 +3024,7 @@ stream->write_function(stream, "(say) OK\n"); if (test_eflag(conference, EFLAG_SPEAK_TEXT) && - switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { conference_add_event_data(conference, event); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "speak-text"); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Text", "%s", text); @@ -3083,7 +3083,7 @@ stream->write_function(stream, "(saymember) OK\n"); if (test_eflag(member->conference, EFLAG_SPEAK_TEXT_MEMBER) && - switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { conference_add_event_member_data(member, event); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "speak-text-member"); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Text", "%s", text); @@ -3212,7 +3212,7 @@ switch_set_flag_locked(conference, CFLAG_LOCKED); stream->write_function(stream, "OK %s locked\n", argv[0]); if (test_eflag(conference, EFLAG_LOCK) && - switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { conference_add_event_data(conference, event); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "lock"); switch_event_fire(&event); @@ -3235,7 +3235,7 @@ switch_clear_flag_locked(conference, CFLAG_LOCKED); stream->write_function(stream, "OK %s unlocked\n", argv[0]); if (test_eflag(conference, EFLAG_UNLOCK) && - switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { conference_add_event_data(conference, event); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "unlock"); switch_event_fire(&event); @@ -3395,7 +3395,7 @@ /* tell them what happened */ if (test_eflag(conference, EFLAG_TRANSFER) && - switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { conference_add_event_member_data(member, event); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Old-Conference-Name", "%s", conference->name); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "New-Conference-Name", "%s", argv[3]); @@ -3891,7 +3891,7 @@ call->session, call->bridgeto, call->timeout, call->flags, call->cid_name, call->cid_num, &cause); if (test_eflag(call->conference, EFLAG_BGDIAL_RESULT) && - switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { + switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { conference_add_event_data(call->conference, event); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "bgdial-result"); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Result", "%s", switch_channel_cause2str(cause)); @@ -5125,8 +5125,8 @@ switch_event_add_header(event, SWITCH_STACK_BOTTOM, "event_count", "%d", EC++); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "unique-id", "%s", conf_name); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "channel-state", "%s", "CS_RING"); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "answer-state", "%s", "confirmed"); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "call-direction", "%s", "inbound"); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "answer-state", "%s", conference->count == 1 ? "early" : "confirmed"); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "call-direction", "%s", conference->count == 1 ? "outbound" : "inbound"); switch_event_fire(&event); } } else if (switch_event_create(&event, SWITCH_EVENT_PRESENCE_IN) == SWITCH_STATUS_SUCCESS) { 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 Fri Apr 11 18:35:30 2008 @@ -121,13 +121,89 @@ switch_ivr_intercept_session(session, data); } +#define MAX_SPY 3000 +struct e_data { + char *uuid_list[MAX_SPY]; + int total; +}; + +static int e_callback(void *pArg, int argc, char **argv, char **columnNames) +{ + char *uuid = argv[0]; + struct e_data *e_data = (struct e_data *) pArg; + + if (uuid && e_data) { + e_data->uuid_list[e_data->total++] = strdup(uuid); + return 0; + } + + return 1; +} + #define eavesdrop_SYNTAX "<uuid>" SWITCH_STANDARD_APP(eavesdrop_function) { if (switch_strlen_zero(data)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Usage: %s\n", eavesdrop_SYNTAX); } else { - switch_ivr_eavesdrop_session(session, data, ED_DTMF); + if (!strcasecmp((char *)data, "all")) { + switch_core_db_t *db = switch_core_db_handle(); + char *errmsg = NULL; + struct e_data e_data = {{ 0 }}; + char *sql = switch_mprintf("select uuid from channels where uuid != '%q'", switch_core_session_get_uuid(session)); + switch_channel_t *channel = switch_core_session_get_channel(session); + const char *file = NULL; + int x = 0; + char buf[2] = ""; + switch_size_t buflen = sizeof(buf); + char terminator; + + while(switch_channel_ready(channel)) { + for(x = 0; x < MAX_SPY; x++) { + switch_safe_free(e_data.uuid_list[x]); + } + e_data.total = 0; + switch_core_db_exec(db, sql, e_callback, &e_data, &errmsg); + if (errmsg) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Error: %s\n", errmsg); + switch_core_db_free(errmsg); + if ((file = switch_channel_get_variable(channel, "eavesdrop_indicate_failed"))) { + switch_ivr_play_file(session, NULL, file, NULL); + } + switch_ivr_collect_digits_count(session, buf, buflen, 1, "*", &terminator, 5000, 0, 0); + continue; + } + if (e_data.total) { + for (x = 0; x < e_data.total && switch_channel_ready(channel); x++) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Spy: %s\n", e_data.uuid_list[x]); + if ((file = switch_channel_get_variable(channel, "eavesdrop_indicate_new"))) { + switch_ivr_play_file(session, NULL, file, NULL); + } + if (switch_ivr_eavesdrop_session(session, e_data.uuid_list[x], ED_DTMF) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Spy: %s Failed\n", e_data.uuid_list[x]); + if ((file = switch_channel_get_variable(channel, "eavesdrop_indicate_failed"))) { + switch_ivr_play_file(session, NULL, file, NULL); + } + switch_ivr_collect_digits_count(session, buf, buflen, 1, "*", &terminator, 5000, 0, 0); + } + } + } else { + if ((file = switch_channel_get_variable(channel, "eavesdrop_indicate_idle"))) { + switch_ivr_play_file(session, NULL, file, NULL); + } + switch_ivr_collect_digits_count(session, buf, buflen, 1, "*", &terminator, 2000, 0, 0); + } + } + + for(x = 0; x < MAX_SPY; x++) { + switch_safe_free(e_data.uuid_list[x]); + } + + switch_core_db_close(db); + + } else { + switch_ivr_eavesdrop_session(session, data, ED_DTMF); + } } } 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 Fri Apr 11 18:35:30 2008 @@ -81,10 +81,8 @@ moh_a = switch_channel_get_variable(channel, "hold_music"); } } - - switch_ivr_soft_hold(session, "0", moh_a, moh_b); - + switch_ivr_soft_hold(session, "0", moh_a, moh_b); return SWITCH_STATUS_IGNORE; } } 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 Fri Apr 11 18:35:30 2008 @@ -482,7 +482,7 @@ *next++ = '\0'; } } - + if (!switch_strlen_zero(this) && (!last || strcmp(last, this))) { sofia_glue_execute_sql(profile, &this, SWITCH_FALSE); last = this; Modified: freeswitch/trunk/src/switch_ivr_async.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_async.c (original) +++ freeswitch/trunk/src/switch_ivr_async.c Fri Apr 11 18:35:30 2008 @@ -497,17 +497,23 @@ switch_codec_t *read_codec = switch_core_session_get_read_codec(session); if ((tsession = switch_core_session_locate(uuid))) { - struct eavesdrop_pvt *ep; + struct eavesdrop_pvt *ep = NULL; switch_media_bug_t *bug = NULL; switch_channel_t *tchannel = switch_core_session_get_channel(tsession); switch_frame_t *read_frame, write_frame = { 0 }; switch_codec_t codec = {0}; int16_t buf[SWITCH_RECOMMENDED_BUFFER_SIZE/2]; switch_codec_t *tread_codec = switch_core_session_get_read_codec(tsession); - uint32_t tlen = tread_codec->implementation->bytes_per_frame; + uint32_t tlen; + + if (!switch_channel_media_ready(channel)) { + goto end; + } ep = switch_core_session_alloc(session, sizeof(*ep)); + tlen = tread_codec->implementation->bytes_per_frame; + switch_channel_pre_answer(channel); if (switch_core_codec_init(&codec, @@ -520,7 +526,7 @@ NULL, switch_core_session_get_pool(session)) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot init codec\n"); switch_core_session_rwunlock(tsession); - return status; + goto end; } switch_core_session_set_read_codec(session, &codec); @@ -599,6 +605,8 @@ switch_clear_flag(ep, ED_MUX_READ); switch_clear_flag(ep, ED_MUX_WRITE); break; + case '*': + goto end; default: z = 0; break; @@ -657,17 +665,19 @@ switch_core_media_bug_remove(tsession, &bug); } - if (ep->buffer) { - switch_buffer_destroy(&ep->buffer); - } - - if (ep->r_buffer) { - switch_buffer_destroy(&ep->r_buffer); - } - - if (ep->w_buffer) { - switch_buffer_destroy(&ep->w_buffer); - } + if (ep) { + if (ep->buffer) { + switch_buffer_destroy(&ep->buffer); + } + + if (ep->r_buffer) { + switch_buffer_destroy(&ep->r_buffer); + } + + if (ep->w_buffer) { + switch_buffer_destroy(&ep->w_buffer); + } + } switch_core_session_rwunlock(tsession); status = SWITCH_STATUS_SUCCESS;

1 0

[commit] r8090 - freeswitch/trunk/conf
by Freeswitch SVN 11 Apr '08

11 Apr '08

Author: brian Date: Fri Apr 11 16:12:41 2008 New Revision: 8090 Modified: freeswitch/trunk/conf/vars.xml Log: set hold_music as a global Modified: freeswitch/trunk/conf/vars.xml ============================================================================== --- freeswitch/trunk/conf/vars.xml (original) +++ freeswitch/trunk/conf/vars.xml Fri Apr 11 16:12:41 2008 @@ -4,6 +4,7 @@ <X-PRE-PROCESS cmd="set" data="sound_prefix=$${base_dir}/sounds/en/us/callie"/> <X-PRE-PROCESS cmd="set" data="domain=$${local_ip_v4}"/> <X-PRE-PROCESS cmd="set" data="moh_uri=local_stream://moh"/> + <X-PRE-PROCESS cmd="set" data="hold_music=local_stream://moh"/> <!-- xmpp_client_profile and xmpp_server_profile xmpp_client_profile can be any string. xmpp_server_profile is appended to "dingaling_" to form the database name

1 0

[commit] r8089 - in freeswitch/trunk/src/mod: applications/mod_fifo endpoints/mod_sofia
by Freeswitch SVN 11 Apr '08

11 Apr '08

Author: anthm Date: Fri Apr 11 15:41:24 2008 New Revision: 8089 Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Log: tweak parking bug 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 Fri Apr 11 15:41:24 2008 @@ -329,9 +329,7 @@ node = create_node(node_name, 0); } - switch_mutex_lock(node->mutex); send_presence(node); - switch_mutex_unlock(node->mutex); switch_mutex_unlock(globals.mutex); @@ -498,8 +496,9 @@ switch_mutex_lock(node->mutex); node->caller_count++; - send_presence(node); + switch_core_hash_insert(node->caller_hash, uuid, session); + if ((pri = switch_channel_get_variable(channel, "fifo_priority"))) { p = atoi(pri); @@ -545,6 +544,8 @@ cd.next = switch_timestamp(NULL) + cd.freq; } + send_presence(node); + while(switch_channel_ready(channel)) { switch_input_args_t args = { 0 }; char buf[25] = ""; @@ -566,7 +567,9 @@ if ((serviced_uuid = switch_channel_get_variable(channel, "fifo_serviced_uuid"))) { break; } - + + switch_core_session_flush_private_events(session); + if (moh) { switch_ivr_play_file(session, NULL, moh, &args); } else { @@ -592,6 +595,7 @@ } } + switch_core_session_flush_private_events(session); if (switch_channel_ready(channel)) { if (announce) { @@ -621,9 +625,10 @@ switch_mutex_lock(node->mutex); node_remove_uuid(node, uuid); node->caller_count--; - send_presence(node); switch_core_hash_delete(node->caller_hash, uuid); switch_mutex_unlock(node->mutex); + send_presence(node); + } if (cd.do_orbit && cd.orbit_exten) { @@ -847,6 +852,7 @@ switch_channel_set_variable(other_channel, "fifo_serviced_by", my_id); switch_channel_set_variable(other_channel, "fifo_serviced_uuid", switch_core_session_get_uuid(session)); + switch_channel_set_flag(other_channel, CF_BREAK); while (switch_channel_ready(channel) && switch_channel_ready(other_channel) && switch_channel_test_flag(other_channel, CF_TAGGED)) { @@ -883,9 +889,9 @@ switch_channel_set_variable(other_channel, "fifo_status", "TALKING"); switch_channel_set_variable(other_channel, "fifo_timestamp", date); switch_channel_set_variable(other_channel, "fifo_target", switch_core_session_get_uuid(session)); - switch_mutex_lock(node->mutex); + send_presence(node); - switch_mutex_unlock(node->mutex); + if (record_template) { expanded = switch_channel_expand_variables(other_channel, record_template); @@ -912,10 +918,12 @@ switch_mutex_lock(node->mutex); node->caller_count--; - send_presence(node); switch_core_hash_delete(node->caller_hash, uuid); switch_mutex_unlock(node->mutex); + send_presence(node); switch_core_session_rwunlock(other_session); + + if (!do_wait) { done = 1; } 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 Fri Apr 11 15:41:24 2008 @@ -46,6 +46,7 @@ sofia_profile_t *profile; switch_event_t *event; switch_stream_handle_t stream; + char last_uuid[512]; }; switch_status_t sofia_presence_chat_send(char *proto, char *from, char *to, char *subject, char *body, char *hint) @@ -472,6 +473,7 @@ if (!switch_strlen_zero((char *)helper.stream.data)) { char *this = (char *)helper.stream.data; char *next = NULL; + char *last = NULL; do { if ((next = strchr(this, ';'))) { @@ -481,8 +483,9 @@ } } - if (!switch_strlen_zero(this)) { + if (!switch_strlen_zero(this) && (!last || strcmp(last, this))) { sofia_glue_execute_sql(profile, &this, SWITCH_FALSE); + last = this; } this = next; } while (this); @@ -934,8 +937,10 @@ ct = "application/dialog-info+xml"; } - if (!switch_strlen_zero(astate) && !switch_strlen_zero(uuid) && helper && helper->stream.data) { - helper->stream.write_function(&helper->stream, "update sip_dialogs set state='%s' where uuid='%s';\n", astate, uuid); + if (!switch_strlen_zero(astate) && !switch_strlen_zero(uuid) && helper && helper->stream.data && strcmp(helper->last_uuid, uuid)) { + helper->stream.write_function(&helper->stream, "update sip_dialogs set state='%s' where uuid='%s';", astate, uuid); + + switch_copy_string(helper->last_uuid, uuid, sizeof(helper->last_uuid)); }

1 0

[commit] r8088 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 11 Apr '08

11 Apr '08

Author: anthm Date: Fri Apr 11 13:07:06 2008 New Revision: 8088 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Log: fix ODBC issue 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 Fri Apr 11 13:07:06 2008 @@ -469,12 +469,25 @@ sofia_presence_sub_callback, &helper); - if (switch_strlen_zero((char *)helper.stream.data)) { - switch_safe_free(helper.stream.data); - } else { - char *ssql = (char *)helper.stream.data; - sofia_glue_execute_sql(profile, &ssql, SWITCH_TRUE); + if (!switch_strlen_zero((char *)helper.stream.data)) { + char *this = (char *)helper.stream.data; + char *next = NULL; + + do { + if ((next = strchr(this, ';'))) { + *next++ = '\0'; + while(*next == '\n' || *next == ' ' || *next == '\r') { + *next++ = '\0'; + } + } + + if (!switch_strlen_zero(this)) { + sofia_glue_execute_sql(profile, &this, SWITCH_FALSE); + } + this = next; + } while (this); } + switch_safe_free(helper.stream.data); helper.stream.data = NULL; } }

1 0

[commit] r8087 - freeswitch/trunk/src
by Freeswitch SVN 11 Apr '08

11 Apr '08

Author: anthm Date: Fri Apr 11 11:53:25 2008 New Revision: 8087 Modified: freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_event.c Log: small fix Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Fri Apr 11 11:53:25 2008 @@ -1581,11 +1581,6 @@ break; } - if (*(p-1) == '\\') { - q = p + 1; - continue; - } - if (*(p+1) != '{') { q = p + 1; continue; @@ -1599,6 +1594,7 @@ return (char *)in; } + nv = 0; olen = strlen(in) + 1; indup = strdup(in); Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Fri Apr 11 11:53:25 2008 @@ -1044,11 +1044,6 @@ break; } - if (*(p-1) == '\\') { - q = p + 1; - continue; - } - if (*(p+1) != '{') { q = p + 1; continue;

1 0

[commit] r8086 - in freeswitch/trunk/scripts/socket: . FreeSWITCH
by Freeswitch SVN 10 Apr '08

10 Apr '08

Author: mikej Date: Thu Apr 10 16:42:15 2008 New Revision: 8086 Modified: freeswitch/trunk/scripts/socket/FreeSWITCH/Client.pm freeswitch/trunk/scripts/socket/sock.pl Log: revert unintentional commit Modified: freeswitch/trunk/scripts/socket/FreeSWITCH/Client.pm ============================================================================== --- freeswitch/trunk/scripts/socket/FreeSWITCH/Client.pm (original) +++ freeswitch/trunk/scripts/socket/FreeSWITCH/Client.pm Thu Apr 10 16:42:15 2008 @@ -10,7 +10,6 @@ my $proto = shift; my $args = shift; my $class = ref($proto) || $proto; - $self->{_host} = $args->{-host} || "localhost"; $self->{_port} = $args->{-port} || 8021; $self->{_password} = $args->{-password} || undef; @@ -18,14 +17,10 @@ $self->{events} = []; my $me = bless $self,$class; - - - if (!$self->{_password}) { return $me; } if ($me->connect()) { - print Dumper $me; return $me; } else { return undef; Modified: freeswitch/trunk/scripts/socket/sock.pl ============================================================================== --- freeswitch/trunk/scripts/socket/sock.pl (original) +++ freeswitch/trunk/scripts/socket/sock.pl Thu Apr 10 16:42:15 2008 @@ -36,15 +36,6 @@ if ($r->{has_event}) { print Dumper $r->{event}; } - if ($r->{event}->{'event-name'} !~ /dtmf/i) { - $o = $fs->call_command("park"); - - print "Got DTMF $r->{event}->{'dtmf-digit'}\n"; - push @digits, $r->{event}->{'dtmf-digit'}; - print "Dialed: " . join("", @digits) . "\n"; - next; - } - if ($r->{event}->{'event-name'} !~ /execute/i) { printf "uuid: $data->{'unique-id'}\n"; $o = $fs->call_command("break");

1 0