- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r7988 - freeswitch/trunk/src
by Freeswitch SVN 31 Mar '08

31 Mar '08

Author: mikej Date: Mon Mar 31 12:06:08 2008 New Revision: 7988 Modified: freeswitch/trunk/src/switch_utils.c Log: make compiler quiet about null termination. Modified: freeswitch/trunk/src/switch_utils.c ============================================================================== --- freeswitch/trunk/src/switch_utils.c (original) +++ freeswitch/trunk/src/switch_utils.c Mon Mar 31 12:06:08 2008 @@ -143,11 +143,11 @@ SWITCH_DECLARE(int) switch_parse_cidr(const char *string, uint32_t *ip, uint32_t *mask, uint32_t *bitp) { - char host[128] = ""; + char host[128]; char *bit_str; int32_t bits; - strncpy(host, string, sizeof(host) - 1); + switch_copy_string(host, string, sizeof(host)); bit_str = strchr(host, '/'); if (!bit_str) {

1 0

[commit] r7987 - in freeswitch/trunk/src/mod: endpoints/mod_sofia event_handlers/mod_event_socket
by Freeswitch SVN 31 Mar '08

31 Mar '08

Author: mikej Date: Mon Mar 31 12:05:32 2008 New Revision: 7987 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Log: use the same type to avoid overflow (could we even cause this?) Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Mon Mar 31 12:05:32 2008 @@ -2491,7 +2491,7 @@ get_addr(network_ip, sizeof(network_ip), &((struct sockaddr_in *) my_addrinfo->ai_addr)->sin_addr); if (profile->acl_count) { - int x = 0; + uint32_t x = 0; for (x = 0 ; x < profile->acl_count; x++) { if (!switch_check_network_list_ip(network_ip, profile->acl[x])) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "IP %s Rejected by acl %s\n", network_ip, profile->acl[x]); Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Mon Mar 31 12:05:32 2008 @@ -659,7 +659,7 @@ su_addrinfo_t *my_addrinfo = msg_addrinfo(nua_current_request(nua)); if (profile->reg_acl_count) { - int x = 0; + uint32_t x = 0; get_addr(network_ip, sizeof(network_ip), &((struct sockaddr_in *) my_addrinfo->ai_addr)->sin_addr); Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Mon Mar 31 12:05:32 2008 @@ -1067,7 +1067,7 @@ switch_assert(listener != NULL); if (prefs.acl_count && listener->sa && !switch_strlen_zero(listener->remote_ip)) { - int x = 0; + uint32_t x = 0; for (x = 0 ; x < prefs.acl_count; x++) { if (!switch_check_network_list_ip(listener->remote_ip, prefs.acl[x])) { @@ -1298,7 +1298,7 @@ switch_sockaddr_t *sa; switch_socket_t *inbound_socket = NULL; listener_t *listener; - int x = 0; + uint32_t x = 0; memset(&listen_list, 0, sizeof(listen_list)); config();

1 0

[commit] r7986 - freeswitch/trunk/src/mod/applications/mod_dptools
by Freeswitch SVN 31 Mar '08

31 Mar '08

Author: mikej Date: Mon Mar 31 12:04:06 2008 New Revision: 7986 Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Log: make argv big enough to handle all our options. Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Mon Mar 31 12:04:06 2008 @@ -203,7 +203,7 @@ SWITCH_STANDARD_APP(check_acl_function) { int argc; - char *argv[2] = { 0 }; + char *argv[3] = { 0 }; char *mydata; switch_call_cause_t cause = SWITCH_CAUSE_CALL_REJECTED;

1 0

[commit] r7985 - in freeswitch/trunk: . src/mod/asr_tts/mod_openmrcp
by Freeswitch SVN 31 Mar '08

31 Mar '08

Author: mikej Date: Mon Mar 31 12:03:29 2008 New Revision: 7985 Modified: freeswitch/trunk/Freeswitch.2008.sln freeswitch/trunk/Freeswitch.sln freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.2008.vcproj Log: adjust to path change in mrcp lib Modified: freeswitch/trunk/Freeswitch.2008.sln ============================================================================== --- freeswitch/trunk/Freeswitch.2008.sln (original) +++ freeswitch/trunk/Freeswitch.2008.sln Mon Mar 31 12:03:29 2008 @@ -752,7 +752,7 @@ {829A9309-3B94-43C0-846B-7EC9D6D35F8B} = {829A9309-3B94-43C0-846B-7EC9D6D35F8B} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libopenmrcpclient", "libs\openmrcp\platform\openmrcpclient\libopenmrcpclient.2008.vcproj", "{A407B661-D7DC-4E30-B268-FFF3296C35E6}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libopenmrcpclient", "libs\openmrcp\platform\libopenmrcpclient\libopenmrcpclient.2008.vcproj", "{A407B661-D7DC-4E30-B268-FFF3296C35E6}" ProjectSection(ProjectDependencies) = postProject {FB64EA08-3BC0-48AE-BE4B-74F1024B756E} = {FB64EA08-3BC0-48AE-BE4B-74F1024B756E} {9EA22C31-BB7E-4C40-A698-2C6792D1E0C6} = {9EA22C31-BB7E-4C40-A698-2C6792D1E0C6} Modified: freeswitch/trunk/Freeswitch.sln ============================================================================== --- freeswitch/trunk/Freeswitch.sln (original) +++ freeswitch/trunk/Freeswitch.sln Mon Mar 31 12:03:29 2008 @@ -455,7 +455,7 @@ {829A9309-3B94-43C0-846B-7EC9D6D35F8B} = {829A9309-3B94-43C0-846B-7EC9D6D35F8B} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libopenmrcpclient", "libs\openmrcp\platform\openmrcpclient\libopenmrcpclient.vcproj", "{A407B661-D7DC-4E30-B268-FFF3296C35E6}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libopenmrcpclient", "libs\openmrcp\platform\libopenmrcpclient\libopenmrcpclient.vcproj", "{A407B661-D7DC-4E30-B268-FFF3296C35E6}" ProjectSection(ProjectDependencies) = postProject {FB64EA08-3BC0-48AE-BE4B-74F1024B756E} = {FB64EA08-3BC0-48AE-BE4B-74F1024B756E} {9EA22C31-BB7E-4C40-A698-2C6792D1E0C6} = {9EA22C31-BB7E-4C40-A698-2C6792D1E0C6} Modified: freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.2008.vcproj (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.2008.vcproj Mon Mar 31 12:03:29 2008 @@ -39,7 +39,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\openmrcp\platform\openmrcpclient\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\client\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\parser\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\media\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\resource\include";"$(InputDir)..\..\..\..\libs\openmrcp\mediaframe\include";"$(InputDir)..\..\..\..\libs\openmrcp\aprtoolkit\include";"$(InputDir)..\..\..\..\libs\apr\include"" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\openmrcp\platform\libopenmrcpclient\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\client\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\parser\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\media\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\resource\include";"$(InputDir)..\..\..\..\libs\openmrcp\mediaframe\include";"$(InputDir)..\..\..\..\libs\openmrcp\aprtoolkit\include";"$(InputDir)..\..\..\..\libs\apr\include"" UsePrecompiledHeader="0" /> <Tool @@ -103,7 +103,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\openmrcp\platform\openmrcpclient\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\client\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\parser\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\media\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\resource\include";"$(InputDir)..\..\..\..\libs\openmrcp\mediaframe\include";"$(InputDir)..\..\..\..\libs\openmrcp\aprtoolkit\include";"$(InputDir)..\..\..\..\libs\apr\include"" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\openmrcp\platform\libopenmrcpclient\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\client\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\parser\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\media\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\resource\include";"$(InputDir)..\..\..\..\libs\openmrcp\mediaframe\include";"$(InputDir)..\..\..\..\libs\openmrcp\aprtoolkit\include";"$(InputDir)..\..\..\..\libs\apr\include"" UsePrecompiledHeader="0" /> <Tool @@ -167,7 +167,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\openmrcp\platform\openmrcpclient\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\client\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\parser\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\media\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\resource\include";"$(InputDir)..\..\..\..\libs\openmrcp\mediaframe\include";"$(InputDir)..\..\..\..\libs\openmrcp\aprtoolkit\include";"$(InputDir)..\..\..\..\libs\apr\include"" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\openmrcp\platform\libopenmrcpclient\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\client\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\parser\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\media\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\resource\include";"$(InputDir)..\..\..\..\libs\openmrcp\mediaframe\include";"$(InputDir)..\..\..\..\libs\openmrcp\aprtoolkit\include";"$(InputDir)..\..\..\..\libs\apr\include"" UsePrecompiledHeader="0" /> <Tool @@ -231,7 +231,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\openmrcp\platform\openmrcpclient\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\client\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\parser\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\media\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\resource\include";"$(InputDir)..\..\..\..\libs\openmrcp\mediaframe\include";"$(InputDir)..\..\..\..\libs\openmrcp\aprtoolkit\include";"$(InputDir)..\..\..\..\libs\apr\include"" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\openmrcp\platform\libopenmrcpclient\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\client\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\parser\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\media\include";"$(InputDir)..\..\..\..\libs\openmrcp\mrcpcore\resource\include";"$(InputDir)..\..\..\..\libs\openmrcp\mediaframe\include";"$(InputDir)..\..\..\..\libs\openmrcp\aprtoolkit\include";"$(InputDir)..\..\..\..\libs\apr\include"" UsePrecompiledHeader="0" /> <Tool

1 0

[commit] r7984 - freeswitch/trunk/src/mod/endpoints/mod_iax
by Freeswitch SVN 31 Mar '08

31 Mar '08

Author: anthm Date: Mon Mar 31 11:31:05 2008 New Revision: 7984 Modified: freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c Log: add a bunch of locking to mod_iax, if it deadlocks nobody will be suprised Modified: freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c Mon Mar 31 11:31:05 2008 @@ -505,6 +505,7 @@ switch_core_codec_destroy(&tech_pvt->write_codec); } + switch_mutex_lock(globals.mutex); if (tech_pvt->iax_session) { if (!switch_test_flag(tech_pvt, TFLAG_HANGUP)) { iax_hangup(tech_pvt->iax_session, "Hangup"); @@ -514,7 +515,6 @@ } switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s CHANNEL HANGUP\n", switch_channel_get_name(switch_core_session_get_channel(session))); - switch_mutex_lock(globals.mutex); globals.calls--; if (globals.calls < 0) { globals.calls = 0; @@ -576,7 +576,9 @@ private_t *tech_pvt = switch_core_session_get_private(session); switch_assert(tech_pvt != NULL); if (tech_pvt->iax_session) { + switch_mutex_lock(globals.mutex); iax_send_dtmf(tech_pvt->iax_session, dtmf->digit); + switch_mutex_unlock(globals.mutex); } return SWITCH_STATUS_SUCCESS; @@ -674,7 +676,9 @@ switch_assert(tech_pvt != NULL); if (!switch_test_flag(tech_pvt, TFLAG_OUTBOUND)) { + switch_mutex_lock(globals.mutex); iax_answer(tech_pvt->iax_session); + switch_mutex_unlock(globals.mutex); } return SWITCH_STATUS_SUCCESS; } @@ -689,8 +693,10 @@ case SWITCH_MESSAGE_INDICATE_RESPOND: { if (tech_pvt->iax_session) { + switch_mutex_lock(globals.mutex); iax_reject(tech_pvt->iax_session, msg->string_arg ? msg->string_arg : "Call Rejected"); switch_set_flag(tech_pvt, TFLAG_HANGUP); + switch_mutex_unlock(globals.mutex); } } break; @@ -745,7 +751,11 @@ return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER; } - if ((tech_pvt->iax_session = iax_session_new()) == 0) { + switch_mutex_lock(globals.mutex); + tech_pvt->iax_session = iax_session_new(); + switch_mutex_unlock(globals.mutex); + + if (!tech_pvt->iax_session) { switch_core_session_destroy(new_session); return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER; } @@ -955,6 +965,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Event %d [%s]!\n", iaxevent->etype, IAXNAMES[iaxevent->etype]); } + switch_mutex_lock(globals.mutex); switch (iaxevent->etype) { case IAX_EVENT_REGACK: switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Registration completed successfully.\n"); @@ -1129,7 +1140,7 @@ break; } iax_event_free(iaxevent); - + switch_mutex_unlock(globals.mutex); if (tech_pvt && tech_pvt->session) { switch_core_session_signal_unlock(tech_pvt->session); }

1 0

[commit] r7983 - freeswitch/trunk/conf/dialplan
by Freeswitch SVN 31 Mar '08

31 Mar '08

Author: brian Date: Mon Mar 31 10:46:45 2008 New Revision: 7983 Modified: freeswitch/trunk/conf/dialplan/default.xml freeswitch/trunk/conf/dialplan/features.xml Log: send_display for phones that support it can be turned back on Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Mon Mar 31 10:46:45 2008 @@ -149,7 +149,7 @@ <anti-action application="db" data="insert/last_dial_ext/${dialed_ext}/${uuid}"/> <anti-action application="bridge" data="user/${dialed_ext}@$${domain}"/> <anti-action application="answer"/> - <anti-action application="send_display" data="Voicemail for ${dialed_ext}"/> +  <anti-action application="sleep" data="1000"/> <anti-action application="voicemail" data="default $${domain} ${dialed_ext}"/> </condition> @@ -168,7 +168,7 @@ <extension name="nb_conferences"> <condition field="destination_number" expression="^(30\d{2})$"> <action application="answer"/> - <action application="send_display" data="8k Conference $1"/> +  <action application="conference" data="$1@default"/> </condition> </extension> @@ -176,7 +176,7 @@ <extension name="wb_conferences"> <condition field="destination_number" expression="^(31\d{2})$"> <action application="answer"/> - <action application="send_display" data="16k Conference $1"/> +  <action application="conference" data="$1@wideband"/> </condition> </extension> @@ -184,7 +184,7 @@ <extension name="uwb_conferences"> <condition field="destination_number" expression="^(32\d{2})$"> <action application="answer"/> - <action application="send_display" data="32k Conference $1"/> +  <action application="conference" data="$1@ultrawideband"/> </condition> </extension> @@ -206,7 +206,7 @@ <extension name="rtp_multicast_page"> <condition field="destination_number" expression="^pagegroup$|^7243"> <action application="answer"/> - <action application="send_display" data="Multicast Page"/> +  <action application="esf_page_group"/> </condition> </extension> @@ -273,7 +273,7 @@ <extension name="delay_echo"> <condition field="destination_number" expression="^9995$"> <action application="answer"/> - <action application="send_display" data="Delay Echo Test (5 sec)"/> +  <action application="delay_echo" data="5000"/> </condition> </extension> @@ -281,7 +281,7 @@ <extension name="echo"> <condition field="destination_number" expression="^9996$"> <action application="answer"/> - <action application="send_display" data="Echo Test"/> +  <action application="echo"/> </condition> </extension> @@ -289,7 +289,7 @@ <extension name="milliwatt"> <condition field="destination_number" expression="^9997$"> <action application="answer"/> - <action application="send_display" data="Milliwatt Test"/> +  <action application="playback" data="tone_stream://%(10000,0,1004);loops=-1"/> </condition> </extension> @@ -308,7 +308,7 @@ <action application="execute_extension" data="is_secure XML features"/> <action application="playback" data="$${moh_uri}"/> <anti-action application="answer"/> - <anti-action application="send_display" data="Insecure Music On Hold"/> +  <anti-action application="playback" data="$${moh_uri}"/> </condition> </extension> Modified: freeswitch/trunk/conf/dialplan/features.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/features.xml (original) +++ freeswitch/trunk/conf/dialplan/features.xml Mon Mar 31 10:46:45 2008 @@ -32,7 +32,7 @@ <extension name="is_secure"> <condition field="${sip_secure_media_confirmed}" expression="^true$"> <action application="sleep" data="1000"/> - <action application="send_display" data="Secure Music On Hold "/> +  <action application="gentones" data="${bong-ring}"/> <anti-action application="eval" data="not_secure"/> </condition>

1 0

[commit] r7982 - freeswitch/trunk/build
by Freeswitch SVN 29 Mar '08

29 Mar '08

Author: stkn Date: Sat Mar 29 14:56:20 2008 New Revision: 7982 Modified: freeswitch/trunk/build/getsounds.sh.in Log: Add quotes (fbsd sh needs them) and check if the command can be executed Modified: freeswitch/trunk/build/getsounds.sh.in ============================================================================== --- freeswitch/trunk/build/getsounds.sh.in (original) +++ freeswitch/trunk/build/getsounds.sh.in Sat Mar 29 14:56:20 2008 @@ -7,10 +7,10 @@ DIR=`pwd` -if [ -f $WGET ] ; then +if [ -x "$WGET" ] ; then DOWNLOAD_CMD=$WGET else - if [ -f $CURL ] ; then + if [ -x "$CURL" ] ; then DOWNLOAD_CMD="$CURL -O" fi fi

1 0

[commit] r7981 - freeswitch/trunk
by Freeswitch SVN 29 Mar '08

29 Mar '08

Author: brian Date: Sat Mar 29 00:22:28 2008 New Revision: 7981 Modified: freeswitch/trunk/freeswitch.spec Log: fix spec file thanks andrew Modified: freeswitch/trunk/freeswitch.spec ============================================================================== --- freeswitch/trunk/freeswitch.spec (original) +++ freeswitch/trunk/freeswitch.spec Sat Mar 29 00:22:28 2008 @@ -237,7 +237,7 @@ # Add a freeswitch user with group daemon %pre %ifos linux -/usr/sbin/useradd -r -g daemon -s /bin/false -c "The FreeSWITCH Open Source Voice Platform" -d %{prefix}/var freeswitch 2> /dev/null || : +/usr/sbin/useradd -r -g daemon -s /bin/false -c "The FreeSWITCH Open Source Voice Platform" -d %{prefix} freeswitch 2> /dev/null || : %endif %post @@ -246,6 +246,8 @@ %{__mkdir} -p /etc/opt %{__ln_s} -f %{prefix}/conf /etc%{prefix} +chkconfig --add freeswitch + %postun %{?run_ldconfig:%run_ldconfig} %{__rm} -rf %{prefix}

1 0

[commit] r7980 - freeswitch/trunk/scripts
by Freeswitch SVN 29 Mar '08

29 Mar '08

Author: stkn Date: Fri Mar 28 20:57:04 2008 New Revision: 7980 Modified: freeswitch/trunk/scripts/fsxs.in Log: Update help text and copyright header. Modified: freeswitch/trunk/scripts/fsxs.in ============================================================================== --- freeswitch/trunk/scripts/fsxs.in (original) +++ freeswitch/trunk/scripts/fsxs.in Fri Mar 28 20:57:04 2008 @@ -1,8 +1,8 @@ #!/usr/bin/perl # -# FreeSwitch fsxs +# FreeSWITCH fsxs # -# (C) 2006 Stefan Knoblich <stkn(a)netdomination.org> +# (C) 2006-2008 Stefan Knoblich <stkn(a)netdomination.org> use strict; @@ -52,21 +52,21 @@ } sub fsxs_usage { - print "FreeSwitch fsxs\n(C) 2006-2008 Stefan Knoblich <stkn\(a)netdomination.org>\n"; + print "FreeSWITCH fsxs\n(C) 2006-2008 Stefan Knoblich <stkn\(a)netdomination.org>\n"; print "\n"; print "Usage:\n"; print "\t$0 compile [options] <file1 ...>\n"; print "\t$0 link [options] <target> <file1 ...>\n"; print "\t$0 build [options] <target> <file1 ...>\n"; print "\t$0 install [options] <file1 ...>\n\n"; - print "\t$0 show <var1>...[varN]\n"; - print "\t$0 <--var1>...<--varN>\n\n"; + print "\t$0 show <var1 ...varN>\n"; + print "\t$0 <--var1 ...--varN>\n\n"; print "Command description:\n"; print "\tcompile: Compile source file(s) into object file(s)\n"; print "\tlink: Create module from object file(s)\n"; print "\tbuild: Build module from source file(s) (compile + link)\n"; - print "\tinstall: Install module(s) into freeswitch module directory\n"; + print "\tinstall: Install module(s) into FreeSWITCH module directory\n"; print "\tshow: Show defined variable(s)\n"; print "\n";

1 0

[commit] r7979 - freeswitch/trunk/scripts
by Freeswitch SVN 29 Mar '08

29 Mar '08

Author: stkn Date: Fri Mar 28 20:49:21 2008 New Revision: 7979 Modified: freeswitch/trunk/scripts/fsxs.in Log: Change variable naming to be more configure-like (except for --confdir) Modified: freeswitch/trunk/scripts/fsxs.in ============================================================================== --- freeswitch/trunk/scripts/fsxs.in (original) +++ freeswitch/trunk/scripts/fsxs.in Fri Mar 28 20:49:21 2008 @@ -20,12 +20,12 @@ LDFLAGS => '@LDFLAGS@', SOLINK => '@SOLINK@', - MODULES_DIR => '@MODULES_DIR@', - LIB_DIR => '@LIB_DIR@', - BIN_DIR => '@BIN_DIR@', - INC_DIR => '@INC_DIR@', - DB_DIR => '@DB_DIR@', - CFG_DIR => '@CFG_DIR@', + MODULESDIR => '@MODULES_DIR@', + LIBDIR => '@LIB_DIR@', + BINDIR => '@BIN_DIR@', + INCLUDEDIR => '@INC_DIR@', + DBDIR => '@DB_DIR@', + CONFDIR => '@CFG_DIR@', PREFIX => '@PREFIX@' ); @@ -84,7 +84,7 @@ print "Variable names for \"fsxs show\" / \"fsxs --var\":\n"; print "\tcflags ldflags libs solink includes cc ld mkdir install\n"; - print "\tprefix lib_dir modules_dir db_dir inc_dir cfg_dir bin_dir\n"; + print "\tprefix libdir modulesdir dbdir includedir confdir bindir\n"; print "\n"; print "Examples:\n"; @@ -135,7 +135,7 @@ sub fsxs_install { my @files = @_; - my $destination = $vars{DESTDIR} . $vars{MODULES_DIR}; + my $destination = $vars{DESTDIR} . $vars{MODULESDIR}; # check if destination exists, create if it doesn't if( ! -e $destination ) {

1 0