September 2008 - freeswitch-svn@lists.freeswitch.org

[Freeswitch-svn] [commit] r9752 - in freeswitch/trunk/src: . include mod/endpoints/mod_sofia mod/formats/mod_shout
by Freeswitch SVN 29 Sep '08

29 Sep '08

Author: anthm Date: Mon Sep 29 19:03:27 2008 New Revision: 9752 Modified: freeswitch/trunk/src/include/switch_rtp.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c freeswitch/trunk/src/mod/formats/mod_shout/Makefile freeswitch/trunk/src/switch_rtp.c Log: tweak Modified: freeswitch/trunk/src/include/switch_rtp.h ============================================================================== --- freeswitch/trunk/src/include/switch_rtp.h (original) +++ freeswitch/trunk/src/include/switch_rtp.h Mon Sep 29 19:03:27 2008 @@ -161,7 +161,8 @@ \param port the remote port \param err pointer for error messages */ -SWITCH_DECLARE(switch_status_t) switch_rtp_set_remote_address(switch_rtp_t *rtp_session, const char *host, switch_port_t port, const char **err); +SWITCH_DECLARE(switch_status_t) switch_rtp_set_remote_address(switch_rtp_t *rtp_session, const char *host, switch_port_t port, + switch_bool_t change_adv_addr, const char **err); SWITCH_DECLARE(char *) switch_rtp_get_remote_host(switch_rtp_t *rtp_session); SWITCH_DECLARE(switch_port_t) switch_rtp_get_remote_port(switch_rtp_t *rtp_session); @@ -173,10 +174,12 @@ \param rtp_session an RTP session to assign the local address to \param host the ip or fqhn of the local address \param port the local port + \param change_adv_addr change the advertised address for doing compare \param err pointer for error messages \note this call also binds the RTP session's socket to the new address */ -SWITCH_DECLARE(switch_status_t) switch_rtp_set_local_address(switch_rtp_t *rtp_session, const char *host, switch_port_t port, const char **err); +SWITCH_DECLARE(switch_status_t) switch_rtp_set_local_address(switch_rtp_t *rtp_session, const char *host, + switch_port_t port, const char **err); /*! \brief Kill the socket on an existing RTP session 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 Mon Sep 29 19:03:27 2008 @@ -858,7 +858,8 @@ switch_set_flag_locked(tech_pvt, TFLAG_VIDEO); switch_channel_set_flag(tech_pvt->channel, CF_VIDEO); if (switch_rtp_ready(tech_pvt->video_rtp_session)) { - if (switch_rtp_set_remote_address(tech_pvt->video_rtp_session, tech_pvt->remote_sdp_video_ip, tech_pvt->remote_sdp_video_port, &err) != + if (switch_rtp_set_remote_address(tech_pvt->video_rtp_session, tech_pvt->remote_sdp_video_ip, + tech_pvt->remote_sdp_video_port, SWITCH_TRUE, &err) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "VIDEO RTP REPORTS ERROR: [%s]\n", err); } else { @@ -881,7 +882,7 @@ } if (switch_rtp_ready(tech_pvt->rtp_session)) { - if (switch_rtp_set_remote_address(tech_pvt->rtp_session, tech_pvt->remote_sdp_audio_ip, tech_pvt->remote_sdp_audio_port, &err) != + if (switch_rtp_set_remote_address(tech_pvt->rtp_session, tech_pvt->remote_sdp_audio_ip, tech_pvt->remote_sdp_audio_port, SWITCH_TRUE, &err) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "AUDIO RTP REPORTS ERROR: [%s]\n", err); } else { @@ -1788,7 +1789,7 @@ if (tech_pvt->rtp_session && switch_test_flag(tech_pvt, TFLAG_REINVITE)) { switch_clear_flag_locked(tech_pvt, TFLAG_REINVITE); - if (switch_rtp_set_remote_address(tech_pvt->rtp_session, tech_pvt->remote_sdp_audio_ip, tech_pvt->remote_sdp_audio_port, &err) != + if (switch_rtp_set_remote_address(tech_pvt->rtp_session, tech_pvt->remote_sdp_audio_ip, tech_pvt->remote_sdp_audio_port, SWITCH_TRUE, &err) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "AUDIO RTP REPORTS ERROR: [%s]\n", err); } else { Modified: freeswitch/trunk/src/mod/formats/mod_shout/Makefile ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_shout/Makefile (original) +++ freeswitch/trunk/src/mod/formats/mod_shout/Makefile Mon Sep 29 19:03:27 2008 @@ -30,7 +30,7 @@ $(GETLIB) $(MPG123).tar.gz $(MPG123_DIR)/Makefile: $(MPG123_DIR) - cd $(MPG123_DIR) && ./configure --disable-shared --with-pic + cd $(MPG123_DIR) && CFLAGS=$(AM_CFLAGS) ./configure --disable-shared --with-pic $(TOUCH_TARGET) $(MPG123LA): $(MPG123_DIR)/Makefile Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Mon Sep 29 19:03:27 2008 @@ -196,6 +196,7 @@ int writing; char *stun_ip; switch_port_t stun_port; + int from_auto; }; static int global_init = 0; @@ -609,7 +610,8 @@ } -SWITCH_DECLARE(switch_status_t) switch_rtp_set_remote_address(switch_rtp_t *rtp_session, const char *host, switch_port_t port, const char **err) +SWITCH_DECLARE(switch_status_t) switch_rtp_set_remote_address(switch_rtp_t *rtp_session, const char *host, switch_port_t port, + switch_bool_t change_adv_addr, const char **err) { switch_sockaddr_t *remote_addr; switch_status_t status = SWITCH_STATUS_SUCCESS; @@ -623,8 +625,11 @@ switch_mutex_lock(rtp_session->write_mutex); rtp_session->remote_addr = remote_addr; - rtp_session->remote_host_str = switch_core_strdup(rtp_session->pool, host); - rtp_session->remote_port = port; + + if (change_adv_addr) { + rtp_session->remote_host_str = switch_core_strdup(rtp_session->pool, host); + rtp_session->remote_port = port; + } if (rtp_session->sock_input && switch_sockaddr_get_family(rtp_session->remote_addr) == @@ -886,7 +891,7 @@ goto end; } - if (switch_rtp_set_remote_address(rtp_session, tx_host, tx_port, err) != SWITCH_STATUS_SUCCESS) { + if (switch_rtp_set_remote_address(rtp_session, tx_host, tx_port, SWITCH_TRUE, err) != SWITCH_STATUS_SUCCESS) { switch_mutex_unlock(rtp_session->flag_mutex); rtp_session = NULL; goto end; @@ -1235,12 +1240,15 @@ uint8_t check = 0; stfu_frame_t *jb_frame; int ret = -1; - + int sleep_mss = 1000; + if (!switch_rtp_ready(rtp_session)) { return -1; } - if (!rtp_session->timer.interval) { + if (rtp_session->timer.interval) { + sleep_mss = 1000;//rtp_session->timer.interval * 1000; + } else { rtp_session->last_time = switch_time_now(); } @@ -1272,7 +1280,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Auto Changing port from %s:%u to %s:%u\n", old_host, old, tx_host, switch_sockaddr_get_port(rtp_session->from_addr)); - switch_rtp_set_remote_address(rtp_session, tx_host, switch_sockaddr_get_port(rtp_session->from_addr), &err); + switch_rtp_set_remote_address(rtp_session, tx_host, switch_sockaddr_get_port(rtp_session->from_addr), SWITCH_FALSE, &err); switch_clear_flag_locked(rtp_session, SWITCH_RTP_FLAG_AUTOADJ); } } @@ -1544,8 +1552,12 @@ break; do_continue: - - switch_yield(1000); + + if (sleep_mss) { + switch_yield(sleep_mss); + } else { + switch_yield(1000); + } } if (switch_rtp_ready(rtp_session)) {

1 0

[Freeswitch-svn] [commit] r9751 - freeswitch/trunk/conf/directory/default
by Freeswitch SVN 29 Sep '08

29 Sep '08

Author: brian Date: Mon Sep 29 17:33:01 2008 New Revision: 9751 Modified: freeswitch/trunk/conf/directory/default/1000.xml freeswitch/trunk/conf/directory/default/1001.xml freeswitch/trunk/conf/directory/default/1002.xml freeswitch/trunk/conf/directory/default/1003.xml freeswitch/trunk/conf/directory/default/1004.xml freeswitch/trunk/conf/directory/default/1005.xml freeswitch/trunk/conf/directory/default/1006.xml freeswitch/trunk/conf/directory/default/1007.xml freeswitch/trunk/conf/directory/default/1008.xml freeswitch/trunk/conf/directory/default/1009.xml freeswitch/trunk/conf/directory/default/1010.xml freeswitch/trunk/conf/directory/default/1011.xml freeswitch/trunk/conf/directory/default/1012.xml freeswitch/trunk/conf/directory/default/1013.xml freeswitch/trunk/conf/directory/default/1014.xml freeswitch/trunk/conf/directory/default/1015.xml freeswitch/trunk/conf/directory/default/1016.xml freeswitch/trunk/conf/directory/default/1017.xml freeswitch/trunk/conf/directory/default/1018.xml freeswitch/trunk/conf/directory/default/1019.xml Log: fix this name Modified: freeswitch/trunk/conf/directory/default/1000.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1000.xml (original) +++ freeswitch/trunk/conf/directory/default/1000.xml Mon Sep 29 17:33:01 2008 @@ -11,7 +11,7 @@ <variable name="effective_caller_id_name" value="Extension 1000"/> <variable name="effective_caller_id_number" value="1000"/> <variable name="outbound_caller_id_name" value="$${outbound_caller_name}"/> - <variable name="outbound_caller_id_number" value="$${outbound_caller_number}"/> + <variable name="outbound_caller_id_number" value="$${outbound_caller_id}"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1001.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1001.xml (original) +++ freeswitch/trunk/conf/directory/default/1001.xml Mon Sep 29 17:33:01 2008 @@ -11,7 +11,7 @@ <variable name="effective_caller_id_name" value="Extension 1001"/> <variable name="effective_caller_id_number" value="1001"/> <variable name="outbound_caller_id_name" value="$${outbound_caller_name}"/> - <variable name="outbound_caller_id_number" value="$${outbound_caller_number}"/> + <variable name="outbound_caller_id_number" value="$${outbound_caller_id}"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1002.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1002.xml (original) +++ freeswitch/trunk/conf/directory/default/1002.xml Mon Sep 29 17:33:01 2008 @@ -11,7 +11,7 @@ <variable name="effective_caller_id_name" value="Extension 1002"/> <variable name="effective_caller_id_number" value="1002"/> <variable name="outbound_caller_id_name" value="$${outbound_caller_name}"/> - <variable name="outbound_caller_id_number" value="$${outbound_caller_number}"/> + <variable name="outbound_caller_id_number" value="$${outbound_caller_id}"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1003.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1003.xml (original) +++ freeswitch/trunk/conf/directory/default/1003.xml Mon Sep 29 17:33:01 2008 @@ -11,7 +11,7 @@ <variable name="effective_caller_id_name" value="Extension 1003"/> <variable name="effective_caller_id_number" value="1003"/> <variable name="outbound_caller_id_name" value="$${outbound_caller_name}"/> - <variable name="outbound_caller_id_number" value="$${outbound_caller_number}"/> + <variable name="outbound_caller_id_number" value="$${outbound_caller_id}"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1004.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1004.xml (original) +++ freeswitch/trunk/conf/directory/default/1004.xml Mon Sep 29 17:33:01 2008 @@ -11,7 +11,7 @@ <variable name="effective_caller_id_name" value="Extension 1004"/> <variable name="effective_caller_id_number" value="1004"/> <variable name="outbound_caller_id_name" value="$${outbound_caller_name}"/> - <variable name="outbound_caller_id_number" value="$${outbound_caller_number}"/> + <variable name="outbound_caller_id_number" value="$${outbound_caller_id}"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1005.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1005.xml (original) +++ freeswitch/trunk/conf/directory/default/1005.xml Mon Sep 29 17:33:01 2008 @@ -11,7 +11,7 @@ <variable name="effective_caller_id_name" value="Extension 1005"/> <variable name="effective_caller_id_number" value="1005"/> <variable name="outbound_caller_id_name" value="$${outbound_caller_name}"/> - <variable name="outbound_caller_id_number" value="$${outbound_caller_number}"/> + <variable name="outbound_caller_id_number" value="$${outbound_caller_id}"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1006.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1006.xml (original) +++ freeswitch/trunk/conf/directory/default/1006.xml Mon Sep 29 17:33:01 2008 @@ -11,7 +11,7 @@ <variable name="effective_caller_id_name" value="Extension 1006"/> <variable name="effective_caller_id_number" value="1006"/> <variable name="outbound_caller_id_name" value="$${outbound_caller_name}"/> - <variable name="outbound_caller_id_number" value="$${outbound_caller_number}"/> + <variable name="outbound_caller_id_number" value="$${outbound_caller_id}"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1007.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1007.xml (original) +++ freeswitch/trunk/conf/directory/default/1007.xml Mon Sep 29 17:33:01 2008 @@ -11,7 +11,7 @@ <variable name="effective_caller_id_name" value="Extension 1007"/> <variable name="effective_caller_id_number" value="1007"/> <variable name="outbound_caller_id_name" value="$${outbound_caller_name}"/> - <variable name="outbound_caller_id_number" value="$${outbound_caller_number}"/> + <variable name="outbound_caller_id_number" value="$${outbound_caller_id}"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1008.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1008.xml (original) +++ freeswitch/trunk/conf/directory/default/1008.xml Mon Sep 29 17:33:01 2008 @@ -11,7 +11,7 @@ <variable name="effective_caller_id_name" value="Extension 1008"/> <variable name="effective_caller_id_number" value="1008"/> <variable name="outbound_caller_id_name" value="$${outbound_caller_name}"/> - <variable name="outbound_caller_id_number" value="$${outbound_caller_number}"/> + <variable name="outbound_caller_id_number" value="$${outbound_caller_id}"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1009.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1009.xml (original) +++ freeswitch/trunk/conf/directory/default/1009.xml Mon Sep 29 17:33:01 2008 @@ -11,7 +11,7 @@ <variable name="effective_caller_id_name" value="Extension 1009"/> <variable name="effective_caller_id_number" value="1009"/> <variable name="outbound_caller_id_name" value="$${outbound_caller_name}"/> - <variable name="outbound_caller_id_number" value="$${outbound_caller_number}"/> + <variable name="outbound_caller_id_number" value="$${outbound_caller_id}"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1010.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1010.xml (original) +++ freeswitch/trunk/conf/directory/default/1010.xml Mon Sep 29 17:33:01 2008 @@ -11,7 +11,7 @@ <variable name="effective_caller_id_name" value="Extension 1010"/> <variable name="effective_caller_id_number" value="1010"/> <variable name="outbound_caller_id_name" value="$${outbound_caller_name}"/> - <variable name="outbound_caller_id_number" value="$${outbound_caller_number}"/> + <variable name="outbound_caller_id_number" value="$${outbound_caller_id}"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1011.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1011.xml (original) +++ freeswitch/trunk/conf/directory/default/1011.xml Mon Sep 29 17:33:01 2008 @@ -11,7 +11,7 @@ <variable name="effective_caller_id_name" value="Extension 1011"/> <variable name="effective_caller_id_number" value="1011"/> <variable name="outbound_caller_id_name" value="$${outbound_caller_name}"/> - <variable name="outbound_caller_id_number" value="$${outbound_caller_number}"/> + <variable name="outbound_caller_id_number" value="$${outbound_caller_id}"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1012.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1012.xml (original) +++ freeswitch/trunk/conf/directory/default/1012.xml Mon Sep 29 17:33:01 2008 @@ -11,7 +11,7 @@ <variable name="effective_caller_id_name" value="Extension 1012"/> <variable name="effective_caller_id_number" value="1012"/> <variable name="outbound_caller_id_name" value="$${outbound_caller_name}"/> - <variable name="outbound_caller_id_number" value="$${outbound_caller_number}"/> + <variable name="outbound_caller_id_number" value="$${outbound_caller_id}"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1013.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1013.xml (original) +++ freeswitch/trunk/conf/directory/default/1013.xml Mon Sep 29 17:33:01 2008 @@ -11,7 +11,7 @@ <variable name="effective_caller_id_name" value="Extension 1013"/> <variable name="effective_caller_id_number" value="1013"/> <variable name="outbound_caller_id_name" value="$${outbound_caller_name}"/> - <variable name="outbound_caller_id_number" value="$${outbound_caller_number}"/> + <variable name="outbound_caller_id_number" value="$${outbound_caller_id}"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1014.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1014.xml (original) +++ freeswitch/trunk/conf/directory/default/1014.xml Mon Sep 29 17:33:01 2008 @@ -11,7 +11,7 @@ <variable name="effective_caller_id_name" value="Extension 1014"/> <variable name="effective_caller_id_number" value="1014"/> <variable name="outbound_caller_id_name" value="$${outbound_caller_name}"/> - <variable name="outbound_caller_id_number" value="$${outbound_caller_number}"/> + <variable name="outbound_caller_id_number" value="$${outbound_caller_id}"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1015.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1015.xml (original) +++ freeswitch/trunk/conf/directory/default/1015.xml Mon Sep 29 17:33:01 2008 @@ -11,7 +11,7 @@ <variable name="effective_caller_id_name" value="Extension 1015"/> <variable name="effective_caller_id_number" value="1015"/> <variable name="outbound_caller_id_name" value="$${outbound_caller_name}"/> - <variable name="outbound_caller_id_number" value="$${outbound_caller_number}"/> + <variable name="outbound_caller_id_number" value="$${outbound_caller_id}"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1016.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1016.xml (original) +++ freeswitch/trunk/conf/directory/default/1016.xml Mon Sep 29 17:33:01 2008 @@ -11,7 +11,7 @@ <variable name="effective_caller_id_name" value="Extension 1016"/> <variable name="effective_caller_id_number" value="1016"/> <variable name="outbound_caller_id_name" value="$${outbound_caller_name}"/> - <variable name="outbound_caller_id_number" value="$${outbound_caller_number}"/> + <variable name="outbound_caller_id_number" value="$${outbound_caller_id}"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1017.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1017.xml (original) +++ freeswitch/trunk/conf/directory/default/1017.xml Mon Sep 29 17:33:01 2008 @@ -11,7 +11,7 @@ <variable name="effective_caller_id_name" value="Extension 1017"/> <variable name="effective_caller_id_number" value="1017"/> <variable name="outbound_caller_id_name" value="$${outbound_caller_name}"/> - <variable name="outbound_caller_id_number" value="$${outbound_caller_number}"/> + <variable name="outbound_caller_id_number" value="$${outbound_caller_id}"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1018.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1018.xml (original) +++ freeswitch/trunk/conf/directory/default/1018.xml Mon Sep 29 17:33:01 2008 @@ -11,7 +11,7 @@ <variable name="effective_caller_id_name" value="Extension 1018"/> <variable name="effective_caller_id_number" value="1018"/> <variable name="outbound_caller_id_name" value="$${outbound_caller_name}"/> - <variable name="outbound_caller_id_number" value="$${outbound_caller_number}"/> + <variable name="outbound_caller_id_number" value="$${outbound_caller_id}"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1019.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1019.xml (original) +++ freeswitch/trunk/conf/directory/default/1019.xml Mon Sep 29 17:33:01 2008 @@ -11,7 +11,7 @@ <variable name="effective_caller_id_name" value="Extension 1019"/> <variable name="effective_caller_id_number" value="1019"/> <variable name="outbound_caller_id_name" value="$${outbound_caller_name}"/> - <variable name="outbound_caller_id_number" value="$${outbound_caller_number}"/> + <variable name="outbound_caller_id_number" value="$${outbound_caller_id}"/> </variables> </user> </include>

1 0

[Freeswitch-svn] [commit] r9750 - in freeswitch/trunk/conf: . directory directory/default
by Freeswitch SVN 29 Sep '08

29 Sep '08

Author: brian Date: Mon Sep 29 17:30:11 2008 New Revision: 9750 Added: freeswitch/trunk/conf/directory/default/provider.com.xml Modified: freeswitch/trunk/conf/directory/default.xml freeswitch/trunk/conf/directory/default/1000.xml freeswitch/trunk/conf/directory/default/1001.xml freeswitch/trunk/conf/directory/default/1002.xml freeswitch/trunk/conf/directory/default/1003.xml freeswitch/trunk/conf/directory/default/1004.xml freeswitch/trunk/conf/directory/default/1005.xml freeswitch/trunk/conf/directory/default/1006.xml freeswitch/trunk/conf/directory/default/1007.xml freeswitch/trunk/conf/directory/default/1008.xml freeswitch/trunk/conf/directory/default/1009.xml freeswitch/trunk/conf/directory/default/1010.xml freeswitch/trunk/conf/directory/default/1011.xml freeswitch/trunk/conf/directory/default/1012.xml freeswitch/trunk/conf/directory/default/1013.xml freeswitch/trunk/conf/directory/default/1014.xml freeswitch/trunk/conf/directory/default/1015.xml freeswitch/trunk/conf/directory/default/1016.xml freeswitch/trunk/conf/directory/default/1017.xml freeswitch/trunk/conf/directory/default/1018.xml freeswitch/trunk/conf/directory/default/1019.xml freeswitch/trunk/conf/vars.xml Log: more fun stuff Modified: freeswitch/trunk/conf/directory/default.xml ============================================================================== --- freeswitch/trunk/conf/directory/default.xml (original) +++ freeswitch/trunk/conf/directory/default.xml Mon Sep 29 17:30:11 2008 @@ -26,8 +26,8 @@ <variables> <variable name="record_stereo" value="true"/> - <variable name="default_gateway" value="asterlink.com"/> - <variable name="default_areacode" value="918"/> + <variable name="default_gateway" value="$${default_provider}"/> + <variable name="default_areacode" value="$${default_areacode}"/> </variables> <X-PRE-PROCESS cmd="include" data="default/*.xml"/> Modified: freeswitch/trunk/conf/directory/default/1000.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1000.xml (original) +++ freeswitch/trunk/conf/directory/default/1000.xml Mon Sep 29 17:30:11 2008 @@ -10,8 +10,8 @@ <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1000"/> <variable name="effective_caller_id_number" value="1000"/> - <variable name="outbound_caller_id_name" value="Acme Corporation"/> - <variable name="outbound_caller_id_number" value="5552566639"/> + <variable name="outbound_caller_id_name" value="$${outbound_caller_name}"/> + <variable name="outbound_caller_id_number" value="$${outbound_caller_number}"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1001.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1001.xml (original) +++ freeswitch/trunk/conf/directory/default/1001.xml Mon Sep 29 17:30:11 2008 @@ -10,8 +10,8 @@ <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1001"/> <variable name="effective_caller_id_number" value="1001"/> - <variable name="outbound_caller_id_name" value="Acme Corporation"/> - <variable name="outbound_caller_id_number" value="5552566639"/> + <variable name="outbound_caller_id_name" value="$${outbound_caller_name}"/> + <variable name="outbound_caller_id_number" value="$${outbound_caller_number}"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1002.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1002.xml (original) +++ freeswitch/trunk/conf/directory/default/1002.xml Mon Sep 29 17:30:11 2008 @@ -10,8 +10,8 @@ <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1002"/> <variable name="effective_caller_id_number" value="1002"/> - <variable name="outbound_caller_id_name" value="Acme Corporation"/> - <variable name="outbound_caller_id_number" value="5552566639"/> + <variable name="outbound_caller_id_name" value="$${outbound_caller_name}"/> + <variable name="outbound_caller_id_number" value="$${outbound_caller_number}"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1003.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1003.xml (original) +++ freeswitch/trunk/conf/directory/default/1003.xml Mon Sep 29 17:30:11 2008 @@ -10,8 +10,8 @@ <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1003"/> <variable name="effective_caller_id_number" value="1003"/> - <variable name="outbound_caller_id_name" value="Acme Corporation"/> - <variable name="outbound_caller_id_number" value="5552566639"/> + <variable name="outbound_caller_id_name" value="$${outbound_caller_name}"/> + <variable name="outbound_caller_id_number" value="$${outbound_caller_number}"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1004.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1004.xml (original) +++ freeswitch/trunk/conf/directory/default/1004.xml Mon Sep 29 17:30:11 2008 @@ -10,8 +10,8 @@ <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1004"/> <variable name="effective_caller_id_number" value="1004"/> - <variable name="outbound_caller_id_name" value="Acme Corporation"/> - <variable name="outbound_caller_id_number" value="5552566639"/> + <variable name="outbound_caller_id_name" value="$${outbound_caller_name}"/> + <variable name="outbound_caller_id_number" value="$${outbound_caller_number}"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1005.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1005.xml (original) +++ freeswitch/trunk/conf/directory/default/1005.xml Mon Sep 29 17:30:11 2008 @@ -10,8 +10,8 @@ <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1005"/> <variable name="effective_caller_id_number" value="1005"/> - <variable name="outbound_caller_id_name" value="Acme Corporation"/> - <variable name="outbound_caller_id_number" value="5552566639"/> + <variable name="outbound_caller_id_name" value="$${outbound_caller_name}"/> + <variable name="outbound_caller_id_number" value="$${outbound_caller_number}"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1006.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1006.xml (original) +++ freeswitch/trunk/conf/directory/default/1006.xml Mon Sep 29 17:30:11 2008 @@ -10,8 +10,8 @@ <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1006"/> <variable name="effective_caller_id_number" value="1006"/> - <variable name="outbound_caller_id_name" value="Acme Corporation"/> - <variable name="outbound_caller_id_number" value="5552566639"/> + <variable name="outbound_caller_id_name" value="$${outbound_caller_name}"/> + <variable name="outbound_caller_id_number" value="$${outbound_caller_number}"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1007.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1007.xml (original) +++ freeswitch/trunk/conf/directory/default/1007.xml Mon Sep 29 17:30:11 2008 @@ -10,8 +10,8 @@ <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1007"/> <variable name="effective_caller_id_number" value="1007"/> - <variable name="outbound_caller_id_name" value="Acme Corporation"/> - <variable name="outbound_caller_id_number" value="5552566639"/> + <variable name="outbound_caller_id_name" value="$${outbound_caller_name}"/> + <variable name="outbound_caller_id_number" value="$${outbound_caller_number}"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1008.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1008.xml (original) +++ freeswitch/trunk/conf/directory/default/1008.xml Mon Sep 29 17:30:11 2008 @@ -10,8 +10,8 @@ <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1008"/> <variable name="effective_caller_id_number" value="1008"/> - <variable name="outbound_caller_id_name" value="Acme Corporation"/> - <variable name="outbound_caller_id_number" value="5552566639"/> + <variable name="outbound_caller_id_name" value="$${outbound_caller_name}"/> + <variable name="outbound_caller_id_number" value="$${outbound_caller_number}"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1009.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1009.xml (original) +++ freeswitch/trunk/conf/directory/default/1009.xml Mon Sep 29 17:30:11 2008 @@ -10,8 +10,8 @@ <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1009"/> <variable name="effective_caller_id_number" value="1009"/> - <variable name="outbound_caller_id_name" value="Acme Corporation"/> - <variable name="outbound_caller_id_number" value="5552566639"/> + <variable name="outbound_caller_id_name" value="$${outbound_caller_name}"/> + <variable name="outbound_caller_id_number" value="$${outbound_caller_number}"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1010.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1010.xml (original) +++ freeswitch/trunk/conf/directory/default/1010.xml Mon Sep 29 17:30:11 2008 @@ -10,8 +10,8 @@ <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1010"/> <variable name="effective_caller_id_number" value="1010"/> - <variable name="outbound_caller_id_name" value="Acme Corporation"/> - <variable name="outbound_caller_id_number" value="5552566639"/> + <variable name="outbound_caller_id_name" value="$${outbound_caller_name}"/> + <variable name="outbound_caller_id_number" value="$${outbound_caller_number}"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1011.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1011.xml (original) +++ freeswitch/trunk/conf/directory/default/1011.xml Mon Sep 29 17:30:11 2008 @@ -10,8 +10,8 @@ <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1011"/> <variable name="effective_caller_id_number" value="1011"/> - <variable name="outbound_caller_id_name" value="Acme Corporation"/> - <variable name="outbound_caller_id_number" value="5552566639"/> + <variable name="outbound_caller_id_name" value="$${outbound_caller_name}"/> + <variable name="outbound_caller_id_number" value="$${outbound_caller_number}"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1012.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1012.xml (original) +++ freeswitch/trunk/conf/directory/default/1012.xml Mon Sep 29 17:30:11 2008 @@ -10,8 +10,8 @@ <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1012"/> <variable name="effective_caller_id_number" value="1012"/> - <variable name="outbound_caller_id_name" value="Acme Corporation"/> - <variable name="outbound_caller_id_number" value="5552566639"/> + <variable name="outbound_caller_id_name" value="$${outbound_caller_name}"/> + <variable name="outbound_caller_id_number" value="$${outbound_caller_number}"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1013.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1013.xml (original) +++ freeswitch/trunk/conf/directory/default/1013.xml Mon Sep 29 17:30:11 2008 @@ -10,8 +10,8 @@ <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1013"/> <variable name="effective_caller_id_number" value="1013"/> - <variable name="outbound_caller_id_name" value="Acme Corporation"/> - <variable name="outbound_caller_id_number" value="5552566639"/> + <variable name="outbound_caller_id_name" value="$${outbound_caller_name}"/> + <variable name="outbound_caller_id_number" value="$${outbound_caller_number}"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1014.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1014.xml (original) +++ freeswitch/trunk/conf/directory/default/1014.xml Mon Sep 29 17:30:11 2008 @@ -10,8 +10,8 @@ <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1014"/> <variable name="effective_caller_id_number" value="1014"/> - <variable name="outbound_caller_id_name" value="Acme Corporation"/> - <variable name="outbound_caller_id_number" value="5552566639"/> + <variable name="outbound_caller_id_name" value="$${outbound_caller_name}"/> + <variable name="outbound_caller_id_number" value="$${outbound_caller_number}"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1015.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1015.xml (original) +++ freeswitch/trunk/conf/directory/default/1015.xml Mon Sep 29 17:30:11 2008 @@ -10,8 +10,8 @@ <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1015"/> <variable name="effective_caller_id_number" value="1015"/> - <variable name="outbound_caller_id_name" value="Acme Corporation"/> - <variable name="outbound_caller_id_number" value="5552566639"/> + <variable name="outbound_caller_id_name" value="$${outbound_caller_name}"/> + <variable name="outbound_caller_id_number" value="$${outbound_caller_number}"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1016.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1016.xml (original) +++ freeswitch/trunk/conf/directory/default/1016.xml Mon Sep 29 17:30:11 2008 @@ -10,8 +10,8 @@ <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1016"/> <variable name="effective_caller_id_number" value="1016"/> - <variable name="outbound_caller_id_name" value="Acme Corporation"/> - <variable name="outbound_caller_id_number" value="5552566639"/> + <variable name="outbound_caller_id_name" value="$${outbound_caller_name}"/> + <variable name="outbound_caller_id_number" value="$${outbound_caller_number}"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1017.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1017.xml (original) +++ freeswitch/trunk/conf/directory/default/1017.xml Mon Sep 29 17:30:11 2008 @@ -10,8 +10,8 @@ <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1017"/> <variable name="effective_caller_id_number" value="1017"/> - <variable name="outbound_caller_id_name" value="Acme Corporation"/> - <variable name="outbound_caller_id_number" value="5552566639"/> + <variable name="outbound_caller_id_name" value="$${outbound_caller_name}"/> + <variable name="outbound_caller_id_number" value="$${outbound_caller_number}"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1018.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1018.xml (original) +++ freeswitch/trunk/conf/directory/default/1018.xml Mon Sep 29 17:30:11 2008 @@ -10,8 +10,8 @@ <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1018"/> <variable name="effective_caller_id_number" value="1018"/> - <variable name="outbound_caller_id_name" value="Acme Corporation"/> - <variable name="outbound_caller_id_number" value="5552566639"/> + <variable name="outbound_caller_id_name" value="$${outbound_caller_name}"/> + <variable name="outbound_caller_id_number" value="$${outbound_caller_number}"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1019.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1019.xml (original) +++ freeswitch/trunk/conf/directory/default/1019.xml Mon Sep 29 17:30:11 2008 @@ -10,8 +10,8 @@ <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1019"/> <variable name="effective_caller_id_number" value="1019"/> - <variable name="outbound_caller_id_name" value="Acme Corporation"/> - <variable name="outbound_caller_id_number" value="5552566639"/> + <variable name="outbound_caller_id_name" value="$${outbound_caller_name}"/> + <variable name="outbound_caller_id_number" value="$${outbound_caller_number}"/> </variables> </user> </include> Added: freeswitch/trunk/conf/directory/default/provider.com.xml ============================================================================== --- (empty file) +++ freeswitch/trunk/conf/directory/default/provider.com.xml Mon Sep 29 17:30:11 2008 @@ -0,0 +1,26 @@ + +<include> + <user id="$${default_provider}"> + <gateways> + <gateway name="$${default_provider}"> + <param name="username" value="$${default_provider_username}"/> + <param name="password" value="$${default_provider_password}"/> + <param name="from-user" value="$${default_provider_username}"/> + <param name="from-domain" value="$${default_provider_from_domain}"/> + <param name="expire-seconds" value="600"/> + <param name="register" value="$${default_provider_register}"/> + <param name="retry-seconds" value="30"/> + <param name="extension" value="$${default_provider_contact}"/> + <param name="contact-params" value="domain_name=$${domain}"/> + <param name="context" value="public"/> + </gateway> + </gateways> + <params> + <param name="password" value="$${default_provider_password}"/> + </params> + </user> +</include> + Modified: freeswitch/trunk/conf/vars.xml ============================================================================== --- freeswitch/trunk/conf/vars.xml (original) +++ freeswitch/trunk/conf/vars.xml Mon Sep 29 17:30:11 2008 @@ -95,14 +95,35 @@ <X-PRE-PROCESS cmd="set" data="unroll_loops=true"/>  <X-PRE-PROCESS cmd="set" data="outbound_caller_name=FreeSWITCH"/> <X-PRE-PROCESS cmd="set" data="outbound_caller_id=0000000000"/> + +  <X-PRE-PROCESS cmd="set" data="call_debug=false"/> <X-PRE-PROCESS cmd="set" data="console_loglevel=info"/> + <X-PRE-PROCESS cmd="set" data="default_areacode=918"/> <X-PRE-PROCESS cmd="set" data="uk-ring=%(400,200,400,450);%(400,2200,400,450)"/> <X-PRE-PROCESS cmd="set" data="us-ring=%(2000, 4000, 440.0, 480.0)"/> <X-PRE-PROCESS cmd="set" data="fr-ring=%(1500, 3500, 440.0, 0.0)"/> <X-PRE-PROCESS cmd="set" data="bong-ring=v=-7;%(100,0,941.0,1477.0);v=-7;>=2;+=.1;%(1400,0,350,440)"/> +  + <X-PRE-PROCESS cmd="set" data="default_provider=provider.com"/> + <X-PRE-PROCESS cmd="set" data="default_provider_username=joeuser"/> + <X-PRE-PROCESS cmd="set" data="default_provider_password=password"/> + <X-PRE-PROCESS cmd="set" data="default_provider_from_domain=provider.com"/> +  + <X-PRE-PROCESS cmd="set" data="default_provider_register=false"/> + <X-PRE-PROCESS cmd="set" data="default_provider_contact=5000"/> + + <X-PRE-PROCESS cmd="include" data="../local_vars.xml"/> +

1 0

[Freeswitch-svn] [commit] r9749 - freeswitch/trunk/conf/directory/default
by Freeswitch SVN 29 Sep '08

29 Sep '08

Author: brian Date: Mon Sep 29 16:59:10 2008 New Revision: 9749 Modified: freeswitch/trunk/conf/directory/default/1000.xml freeswitch/trunk/conf/directory/default/1001.xml freeswitch/trunk/conf/directory/default/1002.xml freeswitch/trunk/conf/directory/default/1003.xml freeswitch/trunk/conf/directory/default/1004.xml freeswitch/trunk/conf/directory/default/1005.xml freeswitch/trunk/conf/directory/default/1006.xml freeswitch/trunk/conf/directory/default/1007.xml freeswitch/trunk/conf/directory/default/1008.xml freeswitch/trunk/conf/directory/default/1009.xml freeswitch/trunk/conf/directory/default/1010.xml freeswitch/trunk/conf/directory/default/1011.xml freeswitch/trunk/conf/directory/default/1012.xml freeswitch/trunk/conf/directory/default/1013.xml freeswitch/trunk/conf/directory/default/1014.xml freeswitch/trunk/conf/directory/default/1015.xml freeswitch/trunk/conf/directory/default/1016.xml freeswitch/trunk/conf/directory/default/1017.xml freeswitch/trunk/conf/directory/default/1018.xml freeswitch/trunk/conf/directory/default/1019.xml Log: woops its outbound not external... note this is just a var I made up. Modified: freeswitch/trunk/conf/directory/default/1000.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1000.xml (original) +++ freeswitch/trunk/conf/directory/default/1000.xml Mon Sep 29 16:59:10 2008 @@ -10,8 +10,8 @@ <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1000"/> <variable name="effective_caller_id_number" value="1000"/> - <variable name="external_caller_id_name" value="Acme Corporation"/> - <variable name="external_caller_id_number" value="5552566639"/> + <variable name="outbound_caller_id_name" value="Acme Corporation"/> + <variable name="outbound_caller_id_number" value="5552566639"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1001.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1001.xml (original) +++ freeswitch/trunk/conf/directory/default/1001.xml Mon Sep 29 16:59:10 2008 @@ -10,8 +10,8 @@ <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1001"/> <variable name="effective_caller_id_number" value="1001"/> - <variable name="external_caller_id_name" value="Acme Corporation"/> - <variable name="external_caller_id_number" value="5552566639"/> + <variable name="outbound_caller_id_name" value="Acme Corporation"/> + <variable name="outbound_caller_id_number" value="5552566639"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1002.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1002.xml (original) +++ freeswitch/trunk/conf/directory/default/1002.xml Mon Sep 29 16:59:10 2008 @@ -10,8 +10,8 @@ <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1002"/> <variable name="effective_caller_id_number" value="1002"/> - <variable name="external_caller_id_name" value="Acme Corporation"/> - <variable name="external_caller_id_number" value="5552566639"/> + <variable name="outbound_caller_id_name" value="Acme Corporation"/> + <variable name="outbound_caller_id_number" value="5552566639"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1003.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1003.xml (original) +++ freeswitch/trunk/conf/directory/default/1003.xml Mon Sep 29 16:59:10 2008 @@ -10,8 +10,8 @@ <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1003"/> <variable name="effective_caller_id_number" value="1003"/> - <variable name="external_caller_id_name" value="Acme Corporation"/> - <variable name="external_caller_id_number" value="5552566639"/> + <variable name="outbound_caller_id_name" value="Acme Corporation"/> + <variable name="outbound_caller_id_number" value="5552566639"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1004.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1004.xml (original) +++ freeswitch/trunk/conf/directory/default/1004.xml Mon Sep 29 16:59:10 2008 @@ -10,8 +10,8 @@ <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1004"/> <variable name="effective_caller_id_number" value="1004"/> - <variable name="external_caller_id_name" value="Acme Corporation"/> - <variable name="external_caller_id_number" value="5552566639"/> + <variable name="outbound_caller_id_name" value="Acme Corporation"/> + <variable name="outbound_caller_id_number" value="5552566639"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1005.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1005.xml (original) +++ freeswitch/trunk/conf/directory/default/1005.xml Mon Sep 29 16:59:10 2008 @@ -10,8 +10,8 @@ <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1005"/> <variable name="effective_caller_id_number" value="1005"/> - <variable name="external_caller_id_name" value="Acme Corporation"/> - <variable name="external_caller_id_number" value="5552566639"/> + <variable name="outbound_caller_id_name" value="Acme Corporation"/> + <variable name="outbound_caller_id_number" value="5552566639"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1006.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1006.xml (original) +++ freeswitch/trunk/conf/directory/default/1006.xml Mon Sep 29 16:59:10 2008 @@ -10,8 +10,8 @@ <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1006"/> <variable name="effective_caller_id_number" value="1006"/> - <variable name="external_caller_id_name" value="Acme Corporation"/> - <variable name="external_caller_id_number" value="5552566639"/> + <variable name="outbound_caller_id_name" value="Acme Corporation"/> + <variable name="outbound_caller_id_number" value="5552566639"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1007.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1007.xml (original) +++ freeswitch/trunk/conf/directory/default/1007.xml Mon Sep 29 16:59:10 2008 @@ -10,8 +10,8 @@ <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1007"/> <variable name="effective_caller_id_number" value="1007"/> - <variable name="external_caller_id_name" value="Acme Corporation"/> - <variable name="external_caller_id_number" value="5552566639"/> + <variable name="outbound_caller_id_name" value="Acme Corporation"/> + <variable name="outbound_caller_id_number" value="5552566639"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1008.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1008.xml (original) +++ freeswitch/trunk/conf/directory/default/1008.xml Mon Sep 29 16:59:10 2008 @@ -10,8 +10,8 @@ <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1008"/> <variable name="effective_caller_id_number" value="1008"/> - <variable name="external_caller_id_name" value="Acme Corporation"/> - <variable name="external_caller_id_number" value="5552566639"/> + <variable name="outbound_caller_id_name" value="Acme Corporation"/> + <variable name="outbound_caller_id_number" value="5552566639"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1009.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1009.xml (original) +++ freeswitch/trunk/conf/directory/default/1009.xml Mon Sep 29 16:59:10 2008 @@ -10,8 +10,8 @@ <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1009"/> <variable name="effective_caller_id_number" value="1009"/> - <variable name="external_caller_id_name" value="Acme Corporation"/> - <variable name="external_caller_id_number" value="5552566639"/> + <variable name="outbound_caller_id_name" value="Acme Corporation"/> + <variable name="outbound_caller_id_number" value="5552566639"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1010.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1010.xml (original) +++ freeswitch/trunk/conf/directory/default/1010.xml Mon Sep 29 16:59:10 2008 @@ -10,8 +10,8 @@ <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1010"/> <variable name="effective_caller_id_number" value="1010"/> - <variable name="external_caller_id_name" value="Acme Corporation"/> - <variable name="external_caller_id_number" value="5552566639"/> + <variable name="outbound_caller_id_name" value="Acme Corporation"/> + <variable name="outbound_caller_id_number" value="5552566639"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1011.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1011.xml (original) +++ freeswitch/trunk/conf/directory/default/1011.xml Mon Sep 29 16:59:10 2008 @@ -10,8 +10,8 @@ <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1011"/> <variable name="effective_caller_id_number" value="1011"/> - <variable name="external_caller_id_name" value="Acme Corporation"/> - <variable name="external_caller_id_number" value="5552566639"/> + <variable name="outbound_caller_id_name" value="Acme Corporation"/> + <variable name="outbound_caller_id_number" value="5552566639"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1012.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1012.xml (original) +++ freeswitch/trunk/conf/directory/default/1012.xml Mon Sep 29 16:59:10 2008 @@ -10,8 +10,8 @@ <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1012"/> <variable name="effective_caller_id_number" value="1012"/> - <variable name="external_caller_id_name" value="Acme Corporation"/> - <variable name="external_caller_id_number" value="5552566639"/> + <variable name="outbound_caller_id_name" value="Acme Corporation"/> + <variable name="outbound_caller_id_number" value="5552566639"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1013.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1013.xml (original) +++ freeswitch/trunk/conf/directory/default/1013.xml Mon Sep 29 16:59:10 2008 @@ -10,8 +10,8 @@ <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1013"/> <variable name="effective_caller_id_number" value="1013"/> - <variable name="external_caller_id_name" value="Acme Corporation"/> - <variable name="external_caller_id_number" value="5552566639"/> + <variable name="outbound_caller_id_name" value="Acme Corporation"/> + <variable name="outbound_caller_id_number" value="5552566639"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1014.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1014.xml (original) +++ freeswitch/trunk/conf/directory/default/1014.xml Mon Sep 29 16:59:10 2008 @@ -10,8 +10,8 @@ <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1014"/> <variable name="effective_caller_id_number" value="1014"/> - <variable name="external_caller_id_name" value="Acme Corporation"/> - <variable name="external_caller_id_number" value="5552566639"/> + <variable name="outbound_caller_id_name" value="Acme Corporation"/> + <variable name="outbound_caller_id_number" value="5552566639"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1015.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1015.xml (original) +++ freeswitch/trunk/conf/directory/default/1015.xml Mon Sep 29 16:59:10 2008 @@ -10,8 +10,8 @@ <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1015"/> <variable name="effective_caller_id_number" value="1015"/> - <variable name="external_caller_id_name" value="Acme Corporation"/> - <variable name="external_caller_id_number" value="5552566639"/> + <variable name="outbound_caller_id_name" value="Acme Corporation"/> + <variable name="outbound_caller_id_number" value="5552566639"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1016.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1016.xml (original) +++ freeswitch/trunk/conf/directory/default/1016.xml Mon Sep 29 16:59:10 2008 @@ -10,8 +10,8 @@ <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1016"/> <variable name="effective_caller_id_number" value="1016"/> - <variable name="external_caller_id_name" value="Acme Corporation"/> - <variable name="external_caller_id_number" value="5552566639"/> + <variable name="outbound_caller_id_name" value="Acme Corporation"/> + <variable name="outbound_caller_id_number" value="5552566639"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1017.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1017.xml (original) +++ freeswitch/trunk/conf/directory/default/1017.xml Mon Sep 29 16:59:10 2008 @@ -10,8 +10,8 @@ <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1017"/> <variable name="effective_caller_id_number" value="1017"/> - <variable name="external_caller_id_name" value="Acme Corporation"/> - <variable name="external_caller_id_number" value="5552566639"/> + <variable name="outbound_caller_id_name" value="Acme Corporation"/> + <variable name="outbound_caller_id_number" value="5552566639"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1018.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1018.xml (original) +++ freeswitch/trunk/conf/directory/default/1018.xml Mon Sep 29 16:59:10 2008 @@ -10,8 +10,8 @@ <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1018"/> <variable name="effective_caller_id_number" value="1018"/> - <variable name="external_caller_id_name" value="Acme Corporation"/> - <variable name="external_caller_id_number" value="5552566639"/> + <variable name="outbound_caller_id_name" value="Acme Corporation"/> + <variable name="outbound_caller_id_number" value="5552566639"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1019.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1019.xml (original) +++ freeswitch/trunk/conf/directory/default/1019.xml Mon Sep 29 16:59:10 2008 @@ -10,8 +10,8 @@ <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1019"/> <variable name="effective_caller_id_number" value="1019"/> - <variable name="external_caller_id_name" value="Acme Corporation"/> - <variable name="external_caller_id_number" value="5552566639"/> + <variable name="outbound_caller_id_name" value="Acme Corporation"/> + <variable name="outbound_caller_id_number" value="5552566639"/> </variables> </user> </include>

1 0

[Freeswitch-svn] [commit] r9748 - in freeswitch/trunk/conf: dialplan/default directory directory/default
by Freeswitch SVN 29 Sep '08

29 Sep '08

Author: brian Date: Mon Sep 29 16:58:13 2008 New Revision: 9748 Added: freeswitch/trunk/conf/dialplan/default/01_provider.com.xml Modified: freeswitch/trunk/conf/directory/default.xml freeswitch/trunk/conf/directory/default/1000.xml freeswitch/trunk/conf/directory/default/1001.xml freeswitch/trunk/conf/directory/default/1002.xml freeswitch/trunk/conf/directory/default/1003.xml freeswitch/trunk/conf/directory/default/1004.xml freeswitch/trunk/conf/directory/default/1005.xml freeswitch/trunk/conf/directory/default/1006.xml freeswitch/trunk/conf/directory/default/1007.xml freeswitch/trunk/conf/directory/default/1008.xml freeswitch/trunk/conf/directory/default/1009.xml freeswitch/trunk/conf/directory/default/1010.xml freeswitch/trunk/conf/directory/default/1011.xml freeswitch/trunk/conf/directory/default/1012.xml freeswitch/trunk/conf/directory/default/1013.xml freeswitch/trunk/conf/directory/default/1014.xml freeswitch/trunk/conf/directory/default/1015.xml freeswitch/trunk/conf/directory/default/1016.xml freeswitch/trunk/conf/directory/default/1017.xml freeswitch/trunk/conf/directory/default/1018.xml freeswitch/trunk/conf/directory/default/1019.xml freeswitch/trunk/conf/directory/default/default.xml Log: make it better.. make it faster... figure this out Added: freeswitch/trunk/conf/dialplan/default/01_provider.com.xml ============================================================================== --- (empty file) +++ freeswitch/trunk/conf/dialplan/default/01_provider.com.xml Mon Sep 29 16:58:13 2008 @@ -0,0 +1,30 @@ +<include> + + <extension name="local.provider.com"> + <condition field="${toll_allow}" expression="local"/> + <condition field="destination_number" expression="^(\d{7})$"> + <action application="set" data="effective_caller_id_number=${outbound_caller_id_number}"/> + <action application="set" data="effective_caller_id_name=${outbound_caller_id_name}"/> + <action application="bridge" data="sofia/gateway/${default_gateway}/1${default_areacode}$1"/> + </condition> + </extension> + + <extension name="domestic.provider.com"> + <condition field="${toll_allow}" expression="domestic"/> + <condition field="destination_number" expression="^(\d{11})$"> + <action application="set" data="effective_caller_id_number=${outbound_caller_id_number}"/> + <action application="set" data="effective_caller_id_name=${outbound_caller_id_name}"/> + <action application="bridge" data="sofia/gateway/${default_gateway}/$1"/> + </condition> + </extension> + + <extension name="international.provider.com"> + <condition field="${toll_allow}" expression="international"/> + <condition field="destination_number" expression="^(011\d{10+})$"> + <action application="set" data="effective_caller_id_number=${outbound_caller_id_number}"/> + <action application="set" data="effective_caller_id_name=${outbound_caller_id_name}"/> + <action application="bridge" data="sofia/gateway/${default_gateway}/$1"/> + </condition> + </extension> + +</include> Modified: freeswitch/trunk/conf/directory/default.xml ============================================================================== --- freeswitch/trunk/conf/directory/default.xml (original) +++ freeswitch/trunk/conf/directory/default.xml Mon Sep 29 16:58:13 2008 @@ -26,6 +26,8 @@ <variables> <variable name="record_stereo" value="true"/> + <variable name="default_gateway" value="asterlink.com"/> + <variable name="default_areacode" value="918"/> </variables> <X-PRE-PROCESS cmd="include" data="default/*.xml"/> Modified: freeswitch/trunk/conf/directory/default/1000.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1000.xml (original) +++ freeswitch/trunk/conf/directory/default/1000.xml Mon Sep 29 16:58:13 2008 @@ -5,10 +5,13 @@ <param name="vm-password" value="1000"/> </params> <variables> + <variable name="toll_allow" value="domestic,international,local"/> <variable name="accountcode" value="1000"/> <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1000"/> <variable name="effective_caller_id_number" value="1000"/> + <variable name="external_caller_id_name" value="Acme Corporation"/> + <variable name="external_caller_id_number" value="5552566639"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1001.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1001.xml (original) +++ freeswitch/trunk/conf/directory/default/1001.xml Mon Sep 29 16:58:13 2008 @@ -5,10 +5,13 @@ <param name="vm-password" value="1001"/> </params> <variables> + <variable name="toll_allow" value="domestic,international,local"/> <variable name="accountcode" value="1001"/> <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1001"/> <variable name="effective_caller_id_number" value="1001"/> + <variable name="external_caller_id_name" value="Acme Corporation"/> + <variable name="external_caller_id_number" value="5552566639"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1002.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1002.xml (original) +++ freeswitch/trunk/conf/directory/default/1002.xml Mon Sep 29 16:58:13 2008 @@ -5,10 +5,13 @@ <param name="vm-password" value="1002"/> </params> <variables> + <variable name="toll_allow" value="domestic,international,local"/> <variable name="accountcode" value="1002"/> <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1002"/> <variable name="effective_caller_id_number" value="1002"/> + <variable name="external_caller_id_name" value="Acme Corporation"/> + <variable name="external_caller_id_number" value="5552566639"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1003.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1003.xml (original) +++ freeswitch/trunk/conf/directory/default/1003.xml Mon Sep 29 16:58:13 2008 @@ -5,10 +5,13 @@ <param name="vm-password" value="1003"/> </params> <variables> + <variable name="toll_allow" value="domestic,international,local"/> <variable name="accountcode" value="1003"/> <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1003"/> <variable name="effective_caller_id_number" value="1003"/> + <variable name="external_caller_id_name" value="Acme Corporation"/> + <variable name="external_caller_id_number" value="5552566639"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1004.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1004.xml (original) +++ freeswitch/trunk/conf/directory/default/1004.xml Mon Sep 29 16:58:13 2008 @@ -5,10 +5,13 @@ <param name="vm-password" value="1004"/> </params> <variables> + <variable name="toll_allow" value="domestic,international,local"/> <variable name="accountcode" value="1004"/> <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1004"/> <variable name="effective_caller_id_number" value="1004"/> + <variable name="external_caller_id_name" value="Acme Corporation"/> + <variable name="external_caller_id_number" value="5552566639"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1005.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1005.xml (original) +++ freeswitch/trunk/conf/directory/default/1005.xml Mon Sep 29 16:58:13 2008 @@ -5,10 +5,13 @@ <param name="vm-password" value="1005"/> </params> <variables> + <variable name="toll_allow" value="domestic,international,local"/> <variable name="accountcode" value="1005"/> <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1005"/> <variable name="effective_caller_id_number" value="1005"/> + <variable name="external_caller_id_name" value="Acme Corporation"/> + <variable name="external_caller_id_number" value="5552566639"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1006.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1006.xml (original) +++ freeswitch/trunk/conf/directory/default/1006.xml Mon Sep 29 16:58:13 2008 @@ -5,10 +5,13 @@ <param name="vm-password" value="1006"/> </params> <variables> + <variable name="toll_allow" value="domestic,international,local"/> <variable name="accountcode" value="1006"/> <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1006"/> <variable name="effective_caller_id_number" value="1006"/> + <variable name="external_caller_id_name" value="Acme Corporation"/> + <variable name="external_caller_id_number" value="5552566639"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1007.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1007.xml (original) +++ freeswitch/trunk/conf/directory/default/1007.xml Mon Sep 29 16:58:13 2008 @@ -5,10 +5,13 @@ <param name="vm-password" value="1007"/> </params> <variables> + <variable name="toll_allow" value="domestic,international,local"/> <variable name="accountcode" value="1007"/> <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1007"/> <variable name="effective_caller_id_number" value="1007"/> + <variable name="external_caller_id_name" value="Acme Corporation"/> + <variable name="external_caller_id_number" value="5552566639"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1008.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1008.xml (original) +++ freeswitch/trunk/conf/directory/default/1008.xml Mon Sep 29 16:58:13 2008 @@ -5,10 +5,13 @@ <param name="vm-password" value="1008"/> </params> <variables> + <variable name="toll_allow" value="domestic,international,local"/> <variable name="accountcode" value="1008"/> <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1008"/> <variable name="effective_caller_id_number" value="1008"/> + <variable name="external_caller_id_name" value="Acme Corporation"/> + <variable name="external_caller_id_number" value="5552566639"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1009.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1009.xml (original) +++ freeswitch/trunk/conf/directory/default/1009.xml Mon Sep 29 16:58:13 2008 @@ -5,10 +5,13 @@ <param name="vm-password" value="1009"/> </params> <variables> + <variable name="toll_allow" value="domestic,international,local"/> <variable name="accountcode" value="1009"/> <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1009"/> <variable name="effective_caller_id_number" value="1009"/> + <variable name="external_caller_id_name" value="Acme Corporation"/> + <variable name="external_caller_id_number" value="5552566639"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1010.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1010.xml (original) +++ freeswitch/trunk/conf/directory/default/1010.xml Mon Sep 29 16:58:13 2008 @@ -5,10 +5,13 @@ <param name="vm-password" value="1010"/> </params> <variables> + <variable name="toll_allow" value="domestic,international,local"/> <variable name="accountcode" value="1010"/> <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1010"/> <variable name="effective_caller_id_number" value="1010"/> + <variable name="external_caller_id_name" value="Acme Corporation"/> + <variable name="external_caller_id_number" value="5552566639"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1011.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1011.xml (original) +++ freeswitch/trunk/conf/directory/default/1011.xml Mon Sep 29 16:58:13 2008 @@ -5,10 +5,13 @@ <param name="vm-password" value="1011"/> </params> <variables> + <variable name="toll_allow" value="domestic,international,local"/> <variable name="accountcode" value="1011"/> <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1011"/> <variable name="effective_caller_id_number" value="1011"/> + <variable name="external_caller_id_name" value="Acme Corporation"/> + <variable name="external_caller_id_number" value="5552566639"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1012.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1012.xml (original) +++ freeswitch/trunk/conf/directory/default/1012.xml Mon Sep 29 16:58:13 2008 @@ -5,10 +5,13 @@ <param name="vm-password" value="1012"/> </params> <variables> + <variable name="toll_allow" value="domestic,international,local"/> <variable name="accountcode" value="1012"/> <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1012"/> <variable name="effective_caller_id_number" value="1012"/> + <variable name="external_caller_id_name" value="Acme Corporation"/> + <variable name="external_caller_id_number" value="5552566639"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1013.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1013.xml (original) +++ freeswitch/trunk/conf/directory/default/1013.xml Mon Sep 29 16:58:13 2008 @@ -5,10 +5,13 @@ <param name="vm-password" value="1013"/> </params> <variables> + <variable name="toll_allow" value="domestic,international,local"/> <variable name="accountcode" value="1013"/> <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1013"/> <variable name="effective_caller_id_number" value="1013"/> + <variable name="external_caller_id_name" value="Acme Corporation"/> + <variable name="external_caller_id_number" value="5552566639"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1014.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1014.xml (original) +++ freeswitch/trunk/conf/directory/default/1014.xml Mon Sep 29 16:58:13 2008 @@ -5,10 +5,13 @@ <param name="vm-password" value="1014"/> </params> <variables> + <variable name="toll_allow" value="domestic,international,local"/> <variable name="accountcode" value="1014"/> <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1014"/> <variable name="effective_caller_id_number" value="1014"/> + <variable name="external_caller_id_name" value="Acme Corporation"/> + <variable name="external_caller_id_number" value="5552566639"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1015.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1015.xml (original) +++ freeswitch/trunk/conf/directory/default/1015.xml Mon Sep 29 16:58:13 2008 @@ -5,10 +5,13 @@ <param name="vm-password" value="1015"/> </params> <variables> + <variable name="toll_allow" value="domestic,international,local"/> <variable name="accountcode" value="1015"/> <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1015"/> <variable name="effective_caller_id_number" value="1015"/> + <variable name="external_caller_id_name" value="Acme Corporation"/> + <variable name="external_caller_id_number" value="5552566639"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1016.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1016.xml (original) +++ freeswitch/trunk/conf/directory/default/1016.xml Mon Sep 29 16:58:13 2008 @@ -5,10 +5,13 @@ <param name="vm-password" value="1016"/> </params> <variables> + <variable name="toll_allow" value="domestic,international,local"/> <variable name="accountcode" value="1016"/> <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1016"/> <variable name="effective_caller_id_number" value="1016"/> + <variable name="external_caller_id_name" value="Acme Corporation"/> + <variable name="external_caller_id_number" value="5552566639"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1017.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1017.xml (original) +++ freeswitch/trunk/conf/directory/default/1017.xml Mon Sep 29 16:58:13 2008 @@ -5,10 +5,13 @@ <param name="vm-password" value="1017"/> </params> <variables> + <variable name="toll_allow" value="domestic,international,local"/> <variable name="accountcode" value="1017"/> <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1017"/> <variable name="effective_caller_id_number" value="1017"/> + <variable name="external_caller_id_name" value="Acme Corporation"/> + <variable name="external_caller_id_number" value="5552566639"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1018.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1018.xml (original) +++ freeswitch/trunk/conf/directory/default/1018.xml Mon Sep 29 16:58:13 2008 @@ -5,10 +5,13 @@ <param name="vm-password" value="1018"/> </params> <variables> + <variable name="toll_allow" value="domestic,international,local"/> <variable name="accountcode" value="1018"/> <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1018"/> <variable name="effective_caller_id_number" value="1018"/> + <variable name="external_caller_id_name" value="Acme Corporation"/> + <variable name="external_caller_id_number" value="5552566639"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/1019.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/1019.xml (original) +++ freeswitch/trunk/conf/directory/default/1019.xml Mon Sep 29 16:58:13 2008 @@ -5,10 +5,13 @@ <param name="vm-password" value="1019"/> </params> <variables> + <variable name="toll_allow" value="domestic,international,local"/> <variable name="accountcode" value="1019"/> <variable name="user_context" value="default"/> <variable name="effective_caller_id_name" value="Extension 1019"/> <variable name="effective_caller_id_number" value="1019"/> + <variable name="external_caller_id_name" value="Acme Corporation"/> + <variable name="external_caller_id_number" value="5552566639"/> </variables> </user> </include> Modified: freeswitch/trunk/conf/directory/default/default.xml ============================================================================== --- freeswitch/trunk/conf/directory/default/default.xml (original) +++ freeswitch/trunk/conf/directory/default/default.xml Mon Sep 29 16:58:13 2008 @@ -5,7 +5,7 @@  <variable name="numbering_plan" value="US"/> <variable name="default_gateway" value="asterlink.com"/> - <variable name="default_area_code" value="918"/> + <variable name="default_areacode" value="918"/> </variables> </user> </include>

1 0

[Freeswitch-svn] [commit] r9747 - freeswitch/trunk/src/mod/endpoints/mod_loopback
by Freeswitch SVN 29 Sep '08

29 Sep '08

Author: brian Date: Mon Sep 29 15:20:06 2008 New Revision: 9747 Modified: freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c Log: lower case for consistency Modified: freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c Mon Sep 29 15:20:06 2008 @@ -214,7 +214,7 @@ b_channel = switch_core_session_get_channel(b_session); b_tech_pvt = (private_t *) switch_core_session_alloc(b_session, sizeof(*b_tech_pvt)); - switch_snprintf(name, sizeof(name), "Loopback/%s-b", tech_pvt->caller_profile->destination_number); + switch_snprintf(name, sizeof(name), "loopback/%s-b", tech_pvt->caller_profile->destination_number); switch_channel_set_name(b_channel, name); if (tech_init(b_tech_pvt, b_session, switch_core_session_get_read_codec(session)) != SWITCH_STATUS_SUCCESS) { switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);

1 0

[Freeswitch-svn] [commit] r9746 - freeswitch/trunk/conf/directory/default
by Freeswitch SVN 29 Sep '08

29 Sep '08

Author: brian Date: Mon Sep 29 15:03:08 2008 New Revision: 9746 Modified: freeswitch/trunk/conf/directory/default/asterlink.com.noload Log: tweak Modified: freeswitch/trunk/conf/directory/default/asterlink.com.noload ============================================================================== --- freeswitch/trunk/conf/directory/default/asterlink.com.noload (original) +++ freeswitch/trunk/conf/directory/default/asterlink.com.noload Mon Sep 29 15:03:08 2008 @@ -11,7 +11,7 @@ <param name="expire-seconds" value="600"/> <param name="register" value="true"/> <param name="retry-seconds" value="30"/> - <param name="contact-params" value="target_domain=$${domain}"/> + <param name="contact-params" value="domain_name=$${domain}"/> <param name="extension" value="%ALEXTENSION%"/> <param name="context" value="public"/> </gateway>

1 0

[Freeswitch-svn] [commit] r9745 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 29 Sep '08

29 Sep '08

Author: brian Date: Mon Sep 29 15:02:42 2008 New Revision: 9745 Modified: freeswitch/trunk/conf/dialplan/default.xml freeswitch/trunk/conf/dialplan/public.xml Log: use domain_name since its free no need for an extra var. Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Mon Sep 29 15:02:42 2008 @@ -27,11 +27,11 @@ --> <extension name="set_domain" continue="true"> - <condition field="${target_domain}" expression="^$" break="never"/> + <condition field="${domain_name}" expression="^$" break="never"/> <condition field="source" expression="mod_sofia" break="never"/> <condition field="${sip_auth_realm}" expression="^$" break="never"> - <action application="set" data="target_domain=$${domain}"/> - <anti-action application="set" data="target_domain=${sip_auth_realm}"/> + <action application="set" data="domain_name=$${domain}"/> + <anti-action application="set" data="domain_name=${sip_auth_realm}"/> </condition> </extension> @@ -45,7 +45,7 @@ <extension name="intercept"> <condition field="destination_number" expression="^886$"> <action application="answer"/> - <action application="intercept" data="${db(select/${target_domain}-last_dial/global)}"/> + <action application="intercept" data="${db(select/${domain_name}-last_dial/global)}"/> <action application="sleep" data="2000"/> </condition> </extension> @@ -53,14 +53,14 @@ <extension name="intercept-ext"> <condition field="destination_number" expression="^\*\*(\d+)$"> <action application="answer"/> - <action application="intercept" data="${db(select/${target_domain}-last_dial_ext/$1)}"/> + <action application="intercept" data="${db(select/${domain_name}-last_dial_ext/$1)}"/> <action application="sleep" data="2000"/> </condition> </extension> <extension name="redial"> <condition field="destination_number" expression="^870$"> - <action application="transfer" data="${db(select/${target_domain}-last_dial/${caller_id_number})}"/> + <action application="transfer" data="${db(select/${domain_name}-last_dial/${caller_id_number})}"/> </condition> </extension> @@ -73,7 +73,7 @@ numbering_plan is required for the demo to function properly. --> <condition field="${numbering_plan}" expression="^$" break="never"> - <action application="set_user" data="default@${target_domain}"/> + <action application="set_user" data="default@${domain_name}"/> </condition> <condition field="${call_debug}" expression="^true$" break="never"> <action application="info"/> @@ -84,9 +84,9 @@  </condition> <condition> - <action application="db" data="insert/${target_domain}-spymap/${caller_id_number}/${uuid}"/> - <action application="db" data="insert/${target_domain}-last_dial/${caller_id_number}/${destination_number}"/> - <action application="db" data="insert/${target_domain}-last_dial/global/${uuid}"/> + <action application="db" data="insert/${domain_name}-spymap/${caller_id_number}/${uuid}"/> + <action application="db" data="insert/${domain_name}-last_dial/${caller_id_number}/${destination_number}"/> + <action application="db" data="insert/${domain_name}-last_dial/global/${uuid}"/> </condition> </extension> @@ -120,7 +120,7 @@ <extension name="eavesdrop"> <condition field="destination_number" expression="^88(.*)$|^\*0(.*)$"> <action application="answer"/> - <action application="eavesdrop" data="${db(select/${target_domain}-spymap/$1)}"/> + <action application="eavesdrop" data="${db(select/${domain_name}-spymap/$1)}"/> </condition> </extension> @@ -136,14 +136,14 @@ <extension name="call_return"> <condition field="destination_number" expression="^\*69$|^869$"> - <action application="transfer" data="${db(select/${target_domain}-call_return/${caller_id_number})}"/> + <action application="transfer" data="${db(select/${domain_name}-call_return/${caller_id_number})}"/> </condition> </extension> <extension name="del-group"> <condition field="destination_number" expression="^80(\d{2})$"> <action application="answer"/> - <action application="group" data="delete:$1@${target_domain}:${sofia_contact(${sip_from_user}@${target_domain})}"/> + <action application="group" data="delete:$1@${domain_name}:${sofia_contact(${sip_from_user}@${domain_name})}"/> <action application="gentones" data="%(1000, 0, 320)"/> </condition> </extension> @@ -151,21 +151,21 @@ <extension name="add-group"> <condition field="destination_number" expression="^81(\d{2})$"> <action application="answer"/> - <action application="group" data="insert:$1@${target_domain}:${sofia_contact(${sip_from_user}@${target_domain})}"/> + <action application="group" data="insert:$1@${domain_name}:${sofia_contact(${sip_from_user}@${domain_name})}"/> <action application="gentones" data="%(1000, 0, 640)"/> </condition> </extension> <extension name="call-group-simo"> <condition field="destination_number" expression="^82(\d{2})$"> - <action application="bridge" data="{ignore_early_media=true}${group(call:$1@${target_domain})}"/> + <action application="bridge" data="{ignore_early_media=true}${group(call:$1@${domain_name})}"/> </condition> </extension> <extension name="call-group-order"> <condition field="destination_number" expression="^83(\d{2})$"> <action application="set" data="call_timeout=10"/> - <action application="bridge" data="{ignore_early_media=true}${group(call:$1@${target_domain}:order)}"/> + <action application="bridge" data="{ignore_early_media=true}${group(call:$1@${domain_name}:order)}"/> </condition> </extension> @@ -174,11 +174,11 @@ <condition field="destination_number" expression="^8(10[01][0-9])$"> <action application="set" data="dialed_extension=$1"/>  -  - <action application="export"><![CDATA[sip_h_Call-Info=<sip:${target_domain}>;answer-after=0]]></action> +  + <action application="export"><![CDATA[sip_h_Call-Info=<sip:${domain_name}>;answer-after=0]]></action> <action application="export" data="sip_invite_params=intercom=true"/> <action application="export" data="sip_auto_answer=true"/> - <action application="bridge" data="user/${dialed_extension}@${target_domain}"/> + <action application="bridge" data="user/${dialed_extension}@${domain_name}"/> </condition> </extension> @@ -198,7 +198,7 @@ <action application="set" data="voicemail_authorized=${sip_authorized}"/> <action application="answer"/> <action application="sleep" data="1000"/> - <action application="voicemail" data="check default ${target_domain} ${dialed_extension}"/> + <action application="voicemail" data="check default ${domain_name} ${dialed_extension}"/>  <anti-action application="bind_meta_app" data="1 b s execute_extension::dx XML features"/> <anti-action application="bind_meta_app" data="2 b s record_session::$${base_dir}/recordings/${caller_id_number}.${strftime(%Y-%m-%d-%H-%M-%S)}.wav"/> @@ -209,13 +209,13 @@ <anti-action application="set" data="hangup_after_bridge=true"/>  <anti-action application="set" data="continue_on_fail=true"/> - <anti-action application="db" data="insert/${target_domain}-call_return/${dialed_extension}/${caller_id_number}"/> - <anti-action application="db" data="insert/${target_domain}-last_dial_ext/${dialed_extension}/${uuid}"/> - <anti-action application="bridge" data="user/${dialed_extension}@${target_domain}"/> + <anti-action application="db" data="insert/${domain_name}-call_return/${dialed_extension}/${caller_id_number}"/> + <anti-action application="db" data="insert/${domain_name}-last_dial_ext/${dialed_extension}/${uuid}"/> + <anti-action application="bridge" data="user/${dialed_extension}@${domain_name}"/> <anti-action application="answer"/>  <anti-action application="sleep" data="1000"/> - <anti-action application="voicemail" data="default ${target_domain} ${dialed_extension}"/> + <anti-action application="voicemail" data="default ${domain_name} ${dialed_extension}"/> </condition> </extension> @@ -230,7 +230,7 @@  <extension name="vmain"> <condition field="destination_number" expression="^vmain|4000$"> - <action application="voicemail" data="check default ${target_domain}"/> + <action application="voicemail" data="check default ${domain_name}"/> </condition> </extension> @@ -248,7 +248,7 @@ <condition field="destination_number" expression="^(30\d{2})$"> <action application="answer"/>  - <action application="conference" data="$1-${target_domain}@default"/> + <action application="conference" data="$1-${domain_name}@default"/> </condition> </extension> @@ -256,7 +256,7 @@ <condition field="destination_number" expression="^(31\d{2})$"> <action application="answer"/>  - <action application="conference" data="$1-${target_domain}@wideband"/> + <action application="conference" data="$1-${domain_name}@wideband"/> </condition> </extension> @@ -264,7 +264,7 @@ <condition field="destination_number" expression="^(32\d{2})$"> <action application="answer"/>  - <action application="conference" data="$1-${target_domain}@ultrawideband"/> + <action application="conference" data="$1-${domain_name}@ultrawideband"/> </condition> </extension> @@ -324,7 +324,7 @@ <extension name="park"> <condition field="destination_number" expression="^5900$"> <action application="set" data="fifo_music=$${hold_music}"/> - <action application="fifo" data="5900@${target_domain} in"/> + <action application="fifo" data="5900@${domain_name} in"/> </condition> </extension> @@ -334,7 +334,7 @@ <extension name="unpark"> <condition field="destination_number" expression="^5901$"> <action application="answer"/> - <action application="fifo" data="5900@${target_domain} out nowait"/> + <action application="fifo" data="5900@${domain_name} out nowait"/> </condition> </extension> @@ -348,7 +348,7 @@ <extension name="park"> <condition field="source" expression="mod_sofia"/> <condition field="destination_number" expression="park\+(\d+)"> - <action application="fifo" data="$1@${target_domain} in undef $${hold_music}"/> + <action application="fifo" data="$1@${domain_name} in undef $${hold_music}"/> </condition> </extension>  +  <extension name="set_domain" continue="true"> - <condition field="${target_domain}" expression="^$" break="never"/> + <condition field="${domain_name}" expression="^$" break="never"/> <condition field="source" expression="mod_sofia" break="never"/> - <condition field="${sip_req_params}" expression="target_domain=([A-Z-a-z0-9.]+)" break="never"> + <condition field="${sip_req_params}" expression="domain_name=([A-Z-a-z0-9.]+)" break="never">  - <action application="export" data="target_domain=$1"/> - <anti-action application="export" data="target_domain=$${domain}"/> + <action application="export" data="domain_name=$1"/> + <anti-action application="export" data="domain_name=$${domain}"/> </condition> </extension>

1 0

[Freeswitch-svn] [commit] r9744 - in freeswitch/trunk/src: . include
by Freeswitch SVN 29 Sep '08

29 Sep '08

Author: mikej Date: Mon Sep 29 13:48:43 2008 New Revision: 9744 Modified: freeswitch/trunk/src/include/switch_channel.h freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_event.c Log: add switch_channel_set_variable_printf Modified: freeswitch/trunk/src/include/switch_channel.h ============================================================================== --- freeswitch/trunk/src/include/switch_channel.h (original) +++ freeswitch/trunk/src/include/switch_channel.h Mon Sep 29 13:48:43 2008 @@ -220,6 +220,7 @@ \returns SWITCH_STATUS_SUCCESS if successful */ SWITCH_DECLARE(switch_status_t) switch_channel_set_variable(switch_channel_t *channel, const char *varname, const char *value); +SWITCH_DECLARE(switch_status_t) switch_channel_set_variable_printf(switch_channel_t *channel, const char *varname, const char *fmt, ...); SWITCH_DECLARE(switch_status_t) switch_channel_set_variable_partner(switch_channel_t *channel, const char *varname, const char *value); SWITCH_DECLARE(const char *) switch_channel_get_variable_partner(switch_channel_t *channel, const char *varname); Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Mon Sep 29 13:48:43 2008 @@ -578,6 +578,37 @@ return SWITCH_STATUS_FALSE; } +switch_status_t switch_event_base_add_header(switch_event_t *event, switch_stack_t stack, const char *header_name, char *data); + +SWITCH_DECLARE(switch_status_t) switch_channel_set_variable_printf(switch_channel_t *channel, const char *varname, const char *fmt, ...) +{ + int ret = 0; + char *data; + va_list ap; + switch_assert(channel != NULL); + + if (!switch_strlen_zero(varname)) { + switch_mutex_lock(channel->profile_mutex); + switch_event_del_header(channel->variables, varname); + + va_start(ap, fmt); + ret = switch_vasprintf(&data, fmt, ap); + va_end(ap); + + if (ret == -1) { + switch_mutex_unlock(channel->profile_mutex); + return SWITCH_STATUS_MEMERR; + } + + switch_event_base_add_header(channel->variables, SWITCH_STACK_BOTTOM, varname, data); + + switch_mutex_unlock(channel->profile_mutex); + return SWITCH_STATUS_SUCCESS; + } + + return SWITCH_STATUS_FALSE; +} + SWITCH_DECLARE(switch_status_t) switch_channel_set_variable_partner(switch_channel_t *channel, const char *varname, const char *value) { Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Mon Sep 29 13:48:43 2008 @@ -625,7 +625,7 @@ return status; } -static switch_status_t switch_event_base_add_header(switch_event_t *event, switch_stack_t stack, const char *header_name, char *data) +switch_status_t switch_event_base_add_header(switch_event_t *event, switch_stack_t stack, const char *header_name, char *data) { switch_event_header_t *header; void *pop;

1 0

[Freeswitch-svn] [commit] r9743 - freeswitch/trunk/src/mod/applications/mod_voicemail
by Freeswitch SVN 29 Sep '08

29 Sep '08

Author: mikej Date: Mon Sep 29 13:36:43 2008 New Revision: 9743 Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Log: silence complaining compiler 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 Mon Sep 29 13:36:43 2008 @@ -2225,7 +2225,7 @@ if(!switch_strlen_zero(vm_timezone)) { char tz_date[80] = ""; - if ((switch_strftime_tz(vm_timezone, profile->date_fmt, tz_date, sizeof(tz_date)) == SWITCH_STATUS_SUCCESS) && !switch_strlen_zero(tz_date)) { + if ((switch_strftime_tz(vm_timezone, profile->date_fmt, tz_date, sizeof(tz_date)) == SWITCH_STATUS_SUCCESS) && !switch_strlen_zero_buf(tz_date)) { switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "voicemail_time", tz_date); } else { switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "voicemail_time", date);

1 0