January 2007 - freeswitch-svn@lists.freeswitch.org

[Freeswitch-svn] [commit] r4105 - in freeswitch/trunk/src: . include mod/applications/mod_ivrtest
by Freeswitch SVN 31 Jan '07

31 Jan '07

Author: anthm Date: Wed Jan 31 18:09:33 2007 New Revision: 4105 Modified: freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/mod/applications/mod_ivrtest/mod_ivrtest.c freeswitch/trunk/src/switch_core.c freeswitch/trunk/src/switch_ivr.c Log: core framework for reverse media bugs Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Wed Jan 31 18:09:33 2007 @@ -137,6 +137,19 @@ SWITCH_DECLARE(void *) switch_core_media_bug_get_user_data(switch_media_bug_t *bug); /*! + \brief Obtain a replace frame from a media bug + \param bug the bug to get the data from +*/ +SWITCH_DECLARE(switch_frame_t *) switch_core_media_bug_get_replace_frame(switch_media_bug_t *bug); + +/*! + \brief Set a return replace frame + \param bug the bug to set the frame on + \param frame the frame to set +*/ +SWITCH_DECLARE(void) switch_core_media_bug_set_replace_frame(switch_media_bug_t *bug, switch_frame_t *frame); + +/*! \brief Remove a media bug from the session \param session the session to remove the bug from \param bug bug to remove Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Wed Jan 31 18:09:33 2007 @@ -140,6 +140,7 @@ SWITCH_ABC_TYPE_INIT, SWITCH_ABC_TYPE_READ, SWITCH_ABC_TYPE_WRITE, + SWITCH_ABC_TYPE_WRITE_REPLACE, SWITCH_ABC_TYPE_CLOSE, } switch_abc_type_t; @@ -654,12 +655,14 @@ <pre> SMBF_READ_STREAM - Include the Read Stream SMBF_WRITE_STREAM - Include the Write Stream +SMBF_WRITE_STREAM - Replace the Write Stream </pre> */ typedef enum { SMBF_BOTH = 0, SMBF_READ_STREAM = (1 << 0), - SMBF_WRITE_STREAM = (1 << 1) + SMBF_WRITE_STREAM = (1 << 1), + SMBF_WRITE_REPLACE = (1 << 2) } switch_media_bug_flag_t; /*! Modified: freeswitch/trunk/src/mod/applications/mod_ivrtest/mod_ivrtest.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_ivrtest/mod_ivrtest.c (original) +++ freeswitch/trunk/src/mod/applications/mod_ivrtest/mod_ivrtest.c Wed Jan 31 18:09:33 2007 @@ -231,6 +231,39 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Done\n"); } +static void bug_callback(switch_media_bug_t *bug, void *user_data, switch_abc_type_t type) +{ + switch_frame_t *frame; + + switch(type) { + case SWITCH_ABC_TYPE_WRITE_REPLACE: + frame = switch_core_media_bug_get_replace_frame(bug); + switch_core_media_bug_set_replace_frame(bug, frame); + printf("W00t\n"); + break; + default: + break; + } + +} + +static void bugtest_function(switch_core_session_t *session, char *data) +{ + switch_media_bug_t *bug; + switch_channel_t *channel = switch_core_session_get_channel(session); + switch_status_t status; + + if ((status = switch_core_media_bug_add(session, + bug_callback, + NULL, + SMBF_WRITE_REPLACE, + &bug)) != SWITCH_STATUS_SUCCESS) { + switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); + return; + } + switch_ivr_play_file(session, NULL, data, NULL); +} + #if 1 static void asrtest_function(switch_core_session_t *session, char *data) { @@ -423,11 +456,18 @@ +static const switch_application_interface_t bug_application_interface = { + /*.interface_name */ "bugtest", + /*.application_function */ bugtest_function, + NULL, NULL, NULL, + /*.next*/ NULL +}; + static const switch_application_interface_t ivr_application_interface = { /*.interface_name */ "ivrmenu", /*.application_function */ ivr_application_function, NULL, NULL, NULL, - /*.next*/ NULL + /*.next*/ &bug_application_interface }; static const switch_application_interface_t xml_application_interface = { Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Wed Jan 31 18:09:33 2007 @@ -59,6 +59,8 @@ struct switch_media_bug { switch_buffer_t *raw_write_buffer; switch_buffer_t *raw_read_buffer; + switch_frame_t *replace_frame_in; + switch_frame_t *replace_frame_out; switch_media_bug_callback_t callback; switch_mutex_t *read_mutex; switch_mutex_t *write_mutex; @@ -176,6 +178,17 @@ switch_buffer_destroy(&bug->raw_write_buffer); } + +SWITCH_DECLARE(switch_frame_t *) switch_core_media_bug_get_replace_frame(switch_media_bug_t *bug) +{ + return bug->replace_frame_in; +} + +SWITCH_DECLARE(void) switch_core_media_bug_set_replace_frame(switch_media_bug_t *bug, switch_frame_t *frame) +{ + bug->replace_frame_out = frame; +} + SWITCH_DECLARE(void *) switch_core_media_bug_get_user_data(switch_media_bug_t *bug) { return bug->user_data; @@ -277,9 +290,21 @@ switch_media_bug_t **new_bug) { - switch_media_bug_t *bug; + switch_media_bug_t *bug, *bp; switch_size_t bytes; + if (flags & SMBF_WRITE_REPLACE) { + switch_thread_rwlock_wrlock(session->bug_rwlock); + for (bp = session->bugs; bp; bp = bp->next) { + if (switch_test_flag(bp, SMBF_WRITE_REPLACE)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Only one bug of this type allowed!\n"); + switch_thread_rwlock_unlock(session->bug_rwlock); + return SWITCH_STATUS_GENERR; + } + } + switch_thread_rwlock_unlock(session->bug_rwlock); + } + if (!(bug = switch_core_session_alloc(session, sizeof(*bug)))) { return SWITCH_STATUS_MEMERR; } @@ -2087,6 +2112,7 @@ switch_status_t status = SWITCH_STATUS_FALSE; if (session->endpoint_interface->io_routines->write_frame) { + if ((status = session->endpoint_interface->io_routines->write_frame(session, frame, timeout, flags, stream_id)) == SWITCH_STATUS_SUCCESS) { @@ -2230,15 +2256,25 @@ if (bp->callback) { bp->callback(bp, bp->user_data, SWITCH_ABC_TYPE_WRITE); } + } else if (switch_test_flag(bp, SMBF_WRITE_REPLACE)) { + do_bugs = 0; + if (bp->callback) { + bp->replace_frame_in = frame; + bp->replace_frame_out = NULL; + bp->callback(bp, bp->user_data, SWITCH_ABC_TYPE_WRITE_REPLACE); + write_frame = bp->replace_frame_out; + } } } switch_thread_rwlock_unlock(session->bug_rwlock); } + if (do_bugs) { - do_write = 1; - write_frame = frame; - goto done; + do_write = 1; + write_frame = frame; + goto done; } + if (session->write_codec) { if (write_frame->datalen == session->write_codec->implementation->bytes_per_frame) { perfect = TRUE; Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Wed Jan 31 18:09:33 2007 @@ -563,6 +563,7 @@ } break; case SWITCH_ABC_TYPE_WRITE: + default: break; } } @@ -787,6 +788,7 @@ } break; case SWITCH_ABC_TYPE_WRITE: + default: break; } }

1 0

[Freeswitch-svn] [commit] r4104 - freeswitch/trunk/conf
by Freeswitch SVN 31 Jan '07

31 Jan '07

Author: anthm Date: Wed Jan 31 16:56:57 2007 New Revision: 4104 Modified: freeswitch/trunk/conf/directory.xml Log: update default conf Modified: freeswitch/trunk/conf/directory.xml ============================================================================== --- freeswitch/trunk/conf/directory.xml (original) +++ freeswitch/trunk/conf/directory.xml Wed Jan 31 16:56:57 2007 @@ -1,12 +1,15 @@  -<domain name="jabber.org"> +<domain name="$${domain}">  <user id="stpeter"> <params>  <param name="password" value="mypass"/> +  +  </params> - + +  <vcard xmlns='vcard-temp'> <FN>Peter Saint-Andre</FN> <N>

1 0

[Freeswitch-svn] [commit] r4102 - freeswitch/trunk/src/mod/xml_int/mod_xml_curl
by Freeswitch SVN 31 Jan '07

31 Jan '07

Author: anthm Date: Wed Jan 31 14:22:44 2007 New Revision: 4102 Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c Log: doh Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c Wed Jan 31 14:22:44 2007 @@ -184,7 +184,7 @@ url = val; } } else if (!strcasecmp(var, "gateway-credentials")) { - bind_cred = var; + bind_cred = val; } }

1 0

[Freeswitch-svn] [commit] r4101 - freeswitch/trunk/src/mod/endpoints/mod_portaudio
by Freeswitch SVN 31 Jan '07

31 Jan '07

Author: anthm Date: Wed Jan 31 12:12:42 2007 New Revision: 4101 Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Log: only 1 call can control the ring device Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Wed Jan 31 12:12:42 2007 @@ -53,7 +53,8 @@ typedef enum { GFLAG_NONE = 0, GFLAG_EAR = (1 << 0), - GFLAG_MOUTH = (1 << 1) + GFLAG_MOUTH = (1 << 1), + GFLAG_RING = (1 << 2) } GFLAGS; typedef enum { @@ -105,6 +106,7 @@ switch_hash_t *call_hash; switch_mutex_t *device_lock; switch_mutex_t *pvt_lock; + switch_mutex_t *flag_mutex; int sample_rate; int codec_ms; PABLIO_Stream *audio_stream; @@ -215,6 +217,10 @@ ring_file = val; } + if (switch_test_flag((&globals), GFLAG_RING)) { + ring_file = NULL; + } + switch_set_flag_locked((&globals), GFLAG_RING); if (ring_file) { if (switch_core_file_open(&fh, ring_file, @@ -267,6 +273,7 @@ switch_yield(globals.read_codec.implementation->microseconds_per_frame); } + switch_clear_flag_locked((&globals), GFLAG_RING); } if (ring_file) { @@ -896,6 +903,7 @@ switch_core_hash_init(&globals.call_hash, module_pool); switch_mutex_init(&globals.device_lock, SWITCH_MUTEX_NESTED, module_pool); switch_mutex_init(&globals.pvt_lock, SWITCH_MUTEX_NESTED, module_pool); + switch_mutex_init(&globals.flag_mutex, SWITCH_MUTEX_NESTED, module_pool);

1 0

[Freeswitch-svn] [commit] r4100 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 31 Jan '07

31 Jan '07

Author: anthm Date: Wed Jan 31 11:32:59 2007 New Revision: 4100 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: update 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 Wed Jan 31 11:32:59 2007 @@ -1032,7 +1032,7 @@ holdstr = switch_test_flag(tech_pvt, TFLAG_SIP_HOLD) ? "*" : ""; nua_invite(tech_pvt->nh, - TAG_IF(rpid, SIPTAG_HEADER_STR(rpid)), + TAG_IF(!switch_strlen_zero(rpid), SIPTAG_HEADER_STR(rpid)), TAG_IF(alert_info, SIPTAG_HEADER_STR(alert_info)), //SIPTAG_CONTACT_STR(tech_pvt->profile->url), SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str),

1 0

[Freeswitch-svn] [commit] r4099 - freeswitch/branches/sepotvin
by Freeswitch SVN 31 Jan '07

31 Jan '07

Author: sphere Date: Wed Jan 31 11:06:11 2007 New Revision: 4099 Added: freeswitch/branches/sepotvin/ Log: Creating empty folder for sepotvin

1 0

[Freeswitch-svn] [commit] r4098 - in freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua: nta su/sofia-sip tport
by Freeswitch SVN 31 Jan '07

31 Jan '07

Author: mikej Date: Wed Jan 31 02:57:12 2007 New Revision: 4098 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_tag.h freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport.c Log: resolve possible loss of data warnings Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c Wed Jan 31 02:57:12 2007 @@ -369,8 +369,8 @@ agent->sa_flags = MSG_DO_CANONIC; agent->sa_maxsize = 2 * 1024 * 1024; /* 2 MB */ - agent->sa_bad_req_mask = ~(sip_mask_response | sip_mask_proxy); - agent->sa_bad_resp_mask = ~(sip_mask_request | sip_mask_proxy); + agent->sa_bad_req_mask = (unsigned)(~(sip_mask_response | sip_mask_proxy)); + agent->sa_bad_resp_mask = (unsigned)(~(sip_mask_request | sip_mask_proxy)); agent->sa_t1 = NTA_SIP_T1; agent->sa_t2 = NTA_SIP_T2; agent->sa_t4 = NTA_SIP_T4; @@ -4153,7 +4153,7 @@ static inline void incoming_remove(nta_incoming_t *irq); static inline void incoming_set_timer(nta_incoming_t *, unsigned interval); static inline void incoming_reset_timer(nta_incoming_t *); -static inline int incoming_mass_destroy(nta_agent_t *sa, incoming_queue_t *q); +static inline size_t incoming_mass_destroy(nta_agent_t *sa, incoming_queue_t *q); static int incoming_set_params(nta_incoming_t *irq, tagi_t const *tags); static inline @@ -5955,7 +5955,7 @@ /** Mass destroy server transactions */ static inline -int incoming_mass_destroy(nta_agent_t *sa, incoming_queue_t *q) +size_t incoming_mass_destroy(nta_agent_t *sa, incoming_queue_t *q) { size_t destroyed = q->q_length; @@ -10154,7 +10154,7 @@ /** Close all transports. @since Experimental in @VERSION_1_12_2. */ int nta_agent_close_tports(nta_agent_t *agent) { - int i; + size_t i; outgoing_htable_t *oht = agent->sa_outgoing; incoming_htable_t *iht = agent->sa_incoming; Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_tag.h ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_tag.h (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_tag.h Wed Jan 31 02:57:12 2007 @@ -174,7 +174,7 @@ #if SU_HAVE_INLINE su_inline tag_value_t tag_int_v(int v) { return (tag_value_t)v; } su_inline tag_value_t tag_int_vr(int *vp) { return (tag_value_t)vp; } -su_inline tag_value_t tag_uint_v(unsigned v) { return (tag_value_t)v; } +su_inline tag_value_t tag_uint_v(size_t v) { return (tag_value_t)v; } su_inline tag_value_t tag_uint_vr(unsigned *vp) { return (tag_value_t)vp; } su_inline tag_value_t tag_usize_v(usize_t v) { return (tag_value_t)v; } su_inline tag_value_t tag_usize_vr(usize_t *vp) { return (tag_value_t)vp; } Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport.c Wed Jan 31 02:57:12 2007 @@ -292,7 +292,7 @@ } /** MTU for transport */ -static inline unsigned tport_mtu(tport_t const *self) +static inline usize_t tport_mtu(tport_t const *self) { return self->tp_params->tpp_mtu; }

1 0

[Freeswitch-svn] [commit] r4097 - freeswitch/trunk/libs/libsndfile/src
by Freeswitch SVN 31 Jan '07

31 Jan '07

Author: mikej Date: Wed Jan 31 02:55:18 2007 New Revision: 4097 Modified: freeswitch/trunk/libs/libsndfile/src/file_io.c Log: pointer truncation fix. Modified: freeswitch/trunk/libs/libsndfile/src/file_io.c ============================================================================== --- freeswitch/trunk/libs/libsndfile/src/file_io.c (original) +++ freeswitch/trunk/libs/libsndfile/src/file_io.c Wed Jan 31 02:55:18 2007 @@ -858,10 +858,8 @@ /* USE_WINDOWS_API */ void psf_set_file (SF_PRIVATE *psf, int fd) { HANDLE handle ; - long osfhandle ; - osfhandle = _get_osfhandle (fd) ; - handle = (HANDLE) osfhandle ; + handle = (HANDLE) _get_osfhandle (fd) ; psf->hfile = handle ; } /* psf_set_file */

1 0

[Freeswitch-svn] [commit] r4096 - in freeswitch/trunk: libs/win32 libs/win32/apr-util w32/Library
by Freeswitch SVN 31 Jan '07

31 Jan '07

Author: mikej Date: Wed Jan 31 02:54:02 2007 New Revision: 4096 Modified: freeswitch/trunk/libs/win32/apr-util/xml.vcproj freeswitch/trunk/libs/win32/util.vbs freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj Log: fix windows build when there is a space in the source directory name. Modified: freeswitch/trunk/libs/win32/apr-util/xml.vcproj ============================================================================== --- freeswitch/trunk/libs/win32/apr-util/xml.vcproj (original) +++ freeswitch/trunk/libs/win32/apr-util/xml.vcproj Wed Jan 31 02:54:02 2007 @@ -346,7 +346,7 @@ <Tool Name="VCCustomBuildTool" Description="Creating expat.h from expat.h.in" - CommandLine="if not exist $(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h type $(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h.in > $(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h
" + CommandLine="if not exist "$(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h" type "$(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h.in" > "$(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h"
" Outputs="$(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h" /> </FileConfiguration> @@ -356,7 +356,7 @@ <Tool Name="VCCustomBuildTool" Description="Creating expat.h from expat.h.in" - CommandLine="if not exist $(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h type $(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h.in > $(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h
" + CommandLine="if not exist "$(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h" type "$(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h.in" > "$(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h"
" Outputs="$(ProjectDir)..\..\apr-util\xml\expat\lib\expat.h" /> </FileConfiguration> @@ -370,7 +370,7 @@ <Tool Name="VCCustomBuildTool" Description="Creating config.h from winconfig.h" - CommandLine="if not exist $(ProjectDir)..\..\apr-util\xml\expat\lib\config.h type $(ProjectDir)..\..\apr-util\xml\expat\lib\winconfig.h > $(ProjectDir)..\..\apr-util\xml\expat\lib\config.h
" + CommandLine="if not exist "$(ProjectDir)..\..\apr-util\xml\expat\lib\config.h" type "$(ProjectDir)..\..\apr-util\xml\expat\lib\winconfig.h" > "$(ProjectDir)..\..\apr-util\xml\expat\lib\config.h"
" Outputs="$(ProjectDir)..\..\apr-util\xml\expat\lib\config.h" /> </FileConfiguration> @@ -380,7 +380,7 @@ <Tool Name="VCCustomBuildTool" Description="Creating config.h from winconfig.h" - CommandLine="if not exist $(ProjectDir)..\..\apr-util\xml\expat\lib\config.h type $(ProjectDir)..\..\apr-util\xml\expat\lib\winconfig.h > $(ProjectDir)..\..\apr-util\xml\expat\lib\config.h
" + CommandLine="if not exist "$(ProjectDir)..\..\apr-util\xml\expat\lib\config.h" type "$(ProjectDir)..\..\apr-util\xml\expat\lib\winconfig.h" > "$(ProjectDir)..\..\apr-util\xml\expat\lib\config.h"
" Outputs="$(ProjectDir)..\..\apr-util\xml\expat\lib\config.h" /> </FileConfiguration> Modified: freeswitch/trunk/libs/win32/util.vbs ============================================================================== --- freeswitch/trunk/libs/win32/util.vbs (original) +++ freeswitch/trunk/libs/win32/util.vbs Wed Jan 31 02:54:02 2007 @@ -231,7 +231,7 @@ MyFile.WriteLine("@" & "cd " & quote & tmpFolder & quote ) MyFile.WriteLine("@" & VersionCmd) MyFile.Close - Set oExec = WshShell.Exec(tmpFolder & "tmpVersion.Bat") + Set oExec = WshShell.Exec("cmd /C " & quote & tmpFolder & "tmpVersion.Bat" & quote) Do strFromProc = OExec.StdOut.ReadLine() VERSION=strFromProc Modified: freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj ============================================================================== --- freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj (original) +++ freeswitch/trunk/w32/Library/FreeSwitchCore.vcproj Wed Jan 31 02:54:02 2007 @@ -106,7 +106,7 @@ /> <Tool Name="VCPostBuildEventTool" - CommandLine="xcopy $(SolutionDir)conf\*.* $(SolutionDir)$(OutDir)\conf\ /C /D /Y
if not exist $(SolutionDir)$(OutDir)\db md $(SolutionDir)$(OutDir)\db
if not exist $(SolutionDir)$(OutDir)\log md $(SolutionDir)$(OutDir)\log
if not exist $(SolutionDir)$(OutDir)\log md $(SolutionDir)$(OutDir)\htdocs

" + CommandLine="xcopy "$(SolutionDir)conf\*.*" "$(SolutionDir)$(OutDir)\conf\" /C /D /Y
if not exist "$(SolutionDir)$(OutDir)\db" md "$(SolutionDir)$(OutDir)\db"
if not exist "$(SolutionDir)$(OutDir)\log" md "$(SolutionDir)$(OutDir)\log"
if not exist "$(SolutionDir)$(OutDir)\htdocs" md "$(SolutionDir)$(OutDir)\htdocs"

" /> </Configuration> <Configuration @@ -195,7 +195,7 @@ /> <Tool Name="VCPostBuildEventTool" - CommandLine="xcopy $(SolutionDir)conf\*.* $(SolutionDir)$(OutDir)\conf\ /C /D /Y
if not exist $(SolutionDir)$(OutDir)\db md $(SolutionDir)$(OutDir)\db
if not exist $(SolutionDir)$(OutDir)\log md $(SolutionDir)$(OutDir)\log
if not exist $(SolutionDir)$(OutDir)\log md $(SolutionDir)$(OutDir)\htdocs

" + CommandLine="xcopy "$(SolutionDir)conf\*.*" "$(SolutionDir)$(OutDir)\conf\" /C /D /Y
if not exist "$(SolutionDir)$(OutDir)\db" md "$(SolutionDir)$(OutDir)\db"
if not exist "$(SolutionDir)$(OutDir)\log" md "$(SolutionDir)$(OutDir)\log"
if not exist "$(SolutionDir)$(OutDir)\htdocs" md "$(SolutionDir)$(OutDir)\htdocs"

" /> </Configuration> </Configurations>

1 0

[Freeswitch-svn] [commit] r4095 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 30 Jan '07

30 Jan '07

Author: mikej Date: Tue Jan 30 14:20:41 2007 New Revision: 4095 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: code before declaration, and function must return value. 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 Tue Jan 30 14:20:41 2007 @@ -1230,7 +1230,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "dial argc %u 1 '%s' 2 '%s' 3 '%s' 4 '%s'\n", argc, argv[0], argv[1], argv[2], argv[3]); if (argc >= 4) { - switch_call_cause_t *cause; + switch_call_cause_t cause; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "executing conference outcall\n"); conference_outcall(member->conference, NULL, argv[0], atoi(argv[1]), NULL, argv[3], argv[2], &cause); } else { @@ -3466,9 +3466,9 @@ if (call) { switch_call_cause_t cause; + switch_event_t *event; conference_outcall(call->conference, call->session, call->bridgeto, call->timeout, call->flags, call->cid_name, call->cid_num, &cause); - switch_event_t *event; 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", call->conference->name); @@ -3523,7 +3523,11 @@ switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE); switch_thread_create(&thread, thd_attr, conference_outcall_run, call, conference->pool); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Lanuching BG Thread for outcall\n"); + + return SWITCH_STATUS_SUCCESS; } + + return SWITCH_STATUS_MEMERR; } /* Play a file */

1 0