October 2007 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r6064 - freeswitch/trunk/src/mod/endpoints/mod_opal
by Freeswitch SVN 27 Oct '07

27 Oct '07

Author: lzwierko Date: Sat Oct 27 06:31:08 2007 New Revision: 6064 Added: freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opalh323.cpp Log: Added: freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opalh323.cpp ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opalh323.cpp Sat Oct 27 06:31:08 2007 @@ -0,0 +1,201 @@ +/* + * mod_opalh323.cpp + * + * Opal-H323 gluer for Freeswitch + * This file implements fontend of OpalH323 module functions + * that is all functions that are used for communication + * between FreeSWITCH core and this module + * + * + * Copyright (c) 2007 Lukasz Zwierko (lzwierko(a)gmail.com) + * + * The contents of this file are subject to the Mozilla Public License + * Version 1.0 (the "License"); you may not use this file except in + * compliance with the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" + * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See + * the License for the specific language governing rights and limitations + * under the License. + * + * + * The Initial Developer of the Original Code is Lukasz Zwierko (lzwierko(a)gmail.com) + * + * Contributor(s): + * + * $Log: mod_opalh323.cpp,v $ + * + * Revision 1.00 2007/10/24 07:29:52 lzwierko + * Initial revision + */ + + +#include "mod_opalh323.h" + +/* All gluer frontend function for Freeswitch must be + * "C" functions. Because OPAL is written in C++ + * I implemented module gluer functions as extern "C" + */ +extern "C" { + +/* + * Loadable FreeSWITCH module functions declaration + */ +SWITCH_MODULE_LOAD_FUNCTION(mod_opalh323_load); +SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_opalh323_shutdown); +SWITCH_MODULE_DEFINITION(mod_opalh323, mod_opalh323_load, mod_opalh323_shutdown, NULL); + +/* + * Pointer to endpoint interface descriptor for this module + */ +switch_endpoint_interface_t *opalh323_endpoint_interface; + + +/* + * This function is called on module load + * It sets up: + * 1. frontend - interface to FreeSWITCH core + * 2. backend - inerface to OPAL core + * + */ +SWITCH_MODULE_LOAD_FUNCTION(mod_opalh323_load) +{ + /* indicate that the module should continue to be loaded */ + return SWITCH_STATUS_SUCCESS; +} + +/* + * This functionis called on module teardown + * It releases all internal resources, i.e. + * it dealocates OPAL core + * + */ +SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_sofia_shutdown) +{ + return SWITCH_STATUS_SUCCESS; +} + +/* + * IO routines handlers + */ +static switch_io_routines_t opalh323_io_routines = { + /*.outgoing_channel */ opalh323_outgoing_channel, + /*.read_frame */ opalh323_read_frame, + /*.write_frame */ opalh323_write_frame, + /*.kill_channel */ opalh323_kill_channel, + /*.waitfor_read */ opalh323_waitfor_read, + /*.waitfor_read */ opalh323_waitfor_write, + /*.send_dtmf */ opalh323_send_dtmf, + /*.receive_message */ opalh323_receive_message, + /*.receive_event */ opalh323_receive_event, + /*.state_change*/ opalh323_state_change, + /*.read_video_frame*/ opalh323_read_video_frame, + /*.write_video_frame*/ opalh323_write_video_frame +}; + +static switch_call_cause_t opalh323_outgoing_channel(switch_core_session_t *, switch_caller_profile_t *, switch_core_session_t **, switch_memory_pool_t **) +{ + return 0; +} + +static switch_status_t opalh323_read_frame(switch_core_session_t *, switch_frame_t **, int, switch_io_flag_t, int) +{ + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t opalh323_write_frame(switch_core_session_t *, switch_frame_t *, int, switch_io_flag_t, int) +{ + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t opalh323_kill_channel(switch_core_session_t *, int) +{ + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t opalh323_waitfor_read(switch_core_session_t *, int, int) +{ + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t opalh323_waitfor_write(switch_core_session_t *, int, int) +{ + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t opalh323_send_dtmf(switch_core_session_t *, char *) +{ + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t opalh323_receive_message(switch_core_session_t *, switch_core_session_message_t *) +{ + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t opalh323_receive_event(switch_core_session_t *, switch_event_t *) +{ + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t opalh323_state_change(switch_core_session_t *) +{ + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t opalh323_read_video_frame(switch_core_session_t *, switch_frame_t **, int, switch_io_flag_t, int) +{ + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t opalh323_write_video_frame(switch_core_session_t *, switch_frame_t *, int, switch_io_flag_t, int) +{ + return SWITCH_STATUS_SUCCESS; +} + +/* + * Event handlers + */ +static switch_state_handler_table_t opalh323_event_handlers = { + /*.on_init */ opalh323_on_init, + /*.on_ring */ opalh323_on_ring, + /*.on_execute */ opalh323_on_execute, + /*.on_hangup */ opalh323_on_hangup, + /*.on_loopback */ opalh323_on_loopback, + /*.on_transmit */ opalh323_on_transmit +}; + +static switch_status_t opalh323_on_init(switch_core_session_t *session) +{ + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t opalh323_on_ring(switch_core_session_t *session) +{ + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t opalh323_on_execute(switch_core_session_t *session) +{ + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t opalh323_on_hangup(switch_core_session_t *session) +{ + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t opalh323_on_loopback(switch_core_session_t *session) +{ + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t opalh323_on_transmit(switch_core_session_t *session) +{ + return SWITCH_STATUS_SUCCESS; +} + + + +}

1 0

[commit] r6063 - freeswitch/trunk/scripts/socket/freepy
by Freeswitch SVN 26 Oct '07

26 Oct '07

Author: greenlizard Date: Fri Oct 26 01:52:41 2007 New Revision: 6063 Modified: freeswitch/trunk/scripts/socket/freepy/__init__.py freeswitch/trunk/scripts/socket/freepy/fshelper.py Log: transfer calls Modified: freeswitch/trunk/scripts/socket/freepy/__init__.py ============================================================================== --- freeswitch/trunk/scripts/socket/freepy/__init__.py (original) +++ freeswitch/trunk/scripts/socket/freepy/__init__.py Fri Oct 26 01:52:41 2007 @@ -323,7 +323,21 @@ print "sending to fs: %s" % msg self.transport.write("%s\n\n" % msg) return req.getDeferred() - + + def transfer(self, uuid, dest_ext, legs, bgapi = False): + """ + transfer <uuid> [-bleg|-both] <dest-exten> + """ + if bgapi == True: + msg = "bgapi transfer %s %s %s" % (uuid, legs, dest_ext) + req = request.BgApiRequest() + else: + msg = "api transfer %s %s %s" % (uuid, legs, dest_ext) + req = request.ApiRequest() + self.requestq.put(req) + print "sending to fs: %s" % msg + self.transport.write("%s\n\n" % msg) + return req.getDeferred() def lineReceived(self, line): if not self.active_request: Modified: freeswitch/trunk/scripts/socket/freepy/fshelper.py ============================================================================== --- freeswitch/trunk/scripts/socket/freepy/fshelper.py (original) +++ freeswitch/trunk/scripts/socket/freepy/fshelper.py Fri Oct 26 01:52:41 2007 @@ -302,6 +302,17 @@ d.addCallback(broadcast_inner) return d + def transfer(self, uuid, dest_ext, legs="-both", bgapi=True): + """ + @legs -bleg|-both + """ + def transfer_inner(ignored): + df = self.freepyd.transfer(uuid, dest_ext, legs, bgapi) + return df + + d = self.connect() + d.addCallback(transfer_inner) + return d def sofia_profile_restart(self, profile_name, bgapi=True):

1 0

[commit] r6062 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 26 Oct '07

26 Oct '07

Author: mikej Date: Thu Oct 25 22:42:18 2007 New Revision: 6062 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: add conference_add_event_member_data and conference_add_event_data functions to add conference and member headers to events. Includes adding profile name to conference dtmf (and all the other events) fix for MODAPP-31 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 Thu Oct 25 22:42:18 2007 @@ -334,6 +334,31 @@ static switch_status_t conf_api_sub_unmute(conference_member_t * member, switch_stream_handle_t *stream, void *data); static switch_status_t conf_api_sub_deaf(conference_member_t * member, switch_stream_handle_t *stream, void *data); static switch_status_t conf_api_sub_undeaf(conference_member_t * member, switch_stream_handle_t *stream, void *data); +static switch_status_t conference_add_event_data(conference_obj_t * conference, switch_event_t *event); +static switch_status_t conference_add_event_member_data(conference_member_t * member, switch_event_t *event); + +static switch_status_t conference_add_event_data(conference_obj_t * conference, switch_event_t *event) +{ + switch_status_t status = SWITCH_STATUS_SUCCESS; + + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", "%s", conference->name); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Size", "%u", conference->count); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Profile-Name", "%s", conference->profile_name); + + return status; +} +static switch_status_t conference_add_event_member_data(conference_member_t * member, switch_event_t *event) +{ + switch_status_t status = SWITCH_STATUS_SUCCESS; + switch_channel_t *channel = switch_core_session_get_channel(member->session); + switch_channel_event_set_data(channel, event); + + status = conference_add_event_data(member->conference, event); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Member-ID", "%u", member->id); + + return status; +} + /* Return a Distinct ID # */ static uint32_t next_member_id(void) @@ -553,13 +578,8 @@ } if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { - switch_channel_t *channel = switch_core_session_get_channel(member->session); - switch_channel_event_set_data(channel, event); - - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", "%s", conference->name); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Member-ID", "%u", member->id); + conference_add_event_member_data(member, event); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "add-member"); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Size", "%u", conference->count); switch_event_fire(&event); } } @@ -658,13 +678,8 @@ } if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { - switch_channel_t *channel = switch_core_session_get_channel(member->session); - switch_channel_event_set_data(channel, event); - - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", "%s", conference->name); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Member-ID", "%u", member->id); + conference_add_event_member_data(member, event); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "del-member"); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Size", "%u", conference->count); switch_event_fire(&event); } } @@ -1062,11 +1077,7 @@ } if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { - switch_channel_t *channel = switch_core_session_get_channel(member->session); - - switch_channel_event_set_data(channel, event); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", "%s", member->conference->name); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Member-ID", "%u", member->id); + 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); switch_event_fire(&event); @@ -1090,11 +1101,7 @@ member->energy_level = member->conference->energy_level; if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { - switch_channel_t *channel = switch_core_session_get_channel(member->session); - - switch_channel_event_set_data(channel, event); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", "%s", member->conference->name); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Member-ID", "%u", member->id); + 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); switch_event_fire(&event); @@ -1120,11 +1127,7 @@ } if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { - switch_channel_t *channel = switch_core_session_get_channel(member->session); - - switch_channel_event_set_data(channel, event); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", "%s", member->conference->name); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Member-ID", "%u", member->id); + 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); switch_event_fire(&event); @@ -1151,11 +1154,7 @@ if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { - switch_channel_t *channel = switch_core_session_get_channel(member->session); - - switch_channel_event_set_data(channel, event); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", "%s", member->conference->name); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Member-ID", "%u", member->id); + 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); switch_event_fire(&event); @@ -1180,11 +1179,7 @@ if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { - switch_channel_t *channel = switch_core_session_get_channel(member->session); - - switch_channel_event_set_data(channel, event); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", "%s", member->conference->name); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Member-ID", "%u", member->id); + 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); switch_event_fire(&event); @@ -1210,11 +1205,7 @@ switch_normalize_volume(member->volume_out_level); if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { - switch_channel_t *channel = switch_core_session_get_channel(member->session); - - switch_channel_event_set_data(channel, event); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", "%s", member->conference->name); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Member-ID", "%u", member->id); + 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); switch_event_fire(&event); @@ -1240,11 +1231,7 @@ if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { - switch_channel_t *channel = switch_core_session_get_channel(member->session); - - switch_channel_event_set_data(channel, event); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", "%s", member->conference->name); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Member-ID", "%u", member->id); + 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); switch_event_fire(&event); @@ -1270,11 +1257,7 @@ member->volume_in_level = 0; if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { - switch_channel_t *channel = switch_core_session_get_channel(member->session); - - switch_channel_event_set_data(channel, event); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", "%s", member->conference->name); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Member-ID", "%u", member->id); + 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); switch_event_fire(&event); @@ -1301,11 +1284,7 @@ if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { - switch_channel_t *channel = switch_core_session_get_channel(member->session); - - switch_channel_event_set_data(channel, event); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", "%s", member->conference->name); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Member-ID", "%u", member->id); + 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); switch_event_fire(&event); @@ -1324,11 +1303,7 @@ { switch_event_t *event; if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { - switch_channel_t *channel = switch_core_session_get_channel(member->session); - - switch_channel_event_set_data(channel, event); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", "%s", member->conference->name); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Member-ID", "%u", member->id); + 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); switch_event_fire(&event); @@ -1407,9 +1382,7 @@ talking = 1; switch_set_flag_locked(member, MFLAG_FLUSH_BUFFER); if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { - switch_channel_event_set_data(channel, event); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", "%s", member->conference->name); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Member-ID", "%u", member->id); + conference_add_event_member_data(member, event); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "start-talking"); switch_event_fire(&event); } @@ -1426,9 +1399,7 @@ talking = 0; if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { - switch_channel_event_set_data(channel, event); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", "%s", member->conference->name); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Member-ID", "%u", member->id); + conference_add_event_member_data(member, event); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "stop-talking"); switch_event_fire(&event); } @@ -2502,11 +2473,7 @@ stream->write_function(stream, "OK mute %u\n", member->id); } if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { - switch_channel_t *channel = switch_core_session_get_channel(member->session); - switch_channel_event_set_data(channel, event); - - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", "%s", member->conference->name); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Member-ID", "%u", member->id); + conference_add_event_member_data(member, event); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "mute-member"); switch_event_fire(&event); } @@ -2537,11 +2504,7 @@ conference_member_say(member, msg, 0); } if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { - switch_channel_t *channel = switch_core_session_get_channel(member->session); - switch_channel_event_set_data(channel, event); - - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", "%s", member->conference->name); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Member-ID", "%u", member->id); + conference_add_event_member_data(member, event); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "unmute-member"); switch_event_fire(&event); } @@ -2564,11 +2527,7 @@ stream->write_function(stream, "OK deaf %u\n", member->id); } if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { - switch_channel_t *channel = switch_core_session_get_channel(member->session); - switch_channel_event_set_data(channel, event); - - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", "%s", member->conference->name); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Member-ID", "%u", member->id); + conference_add_event_member_data(member, event); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "deaf-member"); switch_event_fire(&event); } @@ -2591,11 +2550,7 @@ stream->write_function(stream, "OK undeaf %u\n", member->id); } if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { - switch_channel_t *channel = switch_core_session_get_channel(member->session); - switch_channel_event_set_data(channel, event); - - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", "%s", member->conference->name); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Member-ID", "%u", member->id); + conference_add_event_member_data(member, event); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "undeaf-member"); switch_event_fire(&event); } @@ -2624,11 +2579,7 @@ } if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { - switch_channel_t *channel = switch_core_session_get_channel(member->session); - switch_channel_event_set_data(channel, event); - - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", "%s", member->conference->name); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Member-ID", "%u", member->id); + conference_add_event_member_data(member, event); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "kick-member"); switch_event_fire(&event); } @@ -2667,11 +2618,7 @@ } if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { - switch_channel_t *channel = switch_core_session_get_channel(member->session); - switch_channel_event_set_data(channel, event); - - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", "%s", member->conference->name); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Member-ID", "%u", member->id); + 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); switch_event_fire(&event); @@ -2699,11 +2646,7 @@ if (data) { if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { - switch_channel_t *channel = switch_core_session_get_channel(member->session); - switch_channel_event_set_data(channel, event); - - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", "%s", member->conference->name); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Member-ID", "%u", member->id); + 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); @@ -2736,11 +2679,7 @@ } if (data) { if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { - switch_channel_t *channel = switch_core_session_get_channel(member->session); - switch_channel_event_set_data(channel, event); - - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", "%s", member->conference->name); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Member-ID", "%u", member->id); + 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); @@ -2774,11 +2713,7 @@ if (data) { if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { - switch_channel_t *channel = switch_core_session_get_channel(member->session); - switch_channel_event_set_data(channel, event); - - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", "%s", member->conference->name); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Member-ID", "%u", member->id); + 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); @@ -2866,7 +2801,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 (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", "%s", conference->name); + 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]); switch_event_fire(&event); @@ -2883,8 +2818,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 (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", "%s", conference->name); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Member-ID", "%u", id); + 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]); switch_event_fire(&event); @@ -2915,7 +2849,7 @@ stream->write_function(stream, "(say) OK\n"); if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", "%s", conference->name); + 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); switch_event_fire(&event); @@ -2975,9 +2909,8 @@ stream->write_function(stream, "(saymember) OK\n"); if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", "%s", conference->name); + 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, "Member-ID", "%u", id); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Text", "%s", text); switch_event_fire(&event); } @@ -3112,7 +3045,7 @@ switch_set_flag_locked(conference, CFLAG_LOCKED); stream->write_function(stream, "OK %s locked\n", argv[0]); if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", "%s", conference->name); + conference_add_event_data(conference, event); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "lock"); switch_event_fire(&event); } @@ -3134,7 +3067,7 @@ switch_clear_flag_locked(conference, CFLAG_LOCKED); stream->write_function(stream, "OK %s unlocked\n", argv[0]); if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", "%s", conference->name); + conference_add_event_data(conference, event); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "unlock"); switch_event_fire(&event); } @@ -3295,8 +3228,7 @@ /* tell them what happened */ if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { - switch_channel_event_set_data(channel, event); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Member-ID", "%u", member->id); + 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]); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Action", "transfer"); @@ -3780,7 +3712,7 @@ call->session, call->bridgeto, call->timeout, call->flags, call->cid_name, call->cid_num, &cause); if (switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) { - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Conference-Name", "%s", call->conference->name); + 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)); switch_event_fire(&event); @@ -4753,6 +4685,7 @@ /* initialize the conference object with settings from the specified profile */ conference->pool = pool; + conference->profile_name = switch_core_strdup(conference->pool, switch_xml_attr_soft(cfg.profile, "name")); conference->timer_name = switch_core_strdup(conference->pool, timer_name); conference->tts_engine = switch_core_strdup(conference->pool, tts_engine); conference->tts_voice = switch_core_strdup(conference->pool, tts_voice);

1 0

[commit] r6061 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 25 Oct '07

25 Oct '07

Author: anthm Date: Thu Oct 25 17:51:53 2007 New Revision: 6061 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: sick of this sip 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 Thu Oct 25 17:51:53 2007 @@ -550,7 +550,7 @@ char *d_url = NULL, *url = NULL; sofia_private_t *sofia_private; char *invite_contact = NULL, *to_str, *use_from_str, *from_str, *url_str; - char *transport = "udp", *t_var; + char *transport = "udp", *t_var, *d_contact = NULL; if (switch_strlen_zero(tech_pvt->dest)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "URL Error! [%s]\n", tech_pvt->dest); @@ -586,10 +586,16 @@ url_str = switch_core_session_sprintf(session, "%s;transport=%s", url, transport); } - if (strchr(tech_pvt->invite_contact, ';')) { - invite_contact = switch_core_session_sprintf(session, "<%s&transport=%s>", tech_pvt->invite_contact, transport); + d_contact = sofia_glue_get_url_from_contact(tech_pvt->invite_contact, 1); + + if (switch_stristr("port=", d_contact)) { + invite_contact = switch_core_session_sprintf(session, "<%s>", d_contact); } else { - invite_contact = switch_core_session_sprintf(session, "<%s;transport=%s>", tech_pvt->invite_contact, transport); + if (strchr(d_contact, ';')) { + invite_contact = switch_core_session_sprintf(session, "<%s&transport=%s>", d_contact, transport); + } else { + invite_contact = switch_core_session_sprintf(session, "%s;transport=%s", d_contact, transport); + } } if (strchr(use_from_str, '>')) { @@ -612,6 +618,7 @@ TAG_END()); switch_safe_free(d_url); + switch_safe_free(d_contact); if (!(sofia_private = malloc(sizeof(*sofia_private)))) { abort();

1 0

[commit] r6060 - freeswitch/trunk/src/mod/applications/mod_voicemail
by Freeswitch SVN 25 Oct '07

25 Oct '07

Author: anthm Date: Thu Oct 25 17:19:31 2007 New Revision: 6060 Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Log: pick a greeting from a var (please test) Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c (original) +++ freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Thu Oct 25 17:19:31 2007 @@ -1544,6 +1544,7 @@ int email_attach = 1; int email_delete = 1; char buf[2]; + char *greet_path = NULL, *voicemail_greeting_number = NULL; memset(&cbt, 0, sizeof(cbt)); if (!(profile = switch_core_hash_find(globals.profile_hash, profile_name))) { @@ -1631,15 +1632,24 @@ file_path = switch_mprintf("%s%smsg_%s.%s", dir_path, SWITCH_PATH_SEPARATOR, uuid, profile->file_ext); + if ((voicemail_greeting_number = switch_channel_get_variable(channel, "voicemail_greeting_number"))) { + int num = atoi(voicemail_greeting_number); + if (num > 0 && num < 3) { + greet_path = switch_mprintf("%s%sgreeting_%d.%s", dir_path, SWITCH_PATH_SEPARATOR, num, profile->file_ext); + } + } else { + greet_path = cbt.greeting_path; + } + greet: memset(buf, 0, sizeof(buf)); args.input_callback = cancel_on_dtmf; args.buf = buf; args.buflen = sizeof(buf); - if (!switch_strlen_zero(cbt.greeting_path)) { + if (!switch_strlen_zero(greet_path)) { memset(buf, 0, sizeof(buf)); - TRY_CODE(switch_ivr_play_file(session, NULL, cbt.greeting_path, &args)); + TRY_CODE(switch_ivr_play_file(session, NULL, greet_path, &args)); } else { if (!switch_strlen_zero(cbt.name_path)) { memset(buf, 0, sizeof(buf));

1 0

[commit] r6059 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 25 Oct '07

25 Oct '07

Author: anthm Date: Thu Oct 25 17:07:44 2007 New Revision: 6059 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: rem double contact 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 Thu Oct 25 17:07:44 2007 @@ -923,7 +923,6 @@ nua_respond(tech_pvt->nh, SIP_183_SESSION_PROGRESS, SIPTAG_CONTACT_STR(tech_pvt->reply_contact), - SIPTAG_CONTACT_STR(tech_pvt->profile->url), SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), SOATAG_AUDIO_AUX("cn telephone-event"), TAG_END()); } }

1 0

[commit] r6058 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 25 Oct '07

25 Oct '07

Author: anthm Date: Thu Oct 25 17:02:31 2007 New Revision: 6058 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: fix MODAPP-22 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 Thu Oct 25 17:02:31 2007 @@ -491,8 +491,9 @@ switch_mutex_lock(member->audio_in_mutex); switch_mutex_lock(member->audio_out_mutex); switch_mutex_lock(member->flag_mutex); - switch_mutex_lock(conference->member_mutex); + + switch_clear_flag(conference, CFLAG_DESTRUCT); member->conference = conference; member->next = conference->members; member->energy_level = conference->energy_level; @@ -4149,7 +4150,7 @@ goto done; } } - + if (conference->special_announce) { conference_local_play_file(conference, session, conference->special_announce, CONF_DEFAULT_LEADIN); } @@ -4326,6 +4327,14 @@ switch_buffer_destroy(&member.audio_buffer); switch_buffer_destroy(&member.mux_buffer); + if (conference) { + switch_mutex_lock(conference->mutex); + if (switch_test_flag(conference, CFLAG_DYNAMIC) && conference->count == 0) { + switch_set_flag_locked(conference, CFLAG_DESTRUCT); + } + switch_mutex_unlock(conference->mutex); + } + /* Release the config registry handle */ if (cxml) { switch_xml_free(cxml);

1 0

[commit] r6057 - in freeswitch/trunk: conf src/mod/endpoints/mod_sofia
by Freeswitch SVN 25 Oct '07

25 Oct '07

Author: anthm Date: Thu Oct 25 16:25:32 2007 New Revision: 6057 Modified: freeswitch/trunk/conf/sofia.conf.xml freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: force-register-domain Modified: freeswitch/trunk/conf/sofia.conf.xml ============================================================================== --- freeswitch/trunk/conf/sofia.conf.xml (original) +++ freeswitch/trunk/conf/sofia.conf.xml Thu Oct 25 16:25:32 2007 @@ -101,6 +101,8 @@    +  +  </settings> </profile> </profiles> Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h Thu Oct 25 16:25:32 2007 @@ -227,6 +227,7 @@ char *timer_name; char *hold_music; char *bind_params; + char *reg_domain; int sip_port; char *codec_string; int running; 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 Thu Oct 25 16:25:32 2007 @@ -873,7 +873,8 @@ } } } - + } else if (!strcasecmp(var, "force-register-domain")) { + profile->reg_domain = switch_core_strdup(profile->pool, val); } else if (!strcasecmp(var, "bind-params")) { profile->bind_params = switch_core_strdup(profile->pool, val); } else if (!strcasecmp(var, "sip-domain")) {

1 0

[commit] r6056 - freeswitch/trunk/conf
by Freeswitch SVN 25 Oct '07

25 Oct '07

Author: anthm Date: Thu Oct 25 15:55:57 2007 New Revision: 6056 Modified: freeswitch/trunk/conf/voicemail_en.xml Log: fix macro file Modified: freeswitch/trunk/conf/voicemail_en.xml ============================================================================== --- freeswitch/trunk/conf/voicemail_en.xml (original) +++ freeswitch/trunk/conf/voicemail_en.xml Thu Oct 25 15:55:57 2007 @@ -74,13 +74,13 @@ <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$"> <match> <action function="play-file" data="voicemail/vm-press.wav"/> - <action function="say" data="$1" method="pronounced" type="items"/> + <action function="say" data="$1" method="pronounced" type="name_spelled"/> <action function="play-file" data="voicemail/vm-listen_new.wav"/> <action function="play-file" data="voicemail/vm-press.wav"/> - <action function="say" data="$2" method="pronounced" type="items"/> + <action function="say" data="$2" method="pronounced" type="name_spelled"/> <action function="play-file" data="voicemail/vm-listen_saved.wav"/> <action function="play-file" data="voicemail/vm-press.wav"/> - <action function="say" data="$3" method="pronounced" type="items"/> + <action function="say" data="$3" method="pronounced" type="name_spelled"/> <action function="play-file" data="voicemail/vm-advanced.wav"/> <action function="say" data="$4" method="pronounced" type="name_phonetic"/> <action function="play-file" data="voicemail/vm-to_exit.wav"/> @@ -93,16 +93,16 @@ <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$"> <match> <action function="play-file" data="voicemail/vm-press.wav"/> - <action function="say" data="$1" method="pronounced" type="items"/> + <action function="say" data="$1" method="pronounced" type="name_spelled"/> <action function="play-file" data="voicemail/vm-record_greeting.wav"/> <action function="play-file" data="voicemail/vm-press.wav"/> - <action function="say" data="$2" method="pronounced" type="items"/> + <action function="say" data="$2" method="pronounced" type="name_spelled"/> <action function="play-file" data="voicemail/vm-choose_greeting.wav"/> <action function="play-file" data="voicemail/vm-press.wav"/> - <action function="say" data="$3" method="pronounced" type="items"/> + <action function="say" data="$3" method="pronounced" type="name_spelled"/> <action function="play-file" data="voicemail/vm-record_name2.wav"/> <action function="play-file" data="voicemail/vm-press.wav"/> - <action function="say" data="$4" method="pronounced" type="items"/> + <action function="say" data="$4" method="pronounced" type="name_spelled"/> <action function="play-file" data="voicemail/vm-main_menu.wav"/> </match> </input> @@ -121,13 +121,13 @@ <input pattern="^([0-9#*]):([0-9#*]):([0-9#*])$"> <match> <action function="play-file" data="voicemail/vm-press.wav"/> - <action function="say" data="$1" method="pronounced" type="items"/> + <action function="say" data="$1" method="pronounced" type="name_spelled"/> <action function="play-file" data="voicemail/vm-listen_to_recording.wav"/> <action function="play-file" data="voicemail/vm-press.wav"/> - <action function="say" data="$2" method="pronounced" type="items"/> + <action function="say" data="$2" method="pronounced" type="name_spelled"/> <action function="play-file" data="voicemail/vm-save_recording.wav"/> <action function="play-file" data="voicemail/vm-press.wav"/> - <action function="say" data="$3" method="pronounced" type="items"/> + <action function="say" data="$3" method="pronounced" type="name_spelled"/> <action function="play-file" data="voicemail/vm-rerecord.wav"/> </match> </input> @@ -138,10 +138,10 @@ <match> <action function="play-file" data="voicemail/vm-mark_urgent.wav"/> <action function="play-file" data="voicemail/vm-press.wav"/> - <action function="say" data="$1" method="pronounced" type="items"/> + <action function="say" data="$1" method="pronounced" type="name_spelled"/> <action function="play-file" data="voicemail/vm-continue.wav"/> <action function="play-file" data="voicemail/vm-press.wav"/> - <action function="say" data="$2" method="pronounced" type="items"/> + <action function="say" data="$2" method="pronounced" type="name_spelled"/> </match> </input> </macro> @@ -150,19 +150,19 @@ <input pattern="^([0-9#*]):([0-9#*]):([0-9#*]):([0-9#*])$"> <match> <action function="play-file" data="voicemail/vm-press.wav"/> - <action function="say" data="$1" method="pronounced" type="items"/> + <action function="say" data="$1" method="pronounced" type="name_spelled"/> <action function="play-file" data="voicemail/vm-listen_to_recording.wav"/> <action function="play-file" data="voicemail/vm-press.wav"/> - <action function="say" data="$2" method="pronounced" type="items"/> + <action function="say" data="$2" method="pronounced" type="name_spelled"/> <action function="play-file" data="voicemail/vm-save_recording.wav"/> <action function="play-file" data="voicemail/vm-press.wav"/> - <action function="say" data="$3" method="pronounced" type="items"/> + <action function="say" data="$3" method="pronounced" type="name_spelled"/> <action function="play-file" data="voicemail/vm-delete_recording.wav"/> <action function="play-file" data="voicemail/vm-press.wav"/> - <action function="say" data="$4" method="pronounced" type="items"/> + <action function="say" data="$4" method="pronounced" type="name_spelled"/> <action function="play-file" data="voicemail/vm-forward_to_email.wav"/> <action function="play-file" data="voicemail/vm-press.wav"/> - <action function="say" data="$4" method="pronounced" type="items"/> + <action function="say" data="$4" method="pronounced" type="name_spelled"/> <action function="play-file" data="voicemail/vm-return_call.wav"/> </match> </input> @@ -240,7 +240,7 @@ <macro name="voicemail_say_phone_number"> <input pattern="^(.*)$"> <match> - <action function="say" data="$1" method="pronounced" type="items"/> + <action function="say" data="$1" method="pronounced" type="name_spelled"/> </match> </input> </macro>

1 0

[commit] r6055 - freeswitch/trunk/src/mod/applications/mod_voicemail
by Freeswitch SVN 25 Oct '07

25 Oct '07

Author: mikej Date: Thu Oct 25 15:31:47 2007 New Revision: 6055 Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Log: type tweak for windows build Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c (original) +++ freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Thu Oct 25 15:31:47 2007 @@ -684,7 +684,7 @@ memset(buf, 0, buflen); args.input_callback = cancel_on_dtmf; args.buf = buf; - args.buflen = buflen; + args.buflen = (uint32_t)buflen; ap = &args; }

1 0