- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r8273 - freeswitch/trunk/src/mod/xml_int/mod_xml_ldap
by Freeswitch SVN 06 May '08

06 May '08

Author: stkn Date: Tue May 6 12:03:02 2008 New Revision: 8273 Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_ldap/Makefile Log: mod_xml_ldap: strip -std=c99 from CFLAGS during openldap build (fixes problems w/ arpa/nameser.h on linux) and stop building openldap server components Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_ldap/Makefile ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_ldap/Makefile (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_ldap/Makefile Tue May 6 12:03:02 2008 @@ -8,7 +8,8 @@ LOCAL_CFLAGS=-DWITH_OPENLDAP -DLDAP_DEPRECATED -I$(LDAP_DIR)/include -DEFAULT_ARGS=--prefix=$(PREFIX) --disable-shared --with-pic +DEFAULT_ARGS= --prefix=$(PREFIX) --disable-shared --with-pic --disable-slapd +DEFAULT_ARGS+= --disable-slurpd --disable-relay --disable-bdb --disable-hdb LOCAL_LIBADD=$(LDAPLA) $(LIBLBERLA) @@ -16,7 +17,7 @@ $(LDAP_DIR): $(GETLIB) $(LDAP).tgz - cd $(LDAP_DIR) && ./configure $(DEFAULT_ARGS) --disable-bdb --disable-hdb --disable-slapd + cd $(LDAP_DIR) && CFLAGS="`echo $(CFLAGS) | sed -e 's:-std=c99::'`" ./configure $(DEFAULT_ARGS) $(LDAPLA) $(LIBLBERLA): $(LDAP_DIR) cd $(LDAP_DIR) && $(MAKE)

1 0

[commit] r8272 - freeswitch/trunk/scripts/contrib/jpalley
by Freeswitch SVN 06 May '08

06 May '08

Author: brian Date: Tue May 6 11:47:45 2008 New Revision: 8272 Added: freeswitch/trunk/scripts/contrib/jpalley/ Log: welcome to the jungle

1 0

[commit] r8271 - freeswitch/trunk/src/mod/languages/mod_lua
by Freeswitch SVN 06 May '08

06 May '08

Author: mikej Date: Tue May 6 11:46:11 2008 New Revision: 8271 Modified: freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.2008.vcproj Log: tweak Modified: freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.2008.vcproj ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.2008.vcproj (original) +++ freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.2008.vcproj Tue May 6 11:46:11 2008 @@ -43,7 +43,7 @@ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_WIN32" UsePrecompiledHeader="0" DisableSpecificWarnings="4127, 4505" - EnablePREfast="false" + EnablePREfast="true" /> <Tool Name="VCManagedResourceCompilerTool"

1 0

[commit] r8270 - in freeswitch/trunk/src/mod/endpoints: mod_alsa mod_dingaling mod_iax mod_portaudio mod_reference mod_sofia mod_wanpipe mod_woomera
by Freeswitch SVN 06 May '08

06 May '08

Author: anthm Date: Tue May 6 09:59:37 2008 New Revision: 8270 Modified: freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c freeswitch/trunk/src/mod/endpoints/mod_reference/mod_reference.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c Log: missed some name changes thanks coppice Modified: freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c Tue May 6 09:59:37 2008 @@ -293,7 +293,7 @@ switch_set_flag_locked(tech_pvt, TFLAG_IO); - /* Move Channel's State Machine to RING */ + /* Move channel's state machine to ROUTING */ switch_channel_set_state(channel, CS_ROUTING); return SWITCH_STATUS_SUCCESS; Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Tue May 6 09:59:37 2008 @@ -1165,7 +1165,7 @@ switch_set_flag(tech_pvt, TFLAG_READY); if (negotiate_media(session) == SWITCH_STATUS_SUCCESS) { - /* Move Channel's State Machine to RING */ + /* Move channel's state machine to ROUTING */ switch_channel_set_state(channel, CS_ROUTING); } 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 Tue May 6 09:59:37 2008 @@ -467,7 +467,7 @@ switch_set_flag_locked(tech_pvt, TFLAG_IO); - /* Move Channel's State Machine to RING */ + /* Move channel's state machine to ROUTING */ switch_channel_set_state(switch_core_session_get_channel(session), CS_ROUTING); switch_mutex_lock(globals.mutex); globals.calls++; Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Tue May 6 09:59:37 2008 @@ -283,7 +283,7 @@ switch_set_flag_locked(tech_pvt, TFLAG_IO); - /* Move Channel's State Machine to RING */ + /* Move channel's state machine to ROUTING */ switch_channel_set_state(channel, CS_ROUTING); return SWITCH_STATUS_SUCCESS; Modified: freeswitch/trunk/src/mod/endpoints/mod_reference/mod_reference.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_reference/mod_reference.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_reference/mod_reference.c Tue May 6 09:59:37 2008 @@ -139,7 +139,10 @@ assert(channel != NULL); switch_set_flag_locked(tech_pvt, TFLAG_IO); - /* Move Channel's State Machine to RING */ + /* Move channel's state machine to ROUTING. This means the call is trying + to get from the initial start where the call because, to the point + where a destination has been identified. If the channel is simply + left in the initial state, nothing will happen. */ switch_channel_set_state(channel, CS_ROUTING); switch_mutex_lock(globals.mutex); globals.calls++; Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Tue May 6 09:59:37 2008 @@ -103,7 +103,7 @@ } } - /* Move Channel's State Machine to RING */ + /* Move channel's state machine to ROUTING */ switch_channel_set_state(channel, CS_ROUTING); assert( switch_channel_get_state(channel) != CS_INIT); return SWITCH_STATUS_SUCCESS; Modified: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c Tue May 6 09:59:37 2008 @@ -613,7 +613,7 @@ done: - /* Move Channel's State Machine to RING */ + /* Move channel's state machine to ROUTING */ switch_channel_set_state(channel, CS_ROUTING); return SWITCH_STATUS_SUCCESS; } Modified: freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c Tue May 6 09:59:37 2008 @@ -1042,7 +1042,7 @@ ptr++; port = (switch_port_t) atoi(ptr); } - /* Move Channel's State Machine to RING */ + /* Move channel's state machine to ROUTING */ switch_channel_answer(channel); switch_channel_set_state(channel, CS_ROUTING);

1 0

[commit] r8269 - freeswitch/trunk/src
by Freeswitch SVN 06 May '08

06 May '08

Author: anthm Date: Tue May 6 09:58:36 2008 New Revision: 8269 Modified: freeswitch/trunk/src/switch_time.c Log: crank accuracy on windows sleep Modified: freeswitch/trunk/src/switch_time.c ============================================================================== --- freeswitch/trunk/src/switch_time.c (original) +++ freeswitch/trunk/src/switch_time.c Tue May 6 09:58:36 2008 @@ -173,6 +173,9 @@ } if ((private_info = switch_core_alloc(timer->memory_pool, sizeof(*private_info)))) { +#if defined(WIN32) + timeBeginPeriod(1); +#endif switch_mutex_lock(globals.mutex); TIMER_MATRIX[timer->interval].count++; switch_mutex_unlock(globals.mutex); @@ -454,6 +457,12 @@ switch_yield(10000); } } + +#if defined(WIN32) + timeEndPeriod(1); +#endif + + return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r8268 - freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket
by Freeswitch SVN 06 May '08

06 May '08

Author: verifier Date: Tue May 6 05:08:08 2008 New Revision: 8268 Modified: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelInfo.cs Log: Added a missing comma. Modified: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelInfo.cs ============================================================================== --- freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelInfo.cs (original) +++ freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelInfo.cs Tue May 6 05:08:08 2008 @@ -6,7 +6,7 @@ New, // Channel is newly created Init, // Channel has been initilized Routing, // Channel is looking for a dialplan - SoftExecute // Channel is in a passive transmit state + SoftExecute, // Channel is in a passive transmit state Execute, // Channel is executing it's dialplan ExchangeMedia, // Channel is exchanging media ConsumeMedia, // Channel is consuming media

1 0

[commit] r8267 - freeswitch/trunk/src
by Freeswitch SVN 06 May '08

06 May '08

Author: anthm Date: Mon May 5 20:02:37 2008 New Revision: 8267 Modified: freeswitch/trunk/src/switch_loadable_module.c Log: fix vid issue Modified: freeswitch/trunk/src/switch_loadable_module.c ============================================================================== --- freeswitch/trunk/src/switch_loadable_module.c (original) +++ freeswitch/trunk/src/switch_loadable_module.c Mon May 5 20:02:37 2008 @@ -1276,12 +1276,14 @@ for (imp = codec_interface->implementations; imp; imp = imp->next) { uint8_t match = 1; - if ((uint32_t) (imp->microseconds_per_frame / 1000) != 20) { - match = 0; - } - - if (match && rate && (uint32_t) imp->samples_per_second != rate) { - match = 0; + if (imp->codec_type != SWITCH_CODEC_TYPE_VIDEO) { + if ((uint32_t) (imp->microseconds_per_frame / 1000) != 20) { + match = 0; + } + + if (match && rate && (uint32_t) imp->samples_per_second != rate) { + match = 0; + } } if (match) { @@ -1295,12 +1297,14 @@ for (imp = codec_interface->implementations; imp; imp = imp->next) { uint8_t match = 1; - if (interval && (uint32_t) (imp->microseconds_per_frame / 1000) != interval) { - match = 0; - } + if (imp->codec_type != SWITCH_CODEC_TYPE_VIDEO) { + if (interval && (uint32_t) (imp->microseconds_per_frame / 1000) != interval) { + match = 0; + } - if (match && rate && (uint32_t) imp->samples_per_second != rate) { - match = 0; + if (match && rate && (uint32_t) imp->samples_per_second != rate) { + match = 0; + } } if (match) {

1 0

[commit] r8266 - in freeswitch/trunk/scripts/contrib: trixter verifier/EventSocket/trunk/EventWatcher verifier/EventSocket/trunk/FreeSwitchEventSocket verifier/EventSocket/trunk/FreeSwitchEventSocket/SipEvents
by Freeswitch SVN 05 May '08

05 May '08

Author: mikej Date: Mon May 5 17:27:11 2008 New Revision: 8266 Modified: freeswitch/trunk/scripts/contrib/trixter/call-progress.pl freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/EventWatcher/CallManager.cs freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelInfo.cs freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/SipEvents/EventPresence.cs Log: fix in tree scripts to match changed state names. (FSCORE-119) Modified: freeswitch/trunk/scripts/contrib/trixter/call-progress.pl ============================================================================== --- freeswitch/trunk/scripts/contrib/trixter/call-progress.pl (original) +++ freeswitch/trunk/scripts/contrib/trixter/call-progress.pl Mon May 5 17:27:11 2008 @@ -138,7 +138,7 @@ } elsif (watchedChannel($myhash->{'channel-name'})) { if ($myhash->{'event-name'} eq "CHANNEL_ANSWER") { ## deal with answers do_answer($myhash); - } elsif ($myhash->{'event-name'} eq "CHANNEL_STATE" && $myhash->{'channel-state'} eq "CS_RING") { + } elsif ($myhash->{'event-name'} eq "CHANNEL_STATE" && $myhash->{'channel-state'} eq "CS_ROUTING") { do_ring($myhash); } elsif ($myhash->{'event-name'} eq "CHANNEL_HANGUP") { ## last thing done on a channel do_hangup($myhash); Modified: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/EventWatcher/CallManager.cs ============================================================================== --- freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/EventWatcher/CallManager.cs (original) +++ freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/EventWatcher/CallManager.cs Mon May 5 17:27:11 2008 @@ -60,7 +60,7 @@ if (theEvent is EventPresenceIn) { EventPresenceIn ep = (EventPresenceIn) theEvent; - //Channel-State: CS_RING + //Channel-State: CS_ROUTING //Channel-Name: sofia/default/jonas%40192.168.1.102%3A5070 //Unique-ID: 2f87ba27-2f71-d64d-8c64-9966ee894eac //Call-Direction: inbound @@ -68,7 +68,7 @@ //Event-Name: PRESENCE_IN CallState state = CallState.Unknown; string destination = string.Empty; - if (ep.ChannelState.ChannelInfo.State == ChannelState.Ring) + if (ep.ChannelState.ChannelInfo.State == ChannelState.Routing) { if (IsInbound(ep)) { Modified: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelInfo.cs ============================================================================== --- freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelInfo.cs (original) +++ freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/ChannelInfo.cs Mon May 5 17:27:11 2008 @@ -3,16 +3,16 @@ #region enum ChannelState public enum ChannelState { - New, // Channel is newly created - Init, // Channel has been initilized - Ring, // Channel is looking for a dialplan - Transmit, // Channel is in a passive transmit state - Execute, // Channel is executing it's dialplan - Loopback, // Channel is in loopback - Hold, // Channel is on hold - Hibernate, // Channel is in a sleep state - Hangup, // Channel is flagged for hangup and ready to end - Done, // Channel is ready to be destroyed and out of the state machine + New, // Channel is newly created + Init, // Channel has been initilized + Routing, // Channel is looking for a dialplan + SoftExecute // Channel is in a passive transmit state + Execute, // Channel is executing it's dialplan + ExchangeMedia, // Channel is exchanging media + ConsumeMedia, // Channel is consuming media + Hibernate, // Channel is in a sleep state + Hangup, // Channel is flagged for hangup and ready to end + Done, // Channel is ready to be destroyed and out of the state machine Unknown } #endregion @@ -205,11 +205,11 @@ { case "CS_NEW": return ChannelState.New; case "CS_INIT": return ChannelState.Init; - case "CS_RING": return ChannelState.Ring; - case "CS_TRANSMIT": return ChannelState.Transmit; + case "CS_ROUTING": return ChannelState.Routing; + case "CS_SOFT_EXECUTE": return ChannelState.SoftExecute; case "CS_EXECUTE": return ChannelState.Execute; - case "CS_LOOPBACK": return ChannelState.Loopback; - case "CS_HOLD": return ChannelState.Hold; + case "CS_EXCHANGE_MEDIA": return ChannelState.ExchangeMedia; + case "CS_CONSUME_MEDIA": return ChannelState.ConsumeMedia; case "CS_HIBERNATE": return ChannelState.Hibernate; case "CS_HANGUP": return ChannelState.Hangup; case "CS_DONE": return ChannelState.Done; Modified: freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/SipEvents/EventPresence.cs ============================================================================== --- freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/SipEvents/EventPresence.cs (original) +++ freeswitch/trunk/scripts/contrib/verifier/EventSocket/trunk/FreeSwitchEventSocket/SipEvents/EventPresence.cs Mon May 5 17:27:11 2008 @@ -34,7 +34,7 @@ } /// <summary> - /// Caller is only specified on state CS_RING + /// Caller is only specified on state CS_ROUTING /// and not on CS_HANGUP /// </summary> public PartyInfo Caller

1 0

[commit] r8265 - freeswitch/trunk/src/mod/languages/mod_perl
by Freeswitch SVN 05 May '08

05 May '08

Author: stkn Date: Mon May 5 12:11:39 2008 New Revision: 8265 Modified: freeswitch/trunk/src/mod/languages/mod_perl/Makefile Log: Add missing DESTDIR variable Modified: freeswitch/trunk/src/mod/languages/mod_perl/Makefile ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_perl/Makefile (original) +++ freeswitch/trunk/src/mod/languages/mod_perl/Makefile Mon May 5 12:11:39 2008 @@ -34,6 +34,6 @@ rm -fr *~ .perlok freeswitch.$(DYNAMIC_LIB_EXTEN) depend_install: - mkdir -p $(PREFIX)/perl - $(LTINSTALL) freeswitch.$(DYNAMIC_LIB_EXTEN) freeswitch.pm $(PREFIX)/perl - if [ ! -f $(PREFIX)/perl/freeswitch.pm ] ; then $(LTINSTALL) freeswitch.pm $(PREFIX)/perl ; fi + mkdir -p $(DESTDIR)$(PREFIX)/perl + $(LTINSTALL) freeswitch.$(DYNAMIC_LIB_EXTEN) freeswitch.pm $(DESTDIR)$(PREFIX)/perl + if [ ! -f $(DESTDIR)$(PREFIX)/perl/freeswitch.pm ] ; then $(LTINSTALL) freeswitch.pm $(DESTDIR)$(PREFIX)/perl ; fi

1 0

[commit] r8264 - freeswitch/trunk/src/include
by Freeswitch SVN 05 May '08

05 May '08

Author: anthm Date: Mon May 5 11:56:53 2008 New Revision: 8264 Modified: freeswitch/trunk/src/include/switch_module_interfaces.h Log: change names to protect the innocent Modified: freeswitch/trunk/src/include/switch_module_interfaces.h ============================================================================== --- freeswitch/trunk/src/include/switch_module_interfaces.h (original) +++ freeswitch/trunk/src/include/switch_module_interfaces.h Mon May 5 11:56:53 2008 @@ -62,17 +62,17 @@ struct switch_state_handler_table { /*! executed when the state changes to init */ switch_state_handler_t on_init; - /*! executed when the state changes to ring */ + /*! executed when the state changes to routing */ switch_state_handler_t on_routing; /*! executed when the state changes to execute */ switch_state_handler_t on_execute; /*! executed when the state changes to hangup */ switch_state_handler_t on_hangup; - /*! executed when the state changes to loopback */ + /*! executed when the state changes to exchange_media */ switch_state_handler_t on_exchange_media; - /*! executed when the state changes to transmit */ + /*! executed when the state changes to soft_execute */ switch_state_handler_t on_soft_execute; - /*! executed when the state changes to hold */ + /*! executed when the state changes to consume_media */ switch_state_handler_t on_consume_media; /*! executed when the state changes to hibernate */ switch_state_handler_t on_hibernate;

1 0